From db4386f6e25c8a96bd2510588c9ba462a51d9ca1 Mon Sep 17 00:00:00 2001
From: Frederik Bolding <frederik.bolding@gmail.com>
Date: Fri, 29 Nov 2024 11:31:07 +0100
Subject: [PATCH 001/175] fix: Correct preferences controller usage for
 `isOnPhishingList` hook (#28803)

<!--
Please submit this PR as a draft initially.
Do not mark it as "Ready for review" until the template has been
completely filled out, and PR status checks have passed at least once.
-->

## **Description**

In [this
commit](https://github.com/MetaMask/metamask-extension/commit/cedabc62e45601c77871689425320c54d717275e)
the preferences controller was converted to `BaseControllerV2`, however
the `isOnPhishingList` hook was not corrected to reference the state
properly. The hook will currently always throw which means that link
validation fails for Snaps notifications, making them unable to display.
This PR corrects that mistake.

Note: This is an edge-case of the Snaps API that doesn't have good E2E
coverage yet. We should prioritize that.

[![Open in GitHub
Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/28803?quickstart=1)

## **Manual testing steps**

The following Snap should work correctly and display a notification:
```
export const onRpcRequest: OnRpcRequestHandler = async ({
  origin,
  request,
}) => {
  switch (request.method) {
    case 'hello':
      return snap.request({
        method: 'snap_notify',
        params: {
          type: 'inApp',
          message: 'Hello! [metamask.io](https://metamask.io)',
        },
      });
    default:
      throw new Error('Method not found.');
  }
};

```
---
 app/scripts/metamask-controller.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
index 992302983baf..d60d937e1c3c 100644
--- a/app/scripts/metamask-controller.js
+++ b/app/scripts/metamask-controller.js
@@ -2897,8 +2897,7 @@ export default class MetamaskController extends EventEmitter {
             );
           },
           isOnPhishingList: (url) => {
-            const { usePhishDetect } =
-              this.preferencesController.store.getState();
+            const { usePhishDetect } = this.preferencesController.state;
 
             if (!usePhishDetect) {
               return false;

From 5e52a7d6d05db865fefdb7e7fdab82b090089911 Mon Sep 17 00:00:00 2001
From: chloeYue <105063779+chloeYue@users.noreply.github.com>
Date: Fri, 29 Nov 2024 12:14:33 +0100
Subject: [PATCH 002/175] test: [POM]  fix change language flaky tests and
 migrate tests to Page Object Model (#28777)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## **Description**

- Fix change language flaky tests. There are multiple reasons for the
flakiness, including taking actions during the loading spinner and
excessive misuse of refresh page
- Migrate change language e2e tests to Page Object Model
- Created base pages for advanced settings page and general settings
page
- For some special language-related locators, as they are only used in
this specific test, I didn't migrate them to POM methods.

[![Open in GitHub
Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/27155?quickstart=1)

## **Related issues**

Fixes:https://github.com/MetaMask/metamask-extension/issues/27904
https://github.com/MetaMask/metamask-extension/issues/28698
https://github.com/MetaMask/metamask-extension/issues/27390

## **Manual testing steps**
Check code readability, make sure tests pass.

## **Screenshots/Recordings**

<!-- If applicable, add screenshots and/or recordings to visualize the
before and after of your change. -->

### **Before**

<!-- [screenshots/recordings] -->

### **After**

<!-- [screenshots/recordings] -->

## **Pre-merge author checklist**

- [x] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension Coding
Standards](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/CODING_GUIDELINES.md).
- [x] I've completed the PR template to the best of my ability
- [x] I’ve included tests if applicable
- [x] I’ve documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [x] I’ve applied the right labels on the PR (see [labeling
guidelines](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.

## **Pre-merge reviewer checklist**

- [x] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed).
- [x] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.
---
 test/e2e/page-objects/common.ts               |   5 +-
 .../pages/settings/advanced-settings.ts       |  32 ++++
 .../pages/settings/general-settings.ts        |  61 +++++++
 .../tests/settings/change-language.spec.ts    | 153 +++++++++---------
 4 files changed, 175 insertions(+), 76 deletions(-)
 create mode 100644 test/e2e/page-objects/pages/settings/advanced-settings.ts
 create mode 100644 test/e2e/page-objects/pages/settings/general-settings.ts

diff --git a/test/e2e/page-objects/common.ts b/test/e2e/page-objects/common.ts
index b1f678b80cca..5bf1a91e1859 100644
--- a/test/e2e/page-objects/common.ts
+++ b/test/e2e/page-objects/common.ts
@@ -1 +1,4 @@
-export type RawLocator = string | { css: string; text: string };
+export type RawLocator =
+  | string
+  | { css?: string; text?: string }
+  | { tag: string; text: string };
diff --git a/test/e2e/page-objects/pages/settings/advanced-settings.ts b/test/e2e/page-objects/pages/settings/advanced-settings.ts
new file mode 100644
index 000000000000..b93f29b58736
--- /dev/null
+++ b/test/e2e/page-objects/pages/settings/advanced-settings.ts
@@ -0,0 +1,32 @@
+import { Driver } from '../../../webdriver/driver';
+
+class AdvancedSettings {
+  private readonly driver: Driver;
+
+  private readonly downloadDataButton = '[data-testid="export-data-button"]';
+
+  private readonly downloadStateLogsButton =
+    '[data-testid="advanced-setting-state-logs"]';
+
+  constructor(driver: Driver) {
+    this.driver = driver;
+  }
+
+  async check_pageIsLoaded(): Promise<void> {
+    try {
+      await this.driver.waitForMultipleSelectors([
+        this.downloadStateLogsButton,
+        this.downloadDataButton,
+      ]);
+    } catch (e) {
+      console.log(
+        'Timeout while waiting for Advanced Settings page to be loaded',
+        e,
+      );
+      throw e;
+    }
+    console.log('Advanced Settings page is loaded');
+  }
+}
+
+export default AdvancedSettings;
diff --git a/test/e2e/page-objects/pages/settings/general-settings.ts b/test/e2e/page-objects/pages/settings/general-settings.ts
new file mode 100644
index 000000000000..0db61a03a23f
--- /dev/null
+++ b/test/e2e/page-objects/pages/settings/general-settings.ts
@@ -0,0 +1,61 @@
+import { Driver } from '../../../webdriver/driver';
+
+class GeneralSettings {
+  private readonly driver: Driver;
+
+  private readonly generalSettingsPageTitle = {
+    text: 'General',
+    tag: 'h4',
+  };
+
+  private readonly loadingOverlaySpinner = '.loading-overlay__spinner';
+
+  private readonly selectLanguageField = '[data-testid="locale-select"]';
+
+  constructor(driver: Driver) {
+    this.driver = driver;
+  }
+
+  async check_pageIsLoaded(): Promise<void> {
+    try {
+      await this.check_noLoadingOverlaySpinner();
+      await this.driver.waitForMultipleSelectors([
+        this.generalSettingsPageTitle,
+        this.selectLanguageField,
+      ]);
+    } catch (e) {
+      console.log(
+        'Timeout while waiting for General Settings page to be loaded',
+        e,
+      );
+      throw e;
+    }
+    console.log('General Settings page is loaded');
+  }
+
+  /**
+   * Change the language of MM on General Settings page
+   *
+   * @param languageToSelect - The language to select
+   */
+  async changeLanguage(languageToSelect: string): Promise<void> {
+    console.log(
+      'Changing language to ',
+      languageToSelect,
+      'on general settings page',
+    );
+    await this.check_noLoadingOverlaySpinner();
+    await this.driver.clickElement(this.selectLanguageField);
+    await this.driver.clickElement({
+      text: languageToSelect,
+      tag: 'option',
+    });
+    await this.check_noLoadingOverlaySpinner();
+  }
+
+  async check_noLoadingOverlaySpinner(): Promise<void> {
+    await this.driver.assertElementNotPresent(this.loadingOverlaySpinner);
+  }
+}
+
+export default GeneralSettings;
diff --git a/test/e2e/tests/settings/change-language.spec.ts b/test/e2e/tests/settings/change-language.spec.ts
index 1bd9915a33da..469ad3ceec30 100644
--- a/test/e2e/tests/settings/change-language.spec.ts
+++ b/test/e2e/tests/settings/change-language.spec.ts
@@ -1,21 +1,17 @@
 import { strict as assert } from 'assert';
 import { Suite } from 'mocha';
-
 import { Driver } from '../../webdriver/driver';
-import {
-  defaultGanacheOptions,
-  withFixtures,
-  unlockWallet,
-} from '../../helpers';
+import { withFixtures } from '../../helpers';
 import FixtureBuilder from '../../fixture-builder';
+import AdvancedSettings from '../../page-objects/pages/settings/advanced-settings';
+import GeneralSettings from '../../page-objects/pages/settings/general-settings';
+import HeaderNavbar from '../../page-objects/pages/header-navbar';
+import Homepage from '../../page-objects/pages/homepage';
+import SendTokenPage from '../../page-objects/pages/send/send-token-page';
+import SettingsPage from '../../page-objects/pages/settings/settings-page';
+import { loginWithBalanceValidation } from '../../page-objects/flows/login.flow';
 
 const selectors = {
-  accountOptionsMenuButton: '[data-testid="account-options-menu-button"]',
-  settingsOption: { text: 'Settings', tag: 'div' },
-  localeSelect: '[data-testid="locale-select"]',
-  ethOverviewSend: '[data-testid="eth-overview-send"]',
-  ensInput: '[data-testid="ens-input"]',
-  nftsTab: '[data-testid="account-overview__nfts-tab"]',
   labelSpanish: { tag: 'p', text: 'Idioma actual' },
   currentLanguageLabel: { tag: 'p', text: 'Current language' },
   advanceText: { text: 'Avanceret', tag: 'div' },
@@ -29,50 +25,37 @@ const selectors = {
   headerText: { text: 'الإعدادات', tag: 'h3' },
 };
 
-async function changeLanguage(driver: Driver, languageIndex: number) {
-  await driver.clickElement(selectors.accountOptionsMenuButton);
-  await driver.clickElement(selectors.settingsOption);
-
-  const dropdownElement = await driver.findElement(selectors.localeSelect);
-  await dropdownElement.click();
-
-  const options = await dropdownElement.findElements({ css: 'option' });
-  await options[languageIndex].click();
-}
-
 describe('Settings - general tab @no-mmi', function (this: Suite) {
   it('validate the change language functionality', async function () {
-    let languageIndex = 10;
-
     await withFixtures(
       {
         fixtures: new FixtureBuilder().build(),
-        ganacheOptions: defaultGanacheOptions,
         title: this.test?.fullTitle(),
       },
-
       async ({ driver }: { driver: Driver }) => {
-        await unlockWallet(driver);
-        await changeLanguage(driver, languageIndex);
+        await loginWithBalanceValidation(driver);
+        await new HeaderNavbar(driver).openSettingsPage();
+        const generalSettings = new GeneralSettings(driver);
+        await generalSettings.check_pageIsLoaded();
 
-        // Validate the label changes to Spanish
+        // Change language to Spanish and validate that the word has changed correctly
+        await generalSettings.changeLanguage('Español');
         const isLanguageLabelChanged = await driver.isElementPresent(
           selectors.labelSpanish,
         );
         assert.equal(isLanguageLabelChanged, true, 'Language did not change');
 
+        // Refresh the page and validate that the language is still Spanish
         await driver.refresh();
-
-        // Change back to English and verify that the word is correctly changed back to English
-        languageIndex = 9;
-
-        const dropdownElement = await driver.findElement(
-          selectors.localeSelect,
+        await generalSettings.check_pageIsLoaded();
+        assert.equal(
+          await driver.isElementPresent(selectors.labelSpanish),
+          true,
+          'Language did not change after refresh',
         );
-        await dropdownElement.click();
-        const options = await dropdownElement.findElements({ css: 'option' });
-        await options[languageIndex].click();
 
+        // Change language back to English and validate that the word has changed correctly
+        await generalSettings.changeLanguage('English');
         const isLabelTextChanged = await driver.isElementPresent(
           selectors.currentLanguageLabel,
         );
@@ -82,21 +65,22 @@ describe('Settings - general tab @no-mmi', function (this: Suite) {
   });
 
   it('validate "Dansk" language on page navigation', async function () {
-    const languageIndex = 6;
     await withFixtures(
       {
         fixtures: new FixtureBuilder().build(),
-        ganacheOptions: defaultGanacheOptions,
         title: this.test?.fullTitle(),
       },
-
       async ({ driver }: { driver: Driver }) => {
-        await unlockWallet(driver);
-        await changeLanguage(driver, languageIndex);
-
-        await driver.assertElementNotPresent('.loading-overlay__spinner');
+        await loginWithBalanceValidation(driver);
+        await new HeaderNavbar(driver).openSettingsPage();
+        const generalSettings = new GeneralSettings(driver);
+        await generalSettings.check_pageIsLoaded();
 
+        // Select "Dansk" language
+        await generalSettings.changeLanguage('Dansk');
         await driver.clickElement(selectors.advanceText);
+        const advancedSettings = new AdvancedSettings(driver);
+        await advancedSettings.check_pageIsLoaded();
 
         // Confirm that the language change is reflected in search box water text
         const isWaterTextChanged = await driver.isElementPresent(
@@ -132,22 +116,30 @@ describe('Settings - general tab @no-mmi', function (this: Suite) {
   });
 
   it('validate "Deutsch" language on error messages', async function () {
-    const languageIndex = 7;
     await withFixtures(
       {
         fixtures: new FixtureBuilder().build(),
-        ganacheOptions: defaultGanacheOptions,
         title: this.test?.fullTitle(),
       },
-
       async ({ driver }: { driver: Driver }) => {
-        await unlockWallet(driver);
-        await changeLanguage(driver, languageIndex);
-        await driver.navigate();
-        await driver.clickElement(selectors.ethOverviewSend);
-        await driver.pasteIntoField(
-          selectors.ensInput,
-          // use wrong checksum address; other inputs don't show error until snaps name-lookup has happened
+        await loginWithBalanceValidation(driver);
+        await new HeaderNavbar(driver).openSettingsPage();
+        const generalSettings = new GeneralSettings(driver);
+        await generalSettings.check_pageIsLoaded();
+
+        // Select "Deutsch" language
+        await generalSettings.changeLanguage('Deutsch');
+        await new SettingsPage(driver).closeSettingsPage();
+
+        const homepage = new Homepage(driver);
+        await homepage.check_pageIsLoaded();
+        await homepage.check_expectedBalanceIsDisplayed();
+        await homepage.startSendFlow();
+
+        const sendToPage = new SendTokenPage(driver);
+        await sendToPage.check_pageIsLoaded();
+        // use wrong address for recipient to allow error message to show
+        await sendToPage.fillRecipient(
           '0xAAAA6BF26964aF9D7eEd9e03E53415D37aA96045',
         );
 
@@ -165,18 +157,23 @@ describe('Settings - general tab @no-mmi', function (this: Suite) {
   });
 
   it('validate "मानक हिन्दी" language on tooltips', async function () {
-    const languageIndex = 19;
     await withFixtures(
       {
         fixtures: new FixtureBuilder().build(),
-        ganacheOptions: defaultGanacheOptions,
         title: this.test?.fullTitle(),
       },
-
       async ({ driver }: { driver: Driver }) => {
-        await unlockWallet(driver);
-        await changeLanguage(driver, languageIndex);
-        await driver.navigate();
+        await loginWithBalanceValidation(driver);
+        await new HeaderNavbar(driver).openSettingsPage();
+        const generalSettings = new GeneralSettings(driver);
+        await generalSettings.check_pageIsLoaded();
+
+        // Select "मानक हिन्दी" language
+        await generalSettings.changeLanguage('मानक हिन्दी');
+        await new SettingsPage(driver).closeSettingsPage();
+        const homepage = new Homepage(driver);
+        await homepage.check_pageIsLoaded();
+        await homepage.check_expectedBalanceIsDisplayed();
 
         // Validate the account tooltip
         const isAccountTooltipChanged = await driver.isElementPresent(
@@ -202,20 +199,24 @@ describe('Settings - general tab @no-mmi', function (this: Suite) {
   });
 
   it('validate "Magyar" language change on hypertext', async function () {
-    const languageIndex = 23;
     await withFixtures(
       {
         fixtures: new FixtureBuilder().build(),
-        ganacheOptions: defaultGanacheOptions,
         title: this.test?.fullTitle(),
       },
-
       async ({ driver }: { driver: Driver }) => {
-        await unlockWallet(driver);
-        // selects "Magyar" language
-        await changeLanguage(driver, languageIndex);
-        await driver.navigate();
-        await driver.clickElement(selectors.nftsTab);
+        await loginWithBalanceValidation(driver);
+        await new HeaderNavbar(driver).openSettingsPage();
+        const generalSettings = new GeneralSettings(driver);
+        await generalSettings.check_pageIsLoaded();
+
+        // Select "Magyar" language
+        await generalSettings.changeLanguage('Magyar');
+        await new SettingsPage(driver).closeSettingsPage();
+        const homepage = new Homepage(driver);
+        await homepage.check_pageIsLoaded();
+        await homepage.check_expectedBalanceIsDisplayed();
+        await homepage.goToNftTab();
 
         // Validate the hypertext
         const isHyperTextChanged = await driver.isElementPresent(
@@ -231,18 +232,20 @@ describe('Settings - general tab @no-mmi', function (this: Suite) {
   });
 
   it('validate "العربية" language change on page indent', async function () {
-    const languageIndex = 1;
     await withFixtures(
       {
         fixtures: new FixtureBuilder().build(),
-        ganacheOptions: defaultGanacheOptions,
         title: this.test?.fullTitle(),
       },
       async ({ driver }: { driver: Driver }) => {
-        await unlockWallet(driver);
-        await changeLanguage(driver, languageIndex);
+        await loginWithBalanceValidation(driver);
+        await new HeaderNavbar(driver).openSettingsPage();
+        const generalSettings = new GeneralSettings(driver);
+        await generalSettings.check_pageIsLoaded();
+
+        // Select "العربية" language and validate that the header text has changed
+        await generalSettings.changeLanguage('العربية');
 
-        // Validate the header text
         const isHeaderTextChanged = await driver.isElementPresent(
           selectors.headerText,
         );

From 7d252e9ca78e40c7e41034667850f07da8c70ca0 Mon Sep 17 00:00:00 2001
From: Matthew Walsh <matthew.walsh@consensys.net>
Date: Fri, 29 Nov 2024 16:25:29 +0000
Subject: [PATCH 003/175] refactor: remove global network from transaction
 controller (#28449)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## **Description**

Upgrade `@metamask/transaction-controller` to remove all usages of the
global network.

Specifically:

- Remove deleted constructor options.
- Add `getGlobalChainId` and `getGlobalNetworkClientId` private methods
in `MetamaskController`.
- Remove `TRANSACTION_MULTICHAIN` environment variable.
- Add `networkClientId` to test data.
- Update calls to:
  - `addTransaction`
  - `estimateGasBuffered`
  - `getNonceLock`
  - `getTransactions`
  - `startIncomingTransactionPolling`
  - `updateIncomingTransactions`
  - `wipeTransactions`

[![Open in GitHub
Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/28449?quickstart=1)

## **Related issues**

Fixes:
[#3499](https://github.com/MetaMask/MetaMask-planning/issues/3499)

## **Manual testing steps**

Full regression of all transaction flows.

## **Screenshots/Recordings**

### **Before**

### **After**

## **Pre-merge author checklist**

- [x] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension Coding
Standards](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/CODING_GUIDELINES.md).
- [x] I've completed the PR template to the best of my ability
- [x] I’ve included tests if applicable
- [x] I’ve documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [x] I’ve applied the right labels on the PR (see [labeling
guidelines](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.

## **Pre-merge reviewer checklist**

- [ ] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed).
- [ ] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.
---
 app/scripts/controllers/mmi-controller.ts     |   2 +-
 app/scripts/lib/transaction/metrics.test.ts   |   1 +
 .../transaction/smart-transactions.test.ts    |   1 +
 app/scripts/lib/transaction/util.test.ts      |  39 +----
 app/scripts/lib/transaction/util.ts           |   7 +-
 app/scripts/metamask-controller.js            | 135 +++++++++++-------
 app/scripts/metamask-controller.test.js       |  10 +-
 builds.yml                                    |   2 -
 package.json                                  |   2 +-
 ui/ducks/swaps/swaps.js                       |   1 +
 .../useFirstTimeInteractionAlert.test.ts      |   1 +
 .../usePendingTransactionAlerts.test.ts       |   1 +
 .../transactions/useResimulationAlert.test.ts |   1 +
 .../useSigningOrSubmittingAlerts.test.ts      |   1 +
 ui/store/actions.ts                           |   1 -
 yarn.lock                                     |  10 +-
 16 files changed, 110 insertions(+), 105 deletions(-)

diff --git a/app/scripts/controllers/mmi-controller.ts b/app/scripts/controllers/mmi-controller.ts
index 9f2701b2c0b9..f94388aa5e8f 100644
--- a/app/scripts/controllers/mmi-controller.ts
+++ b/app/scripts/controllers/mmi-controller.ts
@@ -311,7 +311,7 @@ export class MMIController {
           }
         }
 
-        const txList = this.txStateManager.getTransactions({}, [], false); // Includes all transactions, but we are looping through keyrings. Currently filtering is done in updateCustodianTransactions :-/
+        const txList = this.txStateManager.getTransactions(); // Includes all transactions, but we are looping through keyrings. Currently filtering is done in updateCustodianTransactions :-/
 
         try {
           updateCustodianTransactions({
diff --git a/app/scripts/lib/transaction/metrics.test.ts b/app/scripts/lib/transaction/metrics.test.ts
index 7dcedd4e467e..c4ddf9d29e5a 100644
--- a/app/scripts/lib/transaction/metrics.test.ts
+++ b/app/scripts/lib/transaction/metrics.test.ts
@@ -115,6 +115,7 @@ describe('Transaction metrics', () => {
       type: TransactionType.simpleSend,
       origin: ORIGIN_METAMASK,
       chainId: mockChainId,
+      networkClientId: 'testNetworkClientId',
       time: 1624408066355,
       defaultGasEstimates: {
         gas: '0x7b0d',
diff --git a/app/scripts/lib/transaction/smart-transactions.test.ts b/app/scripts/lib/transaction/smart-transactions.test.ts
index 1cf266c3e141..25bb409dffa1 100644
--- a/app/scripts/lib/transaction/smart-transactions.test.ts
+++ b/app/scripts/lib/transaction/smart-transactions.test.ts
@@ -150,6 +150,7 @@ function withRequest<ReturnValue>(
       },
       type: TransactionType.simpleSend,
       chainId: CHAIN_IDS.MAINNET,
+      networkClientId: 'testNetworkClientId',
       time: 1624408066355,
       defaultGasEstimates: {
         gas: '0x7b0d',
diff --git a/app/scripts/lib/transaction/util.test.ts b/app/scripts/lib/transaction/util.test.ts
index fbbee025381b..4d78ea51cfa5 100644
--- a/app/scripts/lib/transaction/util.test.ts
+++ b/app/scripts/lib/transaction/util.test.ts
@@ -50,6 +50,7 @@ const TRANSACTION_PARAMS_MOCK: TransactionParams = {
 
 const TRANSACTION_OPTIONS_MOCK: AddTransactionOptions = {
   actionId: 'mockActionId',
+  networkClientId: 'mockNetworkClientId',
   origin: 'mockOrigin',
   requireApproval: false,
   type: TransactionType.simpleSend,
@@ -151,23 +152,6 @@ describe('Transaction Utils', () => {
         });
       });
 
-      it('adds transaction with networkClientId if process.env.TRANSACTION_MULTICHAIN is set', async () => {
-        process.env.TRANSACTION_MULTICHAIN = '1';
-
-        await addTransaction(request);
-
-        expect(
-          request.transactionController.addTransaction,
-        ).toHaveBeenCalledTimes(1);
-        expect(
-          request.transactionController.addTransaction,
-        ).toHaveBeenCalledWith(TRANSACTION_PARAMS_MOCK, {
-          ...TRANSACTION_OPTIONS_MOCK,
-          networkClientId: 'mockNetworkClientId',
-        });
-        process.env.TRANSACTION_MULTICHAIN = '';
-      });
-
       it('returns transaction meta', async () => {
         const transactionMeta = await addTransaction(request);
         expect(transactionMeta).toStrictEqual(TRANSACTION_META_MOCK);
@@ -541,27 +525,6 @@ describe('Transaction Utils', () => {
         });
       });
 
-      it('adds transaction with networkClientId if process.env.TRANSACTION_MULTICHAIN is set', async () => {
-        process.env.TRANSACTION_MULTICHAIN = '1';
-
-        await addDappTransaction(dappRequest);
-
-        expect(
-          request.transactionController.addTransaction,
-        ).toHaveBeenCalledTimes(1);
-        expect(
-          request.transactionController.addTransaction,
-        ).toHaveBeenCalledWith(TRANSACTION_PARAMS_MOCK, {
-          ...TRANSACTION_OPTIONS_MOCK,
-          networkClientId: 'mockNetworkClientId',
-          method: DAPP_REQUEST_MOCK.method,
-          requireApproval: true,
-          securityAlertResponse: DAPP_REQUEST_MOCK.securityAlertResponse,
-          type: undefined,
-        });
-        process.env.TRANSACTION_MULTICHAIN = '';
-      });
-
       it('returns transaction hash', async () => {
         const transactionHash = await addDappTransaction(dappRequest);
         expect(transactionHash).toStrictEqual(TRANSACTION_META_MOCK.hash);
diff --git a/app/scripts/lib/transaction/util.ts b/app/scripts/lib/transaction/util.ts
index 0bbf93afd8a8..34f27d321e0b 100644
--- a/app/scripts/lib/transaction/util.ts
+++ b/app/scripts/lib/transaction/util.ts
@@ -46,7 +46,7 @@ type BaseAddTransactionRequest = {
 };
 
 type FinalAddTransactionRequest = BaseAddTransactionRequest & {
-  transactionOptions: AddTransactionOptions;
+  transactionOptions: Partial<AddTransactionOptions>;
 };
 
 export type AddTransactionRequest = FinalAddTransactionRequest & {
@@ -66,7 +66,7 @@ export async function addDappTransaction(
   const { id: actionId, method, origin } = dappRequest;
   const { securityAlertResponse, traceContext } = dappRequest;
 
-  const transactionOptions: AddTransactionOptions = {
+  const transactionOptions: Partial<AddTransactionOptions> = {
     actionId,
     method,
     origin,
@@ -143,10 +143,11 @@ async function addTransactionWithController(
     transactionParams,
     networkClientId,
   } = request;
+
   const { result, transactionMeta } =
     await transactionController.addTransaction(transactionParams, {
       ...transactionOptions,
-      ...(process.env.TRANSACTION_MULTICHAIN ? { networkClientId } : {}),
+      networkClientId,
     });
 
   return {
diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
index d60d937e1c3c..a1cbabb9bcbe 100644
--- a/app/scripts/metamask-controller.js
+++ b/app/scripts/metamask-controller.js
@@ -236,10 +236,7 @@ import {
   TOKEN_TRANSFER_LOG_TOPIC_HASH,
   TRANSFER_SINFLE_LOG_TOPIC_HASH,
 } from '../../shared/lib/transactions-controller-utils';
-import {
-  getCurrentChainId,
-  getProviderConfig,
-} from '../../shared/modules/selectors/networks';
+import { getProviderConfig } from '../../shared/modules/selectors/networks';
 import { endTrace, trace } from '../../shared/lib/trace';
 // eslint-disable-next-line import/no-restricted-paths
 import { isSnapId } from '../../ui/helpers/utils/snaps';
@@ -652,7 +649,9 @@ export default class MetamaskController extends EventEmitter {
     });
 
     this.tokenListController = new TokenListController({
-      chainId: getCurrentChainId({ metamask: this.networkController.state }),
+      chainId: this.#getGlobalChainId({
+        metamask: this.networkController.state,
+      }),
       preventPollingOnNetworkRestart: !this.#isTokenListPollingRequired(
         this.preferencesController.state,
       ),
@@ -676,7 +675,7 @@ export default class MetamaskController extends EventEmitter {
       });
     this.assetsContractController = new AssetsContractController({
       messenger: assetsContractControllerMessenger,
-      chainId: getCurrentChainId({ metamask: this.networkController.state }),
+      chainId: this.#getGlobalChainId(),
     });
 
     const tokensControllerMessenger = this.controllerMessenger.getRestricted({
@@ -699,7 +698,7 @@ export default class MetamaskController extends EventEmitter {
       state: initState.TokensController,
       provider: this.provider,
       messenger: tokensControllerMessenger,
-      chainId: getCurrentChainId({ metamask: this.networkController.state }),
+      chainId: this.#getGlobalChainId(),
     });
 
     const nftControllerMessenger = this.controllerMessenger.getRestricted({
@@ -725,7 +724,7 @@ export default class MetamaskController extends EventEmitter {
     this.nftController = new NftController({
       state: initState.NftController,
       messenger: nftControllerMessenger,
-      chainId: getCurrentChainId({ metamask: this.networkController.state }),
+      chainId: this.#getGlobalChainId(),
       onNftAdded: ({ address, symbol, tokenId, standard, source }) =>
         this.metaMetricsController.trackEvent({
           event: MetaMetricsEventName.NftAdded,
@@ -760,7 +759,7 @@ export default class MetamaskController extends EventEmitter {
 
     this.nftDetectionController = new NftDetectionController({
       messenger: nftDetectionControllerMessenger,
-      chainId: getCurrentChainId({ metamask: this.networkController.state }),
+      chainId: this.#getGlobalChainId(),
       getOpenSeaApiKey: () => this.nftController.openSeaApiKey,
       getBalancesInSingleCall:
         this.assetsContractController.getBalancesInSingleCall.bind(
@@ -849,13 +848,10 @@ export default class MetamaskController extends EventEmitter {
       legacyAPIEndpoint: `${gasApiBaseUrl}/networks/<chain_id>/gasPrices`,
       EIP1559APIEndpoint: `${gasApiBaseUrl}/networks/<chain_id>/suggestedGasFees`,
       getCurrentNetworkLegacyGasAPICompatibility: () => {
-        const chainId = getCurrentChainId({
-          metamask: this.networkController.state,
-        });
+        const chainId = this.#getGlobalChainId();
         return chainId === CHAIN_IDS.BSC;
       },
-      getChainId: () =>
-        getCurrentChainId({ metamask: this.networkController.state }),
+      getChainId: () => this.#getGlobalChainId(),
     });
 
     this.appStateController = new AppStateController({
@@ -950,7 +946,7 @@ export default class MetamaskController extends EventEmitter {
         ppomInit: () => PPOMModule.default(process.env.PPOM_URI),
       },
       state: initState.PPOMController,
-      chainId: getCurrentChainId({ metamask: this.networkController.state }),
+      chainId: this.#getGlobalChainId(),
       securityAlertsEnabled:
         this.preferencesController.state.securityAlertsEnabled,
       onPreferencesChange: preferencesMessenger.subscribe.bind(
@@ -1916,8 +1912,8 @@ export default class MetamaskController extends EventEmitter {
         ],
         allowedEvents: [`NetworkController:stateChange`],
       });
+
     this.txController = new TransactionController({
-      blockTracker: this.blockTracker,
       getCurrentNetworkEIP1559Compatibility:
         this.networkController.getEIP1559Compatibility.bind(
           this.networkController,
@@ -1935,10 +1931,10 @@ export default class MetamaskController extends EventEmitter {
         ),
       getNetworkState: () => this.networkController.state,
       getPermittedAccounts: this.getPermittedAccounts.bind(this),
-      getSavedGasFees: () =>
-        this.preferencesController.state.advancedGasFee[
-          getCurrentChainId({ metamask: this.networkController.state })
-        ],
+      getSavedGasFees: () => {
+        const globalChainId = this.#getGlobalChainId();
+        return this.preferencesController.state.advancedGasFee[globalChainId];
+      },
       incomingTransactions: {
         etherscanApiKeysByChainId: {
           [CHAIN_IDS.MAINNET]: process.env.ETHERSCAN_API_KEY,
@@ -1946,26 +1942,17 @@ export default class MetamaskController extends EventEmitter {
         },
         includeTokenTransfers: false,
         isEnabled: () =>
-          Boolean(
-            this.preferencesController.state.incomingTransactionsPreferences?.[
-              getCurrentChainId({ metamask: this.networkController.state })
-            ] && this.onboardingController.state.completedOnboarding,
-          ),
+          this.preferencesController.state.incomingTransactionsPreferences?.[
+            this.#getGlobalChainId()
+          ] && this.onboardingController.state.completedOnboarding,
         queryEntireHistory: false,
         updateTransactions: false,
       },
       isFirstTimeInteractionEnabled: () =>
         this.preferencesController.state.securityAlertsEnabled,
-      isMultichainEnabled: process.env.TRANSACTION_MULTICHAIN,
       isSimulationEnabled: () =>
         this.preferencesController.state.useTransactionSimulations,
       messenger: transactionControllerMessenger,
-      onNetworkStateChange: (listener) => {
-        networkControllerMessenger.subscribe(
-          'NetworkController:networkDidChange',
-          () => listener(),
-        );
-      },
       pendingTransactions: {
         isResubmitEnabled: () => {
           const state = this._getMetaMaskState();
@@ -1975,7 +1962,6 @@ export default class MetamaskController extends EventEmitter {
           );
         },
       },
-      provider: this.provider,
       testGasFeeFlows: process.env.TEST_GAS_FEE_FLOWS,
       trace,
       hooks: {
@@ -2155,12 +2141,12 @@ export default class MetamaskController extends EventEmitter {
     this.swapsController = new SwapsController(
       {
         messenger: swapsControllerMessenger,
-        // TODO: Remove once TransactionController exports this action type
         getBufferedGasLimit: async (txMeta, multiplier) => {
           const { gas: gasLimit, simulationFails } =
             await this.txController.estimateGasBuffered(
               txMeta.txParams,
               multiplier,
+              this.#getGlobalNetworkClientId(),
             );
 
           return { gasLimit, simulationFails };
@@ -2223,7 +2209,11 @@ export default class MetamaskController extends EventEmitter {
     this.smartTransactionsController = new SmartTransactionsController({
       supportedChainIds: getAllowedSmartTransactionsChainIds(),
       clientId: ClientId.Extension,
-      getNonceLock: this.txController.getNonceLock.bind(this.txController),
+      getNonceLock: (address) =>
+        this.txController.getNonceLock(
+          address,
+          this.#getGlobalNetworkClientId(),
+        ),
       confirmExternalTransaction:
         this.txController.confirmExternalTransaction.bind(this.txController),
       trackMetaMetricsEvent: this.metaMetricsController.trackEvent.bind(
@@ -2704,7 +2694,10 @@ export default class MetamaskController extends EventEmitter {
   }
 
   triggerNetworkrequests() {
-    this.txController.startIncomingTransactionPolling();
+    this.txController.startIncomingTransactionPolling([
+      this.#getGlobalNetworkClientId(),
+    ]);
+
     this.tokenDetectionController.enable();
     this.getInfuraFeatureFlags();
   }
@@ -2942,13 +2935,13 @@ export default class MetamaskController extends EventEmitter {
       'PreferencesController:stateChange',
       previousValueComparator(async (prevState, currState) => {
         const { currentLocale } = currState;
-        const chainId = getCurrentChainId({
-          metamask: this.networkController.state,
-        });
+        const chainId = this.#getGlobalChainId();
 
         await updateCurrentLocale(currentLocale);
         if (currState.incomingTransactionsPreferences?.[chainId]) {
-          this.txController.startIncomingTransactionPolling();
+          this.txController.startIncomingTransactionPolling([
+            this.#getGlobalNetworkClientId(),
+          ]);
         } else {
           this.txController.stopIncomingTransactionPolling();
         }
@@ -3018,7 +3011,15 @@ export default class MetamaskController extends EventEmitter {
     this.controllerMessenger.subscribe(
       'NetworkController:networkDidChange',
       async () => {
-        await this.txController.updateIncomingTransactions();
+        await this.txController.updateIncomingTransactions([
+          this.#getGlobalNetworkClientId(),
+        ]);
+
+        await this.txController.stopIncomingTransactionPolling();
+
+        await this.txController.startIncomingTransactionPolling([
+          this.#getGlobalNetworkClientId(),
+        ]);
       },
     );
 
@@ -4520,9 +4521,7 @@ export default class MetamaskController extends EventEmitter {
   async _addAccountsWithBalance() {
     try {
       // Scan accounts until we find an empty one
-      const chainId = getCurrentChainId({
-        metamask: this.networkController.state,
-      });
+      const chainId = this.#getGlobalChainId();
       const ethQuery = new EthQuery(this.provider);
       const accounts = await this.keyringController.getAccounts();
       let address = accounts[accounts.length - 1];
@@ -5051,15 +5050,24 @@ export default class MetamaskController extends EventEmitter {
   async resetAccount() {
     const selectedAddress =
       this.accountsController.getSelectedAccount().address;
-    this.txController.wipeTransactions(false, selectedAddress);
+
+    const globalChainId = this.#getGlobalChainId();
+
+    this.txController.wipeTransactions({
+      address: selectedAddress,
+      chainId: globalChainId,
+    });
+
     this.smartTransactionsController.wipeSmartTransactions({
       address: selectedAddress,
       ignoreNetwork: false,
     });
+
     this.bridgeStatusController.wipeBridgeStatus({
       address: selectedAddress,
       ignoreNetwork: false,
     });
+
     this.networkController.resetConnection();
 
     return selectedAddress;
@@ -5187,8 +5195,7 @@ export default class MetamaskController extends EventEmitter {
       internalAccounts: this.accountsController.listAccounts(),
       dappRequest,
       networkClientId:
-        dappRequest?.networkClientId ??
-        this.networkController.state.selectedNetworkClientId,
+        dappRequest?.networkClientId ?? this.#getGlobalNetworkClientId(),
       selectedAccount: this.accountsController.getAccountByAddress(
         transactionParams.from,
       ),
@@ -5196,7 +5203,7 @@ export default class MetamaskController extends EventEmitter {
       transactionOptions,
       transactionParams,
       userOperationController: this.userOperationController,
-      chainId: getCurrentChainId({ metamask: this.networkController.state }),
+      chainId: this.#getGlobalChainId(),
       ppomController: this.ppomController,
       securityAlertsEnabled:
         this.preferencesController.state?.securityAlertsEnabled,
@@ -6546,13 +6553,13 @@ export default class MetamaskController extends EventEmitter {
    * Returns the nonce that will be associated with a transaction once approved
    *
    * @param {string} address - The hex string address for the transaction
-   * @param networkClientId - The optional networkClientId to get the nonce lock with
+   * @param networkClientId - The networkClientId to get the nonce lock with
    * @returns {Promise<number>}
    */
   async getPendingNonce(address, networkClientId) {
     const { nonceDetails, releaseLock } = await this.txController.getNonceLock(
       address,
-      process.env.TRANSACTION_MULTICHAIN ? networkClientId : undefined,
+      networkClientId,
     );
 
     const pendingNonce = nonceDetails.params.highestSuggested;
@@ -6565,13 +6572,13 @@ export default class MetamaskController extends EventEmitter {
    * Returns the next nonce according to the nonce-tracker
    *
    * @param {string} address - The hex string address for the transaction
-   * @param networkClientId - The optional networkClientId to get the nonce lock with
+   * @param networkClientId - The networkClientId to get the nonce lock with
    * @returns {Promise<number>}
    */
   async getNextNonce(address, networkClientId) {
     const nonceLock = await this.txController.getNonceLock(
       address,
-      process.env.TRANSACTION_MULTICHAIN ? networkClientId : undefined,
+      networkClientId,
     );
     nonceLock.releaseLock();
     return nonceLock.nextNonce;
@@ -7378,4 +7385,28 @@ export default class MetamaskController extends EventEmitter {
 
     return useTokenDetection || petnamesEnabled || useTransactionSimulations;
   }
+
+  /**
+   * @deprecated Avoid new references to the global network.
+   * Will be removed once multi-chain support is fully implemented.
+   * @returns {string} The chain ID of the currently selected network.
+   */
+  #getGlobalChainId() {
+    const globalNetworkClientId = this.#getGlobalNetworkClientId();
+
+    const globalNetworkClient = this.networkController.getNetworkClientById(
+      globalNetworkClientId,
+    );
+
+    return globalNetworkClient.configuration.chainId;
+  }
+
+  /**
+   * @deprecated Avoid new references to the global network.
+   * Will be removed once multi-chain support is fully implemented.
+   * @returns {string} The network client ID of the currently selected network client.
+   */
+  #getGlobalNetworkClientId() {
+    return this.networkController.state.selectedNetworkClientId;
+  }
 }
diff --git a/app/scripts/metamask-controller.test.js b/app/scripts/metamask-controller.test.js
index a596277154eb..f7115f9364bd 100644
--- a/app/scripts/metamask-controller.test.js
+++ b/app/scripts/metamask-controller.test.js
@@ -21,7 +21,10 @@ import {
 } from '@metamask/keyring-api';
 import { ControllerMessenger } from '@metamask/base-controller';
 import { LoggingController, LogType } from '@metamask/logging-controller';
-import { TransactionController } from '@metamask/transaction-controller';
+import {
+  CHAIN_IDS,
+  TransactionController,
+} from '@metamask/transaction-controller';
 import {
   RatesController,
   TokenListController,
@@ -1206,7 +1209,10 @@ describe('MetaMaskController', () => {
         ).toHaveBeenCalledTimes(1);
         expect(
           metamaskController.txController.wipeTransactions,
-        ).toHaveBeenCalledWith(false, selectedAddressMock);
+        ).toHaveBeenCalledWith({
+          address: selectedAddressMock,
+          chainId: CHAIN_IDS.MAINNET,
+        });
         expect(
           metamaskController.smartTransactionsController.wipeSmartTransactions,
         ).toHaveBeenCalledWith({
diff --git a/builds.yml b/builds.yml
index 3963aeda93e5..7985f464b73f 100644
--- a/builds.yml
+++ b/builds.yml
@@ -276,8 +276,6 @@ env:
   - NODE_DEBUG: ''
   # Used by react-devtools-core
   - EDITOR_URL: ''
-  # Determines if feature flagged Multichain Transactions should be used
-  - TRANSACTION_MULTICHAIN: ''
   # Determines if Barad Dur features should be used
   - BARAD_DUR: ''
   # Determines if feature flagged Chain permissions
diff --git a/package.json b/package.json
index e7827cb6d92b..803853059703 100644
--- a/package.json
+++ b/package.json
@@ -347,7 +347,7 @@
     "@metamask/snaps-sdk": "^6.12.0",
     "@metamask/snaps-utils": "^8.6.0",
     "@metamask/solana-wallet-snap": "^0.1.9",
-    "@metamask/transaction-controller": "^40.1.0",
+    "@metamask/transaction-controller": "^41.0.0",
     "@metamask/user-operation-controller": "^16.0.0",
     "@metamask/utils": "^10.0.1",
     "@ngraveio/bc-ur": "^1.1.12",
diff --git a/ui/ducks/swaps/swaps.js b/ui/ducks/swaps/swaps.js
index bc1c675e4d21..e044fdf42b3f 100644
--- a/ui/ducks/swaps/swaps.js
+++ b/ui/ducks/swaps/swaps.js
@@ -589,6 +589,7 @@ export const fetchSwapsLivenessAndFeatureFlags = () => {
         await dispatch(fetchSmartTransactionsLiveness());
         const transactions = await getTransactions({
           searchCriteria: {
+            chainId,
             from: getSelectedInternalAccount(state)?.address,
           },
         });
diff --git a/ui/pages/confirmations/hooks/alerts/transactions/useFirstTimeInteractionAlert.test.ts b/ui/pages/confirmations/hooks/alerts/transactions/useFirstTimeInteractionAlert.test.ts
index 964b218e8501..6689d6610248 100644
--- a/ui/pages/confirmations/hooks/alerts/transactions/useFirstTimeInteractionAlert.test.ts
+++ b/ui/pages/confirmations/hooks/alerts/transactions/useFirstTimeInteractionAlert.test.ts
@@ -22,6 +22,7 @@ const CONFIRMATION_MOCK = genUnapprovedContractInteractionConfirmation({
 const TRANSACTION_META_MOCK = {
   id: TRANSACTION_ID_MOCK,
   chainId: '0x5',
+  networkClientId: 'testNetworkClientId',
   status: TransactionStatus.submitted,
   type: TransactionType.contractInteraction,
   txParams: {
diff --git a/ui/pages/confirmations/hooks/alerts/transactions/usePendingTransactionAlerts.test.ts b/ui/pages/confirmations/hooks/alerts/transactions/usePendingTransactionAlerts.test.ts
index 5d2c16a518e5..b9b3d12dc7d0 100644
--- a/ui/pages/confirmations/hooks/alerts/transactions/usePendingTransactionAlerts.test.ts
+++ b/ui/pages/confirmations/hooks/alerts/transactions/usePendingTransactionAlerts.test.ts
@@ -22,6 +22,7 @@ const CONFIRMATION_MOCK = genUnapprovedContractInteractionConfirmation({
 const TRANSACTION_META_MOCK = {
   id: TRANSACTION_ID_MOCK,
   chainId: '0x5',
+  networkClientId: 'testNetworkClientId',
   status: TransactionStatus.submitted,
   type: TransactionType.contractInteraction,
   txParams: {
diff --git a/ui/pages/confirmations/hooks/alerts/transactions/useResimulationAlert.test.ts b/ui/pages/confirmations/hooks/alerts/transactions/useResimulationAlert.test.ts
index 174b6ec0398a..49209f69df9c 100644
--- a/ui/pages/confirmations/hooks/alerts/transactions/useResimulationAlert.test.ts
+++ b/ui/pages/confirmations/hooks/alerts/transactions/useResimulationAlert.test.ts
@@ -22,6 +22,7 @@ const CONFIRMATION_MOCK = genUnapprovedContractInteractionConfirmation({
 const TRANSACTION_META_MOCK = {
   id: TRANSACTION_ID_MOCK,
   chainId: '0x5',
+  networkClientId: 'testNetworkClientId',
   status: TransactionStatus.submitted,
   type: TransactionType.contractInteraction,
   txParams: {
diff --git a/ui/pages/confirmations/hooks/alerts/transactions/useSigningOrSubmittingAlerts.test.ts b/ui/pages/confirmations/hooks/alerts/transactions/useSigningOrSubmittingAlerts.test.ts
index d1960827c0b1..08ed8f2aac7d 100644
--- a/ui/pages/confirmations/hooks/alerts/transactions/useSigningOrSubmittingAlerts.test.ts
+++ b/ui/pages/confirmations/hooks/alerts/transactions/useSigningOrSubmittingAlerts.test.ts
@@ -28,6 +28,7 @@ const CONFIRMATION_MOCK = genUnapprovedContractInteractionConfirmation({
 const TRANSACTION_META_MOCK = {
   id: TRANSACTION_ID_MOCK,
   chainId: '0x5',
+  networkClientId: 'testNetworkClientId',
   status: TransactionStatus.submitted,
   type: TransactionType.contractInteraction,
   txParams: {
diff --git a/ui/store/actions.ts b/ui/store/actions.ts
index 2ad3046e9040..9b402f476a7e 100644
--- a/ui/store/actions.ts
+++ b/ui/store/actions.ts
@@ -1129,7 +1129,6 @@ export function updateAndApproveTx(
 
 export async function getTransactions(
   filters: {
-    filterToCurrentNetwork?: boolean;
     searchCriteria?: Partial<TransactionMeta> & Partial<TransactionParams>;
   } = {},
 ): Promise<TransactionMeta[]> {
diff --git a/yarn.lock b/yarn.lock
index 91cc4445c553..c88156929c17 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6431,9 +6431,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/transaction-controller@npm:^40.1.0":
-  version: 40.1.0
-  resolution: "@metamask/transaction-controller@npm:40.1.0"
+"@metamask/transaction-controller@npm:^41.0.0":
+  version: 41.0.0
+  resolution: "@metamask/transaction-controller@npm:41.0.0"
   dependencies:
     "@ethereumjs/common": "npm:^3.2.0"
     "@ethereumjs/tx": "npm:^4.2.0"
@@ -6460,7 +6460,7 @@ __metadata:
     "@metamask/approval-controller": ^7.0.0
     "@metamask/gas-fee-controller": ^22.0.0
     "@metamask/network-controller": ^22.0.0
-  checksum: 10/1057af5b0da2d51e46e7568fc0e7fdbe6aed34a013cf56a5a35ad694cbedcb726a5823bbe70b980d1dc9560138acf9d82ac5f0e06f7d17e11b46abacd466dc42
+  checksum: 10/67a00b2eade35fc4e635a6bcbbcd847b3986b3bdcc9730ff2c8f81234df18ed11149203c13d6bad616e859f7e25879efab36b6dc4be05a4e747b4280ae2f300d
   languageName: node
   linkType: hard
 
@@ -26566,7 +26566,7 @@ __metadata:
     "@metamask/solana-wallet-snap": "npm:^0.1.9"
     "@metamask/test-bundler": "npm:^1.0.0"
     "@metamask/test-dapp": "npm:8.13.0"
-    "@metamask/transaction-controller": "npm:^40.1.0"
+    "@metamask/transaction-controller": "npm:^41.0.0"
     "@metamask/user-operation-controller": "npm:^16.0.0"
     "@metamask/utils": "npm:^10.0.1"
     "@ngraveio/bc-ur": "npm:^1.1.12"

From 7143c9643a11034a2a8b7f5f644f961be71b5e10 Mon Sep 17 00:00:00 2001
From: cryptodev-2s <109512101+cryptodev-2s@users.noreply.github.com>
Date: Fri, 29 Nov 2024 18:03:37 +0100
Subject: [PATCH 004/175] chore: remove unused `usedNetworks` state property
 from `AppStateController` (#28813)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<!--
Please submit this PR as a draft initially.
Do not mark it as "Ready for review" until the template has been
completely filled out, and PR status checks have passed at least once.
-->

## **Description**

Building on the work done to remove the network modal in
[PR](https://github.com/MetaMask/metamask-extension/pull/28765), this PR
finalizes the process by completely removing the unused `usedNetworks`
state property from `AppStateController`.

<!--
Write a short description of the changes included in this pull request,
also include relevant motivation and context. Have in mind the following
questions:
1. What is the reason for the change?
2. What is the improvement/solution?
-->

[![Open in GitHub
Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/28813?quickstart=1)

## **Related issues**

Fixes:

## **Manual testing steps**

## **Screenshots/Recordings**

<!-- If applicable, add screenshots and/or recordings to visualize the
before and after of your change. -->

### **Before**

<!-- [screenshots/recordings] -->

### **After**

<!-- [screenshots/recordings] -->

## **Pre-merge author checklist**

- [ ] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension Coding
Standards](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/CODING_GUIDELINES.md).
- [ ] I've completed the PR template to the best of my ability
- [ ] I’ve included tests if applicable
- [ ] I’ve documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [ ] I’ve applied the right labels on the PR (see [labeling
guidelines](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.

## **Pre-merge reviewer checklist**

- [ ] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed).
- [ ] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.
---
 app/scripts/constants/sentry-state.ts         |  1 -
 .../controllers/app-state-controller.test.ts  | 11 ----
 .../controllers/app-state-controller.ts       | 20 ------
 app/scripts/metamask-controller.js            |  2 -
 app/scripts/migrations/134.test.ts            | 62 +++++++++++++++++++
 app/scripts/migrations/134.ts                 | 41 ++++++++++++
 app/scripts/migrations/index.js               |  1 +
 test/data/mock-send-state.json                |  5 --
 test/e2e/default-fixture.js                   |  6 --
 test/e2e/fixture-builder.js                   |  6 --
 ...rs-after-init-opt-in-background-state.json |  1 -
 .../errors-after-init-opt-in-ui-state.json    |  1 -
 ...s-before-init-opt-in-background-state.json |  6 --
 .../errors-before-init-opt-in-ui-state.json   |  6 --
 .../data/integration-init-state.json          |  9 ---
 .../data/onboarding-completion-route.json     |  1 -
 .../ui/new-network-info/new-network-info.js   |  2 -
 ui/pages/routes/routes.component.test.js      |  8 ---
 ui/pages/routes/routes.container.js           |  2 -
 ui/selectors/selectors.js                     |  7 ---
 ui/store/actions.ts                           |  4 --
 21 files changed, 104 insertions(+), 98 deletions(-)
 create mode 100644 app/scripts/migrations/134.test.ts
 create mode 100644 app/scripts/migrations/134.ts

diff --git a/app/scripts/constants/sentry-state.ts b/app/scripts/constants/sentry-state.ts
index f18fb96d85fd..9823b2ada540 100644
--- a/app/scripts/constants/sentry-state.ts
+++ b/app/scripts/constants/sentry-state.ts
@@ -90,7 +90,6 @@ export const SENTRY_BACKGROUND_STATE = {
     termsOfUseLastAgreed: true,
     timeoutMinutes: true,
     trezorModel: true,
-    usedNetworks: true,
   },
   MultichainBalancesController: {
     balances: false,
diff --git a/app/scripts/controllers/app-state-controller.test.ts b/app/scripts/controllers/app-state-controller.test.ts
index 4bc1cb63e390..f830e0ee1cdf 100644
--- a/app/scripts/controllers/app-state-controller.test.ts
+++ b/app/scripts/controllers/app-state-controller.test.ts
@@ -374,17 +374,6 @@ describe('AppStateController', () => {
     });
   });
 
-  describe('setFirstTimeUsedNetwork', () => {
-    it('updates the array of the first time used networks', () => {
-      const chainId = '0x1';
-
-      appStateController.setFirstTimeUsedNetwork(chainId);
-      expect(appStateController.store.getState().usedNetworks[chainId]).toBe(
-        true,
-      );
-    });
-  });
-
   describe('setLastInteractedConfirmationInfo', () => {
     it('sets information about last confirmation user has interacted with', () => {
       const lastInteractedConfirmationInfo = {
diff --git a/app/scripts/controllers/app-state-controller.ts b/app/scripts/controllers/app-state-controller.ts
index 605f307ec0e4..c506dc329e94 100644
--- a/app/scripts/controllers/app-state-controller.ts
+++ b/app/scripts/controllers/app-state-controller.ts
@@ -62,7 +62,6 @@ export type AppStateControllerState = {
   hadAdvancedGasFeesSetPriorToMigration92_3: boolean;
   qrHardware: Json;
   nftsDropdownState: Json;
-  usedNetworks: Record<string, boolean>;
   surveyLinkLastClickedOrClosed: number | null;
   signatureSecurityAlertResponses: Record<string, SecurityAlertResponse>;
   // States used for displaying the changed network toast
@@ -138,7 +137,6 @@ type AppStateControllerInitState = Partial<
     AppStateControllerState,
     | 'qrHardware'
     | 'nftsDropdownState'
-    | 'usedNetworks'
     | 'surveyLinkLastClickedOrClosed'
     | 'signatureSecurityAlertResponses'
     | 'switchedNetworkDetails'
@@ -184,11 +182,6 @@ const getDefaultAppStateControllerState = (
   ...initState,
   qrHardware: {},
   nftsDropdownState: {},
-  usedNetworks: {
-    '0x1': true,
-    '0x5': true,
-    '0x539': true,
-  },
   surveyLinkLastClickedOrClosed: null,
   signatureSecurityAlertResponses: {},
   switchedNetworkDetails: null,
@@ -704,19 +697,6 @@ export class AppStateController extends EventEmitter {
     });
   }
 
-  /**
-   * Updates the array of the first time used networks
-   *
-   * @param chainId
-   */
-  setFirstTimeUsedNetwork(chainId: string): void {
-    const currentState = this.store.getState();
-    const { usedNetworks } = currentState;
-    usedNetworks[chainId] = true;
-
-    this.store.updateState({ usedNetworks });
-  }
-
   ///: BEGIN:ONLY_INCLUDE_IF(build-mmi)
   /**
    * Set the interactive replacement token with a url and the old refresh token
diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
index a1cbabb9bcbe..1eaf354b4caf 100644
--- a/app/scripts/metamask-controller.js
+++ b/app/scripts/metamask-controller.js
@@ -3705,8 +3705,6 @@ export default class MetamaskController extends EventEmitter {
         appStateController.setShowNetworkBanner.bind(appStateController),
       updateNftDropDownState:
         appStateController.updateNftDropDownState.bind(appStateController),
-      setFirstTimeUsedNetwork:
-        appStateController.setFirstTimeUsedNetwork.bind(appStateController),
       setSwitchedNetworkDetails:
         appStateController.setSwitchedNetworkDetails.bind(appStateController),
       clearSwitchedNetworkDetails:
diff --git a/app/scripts/migrations/134.test.ts b/app/scripts/migrations/134.test.ts
new file mode 100644
index 000000000000..9b3d31db017f
--- /dev/null
+++ b/app/scripts/migrations/134.test.ts
@@ -0,0 +1,62 @@
+import { cloneDeep } from 'lodash';
+import { migrate, version } from './134';
+
+const oldVersion = 133;
+
+describe(`migration #${version}`, () => {
+  it('updates the version metadata', async () => {
+    const oldStorage = {
+      meta: { version: oldVersion },
+      data: {},
+    };
+
+    const newStorage = await migrate(oldStorage);
+
+    expect(newStorage.meta).toStrictEqual({ version });
+  });
+
+  it('Does nothing if `usedNetworks` is not in the `AppStateController` state', async () => {
+    const oldState = {
+      AppStateController: {
+        timeoutMinutes: 0,
+      },
+    };
+
+    const transformedState = await migrate({
+      meta: { version: oldVersion },
+      data: cloneDeep(oldState),
+    });
+
+    expect(transformedState.data).toStrictEqual(oldState);
+  });
+
+  it('Removes `usedNetworks` from the `AppStateController` state', async () => {
+    const oldState: {
+      AppStateController: {
+        timeoutMinutes: number;
+        usedNetworks?: Record<string, boolean>;
+      };
+    } = {
+      AppStateController: {
+        timeoutMinutes: 0,
+        usedNetworks: {
+          '0x1': true,
+          '0x5': true,
+          '0x539': true,
+        },
+      },
+    };
+    const expectedState = {
+      AppStateController: {
+        timeoutMinutes: 0,
+      },
+    };
+
+    const transformedState = await migrate({
+      meta: { version: oldVersion },
+      data: cloneDeep(oldState),
+    });
+
+    expect(transformedState.data).toStrictEqual(expectedState);
+  });
+});
diff --git a/app/scripts/migrations/134.ts b/app/scripts/migrations/134.ts
new file mode 100644
index 000000000000..e11b2abd9625
--- /dev/null
+++ b/app/scripts/migrations/134.ts
@@ -0,0 +1,41 @@
+import { hasProperty, isObject } from '@metamask/utils';
+import { cloneDeep } from 'lodash';
+
+type VersionedData = {
+  meta: { version: number };
+  data: Record<string, unknown>;
+};
+
+export const version = 134;
+
+/**
+ * This migration removes `usedNetworks` from `AppStateController` state.
+ *
+ * @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 async function migrate(
+  originalVersionedData: VersionedData,
+): Promise<VersionedData> {
+  const versionedData = cloneDeep(originalVersionedData);
+  versionedData.meta.version = version;
+  transformState(versionedData.data);
+  return versionedData;
+}
+
+function transformState(
+  state: Record<string, unknown>,
+): Record<string, unknown> {
+  if (
+    hasProperty(state, 'AppStateController') &&
+    isObject(state.AppStateController) &&
+    hasProperty(state.AppStateController, 'usedNetworks')
+  ) {
+    console.log('Removing usedNetworks from AppStateController');
+    delete state.AppStateController.usedNetworks;
+  }
+  return state;
+}
diff --git a/app/scripts/migrations/index.js b/app/scripts/migrations/index.js
index e95a9bf7a9da..887732ad9dbc 100644
--- a/app/scripts/migrations/index.js
+++ b/app/scripts/migrations/index.js
@@ -154,6 +154,7 @@ const migrations = [
   require('./131'),
   require('./132'),
   require('./133'),
+  require('./134'),
 ];
 
 export default migrations;
diff --git a/test/data/mock-send-state.json b/test/data/mock-send-state.json
index 73468aca6171..f9c602808719 100644
--- a/test/data/mock-send-state.json
+++ b/test/data/mock-send-state.json
@@ -140,11 +140,6 @@
     "isAccountMenuOpen": false,
     "isUnlocked": true,
     "completedOnboarding": true,
-    "usedNetworks": {
-      "0x1": true,
-      "0x5": true,
-      "0x539": true
-    },
     "showTestnetMessageInDropdown": true,
     "alertEnabledness": {
       "unconnectedAccount": true
diff --git a/test/e2e/default-fixture.js b/test/e2e/default-fixture.js
index c2fba9d63424..a6845e40ec4c 100644
--- a/test/e2e/default-fixture.js
+++ b/test/e2e/default-fixture.js
@@ -115,12 +115,6 @@ function defaultFixture(inputChainId = CHAIN_IDS.LOCALHOST) {
         trezorModel: null,
         newPrivacyPolicyToastClickedOrClosed: true,
         newPrivacyPolicyToastShownDate: Date.now(),
-        usedNetworks: {
-          [CHAIN_IDS.MAINNET]: true,
-          [CHAIN_IDS.LINEA_MAINNET]: true,
-          [CHAIN_IDS.GOERLI]: true,
-          [CHAIN_IDS.LOCALHOST]: true,
-        },
         snapsInstallPrivacyWarningShown: true,
       },
       BridgeController: {
diff --git a/test/e2e/fixture-builder.js b/test/e2e/fixture-builder.js
index 844c4766db3e..94e515d46ff6 100644
--- a/test/e2e/fixture-builder.js
+++ b/test/e2e/fixture-builder.js
@@ -40,12 +40,6 @@ function onboardingFixture() {
           '__FIXTURE_SUBSTITUTION__currentDateInMilliseconds',
         showTestnetMessageInDropdown: true,
         trezorModel: null,
-        usedNetworks: {
-          [CHAIN_IDS.MAINNET]: true,
-          [CHAIN_IDS.LINEA_MAINNET]: true,
-          [CHAIN_IDS.GOERLI]: true,
-          [CHAIN_IDS.LOCALHOST]: true,
-        },
       },
       NetworkController: {
         ...mockNetworkStateOld({
diff --git a/test/e2e/tests/metrics/state-snapshots/errors-after-init-opt-in-background-state.json b/test/e2e/tests/metrics/state-snapshots/errors-after-init-opt-in-background-state.json
index 1df430082f3e..8351032761a7 100644
--- a/test/e2e/tests/metrics/state-snapshots/errors-after-init-opt-in-background-state.json
+++ b/test/e2e/tests/metrics/state-snapshots/errors-after-init-opt-in-background-state.json
@@ -45,7 +45,6 @@
     "nftsDropdownState": {},
     "termsOfUseLastAgreed": "number",
     "qrHardware": {},
-    "usedNetworks": { "0x1": true, "0x5": true, "0x539": true },
     "snapsInstallPrivacyWarningShown": true,
     "surveyLinkLastClickedOrClosed": "object",
     "signatureSecurityAlertResponses": "object",
diff --git a/test/e2e/tests/metrics/state-snapshots/errors-after-init-opt-in-ui-state.json b/test/e2e/tests/metrics/state-snapshots/errors-after-init-opt-in-ui-state.json
index 9988234cac2e..5d79ca5964b8 100644
--- a/test/e2e/tests/metrics/state-snapshots/errors-after-init-opt-in-ui-state.json
+++ b/test/e2e/tests/metrics/state-snapshots/errors-after-init-opt-in-ui-state.json
@@ -95,7 +95,6 @@
     "nftsDropdownState": {},
     "termsOfUseLastAgreed": "number",
     "qrHardware": {},
-    "usedNetworks": { "0x1": true, "0x5": true, "0x539": true },
     "snapsInstallPrivacyWarningShown": true,
     "surveyLinkLastClickedOrClosed": "object",
     "signatureSecurityAlertResponses": "object",
diff --git a/test/e2e/tests/metrics/state-snapshots/errors-before-init-opt-in-background-state.json b/test/e2e/tests/metrics/state-snapshots/errors-before-init-opt-in-background-state.json
index 07b292d33b3b..1a1009c02c23 100644
--- a/test/e2e/tests/metrics/state-snapshots/errors-before-init-opt-in-background-state.json
+++ b/test/e2e/tests/metrics/state-snapshots/errors-before-init-opt-in-background-state.json
@@ -42,12 +42,6 @@
       "trezorModel": null,
       "newPrivacyPolicyToastClickedOrClosed": "boolean",
       "newPrivacyPolicyToastShownDate": "number",
-      "usedNetworks": {
-        "0x1": true,
-        "0xe708": true,
-        "0x5": true,
-        "0x539": true
-      },
       "snapsInstallPrivacyWarningShown": true
     },
     "CurrencyController": {
diff --git a/test/e2e/tests/metrics/state-snapshots/errors-before-init-opt-in-ui-state.json b/test/e2e/tests/metrics/state-snapshots/errors-before-init-opt-in-ui-state.json
index f997b89bcd28..e7fe6fd2a641 100644
--- a/test/e2e/tests/metrics/state-snapshots/errors-before-init-opt-in-ui-state.json
+++ b/test/e2e/tests/metrics/state-snapshots/errors-before-init-opt-in-ui-state.json
@@ -42,12 +42,6 @@
       "trezorModel": null,
       "newPrivacyPolicyToastClickedOrClosed": "boolean",
       "newPrivacyPolicyToastShownDate": "number",
-      "usedNetworks": {
-        "0x1": true,
-        "0xe708": true,
-        "0x5": true,
-        "0x539": true
-      },
       "snapsInstallPrivacyWarningShown": true
     },
     "BridgeController": {
diff --git a/test/integration/data/integration-init-state.json b/test/integration/data/integration-init-state.json
index 0c3853035080..ac58306adca8 100644
--- a/test/integration/data/integration-init-state.json
+++ b/test/integration/data/integration-init-state.json
@@ -2052,15 +2052,6 @@
   "useSafeChainsListValidation": true,
   "useTokenDetection": false,
   "useTransactionSimulations": true,
-  "usedNetworks": {
-    "0xaa36a7": {
-      "rpcUrl": "https://sepolia.infura.io/v3/dummy_key",
-      "chainId": "0xaa36a7",
-      "nickname": "Sepolia Test Network",
-      "ticker": "ETH",
-      "blockExplorerUrl": "https://sepolia.etherscan.io"
-    }
-  },
   "userOperations": {},
   "versionFileETag": "W/\"598946a37f16c5b882a0bebbadf4509f\"",
   "versionInfo": [],
diff --git a/test/integration/data/onboarding-completion-route.json b/test/integration/data/onboarding-completion-route.json
index b2c19536a138..33d0680ab8a0 100644
--- a/test/integration/data/onboarding-completion-route.json
+++ b/test/integration/data/onboarding-completion-route.json
@@ -463,7 +463,6 @@
   "useSafeChainsListValidation": true,
   "useTokenDetection": true,
   "useTransactionSimulations": true,
-  "usedNetworks": { "0x1": true, "0x5": true, "0x539": true },
   "userOperations": {},
   "versionFileETag": "",
   "versionInfo": [],
diff --git a/ui/components/ui/new-network-info/new-network-info.js b/ui/components/ui/new-network-info/new-network-info.js
index 15a11918afc1..9d4df0ec63ec 100644
--- a/ui/components/ui/new-network-info/new-network-info.js
+++ b/ui/components/ui/new-network-info/new-network-info.js
@@ -24,7 +24,6 @@ import {
   getParticipateInMetaMetrics,
   getDataCollectionForMarketing,
 } from '../../../selectors';
-import { setFirstTimeUsedNetwork } from '../../../store/actions';
 import {
   PickerNetwork,
   Text,
@@ -56,7 +55,6 @@ export default function NewNetworkInfo() {
 
   const onCloseClick = () => {
     setShowPopup(false);
-    setFirstTimeUsedNetwork(providerConfig.chainId);
   };
 
   const checkTokenDetection = useCallback(async () => {
diff --git a/ui/pages/routes/routes.component.test.js b/ui/pages/routes/routes.component.test.js
index 14490ad6e146..e661099e1aa2 100644
--- a/ui/pages/routes/routes.component.test.js
+++ b/ui/pages/routes/routes.component.test.js
@@ -225,12 +225,6 @@ describe('Routes Component', () => {
             },
             selectedAccount: account.id,
           },
-          usedNetworks: {
-            '0x1': true,
-            '0x5': true,
-            '0x539': true,
-            [mockNewlyAddedNetwork.chainId]: false,
-          },
           networkConfigurationsByChainId: {
             ...mockState.metamask.networkConfigurationsByChainId,
             [mockNewlyAddedNetwork.chainId]: mockNewlyAddedNetwork,
@@ -312,7 +306,6 @@ describe('toast display', () => {
       announcements: {},
       approvalFlows: [],
       completedOnboarding: true,
-      usedNetworks: [],
       pendingApprovals: {},
       pendingApprovalCount: 0,
       preferences: {
@@ -341,7 +334,6 @@ describe('toast display', () => {
       announcements: {},
       approvalFlows: [],
       completedOnboarding: true,
-      usedNetworks: [],
       pendingApprovals: {},
       pendingApprovalCount: 0,
       swapsState: { swapsFeatureIsLive: true },
diff --git a/ui/pages/routes/routes.container.js b/ui/pages/routes/routes.container.js
index 28f4291ee37c..0342fc2e15d1 100644
--- a/ui/pages/routes/routes.container.js
+++ b/ui/pages/routes/routes.container.js
@@ -8,7 +8,6 @@ import {
 } from '../../../shared/modules/selectors/networks';
 import {
   getAllAccountsOnNetworkAreEmpty,
-  getIsNetworkUsed,
   getNetworkIdentifier,
   getPreferences,
   getTheme,
@@ -95,7 +94,6 @@ function mapStateToProps(state) {
     providerType: getProviderConfig(state).type,
     theme: getTheme(state),
     sendStage: getSendStage(state),
-    isNetworkUsed: getIsNetworkUsed(state),
     allAccountsOnNetworkAreEmpty: getAllAccountsOnNetworkAreEmpty(state),
     isTestNet: getIsTestnet(state),
     showExtensionInFullSizeView: getShowExtensionInFullSizeView(state),
diff --git a/ui/selectors/selectors.js b/ui/selectors/selectors.js
index 2baaa1a0c931..deb18c1c5309 100644
--- a/ui/selectors/selectors.js
+++ b/ui/selectors/selectors.js
@@ -2726,13 +2726,6 @@ export function getBlockExplorerLinkText(
   return blockExplorerLinkText;
 }
 
-export function getIsNetworkUsed(state) {
-  const chainId = getCurrentChainId(state);
-  const { usedNetworks } = state.metamask;
-
-  return Boolean(usedNetworks[chainId]);
-}
-
 export function getAllAccountsOnNetworkAreEmpty(state) {
   const balances = getMetaMaskCachedBalances(state) ?? {};
   const hasNoNativeFundsOnAnyAccounts = Object.values(balances).every(
diff --git a/ui/store/actions.ts b/ui/store/actions.ts
index 9b402f476a7e..01b8b9e458d9 100644
--- a/ui/store/actions.ts
+++ b/ui/store/actions.ts
@@ -5201,10 +5201,6 @@ export function setUseTransactionSimulations(val: boolean): void {
   }
 }
 
-export function setFirstTimeUsedNetwork(chainId: string) {
-  return submitRequestToBackground('setFirstTimeUsedNetwork', [chainId]);
-}
-
 // QR Hardware Wallets
 export async function submitQRHardwareCryptoHDKey(cbor: Hex) {
   await submitRequestToBackground('submitQRHardwareCryptoHDKey', [cbor]);

From 5ab288b8587df64bd7a9c0ede2d0d085dfd713ae Mon Sep 17 00:00:00 2001
From: Salim TOUBAL <salim.toubal@outlook.com>
Date: Mon, 2 Dec 2024 10:38:42 +0100
Subject: [PATCH 005/175] fix: fix asset-list e2e test (#28822)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<!--
Please submit this PR as a draft initially.
Do not mark it as "Ready for review" until the template has been
completely filled out, and PR status checks have passed at least once.
-->

## **Description**
fix e2e test for the unified list
<!--
Write a short description of the changes included in this pull request,
also include relevant motivation and context. Have in mind the following
questions:
1. What is the reason for the change?
2. What is the improvement/solution?
-->

[![Open in GitHub
Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/28822?quickstart=1)

## **Related issues**

Fixes:

## **Manual testing steps**

1. run `PORTFOLIO_VIEW=1 yarn build:test`
2. Run `PORTFOLIO_VIEW=1 yarn test:e2e:single --browser=chrome
test/e2e/tests/multichain/asset-list.spec.ts --debug --leave-running`

## **Screenshots/Recordings**

<!-- If applicable, add screenshots and/or recordings to visualize the
before and after of your change. -->

### **Before**

<!-- [screenshots/recordings] -->

### **After**

<!-- [screenshots/recordings] -->

## **Pre-merge author checklist**

- [ ] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension Coding
Standards](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/CODING_GUIDELINES.md).
- [ ] I've completed the PR template to the best of my ability
- [ ] I’ve included tests if applicable
- [ ] I’ve documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [ ] I’ve applied the right labels on the PR (see [labeling
guidelines](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.

## **Pre-merge reviewer checklist**

- [ ] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed).
- [ ] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.
---
 test/e2e/fixture-builder.js                  | 16 ++++++++++++
 test/e2e/tests/multichain/asset-list.spec.ts | 27 ++++++++++----------
 2 files changed, 30 insertions(+), 13 deletions(-)

diff --git a/test/e2e/fixture-builder.js b/test/e2e/fixture-builder.js
index 94e515d46ff6..7269bda82153 100644
--- a/test/e2e/fixture-builder.js
+++ b/test/e2e/fixture-builder.js
@@ -299,6 +299,22 @@ class FixtureBuilder {
     });
   }
 
+  withNetworkControllerOnPolygon() {
+    return this.withNetworkController({
+      networkConfigurations: {
+        networkConfigurationId: {
+          chainId: CHAIN_IDS.POLYGON,
+          nickname: 'Polygon Mainnet',
+          rpcPrefs: {},
+          rpcUrl: 'https://mainnet.infura.io',
+          ticker: 'ETH',
+          networkConfigurationId: 'networkConfigurationId',
+          id: 'networkConfigurationId',
+        },
+      },
+    });
+  }
+
   withNetworkControllerDoubleGanache() {
     const ganacheNetworks = mockNetworkStateOld({
       id: '76e9cd59-d8e2-47e7-b369-9c205ccb602c',
diff --git a/test/e2e/tests/multichain/asset-list.spec.ts b/test/e2e/tests/multichain/asset-list.spec.ts
index 5b210730ef36..d7120a1fcace 100644
--- a/test/e2e/tests/multichain/asset-list.spec.ts
+++ b/test/e2e/tests/multichain/asset-list.spec.ts
@@ -13,14 +13,15 @@ import AssetListPage from '../../page-objects/pages/asset-list';
 
 const NETWORK_NAME_MAINNET = 'Ethereum Mainnet';
 const LINEA_NAME_MAINNET = 'Linea Mainnet';
-const LOCALHOST = 'Localhost 8545';
+const POLYGON_NAME_MAINNET = 'Polygon';
 const BALANCE_AMOUNT = '24.9956';
 
-function buildFixtures(title: string) {
+function buildFixtures(title: string, chainId: number = 1337) {
   return {
     fixtures: new FixtureBuilder()
       .withPermissionControllerConnectedToTestDapp()
-      .withTokensControllerERC20()
+      .withNetworkControllerOnPolygon()
+      .withTokensControllerERC20({ chainId })
       .build(),
     ganacheOptions: defaultGanacheOptions,
     smartContract: SMART_CONTRACTS.HST,
@@ -49,7 +50,7 @@ describe('Multichain Asset List', function (this: Suite) {
         const assetListPage = new AssetListPage(driver);
         await headerNavbar.clickSwitchNetworkDropDown();
         await selectNetworkDialog.selectNetworkName(NETWORK_NAME_MAINNET);
-        await assetListPage.waitUntilAssetListHasItems(2);
+        await assetListPage.waitUntilAssetListHasItems(3);
         await assetListPage.openNetworksFilter();
         await assetListPage.clickCurrentNetworkOption();
         await headerNavbar.clickSwitchNetworkDropDown();
@@ -79,7 +80,7 @@ describe('Multichain Asset List', function (this: Suite) {
         const assetListPage = new AssetListPage(driver);
         await headerNavbar.clickSwitchNetworkDropDown();
         await selectNetworkDialog.selectNetworkName(NETWORK_NAME_MAINNET);
-        await assetListPage.waitUntilAssetListHasItems(2);
+        await assetListPage.waitUntilAssetListHasItems(3);
         await driver.clickElement('.multichain-token-list-item');
         const coinOverviewElement = await driver.findElement(
           '[data-testid="coin-overview-buy"]',
@@ -97,7 +98,7 @@ describe('Multichain Asset List', function (this: Suite) {
   });
   it('switches networks when clicking on send for a token on another network', async function () {
     await withFixtures(
-      buildFixtures(this.test?.fullTitle() as string),
+      buildFixtures(this.test?.fullTitle() as string, 137),
       async ({
         driver,
         ganacheServer,
@@ -112,10 +113,10 @@ describe('Multichain Asset List', function (this: Suite) {
         await headerNavbar.clickSwitchNetworkDropDown();
         await selectNetworkDialog.selectNetworkName(NETWORK_NAME_MAINNET);
         const sendPage = new SendTokenPage(driver);
-        await assetListPage.waitUntilAssetListHasItems(2);
+        await assetListPage.waitUntilAssetListHasItems(4);
         await assetListPage.clickOnAsset('TST');
         await driver.clickElement('[data-testid="eth-overview-send"]');
-        await sendPage.check_networkChange(LOCALHOST);
+        await sendPage.check_networkChange(POLYGON_NAME_MAINNET);
         await sendPage.check_pageIsLoaded();
         await sendPage.fillRecipient(
           '0x2f318C334780961FB129D2a6c30D0763d9a5C970',
@@ -132,7 +133,7 @@ describe('Multichain Asset List', function (this: Suite) {
   });
   it('switches networks when clicking on swap for a token on another network', async function () {
     await withFixtures(
-      buildFixtures(this.test?.fullTitle() as string),
+      buildFixtures(this.test?.fullTitle() as string, 137),
       async ({
         driver,
         ganacheServer,
@@ -146,14 +147,14 @@ describe('Multichain Asset List', function (this: Suite) {
         const assetListPage = new AssetListPage(driver);
         await headerNavbar.clickSwitchNetworkDropDown();
         await selectNetworkDialog.selectNetworkName(NETWORK_NAME_MAINNET);
-        await assetListPage.waitUntilAssetListHasItems(2);
+        await assetListPage.waitUntilAssetListHasItems(4);
         await assetListPage.clickOnAsset('TST');
         await driver.clickElement('.mm-box > button:nth-of-type(3)');
         const toastTextElement = await driver.findElement('.toast-text');
         const toastText = await toastTextElement.getText();
         assert.equal(
           toastText,
-          `You're now using ${LOCALHOST}`,
+          `You're now using ${POLYGON_NAME_MAINNET}`,
           'Toast text is correct',
         );
       },
@@ -175,7 +176,7 @@ describe('Multichain Asset List', function (this: Suite) {
         const selectNetworkDialog = new SelectNetwork(driver);
         await headerNavbar.clickSwitchNetworkDropDown();
         await selectNetworkDialog.selectNetworkName(LINEA_NAME_MAINNET);
-        await assetListPage.waitUntilAssetListHasItems(2);
+        await assetListPage.waitUntilAssetListHasItems(3);
 
         await assetListPage.clickOnAsset('Ethereum');
 
@@ -187,7 +188,7 @@ describe('Multichain Asset List', function (this: Suite) {
         const toastText = await toastTextElement.getText();
         assert.equal(
           toastText,
-          `You're now using ${LOCALHOST}`,
+          `You're now using Ethereum Mainnet`,
           'Toast text is correct',
         );
         const balanceMessageElement = await driver.findElement(

From 3ad954a2f6e0def316270b1ded679f02f25a9867 Mon Sep 17 00:00:00 2001
From: seaona <54408225+seaona@users.noreply.github.com>
Date: Mon, 2 Dec 2024 14:36:33 +0100
Subject: [PATCH 006/175] chore: accept regex expression for rerun-from-failed
 trigger from circle ci UI, so we can add multiple triggers following the name
 convention (#28804)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<!--
Please submit this PR as a draft initially.
Do not mark it as "Ready for review" until the template has been
completely filled out, and PR status checks have passed at least once.
-->

## **Description**
In circle ci UI, there is no way to schedule a trigger for different
times in a day. Instead you can only scheduled a trigger to run once a
day (or multiple times within that scheduled hour).
Given that we want to trigger the rerun from failed job, different times
within a day, we are now accepting a regex in the trigger name, so we
can add as many triggers as we want in the UI, following that pattern
(see screenshot below).

[![Open in GitHub
Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/28804?quickstart=1)

## **Related issues**

Fixes:

## **Manual testing steps**

1. We can only test this from the UI side, once the PR is merged - I
already created different triggers on circle ci

## **Screenshots/Recordings**

![Screenshot from 2024-11-29
11-10-44](https://github.com/user-attachments/assets/0c71c6f9-8673-42d2-a5fd-6d7790be95ac)


## **Pre-merge author checklist**

- [x] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension Coding
Standards](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/CODING_GUIDELINES.md).
- [x] I've completed the PR template to the best of my ability
- [x] I’ve included tests if applicable
- [x] I’ve documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [x] I’ve applied the right labels on the PR (see [labeling
guidelines](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.

## **Pre-merge reviewer checklist**

- [ ] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed).
- [ ] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.
---
 .circleci/config.yml | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 3178a687a617..facf47afbb9b 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -107,7 +107,9 @@ workflows:
           - matches:
               pattern: /^l10n_crowdin_action$/
               value: << pipeline.git.branch >>
-          - equal: [rerun-from-failed, << pipeline.schedule.name >>]
+          - matches:
+              pattern: /^rerun-from-failed.*/
+              value: << pipeline.schedule.name >>
     jobs:
       - create_release_pull_request:
           <<: *rc_branch_only
@@ -361,7 +363,9 @@ workflows:
 
   rerun-from-failed:
     when:
-      equal: [rerun-from-failed, << pipeline.schedule.name >>]
+      matches:
+        pattern: /^rerun-from-failed.*/
+        value: << pipeline.schedule.name >>
     jobs:
       - prep-deps
       - rerun-workflows-from-failed:

From b6bf219d1a5c883ccf69705f211aacc543e8fd48 Mon Sep 17 00:00:00 2001
From: Mark Stacey <markjstacey@gmail.com>
Date: Mon, 2 Dec 2024 10:30:46 -0330
Subject: [PATCH 007/175] chore: Rename `develop` to `main` (#28821)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## **Description**

Rename references to the main branch. It will be called `main` rather
than `develop`.

[![Open in GitHub
Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/28821?quickstart=1)

## **Related issues**

Relates to https://github.com/MetaMask/MetaMask-planning/issues/3677/

## **Manual testing steps**

N/A

## **Screenshots/Recordings**

N/A

## **Pre-merge author checklist**

- [x] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension Coding
Standards](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/CODING_GUIDELINES.md).
- [x] I've completed the PR template to the best of my ability
- [x] I’ve included tests if applicable
- [x] I’ve documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [x] I’ve applied the right labels on the PR (see [labeling
guidelines](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.

## **Pre-merge reviewer checklist**

- [ ] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed).
- [ ] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.

---------

Co-authored-by: Dan J Miller <danjm.com@gmail.com>
---
 .circleci/config.yml                          | 24 +++++-----
 .circleci/scripts/bundle-stats-commit.sh      |  4 +-
 .circleci/scripts/check_mmi_trigger.sh        |  2 +-
 .circleci/scripts/git-diff-develop.ts         |  2 +-
 .../scripts/rerun-ci-workflow-from-failed.ts  |  8 ++--
 .devcontainer/download-builds.ts              |  2 +-
 .github/CONTRIBUTING.md                       |  6 +--
 .github/guidelines/LABELING_GUIDELINES.md     |  2 +-
 .github/pull-request-template.md              |  4 +-
 .../scripts/check-pr-has-required-labels.ts   |  2 +-
 .../scripts/check-template-and-add-labels.ts  |  8 ++--
 .../workflows/add-mmi-reviewer-and-notify.yml |  4 +-
 .github/workflows/add-release-label.yml       |  2 +-
 .github/workflows/check-pr-labels.yml         |  2 +-
 .github/workflows/codeql-analysis.yml         |  4 +-
 .github/workflows/codespaces.yml              |  2 +-
 .github/workflows/crowdin-action.yml          |  2 +-
 .github/workflows/main.yml                    |  2 +-
 .github/workflows/security-code-scanner.yml   |  4 +-
 .github/workflows/update-coverage.yml         |  2 +-
 .../validate-conventional-commits.yml         |  2 +-
 README.md                                     |  2 +-
 app/scripts/lib/setupSentry.js                |  4 +-
 development/build/README.md                   |  4 +-
 development/build/utils.js                    |  2 +-
 development/fitness-functions/rules/index.ts  |  2 +-
 development/highlights/index.js               |  6 +--
 development/master-sync.js                    | 14 +++---
 docs/QA_MIGRATIONS_GUIDE.md                   |  2 +-
 .../README.md                                 |  8 ++--
 .../confirmation-page-structure/README.md     | 14 +++---
 .../confirmation-pages-routing/README.md      | 10 ++--
 .../confirmation-state-management/README.md   | 16 +++----
 .../signature-request/README.md               | 46 +++++++++----------
 docs/publishing.md                            |  8 ++--
 test/e2e/flask/README.md                      |  2 +-
 .../upgrade-testing/upgrade-testing.md        |  2 +-
 ui/components/ui/box/README.mdx               | 26 +++++------
 ui/hooks/useTransactionInsights.js            |  2 +-
 39 files changed, 130 insertions(+), 130 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index facf47afbb9b..83c5643400a4 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -45,11 +45,11 @@ rc_branch_only: &rc_branch_only
       only:
         - /^Version-v(\d+)[.](\d+)[.](\d+)/
 
-develop_master_rc_only: &develop_master_rc_only
+main_master_rc_only: &main_master_rc_only
   filters:
     branches:
       only:
-        - develop
+        - main
         - master
         - /^Version-v(\d+)[.](\d+)[.](\d+)/
 
@@ -174,7 +174,7 @@ workflows:
           requires:
             - prep-deps
       - prep-build-test-flask-mv2:
-          <<: *develop_master_rc_only
+          <<: *main_master_rc_only
           requires:
             - prep-deps
       - prep-build-test-mmi:
@@ -202,7 +202,7 @@ workflows:
           requires:
             - prep-deps
       - test-e2e-chrome-webpack:
-          <<: *develop_master_rc_only
+          <<: *main_master_rc_only
           requires:
             - prep-build-test-webpack
             - get-changed-files-with-git-diff
@@ -211,7 +211,7 @@ workflows:
             - prep-build-test
             - get-changed-files-with-git-diff
       - test-e2e-firefox:
-          <<: *develop_master_rc_only
+          <<: *main_master_rc_only
           requires:
             - prep-build-test-mv2
             - get-changed-files-with-git-diff
@@ -231,7 +231,7 @@ workflows:
             - prep-build-test-flask
             - get-changed-files-with-git-diff
       - test-e2e-firefox-flask:
-          <<: *develop_master_rc_only
+          <<: *main_master_rc_only
           requires:
             - prep-build-test-flask-mv2
       - test-e2e-chrome-mmi:
@@ -252,7 +252,7 @@ workflows:
           filters:
             branches:
               only:
-                - develop
+                - main
                 - /^Version-v(\d+)[.](\d+)[.](\d+)/
           requires:
             - prep-build
@@ -351,13 +351,13 @@ workflows:
       - job-publish-storybook:
           filters:
             branches:
-              only: develop
+              only: main
           requires:
             - prep-build-storybook
       - job-publish-ts-migration-dashboard:
           filters:
             branches:
-              only: develop
+              only: main
           requires:
             - prep-build-ts-migration-dashboard
 
@@ -371,7 +371,7 @@ workflows:
       - rerun-workflows-from-failed:
           filters:
             branches:
-              only: develop
+              only: main
           requires:
             - prep-deps
 
@@ -481,7 +481,7 @@ jobs:
 
   # This job is used for the e2e quality gate.
   # It must be run before any job which uses the run-all.js script.
-  # The job is skipped in develop, master or RC branches.
+  # The job is skipped in main, master or RC branches.
   get-changed-files-with-git-diff:
     executor: node-browsers-small
     steps:
@@ -1339,7 +1339,7 @@ jobs:
           template: basic_fail_1
           channel: C01LUJL3T98
       - slack/notify:
-          branch_pattern: develop
+          branch_pattern: main
           event: fail
           mentions: <@antonio.regadas>, @ramon.acitores134
           template: basic_fail_1
diff --git a/.circleci/scripts/bundle-stats-commit.sh b/.circleci/scripts/bundle-stats-commit.sh
index 14b3604d82ec..1c9f4380f694 100755
--- a/.circleci/scripts/bundle-stats-commit.sh
+++ b/.circleci/scripts/bundle-stats-commit.sh
@@ -16,9 +16,9 @@ then
     exit 1
 fi
 
-if [[ "${CIRCLE_BRANCH}" != "develop" ]]
+if [[ "${CIRCLE_BRANCH}" != "main" ]]
 then
-    printf 'This is not develop branch'
+    printf 'This is not main branch'
     exit 0
 fi
 
diff --git a/.circleci/scripts/check_mmi_trigger.sh b/.circleci/scripts/check_mmi_trigger.sh
index c8d6fc44523b..b2a5ca13734d 100755
--- a/.circleci/scripts/check_mmi_trigger.sh
+++ b/.circleci/scripts/check_mmi_trigger.sh
@@ -9,7 +9,7 @@ if [ -z "$CIRCLE_PULL_REQUEST" ] || [ -z "$GITHUB_TOKEN" ]; then
   exit 0
 fi
 
-if [[ $CIRCLE_BRANCH = 'develop' || $CIRCLE_BRANCH = 'master' || $CIRCLE_BRANCH =~ ^Version-v[0-9.]* ]]; then
+if [[ $CIRCLE_BRANCH = 'main' || $CIRCLE_BRANCH = 'master' || $CIRCLE_BRANCH =~ ^Version-v[0-9.]* ]]; then
   echo "Long-running branch detected, running MMI tests."
   echo "run_mmi_tests=true" > mmi_trigger.env
   exit 0
diff --git a/.circleci/scripts/git-diff-develop.ts b/.circleci/scripts/git-diff-develop.ts
index f4437d6154db..3800c03d3254 100644
--- a/.circleci/scripts/git-diff-develop.ts
+++ b/.circleci/scripts/git-diff-develop.ts
@@ -10,7 +10,7 @@ const PR_NUMBER =
   process.env.CIRCLE_PR_NUMBER ||
   process.env.CIRCLE_PULL_REQUEST?.split('/').pop();
 
-const MAIN_BRANCH = 'develop';
+const MAIN_BRANCH = 'main';
 const SOURCE_BRANCH = `refs/pull/${PR_NUMBER}/head`;
 
 const CHANGED_FILES_DIR = 'changed-files';
diff --git a/.circleci/scripts/rerun-ci-workflow-from-failed.ts b/.circleci/scripts/rerun-ci-workflow-from-failed.ts
index 84827f11fd13..2863ca5bcda0 100644
--- a/.circleci/scripts/rerun-ci-workflow-from-failed.ts
+++ b/.circleci/scripts/rerun-ci-workflow-from-failed.ts
@@ -59,7 +59,7 @@ interface WorkflowStatusResponse {
  * Note: the API returns the first 20 workflows by default.
  * If we wanted to get older workflows, we would need to use the 'page-token' we would get in the first response
  * and perform a subsequent request with the 'page-token' parameter.
- * This seems unnecessary as of today, as the amount of daily PRs merged to develop is not that high.
+ * This seems unnecessary as of today, as the amount of daily PRs merged to main is not that high.
  *
  * @returns {Promise<WorkflowItem[]>} A promise that resolves to an array of workflow items.
  * @throws Will throw an error if the CircleCI token is not defined or if the HTTP request fails.
@@ -177,7 +177,7 @@ async function rerunWorkflowById(workflowId: string) {
 }
 
 /**
- * Re-runs failed CircleCI workflows from develop branch.
+ * Re-runs failed CircleCI workflows from main branch.
  * The workflow will only be re-runed if:
  *   1. It has the status of 'failed'
  *   2. It has only been run once
@@ -187,8 +187,8 @@ async function rerunWorkflowById(workflowId: string) {
  * @throws Will throw an error if fetching the workflows or re-running a workflow fails.
  */
 async function rerunFailedWorkflowsFromDevelop() {
-  console.log('Getting Circle Ci workflows from develop branch...');
-  const workflows = await getCircleCiWorkflowsByBranch('develop');
+  console.log('Getting Circle Ci workflows from main branch...');
+  const workflows = await getCircleCiWorkflowsByBranch('main');
 
   console.log('Assessing if any of the workflows needs to be rerun...');
   for (const item of workflows) {
diff --git a/.devcontainer/download-builds.ts b/.devcontainer/download-builds.ts
index 83e1822379a1..5408bba8d69f 100644
--- a/.devcontainer/download-builds.ts
+++ b/.devcontainer/download-builds.ts
@@ -7,7 +7,7 @@ function getGitBranch() {
   const gitOutput = execSync('git status').toString();
 
   const branchRegex = /On branch (?<branch>.*)\n/;
-  return gitOutput.match(branchRegex)?.groups?.branch || 'develop';
+  return gitOutput.match(branchRegex)?.groups?.branch || 'main';
 }
 
 async function getCircleJobs(branch: string) {
diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
index 894c13b90238..41d6433db7d7 100644
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -13,14 +13,14 @@ If you're picking up a bounty or an existing issue, feel free to ask clarifying
 ### Submitting a pull request
 When you're done with your project / bugfix / feature and ready to submit a PR, there are a couple guidelines we ask you to follow:
 
-- [ ] **Make sure you followed our [`coding guidelines`](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/CODING_GUIDELINES.md)**: These guidelines aim to maintain consistency and readability across the codebase. They help ensure that the code is easy to understand, maintain, and modify, which is particularly important when working with multiple contributors.
+- [ ] **Make sure you followed our [`coding guidelines`](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/CODING_GUIDELINES.md)**: These guidelines aim to maintain consistency and readability across the codebase. They help ensure that the code is easy to understand, maintain, and modify, which is particularly important when working with multiple contributors.
 - [ ] **Test it**: For any new programmatic functionality, we like unit tests when possible, so if you can keep your code cleanly isolated, please do add a test file to the `tests` folder.
 - [ ] **Meet the spec**: Make sure the PR adds functionality that matches the issue you're closing. This is especially important for bounties: sometimes design or implementation details are included in the conversation, so read carefully!
 - [ ] **Close the issue**: If this PR closes an open issue, fill out the "Related issues" section with `Fixes: #$ISSUE_NUMBER`. Ex. For closing issue 418, include the line `Fixes: #418`. If it doesn't close the issue but addresses it partially, just include a reference to the issue number, like `#418`.
 - [ ] **Keep it simple**: Try not to include multiple features in a single PR, and don't make extraneous changes outside the scope of your contribution. All those touched files make things harder to review ;)
-- [ ] **PR against `develop`**: Submit your PR against the `develop` branch. This is where we merge new features so they get some time to receive extra testing before being pushed to `master` for production. If your PR is a hot-fix that needs to be published urgently, you may submit a PR against the `master` branch, but this PR will receive tighter scrutiny before merging.
+- [ ] **PR against `main`**: Submit your PR against the `main` branch. This is where we merge new features so they get some time to receive extra testing before being pushed to `master` for production. If your PR is a hot-fix that needs to be published urgently, you may submit a PR against the `master` branch, but this PR will receive tighter scrutiny before merging.
 - [ ] **Get reviewed by MetaMask Internal Developers**: All PRs require 2 approvals from MetaMask Internal Developers before merging.
-- [ ] **Ensure the PR is correctly labeled.**: More detail about PR labels can be found [here](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/LABELING_GUIDELINES.md).
+- [ ] **Ensure the PR is correctly labeled.**: More detail about PR labels can be found [here](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/LABELING_GUIDELINES.md).
 - [ ] **PR Titles**: Must adhere to the [Conventional Commits specification](https://www.conventionalcommits.org)
   - `<type>[optional scope]: <description>`
   - Example: `feat(parser): add ability to parse arrays`
diff --git a/.github/guidelines/LABELING_GUIDELINES.md b/.github/guidelines/LABELING_GUIDELINES.md
index 02081367bb5e..ea37c2e5f03d 100644
--- a/.github/guidelines/LABELING_GUIDELINES.md
+++ b/.github/guidelines/LABELING_GUIDELINES.md
@@ -14,7 +14,7 @@ It's essential to ensure that PRs have the appropriate labels before they are co
 - **regression-RC-x.y.z**: This label is manually added to a bug report issue by release engineers when a bug is found during release regerssion testing phase. The `x.y.z` in the label represents the release candidate (RC) version in which the bug's been discovered.
 
 ### Optional labels:
-- **regression-develop**: This label can manually be added to a bug report issue at the time of its creation if the bug is present on the development branch, i.e., `develop`, but is not yet released in production.
+- **regression-main**: This label can manually be added to a bug report issue at the time of its creation if the bug is present on the development branch, i.e., `main`, but is not yet released in production.
 - **needs-qa**: If the PR includes a new features, complex testing steps, or large refactors, this label must be added to indicated PR requires a full manual QA prior being merged and added to a release.
 
 ### Labels prohibited when PR needs to be merged:
diff --git a/.github/pull-request-template.md b/.github/pull-request-template.md
index 59232248ef51..044f83571fc6 100644
--- a/.github/pull-request-template.md
+++ b/.github/pull-request-template.md
@@ -38,11 +38,11 @@ Fixes:
 
 ## **Pre-merge author checklist**
 
-- [ ] I've followed [MetaMask Contributor Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask Extension Coding Standards](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/CODING_GUIDELINES.md).
+- [ ] I've followed [MetaMask Contributor Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask Extension Coding Standards](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/CODING_GUIDELINES.md).
 - [ ] I've completed the PR template to the best of my ability
 - [ ] I’ve included tests if applicable
 - [ ] I’ve documented my code using [JSDoc](https://jsdoc.app/) format if applicable
-- [ ] I’ve applied the right labels on the PR (see [labeling guidelines](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/LABELING_GUIDELINES.md)). Not required for external contributors.
+- [ ] I’ve applied the right labels on the PR (see [labeling guidelines](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/LABELING_GUIDELINES.md)). Not required for external contributors.
 
 ## **Pre-merge reviewer checklist**
 
diff --git a/.github/scripts/check-pr-has-required-labels.ts b/.github/scripts/check-pr-has-required-labels.ts
index 354dc2c2aa7d..fcce4dd23a82 100644
--- a/.github/scripts/check-pr-has-required-labels.ts
+++ b/.github/scripts/check-pr-has-required-labels.ts
@@ -73,7 +73,7 @@ async function main(): Promise<void> {
   if (!hasTeamLabel) {
     errorMessage += 'No team labels found on the PR. ';
   }
-  errorMessage += `Please make sure the PR is appropriately labeled before merging it.\n\nSee labeling guidelines for more detail: https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/LABELING_GUIDELINES.md`;
+  errorMessage += `Please make sure the PR is appropriately labeled before merging it.\n\nSee labeling guidelines for more detail: https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/LABELING_GUIDELINES.md`;
   core.setFailed(errorMessage);
   process.exit(1);
 }
diff --git a/.github/scripts/check-template-and-add-labels.ts b/.github/scripts/check-template-and-add-labels.ts
index ed22e98dc9a1..418174df2a90 100644
--- a/.github/scripts/check-template-and-add-labels.ts
+++ b/.github/scripts/check-template-and-add-labels.ts
@@ -132,7 +132,7 @@ async function main(): Promise<void> {
 
     } else {
       const errorMessage =
-        "Issue body does not match any of expected templates ('general-issue.yml' or 'bug-report.yml').\n\nMake sure issue's body includes all section titles.\n\nSections titles are listed here: https://github.com/MetaMask/metamask-extension/blob/develop/.github/scripts/shared/template.ts#L14-L37";
+        "Issue body does not match any of expected templates ('general-issue.yml' or 'bug-report.yml').\n\nMake sure issue's body includes all section titles.\n\nSections titles are listed here: https://github.com/MetaMask/metamask-extension/blob/main/.github/scripts/shared/template.ts#L14-L37";
       console.log(errorMessage);
 
       // Add label to indicate issue doesn't match any template
@@ -152,7 +152,7 @@ async function main(): Promise<void> {
       );
     } else {
       const errorMessage =
-        `PR body does not match template ('pull-request-template.md').\n\nMake sure PR's body includes all section titles.\n\nSections titles are listed here: https://github.com/MetaMask/metamask-extension/blob/develop/.github/scripts/shared/template.ts#L40-L47`;
+        `PR body does not match template ('pull-request-template.md').\n\nMake sure PR's body includes all section titles.\n\nSections titles are listed here: https://github.com/MetaMask/metamask-extension/blob/main/.github/scripts/shared/template.ts#L40-L47`;
       console.log(errorMessage);
 
       // Add label to indicate PR body doesn't match template
@@ -334,7 +334,7 @@ function craftRegressionLabel(regressionStage: RegressionStage | undefined, rele
   switch (regressionStage) {
     case RegressionStage.Development:
       return {
-        name: `regression-develop`,
+        name: `regression-main`,
         color: '5319E7', // violet
         description: `Regression bug that was found on development branch, but not yet present in production`,
       };
@@ -364,7 +364,7 @@ function craftRegressionLabel(regressionStage: RegressionStage | undefined, rele
       return {
         name: `regression-*`,
         color: 'EDEDED', // grey
-        description: `TODO: Unknown regression stage. Please replace with correct regression label: 'regression-develop', 'regression-RC-x.y.z', or 'regression-prod-x.y.z' label, where 'x.y.z' is the number of the release where bug was found.`,
+        description: `TODO: Unknown regression stage. Please replace with correct regression label: 'regression-main', 'regression-RC-x.y.z', or 'regression-prod-x.y.z' label, where 'x.y.z' is the number of the release where bug was found.`,
       };
   }
 }
diff --git a/.github/workflows/add-mmi-reviewer-and-notify.yml b/.github/workflows/add-mmi-reviewer-and-notify.yml
index 8821ccbd36e9..8372217bce70 100644
--- a/.github/workflows/add-mmi-reviewer-and-notify.yml
+++ b/.github/workflows/add-mmi-reviewer-and-notify.yml
@@ -3,7 +3,7 @@ name: Notify MMI team via Slack
 on:
   pull_request_target:
     branches:
-      - develop
+      - main
     types:
       - opened
       - reopened
@@ -45,4 +45,4 @@ jobs:
               ]
             }
         env:
-          SLACK_WEBHOOK_URL: ${{ secrets.MMI_LABEL_SLACK_WEBHOOK_URL }}
\ No newline at end of file
+          SLACK_WEBHOOK_URL: ${{ secrets.MMI_LABEL_SLACK_WEBHOOK_URL }}
diff --git a/.github/workflows/add-release-label.yml b/.github/workflows/add-release-label.yml
index 94ba76fcefa0..2e34ad491b44 100644
--- a/.github/workflows/add-release-label.yml
+++ b/.github/workflows/add-release-label.yml
@@ -3,7 +3,7 @@ name: Add release label to PR and linked issues when PR gets merged
 on:
   pull_request:
     branches:
-      - develop
+      - main
     types:
       - closed
 
diff --git a/.github/workflows/check-pr-labels.yml b/.github/workflows/check-pr-labels.yml
index 19c0576feaae..cc492c09319e 100644
--- a/.github/workflows/check-pr-labels.yml
+++ b/.github/workflows/check-pr-labels.yml
@@ -2,7 +2,7 @@ name: Check PR has required labels
 on:
   pull_request:
     branches:
-      - develop
+      - main
     types:
       - opened
       - reopened
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 73670c46d75d..a4b5bef7c9e7 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -13,10 +13,10 @@ name: "CodeQL"
 
 on:
   push:
-    branches: [ develop, Version-v*, cla-signatures, master, snaps ]
+    branches: [ main, Version-v*, cla-signatures, master, snaps ]
   pull_request:
     # The branches below must be a subset of the branches above
-    branches: [ develop ]
+    branches: [ main ]
   schedule:
     - cron: '28 12 * * 0'
 
diff --git a/.github/workflows/codespaces.yml b/.github/workflows/codespaces.yml
index 3455e2db54d4..5d37ba2d3dc3 100644
--- a/.github/workflows/codespaces.yml
+++ b/.github/workflows/codespaces.yml
@@ -4,7 +4,7 @@ on:
   push:
     branches:
       - 'codespaces**'
-      - 'develop'
+      - 'main'
     paths:
       - '**/yarn.lock'
 
diff --git a/.github/workflows/crowdin-action.yml b/.github/workflows/crowdin-action.yml
index 94bd8016cd4f..1a902087ad61 100644
--- a/.github/workflows/crowdin-action.yml
+++ b/.github/workflows/crowdin-action.yml
@@ -7,7 +7,7 @@ permissions:
 on:
   push:
     branches:
-      - develop
+      - main
   schedule:
     - cron: "0 */12 * * *"
 
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index f3cc68bebcec..2554557b9c35 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -3,7 +3,7 @@ name: Main
 on:
   push:
     branches:
-      - develop
+      - main
       - master
   pull_request:
     types:
diff --git a/.github/workflows/security-code-scanner.yml b/.github/workflows/security-code-scanner.yml
index 7da1773d666c..cf0b60cf84ac 100644
--- a/.github/workflows/security-code-scanner.yml
+++ b/.github/workflows/security-code-scanner.yml
@@ -2,9 +2,9 @@ name: "MetaMask Security Code Scanner"
 
 on:
   push:
-    branches: [ 'develop' ]
+    branches: [ 'main' ]
   pull_request:
-    branches: [ 'develop' ]
+    branches: [ 'main' ]
 
 jobs:
   run-security-scan:
diff --git a/.github/workflows/update-coverage.yml b/.github/workflows/update-coverage.yml
index fd1b0d5134e3..e65cdcbe978b 100644
--- a/.github/workflows/update-coverage.yml
+++ b/.github/workflows/update-coverage.yml
@@ -43,4 +43,4 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.LAVAMOAT_UPDATE_TOKEN }}
         run: |
-          gh pr create --title "chore: Update coverage.json" --body "This PR is automatically opened to update the coverage.json file when test coverage increases. Coverage increased from $STORED_COVERAGE% to $CURRENT_COVERAGE%." --base develop --head metamaskbot/update-coverage || gh pr edit --body "This PR is automatically opened to update the coverage.json file when test coverage increases. Coverage increased from $STORED_COVERAGE% to $CURRENT_COVERAGE%."
+          gh pr create --title "chore: Update coverage.json" --body "This PR is automatically opened to update the coverage.json file when test coverage increases. Coverage increased from $STORED_COVERAGE% to $CURRENT_COVERAGE%." --base main --head metamaskbot/update-coverage || gh pr edit --body "This PR is automatically opened to update the coverage.json file when test coverage increases. Coverage increased from $STORED_COVERAGE% to $CURRENT_COVERAGE%."
diff --git a/.github/workflows/validate-conventional-commits.yml b/.github/workflows/validate-conventional-commits.yml
index 8cb416844339..b8b5c56eabb6 100644
--- a/.github/workflows/validate-conventional-commits.yml
+++ b/.github/workflows/validate-conventional-commits.yml
@@ -2,7 +2,7 @@ name: Validate Conventional Commit Title
 on:
   pull_request:
     branches:
-      - develop
+      - main
     types: [opened, edited, reopened, synchronize]
 
 jobs:
diff --git a/README.md b/README.md
index f3e738a40abc..85d1b3f91ba3 100644
--- a/README.md
+++ b/README.md
@@ -12,7 +12,7 @@ To learn how to develop MetaMask-compatible applications, visit our [Developer D
 
 To learn how to contribute to the MetaMask codebase, visit our [Contributor Docs](https://github.com/MetaMask/contributor-docs).
 
-To learn how to contribute to the MetaMask Extension project itself, visit our [Extension Docs](https://github.com/MetaMask/metamask-extension/tree/develop/docs).
+To learn how to contribute to the MetaMask Extension project itself, visit our [Extension Docs](https://github.com/MetaMask/metamask-extension/tree/main/docs).
 
 ## GitHub Codespaces quickstart
 
diff --git a/app/scripts/lib/setupSentry.js b/app/scripts/lib/setupSentry.js
index 72c246826ab5..76d66eba88d2 100644
--- a/app/scripts/lib/setupSentry.js
+++ b/app/scripts/lib/setupSentry.js
@@ -127,9 +127,9 @@ function getTracesSampleRate(sentryTarget) {
   }
 
   if (flags.circleci) {
-    // Report very frequently on develop branch, and never on other branches
+    // Report very frequently on main branch, and never on other branches
     // (Unless you use a `flags = {"sentry": {"tracesSampleRate": x.xx}}` override)
-    if (flags.circleci.branch === 'develop') {
+    if (flags.circleci.branch === 'main') {
       return 0.015;
     }
     return 0;
diff --git a/development/build/README.md b/development/build/README.md
index 9d5df1e149fc..3aecead0cb25 100644
--- a/development/build/README.md
+++ b/development/build/README.md
@@ -4,7 +4,7 @@
 > Add `--build-type flask` to build Flask, our canary distribution with more experimental features.
 
 This directory contains the MetaMask build system, which is used to build the MetaMask Extension such that it can be used in a supported browser.
-From the repository root, the build system entry file is located at [`./development/build/index.js`](https://github.com/MetaMask/metamask-extension/blob/develop/development/build/index.js).
+From the repository root, the build system entry file is located at [`./development/build/index.js`](https://github.com/MetaMask/metamask-extension/blob/main/development/build/index.js).
 
 Several package scripts invoke the build system.
 For example, `yarn start` creates a watched development build, and `yarn dist` creates a production build.
@@ -20,7 +20,7 @@ are written to the `./dist` directory.
 
 Our JavaScript source files are transformed using [Babel](https://babeljs.io/), specifically using
 the [`babelify`](https://npmjs.com/package/babelify) Browserify transform.
-Source file bundling tasks are implemented in the [`./development/build/scripts.js`](https://github.com/MetaMask/metamask-extension/blob/develop/development/build/scripts.js).
+Source file bundling tasks are implemented in the [`./development/build/scripts.js`](https://github.com/MetaMask/metamask-extension/blob/main/development/build/scripts.js).
 
 > Locally implemented Browserify transforms, _some of which affect how we write JavaScript_, are listed and documented [here](./transforms/README.md).
 
diff --git a/development/build/utils.js b/development/build/utils.js
index 626aacd588c7..301c998534ad 100644
--- a/development/build/utils.js
+++ b/development/build/utils.js
@@ -130,7 +130,7 @@ function getEnvironment({ buildTarget }) {
     /^Version-v(\d+)[.](\d+)[.](\d+)/u.test(process.env.CIRCLE_BRANCH)
   ) {
     return ENVIRONMENT.RELEASE_CANDIDATE;
-  } else if (process.env.CIRCLE_BRANCH === 'develop') {
+  } else if (process.env.CIRCLE_BRANCH === 'main') {
     return ENVIRONMENT.STAGING;
   } else if (process.env.CIRCLE_PULL_REQUEST) {
     return ENVIRONMENT.PULL_REQUEST;
diff --git a/development/fitness-functions/rules/index.ts b/development/fitness-functions/rules/index.ts
index 6ba0f1198684..5afb72fa5343 100644
--- a/development/fitness-functions/rules/index.ts
+++ b/development/fitness-functions/rules/index.ts
@@ -6,7 +6,7 @@ const RULES: IRule[] = [
     name: "Don't use `sinon` or `assert` in unit tests",
     fn: preventSinonAssertSyntax,
     errorMessage:
-      '`sinon` or `assert` was detected in the diff. Please use Jest instead. For more info: https://github.com/MetaMask/metamask-extension/blob/develop/docs/testing.md#favor-jest-instead-of-mocha',
+      '`sinon` or `assert` was detected in the diff. Please use Jest instead. For more info: https://github.com/MetaMask/metamask-extension/blob/main/docs/testing.md#favor-jest-instead-of-mocha',
   },
   {
     name: "Don't add JS or JSX files",
diff --git a/development/highlights/index.js b/development/highlights/index.js
index 2b263005fb96..2616d602633e 100644
--- a/development/highlights/index.js
+++ b/development/highlights/index.js
@@ -6,11 +6,11 @@ module.exports = { getHighlights };
 
 async function getHighlights({ artifactBase }) {
   let highlights = '';
-  // here we assume the PR base branch ("target") is `develop` in lieu of doing
+  // here we assume the PR base branch ("target") is `main` in lieu of doing
   // a query against the github api which requires an access token
   // see https://discuss.circleci.com/t/how-to-retrieve-a-pull-requests-base-branch-name-github/36911
-  const changedFiles = await getChangedFiles({ target: 'develop' });
-  console.log(`detected changed files vs develop:`);
+  const changedFiles = await getChangedFiles({ target: 'main' });
+  console.log(`detected changed files vs main:`);
   for (const filename of changedFiles) {
     console.log(`  ${filename}`);
   }
diff --git a/development/master-sync.js b/development/master-sync.js
index 548ae6611c2f..dc1d474eaebe 100644
--- a/development/master-sync.js
+++ b/development/master-sync.js
@@ -51,8 +51,8 @@ async function runGitCommands() {
     console.log('Executed: git reset --hard origin/master');
 
     try {
-      await exec('git merge origin/develop');
-      console.log('Executed: git merge origin/develop');
+      await exec('git merge origin/main');
+      console.log('Executed: git merge origin/main');
     } catch (error) {
       // Handle the error but continue script execution
       if (
@@ -70,11 +70,11 @@ async function runGitCommands() {
     }
 
     await exec('git add .');
-    await exec('git restore --source origin/develop .');
-    console.log('Executed: it restore --source origin/develop .');
+    await exec('git restore --source origin/main .');
+    console.log('Executed: it restore --source origin/main .');
 
-    await exec('git checkout origin/develop -- .');
-    console.log('Executed: git checkout origin/develop -- .');
+    await exec('git checkout origin/main -- .');
+    console.log('Executed: git checkout origin/main -- .');
 
     await exec('git checkout origin/master -- CHANGELOG.md');
     console.log('Executed: git checkout origin/master -- CHANGELOG.md');
@@ -91,7 +91,7 @@ async function runGitCommands() {
     await exec('git add .');
     console.log('Executed: git add .');
 
-    await exec('git commit -m "Merge origin/develop into master-sync"');
+    await exec('git commit -m "Merge origin/main into master-sync"');
     console.log('Executed: git commit');
 
     console.log('Your local master-sync branch is now ready to become a PR.');
diff --git a/docs/QA_MIGRATIONS_GUIDE.md b/docs/QA_MIGRATIONS_GUIDE.md
index fbd2c38a182a..beb3a239dea8 100644
--- a/docs/QA_MIGRATIONS_GUIDE.md
+++ b/docs/QA_MIGRATIONS_GUIDE.md
@@ -2,7 +2,7 @@
 Migrations are needed to change top-level state data, this can be found in the browser's storage. This can look like removing specific keys/value pairs from state, changing objects to an array of objects, changing the name of a controller, etc.
 
 Steps
-  1. Create a new MetaMask directory\* folder locally with the source files before the migration, and load it as an unpacked extension in Chrome\*. If the migration is in a pull request, then build the `develop` branch to load. If the migration is already in `develop`, get a commit before the migration was added to build.
+  1. Create a new MetaMask directory\* folder locally with the source files before the migration, and load it as an unpacked extension in Chrome\*. If the migration is in a pull request, then build the `main` branch to load. If the migration is already in `main`, get a commit before the migration was added to build.
 
       ![Load unpacked extension to chrome](./assets/load-build-chrome.gif)
 
diff --git a/docs/confirmation-refactoring/confirmation-backend-architecture/README.md b/docs/confirmation-refactoring/confirmation-backend-architecture/README.md
index a3f30eb88a56..b927b5789801 100644
--- a/docs/confirmation-refactoring/confirmation-backend-architecture/README.md
+++ b/docs/confirmation-refactoring/confirmation-backend-architecture/README.md
@@ -5,13 +5,13 @@
 Current confirmation implementation in the background consists of following pieces:
 
 1. `TransactionController` and utility, helper classes used by it:
-   `TransactionController` is very important piece in transaction processing. It is described [here](https://github.com/MetaMask/metamask-extension/tree/develop/app/scripts/controllers/transactions#transaction-controller). It consists of 4 important parts:
+   `TransactionController` is very important piece in transaction processing. It is described [here](https://github.com/MetaMask/metamask-extension/tree/main/app/scripts/controllers/transactions#transaction-controller). It consists of 4 important parts:
    - `txStateManager`: responsible for the state of a transaction and storing the transaction
    - `pendingTxTracker`: watching blocks for transactions to be include and emitting confirmed events
    - `txGasUtil`: gas calculations and safety buffering
    - `nonceTracker`: calculating nonces
 2. `MessageManagers`:
-   There are 3 different message managers responsible for processing signature requests. These are detailed [here](https://github.com/MetaMask/metamask-extension/tree/develop/docs/refactoring/signature-request#proposed-refactoring).
+   There are 3 different message managers responsible for processing signature requests. These are detailed [here](https://github.com/MetaMask/metamask-extension/tree/main/docs/refactoring/signature-request#proposed-refactoring).
 3. `MetamaskController `:
    `MetamaskController ` is responsible for gluing together the different pieces in transaction processing. It is responsible to inject dependencies in `TransactionController`, `MessageManagers`, handling different events, responses to DAPP requests, etc.
 
@@ -19,8 +19,8 @@ Current confirmation implementation in the background consists of following piec
 
 1. Migrating to `@metamask/transaction-controller`. `TransactionController` in extension repo should eventually get replaced by core repo [TransactionController](https://github.com/MetaMask/core/tree/main/packages/transaction-controller). This controller is maintained by core team and also used in Metamask Mobile App.
 2. Migrating to `@metamask/message-manager`. Message Managers in extension repo should be deprecated in favor of core repo [MessageManagers](https://github.com/MetaMask/core/tree/main/packages/message-manager).
-3. Cleanup Code in `MetamaskController`. [Metamaskcontroller](https://github.com/MetaMask/metamask-extension/blob/develop/app/scripts/metamask-controller.js) is where `TransactionController` and different `MessageManagers` are initialized. It is responsible for injecting required dependencies. Also, it is responsible for handling incoming DAPP requests and invoking appropriate methods in these background classes. Over the period of time lot of code that should have been part of `TransactionController` and `MessageManagers` has ended up in `MetamaskController`. We need to cleanup this code and move to the appropriate classes.
-   - Code [here](https://github.com/MetaMask/metamask-extension/blob/bc19856d5d9ad1831e1722c84fe6161bed7a0a5a/app/scripts/metamask-controller.js#L3097) to check if `eth_sign` is enabled in preferences and perform other validation on the incoming request should be part of [MessageManager](https://github.com/MetaMask/metamask-extension/blob/develop/app/scripts/lib/message-manager.js)
+3. Cleanup Code in `MetamaskController`. [Metamaskcontroller](https://github.com/MetaMask/metamask-extension/blob/main/app/scripts/metamask-controller.js) is where `TransactionController` and different `MessageManagers` are initialized. It is responsible for injecting required dependencies. Also, it is responsible for handling incoming DAPP requests and invoking appropriate methods in these background classes. Over the period of time lot of code that should have been part of `TransactionController` and `MessageManagers` has ended up in `MetamaskController`. We need to cleanup this code and move to the appropriate classes.
+   - Code [here](https://github.com/MetaMask/metamask-extension/blob/bc19856d5d9ad1831e1722c84fe6161bed7a0a5a/app/scripts/metamask-controller.js#L3097) to check if `eth_sign` is enabled in preferences and perform other validation on the incoming request should be part of [MessageManager](https://github.com/MetaMask/metamask-extension/blob/main/app/scripts/lib/message-manager.js)
    - Method to sign messages [signMessage](https://github.com/MetaMask/metamask-extension/blob/bc19856d5d9ad1831e1722c84fe6161bed7a0a5a/app/scripts/metamask-controller.js#L3158), [signPersonalMessage](https://github.com/MetaMask/metamask-extension/blob/bc19856d5d9ad1831e1722c84fe6161bed7a0a5a/app/scripts/metamask-controller.js#L3217), [signTypedMessage](https://github.com/MetaMask/metamask-extension/blob/bc19856d5d9ad1831e1722c84fe6161bed7a0a5a/app/scripts/metamask-controller.js#L3470) can be simplified by injecting `KeyringController` into `MessageManagers`.
    - There are about 11 different methods to `add`, `approve`, `reject` different types of signature requests. These can probably be moved to a helper class, thus reducing lines of code from `MetamaskController `.
    - This [code](https://github.com/MetaMask/metamask-extension/blob/bc19856d5d9ad1831e1722c84fe6161bed7a0a5a/app/scripts/metamask-controller.js#L959) can better be placed in `TransactionController`.
diff --git a/docs/confirmation-refactoring/confirmation-page-structure/README.md b/docs/confirmation-refactoring/confirmation-page-structure/README.md
index a0ecc658836d..3ef31d0e0607 100644
--- a/docs/confirmation-refactoring/confirmation-page-structure/README.md
+++ b/docs/confirmation-refactoring/confirmation-page-structure/README.md
@@ -11,7 +11,7 @@ Currently we have following confirmation pages mapping to confirmation routes:
 5. `pages/confirm-token-transaction-base`
 6. `pages/confirm-contract-interaction`
 
-![Confirmation Pages structure](https://raw.githubusercontent.com/MetaMask/metamask-extension/develop/docs/confirmation-refactoring/confirmation-page-structure/current.png)
+![Confirmation Pages structure](https://raw.githubusercontent.com/MetaMask/metamask-extension/main/docs/confirmation-refactoring/confirmation-page-structure/current.png)
 
 `confirm-page-container` component helps to define a structure for confirmation pages it includes:
 
@@ -26,7 +26,7 @@ Other confirmation components listed above map to different types of transaction
 
 ## Areas of Refactoring:
 
-1. ### [confirm-transaction-base](https://github.com/MetaMask/metamask-extension/tree/develop/ui/pages/confirm-transaction-base/confirm-transaction-base.component.js) cleanup:
+1. ### [confirm-transaction-base](https://github.com/MetaMask/metamask-extension/tree/main/ui/pages/confirm-transaction-base/confirm-transaction-base.component.js) cleanup:
    The `confirm-transaction-base` component is huge 1200 lines component taking care of lot of complexity. We need to break it down into smaller components and move logic to hooks or utility classes. Layout related part can be moved to `confirm-page-container`.
    - Extract out code to render data into separate component from [here](https://github.com/MetaMask/metamask-extension/blob/e07ec9dcf3d3f341f83e6b29a29d30edaf7f5b5b/ui/pages/confirm-transaction-base/confirm-transaction-base.component.js#L641).
    - Extract out component to render hex data from [here](https://github.com/MetaMask/metamask-extension/blob/e07ec9dcf3d3f341f83e6b29a29d30edaf7f5b5b/ui/pages/confirm-transaction-base/confirm-transaction-base.component.js#L675).
@@ -37,11 +37,11 @@ Other confirmation components listed above map to different types of transaction
    - Code to get error key [getErrorKey](https://github.com/MetaMask/metamask-extension/blob/e07ec9dcf3d3f341f83e6b29a29d30edaf7f5b5b/ui/pages/confirm-transaction-base/confirm-transaction-base.component.js#L230) can be moved to a util function.
    - As new component for gas selection popups is created this code [handleEditGas, handleCloseEditGas](https://github.com/MetaMask/metamask-extension/blob/e07ec9dcf3d3f341f83e6b29a29d30edaf7f5b5b/ui/pages/confirm-transaction-base/confirm-transaction-base.component.js#L276) can be moved to it.
    - Convert `confirm-transaction-base` into a functional components and extract out all of these functions into a hook - `handleEdit`, `handleCancelAll`, `handleCancel`, `handleSubmit`, `handleSetApprovalForAll`, etc.
-2. ### [confirm-transaction-base-container](https://github.com/MetaMask/metamask-extension/tree/develop/ui/pages/confirm-transaction-base/confirm-transaction-base.container.js) cleanup:
+2. ### [confirm-transaction-base-container](https://github.com/MetaMask/metamask-extension/tree/main/ui/pages/confirm-transaction-base/confirm-transaction-base.container.js) cleanup:
    This container is doing much work to query and get required transaction related values from state and pass over to `confirm-transaction-base` component. As we refactor state we should get rid of this component.
    - remove the use of `state.confirmTransaction` from the component
    - create hook to get values derived from metamask state and active transaction.
-     State cleanup is detailed more in a separate document [here](https://github.com/MetaMask/metamask-extension/tree/develop/docs/confirmation-refactoring/confirmation-state-management).
+     State cleanup is detailed more in a separate document [here](https://github.com/MetaMask/metamask-extension/tree/main/docs/confirmation-refactoring/confirmation-state-management).
 3. ### [confirm-page-container](https://github.com/MetaMask/metamask-extension/tree/03ccc5366cf31c9fa0fedc2fac533ebc64e6f2b4/ui/components/app/confirm-page-container) cleanup:
    As described we should continue to have `confirm-page-container` components taking care of layout. Also wherever possible more re-usable smaller layout components for different part of confirmation page like gas details, gas selection popover, etc should be added.
    `confirm-page-container` defines a layout which is used by most comfirmation pages, but some pages like new token allowance implementation for `ERC20` differ from this layout. We will be able to use more and more of these re-usable components for other confirmation pages layouts also.
@@ -53,9 +53,9 @@ Other confirmation components listed above map to different types of transaction
 
    There are 2 different versions popovers for gas editing:
 
-   - Legacy gas popover - [component](https://github.com/MetaMask/metamask-extension/tree/develop/ui/components/app/edit-gas-popover)
-   - EIP-1559 V2 gas popover - [component1](https://github.com/MetaMask/metamask-extension/tree/develop/ui/components/app/edit-gas-fee-popover), [component2](https://github.com/MetaMask/metamask-extension/tree/develop/ui/components/app/advanced-gas-fee-popover).
-     Context [transaction-modal-context](https://github.com/MetaMask/metamask-extension/blob/develop/ui/contexts/transaction-modal.js) is used to show hide EIP-1559 gas popovers.
+   - Legacy gas popover - [component](https://github.com/MetaMask/metamask-extension/tree/main/ui/components/app/edit-gas-popover)
+   - EIP-1559 V2 gas popover - [component1](https://github.com/MetaMask/metamask-extension/tree/main/ui/components/app/edit-gas-fee-popover), [component2](https://github.com/MetaMask/metamask-extension/tree/main/ui/components/app/advanced-gas-fee-popover).
+     Context [transaction-modal-context](https://github.com/MetaMask/metamask-extension/blob/main/ui/contexts/transaction-modal.js) is used to show hide EIP-1559 gas popovers.
 
      A parent component can be created for gas editing popover which will wrap both the legacy and EIP-1559 gas popover. Depending on the type of transaction appropriate gas popover can be shown. `transaction-modal-context` can be used to take care to open/close both popovers.
      This parent component can be added to `confirm-transaction-base` and `token-allowance` components and thus will be available on all confirmation pages using gas editing.
diff --git a/docs/confirmation-refactoring/confirmation-pages-routing/README.md b/docs/confirmation-refactoring/confirmation-pages-routing/README.md
index ed4d7aef0788..a6abfcaf31ca 100644
--- a/docs/confirmation-refactoring/confirmation-pages-routing/README.md
+++ b/docs/confirmation-refactoring/confirmation-pages-routing/README.md
@@ -6,7 +6,7 @@ This document details how routing to confirmation pages is currently done and th
 
 The current flow of routing to confirmation pages is un-necessarily complicated and have issues.
 
-![Confirmation Pages Routing - Current](https://raw.githubusercontent.com/MetaMask/metamask-extension/develop/docs/confirmation-refactoring/confirmation-pages-routing/current.png)
+![Confirmation Pages Routing - Current](https://raw.githubusercontent.com/MetaMask/metamask-extension/main/docs/confirmation-refactoring/confirmation-pages-routing/current.png)
 
 - There are 2 ways in which confirmation pages can be opened:
   1. User triggers send flow from within Metamask
@@ -24,7 +24,7 @@ The current flow of routing to confirmation pages is un-necessarily complicated
 
 The proposed routing of confirmation pages looks like.
 
-![Confirmation Pages Routing - Proposed](https://raw.githubusercontent.com/MetaMask/metamask-extension/develop/docs/confirmation-refactoring/confirmation-pages-routing/proposed.png)
+![Confirmation Pages Routing - Proposed](https://raw.githubusercontent.com/MetaMask/metamask-extension/main/docs/confirmation-refactoring/confirmation-pages-routing/proposed.png)
 
 - There are 2 ways in which confirmation pages can be opened:
   1. User triggers send flow from within Metamask
@@ -52,14 +52,14 @@ The proposed routing of confirmation pages looks like.
 
 ## Areas of code refactoring
 
-Current routing code is complicated, it is also currently tied to state change in confirmation pages that makes it more complicated. State refactoring as discussed in this [document](https://github.com/MetaMask/metamask-extension/tree/develop/docs/confirmation-refactoring/confirmation-state-management) will also help simplify it.
+Current routing code is complicated, it is also currently tied to state change in confirmation pages that makes it more complicated. State refactoring as discussed in this [document](https://github.com/MetaMask/metamask-extension/tree/main/docs/confirmation-refactoring/confirmation-state-management) will also help simplify it.
 
-- Any re-usable routing related code should be moved to [useRouting](https://github.com/MetaMask/metamask-extension/blob/develop/ui/hooks/useRouting.js) hook.
+- Any re-usable routing related code should be moved to [useRouting](https://github.com/MetaMask/metamask-extension/blob/main/ui/hooks/useRouting.js) hook.
 - Logic to initially check state and redirect to `/pages/confirm-transaction` can be moved from `/pages/home` to `pages/routes`
 - All the route mapping code should be moved to `/pages/confirm-transaction`, this will require getting rid of route mappings in `/pages/confirm-transaction/confirm-token-transaction-switch`, `/pages/confirm-transaction-switch`.
 - `/pages/confirm-transaction-switch` has the code that checks the un-approved transaction / message in the state, and based on its type and asset redirect to a specific route, a utility method can be created to do this mapping and can be included in `/pages/confirm-transaction` component.
 - During the send flow initiated within metamask user can be redirected to specific confirmations route **`/confirm-transaction/${id}/XXXX`**
-- Confirmation components have lot of props passing which needs to be reduced. Values can be obtained from redux state or other contexts directly using hooks. Component [confirm-token-transaction-switch](https://github.com/MetaMask/metamask-extension/blob/develop/ui/pages/confirm-transaction/confirm-token-transaction-switch.js) has a lot of un-necessary props passing which should be removed and will help to further refactor routing.
+- Confirmation components have lot of props passing which needs to be reduced. Values can be obtained from redux state or other contexts directly using hooks. Component [confirm-token-transaction-switch](https://github.com/MetaMask/metamask-extension/blob/main/ui/pages/confirm-transaction/confirm-token-transaction-switch.js) has a lot of un-necessary props passing which should be removed and will help to further refactor routing.
 
 - **Routing to mostRecentOverviewPage**
   Across confirmation pages there is code to re-direct to `mostRecentOverviewPage`. `mostRecentOverviewPage` is equal to default route `/` or `/asset` whichever was last opened.
diff --git a/docs/confirmation-refactoring/confirmation-state-management/README.md b/docs/confirmation-refactoring/confirmation-state-management/README.md
index a24184154e5a..da9cf143a754 100644
--- a/docs/confirmation-refactoring/confirmation-state-management/README.md
+++ b/docs/confirmation-refactoring/confirmation-state-management/README.md
@@ -12,11 +12,11 @@ State Management is very important piece to keep frontend confirmation code simp
 
 Refactorings:
 
-- There are confirmations related ducks [here](https://github.com/MetaMask/metamask-extension/tree/develop/ui/ducks):
-  - [confirm-transaction](https://github.com/MetaMask/metamask-extension/tree/develop/ui/ducks/confirm-transaction): this is redundant and we should be able to get rid of it.
-  - [gas](https://github.com/MetaMask/metamask-extension/tree/develop/ui/ducks/gas): this is not used anywhere and can be removed.
-  - [send](https://github.com/MetaMask/metamask-extension/tree/develop/ui/ducks/send): this duck is important state machine for send flow and we should continue to maintain.
-- [gasFeeContext](https://github.com/MetaMask/metamask-extension/blob/develop/ui/contexts/gasFee.js) is huge context written on top of [gasFeeInput](https://github.com/MetaMask/metamask-extension/tree/develop/ui/hooks/gasFeeInput) hook. The context / hook provides about 20 different values used in different places in confirmation pages. We need to break this down:
+- There are confirmations related ducks [here](https://github.com/MetaMask/metamask-extension/tree/main/ui/ducks):
+  - [confirm-transaction](https://github.com/MetaMask/metamask-extension/tree/main/ui/ducks/confirm-transaction): this is redundant and we should be able to get rid of it.
+  - [gas](https://github.com/MetaMask/metamask-extension/tree/main/ui/ducks/gas): this is not used anywhere and can be removed.
+  - [send](https://github.com/MetaMask/metamask-extension/tree/main/ui/ducks/send): this duck is important state machine for send flow and we should continue to maintain.
+- [gasFeeContext](https://github.com/MetaMask/metamask-extension/blob/main/ui/contexts/gasFee.js) is huge context written on top of [gasFeeInput](https://github.com/MetaMask/metamask-extension/tree/main/ui/hooks/gasFeeInput) hook. The context / hook provides about 20 different values used in different places in confirmation pages. We need to break this down:
 
   - Context is required only to provide temporary UI state for confirmation pages which includes:
 
@@ -38,10 +38,10 @@ Refactorings:
     - `gasFeeEstimates`
     - `isNetworkBusy`
   - `minimumGasLimitDec` is a constant value 21000 should be removed from the context, this can be moved to constants file.
-  - Create separate hook for transaction functions [here](https://github.com/MetaMask/metamask-extension/blob/develop/ui/hooks/gasFeeInput/useTransactionFunctions.js), this hook can consume GasFeeContext.
-  - Setters and manual update functions are only used by legacy gas component [edit-gas-fee-popover](https://github.com/MetaMask/metamask-extension/tree/develop/ui/components/app/edit-gas-popover). This component uses useGasFeeInputs hook. We need to create a smaller hook just for this component using the above context and hooks.
+  - Create separate hook for transaction functions [here](https://github.com/MetaMask/metamask-extension/blob/main/ui/hooks/gasFeeInput/useTransactionFunctions.js), this hook can consume GasFeeContext.
+  - Setters and manual update functions are only used by legacy gas component [edit-gas-fee-popover](https://github.com/MetaMask/metamask-extension/tree/main/ui/components/app/edit-gas-popover). This component uses useGasFeeInputs hook. We need to create a smaller hook just for this component using the above context and hooks.
 
-* [confirm-transaction-base.container.js](https://github.com/MetaMask/metamask-extension/blob/develop/ui/pages/confirm-transaction-base/confirm-transaction-base.container.js) and [confirm-transaction-base.component.js](https://github.com/MetaMask/metamask-extension/blob/develop/ui/pages/confirm-transaction-base/confirm-transaction-base.component.js) has a lot of code to derive values from state and selected transactions. This can be simplified by using hooks that will he created.
+* [confirm-transaction-base.container.js](https://github.com/MetaMask/metamask-extension/blob/main/ui/pages/confirm-transaction-base/confirm-transaction-base.container.js) and [confirm-transaction-base.component.js](https://github.com/MetaMask/metamask-extension/blob/main/ui/pages/confirm-transaction-base/confirm-transaction-base.component.js) has a lot of code to derive values from state and selected transactions. This can be simplified by using hooks that will he created.
 * We will have a lot of hooks for transaction related fields, these can be grouped into same file / folder.
 
 As we work on the components we will be able to identify more areas of improvement.
diff --git a/docs/confirmation-refactoring/signature-request/README.md b/docs/confirmation-refactoring/signature-request/README.md
index a80cc046ca6c..3585ef4a9c4e 100644
--- a/docs/confirmation-refactoring/signature-request/README.md
+++ b/docs/confirmation-refactoring/signature-request/README.md
@@ -6,35 +6,35 @@ This document details the plan to refactor and cleanup Signature Request pages i
 
 1. Simple ETH Signature
 
-   <img src="https://raw.githubusercontent.com/MetaMask/metamask-extension/develop/docs/confirmation-refactoring/signature-request/eth_sign.png" width="150"/>
+   <img src="https://raw.githubusercontent.com/MetaMask/metamask-extension/main/docs/confirmation-refactoring/signature-request/eth_sign.png" width="150"/>
 
 1. Personal Signature
 
-   <img src="https://raw.githubusercontent.com/MetaMask/metamask-extension/develop/docs/confirmation-refactoring/signature-request/personal_sign.png" width="150"/>
+   <img src="https://raw.githubusercontent.com/MetaMask/metamask-extension/main/docs/confirmation-refactoring/signature-request/personal_sign.png" width="150"/>
 
 1. Typed Data - V1
 
-   <img src="https://raw.githubusercontent.com/MetaMask/metamask-extension/develop/docs/confirmation-refactoring/signature-request/v1.png" width="150"/>
+   <img src="https://raw.githubusercontent.com/MetaMask/metamask-extension/main/docs/confirmation-refactoring/signature-request/v1.png" width="150"/>
 
 1. Typed Data - V3
 
-   <img src="https://raw.githubusercontent.com/MetaMask/metamask-extension/develop/docs/confirmation-refactoring/signature-request/v3.png" width="150"/>
+   <img src="https://raw.githubusercontent.com/MetaMask/metamask-extension/main/docs/confirmation-refactoring/signature-request/v3.png" width="150"/>
 
 1. Typed Data - V4
 
-   <img src="https://raw.githubusercontent.com/MetaMask/metamask-extension/develop/docs/confirmation-refactoring/signature-request/v4.png" width="150"/>
+   <img src="https://raw.githubusercontent.com/MetaMask/metamask-extension/main/docs/confirmation-refactoring/signature-request/v4.png" width="150"/>
 
 1. SIWE Signature
 
-   <img src="https://raw.githubusercontent.com/MetaMask/metamask-extension/develop/docs/confirmation-refactoring/signature-request/siwe.png" width="150"/>
+   <img src="https://raw.githubusercontent.com/MetaMask/metamask-extension/main/docs/confirmation-refactoring/signature-request/siwe.png" width="150"/>
 
 ## The current flow of control for Signature Request looks like:
 
-![Signature Request Flow -  Current](https://raw.githubusercontent.com/MetaMask/metamask-extension/develop/docs/confirmation-refactoring/signature-request/signature_request_old.png)
+![Signature Request Flow -  Current](https://raw.githubusercontent.com/MetaMask/metamask-extension/main/docs/confirmation-refactoring/signature-request/signature_request_old.png)
 
 ## The proposed flow of control:
 
-![Signature Request Flow -  Proposed](https://raw.githubusercontent.com/MetaMask/metamask-extension/develop/docs/confirmation-refactoring/signature-request/signature_request_proposed.png)
+![Signature Request Flow -  Proposed](https://raw.githubusercontent.com/MetaMask/metamask-extension/main/docs/confirmation-refactoring/signature-request/signature_request_proposed.png)
 
 ## Proposed Refactoring:
 
@@ -44,9 +44,9 @@ There are many areas in above flow where the code can be improved upon to cleanu
 
    Currently we have 3 different message managers:
 
-   - [MessageManager](https://github.com/MetaMask/metamask-extension/blob/develop/app/scripts/lib/message-manager.js)
-   - [PersonalMessageManager](https://github.com/MetaMask/metamask-extension/blob/develop/app/scripts/lib/personal-message-manager.js)
-   - [TypedMessageManager](https://github.com/MetaMask/metamask-extension/blob/develop/app/scripts/lib/typed-message-manager.js)
+   - [MessageManager](https://github.com/MetaMask/metamask-extension/blob/main/app/scripts/lib/message-manager.js)
+   - [PersonalMessageManager](https://github.com/MetaMask/metamask-extension/blob/main/app/scripts/lib/personal-message-manager.js)
+   - [TypedMessageManager](https://github.com/MetaMask/metamask-extension/blob/main/app/scripts/lib/typed-message-manager.js)
 
    Above message managers handle different types of message requests sent by DAPP. There is a lot of code duplication between the 3 classes.
 
@@ -56,14 +56,14 @@ There are many areas in above flow where the code can be improved upon to cleanu
 
    Current navigation to Signature Request pages is un-necessarily complicated. It can be simplified to great extent.
 
-   - To the navigation code in [Home](https://github.com/MetaMask/metamask-extension/blob/develop/ui/pages/home/home.component.js#L181) component add condition to check if there are unapproved messages and route to path `/singature-request`.
-   - In [Routes](https://github.com/MetaMask/metamask-extension/blob/develop/ui/pages/routes/routes.component.js) component render pages/confirm-signature-request for path `/singature-request`.
-   - Refactor out [conf-tx.js](https://github.com/MetaMask/metamask-extension/blob/develop/ui/pages/confirm-transaction/conf-tx.js) into pages/confirm-signature-request component. [#17240](https://github.com/MetaMask/metamask-extension/issues/17240)
+   - To the navigation code in [Home](https://github.com/MetaMask/metamask-extension/blob/main/ui/pages/home/home.component.js#L181) component add condition to check if there are unapproved messages and route to path `/singature-request`.
+   - In [Routes](https://github.com/MetaMask/metamask-extension/blob/main/ui/pages/routes/routes.component.js) component render pages/confirm-signature-request for path `/singature-request`.
+   - Refactor out [conf-tx.js](https://github.com/MetaMask/metamask-extension/blob/main/ui/pages/confirm-transaction/conf-tx.js) into pages/confirm-signature-request component. [#17240](https://github.com/MetaMask/metamask-extension/issues/17240)
 
-3. ### Refactoring in [conf-tx.js](https://github.com/MetaMask/metamask-extension/blob/develop/ui/pages/confirm-transaction/conf-tx.js)
+3. ### Refactoring in [conf-tx.js](https://github.com/MetaMask/metamask-extension/blob/main/ui/pages/confirm-transaction/conf-tx.js)
 
-   - [conf-tx.js](https://github.com/MetaMask/metamask-extension/blob/develop/ui/pages/confirm-transaction/conf-tx.js) to be renamed to `pages/confirm-signature-request component`
-   - Get rid of [confirm-transaction](https://github.com/MetaMask/metamask-extension/blob/develop/ui/pages/confirm-transaction/confirm-transaction.component.js) component from signature request routing. Thus, we need to ensure that any required logic from the component is extracted into a reusable hook and included in pages/confirm-signature-request.
+   - [conf-tx.js](https://github.com/MetaMask/metamask-extension/blob/main/ui/pages/confirm-transaction/conf-tx.js) to be renamed to `pages/confirm-signature-request component`
+   - Get rid of [confirm-transaction](https://github.com/MetaMask/metamask-extension/blob/main/ui/pages/confirm-transaction/confirm-transaction.component.js) component from signature request routing. Thus, we need to ensure that any required logic from the component is extracted into a reusable hook and included in pages/confirm-signature-request.
    - Convert to functional react component and use selectors to get state and get rid of `mapStateToProps`. [#17239](https://github.com/MetaMask/metamask-extension/issues/17239)
    - Various callbacks to `sign message`, `cancel request`, etc for different types of messages can be moved to respective child components.
    - On component `mount/update` if there are no unapproved messages redirect to `mostRecentlyOverviewedPage` as [here](https://github.com/MetaMask/metamask-extension/blob/76a2a9bb8b6ea04025328d36404ac3b59121dfc8/ui/app/pages/confirm-transaction/conf-tx.js#L187).
@@ -74,12 +74,12 @@ There are many areas in above flow where the code can be improved upon to cleanu
 
    There are 3 different signature request components responsible to render different signature request pages:
 
-   1. [signature-request-original](https://github.com/MetaMask/metamask-extension/tree/develop/ui/components/app/signature-request-original) - ETH sign, personal sign, sign typed data V1
-   2. [signature-request](https://github.com/MetaMask/metamask-extension/tree/develop/ui/components/app/signature-request) - Sign typed data V3, V4
-   3. [signature-request-siwe](https://github.com/MetaMask/metamask-extension/tree/develop/ui/components/app/signature-request-siwe) - SignatureRequestSIWE (Sign-In with Ethereum)
+   1. [signature-request-original](https://github.com/MetaMask/metamask-extension/tree/main/ui/components/app/signature-request-original) - ETH sign, personal sign, sign typed data V1
+   2. [signature-request](https://github.com/MetaMask/metamask-extension/tree/main/ui/components/app/signature-request) - Sign typed data V3, V4
+   3. [signature-request-siwe](https://github.com/MetaMask/metamask-extension/tree/main/ui/components/app/signature-request-siwe) - SignatureRequestSIWE (Sign-In with Ethereum)
 
    All, the signature request pages (except SIWE) are very similar, the differing part in these pages is the message section.
-   And there is a lot of code duplication between components - [signature-request-original](https://github.com/MetaMask/metamask-extension/tree/develop/ui/components/app/signature-request-original) and [signature-request](https://github.com/MetaMask/metamask-extension/tree/develop/ui/components/app/signature-request).
+   And there is a lot of code duplication between components - [signature-request-original](https://github.com/MetaMask/metamask-extension/tree/main/ui/components/app/signature-request-original) and [signature-request](https://github.com/MetaMask/metamask-extension/tree/main/ui/components/app/signature-request).
 
 5. ### Refactoring in signature-request-original
 
@@ -89,12 +89,12 @@ There are many areas in above flow where the code can be improved upon to cleanu
    - Move this [metrics event](https://github.com/MetaMask/metamask-extension/blob/71a0bc8b3ff94478e61294c815770e6bc12a72f5/ui/app/components/app/signature-request-original/signature-request-original.component.js#L50) to pages/confirm-signature-request as it is applicable to all the signature requests types.
    - Header or we can say upper half of the page of all signature request pages (except SIWE) are very similar, this can be extracted into a reusable component used across both signature-request-original and signature-request:
 
-     <img src="https://raw.githubusercontent.com/MetaMask/metamask-extension/develop/docs/confirmation-refactoring/signature-request/header.png" width="150"/>
+     <img src="https://raw.githubusercontent.com/MetaMask/metamask-extension/main/docs/confirmation-refactoring/signature-request/header.png" width="150"/>
 
    - [LedgerInstructions](https://github.com/MetaMask/metamask-extension/blob/e07ec9dcf3d3f341f83e6b29a29d30edaf7f5b5b/ui/components/app/signature-request-original/signature-request-original.component.js#L312) can also be moved to the header.
    - Create a reuable footer component and use it across all confirmation pages. [#17237](https://github.com/MetaMask/metamask-extension/issues/17237)
 
-     <img src="https://raw.githubusercontent.com/MetaMask/metamask-extension/develop/docs/confirmation-refactoring/signature-request/footer.png" width="150"/>
+     <img src="https://raw.githubusercontent.com/MetaMask/metamask-extension/main/docs/confirmation-refactoring/signature-request/footer.png" width="150"/>
 
    - Create a reusable component for Cancel All requests for use across signature request pages [Code](https://github.com/MetaMask/metamask-extension/blob/e07ec9dcf3d3f341f83e6b29a29d30edaf7f5b5b/ui/components/app/signature-request-original/signature-request-original.component.js#L326).
    - Extract [getNetrowkName](https://github.com/MetaMask/metamask-extension/blob/e07ec9dcf3d3f341f83e6b29a29d30edaf7f5b5b/ui/components/app/signature-request-original/signature-request-original.component.js#L60) into a reusable hook / utility method.
diff --git a/docs/publishing.md b/docs/publishing.md
index fdf1ab1850a7..5915f1873a88 100644
--- a/docs/publishing.md
+++ b/docs/publishing.md
@@ -30,9 +30,9 @@ In the case that a new release has sensitive changes that cannot be fully verifi
 
 ## Building
 
-While we develop on the main `develop` branch, our production version is maintained on the `master` branch.
+While we develop on the `main` branch, our production version is maintained on the `master` branch.
 
-With each pull request, the @MetaMaskBot will comment with a build of that new pull request, so after bumping the version on `develop`, open a pull request against `master`, and once the pull request is reviewed and merged, you can download those builds for publication.
+With each pull request, the @MetaMaskBot will comment with a build of that new pull request, so after bumping the version on `main`, open a pull request against `master`, and once the pull request is reviewed and merged, you can download those builds for publication.
 
 ## Publishing
 
@@ -45,7 +45,7 @@ With each pull request, the @MetaMaskBot will comment with a build of that new p
 
 ## Hotfix Differences
 
-Our `develop` branch is usually not yet fully tested for quality assurance, and so should be treated as if it is in an unstable state.
+Our `main` branch is usually not yet fully tested for quality assurance, and so should be treated as if it is in an unstable state.
 
 For this reason, when an urgent change is needed in production, its pull request should:
 
@@ -53,4 +53,4 @@ For this reason, when an urgent change is needed in production, its pull request
 - Use a hotfix tag.
 - Should be proposed against the `master` branch.
 
-The version and changelog bump should then be made off the `master` branch, and then merged to `develop` to bring the two branches back into sync. Further time can be saved by incorporating the version/changelog bump into the PR against `master`, since we rely on @MetaMaskBot to run tests before merging.
+The version and changelog bump should then be made off the `master` branch, and then merged to `main` to bring the two branches back into sync. Further time can be saved by incorporating the version/changelog bump into the PR against `master`, since we rely on @MetaMaskBot to run tests before merging.
diff --git a/test/e2e/flask/README.md b/test/e2e/flask/README.md
index abb07a11e910..42d0e6a28236 100644
--- a/test/e2e/flask/README.md
+++ b/test/e2e/flask/README.md
@@ -3,4 +3,4 @@ Add `.spec.js` or `.spec.ts` files to run only in flask here.
 
 > [!IMPORTANT]
 > Ensure to update your files in `FLASK_ONLY_TESTS` in
-> [`run-all.js`](https://github.com/MetaMask/metamask-extension/blob/develop/test/e2e/run-all.js)
\ No newline at end of file
+> [`run-all.js`](https://github.com/MetaMask/metamask-extension/blob/main/test/e2e/run-all.js)
diff --git a/test/manual-scenarios/upgrade-testing/upgrade-testing.md b/test/manual-scenarios/upgrade-testing/upgrade-testing.md
index df5ca3d1fc50..13880f13694b 100644
--- a/test/manual-scenarios/upgrade-testing/upgrade-testing.md
+++ b/test/manual-scenarios/upgrade-testing/upgrade-testing.md
@@ -8,7 +8,7 @@ To ensure MetaMask extension's upgrade process is seamless and retains user data
 
 ### Pre-Upgrade Actions on Master Branch
 
-- **Given** the user checks out the master branch, runs `yarn` and `yarn start` to build locally, and has loaded the MetaMask extension. For instructions on how to load extension on Chrome and Firefox, check the guidelines [here for Chrome](https://github.com/MetaMask/metamask-extension/blob/develop/docs/add-to-chrome.md) and [here for Firefox](https://github.com/MetaMask/metamask-extension/blob/develop/docs/add-to-firefox.md).
+- **Given** the user checks out the master branch, runs `yarn` and `yarn start` to build locally, and has loaded the MetaMask extension. For instructions on how to load extension on Chrome and Firefox, check the guidelines [here for Chrome](https://github.com/MetaMask/metamask-extension/blob/main/docs/add-to-chrome.md) and [here for Firefox](https://github.com/MetaMask/metamask-extension/blob/main/docs/add-to-firefox.md).
 - **And** the user has successfully onboarded.
 - **And** the user creates two accounts.
 - **And** the user sends a transaction between these accounts.
diff --git a/ui/components/ui/box/README.mdx b/ui/components/ui/box/README.mdx
index a70ac7e291fb..08d308db11d5 100644
--- a/ui/components/ui/box/README.mdx
+++ b/ui/components/ui/box/README.mdx
@@ -49,21 +49,21 @@ Box is a utility component that can be used for layout or as a base for other UI
 | paddingInline      | 0, 1, 2, 4, 6, 8, 9, 10, 12 or array of numbers [1, 2] for responsive props                                                                                                                                                       | -                 |
 | paddingInlineStart | 0, 1, 2, 4, 6, 8, 9, 10, 12 or array of numbers [1, 2] for responsive props                                                                                                                                                       | -                 |
 | paddingInlineEnd   | 0, 1, 2, 4, 6, 8, 9, 10, 12 or array of numbers [1, 2] for responsive props                                                                                                                                                       | -                 |
-| display            | Display values or array of Display values for responsive props from [../ui/helpers/constants/design-system.js](https://github.com/MetaMask/metamask-extension/blob/develop/ui/helpers/constants/design-system.js)                 | -                 |
-| flexDirection      | FlexDirection values or array of FlexDirection values for responsive props from [../ui/helpers/constants/design-system.js](https://github.com/MetaMask/metamask-extension/blob/develop/ui/helpers/constants/design-system.js)     | FlexDirection.Row |
-| flexWrap           | FlexWrap values or array of FlexWrap values for responsive props from [../ui/helpers/constants/design-system.js](https://github.com/MetaMask/metamask-extension/blob/develop/ui/helpers/constants/design-system.js)               | -                 |
-| alignItems         | AlignItems values or array of AlignItems values for responsive props from [../ui/helpers/constants/design-system.js](https://github.com/MetaMask/metamask-extension/blob/develop/ui/helpers/constants/design-system.js)           | -                 |
-| justifyContent     | JustifyContent values or array of JustifyContent values from [../ui/helpers/constants/design-system.js](https://github.com/MetaMask/metamask-extension/blob/develop/ui/helpers/constants/design-system.js)                        | -                 |
+| display            | Display values or array of Display values for responsive props from [../ui/helpers/constants/design-system.js](https://github.com/MetaMask/metamask-extension/blob/main/ui/helpers/constants/design-system.js)                 | -                 |
+| flexDirection      | FlexDirection values or array of FlexDirection values for responsive props from [../ui/helpers/constants/design-system.js](https://github.com/MetaMask/metamask-extension/blob/main/ui/helpers/constants/design-system.js)     | FlexDirection.Row |
+| flexWrap           | FlexWrap values or array of FlexWrap values for responsive props from [../ui/helpers/constants/design-system.js](https://github.com/MetaMask/metamask-extension/blob/main/ui/helpers/constants/design-system.js)               | -                 |
+| alignItems         | AlignItems values or array of AlignItems values for responsive props from [../ui/helpers/constants/design-system.js](https://github.com/MetaMask/metamask-extension/blob/main/ui/helpers/constants/design-system.js)           | -                 |
+| justifyContent     | JustifyContent values or array of JustifyContent values from [../ui/helpers/constants/design-system.js](https://github.com/MetaMask/metamask-extension/blob/main/ui/helpers/constants/design-system.js)                        | -                 |
 | gap                | 0, 1, 2, 4, 6, 8, 9, 10, 12 or array of numbers [1, 2] for responsive props                                                                                                                                                       | -                 |
-| textAlign          | TextAlign values or array of TextAlign values for responsive props from [../ui/helpers/constants/design-system.js](https://github.com/MetaMask/metamask-extension/blob/develop/ui/helpers/constants/design-system.js)             | -                 |
-| width              | BlockSize values or array of BlockSize values for responsive props from [../ui/helpers/constants/design-system.js](https://github.com/MetaMask/metamask-extension/blob/develop/ui/helpers/constants/design-system.js)             | -                 |
-| height             | BlockSize values or array of BlockSize values for responsive props [../ui/helpers/constants/design-system.js](https://github.com/MetaMask/metamask-extension/blob/develop/ui/helpers/constants/design-system.js)                  | -                 |
-| color              | Color values or array of Color values for responsive props [../ui/helpers/constants/design-system.js](https://github.com/MetaMask/metamask-extension/blob/develop/ui/helpers/constants/design-system.js)                          | -                 |
-| backgroundColor    | BackgroundColor values or array of BackgroundColor values for responsive props from [../ui/helpers/constants/design-system.js](https://github.com/MetaMask/metamask-extension/blob/develop/ui/helpers/constants/design-system.js) | -                 |
-| borderColor        | BorderColor values or array of BorderColor values for responsive props from [../ui/helpers/constants/design-system.js](https://github.com/MetaMask/metamask-extension/blob/develop/ui/helpers/constants/design-system.js)         | -                 |
+| textAlign          | TextAlign values or array of TextAlign values for responsive props from [../ui/helpers/constants/design-system.js](https://github.com/MetaMask/metamask-extension/blob/main/ui/helpers/constants/design-system.js)             | -                 |
+| width              | BlockSize values or array of BlockSize values for responsive props from [../ui/helpers/constants/design-system.js](https://github.com/MetaMask/metamask-extension/blob/main/ui/helpers/constants/design-system.js)             | -                 |
+| height             | BlockSize values or array of BlockSize values for responsive props [../ui/helpers/constants/design-system.js](https://github.com/MetaMask/metamask-extension/blob/main/ui/helpers/constants/design-system.js)                  | -                 |
+| color              | Color values or array of Color values for responsive props [../ui/helpers/constants/design-system.js](https://github.com/MetaMask/metamask-extension/blob/main/ui/helpers/constants/design-system.js)                          | -                 |
+| backgroundColor    | BackgroundColor values or array of BackgroundColor values for responsive props from [../ui/helpers/constants/design-system.js](https://github.com/MetaMask/metamask-extension/blob/main/ui/helpers/constants/design-system.js) | -                 |
+| borderColor        | BorderColor values or array of BorderColor values for responsive props from [../ui/helpers/constants/design-system.js](https://github.com/MetaMask/metamask-extension/blob/main/ui/helpers/constants/design-system.js)         | -                 |
 | borderWidth        | 0, 1, 2, 4, 6, 8, 9, 10, 12 or array of numbers [1, 2] for responsive props                                                                                                                                                       | -                 |
-| borderRadius       | BorderRadius values or array of BorderRadius values for responsive props from [../ui/helpers/constants/design-system.js](https://github.com/MetaMask/metamask-extension/blob/develop/ui/helpers/constants/design-system.js)       | -                 |
-| borderStyle        | BORDER_STYLE values or array of BORDER_STYLE values for responsive props from [../ui/helpers/constants/design-system.js](https://github.com/MetaMask/metamask-extension/blob/develop/ui/helpers/constants/design-system.js)       | -                 |
+| borderRadius       | BorderRadius values or array of BorderRadius values for responsive props from [../ui/helpers/constants/design-system.js](https://github.com/MetaMask/metamask-extension/blob/main/ui/helpers/constants/design-system.js)       | -                 |
+| borderStyle        | BORDER_STYLE values or array of BORDER_STYLE values for responsive props from [../ui/helpers/constants/design-system.js](https://github.com/MetaMask/metamask-extension/blob/main/ui/helpers/constants/design-system.js)       | -                 |
 | as                 | The polymorphic `as` prop allows you to change the root HTML element of the Box component. Defaults to 'div'                                                                                                                      | 'div'             |
 
 ## Usage
diff --git a/ui/hooks/useTransactionInsights.js b/ui/hooks/useTransactionInsights.js
index 997f74061194..13829f17f42e 100644
--- a/ui/hooks/useTransactionInsights.js
+++ b/ui/hooks/useTransactionInsights.js
@@ -22,7 +22,7 @@ const isAllowedTransactionTypes = (transactionType) =>
   transactionType === TransactionType.tokenMethodTransfer;
 
 // A hook was needed to return JSX here as the way Tabs work JSX has to be included in
-// https://github.com/MetaMask/metamask-extension/blob/develop/ui/components/app/confirm-page-container/confirm-page-container-content/confirm-page-container-content.component.js#L129
+// https://github.com/MetaMask/metamask-extension/blob/main/ui/components/app/confirm-page-container/confirm-page-container-content/confirm-page-container-content.component.js#L129
 // Thus it is not possible to use React Component here
 const useTransactionInsights = ({ txData }) => {
   const dispatch = useDispatch();

From e3eab5cade2925f919655bde5499d3fe13e21f47 Mon Sep 17 00:00:00 2001
From: OGPoyraz <omergoktugpoyraz@gmail.com>
Date: Mon, 2 Dec 2024 15:24:55 +0100
Subject: [PATCH 008/175] fix: Replace `AvatarAccount` with `Identicon`
 (#28645)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<!--
Please submit this PR as a draft initially.
Do not mark it as "Ready for review" until the template has been
completely filled out, and PR status checks have passed at least once.
-->

## **Description**

<!--
Write a short description of the changes included in this pull request,
also include relevant motivation and context. Have in mind the following
questions:
1. What is the reason for the change?
2. What is the improvement/solution?
-->

This PR fixes icon issue on confirmations mentioned on
https://github.com/MetaMask/metamask-extension/issues/28609

[![Open in GitHub
Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/28645?quickstart=1)

## **Related issues**

Fixes: https://github.com/MetaMask/metamask-extension/issues/28609

## **Manual testing steps**

1. Go to settings - select Blockies icons
2. Trigger a signature or contract interaction
3. See the addresses there are displayed in Blockies
4. Go to settings - select JazzIcons
5. Trigger a signature or contract interaction
6. See the addresses there are displayed in JazzIcons


## **Screenshots/Recordings**

<!-- If applicable, add screenshots and/or recordings to visualize the
before and after of your change. -->

### **Before**


![before](https://github.com/user-attachments/assets/41727b32-f7c6-411c-9bf4-45b041a059fd)


### **After**


![after](https://github.com/user-attachments/assets/9774f4ec-92ab-4481-81bd-5a70c0f3a90b)


## **Pre-merge author checklist**

- [ ] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension Coding
Standards](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/CODING_GUIDELINES.md).
- [ ] I've completed the PR template to the best of my ability
- [ ] I’ve included tests if applicable
- [ ] I’ve documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [ ] I’ve applied the right labels on the PR (see [labeling
guidelines](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.

## **Pre-merge reviewer checklist**

- [ ] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed).
- [ ] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.
---
 .../row/__snapshots__/address.test.tsx.snap   |  66 +++------
 .../app/confirm/info/row/address.tsx          |  15 +-
 .../components/confirm/header/header-info.tsx |  17 +--
 .../info/__snapshots__/info.test.tsx.snap     |  65 +++++----
 .../__snapshots__/approve.test.tsx.snap       |  20 +--
 .../base-transaction-info.test.tsx.snap       |  10 +-
 .../native-transfer.test.tsx.snap             |   5 +-
 .../nft-token-transfer.test.tsx.snap          |   5 +-
 .../__snapshots__/personal-sign.test.tsx.snap |  10 +-
 .../set-approval-for-all-info.test.tsx.snap   |   5 +-
 .../transaction-data.test.tsx.snap            |  75 ++++++----
 .../transaction-details.test.tsx.snap         |  10 +-
 .../token-details-section.test.tsx.snap       |   5 +-
 .../token-transfer.test.tsx.snap              |   5 +-
 .../transaction-flow-section.test.tsx.snap    |  10 +-
 .../__snapshots__/typed-sign-v1.test.tsx.snap |   5 +-
 .../__snapshots__/typed-sign.test.tsx.snap    | 130 +++++++++++-------
 .../row/__snapshots__/dataTree.test.tsx.snap  |  25 ++--
 .../__snapshots__/typedSignData.test.tsx.snap |  30 ++--
 .../__snapshots__/confirm.test.tsx.snap       | 120 +++++++++-------
 20 files changed, 344 insertions(+), 289 deletions(-)

diff --git a/ui/components/app/confirm/info/row/__snapshots__/address.test.tsx.snap b/ui/components/app/confirm/info/row/__snapshots__/address.test.tsx.snap
index ec2eacb0d44b..87a709c0d80e 100644
--- a/ui/components/app/confirm/info/row/__snapshots__/address.test.tsx.snap
+++ b/ui/components/app/confirm/info/row/__snapshots__/address.test.tsx.snap
@@ -9,10 +9,11 @@ exports[`ConfirmInfoRowAddress renders appropriately with PetNames disabled with
       class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center"
     >
       <div
-        class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-account mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
+        class=""
       >
         <div
-          class="mm-avatar-account__jazzicon"
+          class="identicon"
+          style="height: 16px; width: 16px; border-radius: 8px;"
         >
           <div
             style="border-radius: 50px; overflow: hidden; padding: 0px; margin: 0px; width: 16px; height: 16px; display: inline-block; background: rgb(249, 108, 1);"
@@ -71,47 +72,13 @@ exports[`ConfirmInfoRowAddress renders appropriately with PetNames disabled with
       class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center"
     >
       <div
-        class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-account mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
+        class="identicon"
+        style="height: 16px; width: 16px; border-radius: 8px;"
       >
-        <div
-          class="mm-avatar-account__jazzicon"
-        >
-          <div
-            style="border-radius: 50px; overflow: hidden; padding: 0px; margin: 0px; width: 16px; height: 16px; display: inline-block; background: rgb(200, 20, 47);"
-          >
-            <svg
-              height="16"
-              width="16"
-              x="0"
-              y="0"
-            >
-              <rect
-                fill="#2346E1"
-                height="16"
-                transform="translate(-5.054099824190616 -1.1961526949032948) rotate(220.4 8 8)"
-                width="16"
-                x="0"
-                y="0"
-              />
-              <rect
-                fill="#F96801"
-                height="16"
-                transform="translate(8.4860698787506 -0.0890679807090961) rotate(482.1 8 8)"
-                width="16"
-                x="0"
-                y="0"
-              />
-              <rect
-                fill="#FA9E00"
-                height="16"
-                transform="translate(5.64879181058228 9.815863735670636) rotate(211.9 8 8)"
-                width="16"
-                x="0"
-                y="0"
-              />
-            </svg>
-          </div>
-        </div>
+        <img
+          src="https://s3.amazonaws.com/airswap-token-images/WBTC.png"
+          style="width: 100%;"
+        />
       </div>
       <p
         class="mm-box mm-text mm-text--body-md mm-box--margin-left-2 mm-box--color-inherit"
@@ -133,10 +100,11 @@ exports[`ConfirmInfoRowAddress renders appropriately with PetNames disabled with
       class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center"
     >
       <div
-        class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-account mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
+        class=""
       >
         <div
-          class="mm-avatar-account__jazzicon"
+          class="identicon"
+          style="height: 16px; width: 16px; border-radius: 8px;"
         >
           <div
             style="border-radius: 50px; overflow: hidden; padding: 0px; margin: 0px; width: 16px; height: 16px; display: inline-block; background: rgb(249, 108, 1);"
@@ -195,10 +163,11 @@ exports[`ConfirmInfoRowAddress renders appropriately with PetNames disabled with
       class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center"
     >
       <div
-        class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-account mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
+        class=""
       >
         <div
-          class="mm-avatar-account__jazzicon"
+          class="identicon"
+          style="height: 16px; width: 16px; border-radius: 8px;"
         >
           <div
             style="border-radius: 50px; overflow: hidden; padding: 0px; margin: 0px; width: 16px; height: 16px; display: inline-block; background: rgb(249, 108, 1);"
@@ -257,10 +226,11 @@ exports[`ConfirmInfoRowAddress renders appropriately with PetNames disabled with
       class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center"
     >
       <div
-        class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-account mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
+        class=""
       >
         <div
-          class="mm-avatar-account__jazzicon"
+          class="identicon"
+          style="height: 16px; width: 16px; border-radius: 8px;"
         >
           <div
             style="border-radius: 50px; overflow: hidden; padding: 0px; margin: 0px; width: 16px; height: 16px; display: inline-block; background: rgb(249, 108, 1);"
diff --git a/ui/components/app/confirm/info/row/address.tsx b/ui/components/app/confirm/info/row/address.tsx
index 95fabf26652f..0fbc49e052bf 100644
--- a/ui/components/app/confirm/info/row/address.tsx
+++ b/ui/components/app/confirm/info/row/address.tsx
@@ -3,21 +3,16 @@ import React, { memo, useState } from 'react';
 import { useSelector } from 'react-redux';
 import {
   AlignItems,
-  BorderColor,
   Display,
   FlexDirection,
   TextColor,
 } from '../../../../../helpers/constants/design-system';
 import { getPetnamesEnabled } from '../../../../../selectors';
-import {
-  AvatarAccount,
-  AvatarAccountSize,
-  Box,
-  Text,
-} from '../../../../component-library';
+import { Box, Text } from '../../../../component-library';
 import NicknamePopovers from '../../../modals/nickname-popovers';
 import Name from '../../../name/name';
 import { shortenAddress } from '../../../../../helpers/utils/util';
+import Identicon from '../../../../ui/identicon';
 import { useFallbackDisplayName } from './hook';
 
 export type ConfirmInfoRowAddressProps = {
@@ -59,11 +54,7 @@ export const ConfirmInfoRowAddress = memo(
                 alignItems={AlignItems.center}
                 onClick={isSnapUsingThis ? () => null : handleDisplayNameClick}
               >
-                <AvatarAccount
-                  address={address}
-                  size={AvatarAccountSize.Xs}
-                  borderColor={BorderColor.transparent}
-                />
+                <Identicon address={address} diameter={16} />
                 <Text
                   marginLeft={2}
                   color={TextColor.inherit}
diff --git a/ui/pages/confirmations/components/confirm/header/header-info.tsx b/ui/pages/confirmations/components/confirm/header/header-info.tsx
index 03eabacef42e..08c951d0d418 100644
--- a/ui/pages/confirmations/components/confirm/header/header-info.tsx
+++ b/ui/pages/confirmations/components/confirm/header/header-info.tsx
@@ -1,5 +1,4 @@
 import React, { useContext } from 'react';
-import { useSelector } from 'react-redux';
 import {
   MetaMetricsEventCategory,
   MetaMetricsEventLocation,
@@ -8,9 +7,6 @@ import {
 import { ConfirmInfoRow } from '../../../../../components/app/confirm/info/row';
 import { ConfirmInfoRowCurrency } from '../../../../../components/app/confirm/info/row/currency';
 import {
-  AvatarAccount,
-  AvatarAccountSize,
-  AvatarAccountVariant,
   Box,
   ButtonIcon,
   ButtonIconSize,
@@ -36,19 +32,18 @@ import {
   TextVariant,
 } from '../../../../../helpers/constants/design-system';
 import { useI18nContext } from '../../../../../hooks/useI18nContext';
-import { getUseBlockie } from '../../../../../selectors';
 import { useConfirmContext } from '../../../context/confirm';
 import { useBalance } from '../../../hooks/useBalance';
 import useConfirmationRecipientInfo from '../../../hooks/useConfirmationRecipientInfo';
 import { SignatureRequestType } from '../../../types/confirm';
 import { isSignatureTransactionType } from '../../../utils/confirm';
 import { isCorrectDeveloperTransactionType } from '../../../../../../shared/lib/confirmation.utils';
+import Identicon from '../../../../../components/ui/identicon';
 import { AdvancedDetailsButton } from './advanced-details-button';
 
 const HeaderInfo = () => {
   const trackEvent = useContext(MetaMetricsContext);
 
-  const useBlockie = useSelector(getUseBlockie);
   const [showAccountInfo, setShowAccountInfo] = React.useState(false);
 
   const { currentConfirmation } = useConfirmContext();
@@ -136,15 +131,7 @@ const HeaderInfo = () => {
                 flexDirection={FlexDirection.Column}
                 alignItems={AlignItems.center}
               >
-                <AvatarAccount
-                  variant={
-                    useBlockie
-                      ? AvatarAccountVariant.Blockies
-                      : AvatarAccountVariant.Jazzicon
-                  }
-                  address={fromAddress}
-                  size={AvatarAccountSize.Lg}
-                />
+                <Identicon address={fromAddress} diameter={40} />
                 <Text
                   fontWeight={FontWeight.Bold}
                   variant={TextVariant.bodyMd}
diff --git a/ui/pages/confirmations/components/confirm/info/__snapshots__/info.test.tsx.snap b/ui/pages/confirmations/components/confirm/info/__snapshots__/info.test.tsx.snap
index bdcc3e7db452..ce3731be6fb1 100644
--- a/ui/pages/confirmations/components/confirm/info/__snapshots__/info.test.tsx.snap
+++ b/ui/pages/confirmations/components/confirm/info/__snapshots__/info.test.tsx.snap
@@ -74,10 +74,11 @@ exports[`Info renders info section for approve request 1`] = `
           class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center"
         >
           <div
-            class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-account mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
+            class=""
           >
             <div
-              class="mm-avatar-account__jazzicon"
+              class="identicon"
+              style="height: 16px; width: 16px; border-radius: 8px;"
             >
               <div
                 style="border-radius: 50px; overflow: hidden; padding: 0px; margin: 0px; width: 16px; height: 16px; display: inline-block; background: rgb(24, 100, 242);"
@@ -420,10 +421,11 @@ exports[`Info renders info section for contract interaction request 1`] = `
           class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center"
         >
           <div
-            class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-account mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
+            class=""
           >
             <div
-              class="mm-avatar-account__jazzicon"
+              class="identicon"
+              style="height: 16px; width: 16px; border-radius: 8px;"
             >
               <div
                 style="border-radius: 50px; overflow: hidden; padding: 0px; margin: 0px; width: 16px; height: 16px; display: inline-block; background: rgb(200, 20, 98);"
@@ -495,10 +497,11 @@ exports[`Info renders info section for contract interaction request 1`] = `
           class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center"
         >
           <div
-            class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-account mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
+            class=""
           >
             <div
-              class="mm-avatar-account__jazzicon"
+              class="identicon"
+              style="height: 16px; width: 16px; border-radius: 8px;"
             >
               <div
                 style="border-radius: 50px; overflow: hidden; padding: 0px; margin: 0px; width: 16px; height: 16px; display: inline-block; background: rgb(24, 100, 242);"
@@ -732,10 +735,11 @@ exports[`Info renders info section for personal sign request 1`] = `
           class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center"
         >
           <div
-            class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-account mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
+            class=""
           >
             <div
-              class="mm-avatar-account__jazzicon"
+              class="identicon"
+              style="height: 16px; width: 16px; border-radius: 8px;"
             >
               <div
                 style="border-radius: 50px; overflow: hidden; padding: 0px; margin: 0px; width: 16px; height: 16px; display: inline-block; background: rgb(250, 58, 0);"
@@ -1016,10 +1020,11 @@ exports[`Info renders info section for setApprovalForAll request 1`] = `
           class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center"
         >
           <div
-            class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-account mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
+            class=""
           >
             <div
-              class="mm-avatar-account__jazzicon"
+              class="identicon"
+              style="height: 16px; width: 16px; border-radius: 8px;"
             >
               <div
                 style="border-radius: 50px; overflow: hidden; padding: 0px; margin: 0px; width: 16px; height: 16px; display: inline-block; background: rgb(24, 100, 242);"
@@ -1254,10 +1259,11 @@ exports[`Info renders info section for typed sign request 1`] = `
           class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center"
         >
           <div
-            class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-account mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
+            class=""
           >
             <div
-              class="mm-avatar-account__jazzicon"
+              class="identicon"
+              style="height: 16px; width: 16px; border-radius: 8px;"
             >
               <div
                 style="border-radius: 50px; overflow: hidden; padding: 0px; margin: 0px; width: 16px; height: 16px; display: inline-block; background: rgb(1, 142, 116);"
@@ -1329,10 +1335,11 @@ exports[`Info renders info section for typed sign request 1`] = `
           class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center"
         >
           <div
-            class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-account mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
+            class=""
           >
             <div
-              class="mm-avatar-account__jazzicon"
+              class="identicon"
+              style="height: 16px; width: 16px; border-radius: 8px;"
             >
               <div
                 style="border-radius: 50px; overflow: hidden; padding: 0px; margin: 0px; width: 16px; height: 16px; display: inline-block; background: rgb(250, 58, 0);"
@@ -1575,10 +1582,11 @@ exports[`Info renders info section for typed sign request 1`] = `
                           class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center"
                         >
                           <div
-                            class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-account mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
+                            class=""
                           >
                             <div
-                              class="mm-avatar-account__jazzicon"
+                              class="identicon"
+                              style="height: 16px; width: 16px; border-radius: 8px;"
                             >
                               <div
                                 style="border-radius: 50px; overflow: hidden; padding: 0px; margin: 0px; width: 16px; height: 16px; display: inline-block; background: rgb(35, 98, 225);"
@@ -1651,10 +1659,11 @@ exports[`Info renders info section for typed sign request 1`] = `
                           class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center"
                         >
                           <div
-                            class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-account mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
+                            class=""
                           >
                             <div
-                              class="mm-avatar-account__jazzicon"
+                              class="identicon"
+                              style="height: 16px; width: 16px; border-radius: 8px;"
                             >
                               <div
                                 style="border-radius: 50px; overflow: hidden; padding: 0px; margin: 0px; width: 16px; height: 16px; display: inline-block; background: rgb(24, 183, 242);"
@@ -1727,10 +1736,11 @@ exports[`Info renders info section for typed sign request 1`] = `
                           class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center"
                         >
                           <div
-                            class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-account mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
+                            class=""
                           >
                             <div
-                              class="mm-avatar-account__jazzicon"
+                              class="identicon"
+                              style="height: 16px; width: 16px; border-radius: 8px;"
                             >
                               <div
                                 style="border-radius: 50px; overflow: hidden; padding: 0px; margin: 0px; width: 16px; height: 16px; display: inline-block; background: rgb(245, 143, 0);"
@@ -1899,10 +1909,11 @@ exports[`Info renders info section for typed sign request 1`] = `
                               class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center"
                             >
                               <div
-                                class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-account mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
+                                class=""
                               >
                                 <div
-                                  class="mm-avatar-account__jazzicon"
+                                  class="identicon"
+                                  style="height: 16px; width: 16px; border-radius: 8px;"
                                 >
                                   <div
                                     style="border-radius: 50px; overflow: hidden; padding: 0px; margin: 0px; width: 16px; height: 16px; display: inline-block; background: rgb(242, 162, 2);"
@@ -1975,10 +1986,11 @@ exports[`Info renders info section for typed sign request 1`] = `
                               class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center"
                             >
                               <div
-                                class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-account mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
+                                class=""
                               >
                                 <div
-                                  class="mm-avatar-account__jazzicon"
+                                  class="identicon"
+                                  style="height: 16px; width: 16px; border-radius: 8px;"
                                 >
                                   <div
                                     style="border-radius: 50px; overflow: hidden; padding: 0px; margin: 0px; width: 16px; height: 16px; display: inline-block; background: rgb(250, 54, 0);"
@@ -2051,10 +2063,11 @@ exports[`Info renders info section for typed sign request 1`] = `
                               class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center"
                             >
                               <div
-                                class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-account mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
+                                class=""
                               >
                                 <div
-                                  class="mm-avatar-account__jazzicon"
+                                  class="identicon"
+                                  style="height: 16px; width: 16px; border-radius: 8px;"
                                 >
                                   <div
                                     style="border-radius: 50px; overflow: hidden; padding: 0px; margin: 0px; width: 16px; height: 16px; display: inline-block; background: rgb(200, 20, 86);"
diff --git a/ui/pages/confirmations/components/confirm/info/approve/__snapshots__/approve.test.tsx.snap b/ui/pages/confirmations/components/confirm/info/approve/__snapshots__/approve.test.tsx.snap
index 8cfe63f27147..037cb264226d 100644
--- a/ui/pages/confirmations/components/confirm/info/approve/__snapshots__/approve.test.tsx.snap
+++ b/ui/pages/confirmations/components/confirm/info/approve/__snapshots__/approve.test.tsx.snap
@@ -149,10 +149,11 @@ exports[`<ApproveInfo /> renders component for approve request 1`] = `
           class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center"
         >
           <div
-            class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-account mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
+            class=""
           >
             <div
-              class="mm-avatar-account__jazzicon"
+              class="identicon"
+              style="height: 16px; width: 16px; border-radius: 8px;"
             >
               <div
                 style="border-radius: 50px; overflow: hidden; padding: 0px; margin: 0px; width: 16px; height: 16px; display: inline-block; background: rgb(24, 100, 242);"
@@ -271,10 +272,11 @@ exports[`<ApproveInfo /> renders component for approve request 1`] = `
           class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center"
         >
           <div
-            class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-account mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
+            class=""
           >
             <div
-              class="mm-avatar-account__jazzicon"
+              class="identicon"
+              style="height: 16px; width: 16px; border-radius: 8px;"
             >
               <div
                 style="border-radius: 50px; overflow: hidden; padding: 0px; margin: 0px; width: 16px; height: 16px; display: inline-block; background: rgb(24, 100, 242);"
@@ -363,10 +365,11 @@ exports[`<ApproveInfo /> renders component for approve request 1`] = `
           class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center"
         >
           <div
-            class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-account mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
+            class=""
           >
             <div
-              class="mm-avatar-account__jazzicon"
+              class="identicon"
+              style="height: 16px; width: 16px; border-radius: 8px;"
             >
               <div
                 style="border-radius: 50px; overflow: hidden; padding: 0px; margin: 0px; width: 16px; height: 16px; display: inline-block; background: rgb(1, 142, 119);"
@@ -823,10 +826,11 @@ exports[`<ApproveInfo /> renders component for approve request 1`] = `
             class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center"
           >
             <div
-              class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-account mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
+              class=""
             >
               <div
-                class="mm-avatar-account__jazzicon"
+                class="identicon"
+                style="height: 16px; width: 16px; border-radius: 8px;"
               >
                 <div
                   style="border-radius: 50px; overflow: hidden; padding: 0px; margin: 0px; width: 16px; height: 16px; display: inline-block; background: rgb(24, 100, 242);"
diff --git a/ui/pages/confirmations/components/confirm/info/base-transaction-info/__snapshots__/base-transaction-info.test.tsx.snap b/ui/pages/confirmations/components/confirm/info/base-transaction-info/__snapshots__/base-transaction-info.test.tsx.snap
index 10506183561d..953e88287788 100644
--- a/ui/pages/confirmations/components/confirm/info/base-transaction-info/__snapshots__/base-transaction-info.test.tsx.snap
+++ b/ui/pages/confirmations/components/confirm/info/base-transaction-info/__snapshots__/base-transaction-info.test.tsx.snap
@@ -182,10 +182,11 @@ exports[`<BaseTransactionInfo /> renders component for contract interaction requ
           class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center"
         >
           <div
-            class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-account mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
+            class=""
           >
             <div
-              class="mm-avatar-account__jazzicon"
+              class="identicon"
+              style="height: 16px; width: 16px; border-radius: 8px;"
             >
               <div
                 style="border-radius: 50px; overflow: hidden; padding: 0px; margin: 0px; width: 16px; height: 16px; display: inline-block; background: rgb(200, 20, 98);"
@@ -257,10 +258,11 @@ exports[`<BaseTransactionInfo /> renders component for contract interaction requ
           class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center"
         >
           <div
-            class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-account mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
+            class=""
           >
             <div
-              class="mm-avatar-account__jazzicon"
+              class="identicon"
+              style="height: 16px; width: 16px; border-radius: 8px;"
             >
               <div
                 style="border-radius: 50px; overflow: hidden; padding: 0px; margin: 0px; width: 16px; height: 16px; display: inline-block; background: rgb(24, 100, 242);"
diff --git a/ui/pages/confirmations/components/confirm/info/native-transfer/__snapshots__/native-transfer.test.tsx.snap b/ui/pages/confirmations/components/confirm/info/native-transfer/__snapshots__/native-transfer.test.tsx.snap
index dcfe4ff35624..2cf799486baf 100644
--- a/ui/pages/confirmations/components/confirm/info/native-transfer/__snapshots__/native-transfer.test.tsx.snap
+++ b/ui/pages/confirmations/components/confirm/info/native-transfer/__snapshots__/native-transfer.test.tsx.snap
@@ -180,10 +180,11 @@ exports[`NativeTransferInfo renders correctly 1`] = `
           class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center"
         >
           <div
-            class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-account mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
+            class=""
           >
             <div
-              class="mm-avatar-account__jazzicon"
+              class="identicon"
+              style="height: 16px; width: 16px; border-radius: 8px;"
             >
               <div
                 style="border-radius: 50px; overflow: hidden; padding: 0px; margin: 0px; width: 16px; height: 16px; display: inline-block; background: rgb(1, 142, 119);"
diff --git a/ui/pages/confirmations/components/confirm/info/nft-token-transfer/__snapshots__/nft-token-transfer.test.tsx.snap b/ui/pages/confirmations/components/confirm/info/nft-token-transfer/__snapshots__/nft-token-transfer.test.tsx.snap
index e835130ff73c..e165e34d6642 100644
--- a/ui/pages/confirmations/components/confirm/info/nft-token-transfer/__snapshots__/nft-token-transfer.test.tsx.snap
+++ b/ui/pages/confirmations/components/confirm/info/nft-token-transfer/__snapshots__/nft-token-transfer.test.tsx.snap
@@ -208,10 +208,11 @@ exports[`NFTTokenTransferInfo renders correctly 1`] = `
           class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center"
         >
           <div
-            class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-account mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
+            class=""
           >
             <div
-              class="mm-avatar-account__jazzicon"
+              class="identicon"
+              style="height: 16px; width: 16px; border-radius: 8px;"
             >
               <div
                 style="border-radius: 50px; overflow: hidden; padding: 0px; margin: 0px; width: 16px; height: 16px; display: inline-block; background: rgb(1, 142, 119);"
diff --git a/ui/pages/confirmations/components/confirm/info/personal-sign/__snapshots__/personal-sign.test.tsx.snap b/ui/pages/confirmations/components/confirm/info/personal-sign/__snapshots__/personal-sign.test.tsx.snap
index 8adb5267bfe3..ef22ce3b8aa7 100644
--- a/ui/pages/confirmations/components/confirm/info/personal-sign/__snapshots__/personal-sign.test.tsx.snap
+++ b/ui/pages/confirmations/components/confirm/info/personal-sign/__snapshots__/personal-sign.test.tsx.snap
@@ -71,10 +71,11 @@ exports[`PersonalSignInfo handle reverse string properly 1`] = `
           class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center"
         >
           <div
-            class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-account mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
+            class=""
           >
             <div
-              class="mm-avatar-account__jazzicon"
+              class="identicon"
+              style="height: 16px; width: 16px; border-radius: 8px;"
             >
               <div
                 style="border-radius: 50px; overflow: hidden; padding: 0px; margin: 0px; width: 16px; height: 16px; display: inline-block; background: rgb(250, 58, 0);"
@@ -250,10 +251,11 @@ exports[`PersonalSignInfo renders correctly for personal sign request 1`] = `
           class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center"
         >
           <div
-            class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-account mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
+            class=""
           >
             <div
-              class="mm-avatar-account__jazzicon"
+              class="identicon"
+              style="height: 16px; width: 16px; border-radius: 8px;"
             >
               <div
                 style="border-radius: 50px; overflow: hidden; padding: 0px; margin: 0px; width: 16px; height: 16px; display: inline-block; background: rgb(250, 58, 0);"
diff --git a/ui/pages/confirmations/components/confirm/info/set-approval-for-all-info/__snapshots__/set-approval-for-all-info.test.tsx.snap b/ui/pages/confirmations/components/confirm/info/set-approval-for-all-info/__snapshots__/set-approval-for-all-info.test.tsx.snap
index 5da63fd56680..a2e8d0b30c6e 100644
--- a/ui/pages/confirmations/components/confirm/info/set-approval-for-all-info/__snapshots__/set-approval-for-all-info.test.tsx.snap
+++ b/ui/pages/confirmations/components/confirm/info/set-approval-for-all-info/__snapshots__/set-approval-for-all-info.test.tsx.snap
@@ -178,10 +178,11 @@ exports[`<SetApprovalForAllInfo /> renders component for approve request 1`] = `
           class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center"
         >
           <div
-            class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-account mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
+            class=""
           >
             <div
-              class="mm-avatar-account__jazzicon"
+              class="identicon"
+              style="height: 16px; width: 16px; border-radius: 8px;"
             >
               <div
                 style="border-radius: 50px; overflow: hidden; padding: 0px; margin: 0px; width: 16px; height: 16px; display: inline-block; background: rgb(24, 100, 242);"
diff --git a/ui/pages/confirmations/components/confirm/info/shared/transaction-data/__snapshots__/transaction-data.test.tsx.snap b/ui/pages/confirmations/components/confirm/info/shared/transaction-data/__snapshots__/transaction-data.test.tsx.snap
index 32a6373bb6ca..2e1d65d57972 100644
--- a/ui/pages/confirmations/components/confirm/info/shared/transaction-data/__snapshots__/transaction-data.test.tsx.snap
+++ b/ui/pages/confirmations/components/confirm/info/shared/transaction-data/__snapshots__/transaction-data.test.tsx.snap
@@ -131,10 +131,11 @@ exports[`TransactionData renders decoded data with names and descriptions 1`] =
                 class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center"
               >
                 <div
-                  class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-account mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
+                  class=""
                 >
                   <div
-                    class="mm-avatar-account__jazzicon"
+                    class="identicon"
+                    style="height: 16px; width: 16px; border-radius: 8px;"
                   />
                 </div>
                 <p
@@ -291,10 +292,11 @@ exports[`TransactionData renders decoded data with names and descriptions 1`] =
                 class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center"
               >
                 <div
-                  class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-account mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
+                  class=""
                 >
                   <div
-                    class="mm-avatar-account__jazzicon"
+                    class="identicon"
+                    style="height: 16px; width: 16px; border-radius: 8px;"
                   />
                 </div>
                 <p
@@ -440,10 +442,11 @@ exports[`TransactionData renders decoded data with names and descriptions 1`] =
                   class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center"
                 >
                   <div
-                    class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-account mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
+                    class=""
                   >
                     <div
-                      class="mm-avatar-account__jazzicon"
+                      class="identicon"
+                      style="height: 16px; width: 16px; border-radius: 8px;"
                     />
                   </div>
                   <p
@@ -471,10 +474,11 @@ exports[`TransactionData renders decoded data with names and descriptions 1`] =
                   class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center"
                 >
                   <div
-                    class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-account mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
+                    class=""
                   >
                     <div
-                      class="mm-avatar-account__jazzicon"
+                      class="identicon"
+                      style="height: 16px; width: 16px; border-radius: 8px;"
                     />
                   </div>
                   <p
@@ -502,10 +506,11 @@ exports[`TransactionData renders decoded data with names and descriptions 1`] =
                   class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center"
                 >
                   <div
-                    class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-account mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
+                    class=""
                   >
                     <div
-                      class="mm-avatar-account__jazzicon"
+                      class="identicon"
+                      style="height: 16px; width: 16px; border-radius: 8px;"
                     />
                   </div>
                   <p
@@ -663,10 +668,11 @@ exports[`TransactionData renders decoded data with names and descriptions 1`] =
                 class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center"
               >
                 <div
-                  class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-account mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
+                  class=""
                 >
                   <div
-                    class="mm-avatar-account__jazzicon"
+                    class="identicon"
+                    style="height: 16px; width: 16px; border-radius: 8px;"
                   />
                 </div>
                 <p
@@ -719,10 +725,11 @@ exports[`TransactionData renders decoded data with names and descriptions 1`] =
                 class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center"
               >
                 <div
-                  class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-account mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
+                  class=""
                 >
                   <div
-                    class="mm-avatar-account__jazzicon"
+                    class="identicon"
+                    style="height: 16px; width: 16px; border-radius: 8px;"
                   />
                 </div>
                 <p
@@ -879,10 +886,11 @@ exports[`TransactionData renders decoded data with names and descriptions 1`] =
                 class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center"
               >
                 <div
-                  class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-account mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
+                  class=""
                 >
                   <div
-                    class="mm-avatar-account__jazzicon"
+                    class="identicon"
+                    style="height: 16px; width: 16px; border-radius: 8px;"
                   />
                 </div>
                 <p
@@ -935,10 +943,11 @@ exports[`TransactionData renders decoded data with names and descriptions 1`] =
                 class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center"
               >
                 <div
-                  class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-account mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
+                  class=""
                 >
                   <div
-                    class="mm-avatar-account__jazzicon"
+                    class="identicon"
+                    style="height: 16px; width: 16px; border-radius: 8px;"
                   />
                 </div>
                 <p
@@ -1158,10 +1167,11 @@ exports[`TransactionData renders decoded data with no names 1`] = `
             class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center"
           >
             <div
-              class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-account mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
+              class=""
             >
               <div
-                class="mm-avatar-account__jazzicon"
+                class="identicon"
+                style="height: 16px; width: 16px; border-radius: 8px;"
               />
             </div>
             <p
@@ -1350,10 +1360,11 @@ exports[`TransactionData renders decoded data with tuples and arrays 1`] = `
             class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center"
           >
             <div
-              class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-account mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
+              class=""
             >
               <div
-                class="mm-avatar-account__jazzicon"
+                class="identicon"
+                style="height: 16px; width: 16px; border-radius: 8px;"
               />
             </div>
             <p
@@ -1520,10 +1531,11 @@ exports[`TransactionData renders decoded data with tuples and arrays 1`] = `
                   class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center"
                 >
                   <div
-                    class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-account mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
+                    class=""
                   >
                     <div
-                      class="mm-avatar-account__jazzicon"
+                      class="identicon"
+                      style="height: 16px; width: 16px; border-radius: 8px;"
                     />
                   </div>
                   <p
@@ -1750,10 +1762,11 @@ exports[`TransactionData renders decoded data with tuples and arrays 1`] = `
                   class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center"
                 >
                   <div
-                    class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-account mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
+                    class=""
                   >
                     <div
-                      class="mm-avatar-account__jazzicon"
+                      class="identicon"
+                      style="height: 16px; width: 16px; border-radius: 8px;"
                     />
                   </div>
                   <p
@@ -1980,10 +1993,11 @@ exports[`TransactionData renders decoded data with tuples and arrays 1`] = `
                   class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center"
                 >
                   <div
-                    class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-account mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
+                    class=""
                   >
                     <div
-                      class="mm-avatar-account__jazzicon"
+                      class="identicon"
+                      style="height: 16px; width: 16px; border-radius: 8px;"
                     />
                   </div>
                   <p
@@ -2173,10 +2187,11 @@ exports[`TransactionData renders decoded data with tuples and arrays 1`] = `
               class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center"
             >
               <div
-                class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-account mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
+                class=""
               >
                 <div
-                  class="mm-avatar-account__jazzicon"
+                  class="identicon"
+                  style="height: 16px; width: 16px; border-radius: 8px;"
                 />
               </div>
               <p
diff --git a/ui/pages/confirmations/components/confirm/info/shared/transaction-details/__snapshots__/transaction-details.test.tsx.snap b/ui/pages/confirmations/components/confirm/info/shared/transaction-details/__snapshots__/transaction-details.test.tsx.snap
index 9e9b9b23eca5..7ab32dda1be8 100644
--- a/ui/pages/confirmations/components/confirm/info/shared/transaction-details/__snapshots__/transaction-details.test.tsx.snap
+++ b/ui/pages/confirmations/components/confirm/info/shared/transaction-details/__snapshots__/transaction-details.test.tsx.snap
@@ -100,10 +100,11 @@ exports[`<TransactionDetails /> renders component for transaction details 1`] =
           class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center"
         >
           <div
-            class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-account mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
+            class=""
           >
             <div
-              class="mm-avatar-account__jazzicon"
+              class="identicon"
+              style="height: 16px; width: 16px; border-radius: 8px;"
             >
               <div
                 style="border-radius: 50px; overflow: hidden; padding: 0px; margin: 0px; width: 16px; height: 16px; display: inline-block; background: rgb(200, 20, 98);"
@@ -175,10 +176,11 @@ exports[`<TransactionDetails /> renders component for transaction details 1`] =
           class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center"
         >
           <div
-            class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-account mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
+            class=""
           >
             <div
-              class="mm-avatar-account__jazzicon"
+              class="identicon"
+              style="height: 16px; width: 16px; border-radius: 8px;"
             >
               <div
                 style="border-radius: 50px; overflow: hidden; padding: 0px; margin: 0px; width: 16px; height: 16px; display: inline-block; background: rgb(24, 100, 242);"
diff --git a/ui/pages/confirmations/components/confirm/info/token-transfer/__snapshots__/token-details-section.test.tsx.snap b/ui/pages/confirmations/components/confirm/info/token-transfer/__snapshots__/token-details-section.test.tsx.snap
index 6ab7ebb270b7..882ac4bef4ca 100644
--- a/ui/pages/confirmations/components/confirm/info/token-transfer/__snapshots__/token-details-section.test.tsx.snap
+++ b/ui/pages/confirmations/components/confirm/info/token-transfer/__snapshots__/token-details-section.test.tsx.snap
@@ -77,10 +77,11 @@ exports[`TokenDetailsSection renders correctly 1`] = `
           class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center"
         >
           <div
-            class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-account mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
+            class=""
           >
             <div
-              class="mm-avatar-account__jazzicon"
+              class="identicon"
+              style="height: 16px; width: 16px; border-radius: 8px;"
             >
               <div
                 style="border-radius: 50px; overflow: hidden; padding: 0px; margin: 0px; width: 16px; height: 16px; display: inline-block; background: rgb(1, 142, 119);"
diff --git a/ui/pages/confirmations/components/confirm/info/token-transfer/__snapshots__/token-transfer.test.tsx.snap b/ui/pages/confirmations/components/confirm/info/token-transfer/__snapshots__/token-transfer.test.tsx.snap
index 9b123875728a..a02b77fcac18 100644
--- a/ui/pages/confirmations/components/confirm/info/token-transfer/__snapshots__/token-transfer.test.tsx.snap
+++ b/ui/pages/confirmations/components/confirm/info/token-transfer/__snapshots__/token-transfer.test.tsx.snap
@@ -209,10 +209,11 @@ exports[`TokenTransferInfo renders correctly 1`] = `
           class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center"
         >
           <div
-            class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-account mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
+            class=""
           >
             <div
-              class="mm-avatar-account__jazzicon"
+              class="identicon"
+              style="height: 16px; width: 16px; border-radius: 8px;"
             >
               <div
                 style="border-radius: 50px; overflow: hidden; padding: 0px; margin: 0px; width: 16px; height: 16px; display: inline-block; background: rgb(1, 142, 119);"
diff --git a/ui/pages/confirmations/components/confirm/info/token-transfer/__snapshots__/transaction-flow-section.test.tsx.snap b/ui/pages/confirmations/components/confirm/info/token-transfer/__snapshots__/transaction-flow-section.test.tsx.snap
index 10955f0992bc..b42f23b15d4b 100644
--- a/ui/pages/confirmations/components/confirm/info/token-transfer/__snapshots__/transaction-flow-section.test.tsx.snap
+++ b/ui/pages/confirmations/components/confirm/info/token-transfer/__snapshots__/transaction-flow-section.test.tsx.snap
@@ -36,10 +36,11 @@ exports[`<TransactionFlowSection /> renders correctly 1`] = `
               class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center"
             >
               <div
-                class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-account mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
+                class=""
               >
                 <div
-                  class="mm-avatar-account__jazzicon"
+                  class="identicon"
+                  style="height: 16px; width: 16px; border-radius: 8px;"
                 >
                   <div
                     style="border-radius: 50px; overflow: hidden; padding: 0px; margin: 0px; width: 16px; height: 16px; display: inline-block; background: rgb(24, 100, 242);"
@@ -119,10 +120,11 @@ exports[`<TransactionFlowSection /> renders correctly 1`] = `
               class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center"
             >
               <div
-                class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-account mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
+                class=""
               >
                 <div
-                  class="mm-avatar-account__jazzicon"
+                  class="identicon"
+                  style="height: 16px; width: 16px; border-radius: 8px;"
                 >
                   <div
                     style="border-radius: 50px; overflow: hidden; padding: 0px; margin: 0px; width: 16px; height: 16px; display: inline-block; background: rgb(242, 194, 2);"
diff --git a/ui/pages/confirmations/components/confirm/info/typed-sign-v1/__snapshots__/typed-sign-v1.test.tsx.snap b/ui/pages/confirmations/components/confirm/info/typed-sign-v1/__snapshots__/typed-sign-v1.test.tsx.snap
index f00b51538750..b49b0f345265 100644
--- a/ui/pages/confirmations/components/confirm/info/typed-sign-v1/__snapshots__/typed-sign-v1.test.tsx.snap
+++ b/ui/pages/confirmations/components/confirm/info/typed-sign-v1/__snapshots__/typed-sign-v1.test.tsx.snap
@@ -71,10 +71,11 @@ exports[`TypedSignInfo correctly renders typed sign data request 1`] = `
           class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center"
         >
           <div
-            class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-account mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
+            class=""
           >
             <div
-              class="mm-avatar-account__jazzicon"
+              class="identicon"
+              style="height: 16px; width: 16px; border-radius: 8px;"
             >
               <div
                 style="border-radius: 50px; overflow: hidden; padding: 0px; margin: 0px; width: 16px; height: 16px; display: inline-block; background: rgb(200, 20, 59);"
diff --git a/ui/pages/confirmations/components/confirm/info/typed-sign/__snapshots__/typed-sign.test.tsx.snap b/ui/pages/confirmations/components/confirm/info/typed-sign/__snapshots__/typed-sign.test.tsx.snap
index 20998032a049..f8c3bfe2e55b 100644
--- a/ui/pages/confirmations/components/confirm/info/typed-sign/__snapshots__/typed-sign.test.tsx.snap
+++ b/ui/pages/confirmations/components/confirm/info/typed-sign/__snapshots__/typed-sign.test.tsx.snap
@@ -154,10 +154,11 @@ exports[`TypedSignInfo correctly renders permit sign type 1`] = `
           class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center"
         >
           <div
-            class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-account mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
+            class=""
           >
             <div
-              class="mm-avatar-account__jazzicon"
+              class="identicon"
+              style="height: 16px; width: 16px; border-radius: 8px;"
             >
               <div
                 style="border-radius: 50px; overflow: hidden; padding: 0px; margin: 0px; width: 16px; height: 16px; display: inline-block; background: rgb(200, 20, 65);"
@@ -274,10 +275,11 @@ exports[`TypedSignInfo correctly renders permit sign type 1`] = `
           class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center"
         >
           <div
-            class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-account mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
+            class=""
           >
             <div
-              class="mm-avatar-account__jazzicon"
+              class="identicon"
+              style="height: 16px; width: 16px; border-radius: 8px;"
             >
               <div
                 style="border-radius: 50px; overflow: hidden; padding: 0px; margin: 0px; width: 16px; height: 16px; display: inline-block; background: rgb(1, 142, 116);"
@@ -349,10 +351,11 @@ exports[`TypedSignInfo correctly renders permit sign type 1`] = `
           class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center"
         >
           <div
-            class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-account mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
+            class=""
           >
             <div
-              class="mm-avatar-account__jazzicon"
+              class="identicon"
+              style="height: 16px; width: 16px; border-radius: 8px;"
             >
               <div
                 style="border-radius: 50px; overflow: hidden; padding: 0px; margin: 0px; width: 16px; height: 16px; display: inline-block; background: rgb(200, 20, 59);"
@@ -602,10 +605,11 @@ exports[`TypedSignInfo correctly renders permit sign type with no deadline 1`] =
           class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center"
         >
           <div
-            class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-account mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
+            class=""
           >
             <div
-              class="mm-avatar-account__jazzicon"
+              class="identicon"
+              style="height: 16px; width: 16px; border-radius: 8px;"
             >
               <div
                 style="border-radius: 50px; overflow: hidden; padding: 0px; margin: 0px; width: 16px; height: 16px; display: inline-block; background: rgb(200, 20, 65);"
@@ -722,10 +726,11 @@ exports[`TypedSignInfo correctly renders permit sign type with no deadline 1`] =
           class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center"
         >
           <div
-            class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-account mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
+            class=""
           >
             <div
-              class="mm-avatar-account__jazzicon"
+              class="identicon"
+              style="height: 16px; width: 16px; border-radius: 8px;"
             >
               <div
                 style="border-radius: 50px; overflow: hidden; padding: 0px; margin: 0px; width: 16px; height: 16px; display: inline-block; background: rgb(1, 142, 116);"
@@ -797,10 +802,11 @@ exports[`TypedSignInfo correctly renders permit sign type with no deadline 1`] =
           class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center"
         >
           <div
-            class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-account mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
+            class=""
           >
             <div
-              class="mm-avatar-account__jazzicon"
+              class="identicon"
+              style="height: 16px; width: 16px; border-radius: 8px;"
             >
               <div
                 style="border-radius: 50px; overflow: hidden; padding: 0px; margin: 0px; width: 16px; height: 16px; display: inline-block; background: rgb(200, 20, 59);"
@@ -970,10 +976,11 @@ exports[`TypedSignInfo renders origin for typed sign data request 1`] = `
           class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center"
         >
           <div
-            class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-account mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
+            class=""
           >
             <div
-              class="mm-avatar-account__jazzicon"
+              class="identicon"
+              style="height: 16px; width: 16px; border-radius: 8px;"
             >
               <div
                 style="border-radius: 50px; overflow: hidden; padding: 0px; margin: 0px; width: 16px; height: 16px; display: inline-block; background: rgb(1, 142, 116);"
@@ -1045,10 +1052,11 @@ exports[`TypedSignInfo renders origin for typed sign data request 1`] = `
           class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center"
         >
           <div
-            class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-account mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
+            class=""
           >
             <div
-              class="mm-avatar-account__jazzicon"
+              class="identicon"
+              style="height: 16px; width: 16px; border-radius: 8px;"
             >
               <div
                 style="border-radius: 50px; overflow: hidden; padding: 0px; margin: 0px; width: 16px; height: 16px; display: inline-block; background: rgb(250, 58, 0);"
@@ -1291,10 +1299,11 @@ exports[`TypedSignInfo renders origin for typed sign data request 1`] = `
                           class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center"
                         >
                           <div
-                            class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-account mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
+                            class=""
                           >
                             <div
-                              class="mm-avatar-account__jazzicon"
+                              class="identicon"
+                              style="height: 16px; width: 16px; border-radius: 8px;"
                             >
                               <div
                                 style="border-radius: 50px; overflow: hidden; padding: 0px; margin: 0px; width: 16px; height: 16px; display: inline-block; background: rgb(35, 98, 225);"
@@ -1367,10 +1376,11 @@ exports[`TypedSignInfo renders origin for typed sign data request 1`] = `
                           class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center"
                         >
                           <div
-                            class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-account mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
+                            class=""
                           >
                             <div
-                              class="mm-avatar-account__jazzicon"
+                              class="identicon"
+                              style="height: 16px; width: 16px; border-radius: 8px;"
                             >
                               <div
                                 style="border-radius: 50px; overflow: hidden; padding: 0px; margin: 0px; width: 16px; height: 16px; display: inline-block; background: rgb(24, 183, 242);"
@@ -1443,10 +1453,11 @@ exports[`TypedSignInfo renders origin for typed sign data request 1`] = `
                           class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center"
                         >
                           <div
-                            class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-account mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
+                            class=""
                           >
                             <div
-                              class="mm-avatar-account__jazzicon"
+                              class="identicon"
+                              style="height: 16px; width: 16px; border-radius: 8px;"
                             >
                               <div
                                 style="border-radius: 50px; overflow: hidden; padding: 0px; margin: 0px; width: 16px; height: 16px; display: inline-block; background: rgb(245, 143, 0);"
@@ -1615,10 +1626,11 @@ exports[`TypedSignInfo renders origin for typed sign data request 1`] = `
                               class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center"
                             >
                               <div
-                                class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-account mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
+                                class=""
                               >
                                 <div
-                                  class="mm-avatar-account__jazzicon"
+                                  class="identicon"
+                                  style="height: 16px; width: 16px; border-radius: 8px;"
                                 >
                                   <div
                                     style="border-radius: 50px; overflow: hidden; padding: 0px; margin: 0px; width: 16px; height: 16px; display: inline-block; background: rgb(242, 162, 2);"
@@ -1691,10 +1703,11 @@ exports[`TypedSignInfo renders origin for typed sign data request 1`] = `
                               class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center"
                             >
                               <div
-                                class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-account mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
+                                class=""
                               >
                                 <div
-                                  class="mm-avatar-account__jazzicon"
+                                  class="identicon"
+                                  style="height: 16px; width: 16px; border-radius: 8px;"
                                 >
                                   <div
                                     style="border-radius: 50px; overflow: hidden; padding: 0px; margin: 0px; width: 16px; height: 16px; display: inline-block; background: rgb(250, 54, 0);"
@@ -1767,10 +1780,11 @@ exports[`TypedSignInfo renders origin for typed sign data request 1`] = `
                               class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center"
                             >
                               <div
-                                class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-account mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
+                                class=""
                               >
                                 <div
-                                  class="mm-avatar-account__jazzicon"
+                                  class="identicon"
+                                  style="height: 16px; width: 16px; border-radius: 8px;"
                                 >
                                   <div
                                     style="border-radius: 50px; overflow: hidden; padding: 0px; margin: 0px; width: 16px; height: 16px; display: inline-block; background: rgb(200, 20, 86);"
@@ -1904,10 +1918,11 @@ exports[`TypedSignInfo should render message for typed sign v3 request 1`] = `
           class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center"
         >
           <div
-            class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-account mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
+            class=""
           >
             <div
-              class="mm-avatar-account__jazzicon"
+              class="identicon"
+              style="height: 16px; width: 16px; border-radius: 8px;"
             >
               <div
                 style="border-radius: 50px; overflow: hidden; padding: 0px; margin: 0px; width: 16px; height: 16px; display: inline-block; background: rgb(1, 142, 116);"
@@ -1979,10 +1994,11 @@ exports[`TypedSignInfo should render message for typed sign v3 request 1`] = `
           class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center"
         >
           <div
-            class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-account mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
+            class=""
           >
             <div
-              class="mm-avatar-account__jazzicon"
+              class="identicon"
+              style="height: 16px; width: 16px; border-radius: 8px;"
             >
               <div
                 style="border-radius: 50px; overflow: hidden; padding: 0px; margin: 0px; width: 16px; height: 16px; display: inline-block; background: rgb(200, 20, 59);"
@@ -2175,10 +2191,11 @@ exports[`TypedSignInfo should render message for typed sign v3 request 1`] = `
                       class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center"
                     >
                       <div
-                        class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-account mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
+                        class=""
                       >
                         <div
-                          class="mm-avatar-account__jazzicon"
+                          class="identicon"
+                          style="height: 16px; width: 16px; border-radius: 8px;"
                         >
                           <div
                             style="border-radius: 50px; overflow: hidden; padding: 0px; margin: 0px; width: 16px; height: 16px; display: inline-block; background: rgb(35, 98, 225);"
@@ -2303,10 +2320,11 @@ exports[`TypedSignInfo should render message for typed sign v3 request 1`] = `
                       class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center"
                     >
                       <div
-                        class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-account mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
+                        class=""
                       >
                         <div
-                          class="mm-avatar-account__jazzicon"
+                          class="identicon"
+                          style="height: 16px; width: 16px; border-radius: 8px;"
                         >
                           <div
                             style="border-radius: 50px; overflow: hidden; padding: 0px; margin: 0px; width: 16px; height: 16px; display: inline-block; background: rgb(242, 162, 2);"
@@ -2465,10 +2483,11 @@ exports[`TypedSignInfo should render message for typed sign v4 request 1`] = `
           class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center"
         >
           <div
-            class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-account mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
+            class=""
           >
             <div
-              class="mm-avatar-account__jazzicon"
+              class="identicon"
+              style="height: 16px; width: 16px; border-radius: 8px;"
             >
               <div
                 style="border-radius: 50px; overflow: hidden; padding: 0px; margin: 0px; width: 16px; height: 16px; display: inline-block; background: rgb(1, 142, 116);"
@@ -2540,10 +2559,11 @@ exports[`TypedSignInfo should render message for typed sign v4 request 1`] = `
           class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center"
         >
           <div
-            class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-account mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
+            class=""
           >
             <div
-              class="mm-avatar-account__jazzicon"
+              class="identicon"
+              style="height: 16px; width: 16px; border-radius: 8px;"
             >
               <div
                 style="border-radius: 50px; overflow: hidden; padding: 0px; margin: 0px; width: 16px; height: 16px; display: inline-block; background: rgb(250, 58, 0);"
@@ -2786,10 +2806,11 @@ exports[`TypedSignInfo should render message for typed sign v4 request 1`] = `
                           class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center"
                         >
                           <div
-                            class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-account mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
+                            class=""
                           >
                             <div
-                              class="mm-avatar-account__jazzicon"
+                              class="identicon"
+                              style="height: 16px; width: 16px; border-radius: 8px;"
                             >
                               <div
                                 style="border-radius: 50px; overflow: hidden; padding: 0px; margin: 0px; width: 16px; height: 16px; display: inline-block; background: rgb(35, 98, 225);"
@@ -2862,10 +2883,11 @@ exports[`TypedSignInfo should render message for typed sign v4 request 1`] = `
                           class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center"
                         >
                           <div
-                            class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-account mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
+                            class=""
                           >
                             <div
-                              class="mm-avatar-account__jazzicon"
+                              class="identicon"
+                              style="height: 16px; width: 16px; border-radius: 8px;"
                             >
                               <div
                                 style="border-radius: 50px; overflow: hidden; padding: 0px; margin: 0px; width: 16px; height: 16px; display: inline-block; background: rgb(24, 183, 242);"
@@ -2938,10 +2960,11 @@ exports[`TypedSignInfo should render message for typed sign v4 request 1`] = `
                           class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center"
                         >
                           <div
-                            class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-account mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
+                            class=""
                           >
                             <div
-                              class="mm-avatar-account__jazzicon"
+                              class="identicon"
+                              style="height: 16px; width: 16px; border-radius: 8px;"
                             >
                               <div
                                 style="border-radius: 50px; overflow: hidden; padding: 0px; margin: 0px; width: 16px; height: 16px; display: inline-block; background: rgb(245, 143, 0);"
@@ -3110,10 +3133,11 @@ exports[`TypedSignInfo should render message for typed sign v4 request 1`] = `
                               class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center"
                             >
                               <div
-                                class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-account mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
+                                class=""
                               >
                                 <div
-                                  class="mm-avatar-account__jazzicon"
+                                  class="identicon"
+                                  style="height: 16px; width: 16px; border-radius: 8px;"
                                 >
                                   <div
                                     style="border-radius: 50px; overflow: hidden; padding: 0px; margin: 0px; width: 16px; height: 16px; display: inline-block; background: rgb(242, 162, 2);"
@@ -3186,10 +3210,11 @@ exports[`TypedSignInfo should render message for typed sign v4 request 1`] = `
                               class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center"
                             >
                               <div
-                                class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-account mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
+                                class=""
                               >
                                 <div
-                                  class="mm-avatar-account__jazzicon"
+                                  class="identicon"
+                                  style="height: 16px; width: 16px; border-radius: 8px;"
                                 >
                                   <div
                                     style="border-radius: 50px; overflow: hidden; padding: 0px; margin: 0px; width: 16px; height: 16px; display: inline-block; background: rgb(250, 54, 0);"
@@ -3262,10 +3287,11 @@ exports[`TypedSignInfo should render message for typed sign v4 request 1`] = `
                               class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center"
                             >
                               <div
-                                class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-account mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
+                                class=""
                               >
                                 <div
-                                  class="mm-avatar-account__jazzicon"
+                                  class="identicon"
+                                  style="height: 16px; width: 16px; border-radius: 8px;"
                                 >
                                   <div
                                     style="border-radius: 50px; overflow: hidden; padding: 0px; margin: 0px; width: 16px; height: 16px; display: inline-block; background: rgb(200, 20, 86);"
diff --git a/ui/pages/confirmations/components/confirm/row/__snapshots__/dataTree.test.tsx.snap b/ui/pages/confirmations/components/confirm/row/__snapshots__/dataTree.test.tsx.snap
index e73a4613f8d2..019c718bbcf1 100644
--- a/ui/pages/confirmations/components/confirm/row/__snapshots__/dataTree.test.tsx.snap
+++ b/ui/pages/confirmations/components/confirm/row/__snapshots__/dataTree.test.tsx.snap
@@ -197,10 +197,11 @@ exports[`DataTree should match snapshot 1`] = `
                   class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center"
                 >
                   <div
-                    class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-account mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
+                    class=""
                   >
                     <div
-                      class="mm-avatar-account__jazzicon"
+                      class="identicon"
+                      style="height: 16px; width: 16px; border-radius: 8px;"
                     >
                       <div
                         style="border-radius: 50px; overflow: hidden; padding: 0px; margin: 0px; width: 16px; height: 16px; display: inline-block; background: rgb(35, 98, 225);"
@@ -273,10 +274,11 @@ exports[`DataTree should match snapshot 1`] = `
                   class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center"
                 >
                   <div
-                    class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-account mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
+                    class=""
                   >
                     <div
-                      class="mm-avatar-account__jazzicon"
+                      class="identicon"
+                      style="height: 16px; width: 16px; border-radius: 8px;"
                     >
                       <div
                         style="border-radius: 50px; overflow: hidden; padding: 0px; margin: 0px; width: 16px; height: 16px; display: inline-block; background: rgb(24, 183, 242);"
@@ -445,10 +447,11 @@ exports[`DataTree should match snapshot 1`] = `
                       class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center"
                     >
                       <div
-                        class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-account mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
+                        class=""
                       >
                         <div
-                          class="mm-avatar-account__jazzicon"
+                          class="identicon"
+                          style="height: 16px; width: 16px; border-radius: 8px;"
                         >
                           <div
                             style="border-radius: 50px; overflow: hidden; padding: 0px; margin: 0px; width: 16px; height: 16px; display: inline-block; background: rgb(242, 162, 2);"
@@ -521,10 +524,11 @@ exports[`DataTree should match snapshot 1`] = `
                       class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center"
                     >
                       <div
-                        class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-account mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
+                        class=""
                       >
                         <div
-                          class="mm-avatar-account__jazzicon"
+                          class="identicon"
+                          style="height: 16px; width: 16px; border-radius: 8px;"
                         >
                           <div
                             style="border-radius: 50px; overflow: hidden; padding: 0px; margin: 0px; width: 16px; height: 16px; display: inline-block; background: rgb(250, 54, 0);"
@@ -597,10 +601,11 @@ exports[`DataTree should match snapshot 1`] = `
                       class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center"
                     >
                       <div
-                        class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-account mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
+                        class=""
                       >
                         <div
-                          class="mm-avatar-account__jazzicon"
+                          class="identicon"
+                          style="height: 16px; width: 16px; border-radius: 8px;"
                         >
                           <div
                             style="border-radius: 50px; overflow: hidden; padding: 0px; margin: 0px; width: 16px; height: 16px; display: inline-block; background: rgb(200, 20, 86);"
diff --git a/ui/pages/confirmations/components/confirm/row/typed-sign-data/__snapshots__/typedSignData.test.tsx.snap b/ui/pages/confirmations/components/confirm/row/typed-sign-data/__snapshots__/typedSignData.test.tsx.snap
index 4f55f5f2d68e..c88e4fc8efac 100644
--- a/ui/pages/confirmations/components/confirm/row/typed-sign-data/__snapshots__/typedSignData.test.tsx.snap
+++ b/ui/pages/confirmations/components/confirm/row/typed-sign-data/__snapshots__/typedSignData.test.tsx.snap
@@ -165,10 +165,11 @@ exports[`ConfirmInfoRowTypedSignData should match snapshot 1`] = `
                       class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center"
                     >
                       <div
-                        class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-account mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
+                        class=""
                       >
                         <div
-                          class="mm-avatar-account__jazzicon"
+                          class="identicon"
+                          style="height: 16px; width: 16px; border-radius: 8px;"
                         >
                           <div
                             style="border-radius: 50px; overflow: hidden; padding: 0px; margin: 0px; width: 16px; height: 16px; display: inline-block; background: rgb(35, 98, 225);"
@@ -241,10 +242,11 @@ exports[`ConfirmInfoRowTypedSignData should match snapshot 1`] = `
                       class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center"
                     >
                       <div
-                        class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-account mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
+                        class=""
                       >
                         <div
-                          class="mm-avatar-account__jazzicon"
+                          class="identicon"
+                          style="height: 16px; width: 16px; border-radius: 8px;"
                         >
                           <div
                             style="border-radius: 50px; overflow: hidden; padding: 0px; margin: 0px; width: 16px; height: 16px; display: inline-block; background: rgb(24, 183, 242);"
@@ -317,10 +319,11 @@ exports[`ConfirmInfoRowTypedSignData should match snapshot 1`] = `
                       class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center"
                     >
                       <div
-                        class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-account mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
+                        class=""
                       >
                         <div
-                          class="mm-avatar-account__jazzicon"
+                          class="identicon"
+                          style="height: 16px; width: 16px; border-radius: 8px;"
                         >
                           <div
                             style="border-radius: 50px; overflow: hidden; padding: 0px; margin: 0px; width: 16px; height: 16px; display: inline-block; background: rgb(245, 143, 0);"
@@ -489,10 +492,11 @@ exports[`ConfirmInfoRowTypedSignData should match snapshot 1`] = `
                           class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center"
                         >
                           <div
-                            class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-account mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
+                            class=""
                           >
                             <div
-                              class="mm-avatar-account__jazzicon"
+                              class="identicon"
+                              style="height: 16px; width: 16px; border-radius: 8px;"
                             >
                               <div
                                 style="border-radius: 50px; overflow: hidden; padding: 0px; margin: 0px; width: 16px; height: 16px; display: inline-block; background: rgb(242, 162, 2);"
@@ -565,10 +569,11 @@ exports[`ConfirmInfoRowTypedSignData should match snapshot 1`] = `
                           class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center"
                         >
                           <div
-                            class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-account mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
+                            class=""
                           >
                             <div
-                              class="mm-avatar-account__jazzicon"
+                              class="identicon"
+                              style="height: 16px; width: 16px; border-radius: 8px;"
                             >
                               <div
                                 style="border-radius: 50px; overflow: hidden; padding: 0px; margin: 0px; width: 16px; height: 16px; display: inline-block; background: rgb(250, 54, 0);"
@@ -641,10 +646,11 @@ exports[`ConfirmInfoRowTypedSignData should match snapshot 1`] = `
                           class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center"
                         >
                           <div
-                            class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-account mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
+                            class=""
                           >
                             <div
-                              class="mm-avatar-account__jazzicon"
+                              class="identicon"
+                              style="height: 16px; width: 16px; border-radius: 8px;"
                             >
                               <div
                                 style="border-radius: 50px; overflow: hidden; padding: 0px; margin: 0px; width: 16px; height: 16px; display: inline-block; background: rgb(200, 20, 86);"
diff --git a/ui/pages/confirmations/confirm/__snapshots__/confirm.test.tsx.snap b/ui/pages/confirmations/confirm/__snapshots__/confirm.test.tsx.snap
index e7e2e499dfe9..422be322dc06 100644
--- a/ui/pages/confirmations/confirm/__snapshots__/confirm.test.tsx.snap
+++ b/ui/pages/confirmations/confirm/__snapshots__/confirm.test.tsx.snap
@@ -203,10 +203,11 @@ exports[`Confirm matches snapshot for signature - personal sign type 1`] = `
                   class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center"
                 >
                   <div
-                    class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-account mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
+                    class=""
                   >
                     <div
-                      class="mm-avatar-account__jazzicon"
+                      class="identicon"
+                      style="height: 16px; width: 16px; border-radius: 8px;"
                     >
                       <div
                         style="border-radius: 50px; overflow: hidden; padding: 0px; margin: 0px; width: 16px; height: 16px; display: inline-block; background: rgb(250, 58, 0);"
@@ -673,10 +674,11 @@ exports[`Confirm should match snapshot for signature - typed sign - V4 - PermitB
                   class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center"
                 >
                   <div
-                    class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-account mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
+                    class=""
                   >
                     <div
-                      class="mm-avatar-account__jazzicon"
+                      class="identicon"
+                      style="height: 16px; width: 16px; border-radius: 8px;"
                     >
                       <div
                         style="border-radius: 50px; overflow: hidden; padding: 0px; margin: 0px; width: 16px; height: 16px; display: inline-block; background: rgb(250, 171, 0);"
@@ -793,10 +795,11 @@ exports[`Confirm should match snapshot for signature - typed sign - V4 - PermitB
                   class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center"
                 >
                   <div
-                    class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-account mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
+                    class=""
                   >
                     <div
-                      class="mm-avatar-account__jazzicon"
+                      class="identicon"
+                      style="height: 16px; width: 16px; border-radius: 8px;"
                     >
                       <div
                         style="border-radius: 50px; overflow: hidden; padding: 0px; margin: 0px; width: 16px; height: 16px; display: inline-block; background: rgb(24, 151, 242);"
@@ -868,10 +871,11 @@ exports[`Confirm should match snapshot for signature - typed sign - V4 - PermitB
                   class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center"
                 >
                   <div
-                    class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-account mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
+                    class=""
                   >
                     <div
-                      class="mm-avatar-account__jazzicon"
+                      class="identicon"
+                      style="height: 16px; width: 16px; border-radius: 8px;"
                     >
                       <div
                         style="border-radius: 50px; overflow: hidden; padding: 0px; margin: 0px; width: 16px; height: 16px; display: inline-block; background: rgb(200, 20, 59);"
@@ -1276,10 +1280,11 @@ exports[`Confirm should match snapshot for signature - typed sign - V4 - PermitS
                   class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center"
                 >
                   <div
-                    class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-account mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
+                    class=""
                   >
                     <div
-                      class="mm-avatar-account__jazzicon"
+                      class="identicon"
+                      style="height: 16px; width: 16px; border-radius: 8px;"
                     >
                       <div
                         style="border-radius: 50px; overflow: hidden; padding: 0px; margin: 0px; width: 16px; height: 16px; display: inline-block; background: rgb(250, 171, 0);"
@@ -1396,10 +1401,11 @@ exports[`Confirm should match snapshot for signature - typed sign - V4 - PermitS
                   class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center"
                 >
                   <div
-                    class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-account mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
+                    class=""
                   >
                     <div
-                      class="mm-avatar-account__jazzicon"
+                      class="identicon"
+                      style="height: 16px; width: 16px; border-radius: 8px;"
                     >
                       <div
                         style="border-radius: 50px; overflow: hidden; padding: 0px; margin: 0px; width: 16px; height: 16px; display: inline-block; background: rgb(24, 151, 242);"
@@ -1471,10 +1477,11 @@ exports[`Confirm should match snapshot for signature - typed sign - V4 - PermitS
                   class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center"
                 >
                   <div
-                    class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-account mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
+                    class=""
                   >
                     <div
-                      class="mm-avatar-account__jazzicon"
+                      class="identicon"
+                      style="height: 16px; width: 16px; border-radius: 8px;"
                     >
                       <div
                         style="border-radius: 50px; overflow: hidden; padding: 0px; margin: 0px; width: 16px; height: 16px; display: inline-block; background: rgb(200, 20, 59);"
@@ -1795,10 +1802,11 @@ exports[`Confirm should match snapshot for signature - typed sign - V4 1`] = `
                   class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center"
                 >
                   <div
-                    class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-account mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
+                    class=""
                   >
                     <div
-                      class="mm-avatar-account__jazzicon"
+                      class="identicon"
+                      style="height: 16px; width: 16px; border-radius: 8px;"
                     >
                       <div
                         style="border-radius: 50px; overflow: hidden; padding: 0px; margin: 0px; width: 16px; height: 16px; display: inline-block; background: rgb(1, 142, 116);"
@@ -1870,10 +1878,11 @@ exports[`Confirm should match snapshot for signature - typed sign - V4 1`] = `
                   class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center"
                 >
                   <div
-                    class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-account mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
+                    class=""
                   >
                     <div
-                      class="mm-avatar-account__jazzicon"
+                      class="identicon"
+                      style="height: 16px; width: 16px; border-radius: 8px;"
                     >
                       <div
                         style="border-radius: 50px; overflow: hidden; padding: 0px; margin: 0px; width: 16px; height: 16px; display: inline-block; background: rgb(250, 58, 0);"
@@ -2116,10 +2125,11 @@ exports[`Confirm should match snapshot for signature - typed sign - V4 1`] = `
                                   class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center"
                                 >
                                   <div
-                                    class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-account mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
+                                    class=""
                                   >
                                     <div
-                                      class="mm-avatar-account__jazzicon"
+                                      class="identicon"
+                                      style="height: 16px; width: 16px; border-radius: 8px;"
                                     >
                                       <div
                                         style="border-radius: 50px; overflow: hidden; padding: 0px; margin: 0px; width: 16px; height: 16px; display: inline-block; background: rgb(35, 98, 225);"
@@ -2192,10 +2202,11 @@ exports[`Confirm should match snapshot for signature - typed sign - V4 1`] = `
                                   class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center"
                                 >
                                   <div
-                                    class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-account mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
+                                    class=""
                                   >
                                     <div
-                                      class="mm-avatar-account__jazzicon"
+                                      class="identicon"
+                                      style="height: 16px; width: 16px; border-radius: 8px;"
                                     >
                                       <div
                                         style="border-radius: 50px; overflow: hidden; padding: 0px; margin: 0px; width: 16px; height: 16px; display: inline-block; background: rgb(24, 183, 242);"
@@ -2268,10 +2279,11 @@ exports[`Confirm should match snapshot for signature - typed sign - V4 1`] = `
                                   class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center"
                                 >
                                   <div
-                                    class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-account mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
+                                    class=""
                                   >
                                     <div
-                                      class="mm-avatar-account__jazzicon"
+                                      class="identicon"
+                                      style="height: 16px; width: 16px; border-radius: 8px;"
                                     >
                                       <div
                                         style="border-radius: 50px; overflow: hidden; padding: 0px; margin: 0px; width: 16px; height: 16px; display: inline-block; background: rgb(245, 143, 0);"
@@ -2440,10 +2452,11 @@ exports[`Confirm should match snapshot for signature - typed sign - V4 1`] = `
                                       class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center"
                                     >
                                       <div
-                                        class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-account mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
+                                        class=""
                                       >
                                         <div
-                                          class="mm-avatar-account__jazzicon"
+                                          class="identicon"
+                                          style="height: 16px; width: 16px; border-radius: 8px;"
                                         >
                                           <div
                                             style="border-radius: 50px; overflow: hidden; padding: 0px; margin: 0px; width: 16px; height: 16px; display: inline-block; background: rgb(242, 162, 2);"
@@ -2516,10 +2529,11 @@ exports[`Confirm should match snapshot for signature - typed sign - V4 1`] = `
                                       class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center"
                                     >
                                       <div
-                                        class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-account mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
+                                        class=""
                                       >
                                         <div
-                                          class="mm-avatar-account__jazzicon"
+                                          class="identicon"
+                                          style="height: 16px; width: 16px; border-radius: 8px;"
                                         >
                                           <div
                                             style="border-radius: 50px; overflow: hidden; padding: 0px; margin: 0px; width: 16px; height: 16px; display: inline-block; background: rgb(250, 54, 0);"
@@ -2592,10 +2606,11 @@ exports[`Confirm should match snapshot for signature - typed sign - V4 1`] = `
                                       class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center"
                                     >
                                       <div
-                                        class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-account mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
+                                        class=""
                                       >
                                         <div
-                                          class="mm-avatar-account__jazzicon"
+                                          class="identicon"
+                                          style="height: 16px; width: 16px; border-radius: 8px;"
                                         >
                                           <div
                                             style="border-radius: 50px; overflow: hidden; padding: 0px; margin: 0px; width: 16px; height: 16px; display: inline-block; background: rgb(200, 20, 86);"
@@ -2962,10 +2977,11 @@ exports[`Confirm should match snapshot for signature - typed sign - permit 1`] =
                   class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center"
                 >
                   <div
-                    class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-account mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
+                    class=""
                   >
                     <div
-                      class="mm-avatar-account__jazzicon"
+                      class="identicon"
+                      style="height: 16px; width: 16px; border-radius: 8px;"
                     >
                       <div
                         style="border-radius: 50px; overflow: hidden; padding: 0px; margin: 0px; width: 16px; height: 16px; display: inline-block; background: rgb(200, 20, 65);"
@@ -3082,10 +3098,11 @@ exports[`Confirm should match snapshot for signature - typed sign - permit 1`] =
                   class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center"
                 >
                   <div
-                    class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-account mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
+                    class=""
                   >
                     <div
-                      class="mm-avatar-account__jazzicon"
+                      class="identicon"
+                      style="height: 16px; width: 16px; border-radius: 8px;"
                     >
                       <div
                         style="border-radius: 50px; overflow: hidden; padding: 0px; margin: 0px; width: 16px; height: 16px; display: inline-block; background: rgb(1, 142, 116);"
@@ -3157,10 +3174,11 @@ exports[`Confirm should match snapshot for signature - typed sign - permit 1`] =
                   class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center"
                 >
                   <div
-                    class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-account mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
+                    class=""
                   >
                     <div
-                      class="mm-avatar-account__jazzicon"
+                      class="identicon"
+                      style="height: 16px; width: 16px; border-radius: 8px;"
                     >
                       <div
                         style="border-radius: 50px; overflow: hidden; padding: 0px; margin: 0px; width: 16px; height: 16px; display: inline-block; background: rgb(200, 20, 59);"
@@ -3479,10 +3497,11 @@ exports[`Confirm should match snapshot signature - typed sign - order 1`] = `
                   class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center"
                 >
                   <div
-                    class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-account mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
+                    class=""
                   >
                     <div
-                      class="mm-avatar-account__jazzicon"
+                      class="identicon"
+                      style="height: 16px; width: 16px; border-radius: 8px;"
                     >
                       <div
                         style="border-radius: 50px; overflow: hidden; padding: 0px; margin: 0px; width: 16px; height: 16px; display: inline-block; background: rgb(200, 20, 101);"
@@ -3554,10 +3573,11 @@ exports[`Confirm should match snapshot signature - typed sign - order 1`] = `
                   class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center"
                 >
                   <div
-                    class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-account mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
+                    class=""
                   >
                     <div
-                      class="mm-avatar-account__jazzicon"
+                      class="identicon"
+                      style="height: 16px; width: 16px; border-radius: 8px;"
                     >
                       <div
                         style="border-radius: 50px; overflow: hidden; padding: 0px; margin: 0px; width: 16px; height: 16px; display: inline-block; background: rgb(200, 20, 59);"
@@ -3740,10 +3760,11 @@ exports[`Confirm should match snapshot signature - typed sign - order 1`] = `
                           class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center"
                         >
                           <div
-                            class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-account mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
+                            class=""
                           >
                             <div
-                              class="mm-avatar-account__jazzicon"
+                              class="identicon"
+                              style="height: 16px; width: 16px; border-radius: 8px;"
                             >
                               <div
                                 style="border-radius: 50px; overflow: hidden; padding: 0px; margin: 0px; width: 16px; height: 16px; display: inline-block; background: rgb(250, 58, 0);"
@@ -3816,10 +3837,11 @@ exports[`Confirm should match snapshot signature - typed sign - order 1`] = `
                           class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center"
                         >
                           <div
-                            class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-account mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
+                            class=""
                           >
                             <div
-                              class="mm-avatar-account__jazzicon"
+                              class="identicon"
+                              style="height: 16px; width: 16px; border-radius: 8px;"
                             >
                               <div
                                 style="border-radius: 50px; overflow: hidden; padding: 0px; margin: 0px; width: 16px; height: 16px; display: inline-block; background: rgb(35, 98, 225);"
@@ -3950,10 +3972,11 @@ exports[`Confirm should match snapshot signature - typed sign - order 1`] = `
                           class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center"
                         >
                           <div
-                            class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-account mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
+                            class=""
                           >
                             <div
-                              class="mm-avatar-account__jazzicon"
+                              class="identicon"
+                              style="height: 16px; width: 16px; border-radius: 8px;"
                             >
                               <div
                                 style="border-radius: 50px; overflow: hidden; padding: 0px; margin: 0px; width: 16px; height: 16px; display: inline-block; background: rgb(200, 20, 113);"
@@ -4077,10 +4100,11 @@ exports[`Confirm should match snapshot signature - typed sign - order 1`] = `
                           class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center"
                         >
                           <div
-                            class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-account mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
+                            class=""
                           >
                             <div
-                              class="mm-avatar-account__jazzicon"
+                              class="identicon"
+                              style="height: 16px; width: 16px; border-radius: 8px;"
                             >
                               <div
                                 style="border-radius: 50px; overflow: hidden; padding: 0px; margin: 0px; width: 16px; height: 16px; display: inline-block; background: rgb(250, 62, 0);"

From ca64247b33b7ac093c10b3f4dff75b0b5cd8c170 Mon Sep 17 00:00:00 2001
From: Mark Stacey <markjstacey@gmail.com>
Date: Mon, 2 Dec 2024 11:10:14 -0330
Subject: [PATCH 009/175] chore: Reduce MMI trigger machine size (#28689)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## **Description**

The `check-mmi-trigger` job was using a medium machine, but the work
performed during this job is trivial and doesn't require a medium
machine. It has been reduced to small.

[![Open in GitHub
Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/28689?quickstart=1)

## **Related issues**

No related issue, just a minor CircleCI credit usage reduction.

## **Manual testing steps**

See that the trigger MMI job still passes.

## **Screenshots/Recordings**

N/A

## **Pre-merge author checklist**

- [x] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension Coding
Standards](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/CODING_GUIDELINES.md).
- [x] I've completed the PR template to the best of my ability
- [x] I’ve included tests if applicable
- [x] I’ve documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [x] I’ve applied the right labels on the PR (see [labeling
guidelines](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.

## **Pre-merge reviewer checklist**

- [ ] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed).
- [ ] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.
---
 .circleci/config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 83c5643400a4..b4b02324da30 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1749,7 +1749,7 @@ jobs:
           command: echo 'whew - everything passed!'
 
   check-mmi-trigger:
-    executor: node-browsers-medium
+    executor: node-browsers-small
     steps:
       - checkout
       - run:

From 93e480c15a03b8335b393455b4ea37218abc4a39 Mon Sep 17 00:00:00 2001
From: Jyoti Puri <jyotipuri@gmail.com>
Date: Mon, 2 Dec 2024 20:32:07 +0530
Subject: [PATCH 010/175] fix: optimize helper methods for signature e2e
 (#28810)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## **Description**

Signature e2e are slower after this PR is merged:
https://github.com/MetaMask/metamask-extension/pull/28423/. This PR
optimises those signature methods.

## **Related issues**

Fixes: https://github.com/MetaMask/metamask-extension/issues/28809

## **Manual testing steps**
NA

## **Screenshots/Recordings**
NA

## **Pre-merge author checklist**

- [X] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension Coding
Standards](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/CODING_GUIDELINES.md).
- [X] I've completed the PR template to the best of my ability
- [X] I’ve included tests if applicable
- [X] I’ve documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [X] I’ve applied the right labels on the PR (see [labeling
guidelines](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.

## **Pre-merge reviewer checklist**

- [ ] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed).
- [ ] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.
---
 test/e2e/tests/confirmations/helpers.ts       | 20 ++++++++++++++++++-
 .../signatures/nft-permit.spec.ts             |  8 ++++----
 .../confirmations/signatures/permit.spec.ts   |  8 ++++----
 .../signatures/signature-helpers.ts           |  6 ++++++
 .../confirmations/signatures/siwe.spec.ts     |  1 -
 5 files changed, 33 insertions(+), 10 deletions(-)

diff --git a/test/e2e/tests/confirmations/helpers.ts b/test/e2e/tests/confirmations/helpers.ts
index 3ea2a2927729..e838ad3a9093 100644
--- a/test/e2e/tests/confirmations/helpers.ts
+++ b/test/e2e/tests/confirmations/helpers.ts
@@ -107,6 +107,15 @@ export async function mockSignatureApproved(
     await createMockSegmentEvent(mockServer, 'Account Details Opened'),
     ...anonEvents,
     await createMockSegmentEvent(mockServer, 'Signature Approved'),
+  ];
+}
+
+export async function mockSignatureApprovedWithDecoding(
+  mockServer: Mockttp,
+  withAnonEvents = false,
+) {
+  return [
+    ...(await mockSignatureApproved(mockServer, withAnonEvents)),
     await createMockSignatureDecodingEvent(mockServer),
   ];
 }
@@ -125,11 +134,20 @@ export async function mockSignatureRejected(
   return [
     await createMockSegmentEvent(mockServer, 'Signature Requested'),
     await createMockSegmentEvent(mockServer, 'Signature Rejected'),
-    await createMockSignatureDecodingEvent(mockServer),
     ...anonEvents,
   ];
 }
 
+export async function mockSignatureRejectedWithDecoding(
+  mockServer: Mockttp,
+  withAnonEvents = false,
+) {
+  return [
+    ...(await mockSignatureRejected(mockServer, withAnonEvents)),
+    await createMockSignatureDecodingEvent(mockServer),
+  ];
+}
+
 export async function mockPermitDecoding(mockServer: Mockttp) {
   return [await createMockSignatureDecodingEvent(mockServer)];
 }
diff --git a/test/e2e/tests/confirmations/signatures/nft-permit.spec.ts b/test/e2e/tests/confirmations/signatures/nft-permit.spec.ts
index 09c1e414eeee..4f1afe586116 100644
--- a/test/e2e/tests/confirmations/signatures/nft-permit.spec.ts
+++ b/test/e2e/tests/confirmations/signatures/nft-permit.spec.ts
@@ -5,8 +5,8 @@ import { WINDOW_TITLES } from '../../../helpers';
 import { Ganache } from '../../../seeder/ganache';
 import { Driver } from '../../../webdriver/driver';
 import {
-  mockSignatureApproved,
-  mockSignatureRejected,
+  mockSignatureApprovedWithDecoding,
+  mockSignatureRejectedWithDecoding,
   scrollAndConfirmAndAssertConfirm,
   withTransactionEnvelopeTypeFixtures,
 } from '../helpers';
@@ -78,7 +78,7 @@ describe('Confirmation Signature - NFT Permit @no-mmi', function (this: Suite) {
 
         await assertVerifiedResults(driver, publicAddress);
       },
-      mockSignatureApproved,
+      mockSignatureApprovedWithDecoding,
     );
   });
 
@@ -119,7 +119,7 @@ describe('Confirmation Signature - NFT Permit @no-mmi', function (this: Suite) {
           decodingResponse: 'CHANGE',
         });
       },
-      mockSignatureRejected,
+      mockSignatureRejectedWithDecoding,
     );
   });
 });
diff --git a/test/e2e/tests/confirmations/signatures/permit.spec.ts b/test/e2e/tests/confirmations/signatures/permit.spec.ts
index f4c55582cb0a..ea375b0c1100 100644
--- a/test/e2e/tests/confirmations/signatures/permit.spec.ts
+++ b/test/e2e/tests/confirmations/signatures/permit.spec.ts
@@ -7,8 +7,8 @@ import { Ganache } from '../../../seeder/ganache';
 import { Driver } from '../../../webdriver/driver';
 import {
   mockPermitDecoding,
-  mockSignatureApproved,
-  mockSignatureRejected,
+  mockSignatureApprovedWithDecoding,
+  mockSignatureRejectedWithDecoding,
   scrollAndConfirmAndAssertConfirm,
   withTransactionEnvelopeTypeFixtures,
 } from '../helpers';
@@ -75,7 +75,7 @@ describe('Confirmation Signature - Permit @no-mmi', function (this: Suite) {
 
         await assertVerifiedResults(driver, publicAddress);
       },
-      mockSignatureApproved,
+      mockSignatureApprovedWithDecoding,
     );
   });
 
@@ -111,7 +111,7 @@ describe('Confirmation Signature - Permit @no-mmi', function (this: Suite) {
           decodingResponse: 'CHANGE',
         });
       },
-      mockSignatureRejected,
+      mockSignatureRejectedWithDecoding,
     );
   });
 
diff --git a/test/e2e/tests/confirmations/signatures/signature-helpers.ts b/test/e2e/tests/confirmations/signatures/signature-helpers.ts
index 050b2fc19eb7..d341a0020e56 100644
--- a/test/e2e/tests/confirmations/signatures/signature-helpers.ts
+++ b/test/e2e/tests/confirmations/signatures/signature-helpers.ts
@@ -294,6 +294,12 @@ function compareDecodingAPIResponse(
   expectedProperties: Record<string, unknown>,
   eventName: string,
 ) {
+  if (
+    !expectedProperties.decoding_response &&
+    !actualProperties.decoding_response
+  ) {
+    return;
+  }
   if (
     eventName === 'Signature Rejected' ||
     eventName === 'Signature Approved'
diff --git a/test/e2e/tests/confirmations/signatures/siwe.spec.ts b/test/e2e/tests/confirmations/signatures/siwe.spec.ts
index ab614095d793..4e90ac788a08 100644
--- a/test/e2e/tests/confirmations/signatures/siwe.spec.ts
+++ b/test/e2e/tests/confirmations/signatures/siwe.spec.ts
@@ -31,7 +31,6 @@ import {
 } from './signature-helpers';
 
 describe('Confirmation Signature - SIWE @no-mmi', function (this: Suite) {
-  this.timeout(200000); // This test is very long, so we need an unusually high timeout
   it('initiates and confirms', async function () {
     await withTransactionEnvelopeTypeFixtures(
       this.test?.fullTitle(),

From c5df9dca33b81e64af216b9da52a761a36a9edb7 Mon Sep 17 00:00:00 2001
From: Davide Brocchetto <davide.brocchetto@consensys.net>
Date: Mon, 2 Dec 2024 10:59:49 -0800
Subject: [PATCH 011/175] test: Allow token balance to populate after swap
 (#28744)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## **Description**

After importing the test account which contains the funds to execute the
swaps it takes a few seconds before the balance would show up in the
wallet. So I added steps to the script to pause and wait for that
balance to show up before executing the tests.

[![Open in GitHub
Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/28744?quickstart=1)

## **Related issues**

Fixes:

## **Manual testing steps**

1. Go to this page...
2.
3.

## **Screenshots/Recordings**

<!-- If applicable, add screenshots and/or recordings to visualize the
before and after of your change. -->

### **Before**

<!-- [screenshots/recordings] -->

### **After**

<!-- [screenshots/recordings] -->

## **Pre-merge author checklist**

- [x] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension Coding
Standards](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/CODING_GUIDELINES.md).
- [x] I've completed the PR template to the best of my ability
- [ ] I’ve included tests if applicable
- [ ] I’ve documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [x] I’ve applied the right labels on the PR (see [labeling
guidelines](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.

## **Pre-merge reviewer checklist**

- [x] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed).
- [ ] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.
---
 .../shared/pageObjects/wallet-page.ts           | 17 ++++++++++++++++-
 test/e2e/playwright/swap/specs/swap.spec.ts     |  8 ++++++--
 2 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/test/e2e/playwright/shared/pageObjects/wallet-page.ts b/test/e2e/playwright/shared/pageObjects/wallet-page.ts
index 4e31441451bf..1e0049be5d3e 100644
--- a/test/e2e/playwright/shared/pageObjects/wallet-page.ts
+++ b/test/e2e/playwright/shared/pageObjects/wallet-page.ts
@@ -1,7 +1,7 @@
 import { type Locator, type Page } from '@playwright/test';
 
 export class WalletPage {
-  private page: Page;
+  readonly page: Page;
 
   readonly importTokensButton: Locator;
 
@@ -21,6 +21,8 @@ export class WalletPage {
 
   readonly importAccountConfirmBtn: Locator;
 
+  readonly tokenBalance: Locator;
+
   constructor(page: Page) {
     this.page = page;
     this.swapButton = this.page.getByTestId('token-overview-button-swap');
@@ -29,6 +31,9 @@ export class WalletPage {
     this.importAccountButton = this.page.getByText('Import account');
     this.importButton = this.page.getByText('Import (');
     this.tokenTab = this.page.getByTestId('account-overview__asset-tab');
+    this.tokenBalance = this.page.getByTestId(
+      'multichain-token-list-item-value',
+    );
     this.addAccountButton = this.page.getByTestId(
       'multichain-account-menu-popover-action-button',
     );
@@ -54,6 +59,8 @@ export class WalletPage {
     await this.importAccountButton.click();
     await this.page.fill('#private-key-box', accountPK);
     await this.importAccountConfirmBtn.click();
+    await this.page.waitForTimeout(2000);
+    return await this.accountMenu.textContent();
   }
 
   async selectTokenWallet() {
@@ -68,4 +75,12 @@ export class WalletPage {
   async selectActivityList() {
     await this.activityListTab.click();
   }
+
+  async getTokenBalance() {
+    return await this.tokenBalance.first().textContent();
+  }
+
+  async waitforTokenBalance(balance: string) {
+    await this.page.waitForSelector(`text=/${balance}/`, { timeout: 60000 });
+  }
 }
diff --git a/test/e2e/playwright/swap/specs/swap.spec.ts b/test/e2e/playwright/swap/specs/swap.spec.ts
index 73a85620eabf..d7d369c469f4 100644
--- a/test/e2e/playwright/swap/specs/swap.spec.ts
+++ b/test/e2e/playwright/swap/specs/swap.spec.ts
@@ -1,5 +1,5 @@
 import { ethers } from 'ethers';
-import { test } from '@playwright/test';
+import { test, expect } from '@playwright/test';
 import log from 'loglevel';
 
 import { ChromeExtensionPage } from '../../shared/pageObjects/extension-page';
@@ -73,7 +73,9 @@ test.beforeAll(
     walletPage = new WalletPage(page);
 
     await networkController.addCustomNetwork(Tenderly.Mainnet);
-    await walletPage.importAccount(wallet.privateKey);
+    const accountName = await walletPage.importAccount(wallet.privateKey);
+    expect(accountName).toEqual('Account 2');
+    await walletPage.waitforTokenBalance('1 ETH');
   },
 );
 
@@ -82,6 +84,8 @@ testSet.forEach((options) => {
     await walletPage.selectTokenWallet();
     await networkController.selectNetwork(options.network);
     await walletPage.selectSwapAction();
+    // Allow balance label to populate
+    await walletPage.page.waitForTimeout(3000);
     const quoteEntered = await swapPage.enterQuote({
       from: options.source,
       to: options.destination,

From 19d5637e22eab3e4f87284704a3362bc044425b3 Mon Sep 17 00:00:00 2001
From: infiniteflower <139582705+infiniteflower@users.noreply.github.com>
Date: Mon, 2 Dec 2024 17:08:41 -0500
Subject: [PATCH 012/175] feat: cross chain swaps - tx status - UI (#28657)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<!--
Please submit this PR as a draft initially.
Do not mark it as "Ready for review" until the template has been
completely filled out, and PR status checks have passed at least once.
-->

## **Description**

<!--
Write a short description of the changes included in this pull request,
also include relevant motivation and context. Have in mind the following
questions:
1. What is the reason for the change?
2. What is the improvement/solution?
-->

This PR is a collection of all the UI related code from
https://github.com/MetaMask/metamask-extension/pull/27740 (no UI
changes). It has been split up in order to make it easier to review.

The main addition is the Bridge Transaction Details and its supporting
code.

[![Open in GitHub
Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/28657?quickstart=1)

## **Related issues**

Related to #27740, #28636

## **Manual testing steps**

Add `BRIDGE_USE_DEV_APIS=1` to `.metamaskrc` to enable Bridge

Refer to to #27740

## **Screenshots/Recordings**

Refer to to #27740

## **Pre-merge author checklist**

- [x] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension Coding
Standards](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/CODING_GUIDELINES.md).
- [x] I've completed the PR template to the best of my ability
- [x] I’ve included tests if applicable
- [x] I’ve documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [x] I’ve applied the right labels on the PR (see [labeling
guidelines](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.

## **Pre-merge reviewer checklist**

- [ ] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed).
- [ ] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.
---
 .storybook/test-data.js                       |   10 +-
 app/_locales/en/messages.json                 |   71 +
 app/images/hollow-circle.svg                  |    3 +
 shared/types/bridge-status.ts                 |    4 +-
 test/jest/mock-store.js                       |   22 +-
 .../selected-account-component.test.js        |    1 +
 .../transaction-breakdown-utils.ts            |  140 ++
 .../transaction-breakdown.container.js        |  124 +-
 .../app/transaction-icon/transaction-icon.js  |    2 +
 .../transaction-list-item.component.js        |   62 +-
 .../transaction-list.component.js             |    1 +
 .../activity-list-item.test.js.snap           |   10 +-
 .../activity-list-item/activity-list-item.js  |    4 +-
 ui/ducks/bridge-status/actions.ts             |   30 +
 ui/ducks/bridge-status/selectors.ts           |   68 +
 ui/ducks/bridge/bridge.test.ts                |    4 +-
 ui/ducks/bridge/selectors.test.ts             |  284 +--
 ui/helpers/constants/routes.ts                |    1 +
 ui/hooks/bridge/useBridgeChainInfo.ts         |   83 +
 ui/hooks/bridge/useBridgeTxHistoryData.ts     |   62 +
 ui/hooks/bridge/useCountdownTimer.test.ts     |   11 +-
 ui/hooks/useTransactionDisplayData.js         |    5 +
 ui/pages/bridge/hooks/useAddToken.ts          |    8 +-
 ui/pages/bridge/hooks/useHandleApprovalTx.ts  |    9 +-
 ui/pages/bridge/hooks/useHandleBridgeTx.ts    |    2 +-
 ui/pages/bridge/hooks/useHandleTx.ts          |    7 +-
 .../hooks/useSubmitBridgeTransaction.test.tsx |    9 +-
 .../hooks/useSubmitBridgeTransaction.ts       |   31 +-
 ui/pages/bridge/index.scss                    |    1 +
 ui/pages/bridge/index.test.tsx                |    4 +-
 .../bridge/prepare/bridge-cta-button.test.tsx |   56 +-
 .../prepare/prepare-bridge-page.test.tsx      |   26 +-
 .../bridge/quotes/bridge-quote-card.test.tsx  |   40 +-
 .../quotes/bridge-quotes-modal.test.tsx       |    8 +-
 .../bridge-activity-item-tx-segments.tsx      |   80 +
 .../bridge-explorer-links.tsx                 |  116 ++
 .../bridge-step-description.tsx               |  185 ++
 .../bridge-step-list.stories.tsx              | 1781 +++++++++++++++++
 .../transaction-details/bridge-step-list.tsx  |   98 +
 .../transaction-details/hollow-circle.tsx     |   39 +
 .../bridge/transaction-details/index.scss     |   50 +
 .../transaction-details/pulsing-circle.tsx    |   51 +
 .../transaction-details/segment.stories.tsx   |   46 +
 .../bridge/transaction-details/segment.tsx    |   32 +
 .../step-progress-bar-item.tsx                |   82 +
 .../transaction-detail-row.tsx                |   40 +
 .../transaction-details.tsx                   |  328 +++
 .../connect-hardware/index.test.tsx           |    1 +
 ui/pages/routes/routes.component.js           |    7 +
 49 files changed, 3741 insertions(+), 398 deletions(-)
 create mode 100644 app/images/hollow-circle.svg
 create mode 100644 ui/components/app/transaction-breakdown/transaction-breakdown-utils.ts
 create mode 100644 ui/ducks/bridge-status/actions.ts
 create mode 100644 ui/ducks/bridge-status/selectors.ts
 create mode 100644 ui/hooks/bridge/useBridgeChainInfo.ts
 create mode 100644 ui/hooks/bridge/useBridgeTxHistoryData.ts
 create mode 100644 ui/pages/bridge/transaction-details/bridge-activity-item-tx-segments.tsx
 create mode 100644 ui/pages/bridge/transaction-details/bridge-explorer-links.tsx
 create mode 100644 ui/pages/bridge/transaction-details/bridge-step-description.tsx
 create mode 100644 ui/pages/bridge/transaction-details/bridge-step-list.stories.tsx
 create mode 100644 ui/pages/bridge/transaction-details/bridge-step-list.tsx
 create mode 100644 ui/pages/bridge/transaction-details/hollow-circle.tsx
 create mode 100644 ui/pages/bridge/transaction-details/index.scss
 create mode 100644 ui/pages/bridge/transaction-details/pulsing-circle.tsx
 create mode 100644 ui/pages/bridge/transaction-details/segment.stories.tsx
 create mode 100644 ui/pages/bridge/transaction-details/segment.tsx
 create mode 100644 ui/pages/bridge/transaction-details/step-progress-bar-item.tsx
 create mode 100644 ui/pages/bridge/transaction-details/transaction-detail-row.tsx
 create mode 100644 ui/pages/bridge/transaction-details/transaction-details.tsx

diff --git a/.storybook/test-data.js b/.storybook/test-data.js
index 717109b77dac..bce6d082e086 100644
--- a/.storybook/test-data.js
+++ b/.storybook/test-data.js
@@ -28,6 +28,9 @@ const state = {
     url: 'https://metamask.github.io/test-dapp/',
   },
   metamask: {
+    bridgeStatusState: {
+      txHistory: {},
+    },
     announcements: {
       22: {
         id: 22,
@@ -525,13 +528,6 @@ const state = {
         decimals: 18,
       },
     ],
-    tokenBalances: {
-      '0x64a845a5b02460acf8a3d84503b0d68d028b4bb4': {
-        '0x1': {
-          '0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48': '0x25e4bc',
-        },
-      },
-    },
     allDetectedTokens: {
       '0xaa36a7': {
         '0x9d0ba4ddac06032527b140912ec808ab9451b788': [
diff --git a/app/_locales/en/messages.json b/app/_locales/en/messages.json
index 3b8b2bfa9682..f125126e878c 100644
--- a/app/_locales/en/messages.json
+++ b/app/_locales/en/messages.json
@@ -863,12 +863,18 @@
   "bridgeCalculatingAmount": {
     "message": "Calculating..."
   },
+  "bridgeDestination": {
+    "message": "Destination"
+  },
   "bridgeDontSend": {
     "message": "Bridge, don't send"
   },
   "bridgeEnterAmount": {
     "message": "Enter amount"
   },
+  "bridgeExplorerLinkViewOn": {
+    "message": "View on $1"
+  },
   "bridgeFrom": {
     "message": "Bridge from"
   },
@@ -881,6 +887,25 @@
   "bridgeSelectTokenAndAmount": {
     "message": "Select token and amount"
   },
+  "bridgeSource": {
+    "message": "Source"
+  },
+  "bridgeStepActionBridgeComplete": {
+    "message": "$1 received on $2",
+    "description": "$1 is the amount of the destination asset, $2 is the name of the destination network"
+  },
+  "bridgeStepActionBridgePending": {
+    "message": "Receiving $1 on $2",
+    "description": "$1 is the amount of the destination asset, $2 is the name of the destination network"
+  },
+  "bridgeStepActionSwapComplete": {
+    "message": "Swapped $1 for $2",
+    "description": "$1 is the amount of the source asset, $2 is the amount of the destination asset"
+  },
+  "bridgeStepActionSwapPending": {
+    "message": "Swapping $1 for $2",
+    "description": "$1 is the amount of the source asset, $2 is the amount of the destination asset"
+  },
   "bridgeTimingMinutes": {
     "message": "$1 min",
     "description": "$1 is the ticker symbol of a an asset the user is being prompted to purchase"
@@ -891,9 +916,55 @@
   "bridgeTo": {
     "message": "Bridge to"
   },
+  "bridgeToChain": {
+    "message": " to $1"
+  },
   "bridgeTotalFeesTooltipText": {
     "message": "This includes gas fees (paid to crypto miners) and relayer fees (paid to power complex services like bridging).\nFees are based on network traffic and transaction complexity. MetaMask does not profit from either fee."
   },
+  "bridgeTxDetailsBaseFee": {
+    "message": "Base fee (GWEI)"
+  },
+  "bridgeTxDetailsBridgeAmount": {
+    "message": "Bridge amount"
+  },
+  "bridgeTxDetailsBridgeType": {
+    "message": "Bridge type"
+  },
+  "bridgeTxDetailsGasLimit": {
+    "message": "Gas limit (units)"
+  },
+  "bridgeTxDetailsGasUsed": {
+    "message": "Gas used (units)"
+  },
+  "bridgeTxDetailsMaxFeePerGas": {
+    "message": "Max fee per gas"
+  },
+  "bridgeTxDetailsNonce": {
+    "message": "Nonce"
+  },
+  "bridgeTxDetailsPriorityFee": {
+    "message": "Priority fee (GWEI)"
+  },
+  "bridgeTxDetailsStatus": {
+    "message": "Status"
+  },
+  "bridgeTxDetailsTimestamp": {
+    "message": "Time stamp"
+  },
+  "bridgeTxDetailsTimestampValue": {
+    "message": "$1 at $2",
+    "description": "$1 is the date, $2 is the time"
+  },
+  "bridgeTxDetailsTotal": {
+    "message": "Total"
+  },
+  "bridgeTxDetailsTotalGasFee": {
+    "message": "Total gas fee"
+  },
+  "bridgeTypeDirectionTo": {
+    "message": "To"
+  },
   "browserNotSupported": {
     "message": "Your browser is not supported..."
   },
diff --git a/app/images/hollow-circle.svg b/app/images/hollow-circle.svg
new file mode 100644
index 000000000000..3490e8439b5e
--- /dev/null
+++ b/app/images/hollow-circle.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512">
+  <path d="M256 85c94 0 171 77 171 171s-77 171-171 171S85 350 85 256s77-171 171-171m0-42C138 43 43 138 43 256s95 213 213 213 213-95 213-213S374 43 256 43z"/>
+</svg>
\ No newline at end of file
diff --git a/shared/types/bridge-status.ts b/shared/types/bridge-status.ts
index 601a2209aaf9..f4c5c82d26eb 100644
--- a/shared/types/bridge-status.ts
+++ b/shared/types/bridge-status.ts
@@ -139,8 +139,8 @@ export type StartPollingForBridgeTxStatusArgs = {
   targetContractAddress?: BridgeHistoryItem['targetContractAddress'];
 };
 
-export type SourceChainTxHash = string;
+export type SourceChainTxMetaId = string;
 
 export type BridgeStatusControllerState = {
-  txHistory: Record<SourceChainTxHash, BridgeHistoryItem>;
+  txHistory: Record<SourceChainTxMetaId, BridgeHistoryItem>;
 };
diff --git a/test/jest/mock-store.js b/test/jest/mock-store.js
index f88b8a210904..422c54f13bf1 100644
--- a/test/jest/mock-store.js
+++ b/test/jest/mock-store.js
@@ -4,6 +4,7 @@ import { KeyringType } from '../../shared/constants/keyring';
 import { ETH_EOA_METHODS } from '../../shared/constants/eth-methods';
 import { mockNetworkState } from '../stub/networks';
 import { DEFAULT_BRIDGE_CONTROLLER_STATE } from '../../app/scripts/controllers/bridge/constants';
+import { DEFAULT_BRIDGE_STATUS_CONTROLLER_STATE } from '../../app/scripts/controllers/bridge-status/constants';
 import { BRIDGE_PREFERRED_GAS_ESTIMATE } from '../../shared/constants/bridge';
 
 export const createGetSmartTransactionFeesApiResponse = () => {
@@ -702,10 +703,19 @@ export const createSwapsMockStore = () => {
 };
 
 export const createBridgeMockStore = (
-  featureFlagOverrides = {},
-  bridgeSliceOverrides = {},
-  bridgeStateOverrides = {},
-  metamaskStateOverrides = {},
+  {
+    featureFlagOverrides = {},
+    bridgeSliceOverrides = {},
+    bridgeStateOverrides = {},
+    bridgeStatusStateOverrides = {},
+    metamaskStateOverrides = {},
+  } = {
+    featureFlagOverrides: {},
+    bridgeSliceOverrides: {},
+    bridgeStateOverrides: {},
+    bridgeStatusStateOverrides: {},
+    metamaskStateOverrides: {},
+  },
 ) => {
   const swapsStore = createSwapsMockStore();
   return {
@@ -744,6 +754,10 @@ export const createBridgeMockStore = (
         quoteRequest: DEFAULT_BRIDGE_CONTROLLER_STATE.quoteRequest,
         ...bridgeStateOverrides,
       },
+      bridgeStatusState: {
+        ...DEFAULT_BRIDGE_STATUS_CONTROLLER_STATE,
+        ...bridgeStatusStateOverrides,
+      },
     },
   };
 };
diff --git a/ui/components/app/selected-account/selected-account-component.test.js b/ui/components/app/selected-account/selected-account-component.test.js
index 257ee44aa46a..d181eef44701 100644
--- a/ui/components/app/selected-account/selected-account-component.test.js
+++ b/ui/components/app/selected-account/selected-account-component.test.js
@@ -49,6 +49,7 @@ jest.mock('../../../selectors', () => {
   const mockGetSelectedAccount = jest.fn(() => mockSelectedAccount);
 
   return {
+    getSelectedAddress: jest.fn(() => '0xselectedaddress'),
     getAccountType: mockGetAccountType,
     getSelectedInternalAccount: mockGetSelectedAccount,
     getCurrentChainId: jest.fn(() => '0x5'),
diff --git a/ui/components/app/transaction-breakdown/transaction-breakdown-utils.ts b/ui/components/app/transaction-breakdown/transaction-breakdown-utils.ts
new file mode 100644
index 000000000000..dc40f23f4a92
--- /dev/null
+++ b/ui/components/app/transaction-breakdown/transaction-breakdown-utils.ts
@@ -0,0 +1,140 @@
+import {
+  TransactionMeta,
+  TransactionType,
+} from '@metamask/transaction-controller';
+import { getShouldShowFiat } from '../../../selectors';
+import { getNativeCurrency } from '../../../ducks/metamask/metamask';
+import { getHexGasTotal } from '../../../helpers/utils/confirm-tx.util';
+import { isEIP1559Transaction } from '../../../../shared/modules/transaction.utils';
+
+import {
+  subtractHexes,
+  sumHexes,
+} from '../../../../shared/modules/conversion.utils';
+import {
+  calcTokenAmount,
+  getSwapsTokensReceivedFromTxMeta,
+} from '../../../../shared/lib/transactions-controller-utils';
+import { CONFIRMED_STATUS } from '../transaction-activity-log/transaction-activity-log.constants';
+import { MetaMaskReduxState } from '../../../store/store';
+
+export const getTransactionBreakdownData = ({
+  state,
+  transaction,
+  isTokenApprove,
+}: {
+  state: MetaMaskReduxState;
+  transaction: TransactionMeta;
+  isTokenApprove: boolean;
+}) => {
+  const {
+    txParams: { gas, gasPrice, maxFeePerGas, value } = {},
+    txReceipt: { gasUsed, effectiveGasPrice, l1Fee: l1HexGasTotal } = {},
+    baseFeePerGas,
+    sourceTokenAmount: rawSourceTokenAmount,
+    sourceTokenDecimals,
+    sourceTokenSymbol,
+    destinationTokenAddress,
+    destinationTokenAmount: rawDestinationTokenAmountEstimate,
+    destinationTokenDecimals,
+    destinationTokenSymbol,
+    status,
+    type,
+  } = transaction;
+
+  const sourceTokenAmount =
+    rawSourceTokenAmount && sourceTokenDecimals
+      ? calcTokenAmount(rawSourceTokenAmount, sourceTokenDecimals).toFixed()
+      : undefined;
+  let destinationTokenAmount;
+
+  if (
+    type === TransactionType.swapAndSend &&
+    // ensure fallback values are available
+    rawDestinationTokenAmountEstimate &&
+    destinationTokenDecimals &&
+    destinationTokenSymbol
+  ) {
+    try {
+      // try to get the actual destination token amount from the on-chain events
+      destinationTokenAmount = getSwapsTokensReceivedFromTxMeta(
+        destinationTokenSymbol,
+        transaction,
+        destinationTokenAddress,
+        undefined,
+        destinationTokenDecimals,
+        undefined,
+        undefined,
+        // @ts-expect-error TODO: fix this, ported directly from original code
+        null,
+      );
+
+      // if no amount is found, throw
+      if (!destinationTokenAmount) {
+        throw new Error('Actual destination token amount not found');
+      }
+    } catch (error) {
+      // if actual destination token amount is not found, use the estimated amount from the quote
+      destinationTokenAmount =
+        rawDestinationTokenAmountEstimate && destinationTokenDecimals
+          ? calcTokenAmount(
+              rawDestinationTokenAmountEstimate,
+              destinationTokenDecimals,
+            ).toFixed()
+          : undefined;
+    }
+  }
+
+  const sourceAmountFormatted =
+    sourceTokenAmount && sourceTokenDecimals && sourceTokenSymbol
+      ? `${sourceTokenAmount} ${sourceTokenSymbol}`
+      : undefined;
+  const destinationAmountFormatted =
+    destinationTokenAmount && status === CONFIRMED_STATUS
+      ? `${destinationTokenAmount} ${destinationTokenSymbol}`
+      : undefined;
+
+  const gasLimit = typeof gasUsed === 'string' ? gasUsed : gas;
+
+  const priorityFee =
+    effectiveGasPrice &&
+    baseFeePerGas &&
+    subtractHexes(effectiveGasPrice, baseFeePerGas);
+
+  // To calculate the total cost of the transaction, we use gasPrice if it is in the txParam,
+  // which will only be the case on non-EIP1559 networks. If it is not in the params, we can
+  // use the effectiveGasPrice from the receipt, which will ultimately represent to true cost
+  // of the transaction. Either of these are used the same way with gasLimit to calculate total
+  // cost. effectiveGasPrice will be available on the txReciept for all EIP1559 networks
+  const usedGasPrice = gasPrice || effectiveGasPrice;
+  const hexGasTotal =
+    (gasLimit &&
+      usedGasPrice &&
+      getHexGasTotal({ gasLimit, gasPrice: usedGasPrice })) ||
+    '0x0';
+
+  const totalInHex = sumHexes(
+    hexGasTotal,
+    // @ts-expect-error TODO: fix this, ported directly from original code
+    value,
+    l1HexGasTotal ?? 0,
+  );
+
+  return {
+    nativeCurrency: getNativeCurrency(state),
+    showFiat: getShouldShowFiat(state),
+    totalInHex,
+    gas,
+    gasPrice,
+    maxFeePerGas,
+    gasUsed,
+    isTokenApprove,
+    hexGasTotal,
+    priorityFee,
+    baseFee: baseFeePerGas,
+    isEIP1559Transaction: isEIP1559Transaction(transaction),
+    l1HexGasTotal,
+    sourceAmountFormatted,
+    destinationAmountFormatted,
+  };
+};
diff --git a/ui/components/app/transaction-breakdown/transaction-breakdown.container.js b/ui/components/app/transaction-breakdown/transaction-breakdown.container.js
index 5fdb37be3493..cef2e1b03712 100644
--- a/ui/components/app/transaction-breakdown/transaction-breakdown.container.js
+++ b/ui/components/app/transaction-breakdown/transaction-breakdown.container.js
@@ -1,127 +1,15 @@
 import { connect } from 'react-redux';
-import { TransactionType } from '@metamask/transaction-controller';
-import { getShouldShowFiat } from '../../../selectors';
-import { getNativeCurrency } from '../../../ducks/metamask/metamask';
-import { getHexGasTotal } from '../../../helpers/utils/confirm-tx.util';
-import { isEIP1559Transaction } from '../../../../shared/modules/transaction.utils';
-
-import {
-  subtractHexes,
-  sumHexes,
-} from '../../../../shared/modules/conversion.utils';
-import {
-  calcTokenAmount,
-  getSwapsTokensReceivedFromTxMeta,
-} from '../../../../shared/lib/transactions-controller-utils';
-import { CONFIRMED_STATUS } from '../transaction-activity-log/transaction-activity-log.constants';
 import TransactionBreakdown from './transaction-breakdown.component';
+import { getTransactionBreakdownData } from './transaction-breakdown-utils';
 
 const mapStateToProps = (state, ownProps) => {
   const { transaction, isTokenApprove } = ownProps;
-  const {
-    txParams: { gas, gasPrice, maxFeePerGas, value } = {},
-    txReceipt: { gasUsed, effectiveGasPrice, l1Fee: l1HexGasTotal } = {},
-    baseFeePerGas,
-    sourceTokenAmount: rawSourceTokenAmount,
-    sourceTokenDecimals,
-    sourceTokenSymbol,
-    destinationTokenAddress,
-    destinationTokenAmount: rawDestinationTokenAmountEstimate,
-    destinationTokenDecimals,
-    destinationTokenSymbol,
-    status,
-    type,
-  } = transaction;
-
-  const sourceTokenAmount =
-    rawSourceTokenAmount && sourceTokenDecimals
-      ? calcTokenAmount(rawSourceTokenAmount, sourceTokenDecimals).toFixed()
-      : undefined;
-  let destinationTokenAmount;
-
-  if (
-    type === TransactionType.swapAndSend &&
-    // ensure fallback values are available
-    rawDestinationTokenAmountEstimate &&
-    destinationTokenDecimals &&
-    destinationTokenSymbol
-  ) {
-    try {
-      // try to get the actual destination token amount from the on-chain events
-      destinationTokenAmount = getSwapsTokensReceivedFromTxMeta(
-        destinationTokenSymbol,
-        transaction,
-        destinationTokenAddress,
-        undefined,
-        destinationTokenDecimals,
-        undefined,
-        undefined,
-        null,
-      );
-
-      // if no amount is found, throw
-      if (!destinationTokenAmount) {
-        throw new Error('Actual destination token amount not found');
-      }
-    } catch (error) {
-      // if actual destination token amount is not found, use the estimated amount from the quote
-      destinationTokenAmount =
-        rawDestinationTokenAmountEstimate && destinationTokenDecimals
-          ? calcTokenAmount(
-              rawDestinationTokenAmountEstimate,
-              destinationTokenDecimals,
-            ).toFixed()
-          : undefined;
-    }
-  }
-
-  const sourceAmountFormatted =
-    sourceTokenAmount && sourceTokenDecimals && sourceTokenSymbol
-      ? `${sourceTokenAmount} ${sourceTokenSymbol}`
-      : undefined;
-  const destinationAmountFormatted =
-    destinationTokenAmount && status === CONFIRMED_STATUS
-      ? `${destinationTokenAmount} ${destinationTokenSymbol}`
-      : undefined;
-
-  const gasLimit = typeof gasUsed === 'string' ? gasUsed : gas;
-
-  const priorityFee =
-    effectiveGasPrice &&
-    baseFeePerGas &&
-    subtractHexes(effectiveGasPrice, baseFeePerGas);
-
-  // To calculate the total cost of the transaction, we use gasPrice if it is in the txParam,
-  // which will only be the case on non-EIP1559 networks. If it is not in the params, we can
-  // use the effectiveGasPrice from the receipt, which will ultimately represent to true cost
-  // of the transaction. Either of these are used the same way with gasLimit to calculate total
-  // cost. effectiveGasPrice will be available on the txReciept for all EIP1559 networks
-  const usedGasPrice = gasPrice || effectiveGasPrice;
-  const hexGasTotal =
-    (gasLimit &&
-      usedGasPrice &&
-      getHexGasTotal({ gasLimit, gasPrice: usedGasPrice })) ||
-    '0x0';
-
-  const totalInHex = sumHexes(hexGasTotal, value, l1HexGasTotal ?? 0);
-
-  return {
-    nativeCurrency: getNativeCurrency(state),
-    showFiat: getShouldShowFiat(state),
-    totalInHex,
-    gas,
-    gasPrice,
-    maxFeePerGas,
-    gasUsed,
+  const data = getTransactionBreakdownData({
+    state,
+    transaction,
     isTokenApprove,
-    hexGasTotal,
-    priorityFee,
-    baseFee: baseFeePerGas,
-    isEIP1559Transaction: isEIP1559Transaction(transaction),
-    l1HexGasTotal,
-    sourceAmountFormatted,
-    destinationAmountFormatted,
-  };
+  });
+  return data;
 };
 
 export default connect(mapStateToProps)(TransactionBreakdown);
diff --git a/ui/components/app/transaction-icon/transaction-icon.js b/ui/components/app/transaction-icon/transaction-icon.js
index 2905f0090b1b..6051862aae26 100644
--- a/ui/components/app/transaction-icon/transaction-icon.js
+++ b/ui/components/app/transaction-icon/transaction-icon.js
@@ -21,6 +21,7 @@ const ICON_MAP = {
   [TransactionGroupCategory.signatureRequest]: IconName.SecurityTick,
   [TransactionGroupCategory.swap]: IconName.SwapHorizontal,
   [TransactionGroupCategory.swapAndSend]: IconName.Arrow2UpRight,
+  [TransactionGroupCategory.bridge]: IconName.Bridge,
 };
 
 const COLOR_MAP = {
@@ -97,5 +98,6 @@ TransactionIcon.propTypes = {
     TransactionGroupCategory.signatureRequest,
     TransactionGroupCategory.swap,
     TransactionGroupCategory.swapAndSend,
+    TransactionGroupCategory.bridge,
   ]).isRequired,
 };
diff --git a/ui/components/app/transaction-list-item/transaction-list-item.component.js b/ui/components/app/transaction-list-item/transaction-list-item.component.js
index 9354a0d9e9ff..060bc8158e92 100644
--- a/ui/components/app/transaction-list-item/transaction-list-item.component.js
+++ b/ui/components/app/transaction-list-item/transaction-list-item.component.js
@@ -5,7 +5,10 @@ import classnames from 'classnames';
 import { useHistory } from 'react-router-dom';
 import { useDispatch, useSelector } from 'react-redux';
 
-import { TransactionStatus } from '@metamask/transaction-controller';
+import {
+  TransactionStatus,
+  TransactionType,
+} from '@metamask/transaction-controller';
 import { useTransactionDisplayData } from '../../../hooks/useTransactionDisplayData';
 import { useI18nContext } from '../../../hooks/useI18nContext';
 
@@ -66,6 +69,8 @@ import { MetaMetricsContext } from '../../../contexts/metametrics';
 import { ActivityListItem } from '../../multichain';
 import { abortTransactionSigning } from '../../../store/actions';
 import { getIsSmartTransaction } from '../../../../shared/modules/selectors';
+import useBridgeTxHistoryData from '../../../hooks/bridge/useBridgeTxHistoryData';
+import BridgeActivityItemTxSegments from '../../../pages/bridge/transaction-details/bridge-activity-item-tx-segments';
 
 function TransactionListItemInner({
   transactionGroup,
@@ -85,6 +90,18 @@ function TransactionListItemInner({
   const isSmartTransaction = useSelector(getIsSmartTransaction);
   const dispatch = useDispatch();
 
+  // Bridge transactions
+  const isBridgeTx =
+    transactionGroup.initialTransaction.type === TransactionType.bridge;
+  const {
+    bridgeTitleSuffix,
+    bridgeTxHistoryItem,
+    isBridgeComplete,
+    showBridgeTxDetails,
+  } = useBridgeTxHistoryData({
+    transactionGroup,
+  });
+
   const {
     initialTransaction: { id },
     primaryTransaction: { error, status },
@@ -286,9 +303,13 @@ function TransactionListItemInner({
     <>
       <ActivityListItem
         data-testid="activity-list-item"
-        onClick={toggleShowDetails}
+        onClick={
+          isBridgeTx && showBridgeTxDetails
+            ? showBridgeTxDetails
+            : toggleShowDetails
+        }
         className={className}
-        title={title}
+        title={`${title}${bridgeTitleSuffix}`}
         icon={
           ///: BEGIN:ONLY_INCLUDE_IF(build-mmi)
           isCustodian ? (
@@ -334,20 +355,27 @@ function TransactionListItemInner({
           ///: END:ONLY_INCLUDE_IF
         }
         subtitle={
-          <TransactionStatusLabel
-            statusOnly
-            isPending={isPending}
-            isEarliestNonce={isEarliestNonce}
-            error={error}
-            date={date}
-            status={displayedStatusKey}
-            ///: BEGIN:ONLY_INCLUDE_IF(build-mmi)
-            custodyStatus={transactionGroup.primaryTransaction.custodyStatus}
-            custodyStatusDisplayText={
-              transactionGroup.primaryTransaction.custodyStatusDisplayText
-            }
-            ///: END:ONLY_INCLUDE_IF
-          />
+          isBridgeTx && isBridgeComplete === false ? (
+            <BridgeActivityItemTxSegments
+              bridgeTxHistoryItem={bridgeTxHistoryItem}
+              transactionGroup={transactionGroup}
+            />
+          ) : (
+            <TransactionStatusLabel
+              statusOnly
+              isPending={isPending}
+              isEarliestNonce={isEarliestNonce}
+              error={error}
+              date={date}
+              status={displayedStatusKey}
+              ///: BEGIN:ONLY_INCLUDE_IF(build-mmi)
+              custodyStatus={transactionGroup.primaryTransaction.custodyStatus}
+              custodyStatusDisplayText={
+                transactionGroup.primaryTransaction.custodyStatusDisplayText
+              }
+              ///: END:ONLY_INCLUDE_IF
+            />
+          )
         }
         rightContent={
           !isSignatureReq &&
diff --git a/ui/components/app/transaction-list/transaction-list.component.js b/ui/components/app/transaction-list/transaction-list.component.js
index 0a0d081016fb..27b0e1b5c60c 100644
--- a/ui/components/app/transaction-list/transaction-list.component.js
+++ b/ui/components/app/transaction-list/transaction-list.component.js
@@ -154,6 +154,7 @@ export default function TransactionList({
   const unfilteredCompletedTransactions = useSelector(
     nonceSortedCompletedTransactionsSelector,
   );
+
   const chainId = useSelector(getCurrentChainId);
   const networkConfigurationsByChainId = useSelector(
     getNetworkConfigurationsByChainId,
diff --git a/ui/components/multichain/activity-list-item/__snapshots__/activity-list-item.test.js.snap b/ui/components/multichain/activity-list-item/__snapshots__/activity-list-item.test.js.snap
index 3bce90a09f76..8f0c24760246 100644
--- a/ui/components/multichain/activity-list-item/__snapshots__/activity-list-item.test.js.snap
+++ b/ui/components/multichain/activity-list-item/__snapshots__/activity-list-item.test.js.snap
@@ -10,10 +10,10 @@ exports[`ActivityListItem should match snapshot with no props 1`] = `
       class="mm-box mm-box--display-flex mm-box--gap-4 mm-box--flex-direction-row mm-box--width-full"
     >
       <div
-        class="mm-box activity-list-item__content-container mm-box--display-inline-flex mm-box--width-full"
+        class="mm-box activity-list-item__content-container mm-box--display-inline-flex mm-box--justify-content-space-between mm-box--width-full"
       >
         <div
-          class="mm-box activity-list-item__detail-container mm-box--display-inline-flex mm-box--flex-direction-column mm-box--width-1/3 mm-box--sm:width-7/12"
+          class="mm-box activity-list-item__detail-container mm-box--display-inline-flex mm-box--flex-direction-column"
         >
           <p
             class="mm-box mm-text mm-text--body-lg-medium mm-text--font-weight-medium mm-text--ellipsis mm-text--text-align-left mm-box--color-text-default"
@@ -52,10 +52,10 @@ exports[`ActivityListItem should match snapshot with props 1`] = `
         />
       </div>
       <div
-        class="mm-box activity-list-item__content-container mm-box--display-inline-flex mm-box--width-full"
+        class="mm-box activity-list-item__content-container mm-box--display-inline-flex mm-box--justify-content-space-between mm-box--width-full"
       >
         <div
-          class="mm-box activity-list-item__detail-container mm-box--display-inline-flex mm-box--flex-direction-column mm-box--width-1/3 mm-box--sm:width-7/12"
+          class="mm-box activity-list-item__detail-container mm-box--display-inline-flex mm-box--flex-direction-column"
         >
           <p
             class="mm-box mm-text mm-text--body-lg-medium mm-text--font-weight-medium mm-text--ellipsis mm-text--text-align-left mm-box--color-text-default"
@@ -86,7 +86,7 @@ exports[`ActivityListItem should match snapshot with props 1`] = `
           </p>
         </div>
         <div
-          class="mm-box activity-list-item__right-content mm-box--display-inline-flex mm-box--flex-direction-column mm-box--align-items-flex-end mm-box--width-full mm-box--height-min"
+          class="mm-box activity-list-item__right-content mm-box--display-inline-flex mm-box--flex-direction-column mm-box--align-items-flex-end mm-box--height-min"
         >
           <p>
             Content rendered to the right
diff --git a/ui/components/multichain/activity-list-item/activity-list-item.js b/ui/components/multichain/activity-list-item/activity-list-item.js
index 8fd66714574a..5160f9076ad6 100644
--- a/ui/components/multichain/activity-list-item/activity-list-item.js
+++ b/ui/components/multichain/activity-list-item/activity-list-item.js
@@ -9,6 +9,7 @@ import {
   FlexDirection,
   FlexWrap,
   FontWeight,
+  JustifyContent,
   TextAlign,
   TextColor,
   TextVariant,
@@ -69,11 +70,11 @@ export const ActivityListItem = ({
         <Box
           display={Display.InlineFlex}
           width={BlockSize.Full}
+          justifyContent={JustifyContent.spaceBetween}
           className="activity-list-item__content-container"
         >
           <Box
             display={Display.InlineFlex}
-            width={[BlockSize.OneThird, BlockSize.SevenTwelfths]}
             flexDirection={FlexDirection.Column}
             className="activity-list-item__detail-container"
           >
@@ -113,7 +114,6 @@ export const ActivityListItem = ({
           {rightContent && (
             <Box
               display={Display.InlineFlex}
-              width={BlockSize.Full}
               height={BlockSize.Min}
               flexDirection={FlexDirection.Column}
               alignItems={AlignItems.flexEnd}
diff --git a/ui/ducks/bridge-status/actions.ts b/ui/ducks/bridge-status/actions.ts
new file mode 100644
index 000000000000..e9198914966c
--- /dev/null
+++ b/ui/ducks/bridge-status/actions.ts
@@ -0,0 +1,30 @@
+import {
+  StartPollingForBridgeTxStatusArgs,
+  BridgeStatusAction,
+} from '../../../shared/types/bridge-status';
+import { forceUpdateMetamaskState } from '../../store/actions';
+import { submitRequestToBackground } from '../../store/background-connection';
+import { MetaMaskReduxDispatch } from '../../store/store';
+
+const callBridgeStatusControllerMethod = <T extends unknown[]>(
+  bridgeAction: BridgeStatusAction,
+  args?: T,
+) => {
+  return async (dispatch: MetaMaskReduxDispatch) => {
+    await submitRequestToBackground(bridgeAction, args);
+    await forceUpdateMetamaskState(dispatch);
+  };
+};
+
+export const startPollingForBridgeTxStatus = (
+  startPollingForBridgeTxStatusArgs: StartPollingForBridgeTxStatusArgs,
+) => {
+  return async (dispatch: MetaMaskReduxDispatch) => {
+    return dispatch(
+      callBridgeStatusControllerMethod<[StartPollingForBridgeTxStatusArgs]>(
+        BridgeStatusAction.START_POLLING_FOR_BRIDGE_TX_STATUS,
+        [startPollingForBridgeTxStatusArgs],
+      ),
+    );
+  };
+};
diff --git a/ui/ducks/bridge-status/selectors.ts b/ui/ducks/bridge-status/selectors.ts
new file mode 100644
index 000000000000..f85937697703
--- /dev/null
+++ b/ui/ducks/bridge-status/selectors.ts
@@ -0,0 +1,68 @@
+import { createSelector } from 'reselect';
+import { Hex } from '@metamask/utils';
+import {
+  BridgeStatusControllerState,
+  BridgeHistoryItem,
+} from '../../../shared/types/bridge-status';
+import { getSelectedAddress } from '../../selectors';
+import { Numeric } from '../../../shared/modules/Numeric';
+import {
+  getCurrentChainId,
+  ProviderConfigState,
+} from '../../../shared/modules/selectors/networks';
+
+export type BridgeStatusAppState = ProviderConfigState & {
+  metamask: {
+    bridgeStatusState: BridgeStatusControllerState;
+  };
+};
+
+export const selectBridgeStatusState = (state: BridgeStatusAppState) =>
+  state.metamask.bridgeStatusState;
+
+/**
+ * Returns a mapping of srcTxMetaId to txHistoryItem for the selected address
+ */
+export const selectBridgeHistoryForAccount = createSelector(
+  [getSelectedAddress, selectBridgeStatusState],
+  (selectedAddress, bridgeStatusState) => {
+    const { txHistory } = bridgeStatusState;
+
+    return Object.keys(txHistory).reduce<Record<string, BridgeHistoryItem>>(
+      (acc, txMetaId) => {
+        const txHistoryItem = txHistory[txMetaId];
+        if (txHistoryItem.account === selectedAddress) {
+          acc[txMetaId] = txHistoryItem;
+        }
+        return acc;
+      },
+      {},
+    );
+  },
+);
+
+/**
+ * Returns an array of sorted bridge history items for when the user's current chain is the destination chain for a bridge tx
+ */
+export const selectIncomingBridgeHistory = createSelector(
+  selectBridgeHistoryForAccount,
+  getCurrentChainId,
+  (bridgeHistory, currentChainId) => {
+    // Get all history items with dest chain that matches current chain
+    return Object.values(bridgeHistory)
+      .filter((bridgeHistoryItem) => {
+        const hexDestChainId = new Numeric(
+          bridgeHistoryItem.quote.destChainId,
+          10,
+        ).toPrefixedHexString() as Hex;
+
+        return hexDestChainId === currentChainId;
+      })
+      .sort((a, b) => {
+        if (a.startTime && b.startTime) {
+          return b.startTime - a.startTime;
+        }
+        return 0;
+      });
+  },
+);
diff --git a/ui/ducks/bridge/bridge.test.ts b/ui/ducks/bridge/bridge.test.ts
index 5a395fa23036..f4638c992906 100644
--- a/ui/ducks/bridge/bridge.test.ts
+++ b/ui/ducks/bridge/bridge.test.ts
@@ -188,7 +188,9 @@ describe('Ducks - Bridge', () => {
     it('dispatches action to the bridge controller', () => {
       // eslint-disable-next-line @typescript-eslint/no-explicit-any
       const mockStore = configureMockStore<any>(middleware)(
-        createBridgeMockStore({}, { fromTokenInputValue: '10' }),
+        createBridgeMockStore({
+          bridgeSliceOverrides: { fromTokenInputValue: '10' },
+        }),
       );
       const state = mockStore.getState().bridge;
       const mockResetBridgeState = jest.fn();
diff --git a/ui/ducks/bridge/selectors.test.ts b/ui/ducks/bridge/selectors.test.ts
index b92c8e60e4f0..3b150c3fde35 100644
--- a/ui/ducks/bridge/selectors.test.ts
+++ b/ui/ducks/bridge/selectors.test.ts
@@ -33,12 +33,13 @@ import {
 describe('Bridge selectors', () => {
   describe('getFromChain', () => {
     it('returns the fromChain from the state', () => {
-      const state = createBridgeMockStore(
-        { srcNetworkAllowlist: [CHAIN_IDS.ARBITRUM] },
-        { toChainId: '0xe708' },
-        {},
-        { ...mockNetworkState(FEATURED_RPCS[1]) },
-      );
+      const state = createBridgeMockStore({
+        featureFlagOverrides: { srcNetworkAllowlist: [CHAIN_IDS.ARBITRUM] },
+        bridgeSliceOverrides: { toChainId: '0xe708' },
+        metamaskStateOverrides: {
+          ...mockNetworkState(FEATURED_RPCS[1]),
+        },
+      });
 
       const result = getFromChain(state as never);
       expect(result).toStrictEqual({
@@ -61,10 +62,10 @@ describe('Bridge selectors', () => {
 
   describe('getToChain', () => {
     it('returns the toChain from the state', () => {
-      const state = createBridgeMockStore(
-        { destNetworkAllowlist: ['0xe708'] },
-        { toChainId: '0xe708' },
-      );
+      const state = createBridgeMockStore({
+        featureFlagOverrides: { destNetworkAllowlist: ['0xe708'] },
+        bridgeSliceOverrides: { toChainId: '0xe708' },
+      });
 
       const result = getToChain(state as never);
 
@@ -88,12 +89,11 @@ describe('Bridge selectors', () => {
 
   describe('getAllBridgeableNetworks', () => {
     it('returns list of ALLOWED_BRIDGE_CHAIN_IDS networks', () => {
-      const state = createBridgeMockStore(
-        {},
-        {},
-        {},
-        mockNetworkState(...FEATURED_RPCS),
-      );
+      const state = createBridgeMockStore({
+        metamaskStateOverrides: {
+          ...mockNetworkState(...FEATURED_RPCS),
+        },
+      });
       const result = getAllBridgeableNetworks(state as never);
 
       expect(result).toHaveLength(8);
@@ -154,8 +154,8 @@ describe('Bridge selectors', () => {
 
   describe('getFromChains', () => {
     it('excludes disabled chains from options', () => {
-      const state = createBridgeMockStore(
-        {
+      const state = createBridgeMockStore({
+        featureFlagOverrides: {
           srcNetworkAllowlist: [
             CHAIN_IDS.MAINNET,
             CHAIN_IDS.LINEA_MAINNET,
@@ -163,8 +163,8 @@ describe('Bridge selectors', () => {
             CHAIN_IDS.POLYGON,
           ],
         },
-        { toChainId: CHAIN_IDS.LINEA_MAINNET },
-      );
+        bridgeSliceOverrides: { toChainId: CHAIN_IDS.LINEA_MAINNET },
+      });
       const result = getFromChains(state as never);
 
       expect(result).toHaveLength(2);
@@ -186,8 +186,8 @@ describe('Bridge selectors', () => {
 
   describe('getToChains', () => {
     it('excludes selected providerConfig and disabled chains from options', () => {
-      const state = createBridgeMockStore(
-        {
+      const state = createBridgeMockStore({
+        featureFlagOverrides: {
           destNetworkAllowlist: [
             CHAIN_IDS.ARBITRUM,
             CHAIN_IDS.LINEA_MAINNET,
@@ -195,10 +195,10 @@ describe('Bridge selectors', () => {
             CHAIN_IDS.POLYGON,
           ],
         },
-        {},
-        {},
-        mockNetworkState(...FEATURED_RPCS),
-      );
+        metamaskStateOverrides: {
+          ...mockNetworkState(...FEATURED_RPCS),
+        },
+      });
       const result = getToChains(state as never);
 
       expect(result).toHaveLength(3);
@@ -223,16 +223,17 @@ describe('Bridge selectors', () => {
 
   describe('getIsBridgeTx', () => {
     it('returns false if bridge is not enabled', () => {
-      const state = createBridgeMockStore(
-        {
+      const state = createBridgeMockStore({
+        featureFlagOverrides: {
           extensionSupport: false,
           srcNetworkAllowlist: ['0x1'],
           destNetworkAllowlist: ['0x38'],
         },
-        { toChainId: '0x38' },
-        {},
-        { ...mockNetworkState({ chainId: '0x1' }), useExternalServices: true },
-      );
+        bridgeSliceOverrides: { toChainId: '0x38' },
+        metamaskStateOverrides: {
+          ...mockNetworkState({ chainId: '0x1' }),
+        },
+      });
 
       const result = getIsBridgeTx(state as never);
 
@@ -240,16 +241,17 @@ describe('Bridge selectors', () => {
     });
 
     it('returns false if toChainId is null', () => {
-      const state = createBridgeMockStore(
-        {
+      const state = createBridgeMockStore({
+        featureFlagOverrides: {
           extensionSupport: true,
           srcNetworkAllowlist: ['0x1'],
           destNetworkAllowlist: ['0x1'],
         },
-        { toChainId: null },
-        {},
-        { ...mockNetworkState({ chainId: '0x1' }), useExternalServices: true },
-      );
+        bridgeSliceOverrides: { toChainId: null },
+        metamaskStateOverrides: {
+          ...mockNetworkState({ chainId: '0x1' }),
+        },
+      });
 
       const result = getIsBridgeTx(state as never);
 
@@ -257,16 +259,17 @@ describe('Bridge selectors', () => {
     });
 
     it('returns false if fromChain and toChainId have the same chainId', () => {
-      const state = createBridgeMockStore(
-        {
+      const state = createBridgeMockStore({
+        featureFlagOverrides: {
           extensionSupport: true,
           srcNetworkAllowlist: ['0x1'],
           destNetworkAllowlist: ['0x1'],
         },
-        { toChainId: '0x1' },
-        {},
-        { ...mockNetworkState({ chainId: '0x1' }), useExternalServices: true },
-      );
+        bridgeSliceOverrides: { toChainId: '0x1' },
+        metamaskStateOverrides: {
+          ...mockNetworkState({ chainId: '0x1' }),
+        },
+      });
 
       const result = getIsBridgeTx(state as never);
 
@@ -274,16 +277,17 @@ describe('Bridge selectors', () => {
     });
 
     it('returns false if useExternalServices is not enabled', () => {
-      const state = createBridgeMockStore(
-        {
+      const state = createBridgeMockStore({
+        featureFlagOverrides: {
           extensionSupport: true,
           srcNetworkAllowlist: ['0x1'],
           destNetworkAllowlist: ['0x38'],
         },
-        { toChainId: '0x38' },
-        {},
-        { ...mockNetworkState({ chainId: '0x1' }), useExternalServices: false },
-      );
+        bridgeSliceOverrides: { toChainId: '0x38' },
+        metamaskStateOverrides: {
+          ...mockNetworkState({ chainId: '0x1' }),
+        },
+      });
 
       const result = getIsBridgeTx(state as never);
 
@@ -291,15 +295,14 @@ describe('Bridge selectors', () => {
     });
 
     it('returns true if bridge is enabled and fromChain and toChainId have different chainIds', () => {
-      const state = createBridgeMockStore(
-        {
+      const state = createBridgeMockStore({
+        featureFlagOverrides: {
           extensionSupport: true,
           srcNetworkAllowlist: ['0x1'],
           destNetworkAllowlist: ['0x38'],
         },
-        { toChainId: '0x38' },
-        {},
-        {
+        bridgeSliceOverrides: { toChainId: '0x38' },
+        metamaskStateOverrides: {
           ...mockNetworkState(
             ...Object.values(BUILT_IN_NETWORKS),
             ...FEATURED_RPCS.filter(
@@ -308,7 +311,7 @@ describe('Bridge selectors', () => {
           ),
           useExternalServices: true,
         },
-      );
+      });
 
       const result = getIsBridgeTx(state as never);
 
@@ -318,21 +321,22 @@ describe('Bridge selectors', () => {
 
   describe('getFromToken', () => {
     it('returns fromToken', () => {
-      const state = createBridgeMockStore(
-        {},
-
-        { fromToken: { address: '0x123', symbol: 'TEST' } },
-      );
+      const state = createBridgeMockStore({
+        bridgeSliceOverrides: {
+          fromToken: { address: '0x123', symbol: 'TEST' },
+        },
+      });
       const result = getFromToken(state as never);
 
       expect(result).toStrictEqual({ address: '0x123', symbol: 'TEST' });
     });
 
     it('returns defaultToken if fromToken has no address', () => {
-      const state = createBridgeMockStore(
-        {},
-        { fromToken: { symbol: 'NATIVE' } },
-      );
+      const state = createBridgeMockStore({
+        bridgeSliceOverrides: {
+          fromToken: { symbol: 'NATIVE' },
+        },
+      });
       const result = getFromToken(state as never);
 
       expect(result).toStrictEqual({
@@ -347,7 +351,9 @@ describe('Bridge selectors', () => {
     });
 
     it('returns defaultToken if fromToken is undefined', () => {
-      const state = createBridgeMockStore({}, { fromToken: undefined });
+      const state = createBridgeMockStore({
+        bridgeSliceOverrides: { fromToken: undefined },
+      });
       const result = getFromToken(state as never);
 
       expect(result).toStrictEqual({
@@ -364,17 +370,20 @@ describe('Bridge selectors', () => {
 
   describe('getToToken', () => {
     it('returns toToken', () => {
-      const state = createBridgeMockStore(
-        {},
-        { toToken: { address: '0x123', symbol: 'TEST' } },
-      );
+      const state = createBridgeMockStore({
+        bridgeSliceOverrides: {
+          toToken: { address: '0x123', symbol: 'TEST' },
+        },
+      });
       const result = getToToken(state as never);
 
       expect(result).toStrictEqual({ address: '0x123', symbol: 'TEST' });
     });
 
     it('returns undefined if toToken is undefined', () => {
-      const state = createBridgeMockStore({}, { toToken: null });
+      const state = createBridgeMockStore({
+        bridgeSliceOverrides: { toToken: null },
+      });
       const result = getToToken(state as never);
 
       expect(result).toStrictEqual(null);
@@ -383,14 +392,18 @@ describe('Bridge selectors', () => {
 
   describe('getFromAmount', () => {
     it('returns fromTokenInputValue', () => {
-      const state = createBridgeMockStore({}, { fromTokenInputValue: '123' });
+      const state = createBridgeMockStore({
+        bridgeSliceOverrides: { fromTokenInputValue: '123' },
+      });
       const result = getFromAmount(state as never);
 
       expect(result).toStrictEqual('123');
     });
 
     it('returns empty string', () => {
-      const state = createBridgeMockStore({}, { fromTokenInputValue: '' });
+      const state = createBridgeMockStore({
+        bridgeSliceOverrides: { fromTokenInputValue: '' },
+      });
       const result = getFromAmount(state as never);
 
       expect(result).toStrictEqual('');
@@ -399,13 +412,12 @@ describe('Bridge selectors', () => {
 
   describe('getToTokens', () => {
     it('returns dest tokens from controller state when toChainId is defined', () => {
-      const state = createBridgeMockStore(
-        {},
-        { toChainId: '0x1' },
-        {
+      const state = createBridgeMockStore({
+        bridgeSliceOverrides: { toChainId: '0x1' },
+        bridgeStateOverrides: {
           destTokens: { '0x00': { address: '0x00', symbol: 'TEST' } },
         },
-      );
+      });
       const result = getToTokens(state as never);
 
       expect(result).toStrictEqual({
@@ -414,13 +426,11 @@ describe('Bridge selectors', () => {
     });
 
     it('returns empty dest tokens from controller state when toChainId is undefined', () => {
-      const state = createBridgeMockStore(
-        {},
-        {},
-        {
+      const state = createBridgeMockStore({
+        bridgeStateOverrides: {
           destTokens: { '0x00': { address: '0x00', symbol: 'TEST' } },
         },
-      );
+      });
       const result = getToTokens(state as never);
 
       expect(result).toStrictEqual({});
@@ -429,28 +439,25 @@ describe('Bridge selectors', () => {
 
   describe('getToTopAssets', () => {
     it('returns dest top assets from controller state when toChainId is defined', () => {
-      const state = createBridgeMockStore(
-        {},
-        { toChainId: '0x1' },
-        {
+      const state = createBridgeMockStore({
+        bridgeSliceOverrides: { toChainId: '0x1' },
+        bridgeStateOverrides: {
           destTokens: { '0x00': { address: '0x00', symbol: 'TEST' } },
           destTopAssets: [{ address: '0x00', symbol: 'TEST' }],
         },
-      );
+      });
       const result = getToTopAssets(state as never);
 
       expect(result).toStrictEqual([{ address: '0x00', symbol: 'TEST' }]);
     });
 
     it('returns empty dest top assets from controller state when toChainId is undefined', () => {
-      const state = createBridgeMockStore(
-        {},
-        {},
-        {
+      const state = createBridgeMockStore({
+        bridgeStateOverrides: {
           destTokens: { '0x00': { address: '0x00', symbol: 'TEST' } },
           destTopAssets: [{ address: '0x00', symbol: 'TEST' }],
         },
-      );
+      });
       const result = getToTopAssets(state as never);
 
       expect(result).toStrictEqual([]);
@@ -459,13 +466,12 @@ describe('Bridge selectors', () => {
 
   describe('getFromTokens', () => {
     it('returns src tokens from controller state', () => {
-      const state = createBridgeMockStore(
-        {},
-        { toChainId: '0x1' },
-        {
+      const state = createBridgeMockStore({
+        bridgeSliceOverrides: { toChainId: '0x1' },
+        bridgeStateOverrides: {
           srcTokens: { '0x00': { address: '0x00', symbol: 'TEST' } },
         },
-      );
+      });
       const result = getFromTokens(state as never);
 
       expect(result).toStrictEqual({
@@ -476,14 +482,13 @@ describe('Bridge selectors', () => {
 
   describe('getFromTopAssets', () => {
     it('returns src top assets from controller state', () => {
-      const state = createBridgeMockStore(
-        {},
-        { toChainId: '0x1' },
-        {
+      const state = createBridgeMockStore({
+        bridgeSliceOverrides: { toChainId: '0x1' },
+        bridgeStateOverrides: {
           srcTokens: { '0x00': { address: '0x00', symbol: 'TEST' } },
           srcTopAssets: [{ address: '0x00', symbol: 'TEST' }],
         },
-      );
+      });
       const result = getFromTopAssets(state as never);
 
       expect(result).toStrictEqual([{ address: '0x00', symbol: 'TEST' }]);
@@ -492,15 +497,15 @@ describe('Bridge selectors', () => {
 
   describe('getBridgeQuotes', () => {
     it('returns quote list and fetch data, insufficientBal=false,quotesRefreshCount=5', () => {
-      const state = createBridgeMockStore(
-        { extensionConfig: { maxRefreshCount: 5 } },
-        {
+      const state = createBridgeMockStore({
+        featureFlagOverrides: { extensionConfig: { maxRefreshCount: 5 } },
+        bridgeSliceOverrides: {
           toChainId: '0x1',
           fromTokenExchangeRate: 1,
           toTokenExchangeRate: 0.99,
           toNativeExchangeRate: 0.354073,
         },
-        {
+        bridgeStateOverrides: {
           quoteRequest: { insufficientBal: false },
           quotes: mockErc20Erc20Quotes,
           quotesFetchStatus: 1,
@@ -509,14 +514,14 @@ describe('Bridge selectors', () => {
           srcTokens: { '0x00': { address: '0x00', symbol: 'TEST' } },
           srcTopAssets: [{ address: '0x00', symbol: 'TEST' }],
         },
-        {
+        metamaskStateOverrides: {
           currencyRates: {
             ETH: {
               conversionRate: 1,
             },
           },
         },
-      );
+      });
 
       const recommendedQuoteMetadata = {
         adjustedReturn: {
@@ -562,15 +567,15 @@ describe('Bridge selectors', () => {
     });
 
     it('returns quote list and fetch data, insufficientBal=false,quotesRefreshCount=2', () => {
-      const state = createBridgeMockStore(
-        { extensionConfig: { maxRefreshCount: 5 } },
-        {
+      const state = createBridgeMockStore({
+        featureFlagOverrides: { extensionConfig: { maxRefreshCount: 5 } },
+        bridgeSliceOverrides: {
           toChainId: '0x1',
           fromTokenExchangeRate: 1,
           toTokenExchangeRate: 0.99,
           toNativeExchangeRate: 0.354073,
         },
-        {
+        bridgeStateOverrides: {
           quoteRequest: { insufficientBal: false },
           quotes: mockErc20Erc20Quotes,
           quotesFetchStatus: 1,
@@ -579,14 +584,14 @@ describe('Bridge selectors', () => {
           srcTokens: { '0x00': { address: '0x00', symbol: 'TEST' } },
           srcTopAssets: [{ address: '0x00', symbol: 'TEST' }],
         },
-        {
+        metamaskStateOverrides: {
           currencyRates: {
             ETH: {
               conversionRate: 1,
             },
           },
         },
-      );
+      });
       const result = getBridgeQuotes(state as never);
 
       const recommendedQuoteMetadata = {
@@ -638,15 +643,15 @@ describe('Bridge selectors', () => {
     });
 
     it('returns quote list and fetch data, insufficientBal=true', () => {
-      const state = createBridgeMockStore(
-        { extensionConfig: { maxRefreshCount: 5 } },
-        {
+      const state = createBridgeMockStore({
+        featureFlagOverrides: { extensionConfig: { maxRefreshCount: 5 } },
+        bridgeSliceOverrides: {
           toChainId: '0x1',
           fromTokenExchangeRate: 1,
           toTokenExchangeRate: 0.99,
           toNativeExchangeRate: 0.354073,
         },
-        {
+        bridgeStateOverrides: {
           quoteRequest: { insufficientBal: true },
           quotes: mockErc20Erc20Quotes,
           quotesFetchStatus: 1,
@@ -655,14 +660,14 @@ describe('Bridge selectors', () => {
           srcTokens: { '0x00': { address: '0x00', symbol: 'TEST' } },
           srcTopAssets: [{ address: '0x00', symbol: 'TEST' }],
         },
-        {
+        metamaskStateOverrides: {
           currencyRates: {
             ETH: {
               conversionRate: 1,
             },
           },
         },
-      );
+      });
       const result = getBridgeQuotes(state as never);
 
       const recommendedQuoteMetadata = {
@@ -733,11 +738,9 @@ describe('Bridge selectors', () => {
     });
 
     it('should sort quotes by adjustedReturn', () => {
-      const state = createBridgeMockStore(
-        {},
-        {},
-        { quotes: mockBridgeQuotesNativeErc20 },
-      );
+      const state = createBridgeMockStore({
+        bridgeStateOverrides: { quotes: mockBridgeQuotesNativeErc20 },
+      });
 
       const { activeQuote, recommendedQuote, sortedQuotes } = getBridgeQuotes(
         state as never,
@@ -773,10 +776,9 @@ describe('Bridge selectors', () => {
     });
 
     it('should sort quotes by ETA', () => {
-      const state = createBridgeMockStore(
-        {},
-        { sortOrder: SortOrder.ETA_ASC },
-        {
+      const state = createBridgeMockStore({
+        bridgeSliceOverrides: { sortOrder: SortOrder.ETA_ASC },
+        bridgeStateOverrides: {
           quotes: [
             ...mockBridgeQuotesNativeErc20,
             {
@@ -789,7 +791,7 @@ describe('Bridge selectors', () => {
             },
           ],
         },
-      );
+      });
 
       const { activeQuote, recommendedQuote, sortedQuotes } = getBridgeQuotes(
         state as never,
@@ -808,10 +810,9 @@ describe('Bridge selectors', () => {
     });
 
     it('should recommend 2nd cheapest quote if ETA exceeds 1 hour', () => {
-      const state = createBridgeMockStore(
-        {},
-        { sortOrder: SortOrder.COST_ASC },
-        {
+      const state = createBridgeMockStore({
+        bridgeSliceOverrides: { sortOrder: SortOrder.COST_ASC },
+        bridgeStateOverrides: {
           quotes: [
             mockBridgeQuotesNativeErc20[1],
             {
@@ -825,7 +826,7 @@ describe('Bridge selectors', () => {
             },
           ],
         },
-      );
+      });
 
       const { activeQuote, recommendedQuote, sortedQuotes } = getBridgeQuotes(
         state as never,
@@ -847,14 +848,13 @@ describe('Bridge selectors', () => {
     });
 
     it('should recommend 2nd fastest quote if adjustedReturn is less than 80% of cheapest quote', () => {
-      const state = createBridgeMockStore(
-        {},
-        {
+      const state = createBridgeMockStore({
+        bridgeSliceOverrides: {
           sortOrder: SortOrder.ETA_ASC,
           toTokenExchangeRate: 0.998781,
           toNativeExchangeRate: 0.354073,
         },
-        {
+        bridgeStateOverrides: {
           quotes: [
             ...mockBridgeQuotesNativeErc20,
             {
@@ -868,14 +868,14 @@ describe('Bridge selectors', () => {
             },
           ],
         },
-        {
+        metamaskStateOverrides: {
           currencyRates: {
             ETH: {
               conversionRate: 2524.25,
             },
           },
         },
-      );
+      });
 
       const { activeQuote, recommendedQuote, sortedQuotes } = getBridgeQuotes(
         state as never,
diff --git a/ui/helpers/constants/routes.ts b/ui/helpers/constants/routes.ts
index bf38109ec9d7..330d3ad20815 100644
--- a/ui/helpers/constants/routes.ts
+++ b/ui/helpers/constants/routes.ts
@@ -232,6 +232,7 @@ PATH_NAME_MAP[
 ] = 'Encryption Public Key Request Page';
 
 export const CROSS_CHAIN_SWAP_ROUTE = '/cross-chain';
+export const CROSS_CHAIN_SWAP_TX_DETAILS_ROUTE = '/cross-chain/tx-details';
 
 export const SWAPS_ROUTE = '/swaps';
 
diff --git a/ui/hooks/bridge/useBridgeChainInfo.ts b/ui/hooks/bridge/useBridgeChainInfo.ts
new file mode 100644
index 000000000000..f5229391ff44
--- /dev/null
+++ b/ui/hooks/bridge/useBridgeChainInfo.ts
@@ -0,0 +1,83 @@
+import { useSelector } from 'react-redux';
+import { Hex } from '@metamask/utils';
+import { NetworkConfiguration } from '@metamask/network-controller';
+import { Numeric } from '../../../shared/modules/Numeric';
+import { getNetworkConfigurationsByChainId } from '../../../shared/modules/selectors/networks';
+import { BridgeHistoryItem } from '../../../shared/types/bridge-status';
+import {
+  CHAIN_ID_TO_CURRENCY_SYMBOL_MAP,
+  NETWORK_TO_NAME_MAP,
+} from '../../../shared/constants/network';
+import { CHAINID_DEFAULT_BLOCK_EXPLORER_URL_MAP } from '../../../shared/constants/common';
+
+export type UseBridgeChainInfoProps = {
+  bridgeHistoryItem?: BridgeHistoryItem;
+};
+
+export default function useBridgeChainInfo({
+  bridgeHistoryItem,
+}: UseBridgeChainInfoProps) {
+  const networkConfigurationsByChainId = useSelector(
+    getNetworkConfigurationsByChainId,
+  );
+
+  const decSrcChainId = bridgeHistoryItem?.quote.srcChainId;
+  const hexSrcChainId = decSrcChainId
+    ? (new Numeric(decSrcChainId, 10).toPrefixedHexString() as Hex)
+    : undefined;
+
+  const decDestChainId = bridgeHistoryItem?.quote.destChainId;
+  const hexDestChainId = decDestChainId
+    ? (new Numeric(decDestChainId, 10).toPrefixedHexString() as Hex)
+    : undefined;
+
+  if (!bridgeHistoryItem || !hexSrcChainId || !hexDestChainId) {
+    return {
+      srcNetwork: undefined,
+      destNetwork: undefined,
+    };
+  }
+
+  // Source chain info
+  const srcNetwork = networkConfigurationsByChainId[hexSrcChainId]
+    ? networkConfigurationsByChainId[hexSrcChainId]
+    : undefined;
+  const fallbackSrcNetwork: NetworkConfiguration = {
+    chainId: hexSrcChainId,
+    name: NETWORK_TO_NAME_MAP[
+      hexSrcChainId as keyof typeof NETWORK_TO_NAME_MAP
+    ],
+    nativeCurrency:
+      CHAIN_ID_TO_CURRENCY_SYMBOL_MAP[
+        hexSrcChainId as keyof typeof CHAIN_ID_TO_CURRENCY_SYMBOL_MAP
+      ],
+    defaultBlockExplorerUrlIndex: 0,
+    blockExplorerUrls: [CHAINID_DEFAULT_BLOCK_EXPLORER_URL_MAP[hexSrcChainId]],
+    defaultRpcEndpointIndex: 0,
+    rpcEndpoints: [],
+  };
+
+  // Dest chain info
+  const destNetwork = networkConfigurationsByChainId[hexDestChainId]
+    ? networkConfigurationsByChainId[hexDestChainId]
+    : undefined;
+  const fallbackDestNetwork: NetworkConfiguration = {
+    chainId: hexDestChainId,
+    name: NETWORK_TO_NAME_MAP[
+      hexDestChainId as keyof typeof NETWORK_TO_NAME_MAP
+    ],
+    nativeCurrency:
+      CHAIN_ID_TO_CURRENCY_SYMBOL_MAP[
+        hexDestChainId as keyof typeof CHAIN_ID_TO_CURRENCY_SYMBOL_MAP
+      ],
+    defaultBlockExplorerUrlIndex: 0,
+    blockExplorerUrls: [CHAINID_DEFAULT_BLOCK_EXPLORER_URL_MAP[hexDestChainId]],
+    defaultRpcEndpointIndex: 0,
+    rpcEndpoints: [],
+  };
+
+  return {
+    srcNetwork: srcNetwork || fallbackSrcNetwork,
+    destNetwork: destNetwork || fallbackDestNetwork,
+  };
+}
diff --git a/ui/hooks/bridge/useBridgeTxHistoryData.ts b/ui/hooks/bridge/useBridgeTxHistoryData.ts
new file mode 100644
index 000000000000..97cc7f5675a3
--- /dev/null
+++ b/ui/hooks/bridge/useBridgeTxHistoryData.ts
@@ -0,0 +1,62 @@
+import { useSelector } from 'react-redux';
+import { Hex } from '@metamask/utils';
+import { TransactionMeta } from '@metamask/transaction-controller';
+import { useHistory } from 'react-router-dom';
+import { selectBridgeHistoryForAccount } from '../../ducks/bridge-status/selectors';
+import { CROSS_CHAIN_SWAP_TX_DETAILS_ROUTE } from '../../helpers/constants/routes';
+import { useI18nContext } from '../useI18nContext';
+import useBridgeChainInfo from './useBridgeChainInfo';
+
+export type UseBridgeDataProps = {
+  transactionGroup: {
+    hasCancelled: boolean;
+    hasRetried: boolean;
+    initialTransaction: TransactionMeta;
+    nonce: Hex;
+    primaryTransaction: TransactionMeta;
+    transactions: TransactionMeta[];
+  };
+};
+
+export default function useBridgeTxHistoryData({
+  transactionGroup,
+}: UseBridgeDataProps) {
+  const t = useI18nContext();
+  const history = useHistory();
+  const bridgeHistory = useSelector(selectBridgeHistoryForAccount);
+
+  const srcTxHash = transactionGroup.initialTransaction.hash;
+
+  // If this tx is a bridge tx, it will have a bridgeHistoryItem
+  const bridgeHistoryItem = srcTxHash ? bridgeHistory[srcTxHash] : undefined;
+
+  const { destNetwork } = useBridgeChainInfo({
+    bridgeHistoryItem,
+  });
+
+  const destChainName = destNetwork?.name;
+  const bridgeTitleSuffix = destChainName
+    ? t('bridgeToChain', [destChainName])
+    : '';
+
+  // By complete, this means BOTH source and dest tx are confirmed
+  const isBridgeComplete = bridgeHistoryItem
+    ? Boolean(
+        bridgeHistoryItem?.status.srcChain.txHash &&
+          bridgeHistoryItem.status.destChain?.txHash,
+      )
+    : null;
+
+  const showBridgeTxDetails = srcTxHash
+    ? () => {
+        history.push(`${CROSS_CHAIN_SWAP_TX_DETAILS_ROUTE}/${srcTxHash}`);
+      }
+    : null;
+
+  return {
+    bridgeTitleSuffix,
+    bridgeTxHistoryItem: bridgeHistoryItem,
+    isBridgeComplete,
+    showBridgeTxDetails,
+  };
+}
diff --git a/ui/hooks/bridge/useCountdownTimer.test.ts b/ui/hooks/bridge/useCountdownTimer.test.ts
index 293fe1ac679b..0adc18f68c15 100644
--- a/ui/hooks/bridge/useCountdownTimer.test.ts
+++ b/ui/hooks/bridge/useCountdownTimer.test.ts
@@ -16,14 +16,15 @@ describe('useCountdownTimer', () => {
   it('returns time remaining', async () => {
     const quotesLastFetched = Date.now();
     const { result } = renderUseCountdownTimer(
-      createBridgeMockStore(
-        { extensionConfig: { maxRefreshCount: 5, refreshRate: 40000 } },
-        {},
-        {
+      createBridgeMockStore({
+        featureFlagOverrides: {
+          extensionConfig: { maxRefreshCount: 5, refreshRate: 40000 },
+        },
+        bridgeStateOverrides: {
           quotesLastFetched,
           quotesRefreshCount: 0,
         },
-      ),
+      }),
     );
 
     let i = 0;
diff --git a/ui/hooks/useTransactionDisplayData.js b/ui/hooks/useTransactionDisplayData.js
index b008f2fdaf7d..2adcdd03e760 100644
--- a/ui/hooks/useTransactionDisplayData.js
+++ b/ui/hooks/useTransactionDisplayData.js
@@ -79,6 +79,10 @@ const signatureTypes = [
  * @property {boolean} subtitleContainsOrigin - true if the subtitle includes the origin of the tx
  * @property {string} title - the primary title of the tx that will be displayed in the activity list
  * @property {string} [secondaryCurrency] - the currency string to display in the secondary position
+ * @property {string} date - the formatted date of the transaction
+ * @property {string} displayedStatusKey - the key representing the displayed status of the transaction
+ * @property {boolean} isPending - indicates if the transaction is pending
+ * @property {boolean} isSubmitted - indicates if the transaction has been submitted
  */
 
 /**
@@ -366,6 +370,7 @@ export function useTransactionDisplayData(transactionGroup) {
     primarySuffix = primaryTransaction.sourceTokenSymbol; // TODO this will be undefined right now
   } else if (type === TransactionType.bridge) {
     title = t('bridge');
+    category = TransactionGroupCategory.bridge;
   } else {
     dispatch(
       captureSingleException(
diff --git a/ui/pages/bridge/hooks/useAddToken.ts b/ui/pages/bridge/hooks/useAddToken.ts
index d0d29847bf57..1f2dc117513b 100644
--- a/ui/pages/bridge/hooks/useAddToken.ts
+++ b/ui/pages/bridge/hooks/useAddToken.ts
@@ -1,6 +1,5 @@
 import { useDispatch, useSelector } from 'react-redux';
 import { NetworkConfiguration } from '@metamask/network-controller';
-import { Numeric } from '../../../../shared/modules/Numeric';
 import { QuoteResponse } from '../types';
 import { FEATURED_RPCS } from '../../../../shared/constants/network';
 import { addToken, addNetwork } from '../../../store/actions';
@@ -8,6 +7,7 @@ import {
   getNetworkConfigurationsByChainId,
   getSelectedNetworkClientId,
 } from '../../../../shared/modules/selectors/networks';
+import { decimalToPrefixedHex } from '../../../../shared/modules/conversion.utils';
 
 export default function useAddToken() {
   const dispatch = useDispatch();
@@ -34,9 +34,9 @@ export default function useAddToken() {
 
   const addDestToken = async (quoteResponse: QuoteResponse) => {
     // Look up the destination chain
-    const hexDestChainId = new Numeric(quoteResponse.quote.destChainId, 10)
-      .toPrefixedHexString()
-      .toLowerCase() as `0x${string}`;
+    const hexDestChainId = decimalToPrefixedHex(
+      quoteResponse.quote.destChainId,
+    );
     const foundDestNetworkConfig: NetworkConfiguration | undefined =
       networkConfigurations[hexDestChainId];
     let addedDestNetworkConfig: NetworkConfiguration | undefined;
diff --git a/ui/pages/bridge/hooks/useHandleApprovalTx.ts b/ui/pages/bridge/hooks/useHandleApprovalTx.ts
index 67f2abf67e7e..c0fb7812cce0 100644
--- a/ui/pages/bridge/hooks/useHandleApprovalTx.ts
+++ b/ui/pages/bridge/hooks/useHandleApprovalTx.ts
@@ -3,9 +3,9 @@ import { Hex } from '@metamask/utils';
 import { BigNumber } from 'bignumber.js';
 import { TxData, QuoteResponse, FeeType } from '../types';
 import { isEthUsdt, getEthUsdtResetData } from '../bridge.util';
-import { Numeric } from '../../../../shared/modules/Numeric';
 import { ETH_USDT_ADDRESS } from '../../../../shared/constants/bridge';
 import { getBridgeERC20Allowance } from '../../../ducks/bridge/actions';
+import { decimalToPrefixedHex } from '../../../../shared/modules/conversion.utils';
 import useHandleTx from './useHandleTx';
 
 export default function useHandleApprovalTx() {
@@ -59,10 +59,7 @@ export default function useHandleApprovalTx() {
     approval: TxData;
     quoteResponse: QuoteResponse;
   }) => {
-    const hexChainId = new Numeric(
-      approval.chainId,
-      10,
-    ).toPrefixedHexString() as `0x${string}`;
+    const hexChainId = decimalToPrefixedHex(approval.chainId);
 
     // On Ethereum, we need to reset the allowance to 0 for USDT first if we need to set a new allowance
     // https://www.google.com/url?q=https://docs.unizen.io/trade-api/before-you-get-started/token-allowance-management-for-non-updatable-allowance-tokens&sa=D&source=docs&ust=1727386175513609&usg=AOvVaw3Opm6BSJeu7qO0Ve5iLTOh
@@ -86,7 +83,7 @@ export default function useHandleApprovalTx() {
       },
     });
 
-    return txMeta.id;
+    return txMeta;
   };
   return {
     handleApprovalTx,
diff --git a/ui/pages/bridge/hooks/useHandleBridgeTx.ts b/ui/pages/bridge/hooks/useHandleBridgeTx.ts
index 22b2a74fa077..f8135a1bbc08 100644
--- a/ui/pages/bridge/hooks/useHandleBridgeTx.ts
+++ b/ui/pages/bridge/hooks/useHandleBridgeTx.ts
@@ -41,7 +41,7 @@ export default function useHandleBridgeTx() {
       },
     });
 
-    return txMeta.id;
+    return txMeta;
   };
 
   return { handleBridgeTx };
diff --git a/ui/pages/bridge/hooks/useHandleTx.ts b/ui/pages/bridge/hooks/useHandleTx.ts
index a4cbf631c338..ffd378449bc7 100644
--- a/ui/pages/bridge/hooks/useHandleTx.ts
+++ b/ui/pages/bridge/hooks/useHandleTx.ts
@@ -14,7 +14,7 @@ import {
 import { getGasFeeEstimates } from '../../../ducks/metamask/metamask';
 import { checkNetworkAndAccountSupports1559 } from '../../../selectors';
 import { ChainId } from '../types';
-import { Numeric } from '../../../../shared/modules/Numeric';
+import { decimalToPrefixedHex } from '../../../../shared/modules/conversion.utils';
 
 export default function useHandleTx() {
   const dispatch = useDispatch();
@@ -42,10 +42,7 @@ export default function useHandleTx() {
       meta: Partial<TransactionMeta>;
     };
   }) => {
-    const hexChainId = new Numeric(
-      txParams.chainId,
-      10,
-    ).toPrefixedHexString() as `0x${string}`;
+    const hexChainId = decimalToPrefixedHex(txParams.chainId);
 
     const { maxFeePerGas, maxPriorityFeePerGas } = await getTxGasEstimates({
       networkAndAccountSupports1559,
diff --git a/ui/pages/bridge/hooks/useSubmitBridgeTransaction.test.tsx b/ui/pages/bridge/hooks/useSubmitBridgeTransaction.test.tsx
index 54d7b9e96700..55c19821777b 100644
--- a/ui/pages/bridge/hooks/useSubmitBridgeTransaction.test.tsx
+++ b/ui/pages/bridge/hooks/useSubmitBridgeTransaction.test.tsx
@@ -97,11 +97,8 @@ const middleware = [thunk];
 
 const makeMockStore = () => {
   const store = configureMockStore<any>(middleware)(
-    createBridgeMockStore(
-      {},
-      {},
-      {},
-      {
+    createBridgeMockStore({
+      metamaskStateOverrides: {
         gasFeeEstimates: {
           high: {
             maxWaitTimeEstimate: 30000,
@@ -112,7 +109,7 @@ const makeMockStore = () => {
         },
         useExternalServices: true,
       },
-    ),
+    }),
   );
   return store;
 };
diff --git a/ui/pages/bridge/hooks/useSubmitBridgeTransaction.ts b/ui/pages/bridge/hooks/useSubmitBridgeTransaction.ts
index db3b1c86ca06..fcdf8569bdd0 100644
--- a/ui/pages/bridge/hooks/useSubmitBridgeTransaction.ts
+++ b/ui/pages/bridge/hooks/useSubmitBridgeTransaction.ts
@@ -1,9 +1,11 @@
 import { useDispatch } from 'react-redux';
 import { zeroAddress } from 'ethereumjs-util';
 import { useHistory } from 'react-router-dom';
+import { TransactionMeta } from '@metamask/transaction-controller';
 import { QuoteResponse } from '../types';
 import { DEFAULT_ROUTE } from '../../../helpers/constants/routes';
 import { setDefaultHomeActiveTabName } from '../../../store/actions';
+import { startPollingForBridgeTxStatus } from '../../../ducks/bridge-status/actions';
 import useAddToken from './useAddToken';
 import useHandleApprovalTx from './useHandleApprovalTx';
 import useHandleBridgeTx from './useHandleBridgeTx';
@@ -17,19 +19,40 @@ export default function useSubmitBridgeTransaction() {
 
   const submitBridgeTransaction = async (quoteResponse: QuoteResponse) => {
     // Execute transaction(s)
-    let approvalTxId: string | undefined;
+    let approvalTxMeta: TransactionMeta | undefined;
     if (quoteResponse?.approval) {
-      approvalTxId = await handleApprovalTx({
+      approvalTxMeta = await handleApprovalTx({
         approval: quoteResponse.approval,
         quoteResponse,
       });
     }
 
-    await handleBridgeTx({
+    const bridgeTxMeta = await handleBridgeTx({
       quoteResponse,
-      approvalTxId,
+      approvalTxId: approvalTxMeta?.id,
     });
 
+    // Get bridge tx status
+    if (bridgeTxMeta.hash) {
+      const statusRequest = {
+        bridgeId: quoteResponse.quote.bridgeId,
+        srcTxHash: bridgeTxMeta.hash,
+        bridge: quoteResponse.quote.bridges[0],
+        srcChainId: quoteResponse.quote.srcChainId,
+        destChainId: quoteResponse.quote.destChainId,
+        quote: quoteResponse.quote,
+        refuel: Boolean(quoteResponse.quote.refuel),
+      };
+      dispatch(
+        startPollingForBridgeTxStatus({
+          statusRequest,
+          quoteResponse,
+          slippagePercentage: 0, // TODO pull this from redux/bridgecontroller once it's implemented. currently hardcoded in quoteRequest.slippage right now
+          startTime: bridgeTxMeta.time,
+        }),
+      );
+    }
+
     // Add tokens if not the native gas token
     if (quoteResponse.quote.srcAsset.address !== zeroAddress()) {
       addSourceToken(quoteResponse);
diff --git a/ui/pages/bridge/index.scss b/ui/pages/bridge/index.scss
index bc96dfbbe825..e9d6009676f9 100644
--- a/ui/pages/bridge/index.scss
+++ b/ui/pages/bridge/index.scss
@@ -2,6 +2,7 @@
 
 @import 'prepare/index';
 @import 'quotes/index';
+@import 'transaction-details/index';
 
 
 .bridge {
diff --git a/ui/pages/bridge/index.test.tsx b/ui/pages/bridge/index.test.tsx
index 1dc898d71685..2b0275962afe 100644
--- a/ui/pages/bridge/index.test.tsx
+++ b/ui/pages/bridge/index.test.tsx
@@ -63,7 +63,9 @@ describe('Bridge', () => {
   });
 
   it('renders the component with initial props', async () => {
-    const swapsMockStore = createBridgeMockStore({ extensionSupport: true });
+    const swapsMockStore = createBridgeMockStore({
+      featureFlagOverrides: { extensionSupport: true },
+    });
     const store = configureMockStore(middleware)(swapsMockStore);
 
     const { container, getByText } = renderWithProvider(
diff --git a/ui/pages/bridge/prepare/bridge-cta-button.test.tsx b/ui/pages/bridge/prepare/bridge-cta-button.test.tsx
index 91adb422e22b..e20a7e661796 100644
--- a/ui/pages/bridge/prepare/bridge-cta-button.test.tsx
+++ b/ui/pages/bridge/prepare/bridge-cta-button.test.tsx
@@ -11,13 +11,13 @@ import { BridgeCTAButton } from './bridge-cta-button';
 
 describe('BridgeCTAButton', () => {
   it("should render the component's initial state", () => {
-    const mockStore = createBridgeMockStore(
-      {
+    const mockStore = createBridgeMockStore({
+      featureFlagOverrides: {
         srcNetworkAllowlist: [CHAIN_IDS.MAINNET, CHAIN_IDS.OPTIMISM],
         destNetworkAllowlist: [CHAIN_IDS.OPTIMISM],
       },
-      { fromTokenInputValue: 1 },
-    );
+      bridgeSliceOverrides: { fromTokenInputValue: 1 },
+    });
     const { container, getByText, getByRole } = renderWithProvider(
       <BridgeCTAButton />,
       configureStore(mockStore),
@@ -30,19 +30,18 @@ describe('BridgeCTAButton', () => {
   });
 
   it('should render the component when amount is missing', () => {
-    const mockStore = createBridgeMockStore(
-      {
+    const mockStore = createBridgeMockStore({
+      featureFlagOverrides: {
         srcNetworkAllowlist: [CHAIN_IDS.MAINNET, CHAIN_IDS.OPTIMISM],
         destNetworkAllowlist: [CHAIN_IDS.LINEA_MAINNET],
       },
-      {
+      bridgeSliceOverrides: {
         fromTokenInputValue: null,
         fromToken: 'ETH',
         toToken: 'ETH',
         toChainId: CHAIN_IDS.LINEA_MAINNET,
       },
-      {},
-    );
+    });
     const { getByText, getByRole } = renderWithProvider(
       <BridgeCTAButton />,
       configureStore(mockStore),
@@ -53,19 +52,18 @@ describe('BridgeCTAButton', () => {
   });
 
   it('should render the component when amount and dest token is missing', () => {
-    const mockStore = createBridgeMockStore(
-      {
+    const mockStore = createBridgeMockStore({
+      featureFlagOverrides: {
         srcNetworkAllowlist: [CHAIN_IDS.MAINNET, CHAIN_IDS.OPTIMISM],
         destNetworkAllowlist: [CHAIN_IDS.LINEA_MAINNET],
       },
-      {
+      bridgeSliceOverrides: {
         fromTokenInputValue: null,
         fromToken: 'ETH',
         toToken: null,
         toChainId: CHAIN_IDS.LINEA_MAINNET,
       },
-      {},
-    );
+    });
     const { getByText, getByRole } = renderWithProvider(
       <BridgeCTAButton />,
       configureStore(mockStore),
@@ -76,23 +74,23 @@ describe('BridgeCTAButton', () => {
   });
 
   it('should render the component when tx is submittable', () => {
-    const mockStore = createBridgeMockStore(
-      {
+    const mockStore = createBridgeMockStore({
+      featureFlagOverrides: {
         srcNetworkAllowlist: [CHAIN_IDS.MAINNET, CHAIN_IDS.OPTIMISM],
         destNetworkAllowlist: [CHAIN_IDS.LINEA_MAINNET],
       },
-      {
+      bridgeSliceOverrides: {
         fromTokenInputValue: 1,
         fromToken: 'ETH',
         toToken: 'ETH',
         toChainId: CHAIN_IDS.LINEA_MAINNET,
       },
-      {
+      bridgeStateOverrides: {
         quotes: mockBridgeQuotesNativeErc20,
         quotesLastFetched: Date.now(),
         quotesLoadingStatus: RequestStatus.FETCHED,
       },
-    );
+    });
     const { getByText, getByRole } = renderWithProvider(
       <BridgeCTAButton />,
       configureStore(mockStore),
@@ -103,23 +101,23 @@ describe('BridgeCTAButton', () => {
   });
 
   it('should disable the component when quotes are loading and there are no existing quotes', () => {
-    const mockStore = createBridgeMockStore(
-      {
+    const mockStore = createBridgeMockStore({
+      featureFlagOverrides: {
         srcNetworkAllowlist: [CHAIN_IDS.MAINNET, CHAIN_IDS.OPTIMISM],
         destNetworkAllowlist: [CHAIN_IDS.LINEA_MAINNET],
       },
-      {
+      bridgeSliceOverrides: {
         fromTokenInputValue: 1,
         fromToken: 'ETH',
         toToken: 'ETH',
         toChainId: CHAIN_IDS.LINEA_MAINNET,
       },
-      {
+      bridgeStateOverrides: {
         quotes: [],
         quotesLastFetched: Date.now(),
         quotesLoadingStatus: RequestStatus.LOADING,
       },
-    );
+    });
     const { getByText, getByRole } = renderWithProvider(
       <BridgeCTAButton />,
       configureStore(mockStore),
@@ -130,23 +128,23 @@ describe('BridgeCTAButton', () => {
   });
 
   it('should enable the component when quotes are loading and there are existing quotes', () => {
-    const mockStore = createBridgeMockStore(
-      {
+    const mockStore = createBridgeMockStore({
+      featureFlagOverrides: {
         srcNetworkAllowlist: [CHAIN_IDS.MAINNET, CHAIN_IDS.OPTIMISM],
         destNetworkAllowlist: [CHAIN_IDS.LINEA_MAINNET],
       },
-      {
+      bridgeSliceOverrides: {
         fromTokenInputValue: 1,
         fromToken: 'ETH',
         toToken: 'ETH',
         toChainId: CHAIN_IDS.LINEA_MAINNET,
       },
-      {
+      bridgeStateOverrides: {
         quotes: mockBridgeQuotesNativeErc20,
         quotesLastFetched: Date.now(),
         quotesLoadingStatus: RequestStatus.LOADING,
       },
-    );
+    });
     const { getByText, getByRole } = renderWithProvider(
       <BridgeCTAButton />,
       configureStore(mockStore),
diff --git a/ui/pages/bridge/prepare/prepare-bridge-page.test.tsx b/ui/pages/bridge/prepare/prepare-bridge-page.test.tsx
index 95248bdbb0bc..28a754ac85b5 100644
--- a/ui/pages/bridge/prepare/prepare-bridge-page.test.tsx
+++ b/ui/pages/bridge/prepare/prepare-bridge-page.test.tsx
@@ -27,13 +27,12 @@ describe('PrepareBridgePage', () => {
     jest
       .spyOn(reactRouterUtils, 'useSearchParams')
       .mockReturnValue([{ get: () => null }] as never);
-    const mockStore = createBridgeMockStore(
-      {
+    const mockStore = createBridgeMockStore({
+      featureFlagOverrides: {
         srcNetworkAllowlist: [CHAIN_IDS.MAINNET, CHAIN_IDS.OPTIMISM],
         destNetworkAllowlist: [CHAIN_IDS.OPTIMISM],
       },
-      {},
-    );
+    });
     const { container, getByRole, getByTestId } = renderWithProvider(
       <PrepareBridgePage />,
       configureStore(mockStore),
@@ -61,8 +60,8 @@ describe('PrepareBridgePage', () => {
     jest
       .spyOn(reactRouterUtils, 'useSearchParams')
       .mockReturnValue([{ get: () => '0x3103910' }, jest.fn()] as never);
-    const mockStore = createBridgeMockStore(
-      {
+    const mockStore = createBridgeMockStore({
+      featureFlagOverrides: {
         srcNetworkAllowlist: [CHAIN_IDS.MAINNET, CHAIN_IDS.LINEA_MAINNET],
         destNetworkAllowlist: [CHAIN_IDS.LINEA_MAINNET],
         destTokens: {
@@ -74,7 +73,7 @@ describe('PrepareBridgePage', () => {
           },
         },
       },
-      {
+      bridgeSliceOverrides: {
         fromTokenInputValue: '1',
         fromToken: { address: '0x3103910', decimals: 6 },
         toToken: {
@@ -85,7 +84,7 @@ describe('PrepareBridgePage', () => {
         },
         toChainId: CHAIN_IDS.LINEA_MAINNET,
       },
-      {
+      bridgeStateOverrides: {
         quoteRequest: {
           srcTokenAddress: '0x3103910',
           destTokenAddress: '0x1f9840a85d5af5bf1d1762f925bdaddc4201f984',
@@ -95,7 +94,7 @@ describe('PrepareBridgePage', () => {
           slippage: 0.5,
         },
       },
-    );
+    });
     const { container, getByRole, getByTestId } = renderWithProvider(
       <PrepareBridgePage />,
       configureStore(mockStore),
@@ -122,12 +121,12 @@ describe('PrepareBridgePage', () => {
   });
 
   it('should throw an error if token decimals are not defined', async () => {
-    const mockStore = createBridgeMockStore(
-      {
+    const mockStore = createBridgeMockStore({
+      featureFlagOverrides: {
         srcNetworkAllowlist: [CHAIN_IDS.MAINNET, CHAIN_IDS.LINEA_MAINNET],
         destNetworkAllowlist: [CHAIN_IDS.LINEA_MAINNET],
       },
-      {
+      bridgeSliceOverrides: {
         fromTokenInputValue: 1,
         fromToken: { address: '0x3103910' },
         toToken: {
@@ -137,8 +136,7 @@ describe('PrepareBridgePage', () => {
         },
         toChainId: CHAIN_IDS.LINEA_MAINNET,
       },
-      {},
-    );
+    });
 
     expect(() =>
       renderWithProvider(<PrepareBridgePage />, configureStore(mockStore)),
diff --git a/ui/pages/bridge/quotes/bridge-quote-card.test.tsx b/ui/pages/bridge/quotes/bridge-quote-card.test.tsx
index 7de52fef1d58..60285fbce9ba 100644
--- a/ui/pages/bridge/quotes/bridge-quote-card.test.tsx
+++ b/ui/pages/bridge/quotes/bridge-quote-card.test.tsx
@@ -16,21 +16,21 @@ describe('BridgeQuoteCard', () => {
   });
 
   it('should render the recommended quote', async () => {
-    const mockStore = createBridgeMockStore(
-      {
+    const mockStore = createBridgeMockStore({
+      featureFlagOverrides: {
         srcNetworkAllowlist: [CHAIN_IDS.MAINNET, CHAIN_IDS.OPTIMISM],
         destNetworkAllowlist: [CHAIN_IDS.OPTIMISM],
         extensionConfig: { maxRefreshCount: 5, refreshRate: 30000 },
       },
-      { fromTokenInputValue: 1 },
-      {
+      bridgeSliceOverrides: { fromTokenInputValue: 1 },
+      bridgeStateOverrides: {
         quoteRequest: { insufficientBal: false },
         quotesRefreshCount: 1,
         quotes: mockBridgeQuotesErc20Erc20,
         getQuotesLastFetched: Date.now(),
         quotesLoadingStatus: RequestStatus.FETCHED,
       },
-    );
+    });
     const { container } = renderWithProvider(
       <BridgeQuoteCard />,
       configureStore(mockStore),
@@ -40,18 +40,18 @@ describe('BridgeQuoteCard', () => {
   });
 
   it('should render the recommended quote while loading new quotes', async () => {
-    const mockStore = createBridgeMockStore(
-      {
+    const mockStore = createBridgeMockStore({
+      featureFlagOverrides: {
         srcNetworkAllowlist: [CHAIN_IDS.MAINNET, CHAIN_IDS.OPTIMISM],
         destNetworkAllowlist: [CHAIN_IDS.OPTIMISM],
       },
-      { fromTokenInputValue: 1 },
-      {
+      bridgeSliceOverrides: { fromTokenInputValue: 1 },
+      bridgeStateOverrides: {
         quotes: mockBridgeQuotesNativeErc20,
         getQuotesLastFetched: Date.now() - 5000,
         quotesLoadingStatus: RequestStatus.LOADING,
       },
-    );
+    });
     const { container, queryByText } = renderWithProvider(
       <BridgeQuoteCard />,
       configureStore(mockStore),
@@ -62,18 +62,18 @@ describe('BridgeQuoteCard', () => {
   });
 
   it('should not render when there is no quote', async () => {
-    const mockStore = createBridgeMockStore(
-      {
+    const mockStore = createBridgeMockStore({
+      featureFlagOverrides: {
         srcNetworkAllowlist: [CHAIN_IDS.MAINNET, CHAIN_IDS.OPTIMISM],
         destNetworkAllowlist: [CHAIN_IDS.OPTIMISM],
       },
-      { fromTokenInputValue: 1 },
-      {
+      bridgeSliceOverrides: { fromTokenInputValue: 1 },
+      bridgeStateOverrides: {
         quotes: [],
         getQuotesLastFetched: Date.now() - 5000,
         quotesLoadingStatus: RequestStatus.FETCHED,
       },
-    );
+    });
     const { container } = renderWithProvider(
       <BridgeQuoteCard />,
       configureStore(mockStore),
@@ -83,18 +83,18 @@ describe('BridgeQuoteCard', () => {
   });
 
   it('should not render when there is a quote fetch error', async () => {
-    const mockStore = createBridgeMockStore(
-      {
+    const mockStore = createBridgeMockStore({
+      featureFlagOverrides: {
         srcNetworkAllowlist: [CHAIN_IDS.MAINNET, CHAIN_IDS.OPTIMISM],
         destNetworkAllowlist: [CHAIN_IDS.OPTIMISM],
       },
-      { fromTokenInputValue: 1 },
-      {
+      bridgeSliceOverrides: { fromTokenInputValue: 1 },
+      bridgeStateOverrides: {
         quotes: [],
         getQuotesLastFetched: Date.now() - 5000,
         quotesLoadingStatus: RequestStatus.ERROR,
       },
-    );
+    });
     const { container } = renderWithProvider(
       <BridgeQuoteCard />,
       configureStore(mockStore),
diff --git a/ui/pages/bridge/quotes/bridge-quotes-modal.test.tsx b/ui/pages/bridge/quotes/bridge-quotes-modal.test.tsx
index 0431f1b8eada..42c5968bb5b0 100644
--- a/ui/pages/bridge/quotes/bridge-quotes-modal.test.tsx
+++ b/ui/pages/bridge/quotes/bridge-quotes-modal.test.tsx
@@ -10,15 +10,13 @@ import { BridgeQuotesModal } from './bridge-quotes-modal';
 
 describe('BridgeQuotesModal', () => {
   it('should render the modal', () => {
-    const mockStore = createBridgeMockStore(
-      {},
-      {},
-      {
+    const mockStore = createBridgeMockStore({
+      bridgeStateOverrides: {
         quotes: mockBridgeQuotesErc20Erc20,
         getQuotesLastFetched: Date.now(),
         quotesLoadingStatus: RequestStatus.FETCHED,
       },
-    );
+    });
 
     const { baseElement } = renderWithProvider(
       <BridgeQuotesModal
diff --git a/ui/pages/bridge/transaction-details/bridge-activity-item-tx-segments.tsx b/ui/pages/bridge/transaction-details/bridge-activity-item-tx-segments.tsx
new file mode 100644
index 000000000000..f19025e9b83b
--- /dev/null
+++ b/ui/pages/bridge/transaction-details/bridge-activity-item-tx-segments.tsx
@@ -0,0 +1,80 @@
+import React from 'react';
+import {
+  TransactionMeta,
+  TransactionStatus,
+} from '@metamask/transaction-controller';
+import {
+  BridgeHistoryItem,
+  StatusTypes,
+} from '../../../../shared/types/bridge-status';
+import { Box, Text } from '../../../components/component-library';
+import {
+  BlockSize,
+  Display,
+  FlexDirection,
+  TextColor,
+} from '../../../helpers/constants/design-system';
+import { UseBridgeDataProps } from '../../../hooks/bridge/useBridgeTxHistoryData';
+import Segment from './segment';
+
+const getTxIndex = (srcTxStatus: StatusTypes) => {
+  if (srcTxStatus === StatusTypes.PENDING) {
+    return 1;
+  }
+
+  if (srcTxStatus === StatusTypes.COMPLETE) {
+    return 2;
+  }
+
+  throw new Error('No more possible states for srcTxStatus');
+};
+
+const getSrcTxStatus = (initialTransaction: TransactionMeta) => {
+  return initialTransaction.status === TransactionStatus.confirmed
+    ? StatusTypes.COMPLETE
+    : StatusTypes.PENDING;
+};
+
+const getDestTxStatus = (
+  bridgeTxHistoryItem: BridgeHistoryItem,
+  srcTxStatus: StatusTypes,
+) => {
+  if (srcTxStatus !== StatusTypes.COMPLETE) {
+    return null;
+  }
+
+  return bridgeTxHistoryItem?.status.destChain?.txHash &&
+    bridgeTxHistoryItem.status.status === StatusTypes.COMPLETE
+    ? StatusTypes.COMPLETE
+    : StatusTypes.PENDING;
+};
+
+/**
+ * Renders the 2 transaction segments for a bridge activity item
+ *
+ * @param options
+ * @param options.bridgeTxHistoryItem - The bridge history item for the transaction
+ * @param options.transactionGroup - The transaction group for the transaction
+ */
+export default function BridgeActivityItemTxSegments({
+  bridgeTxHistoryItem,
+  transactionGroup,
+}: {
+  bridgeTxHistoryItem: BridgeHistoryItem;
+  transactionGroup: UseBridgeDataProps['transactionGroup'];
+}) {
+  const { initialTransaction } = transactionGroup;
+  const srcTxStatus = getSrcTxStatus(initialTransaction);
+  const destTxStatus = getDestTxStatus(bridgeTxHistoryItem, srcTxStatus);
+  const txIndex = getTxIndex(srcTxStatus);
+
+  return (
+    <Box display={Display.Flex} flexDirection={FlexDirection.Column} gap={2}>
+      <Text color={TextColor.textAlternative}>Transaction {txIndex} of 2</Text>
+      <Box display={Display.Flex} gap={2} width={BlockSize.Full}>
+        <Segment type={srcTxStatus} />
+        <Segment type={destTxStatus} />
+      </Box>
+    </Box>
+  );
+}
diff --git a/ui/pages/bridge/transaction-details/bridge-explorer-links.tsx b/ui/pages/bridge/transaction-details/bridge-explorer-links.tsx
new file mode 100644
index 000000000000..570680f416d2
--- /dev/null
+++ b/ui/pages/bridge/transaction-details/bridge-explorer-links.tsx
@@ -0,0 +1,116 @@
+import { NetworkConfiguration } from '@metamask/network-controller';
+import React, { useContext } from 'react';
+import { Hex } from '@metamask/utils';
+import {
+  Box,
+  IconName,
+  ButtonSecondary,
+} from '../../../components/component-library';
+import { openBlockExplorer } from '../../../components/multichain/menu-items/view-explorer-menu-item';
+import { MetaMetricsContext } from '../../../contexts/metametrics';
+import {
+  Display,
+  FlexDirection,
+} from '../../../helpers/constants/design-system';
+import { useI18nContext } from '../../../hooks/useI18nContext';
+import { CHAINID_DEFAULT_BLOCK_EXPLORER_HUMAN_READABLE_URL_MAP } from '../../../../shared/constants/common';
+
+const getBlockExplorerName = (
+  chainId: Hex | undefined,
+  blockExplorerUrl: string | undefined,
+) => {
+  const humanReadableUrl = chainId
+    ? CHAINID_DEFAULT_BLOCK_EXPLORER_HUMAN_READABLE_URL_MAP[chainId]
+    : undefined;
+  if (humanReadableUrl) {
+    return humanReadableUrl;
+  }
+
+  if (!blockExplorerUrl) {
+    return undefined;
+  }
+  return blockExplorerUrl.split('/')[2];
+};
+
+export const getBlockExplorerUrl = (
+  networkConfiguration: NetworkConfiguration | undefined,
+  txHash: string | undefined,
+) => {
+  if (!networkConfiguration || !txHash) {
+    return undefined;
+  }
+  const index = networkConfiguration.defaultBlockExplorerUrlIndex;
+  if (index === undefined) {
+    return undefined;
+  }
+
+  const rootUrl = networkConfiguration.blockExplorerUrls[index]?.replace(
+    /\/$/u,
+    '',
+  );
+  return `${rootUrl}/tx/${txHash}`;
+};
+
+const METRICS_LOCATION = 'Activity Tab';
+
+type ExplorerLinksProps = {
+  srcChainId?: Hex;
+  destChainId?: Hex;
+  srcBlockExplorerUrl?: string;
+  destBlockExplorerUrl?: string;
+};
+
+export default function BridgeExplorerLinks({
+  srcChainId,
+  destChainId,
+  srcBlockExplorerUrl,
+  destBlockExplorerUrl,
+}: ExplorerLinksProps) {
+  const trackEvent = useContext(MetaMetricsContext);
+  const t = useI18nContext();
+
+  // Not sure why but the text is not being changed to white on hover, unless it's put into a variable before the render
+  const srcButtonText = t('bridgeExplorerLinkViewOn', [
+    getBlockExplorerName(srcChainId, srcBlockExplorerUrl),
+  ]);
+  const destButtonText = t('bridgeExplorerLinkViewOn', [
+    getBlockExplorerName(destChainId, destBlockExplorerUrl),
+  ]);
+
+  return (
+    <Box display={Display.Flex} flexDirection={FlexDirection.Column} gap={4}>
+      {srcBlockExplorerUrl && (
+        <ButtonSecondary
+          endIconName={IconName.Export}
+          onClick={() => {
+            if (srcBlockExplorerUrl) {
+              openBlockExplorer(
+                srcBlockExplorerUrl,
+                METRICS_LOCATION,
+                trackEvent,
+              );
+            }
+          }}
+        >
+          {srcButtonText}
+        </ButtonSecondary>
+      )}
+      {destBlockExplorerUrl && (
+        <ButtonSecondary
+          endIconName={IconName.Export}
+          onClick={() => {
+            if (destBlockExplorerUrl) {
+              openBlockExplorer(
+                destBlockExplorerUrl,
+                METRICS_LOCATION,
+                trackEvent,
+              );
+            }
+          }}
+        >
+          {destButtonText}
+        </ButtonSecondary>
+      )}
+    </Box>
+  );
+}
diff --git a/ui/pages/bridge/transaction-details/bridge-step-description.tsx b/ui/pages/bridge/transaction-details/bridge-step-description.tsx
new file mode 100644
index 000000000000..ef69ea4ed116
--- /dev/null
+++ b/ui/pages/bridge/transaction-details/bridge-step-description.tsx
@@ -0,0 +1,185 @@
+import * as React from 'react';
+import { NetworkConfiguration } from '@metamask/network-controller';
+import { Hex } from '@metamask/utils';
+import {
+  TransactionMeta,
+  TransactionStatus,
+} from '@metamask/transaction-controller';
+import {
+  BridgeHistoryItem,
+  Step,
+  ActionTypes,
+  StatusTypes,
+} from '../../../../shared/types/bridge-status';
+import { Box, Text } from '../../../components/component-library';
+import { Numeric } from '../../../../shared/modules/Numeric';
+import {
+  AlignItems,
+  Display,
+  FontWeight,
+  TextColor,
+} from '../../../helpers/constants/design-system';
+import { useI18nContext } from '../../../hooks/useI18nContext';
+
+type I18nFunction = (
+  key: string,
+  args: (string | number | undefined | null)[],
+) => string;
+
+/**
+ * bridge actions will have step.srcChainId !== step.destChainId
+ * We cannot infer the status of the bridge action since 2 different chains are involved
+ * The best we can do is the bridgeHistoryItem.estimatedProcessingTimeInSeconds
+ *
+ * @param t - The i18n context return value to get translations
+ * @param stepStatus - The status of the step
+ * @param step - The step to be rendered
+ * @param networkConfigurationsByChainId - The network configurations by chain id
+ */
+const getBridgeActionText = (
+  t: I18nFunction,
+  stepStatus: StatusTypes | null,
+  step: Step,
+  networkConfigurationsByChainId: Record<`0x${string}`, NetworkConfiguration>,
+) => {
+  const hexDestChainId = step.destChainId
+    ? (new Numeric(step.destChainId, 10).toPrefixedHexString() as Hex)
+    : undefined;
+  const destNetworkConfiguration = hexDestChainId
+    ? networkConfigurationsByChainId[hexDestChainId]
+    : undefined;
+
+  return stepStatus === StatusTypes.COMPLETE
+    ? t('bridgeStepActionBridgeComplete', [
+        step.destAsset.symbol,
+        destNetworkConfiguration?.name,
+      ])
+    : t('bridgeStepActionBridgePending', [
+        step.destAsset.symbol,
+        destNetworkConfiguration?.name,
+      ]);
+};
+
+const getBridgeActionStatus = (bridgeHistoryItem: BridgeHistoryItem) => {
+  return bridgeHistoryItem.status ? bridgeHistoryItem.status.status : null;
+};
+
+/**
+ * swap actions can have step.srcChainId === step.destChainId, and can occur on
+ * EITHER the quote.srcChainId or the quote.destChainId
+ * Despite not having any actual timestamp,we can infer the status of the swap action
+ * based on the status of the source chain tx if srcChainId and destChainId are the same*
+ *
+ * @param bridgeHistoryItem
+ * @param step
+ * @param srcChainTxMeta
+ */
+const getSwapActionStatus = (
+  bridgeHistoryItem: BridgeHistoryItem,
+  step: Step,
+  srcChainTxMeta?: TransactionMeta,
+) => {
+  const isSrcAndDestChainSame = step.srcChainId === step.destChainId;
+  const isSwapOnSrcChain =
+    step.srcChainId === bridgeHistoryItem.quote.srcChainId;
+
+  if (isSrcAndDestChainSame && isSwapOnSrcChain) {
+    // if the swap action is on the src chain (i.e. step.srcChainId === step.destChainId === bridgeHistoryItem.quote.srcChainId),
+    // we check the source chain tx status, since we know when it's confirmed
+    const isSrcChainTxConfirmed =
+      srcChainTxMeta?.status === TransactionStatus.confirmed;
+    return isSrcChainTxConfirmed ? StatusTypes.COMPLETE : StatusTypes.PENDING;
+  }
+  // if the swap action is on the dest chain, we check the bridgeHistoryItem.status,
+  // since we don't know when the dest tx is confirmed
+  if (srcChainTxMeta?.status === TransactionStatus.confirmed) {
+    return bridgeHistoryItem.status ? bridgeHistoryItem.status.status : null;
+  }
+
+  // If the source chain tx is not confirmed, we know the swap hasn't started
+  // use null to represent this as we don't have an equivalent in StatusTypes
+  return null;
+};
+
+const getSwapActionText = (
+  t: I18nFunction,
+  status: StatusTypes | null,
+  step: Step,
+) => {
+  return status === StatusTypes.COMPLETE
+    ? t('bridgeStepActionSwapComplete', [
+        step.srcAsset.symbol,
+        step.destAsset.symbol,
+      ])
+    : t('bridgeStepActionSwapPending', [
+        step.srcAsset.symbol,
+        step.destAsset.symbol,
+      ]);
+};
+
+export const getStepStatus = (
+  bridgeHistoryItem: BridgeHistoryItem,
+  step: Step,
+  srcChainTxMeta?: TransactionMeta,
+) => {
+  if (step.action === ActionTypes.SWAP) {
+    return getSwapActionStatus(bridgeHistoryItem, step, srcChainTxMeta);
+  } else if (step.action === ActionTypes.BRIDGE) {
+    return getBridgeActionStatus(bridgeHistoryItem);
+  }
+
+  return StatusTypes.UNKNOWN;
+};
+
+type BridgeStepProps = {
+  step: Step;
+  networkConfigurationsByChainId: Record<`0x${string}`, NetworkConfiguration>;
+  time?: string;
+  stepStatus: StatusTypes | null;
+};
+
+// You can have the following cases:
+// 1. Bridge: usually for cases like Optimism ETH to Arbitrum ETH
+// 2. Swap > Bridge
+// 3. Swap > Bridge > Swap: e.g. Optimism ETH to Avalanche USDC
+export default function BridgeStepDescription({
+  step,
+  networkConfigurationsByChainId,
+  time,
+  stepStatus,
+}: BridgeStepProps) {
+  const t = useI18nContext() as I18nFunction;
+  return (
+    <Box
+      display={Display.Flex}
+      alignItems={AlignItems.center}
+      gap={2}
+      className="bridge-transaction-details__step-grid--desc"
+    >
+      {time && <Text color={TextColor.textDefault}>{time}</Text>}
+      <Text
+        color={
+          stepStatus === StatusTypes.PENDING ||
+          stepStatus === StatusTypes.COMPLETE
+            ? TextColor.textDefault
+            : TextColor.textAlternative
+        }
+        fontWeight={
+          stepStatus === StatusTypes.PENDING
+            ? FontWeight.Medium
+            : FontWeight.Normal
+        }
+      >
+        {step.action === ActionTypes.BRIDGE &&
+          getBridgeActionText(
+            t,
+            stepStatus,
+            step,
+            networkConfigurationsByChainId,
+          )}
+        {step.action === ActionTypes.SWAP &&
+          getSwapActionText(t, stepStatus, step)}
+      </Text>
+    </Box>
+  );
+}
diff --git a/ui/pages/bridge/transaction-details/bridge-step-list.stories.tsx b/ui/pages/bridge/transaction-details/bridge-step-list.stories.tsx
new file mode 100644
index 000000000000..a02337fbce61
--- /dev/null
+++ b/ui/pages/bridge/transaction-details/bridge-step-list.stories.tsx
@@ -0,0 +1,1781 @@
+import React, { useEffect } from 'react';
+import { StoryFn, Meta } from '@storybook/react';
+import {
+  BlockSize,
+  Display,
+  FlexDirection,
+} from '../../../helpers/constants/design-system';
+import { Box } from '../../../components/component-library';
+import BridgeStepList from './bridge-step-list';
+
+export default {
+  title: 'pages/bridge/transaction-details/BridgeStepList',
+  component: BridgeStepList,
+} as Meta<typeof BridgeStepList>;
+
+const networkConfigurationsByChainId = {
+  '0xa4b1': {
+    blockExplorerUrls: ['https://explorer.arbitrum.io'],
+    chainId: '0xa4b1',
+    defaultBlockExplorerUrlIndex: 0,
+    defaultRpcEndpointIndex: 0,
+    name: 'Arbitrum One',
+    nativeCurrency: 'ETH',
+    rpcEndpoints: [
+      {
+        networkClientId: '1abbfb5d-ed75-4de7-8cff-694d863d8519',
+        type: 'custom',
+        url: 'https://arbitrum-mainnet.infura.io/v3/05412cce7f71411d93cc724545806fd3',
+      },
+    ],
+  },
+  '0xa86a': {
+    blockExplorerUrls: ['https://snowtrace.io/'],
+    chainId: '0xa86a',
+    defaultBlockExplorerUrlIndex: 0,
+    defaultRpcEndpointIndex: 0,
+    name: 'Avalanche Network C-Chain',
+    nativeCurrency: 'AVAX',
+    rpcEndpoints: [
+      {
+        networkClientId: '2fb77c4b-4515-40e2-b717-5629a086e606',
+        type: 'custom',
+        url: 'https://avalanche-mainnet.infura.io/v3/05412cce7f71411d93cc724545806fd3',
+      },
+    ],
+  },
+};
+
+const Args = {
+  step1: {
+    bridgeHistoryItem: {
+      quote: {
+        requestId: '125a2aa2-c71f-4e96-9e3b-96fca826a608',
+        srcChainId: 43114,
+        srcTokenAmount: '99125000000000000',
+        srcAsset: {
+          address: '0x0000000000000000000000000000000000000000',
+          chainId: 43114,
+          symbol: 'AVAX',
+          decimals: 18,
+          name: 'AVAX',
+          coinKey: 'AVAX',
+          logoURI:
+            'https://static.debank.com/image/avax_token/logo_url/avax/0b9c84359c84d6bdd5bfda9c2d4c4a82.png',
+          priceUSD: '26.56',
+          icon: 'https://static.debank.com/image/avax_token/logo_url/avax/0b9c84359c84d6bdd5bfda9c2d4c4a82.png',
+        },
+        destChainId: 42161,
+        destTokenAmount: '976873412881134',
+        destAsset: {
+          address: '0x0000000000000000000000000000000000000000',
+          chainId: 42161,
+          symbol: 'ETH',
+          decimals: 18,
+          name: 'ETH',
+          coinKey: 'ETH',
+          logoURI:
+            'https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/ethereum/assets/0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2/logo.png',
+          priceUSD: '2689.39',
+          icon: 'https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/ethereum/assets/0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2/logo.png',
+        },
+        feeData: {
+          metabridge: {
+            amount: '875000000000000',
+            asset: {
+              address: '0x0000000000000000000000000000000000000000',
+              chainId: 43114,
+              symbol: 'AVAX',
+              decimals: 18,
+              name: 'AVAX',
+              coinKey: 'AVAX',
+              logoURI:
+                'https://static.debank.com/image/avax_token/logo_url/avax/0b9c84359c84d6bdd5bfda9c2d4c4a82.png',
+              priceUSD: '26.56',
+              icon: 'https://static.debank.com/image/avax_token/logo_url/avax/0b9c84359c84d6bdd5bfda9c2d4c4a82.png',
+            },
+          },
+        },
+        bridgeId: 'lifi',
+        bridges: ['stargate'],
+        steps: [
+          {
+            action: 'swap',
+            srcChainId: 43114,
+            destChainId: 43114,
+            protocol: {
+              name: '1inch',
+              displayName: '1inch',
+              icon: 'https://raw.githubusercontent.com/lifinance/types/main/src/assets/icons/exchanges/oneinch.png',
+            },
+            srcAsset: {
+              address: '0x0000000000000000000000000000000000000000',
+              chainId: 43114,
+              symbol: 'AVAX',
+              decimals: 18,
+              name: 'AVAX',
+              coinKey: 'AVAX',
+              logoURI:
+                'https://static.debank.com/image/avax_token/logo_url/avax/0b9c84359c84d6bdd5bfda9c2d4c4a82.png',
+              priceUSD: '26.56',
+              icon: 'https://static.debank.com/image/avax_token/logo_url/avax/0b9c84359c84d6bdd5bfda9c2d4c4a82.png',
+            },
+            destAsset: {
+              address: '0x9702230A8Ea53601f5cD2dc00fDBc13d4dF4A8c7',
+              chainId: 43114,
+              symbol: 'USDt',
+              decimals: 6,
+              name: 'TetherToken',
+              coinKey: 'USDt',
+              logoURI:
+                'https://static.debank.com/image/eth_token/logo_url/0xdac17f958d2ee523a2206206994597c13d831ec7/464c0de678334b8fe87327e527bc476d.png',
+              priceUSD: '1.00125',
+              icon: 'https://static.debank.com/image/eth_token/logo_url/0xdac17f958d2ee523a2206206994597c13d831ec7/464c0de678334b8fe87327e527bc476d.png',
+            },
+            srcAmount: '99125000000000000',
+            destAmount: '2630653',
+          },
+          {
+            action: 'bridge',
+            srcChainId: 43114,
+            destChainId: 42161,
+            protocol: {
+              name: 'stargate',
+              displayName: 'StargateV2 (Fast mode)',
+              icon: 'https://raw.githubusercontent.com/lifinance/types/5685c638772f533edad80fcb210b4bb89e30a50f/src/assets/icons/bridges/stargate.png',
+            },
+            srcAsset: {
+              address: '0x9702230A8Ea53601f5cD2dc00fDBc13d4dF4A8c7',
+              chainId: 43114,
+              symbol: 'USDt',
+              decimals: 6,
+              name: 'TetherToken',
+              coinKey: 'USDt',
+              logoURI:
+                'https://static.debank.com/image/eth_token/logo_url/0xdac17f958d2ee523a2206206994597c13d831ec7/464c0de678334b8fe87327e527bc476d.png',
+              priceUSD: '1.00125',
+              icon: 'https://static.debank.com/image/eth_token/logo_url/0xdac17f958d2ee523a2206206994597c13d831ec7/464c0de678334b8fe87327e527bc476d.png',
+            },
+            destAsset: {
+              address: '0xFd086bC7CD5C481DCC9C85ebE478A1C0b69FCbb9',
+              chainId: 42161,
+              symbol: 'USDT',
+              decimals: 6,
+              name: 'USDT',
+              coinKey: 'USDT',
+              logoURI:
+                'https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/ethereum/assets/0xdAC17F958D2ee523a2206206994597C13D831ec7/logo.png',
+              priceUSD: '1.00125',
+              icon: 'https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/ethereum/assets/0xdAC17F958D2ee523a2206206994597C13D831ec7/logo.png',
+            },
+            srcAmount: '2630653',
+            destAmount: '2626707',
+          },
+          {
+            action: 'swap',
+            srcChainId: 42161,
+            destChainId: 42161,
+            protocol: {
+              name: '1inch',
+              displayName: '1inch',
+              icon: 'https://raw.githubusercontent.com/lifinance/types/main/src/assets/icons/exchanges/oneinch.png',
+            },
+            srcAsset: {
+              address: '0xFd086bC7CD5C481DCC9C85ebE478A1C0b69FCbb9',
+              chainId: 42161,
+              symbol: 'USDT',
+              decimals: 6,
+              name: 'USDT',
+              coinKey: 'USDT',
+              logoURI:
+                'https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/ethereum/assets/0xdAC17F958D2ee523a2206206994597C13D831ec7/logo.png',
+              priceUSD: '1.00125',
+              icon: 'https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/ethereum/assets/0xdAC17F958D2ee523a2206206994597C13D831ec7/logo.png',
+            },
+            destAsset: {
+              address: '0x0000000000000000000000000000000000000000',
+              chainId: 42161,
+              symbol: 'ETH',
+              decimals: 18,
+              name: 'ETH',
+              coinKey: 'ETH',
+              logoURI:
+                'https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/ethereum/assets/0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2/logo.png',
+              priceUSD: '2689.39',
+              icon: 'https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/ethereum/assets/0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2/logo.png',
+            },
+            srcAmount: '2613573',
+            destAmount: '976873412881134',
+          },
+        ],
+      },
+      startTime: 1730925150751,
+      estimatedProcessingTimeInSeconds: 99,
+      slippagePercentage: 0,
+      targetContractAddress: '0x29106d08382d3c73bf477a94333c61db1142e1b6',
+      account: '0xc5fe6ef47965741f6f7a4734bf784bf3ae3f2452',
+      status: {
+        status: 'PENDING',
+        srcChain: {
+          chainId: 43114,
+          txHash:
+            '0x8586e162e456a23c1969573a4b79e77912705b474bc5aa0c2a63d56556623ab2',
+        },
+      },
+    },
+    srcChainTxMeta: {
+      actionId: 1730925150740.3386,
+      chainId: '0xa86a',
+      id: '3ef01af0-9c7e-11ef-929c-517d218027d6',
+      origin: 'metamask',
+      status: 'submitted',
+      time: 1730925150751,
+      txParams: {
+        from: '0xc5fe6ef47965741f6f7a4734bf784bf3ae3f2452',
+        data: '0x3ce33bff00000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000017bb83647a5333e00000000000000000000000000000000000000000000000000000000000000c0000000000000000000000000000000000000000000000000000000000000000d6c6966694164617074657256320000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000009600000000000000000000000001231deb6f5749ef6ce6943a275a1d3e7486f4eae0000000000000000000000001231deb6f5749ef6ce6943a275a1d3e7486f4eae000000000000000000000000000000000000000000000000000000000000a4b100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000016029a98d5c5000000000000000000000000000000000000000000000000000000000000000014000000000000000000000000000000000000000000000000000031bced02db00000000000000000000000000068e21357555a15cd9df624f3bfb7aed0eae167e90000000000000000000000000000000000000000000000000000000000000804a6010a660000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000022000000000000000000000000000000000000000000000000000000000000003c07c8d02889018b288c8f3d7155bccc6f087fac6bd430d74cb798929f836fe1ae70000000000000000000000000000000000000000000000000000000000000140000000000000000000000000000000000000000000000000000000000000018000000000000000000000000000000000000000000000000000000000000000000000000000000000000000009702230a8ea53601f5cd2dc00fdbc13d4df4a8c7000000000000000000000000c5fe6ef47965741f6f7a4734bf784bf3ae3f2452000000000000000000000000000000000000000000000000000000000027f09c000000000000000000000000000000000000000000000000000000000000a4b100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000a7374617267617465563200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000f6d6574616d61736b2d627269646765000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000020000000000000000000000000111111125421ca6dc452d289314280a0f8842a65000000000000000000000000111111125421ca6dc452d289314280a0f8842a6500000000000000000000000000000000000000000000000000000000000000000000000000000000000000009702230a8ea53601f5cd2dc00fdbc13d4df4a8c7000000000000000000000000000000000000000000000000016029a98d5c500000000000000000000000000000000000000000000000000000000000000000e000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000048a76dfc3b000000000000000000000000000000000000000000000000000000000027f09b00000000000000003b6d0340e3ba3d5e3f98eeff5e9eddd5bd20e476202770da2a94d114000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000000000000000000000000000001872bdea1b333e0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000c5fe6ef47965741f6f7a4734bf784bf3ae3f2452000000000000000000000000000000000000000000000000000000000000759e0000000000000000000000001493e7b8d4dfade0a178dad9335470337a3a219a000000000000000000000000000000000000000000000000000000000027f09c000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000e00000000000000000000000000000000000000000000000000000000000000120000000000000000000000000000000000000000000000000000000000000038000000000000000000000000000000000000000000000000000000000000000180003010013030000000000000000000000000000003037c0000000000000000000000000000000000000000000000000000000000000000000000000000002407c8d02889018b288c8f3d7155bccc6f087fac6bd430d74cb798929f836fe1ae70000000000000000000000000000000000000000000000000000000000000060000000000000000000000000c5fe6ef47965741f6f7a4734bf784bf3ae3f245200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000020000000000000000000000000111111125421ca6dc452d289314280a0f8842a65000000000000000000000000111111125421ca6dc452d289314280a0f8842a65000000000000000000000000fd086bc7cd5c481dcc9c85ebe478a1c0b69fcbb90000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000027ae3900000000000000000000000000000000000000000000000000000000000000e00000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000008883800a8e000000000000000000000000fd086bc7cd5c481dcc9c85ebe478a1c0b69fcbb9000000000000000000000000000000000000000000000000000000000027ae3900000000000000000000000000000000000000000000000000036f993610ce1138000000000000000000000042161084d0672e1d3f26a9b53e653be2084ff19c2a94d11400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000051408a61b2fa890424911fb6896c7f34c97920f4db458717b3aadf236a5fc4ad77462476be8335db44a54d720c1f4b97035407d8b798000319982c4d9f64b7701c',
+        gas: '0xbcdcb',
+        gasLimit: '0xbcdcb',
+        nonce: '0x6',
+        to: '0x29106d08382d3c73bf477a94333c61db1142e1b6',
+        value: '0x017bb83647a5333e',
+        maxFeePerGas: '0xa5c681d00',
+        maxPriorityFeePerGas: '0x77359400',
+        type: '0x2',
+      },
+      userEditedGasLimit: false,
+      verifiedOnBlockchain: false,
+      type: 'bridge',
+      networkClientId: '2fb77c4b-4515-40e2-b717-5629a086e606',
+      defaultGasEstimates: {
+        gas: '0xbcdcb',
+        maxFeePerGas: '0xa5c681d00',
+        maxPriorityFeePerGas: '0x77359400',
+        estimateType: 'medium',
+      },
+      userFeeLevel: 'medium',
+      sendFlowHistory: [],
+      history: [
+        {
+          actionId: 1730925150740.3386,
+          chainId: '0xa86a',
+          id: '3ef01af0-9c7e-11ef-929c-517d218027d6',
+          origin: 'metamask',
+          status: 'unapproved',
+          time: 1730925150751,
+          txParams: {
+            from: '0xc5fe6ef47965741f6f7a4734bf784bf3ae3f2452',
+            data: '0x3ce33bff00000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000017bb83647a5333e00000000000000000000000000000000000000000000000000000000000000c0000000000000000000000000000000000000000000000000000000000000000d6c6966694164617074657256320000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000009600000000000000000000000001231deb6f5749ef6ce6943a275a1d3e7486f4eae0000000000000000000000001231deb6f5749ef6ce6943a275a1d3e7486f4eae000000000000000000000000000000000000000000000000000000000000a4b100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000016029a98d5c5000000000000000000000000000000000000000000000000000000000000000014000000000000000000000000000000000000000000000000000031bced02db00000000000000000000000000068e21357555a15cd9df624f3bfb7aed0eae167e90000000000000000000000000000000000000000000000000000000000000804a6010a660000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000022000000000000000000000000000000000000000000000000000000000000003c07c8d02889018b288c8f3d7155bccc6f087fac6bd430d74cb798929f836fe1ae70000000000000000000000000000000000000000000000000000000000000140000000000000000000000000000000000000000000000000000000000000018000000000000000000000000000000000000000000000000000000000000000000000000000000000000000009702230a8ea53601f5cd2dc00fdbc13d4df4a8c7000000000000000000000000c5fe6ef47965741f6f7a4734bf784bf3ae3f2452000000000000000000000000000000000000000000000000000000000027f09c000000000000000000000000000000000000000000000000000000000000a4b100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000a7374617267617465563200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000f6d6574616d61736b2d627269646765000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000020000000000000000000000000111111125421ca6dc452d289314280a0f8842a65000000000000000000000000111111125421ca6dc452d289314280a0f8842a6500000000000000000000000000000000000000000000000000000000000000000000000000000000000000009702230a8ea53601f5cd2dc00fdbc13d4df4a8c7000000000000000000000000000000000000000000000000016029a98d5c500000000000000000000000000000000000000000000000000000000000000000e000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000048a76dfc3b000000000000000000000000000000000000000000000000000000000027f09b00000000000000003b6d0340e3ba3d5e3f98eeff5e9eddd5bd20e476202770da2a94d114000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000000000000000000000000000001872bdea1b333e0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000c5fe6ef47965741f6f7a4734bf784bf3ae3f2452000000000000000000000000000000000000000000000000000000000000759e0000000000000000000000001493e7b8d4dfade0a178dad9335470337a3a219a000000000000000000000000000000000000000000000000000000000027f09c000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000e00000000000000000000000000000000000000000000000000000000000000120000000000000000000000000000000000000000000000000000000000000038000000000000000000000000000000000000000000000000000000000000000180003010013030000000000000000000000000000003037c0000000000000000000000000000000000000000000000000000000000000000000000000000002407c8d02889018b288c8f3d7155bccc6f087fac6bd430d74cb798929f836fe1ae70000000000000000000000000000000000000000000000000000000000000060000000000000000000000000c5fe6ef47965741f6f7a4734bf784bf3ae3f245200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000020000000000000000000000000111111125421ca6dc452d289314280a0f8842a65000000000000000000000000111111125421ca6dc452d289314280a0f8842a65000000000000000000000000fd086bc7cd5c481dcc9c85ebe478a1c0b69fcbb90000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000027ae3900000000000000000000000000000000000000000000000000000000000000e00000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000008883800a8e000000000000000000000000fd086bc7cd5c481dcc9c85ebe478a1c0b69fcbb9000000000000000000000000000000000000000000000000000000000027ae3900000000000000000000000000000000000000000000000000036f993610ce1138000000000000000000000042161084d0672e1d3f26a9b53e653be2084ff19c2a94d11400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000051408a61b2fa890424911fb6896c7f34c97920f4db458717b3aadf236a5fc4ad77462476be8335db44a54d720c1f4b97035407d8b798000319982c4d9f64b7701c',
+            gas: '0xbcdcb',
+            gasLimit: '0xbcdcb',
+            to: '0x29106d08382d3c73bf477a94333c61db1142e1b6',
+            value: '0x017bb83647a5333e',
+            maxFeePerGas: '0xa5c681d00',
+            maxPriorityFeePerGas: '0x77359400',
+          },
+          userEditedGasLimit: false,
+          verifiedOnBlockchain: false,
+          type: 'bridge',
+          networkClientId: '2fb77c4b-4515-40e2-b717-5629a086e606',
+          defaultGasEstimates: {
+            gas: '0xbcdcb',
+            maxFeePerGas: '0xa5c681d00',
+            maxPriorityFeePerGas: '0x77359400',
+            estimateType: 'medium',
+          },
+          userFeeLevel: 'medium',
+          sendFlowHistory: [],
+        },
+        [
+          {
+            op: 'add',
+            path: '/txParams/nonce',
+            value: '0x6',
+            note: 'TransactionController#approveTransaction - Transaction approved',
+            timestamp: 1730925150919,
+          },
+          {
+            op: 'add',
+            path: '/txParams/type',
+            value: '0x2',
+          },
+          {
+            op: 'replace',
+            path: '/status',
+            value: 'approved',
+          },
+          {
+            op: 'add',
+            path: '/gasFeeEstimates',
+            value: {
+              type: 'fee-market',
+              low: {
+                maxFeePerGas: '0x60db88400',
+                maxPriorityFeePerGas: '0x3b9aca00',
+              },
+              medium: {
+                maxFeePerGas: '0x835105080',
+                maxPriorityFeePerGas: '0x59682f00',
+              },
+              high: {
+                maxFeePerGas: '0xa5c681d00',
+                maxPriorityFeePerGas: '0x77359400',
+              },
+            },
+          },
+          {
+            op: 'add',
+            path: '/gasFeeEstimatesLoaded',
+            value: true,
+          },
+        ],
+        [
+          {
+            op: 'replace',
+            path: '/status',
+            value: 'signed',
+            note: 'TransactionController#approveTransaction - RawTransaction added',
+            timestamp: 1730925150933,
+          },
+          {
+            op: 'add',
+            path: '/r',
+            value:
+              '0xbe080a38b4ea9d4586fc525e2647deb483f47eafd54bf9a2381eb96b68cb6cc7',
+          },
+          {
+            op: 'add',
+            path: '/s',
+            value:
+              '0x3c0a6564fc0c80a8b7a36eadaf069bbea3c97304588cb6e2d74c5f2af7ce01b1',
+          },
+          {
+            op: 'add',
+            path: '/v',
+            value: '0x1',
+          },
+          {
+            op: 'add',
+            path: '/rawTx',
+            value:
+              '0x02f90afd82a86a068477359400850a5c681d00830bcdcb9429106d08382d3c73bf477a94333c61db1142e1b688017bb83647a5333eb90a853ce33bff00000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000017bb83647a5333e00000000000000000000000000000000000000000000000000000000000000c0000000000000000000000000000000000000000000000000000000000000000d6c6966694164617074657256320000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000009600000000000000000000000001231deb6f5749ef6ce6943a275a1d3e7486f4eae0000000000000000000000001231deb6f5749ef6ce6943a275a1d3e7486f4eae000000000000000000000000000000000000000000000000000000000000a4b100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000016029a98d5c5000000000000000000000000000000000000000000000000000000000000000014000000000000000000000000000000000000000000000000000031bced02db00000000000000000000000000068e21357555a15cd9df624f3bfb7aed0eae167e90000000000000000000000000000000000000000000000000000000000000804a6010a660000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000022000000000000000000000000000000000000000000000000000000000000003c07c8d02889018b288c8f3d7155bccc6f087fac6bd430d74cb798929f836fe1ae70000000000000000000000000000000000000000000000000000000000000140000000000000000000000000000000000000000000000000000000000000018000000000000000000000000000000000000000000000000000000000000000000000000000000000000000009702230a8ea53601f5cd2dc00fdbc13d4df4a8c7000000000000000000000000c5fe6ef47965741f6f7a4734bf784bf3ae3f2452000000000000000000000000000000000000000000000000000000000027f09c000000000000000000000000000000000000000000000000000000000000a4b100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000a7374617267617465563200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000f6d6574616d61736b2d627269646765000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000020000000000000000000000000111111125421ca6dc452d289314280a0f8842a65000000000000000000000000111111125421ca6dc452d289314280a0f8842a6500000000000000000000000000000000000000000000000000000000000000000000000000000000000000009702230a8ea53601f5cd2dc00fdbc13d4df4a8c7000000000000000000000000000000000000000000000000016029a98d5c500000000000000000000000000000000000000000000000000000000000000000e000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000048a76dfc3b000000000000000000000000000000000000000000000000000000000027f09b00000000000000003b6d0340e3ba3d5e3f98eeff5e9eddd5bd20e476202770da2a94d114000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000000000000000000000000000001872bdea1b333e0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000c5fe6ef47965741f6f7a4734bf784bf3ae3f2452000000000000000000000000000000000000000000000000000000000000759e0000000000000000000000001493e7b8d4dfade0a178dad9335470337a3a219a000000000000000000000000000000000000000000000000000000000027f09c000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000e00000000000000000000000000000000000000000000000000000000000000120000000000000000000000000000000000000000000000000000000000000038000000000000000000000000000000000000000000000000000000000000000180003010013030000000000000000000000000000003037c0000000000000000000000000000000000000000000000000000000000000000000000000000002407c8d02889018b288c8f3d7155bccc6f087fac6bd430d74cb798929f836fe1ae70000000000000000000000000000000000000000000000000000000000000060000000000000000000000000c5fe6ef47965741f6f7a4734bf784bf3ae3f245200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000020000000000000000000000000111111125421ca6dc452d289314280a0f8842a65000000000000000000000000111111125421ca6dc452d289314280a0f8842a65000000000000000000000000fd086bc7cd5c481dcc9c85ebe478a1c0b69fcbb90000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000027ae3900000000000000000000000000000000000000000000000000000000000000e00000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000008883800a8e000000000000000000000000fd086bc7cd5c481dcc9c85ebe478a1c0b69fcbb9000000000000000000000000000000000000000000000000000000000027ae3900000000000000000000000000000000000000000000000000036f993610ce1138000000000000000000000042161084d0672e1d3f26a9b53e653be2084ff19c2a94d11400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000051408a61b2fa890424911fb6896c7f34c97920f4db458717b3aadf236a5fc4ad77462476be8335db44a54d720c1f4b97035407d8b798000319982c4d9f64b7701cc001a0be080a38b4ea9d4586fc525e2647deb483f47eafd54bf9a2381eb96b68cb6cc7a03c0a6564fc0c80a8b7a36eadaf069bbea3c97304588cb6e2d74c5f2af7ce01b1',
+          },
+        ],
+        [
+          {
+            op: 'replace',
+            path: '/status',
+            value: 'submitted',
+            note: 'TransactionController#approveTransaction - Transaction submitted',
+            timestamp: 1730925151001,
+          },
+          {
+            op: 'add',
+            path: '/hash',
+            value:
+              '0x8586e162e456a23c1969573a4b79e77912705b474bc5aa0c2a63d56556623ab2',
+          },
+          {
+            op: 'add',
+            path: '/submittedTime',
+            value: 1730925151001,
+          },
+        ],
+      ],
+      gasFeeEstimates: {
+        type: 'fee-market',
+        low: {
+          maxFeePerGas: '0x60db88400',
+          maxPriorityFeePerGas: '0x3b9aca00',
+        },
+        medium: {
+          maxFeePerGas: '0x835105080',
+          maxPriorityFeePerGas: '0x59682f00',
+        },
+        high: {
+          maxFeePerGas: '0xa5c681d00',
+          maxPriorityFeePerGas: '0x77359400',
+        },
+      },
+      gasFeeEstimatesLoaded: true,
+      r: '0xbe080a38b4ea9d4586fc525e2647deb483f47eafd54bf9a2381eb96b68cb6cc7',
+      s: '0x3c0a6564fc0c80a8b7a36eadaf069bbea3c97304588cb6e2d74c5f2af7ce01b1',
+      v: '0x1',
+      rawTx:
+        '0x02f90afd82a86a068477359400850a5c681d00830bcdcb9429106d08382d3c73bf477a94333c61db1142e1b688017bb83647a5333eb90a853ce33bff00000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000017bb83647a5333e00000000000000000000000000000000000000000000000000000000000000c0000000000000000000000000000000000000000000000000000000000000000d6c6966694164617074657256320000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000009600000000000000000000000001231deb6f5749ef6ce6943a275a1d3e7486f4eae0000000000000000000000001231deb6f5749ef6ce6943a275a1d3e7486f4eae000000000000000000000000000000000000000000000000000000000000a4b100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000016029a98d5c5000000000000000000000000000000000000000000000000000000000000000014000000000000000000000000000000000000000000000000000031bced02db00000000000000000000000000068e21357555a15cd9df624f3bfb7aed0eae167e90000000000000000000000000000000000000000000000000000000000000804a6010a660000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000022000000000000000000000000000000000000000000000000000000000000003c07c8d02889018b288c8f3d7155bccc6f087fac6bd430d74cb798929f836fe1ae70000000000000000000000000000000000000000000000000000000000000140000000000000000000000000000000000000000000000000000000000000018000000000000000000000000000000000000000000000000000000000000000000000000000000000000000009702230a8ea53601f5cd2dc00fdbc13d4df4a8c7000000000000000000000000c5fe6ef47965741f6f7a4734bf784bf3ae3f2452000000000000000000000000000000000000000000000000000000000027f09c000000000000000000000000000000000000000000000000000000000000a4b100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000a7374617267617465563200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000f6d6574616d61736b2d627269646765000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000020000000000000000000000000111111125421ca6dc452d289314280a0f8842a65000000000000000000000000111111125421ca6dc452d289314280a0f8842a6500000000000000000000000000000000000000000000000000000000000000000000000000000000000000009702230a8ea53601f5cd2dc00fdbc13d4df4a8c7000000000000000000000000000000000000000000000000016029a98d5c500000000000000000000000000000000000000000000000000000000000000000e000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000048a76dfc3b000000000000000000000000000000000000000000000000000000000027f09b00000000000000003b6d0340e3ba3d5e3f98eeff5e9eddd5bd20e476202770da2a94d114000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000000000000000000000000000001872bdea1b333e0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000c5fe6ef47965741f6f7a4734bf784bf3ae3f2452000000000000000000000000000000000000000000000000000000000000759e0000000000000000000000001493e7b8d4dfade0a178dad9335470337a3a219a000000000000000000000000000000000000000000000000000000000027f09c000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000e00000000000000000000000000000000000000000000000000000000000000120000000000000000000000000000000000000000000000000000000000000038000000000000000000000000000000000000000000000000000000000000000180003010013030000000000000000000000000000003037c0000000000000000000000000000000000000000000000000000000000000000000000000000002407c8d02889018b288c8f3d7155bccc6f087fac6bd430d74cb798929f836fe1ae70000000000000000000000000000000000000000000000000000000000000060000000000000000000000000c5fe6ef47965741f6f7a4734bf784bf3ae3f245200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000020000000000000000000000000111111125421ca6dc452d289314280a0f8842a65000000000000000000000000111111125421ca6dc452d289314280a0f8842a65000000000000000000000000fd086bc7cd5c481dcc9c85ebe478a1c0b69fcbb90000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000027ae3900000000000000000000000000000000000000000000000000000000000000e00000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000008883800a8e000000000000000000000000fd086bc7cd5c481dcc9c85ebe478a1c0b69fcbb9000000000000000000000000000000000000000000000000000000000027ae3900000000000000000000000000000000000000000000000000036f993610ce1138000000000000000000000042161084d0672e1d3f26a9b53e653be2084ff19c2a94d11400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000051408a61b2fa890424911fb6896c7f34c97920f4db458717b3aadf236a5fc4ad77462476be8335db44a54d720c1f4b97035407d8b798000319982c4d9f64b7701cc001a0be080a38b4ea9d4586fc525e2647deb483f47eafd54bf9a2381eb96b68cb6cc7a03c0a6564fc0c80a8b7a36eadaf069bbea3c97304588cb6e2d74c5f2af7ce01b1',
+      hash: '0x8586e162e456a23c1969573a4b79e77912705b474bc5aa0c2a63d56556623ab2',
+      submittedTime: 1730925151001,
+    },
+  },
+  step2: {
+    bridgeHistoryItem: {
+      quote: {
+        requestId: '81dc4f52-6d53-4b85-a31a-f1c29fce3ea3',
+        srcChainId: 43114,
+        srcTokenAmount: '99125000000000000',
+        srcAsset: {
+          address: '0x0000000000000000000000000000000000000000',
+          chainId: 43114,
+          symbol: 'AVAX',
+          decimals: 18,
+          name: 'AVAX',
+          coinKey: 'AVAX',
+          logoURI:
+            'https://static.debank.com/image/avax_token/logo_url/avax/0b9c84359c84d6bdd5bfda9c2d4c4a82.png',
+          priceUSD: '26.56',
+          icon: 'https://static.debank.com/image/avax_token/logo_url/avax/0b9c84359c84d6bdd5bfda9c2d4c4a82.png',
+        },
+        destChainId: 42161,
+        destTokenAmount: '976471237080818',
+        destAsset: {
+          address: '0x0000000000000000000000000000000000000000',
+          chainId: 42161,
+          symbol: 'ETH',
+          decimals: 18,
+          name: 'ETH',
+          coinKey: 'ETH',
+          logoURI:
+            'https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/ethereum/assets/0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2/logo.png',
+          priceUSD: '2689.39',
+          icon: 'https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/ethereum/assets/0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2/logo.png',
+        },
+        feeData: {
+          metabridge: {
+            amount: '875000000000000',
+            asset: {
+              address: '0x0000000000000000000000000000000000000000',
+              chainId: 43114,
+              symbol: 'AVAX',
+              decimals: 18,
+              name: 'AVAX',
+              coinKey: 'AVAX',
+              logoURI:
+                'https://static.debank.com/image/avax_token/logo_url/avax/0b9c84359c84d6bdd5bfda9c2d4c4a82.png',
+              priceUSD: '26.56',
+              icon: 'https://static.debank.com/image/avax_token/logo_url/avax/0b9c84359c84d6bdd5bfda9c2d4c4a82.png',
+            },
+          },
+        },
+        bridgeId: 'lifi',
+        bridges: ['stargate'],
+        steps: [
+          {
+            action: 'swap',
+            srcChainId: 43114,
+            destChainId: 43114,
+            protocol: {
+              name: '1inch',
+              displayName: '1inch',
+              icon: 'https://raw.githubusercontent.com/lifinance/types/main/src/assets/icons/exchanges/oneinch.png',
+            },
+            srcAsset: {
+              address: '0x0000000000000000000000000000000000000000',
+              chainId: 43114,
+              symbol: 'AVAX',
+              decimals: 18,
+              name: 'AVAX',
+              coinKey: 'AVAX',
+              logoURI:
+                'https://static.debank.com/image/avax_token/logo_url/avax/0b9c84359c84d6bdd5bfda9c2d4c4a82.png',
+              priceUSD: '26.56',
+              icon: 'https://static.debank.com/image/avax_token/logo_url/avax/0b9c84359c84d6bdd5bfda9c2d4c4a82.png',
+            },
+            destAsset: {
+              address: '0x9702230A8Ea53601f5cD2dc00fDBc13d4dF4A8c7',
+              chainId: 43114,
+              symbol: 'USDt',
+              decimals: 6,
+              name: 'TetherToken',
+              coinKey: 'USDt',
+              logoURI:
+                'https://static.debank.com/image/eth_token/logo_url/0xdac17f958d2ee523a2206206994597c13d831ec7/464c0de678334b8fe87327e527bc476d.png',
+              priceUSD: '1.00125',
+              icon: 'https://static.debank.com/image/eth_token/logo_url/0xdac17f958d2ee523a2206206994597c13d831ec7/464c0de678334b8fe87327e527bc476d.png',
+            },
+            srcAmount: '99125000000000000',
+            destAmount: '2628919',
+          },
+          {
+            action: 'bridge',
+            srcChainId: 43114,
+            destChainId: 42161,
+            protocol: {
+              name: 'stargate',
+              displayName: 'StargateV2 (Fast mode)',
+              icon: 'https://raw.githubusercontent.com/lifinance/types/5685c638772f533edad80fcb210b4bb89e30a50f/src/assets/icons/bridges/stargate.png',
+            },
+            srcAsset: {
+              address: '0x9702230A8Ea53601f5cD2dc00fDBc13d4dF4A8c7',
+              chainId: 43114,
+              symbol: 'USDt',
+              decimals: 6,
+              name: 'TetherToken',
+              coinKey: 'USDt',
+              logoURI:
+                'https://static.debank.com/image/eth_token/logo_url/0xdac17f958d2ee523a2206206994597c13d831ec7/464c0de678334b8fe87327e527bc476d.png',
+              priceUSD: '1.00125',
+              icon: 'https://static.debank.com/image/eth_token/logo_url/0xdac17f958d2ee523a2206206994597c13d831ec7/464c0de678334b8fe87327e527bc476d.png',
+            },
+            destAsset: {
+              address: '0xFd086bC7CD5C481DCC9C85ebE478A1C0b69FCbb9',
+              chainId: 42161,
+              symbol: 'USDT',
+              decimals: 6,
+              name: 'USDT',
+              coinKey: 'USDT',
+              logoURI:
+                'https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/ethereum/assets/0xdAC17F958D2ee523a2206206994597C13D831ec7/logo.png',
+              priceUSD: '1.00125',
+              icon: 'https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/ethereum/assets/0xdAC17F958D2ee523a2206206994597C13D831ec7/logo.png',
+            },
+            srcAmount: '2628919',
+            destAmount: '2624975',
+          },
+          {
+            action: 'swap',
+            srcChainId: 42161,
+            destChainId: 42161,
+            protocol: {
+              name: '1inch',
+              displayName: '1inch',
+              icon: 'https://raw.githubusercontent.com/lifinance/types/main/src/assets/icons/exchanges/oneinch.png',
+            },
+            srcAsset: {
+              address: '0xFd086bC7CD5C481DCC9C85ebE478A1C0b69FCbb9',
+              chainId: 42161,
+              symbol: 'USDT',
+              decimals: 6,
+              name: 'USDT',
+              coinKey: 'USDT',
+              logoURI:
+                'https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/ethereum/assets/0xdAC17F958D2ee523a2206206994597C13D831ec7/logo.png',
+              priceUSD: '1.00125',
+              icon: 'https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/ethereum/assets/0xdAC17F958D2ee523a2206206994597C13D831ec7/logo.png',
+            },
+            destAsset: {
+              address: '0x0000000000000000000000000000000000000000',
+              chainId: 42161,
+              symbol: 'ETH',
+              decimals: 18,
+              name: 'ETH',
+              coinKey: 'ETH',
+              logoURI:
+                'https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/ethereum/assets/0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2/logo.png',
+              priceUSD: '2689.39',
+              icon: 'https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/ethereum/assets/0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2/logo.png',
+            },
+            srcAmount: '2611849',
+            destAmount: '976471237080818',
+          },
+        ],
+      },
+      startTime: 1730925261375,
+      estimatedProcessingTimeInSeconds: 99,
+      slippagePercentage: 0,
+      targetContractAddress: '0x29106d08382d3c73bf477a94333c61db1142e1b6',
+      account: '0xc5fe6ef47965741f6f7a4734bf784bf3ae3f2452',
+      status: {
+        status: 'PENDING',
+        srcChain: {
+          chainId: 43114,
+          txHash:
+            '0xe12fee9d2d73550236d233e8c541cee3237d7e9dc8085cd576d620fca1b659b7',
+          amount: '99125000000000000',
+          token: {
+            address: '0x0000000000000000000000000000000000000000',
+            chainId: 43114,
+            symbol: 'AVAX',
+            decimals: 18,
+            name: 'AVAX',
+            coinKey: 'AVAX',
+            logoURI:
+              'https://static.debank.com/image/avax_token/logo_url/avax/0b9c84359c84d6bdd5bfda9c2d4c4a82.png',
+            priceUSD: '26.56',
+            icon: 'https://static.debank.com/image/avax_token/logo_url/avax/0b9c84359c84d6bdd5bfda9c2d4c4a82.png',
+          },
+        },
+        destChain: {
+          chainId: '42161',
+          token: {},
+        },
+      },
+    },
+    srcChainTxMeta: {
+      actionId: 1730925261366.3533,
+      chainId: '0xa86a',
+      id: '80dffcf0-9c7e-11ef-929c-517d218027d6',
+      origin: 'metamask',
+      status: 'confirmed',
+      time: 1730925261375,
+      txParams: {
+        from: '0xc5fe6ef47965741f6f7a4734bf784bf3ae3f2452',
+        data: '0x3ce33bff00000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000017bb83647a5333e00000000000000000000000000000000000000000000000000000000000000c0000000000000000000000000000000000000000000000000000000000000000d6c6966694164617074657256320000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000009600000000000000000000000001231deb6f5749ef6ce6943a275a1d3e7486f4eae0000000000000000000000001231deb6f5749ef6ce6943a275a1d3e7486f4eae000000000000000000000000000000000000000000000000000000000000a4b100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000016029a98d5c5000000000000000000000000000000000000000000000000000000000000000014000000000000000000000000000000000000000000000000000031bced02db00000000000000000000000000068e21357555a15cd9df624f3bfb7aed0eae167e90000000000000000000000000000000000000000000000000000000000000804a6010a660000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000022000000000000000000000000000000000000000000000000000000000000003c049edb1f86374f25f25bba1abda983a1ba299a1f4072203a477122ab74befd0000000000000000000000000000000000000000000000000000000000000000140000000000000000000000000000000000000000000000000000000000000018000000000000000000000000000000000000000000000000000000000000000000000000000000000000000009702230a8ea53601f5cd2dc00fdbc13d4df4a8c7000000000000000000000000c5fe6ef47965741f6f7a4734bf784bf3ae3f2452000000000000000000000000000000000000000000000000000000000027e9de000000000000000000000000000000000000000000000000000000000000a4b100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000a7374617267617465563200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000f6d6574616d61736b2d627269646765000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000020000000000000000000000000111111125421ca6dc452d289314280a0f8842a65000000000000000000000000111111125421ca6dc452d289314280a0f8842a6500000000000000000000000000000000000000000000000000000000000000000000000000000000000000009702230a8ea53601f5cd2dc00fdbc13d4df4a8c7000000000000000000000000000000000000000000000000016029a98d5c500000000000000000000000000000000000000000000000000000000000000000e000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000048a76dfc3b000000000000000000000000000000000000000000000000000000000027e9de00000000000000003b6d0340e3ba3d5e3f98eeff5e9eddd5bd20e476202770da2a94d114000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000000000000000000000000000001872bdea1b333e0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000c5fe6ef47965741f6f7a4734bf784bf3ae3f2452000000000000000000000000000000000000000000000000000000000000759e0000000000000000000000001493e7b8d4dfade0a178dad9335470337a3a219a000000000000000000000000000000000000000000000000000000000027e9de000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000e00000000000000000000000000000000000000000000000000000000000000120000000000000000000000000000000000000000000000000000000000000038000000000000000000000000000000000000000000000000000000000000000180003010013030000000000000000000000000000003037c00000000000000000000000000000000000000000000000000000000000000000000000000000024049edb1f86374f25f25bba1abda983a1ba299a1f4072203a477122ab74befd0000000000000000000000000000000000000000000000000000000000000000060000000000000000000000000c5fe6ef47965741f6f7a4734bf784bf3ae3f245200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000020000000000000000000000000111111125421ca6dc452d289314280a0f8842a65000000000000000000000000111111125421ca6dc452d289314280a0f8842a65000000000000000000000000fd086bc7cd5c481dcc9c85ebe478a1c0b69fcbb90000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000027a78600000000000000000000000000000000000000000000000000000000000000e00000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000008883800a8e000000000000000000000000fd086bc7cd5c481dcc9c85ebe478a1c0b69fcbb9000000000000000000000000000000000000000000000000000000000027a78600000000000000000000000000000000000000000000000000036f3c9b851bf338000000000000000000000042161084d0672e1d3f26a9b53e653be2084ff19c2a94d114000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000505b476320219f1b44f1f2f21b17912641058e450ba4b94381cc082ec1c42c9d717e9ffa7b6bb9231fcddae65bf8e3bbcf0f9b5d7720347c2337670b2681b00b1b',
+        gas: '0xbcdae',
+        gasLimit: '0xbcdae',
+        nonce: '0x7',
+        to: '0x29106d08382d3c73bf477a94333c61db1142e1b6',
+        value: '0x017bb83647a5333e',
+        maxFeePerGas: '0xa5c681d00',
+        maxPriorityFeePerGas: '0x77359400',
+        type: '0x2',
+      },
+      userEditedGasLimit: false,
+      verifiedOnBlockchain: true,
+      type: 'bridge',
+      networkClientId: '2fb77c4b-4515-40e2-b717-5629a086e606',
+      defaultGasEstimates: {
+        gas: '0xbcdae',
+        maxFeePerGas: '0xa5c681d00',
+        maxPriorityFeePerGas: '0x77359400',
+        estimateType: 'medium',
+      },
+      userFeeLevel: 'medium',
+      sendFlowHistory: [],
+      history: [
+        {
+          actionId: 1730925261366.3533,
+          chainId: '0xa86a',
+          id: '80dffcf0-9c7e-11ef-929c-517d218027d6',
+          origin: 'metamask',
+          status: 'unapproved',
+          time: 1730925261375,
+          txParams: {
+            from: '0xc5fe6ef47965741f6f7a4734bf784bf3ae3f2452',
+            data: '0x3ce33bff00000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000017bb83647a5333e00000000000000000000000000000000000000000000000000000000000000c0000000000000000000000000000000000000000000000000000000000000000d6c6966694164617074657256320000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000009600000000000000000000000001231deb6f5749ef6ce6943a275a1d3e7486f4eae0000000000000000000000001231deb6f5749ef6ce6943a275a1d3e7486f4eae000000000000000000000000000000000000000000000000000000000000a4b100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000016029a98d5c5000000000000000000000000000000000000000000000000000000000000000014000000000000000000000000000000000000000000000000000031bced02db00000000000000000000000000068e21357555a15cd9df624f3bfb7aed0eae167e90000000000000000000000000000000000000000000000000000000000000804a6010a660000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000022000000000000000000000000000000000000000000000000000000000000003c049edb1f86374f25f25bba1abda983a1ba299a1f4072203a477122ab74befd0000000000000000000000000000000000000000000000000000000000000000140000000000000000000000000000000000000000000000000000000000000018000000000000000000000000000000000000000000000000000000000000000000000000000000000000000009702230a8ea53601f5cd2dc00fdbc13d4df4a8c7000000000000000000000000c5fe6ef47965741f6f7a4734bf784bf3ae3f2452000000000000000000000000000000000000000000000000000000000027e9de000000000000000000000000000000000000000000000000000000000000a4b100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000a7374617267617465563200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000f6d6574616d61736b2d627269646765000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000020000000000000000000000000111111125421ca6dc452d289314280a0f8842a65000000000000000000000000111111125421ca6dc452d289314280a0f8842a6500000000000000000000000000000000000000000000000000000000000000000000000000000000000000009702230a8ea53601f5cd2dc00fdbc13d4df4a8c7000000000000000000000000000000000000000000000000016029a98d5c500000000000000000000000000000000000000000000000000000000000000000e000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000048a76dfc3b000000000000000000000000000000000000000000000000000000000027e9de00000000000000003b6d0340e3ba3d5e3f98eeff5e9eddd5bd20e476202770da2a94d114000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000000000000000000000000000001872bdea1b333e0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000c5fe6ef47965741f6f7a4734bf784bf3ae3f2452000000000000000000000000000000000000000000000000000000000000759e0000000000000000000000001493e7b8d4dfade0a178dad9335470337a3a219a000000000000000000000000000000000000000000000000000000000027e9de000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000e00000000000000000000000000000000000000000000000000000000000000120000000000000000000000000000000000000000000000000000000000000038000000000000000000000000000000000000000000000000000000000000000180003010013030000000000000000000000000000003037c00000000000000000000000000000000000000000000000000000000000000000000000000000024049edb1f86374f25f25bba1abda983a1ba299a1f4072203a477122ab74befd0000000000000000000000000000000000000000000000000000000000000000060000000000000000000000000c5fe6ef47965741f6f7a4734bf784bf3ae3f245200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000020000000000000000000000000111111125421ca6dc452d289314280a0f8842a65000000000000000000000000111111125421ca6dc452d289314280a0f8842a65000000000000000000000000fd086bc7cd5c481dcc9c85ebe478a1c0b69fcbb90000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000027a78600000000000000000000000000000000000000000000000000000000000000e00000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000008883800a8e000000000000000000000000fd086bc7cd5c481dcc9c85ebe478a1c0b69fcbb9000000000000000000000000000000000000000000000000000000000027a78600000000000000000000000000000000000000000000000000036f3c9b851bf338000000000000000000000042161084d0672e1d3f26a9b53e653be2084ff19c2a94d114000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000505b476320219f1b44f1f2f21b17912641058e450ba4b94381cc082ec1c42c9d717e9ffa7b6bb9231fcddae65bf8e3bbcf0f9b5d7720347c2337670b2681b00b1b',
+            gas: '0xbcdae',
+            gasLimit: '0xbcdae',
+            to: '0x29106d08382d3c73bf477a94333c61db1142e1b6',
+            value: '0x017bb83647a5333e',
+            maxFeePerGas: '0xa5c681d00',
+            maxPriorityFeePerGas: '0x77359400',
+          },
+          userEditedGasLimit: false,
+          verifiedOnBlockchain: false,
+          type: 'bridge',
+          networkClientId: '2fb77c4b-4515-40e2-b717-5629a086e606',
+          defaultGasEstimates: {
+            gas: '0xbcdae',
+            maxFeePerGas: '0xa5c681d00',
+            maxPriorityFeePerGas: '0x77359400',
+            estimateType: 'medium',
+          },
+          userFeeLevel: 'medium',
+          sendFlowHistory: [],
+        },
+        [
+          {
+            op: 'add',
+            path: '/txParams/nonce',
+            value: '0x7',
+            note: 'TransactionController#approveTransaction - Transaction approved',
+            timestamp: 1730925261449,
+          },
+          {
+            op: 'add',
+            path: '/txParams/type',
+            value: '0x2',
+          },
+          {
+            op: 'replace',
+            path: '/status',
+            value: 'approved',
+          },
+        ],
+        [
+          {
+            op: 'replace',
+            path: '/status',
+            value: 'signed',
+            note: 'TransactionController#approveTransaction - RawTransaction added',
+            timestamp: 1730925261459,
+          },
+          {
+            op: 'add',
+            path: '/r',
+            value:
+              '0xfd3ca699de97aabaefb3b5c51dea239efaf3c01aa65be1a2fa5d4e1931eba1e8',
+          },
+          {
+            op: 'add',
+            path: '/s',
+            value:
+              '0x5c63a89126570ccb0a1ac39bde25c56c20c76fcf4c94fd61588989eb05f723ad',
+          },
+          {
+            op: 'add',
+            path: '/v',
+            value: '0x0',
+          },
+          {
+            op: 'add',
+            path: '/rawTx',
+            value:
+              '0x02f90afd82a86a078477359400850a5c681d00830bcdae9429106d08382d3c73bf477a94333c61db1142e1b688017bb83647a5333eb90a853ce33bff00000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000017bb83647a5333e00000000000000000000000000000000000000000000000000000000000000c0000000000000000000000000000000000000000000000000000000000000000d6c6966694164617074657256320000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000009600000000000000000000000001231deb6f5749ef6ce6943a275a1d3e7486f4eae0000000000000000000000001231deb6f5749ef6ce6943a275a1d3e7486f4eae000000000000000000000000000000000000000000000000000000000000a4b100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000016029a98d5c5000000000000000000000000000000000000000000000000000000000000000014000000000000000000000000000000000000000000000000000031bced02db00000000000000000000000000068e21357555a15cd9df624f3bfb7aed0eae167e90000000000000000000000000000000000000000000000000000000000000804a6010a660000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000022000000000000000000000000000000000000000000000000000000000000003c049edb1f86374f25f25bba1abda983a1ba299a1f4072203a477122ab74befd0000000000000000000000000000000000000000000000000000000000000000140000000000000000000000000000000000000000000000000000000000000018000000000000000000000000000000000000000000000000000000000000000000000000000000000000000009702230a8ea53601f5cd2dc00fdbc13d4df4a8c7000000000000000000000000c5fe6ef47965741f6f7a4734bf784bf3ae3f2452000000000000000000000000000000000000000000000000000000000027e9de000000000000000000000000000000000000000000000000000000000000a4b100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000a7374617267617465563200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000f6d6574616d61736b2d627269646765000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000020000000000000000000000000111111125421ca6dc452d289314280a0f8842a65000000000000000000000000111111125421ca6dc452d289314280a0f8842a6500000000000000000000000000000000000000000000000000000000000000000000000000000000000000009702230a8ea53601f5cd2dc00fdbc13d4df4a8c7000000000000000000000000000000000000000000000000016029a98d5c500000000000000000000000000000000000000000000000000000000000000000e000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000048a76dfc3b000000000000000000000000000000000000000000000000000000000027e9de00000000000000003b6d0340e3ba3d5e3f98eeff5e9eddd5bd20e476202770da2a94d114000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000000000000000000000000000001872bdea1b333e0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000c5fe6ef47965741f6f7a4734bf784bf3ae3f2452000000000000000000000000000000000000000000000000000000000000759e0000000000000000000000001493e7b8d4dfade0a178dad9335470337a3a219a000000000000000000000000000000000000000000000000000000000027e9de000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000e00000000000000000000000000000000000000000000000000000000000000120000000000000000000000000000000000000000000000000000000000000038000000000000000000000000000000000000000000000000000000000000000180003010013030000000000000000000000000000003037c00000000000000000000000000000000000000000000000000000000000000000000000000000024049edb1f86374f25f25bba1abda983a1ba299a1f4072203a477122ab74befd0000000000000000000000000000000000000000000000000000000000000000060000000000000000000000000c5fe6ef47965741f6f7a4734bf784bf3ae3f245200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000020000000000000000000000000111111125421ca6dc452d289314280a0f8842a65000000000000000000000000111111125421ca6dc452d289314280a0f8842a65000000000000000000000000fd086bc7cd5c481dcc9c85ebe478a1c0b69fcbb90000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000027a78600000000000000000000000000000000000000000000000000000000000000e00000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000008883800a8e000000000000000000000000fd086bc7cd5c481dcc9c85ebe478a1c0b69fcbb9000000000000000000000000000000000000000000000000000000000027a78600000000000000000000000000000000000000000000000000036f3c9b851bf338000000000000000000000042161084d0672e1d3f26a9b53e653be2084ff19c2a94d114000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000505b476320219f1b44f1f2f21b17912641058e450ba4b94381cc082ec1c42c9d717e9ffa7b6bb9231fcddae65bf8e3bbcf0f9b5d7720347c2337670b2681b00b1bc080a0fd3ca699de97aabaefb3b5c51dea239efaf3c01aa65be1a2fa5d4e1931eba1e8a05c63a89126570ccb0a1ac39bde25c56c20c76fcf4c94fd61588989eb05f723ad',
+          },
+        ],
+        [
+          {
+            op: 'replace',
+            path: '/status',
+            value: 'submitted',
+            note: 'TransactionController#approveTransaction - Transaction submitted',
+            timestamp: 1730925261526,
+          },
+          {
+            op: 'add',
+            path: '/gasFeeEstimates',
+            value: {
+              type: 'fee-market',
+              low: {
+                maxFeePerGas: '0x60db88400',
+                maxPriorityFeePerGas: '0x3b9aca00',
+              },
+              medium: {
+                maxFeePerGas: '0x835105080',
+                maxPriorityFeePerGas: '0x59682f00',
+              },
+              high: {
+                maxFeePerGas: '0xa5c681d00',
+                maxPriorityFeePerGas: '0x77359400',
+              },
+            },
+          },
+          {
+            op: 'add',
+            path: '/gasFeeEstimatesLoaded',
+            value: true,
+          },
+          {
+            op: 'add',
+            path: '/hash',
+            value:
+              '0xe12fee9d2d73550236d233e8c541cee3237d7e9dc8085cd576d620fca1b659b7',
+          },
+          {
+            op: 'add',
+            path: '/submittedTime',
+            value: 1730925261525,
+          },
+        ],
+        [
+          {
+            op: 'replace',
+            path: '/verifiedOnBlockchain',
+            value: true,
+            note: 'PendingTransactionTracker:#onTransactionConfirmed - Transaction confirmed',
+            timestamp: 1730925278122,
+          },
+          {
+            op: 'replace',
+            path: '/status',
+            value: 'confirmed',
+          },
+          {
+            op: 'add',
+            path: '/baseFeePerGas',
+            value: '0x5d21dba00',
+          },
+          {
+            op: 'add',
+            path: '/blockTimestamp',
+            value: '0x672bd2cd',
+          },
+          {
+            op: 'add',
+            path: '/txReceipt',
+            value: {
+              blockHash:
+                '0x158b659f69b0d465b88ad768147057f9c8dc01ae0631e88b04d9406a19fcc9f6',
+              blockNumber: '0x324d0fb',
+              contractAddress: null,
+              cumulativeGasUsed: '0x160ccc',
+              effectiveGasPrice: '0x649534e00',
+              from: '0xc5fe6ef47965741f6f7a4734bf784bf3ae3f2452',
+              gasUsed: '0xa1211',
+              logs: [
+                {
+                  address: '0x68e21357555a15cd9df624f3bfb7aed0eae167e9',
+                  blockHash:
+                    '0x158b659f69b0d465b88ad768147057f9c8dc01ae0631e88b04d9406a19fcc9f6',
+                  blockNumber: '0x324d0fb',
+                  data: '0x00000000000000000000000000000000000000000000000000031bced02db000',
+                  logIndex: '0x27',
+                  removed: false,
+                  topics: [
+                    '0x3d0ce9bfc3ed7d6862dbb28b2dea94561fe714a1b4d019aa8af39730d1ad7c3d',
+                    '0x000000000000000000000000f3e6bb4227c0040e0e274388269ee3cec1de8447',
+                  ],
+                  transactionHash:
+                    '0xe12fee9d2d73550236d233e8c541cee3237d7e9dc8085cd576d620fca1b659b7',
+                  transactionIndex: '0x5',
+                },
+                {
+                  address: '0xf3e6bb4227c0040e0e274388269ee3cec1de8447',
+                  blockHash:
+                    '0x158b659f69b0d465b88ad768147057f9c8dc01ae0631e88b04d9406a19fcc9f6',
+                  blockNumber: '0x324d0fb',
+                  data: '0x000000000000000000000000000000000000000000000000000000000000000000000000000000000000000068e21357555a15cd9df624f3bfb7aed0eae167e900000000000000000000000000000000000000000000000000031bced02db000',
+                  logIndex: '0x28',
+                  removed: false,
+                  topics: [
+                    '0x6ded982279c8387ad8a63e73385031a3807c1862e633f06e09d11bcb6e282f60',
+                  ],
+                  transactionHash:
+                    '0xe12fee9d2d73550236d233e8c541cee3237d7e9dc8085cd576d620fca1b659b7',
+                  transactionIndex: '0x5',
+                },
+                {
+                  address: '0xb31f66aa3c1e785363f0875a1b74e27b85fd66c7',
+                  blockHash:
+                    '0x158b659f69b0d465b88ad768147057f9c8dc01ae0631e88b04d9406a19fcc9f6',
+                  blockNumber: '0x324d0fb',
+                  data: '0x000000000000000000000000000000000000000000000000016029a98d5c5000',
+                  logIndex: '0x29',
+                  removed: false,
+                  topics: [
+                    '0xe1fffcc4923d04b559f4d29a8bfc6cda04eb5b0d3c460751c2402c5c5cc9109c',
+                    '0x000000000000000000000000111111125421ca6dc452d289314280a0f8842a65',
+                  ],
+                  transactionHash:
+                    '0xe12fee9d2d73550236d233e8c541cee3237d7e9dc8085cd576d620fca1b659b7',
+                  transactionIndex: '0x5',
+                },
+                {
+                  address: '0xb31f66aa3c1e785363f0875a1b74e27b85fd66c7',
+                  blockHash:
+                    '0x158b659f69b0d465b88ad768147057f9c8dc01ae0631e88b04d9406a19fcc9f6',
+                  blockNumber: '0x324d0fb',
+                  data: '0x000000000000000000000000000000000000000000000000016029a98d5c5000',
+                  logIndex: '0x2a',
+                  removed: false,
+                  topics: [
+                    '0xddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef',
+                    '0x000000000000000000000000111111125421ca6dc452d289314280a0f8842a65',
+                    '0x000000000000000000000000e3ba3d5e3f98eeff5e9eddd5bd20e476202770da',
+                  ],
+                  transactionHash:
+                    '0xe12fee9d2d73550236d233e8c541cee3237d7e9dc8085cd576d620fca1b659b7',
+                  transactionIndex: '0x5',
+                },
+                {
+                  address: '0x9702230a8ea53601f5cd2dc00fdbc13d4df4a8c7',
+                  blockHash:
+                    '0x158b659f69b0d465b88ad768147057f9c8dc01ae0631e88b04d9406a19fcc9f6',
+                  blockNumber: '0x324d0fb',
+                  data: '0x0000000000000000000000000000000000000000000000000000000000281d37',
+                  logIndex: '0x2b',
+                  removed: false,
+                  topics: [
+                    '0xddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef',
+                    '0x000000000000000000000000e3ba3d5e3f98eeff5e9eddd5bd20e476202770da',
+                    '0x0000000000000000000000001231deb6f5749ef6ce6943a275a1d3e7486f4eae',
+                  ],
+                  transactionHash:
+                    '0xe12fee9d2d73550236d233e8c541cee3237d7e9dc8085cd576d620fca1b659b7',
+                  transactionIndex: '0x5',
+                },
+                {
+                  address: '0xe3ba3d5e3f98eeff5e9eddd5bd20e476202770da',
+                  blockHash:
+                    '0x158b659f69b0d465b88ad768147057f9c8dc01ae0631e88b04d9406a19fcc9f6',
+                  blockNumber: '0x324d0fb',
+                  data: '0x0000000000000000000000000000000000000000000000000000000ee03b968f00000000000000000000000000000000000000000000008235a12766ecdf66da',
+                  logIndex: '0x2c',
+                  removed: false,
+                  topics: [
+                    '0x1c411e9a96e071241c2f21f7726b17ae89e3cab4c78be50e062b03a9fffbbad1',
+                  ],
+                  transactionHash:
+                    '0xe12fee9d2d73550236d233e8c541cee3237d7e9dc8085cd576d620fca1b659b7',
+                  transactionIndex: '0x5',
+                },
+                {
+                  address: '0xe3ba3d5e3f98eeff5e9eddd5bd20e476202770da',
+                  blockHash:
+                    '0x158b659f69b0d465b88ad768147057f9c8dc01ae0631e88b04d9406a19fcc9f6',
+                  blockNumber: '0x324d0fb',
+                  data: '0x0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000016029a98d5c50000000000000000000000000000000000000000000000000000000000000281d370000000000000000000000000000000000000000000000000000000000000000',
+                  logIndex: '0x2d',
+                  removed: false,
+                  topics: [
+                    '0xd78ad95fa46c994b6551d0da85fc275fe613ce37657fb8d5e3d130840159d822',
+                    '0x000000000000000000000000111111125421ca6dc452d289314280a0f8842a65',
+                    '0x0000000000000000000000001231deb6f5749ef6ce6943a275a1d3e7486f4eae',
+                  ],
+                  transactionHash:
+                    '0xe12fee9d2d73550236d233e8c541cee3237d7e9dc8085cd576d620fca1b659b7',
+                  transactionIndex: '0x5',
+                },
+                {
+                  address: '0x1231deb6f5749ef6ce6943a275a1d3e7486f4eae',
+                  blockHash:
+                    '0x158b659f69b0d465b88ad768147057f9c8dc01ae0631e88b04d9406a19fcc9f6',
+                  blockNumber: '0x324d0fb',
+                  data: '0x49edb1f86374f25f25bba1abda983a1ba299a1f4072203a477122ab74befd000000000000000000000000000111111125421ca6dc452d289314280a0f8842a6500000000000000000000000000000000000000000000000000000000000000000000000000000000000000009702230a8ea53601f5cd2dc00fdbc13d4df4a8c7000000000000000000000000000000000000000000000000016029a98d5c50000000000000000000000000000000000000000000000000000000000000281d3700000000000000000000000000000000000000000000000000000000672bd2cd',
+                  logIndex: '0x2e',
+                  removed: false,
+                  topics: [
+                    '0x7bfdfdb5e3a3776976e53cb0607060f54c5312701c8cba1155cc4d5394440b38',
+                  ],
+                  transactionHash:
+                    '0xe12fee9d2d73550236d233e8c541cee3237d7e9dc8085cd576d620fca1b659b7',
+                  transactionIndex: '0x5',
+                },
+                {
+                  address: '0x9702230a8ea53601f5cd2dc00fdbc13d4df4a8c7',
+                  blockHash:
+                    '0x158b659f69b0d465b88ad768147057f9c8dc01ae0631e88b04d9406a19fcc9f6',
+                  blockNumber: '0x324d0fb',
+                  data: '0x0000000000000000000000000000000000000000000000000000000000281d37',
+                  logIndex: '0x2f',
+                  removed: false,
+                  topics: [
+                    '0xddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef',
+                    '0x0000000000000000000000001231deb6f5749ef6ce6943a275a1d3e7486f4eae',
+                    '0x00000000000000000000000012dc9256acc9895b076f6638d628382881e62cee',
+                  ],
+                  transactionHash:
+                    '0xe12fee9d2d73550236d233e8c541cee3237d7e9dc8085cd576d620fca1b659b7',
+                  transactionIndex: '0x5',
+                },
+                {
+                  address: '0x9702230a8ea53601f5cd2dc00fdbc13d4df4a8c7',
+                  blockHash:
+                    '0x158b659f69b0d465b88ad768147057f9c8dc01ae0631e88b04d9406a19fcc9f6',
+                  blockNumber: '0x324d0fb',
+                  data: '0xffffffffffffffffffffffffffffffffffffffffffffffffffffff55e55aa213',
+                  logIndex: '0x30',
+                  removed: false,
+                  topics: [
+                    '0x8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925',
+                    '0x0000000000000000000000001231deb6f5749ef6ce6943a275a1d3e7486f4eae',
+                    '0x00000000000000000000000012dc9256acc9895b076f6638d628382881e62cee',
+                  ],
+                  transactionHash:
+                    '0xe12fee9d2d73550236d233e8c541cee3237d7e9dc8085cd576d620fca1b659b7',
+                  transactionIndex: '0x5',
+                },
+                {
+                  address: '0x197d1333dea5fe0d6600e9b396c7f1b1cfcc558a',
+                  blockHash:
+                    '0x158b659f69b0d465b88ad768147057f9c8dc01ae0631e88b04d9406a19fcc9f6',
+                  blockNumber: '0x324d0fb',
+                  data: '0x00000000000000000000000090e595783e43eb89ff07f63d27b8430e6b44bd9c000000000000000000000000000000000000000000000000001445775143bee0',
+                  logIndex: '0x31',
+                  removed: false,
+                  topics: [
+                    '0x61ed099e74a97a1d7f8bb0952a88ca8b7b8ebd00c126ea04671f92a81213318a',
+                  ],
+                  transactionHash:
+                    '0xe12fee9d2d73550236d233e8c541cee3237d7e9dc8085cd576d620fca1b659b7',
+                  transactionIndex: '0x5',
+                },
+                {
+                  address: '0x197d1333dea5fe0d6600e9b396c7f1b1cfcc558a',
+                  blockHash:
+                    '0x158b659f69b0d465b88ad768147057f9c8dc01ae0631e88b04d9406a19fcc9f6',
+                  blockNumber: '0x324d0fb',
+                  data: '0x000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000c000000000000000000000000000000000000000000000000000000000000000e00000000000000000000000000000000000000000000000000000000000000002000000000000000000000000252b234545e154543ad2784c7111eb90406be836000000000000000000000000a59ba433ac34d2927232918ef5b2eaafcf130ba500000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000216a34c6bba2f000000000000000000000000000000000000000000000000000216a34c6bba2f',
+                  logIndex: '0x32',
+                  removed: false,
+                  topics: [
+                    '0x07ea52d82345d6e838192107d8fd7123d9c2ec8e916cd0aad13fd2b60db24644',
+                  ],
+                  transactionHash:
+                    '0xe12fee9d2d73550236d233e8c541cee3237d7e9dc8085cd576d620fca1b659b7',
+                  transactionIndex: '0x5',
+                },
+                {
+                  address: '0x1a44076050125825900e736c501f859c50fe728c',
+                  blockHash:
+                    '0x158b659f69b0d465b88ad768147057f9c8dc01ae0631e88b04d9406a19fcc9f6',
+                  blockNumber: '0x324d0fb',
+                  data: '0x00000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000380000000000000000000000000197d1333dea5fe0d6600e9b396c7f1b1cfcc558a00000000000000000000000000000000000000000000000000000000000002fc010000000000001eb30000759a00000000000000000000000017e450be3ba9557f2378e20d64ad417e59ef9a340000759e00000000000000000000000019cfce47ed54a88614648dc3f19a5980097007dd0a668d7b26be67905413d7478cff17283cd09f3076ec95fd14469766b9ec837f0100020000000000000000000000001493e7b8d4dfade0a178dad9335470337a3a219a0000000000280dcf0000000000000000000000001231deb6f5749ef6ce6943a275a1d3e7486f4eae49edb1f86374f25f25bba1abda983a1ba299a1f4072203a477122ab74befd0000000000000000000000000000000000000000000000000000000000000000060000000000000000000000000c5fe6ef47965741f6f7a4734bf784bf3ae3f245200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000020000000000000000000000000111111125421ca6dc452d289314280a0f8842a65000000000000000000000000111111125421ca6dc452d289314280a0f8842a65000000000000000000000000fd086bc7cd5c481dcc9c85ebe478a1c0b69fcbb90000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000027a78600000000000000000000000000000000000000000000000000000000000000e00000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000008883800a8e000000000000000000000000fd086bc7cd5c481dcc9c85ebe478a1c0b69fcbb9000000000000000000000000000000000000000000000000000000000027a78600000000000000000000000000000000000000000000000000036f3c9b851bf338000000000000000000000042161084d0672e1d3f26a9b53e653be2084ff19c2a94d11400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002c000301001101000000000000000000000000000249f0010013030000000000000000000000000000003037c00000000000000000000000000000000000000000',
+                  logIndex: '0x33',
+                  removed: false,
+                  topics: [
+                    '0x1ab700d4ced0c005b164c0f789fd09fcbb0156d4c2041b8a3bfbcd961cd1567f',
+                  ],
+                  transactionHash:
+                    '0xe12fee9d2d73550236d233e8c541cee3237d7e9dc8085cd576d620fca1b659b7',
+                  transactionIndex: '0x5',
+                },
+                {
+                  address: '0x12dc9256acc9895b076f6638d628382881e62cee',
+                  blockHash:
+                    '0x158b659f69b0d465b88ad768147057f9c8dc01ae0631e88b04d9406a19fcc9f6',
+                  blockNumber: '0x324d0fb',
+                  data: '0x000000000000000000000000000000000000000000000000000000000000759e0000000000000000000000000000000000000000000000000000000000281d370000000000000000000000000000000000000000000000000000000000280dcf',
+                  logIndex: '0x34',
+                  removed: false,
+                  topics: [
+                    '0x85496b760a4b7f8d66384b9df21b381f5d1b1e79f229a47aaf4c232edc2fe59a',
+                    '0x0a668d7b26be67905413d7478cff17283cd09f3076ec95fd14469766b9ec837f',
+                    '0x0000000000000000000000001231deb6f5749ef6ce6943a275a1d3e7486f4eae',
+                  ],
+                  transactionHash:
+                    '0xe12fee9d2d73550236d233e8c541cee3237d7e9dc8085cd576d620fca1b659b7',
+                  transactionIndex: '0x5',
+                },
+                {
+                  address: '0x1231deb6f5749ef6ce6943a275a1d3e7486f4eae',
+                  blockHash:
+                    '0x158b659f69b0d465b88ad768147057f9c8dc01ae0631e88b04d9406a19fcc9f6',
+                  blockNumber: '0x324d0fb',
+                  data: '0x000000000000000000000000000000000000000000000000000000000000002049edb1f86374f25f25bba1abda983a1ba299a1f4072203a477122ab74befd0000000000000000000000000000000000000000000000000000000000000000140000000000000000000000000000000000000000000000000000000000000018000000000000000000000000000000000000000000000000000000000000000000000000000000000000000009702230a8ea53601f5cd2dc00fdbc13d4df4a8c7000000000000000000000000c5fe6ef47965741f6f7a4734bf784bf3ae3f24520000000000000000000000000000000000000000000000000000000000281d37000000000000000000000000000000000000000000000000000000000000a4b100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000a7374617267617465563200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000f6d6574616d61736b2d6272696467650000000000000000000000000000000000',
+                  logIndex: '0x35',
+                  removed: false,
+                  topics: [
+                    '0xcba69f43792f9f399347222505213b55af8e0b0b54b893085c2e27ecbe1644f1',
+                  ],
+                  transactionHash:
+                    '0xe12fee9d2d73550236d233e8c541cee3237d7e9dc8085cd576d620fca1b659b7',
+                  transactionIndex: '0x5',
+                },
+                {
+                  address: '0xf3e6bb4227c0040e0e274388269ee3cec1de8447',
+                  blockHash:
+                    '0x158b659f69b0d465b88ad768147057f9c8dc01ae0631e88b04d9406a19fcc9f6',
+                  blockNumber: '0x324d0fb',
+                  data: '0x000000000000000000000000c5fe6ef47965741f6f7a4734bf784bf3ae3f24520000000000000000000000001231deb6f5749ef6ce6943a275a1d3e7486f4eae000000000000000000000000000000000000000000000000000000000000a4b100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000016029a98d5c5000',
+                  logIndex: '0x36',
+                  removed: false,
+                  topics: [
+                    '0x831bac9533a2034226daa21109dbd4f887674f0fe4877e1a8b35b3ffe1bdce76',
+                  ],
+                  transactionHash:
+                    '0xe12fee9d2d73550236d233e8c541cee3237d7e9dc8085cd576d620fca1b659b7',
+                  transactionIndex: '0x5',
+                },
+              ],
+              logsBloom:
+                '0x00200002000000000000000080600000000000000000000020000000001000000000000004000000004004000002008000000000100000000000000000200080000082000000002000000008000000200004000000000010000004008000000004000000804008008000000000000001002000022010000000000014000000000000020808000000000000080000000000000011000000080004005000000008060081028000000080100040080000000000000000400000004540002000000008081022002008000000000080000000800000000000001000000000000000000010040000000000000000800000002008000400018004420800000000000000',
+              status: '0x1',
+              to: '0x29106d08382d3c73bf477a94333c61db1142e1b6',
+              transactionHash:
+                '0xe12fee9d2d73550236d233e8c541cee3237d7e9dc8085cd576d620fca1b659b7',
+              transactionIndex: '0x5',
+              type: '0x2',
+            },
+          },
+        ],
+      ],
+      r: '0xfd3ca699de97aabaefb3b5c51dea239efaf3c01aa65be1a2fa5d4e1931eba1e8',
+      s: '0x5c63a89126570ccb0a1ac39bde25c56c20c76fcf4c94fd61588989eb05f723ad',
+      v: '0x0',
+      rawTx:
+        '0x02f90afd82a86a078477359400850a5c681d00830bcdae9429106d08382d3c73bf477a94333c61db1142e1b688017bb83647a5333eb90a853ce33bff00000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000017bb83647a5333e00000000000000000000000000000000000000000000000000000000000000c0000000000000000000000000000000000000000000000000000000000000000d6c6966694164617074657256320000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000009600000000000000000000000001231deb6f5749ef6ce6943a275a1d3e7486f4eae0000000000000000000000001231deb6f5749ef6ce6943a275a1d3e7486f4eae000000000000000000000000000000000000000000000000000000000000a4b100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000016029a98d5c5000000000000000000000000000000000000000000000000000000000000000014000000000000000000000000000000000000000000000000000031bced02db00000000000000000000000000068e21357555a15cd9df624f3bfb7aed0eae167e90000000000000000000000000000000000000000000000000000000000000804a6010a660000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000022000000000000000000000000000000000000000000000000000000000000003c049edb1f86374f25f25bba1abda983a1ba299a1f4072203a477122ab74befd0000000000000000000000000000000000000000000000000000000000000000140000000000000000000000000000000000000000000000000000000000000018000000000000000000000000000000000000000000000000000000000000000000000000000000000000000009702230a8ea53601f5cd2dc00fdbc13d4df4a8c7000000000000000000000000c5fe6ef47965741f6f7a4734bf784bf3ae3f2452000000000000000000000000000000000000000000000000000000000027e9de000000000000000000000000000000000000000000000000000000000000a4b100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000a7374617267617465563200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000f6d6574616d61736b2d627269646765000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000020000000000000000000000000111111125421ca6dc452d289314280a0f8842a65000000000000000000000000111111125421ca6dc452d289314280a0f8842a6500000000000000000000000000000000000000000000000000000000000000000000000000000000000000009702230a8ea53601f5cd2dc00fdbc13d4df4a8c7000000000000000000000000000000000000000000000000016029a98d5c500000000000000000000000000000000000000000000000000000000000000000e000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000048a76dfc3b000000000000000000000000000000000000000000000000000000000027e9de00000000000000003b6d0340e3ba3d5e3f98eeff5e9eddd5bd20e476202770da2a94d114000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000000000000000000000000000001872bdea1b333e0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000c5fe6ef47965741f6f7a4734bf784bf3ae3f2452000000000000000000000000000000000000000000000000000000000000759e0000000000000000000000001493e7b8d4dfade0a178dad9335470337a3a219a000000000000000000000000000000000000000000000000000000000027e9de000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000e00000000000000000000000000000000000000000000000000000000000000120000000000000000000000000000000000000000000000000000000000000038000000000000000000000000000000000000000000000000000000000000000180003010013030000000000000000000000000000003037c00000000000000000000000000000000000000000000000000000000000000000000000000000024049edb1f86374f25f25bba1abda983a1ba299a1f4072203a477122ab74befd0000000000000000000000000000000000000000000000000000000000000000060000000000000000000000000c5fe6ef47965741f6f7a4734bf784bf3ae3f245200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000020000000000000000000000000111111125421ca6dc452d289314280a0f8842a65000000000000000000000000111111125421ca6dc452d289314280a0f8842a65000000000000000000000000fd086bc7cd5c481dcc9c85ebe478a1c0b69fcbb90000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000027a78600000000000000000000000000000000000000000000000000000000000000e00000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000008883800a8e000000000000000000000000fd086bc7cd5c481dcc9c85ebe478a1c0b69fcbb9000000000000000000000000000000000000000000000000000000000027a78600000000000000000000000000000000000000000000000000036f3c9b851bf338000000000000000000000042161084d0672e1d3f26a9b53e653be2084ff19c2a94d114000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000505b476320219f1b44f1f2f21b17912641058e450ba4b94381cc082ec1c42c9d717e9ffa7b6bb9231fcddae65bf8e3bbcf0f9b5d7720347c2337670b2681b00b1bc080a0fd3ca699de97aabaefb3b5c51dea239efaf3c01aa65be1a2fa5d4e1931eba1e8a05c63a89126570ccb0a1ac39bde25c56c20c76fcf4c94fd61588989eb05f723ad',
+      gasFeeEstimates: {
+        type: 'fee-market',
+        low: {
+          maxFeePerGas: '0x60db88400',
+          maxPriorityFeePerGas: '0x3b9aca00',
+        },
+        medium: {
+          maxFeePerGas: '0x835105080',
+          maxPriorityFeePerGas: '0x59682f00',
+        },
+        high: {
+          maxFeePerGas: '0xa5c681d00',
+          maxPriorityFeePerGas: '0x77359400',
+        },
+      },
+      gasFeeEstimatesLoaded: true,
+      hash: '0xe12fee9d2d73550236d233e8c541cee3237d7e9dc8085cd576d620fca1b659b7',
+      submittedTime: 1730925261525,
+      baseFeePerGas: '0x5d21dba00',
+      blockTimestamp: '0x672bd2cd',
+      txReceipt: {
+        blockHash:
+          '0x158b659f69b0d465b88ad768147057f9c8dc01ae0631e88b04d9406a19fcc9f6',
+        blockNumber: '0x324d0fb',
+        contractAddress: null,
+        cumulativeGasUsed: '0x160ccc',
+        effectiveGasPrice: '0x649534e00',
+        from: '0xc5fe6ef47965741f6f7a4734bf784bf3ae3f2452',
+        gasUsed: '0xa1211',
+        logs: [
+          {
+            address: '0x68e21357555a15cd9df624f3bfb7aed0eae167e9',
+            blockHash:
+              '0x158b659f69b0d465b88ad768147057f9c8dc01ae0631e88b04d9406a19fcc9f6',
+            blockNumber: '0x324d0fb',
+            data: '0x00000000000000000000000000000000000000000000000000031bced02db000',
+            logIndex: '0x27',
+            removed: false,
+            topics: [
+              '0x3d0ce9bfc3ed7d6862dbb28b2dea94561fe714a1b4d019aa8af39730d1ad7c3d',
+              '0x000000000000000000000000f3e6bb4227c0040e0e274388269ee3cec1de8447',
+            ],
+            transactionHash:
+              '0xe12fee9d2d73550236d233e8c541cee3237d7e9dc8085cd576d620fca1b659b7',
+            transactionIndex: '0x5',
+          },
+          {
+            address: '0xf3e6bb4227c0040e0e274388269ee3cec1de8447',
+            blockHash:
+              '0x158b659f69b0d465b88ad768147057f9c8dc01ae0631e88b04d9406a19fcc9f6',
+            blockNumber: '0x324d0fb',
+            data: '0x000000000000000000000000000000000000000000000000000000000000000000000000000000000000000068e21357555a15cd9df624f3bfb7aed0eae167e900000000000000000000000000000000000000000000000000031bced02db000',
+            logIndex: '0x28',
+            removed: false,
+            topics: [
+              '0x6ded982279c8387ad8a63e73385031a3807c1862e633f06e09d11bcb6e282f60',
+            ],
+            transactionHash:
+              '0xe12fee9d2d73550236d233e8c541cee3237d7e9dc8085cd576d620fca1b659b7',
+            transactionIndex: '0x5',
+          },
+          {
+            address: '0xb31f66aa3c1e785363f0875a1b74e27b85fd66c7',
+            blockHash:
+              '0x158b659f69b0d465b88ad768147057f9c8dc01ae0631e88b04d9406a19fcc9f6',
+            blockNumber: '0x324d0fb',
+            data: '0x000000000000000000000000000000000000000000000000016029a98d5c5000',
+            logIndex: '0x29',
+            removed: false,
+            topics: [
+              '0xe1fffcc4923d04b559f4d29a8bfc6cda04eb5b0d3c460751c2402c5c5cc9109c',
+              '0x000000000000000000000000111111125421ca6dc452d289314280a0f8842a65',
+            ],
+            transactionHash:
+              '0xe12fee9d2d73550236d233e8c541cee3237d7e9dc8085cd576d620fca1b659b7',
+            transactionIndex: '0x5',
+          },
+          {
+            address: '0xb31f66aa3c1e785363f0875a1b74e27b85fd66c7',
+            blockHash:
+              '0x158b659f69b0d465b88ad768147057f9c8dc01ae0631e88b04d9406a19fcc9f6',
+            blockNumber: '0x324d0fb',
+            data: '0x000000000000000000000000000000000000000000000000016029a98d5c5000',
+            logIndex: '0x2a',
+            removed: false,
+            topics: [
+              '0xddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef',
+              '0x000000000000000000000000111111125421ca6dc452d289314280a0f8842a65',
+              '0x000000000000000000000000e3ba3d5e3f98eeff5e9eddd5bd20e476202770da',
+            ],
+            transactionHash:
+              '0xe12fee9d2d73550236d233e8c541cee3237d7e9dc8085cd576d620fca1b659b7',
+            transactionIndex: '0x5',
+          },
+          {
+            address: '0x9702230a8ea53601f5cd2dc00fdbc13d4df4a8c7',
+            blockHash:
+              '0x158b659f69b0d465b88ad768147057f9c8dc01ae0631e88b04d9406a19fcc9f6',
+            blockNumber: '0x324d0fb',
+            data: '0x0000000000000000000000000000000000000000000000000000000000281d37',
+            logIndex: '0x2b',
+            removed: false,
+            topics: [
+              '0xddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef',
+              '0x000000000000000000000000e3ba3d5e3f98eeff5e9eddd5bd20e476202770da',
+              '0x0000000000000000000000001231deb6f5749ef6ce6943a275a1d3e7486f4eae',
+            ],
+            transactionHash:
+              '0xe12fee9d2d73550236d233e8c541cee3237d7e9dc8085cd576d620fca1b659b7',
+            transactionIndex: '0x5',
+          },
+          {
+            address: '0xe3ba3d5e3f98eeff5e9eddd5bd20e476202770da',
+            blockHash:
+              '0x158b659f69b0d465b88ad768147057f9c8dc01ae0631e88b04d9406a19fcc9f6',
+            blockNumber: '0x324d0fb',
+            data: '0x0000000000000000000000000000000000000000000000000000000ee03b968f00000000000000000000000000000000000000000000008235a12766ecdf66da',
+            logIndex: '0x2c',
+            removed: false,
+            topics: [
+              '0x1c411e9a96e071241c2f21f7726b17ae89e3cab4c78be50e062b03a9fffbbad1',
+            ],
+            transactionHash:
+              '0xe12fee9d2d73550236d233e8c541cee3237d7e9dc8085cd576d620fca1b659b7',
+            transactionIndex: '0x5',
+          },
+          {
+            address: '0xe3ba3d5e3f98eeff5e9eddd5bd20e476202770da',
+            blockHash:
+              '0x158b659f69b0d465b88ad768147057f9c8dc01ae0631e88b04d9406a19fcc9f6',
+            blockNumber: '0x324d0fb',
+            data: '0x0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000016029a98d5c50000000000000000000000000000000000000000000000000000000000000281d370000000000000000000000000000000000000000000000000000000000000000',
+            logIndex: '0x2d',
+            removed: false,
+            topics: [
+              '0xd78ad95fa46c994b6551d0da85fc275fe613ce37657fb8d5e3d130840159d822',
+              '0x000000000000000000000000111111125421ca6dc452d289314280a0f8842a65',
+              '0x0000000000000000000000001231deb6f5749ef6ce6943a275a1d3e7486f4eae',
+            ],
+            transactionHash:
+              '0xe12fee9d2d73550236d233e8c541cee3237d7e9dc8085cd576d620fca1b659b7',
+            transactionIndex: '0x5',
+          },
+          {
+            address: '0x1231deb6f5749ef6ce6943a275a1d3e7486f4eae',
+            blockHash:
+              '0x158b659f69b0d465b88ad768147057f9c8dc01ae0631e88b04d9406a19fcc9f6',
+            blockNumber: '0x324d0fb',
+            data: '0x49edb1f86374f25f25bba1abda983a1ba299a1f4072203a477122ab74befd000000000000000000000000000111111125421ca6dc452d289314280a0f8842a6500000000000000000000000000000000000000000000000000000000000000000000000000000000000000009702230a8ea53601f5cd2dc00fdbc13d4df4a8c7000000000000000000000000000000000000000000000000016029a98d5c50000000000000000000000000000000000000000000000000000000000000281d3700000000000000000000000000000000000000000000000000000000672bd2cd',
+            logIndex: '0x2e',
+            removed: false,
+            topics: [
+              '0x7bfdfdb5e3a3776976e53cb0607060f54c5312701c8cba1155cc4d5394440b38',
+            ],
+            transactionHash:
+              '0xe12fee9d2d73550236d233e8c541cee3237d7e9dc8085cd576d620fca1b659b7',
+            transactionIndex: '0x5',
+          },
+          {
+            address: '0x9702230a8ea53601f5cd2dc00fdbc13d4df4a8c7',
+            blockHash:
+              '0x158b659f69b0d465b88ad768147057f9c8dc01ae0631e88b04d9406a19fcc9f6',
+            blockNumber: '0x324d0fb',
+            data: '0x0000000000000000000000000000000000000000000000000000000000281d37',
+            logIndex: '0x2f',
+            removed: false,
+            topics: [
+              '0xddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef',
+              '0x0000000000000000000000001231deb6f5749ef6ce6943a275a1d3e7486f4eae',
+              '0x00000000000000000000000012dc9256acc9895b076f6638d628382881e62cee',
+            ],
+            transactionHash:
+              '0xe12fee9d2d73550236d233e8c541cee3237d7e9dc8085cd576d620fca1b659b7',
+            transactionIndex: '0x5',
+          },
+          {
+            address: '0x9702230a8ea53601f5cd2dc00fdbc13d4df4a8c7',
+            blockHash:
+              '0x158b659f69b0d465b88ad768147057f9c8dc01ae0631e88b04d9406a19fcc9f6',
+            blockNumber: '0x324d0fb',
+            data: '0xffffffffffffffffffffffffffffffffffffffffffffffffffffff55e55aa213',
+            logIndex: '0x30',
+            removed: false,
+            topics: [
+              '0x8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925',
+              '0x0000000000000000000000001231deb6f5749ef6ce6943a275a1d3e7486f4eae',
+              '0x00000000000000000000000012dc9256acc9895b076f6638d628382881e62cee',
+            ],
+            transactionHash:
+              '0xe12fee9d2d73550236d233e8c541cee3237d7e9dc8085cd576d620fca1b659b7',
+            transactionIndex: '0x5',
+          },
+          {
+            address: '0x197d1333dea5fe0d6600e9b396c7f1b1cfcc558a',
+            blockHash:
+              '0x158b659f69b0d465b88ad768147057f9c8dc01ae0631e88b04d9406a19fcc9f6',
+            blockNumber: '0x324d0fb',
+            data: '0x00000000000000000000000090e595783e43eb89ff07f63d27b8430e6b44bd9c000000000000000000000000000000000000000000000000001445775143bee0',
+            logIndex: '0x31',
+            removed: false,
+            topics: [
+              '0x61ed099e74a97a1d7f8bb0952a88ca8b7b8ebd00c126ea04671f92a81213318a',
+            ],
+            transactionHash:
+              '0xe12fee9d2d73550236d233e8c541cee3237d7e9dc8085cd576d620fca1b659b7',
+            transactionIndex: '0x5',
+          },
+          {
+            address: '0x197d1333dea5fe0d6600e9b396c7f1b1cfcc558a',
+            blockHash:
+              '0x158b659f69b0d465b88ad768147057f9c8dc01ae0631e88b04d9406a19fcc9f6',
+            blockNumber: '0x324d0fb',
+            data: '0x000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000c000000000000000000000000000000000000000000000000000000000000000e00000000000000000000000000000000000000000000000000000000000000002000000000000000000000000252b234545e154543ad2784c7111eb90406be836000000000000000000000000a59ba433ac34d2927232918ef5b2eaafcf130ba500000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000216a34c6bba2f000000000000000000000000000000000000000000000000000216a34c6bba2f',
+            logIndex: '0x32',
+            removed: false,
+            topics: [
+              '0x07ea52d82345d6e838192107d8fd7123d9c2ec8e916cd0aad13fd2b60db24644',
+            ],
+            transactionHash:
+              '0xe12fee9d2d73550236d233e8c541cee3237d7e9dc8085cd576d620fca1b659b7',
+            transactionIndex: '0x5',
+          },
+          {
+            address: '0x1a44076050125825900e736c501f859c50fe728c',
+            blockHash:
+              '0x158b659f69b0d465b88ad768147057f9c8dc01ae0631e88b04d9406a19fcc9f6',
+            blockNumber: '0x324d0fb',
+            data: '0x00000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000380000000000000000000000000197d1333dea5fe0d6600e9b396c7f1b1cfcc558a00000000000000000000000000000000000000000000000000000000000002fc010000000000001eb30000759a00000000000000000000000017e450be3ba9557f2378e20d64ad417e59ef9a340000759e00000000000000000000000019cfce47ed54a88614648dc3f19a5980097007dd0a668d7b26be67905413d7478cff17283cd09f3076ec95fd14469766b9ec837f0100020000000000000000000000001493e7b8d4dfade0a178dad9335470337a3a219a0000000000280dcf0000000000000000000000001231deb6f5749ef6ce6943a275a1d3e7486f4eae49edb1f86374f25f25bba1abda983a1ba299a1f4072203a477122ab74befd0000000000000000000000000000000000000000000000000000000000000000060000000000000000000000000c5fe6ef47965741f6f7a4734bf784bf3ae3f245200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000020000000000000000000000000111111125421ca6dc452d289314280a0f8842a65000000000000000000000000111111125421ca6dc452d289314280a0f8842a65000000000000000000000000fd086bc7cd5c481dcc9c85ebe478a1c0b69fcbb90000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000027a78600000000000000000000000000000000000000000000000000000000000000e00000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000008883800a8e000000000000000000000000fd086bc7cd5c481dcc9c85ebe478a1c0b69fcbb9000000000000000000000000000000000000000000000000000000000027a78600000000000000000000000000000000000000000000000000036f3c9b851bf338000000000000000000000042161084d0672e1d3f26a9b53e653be2084ff19c2a94d11400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002c000301001101000000000000000000000000000249f0010013030000000000000000000000000000003037c00000000000000000000000000000000000000000',
+            logIndex: '0x33',
+            removed: false,
+            topics: [
+              '0x1ab700d4ced0c005b164c0f789fd09fcbb0156d4c2041b8a3bfbcd961cd1567f',
+            ],
+            transactionHash:
+              '0xe12fee9d2d73550236d233e8c541cee3237d7e9dc8085cd576d620fca1b659b7',
+            transactionIndex: '0x5',
+          },
+          {
+            address: '0x12dc9256acc9895b076f6638d628382881e62cee',
+            blockHash:
+              '0x158b659f69b0d465b88ad768147057f9c8dc01ae0631e88b04d9406a19fcc9f6',
+            blockNumber: '0x324d0fb',
+            data: '0x000000000000000000000000000000000000000000000000000000000000759e0000000000000000000000000000000000000000000000000000000000281d370000000000000000000000000000000000000000000000000000000000280dcf',
+            logIndex: '0x34',
+            removed: false,
+            topics: [
+              '0x85496b760a4b7f8d66384b9df21b381f5d1b1e79f229a47aaf4c232edc2fe59a',
+              '0x0a668d7b26be67905413d7478cff17283cd09f3076ec95fd14469766b9ec837f',
+              '0x0000000000000000000000001231deb6f5749ef6ce6943a275a1d3e7486f4eae',
+            ],
+            transactionHash:
+              '0xe12fee9d2d73550236d233e8c541cee3237d7e9dc8085cd576d620fca1b659b7',
+            transactionIndex: '0x5',
+          },
+          {
+            address: '0x1231deb6f5749ef6ce6943a275a1d3e7486f4eae',
+            blockHash:
+              '0x158b659f69b0d465b88ad768147057f9c8dc01ae0631e88b04d9406a19fcc9f6',
+            blockNumber: '0x324d0fb',
+            data: '0x000000000000000000000000000000000000000000000000000000000000002049edb1f86374f25f25bba1abda983a1ba299a1f4072203a477122ab74befd0000000000000000000000000000000000000000000000000000000000000000140000000000000000000000000000000000000000000000000000000000000018000000000000000000000000000000000000000000000000000000000000000000000000000000000000000009702230a8ea53601f5cd2dc00fdbc13d4df4a8c7000000000000000000000000c5fe6ef47965741f6f7a4734bf784bf3ae3f24520000000000000000000000000000000000000000000000000000000000281d37000000000000000000000000000000000000000000000000000000000000a4b100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000a7374617267617465563200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000f6d6574616d61736b2d6272696467650000000000000000000000000000000000',
+            logIndex: '0x35',
+            removed: false,
+            topics: [
+              '0xcba69f43792f9f399347222505213b55af8e0b0b54b893085c2e27ecbe1644f1',
+            ],
+            transactionHash:
+              '0xe12fee9d2d73550236d233e8c541cee3237d7e9dc8085cd576d620fca1b659b7',
+            transactionIndex: '0x5',
+          },
+          {
+            address: '0xf3e6bb4227c0040e0e274388269ee3cec1de8447',
+            blockHash:
+              '0x158b659f69b0d465b88ad768147057f9c8dc01ae0631e88b04d9406a19fcc9f6',
+            blockNumber: '0x324d0fb',
+            data: '0x000000000000000000000000c5fe6ef47965741f6f7a4734bf784bf3ae3f24520000000000000000000000001231deb6f5749ef6ce6943a275a1d3e7486f4eae000000000000000000000000000000000000000000000000000000000000a4b100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000016029a98d5c5000',
+            logIndex: '0x36',
+            removed: false,
+            topics: [
+              '0x831bac9533a2034226daa21109dbd4f887674f0fe4877e1a8b35b3ffe1bdce76',
+            ],
+            transactionHash:
+              '0xe12fee9d2d73550236d233e8c541cee3237d7e9dc8085cd576d620fca1b659b7',
+            transactionIndex: '0x5',
+          },
+        ],
+        logsBloom:
+          '0x00200002000000000000000080600000000000000000000020000000001000000000000004000000004004000002008000000000100000000000000000200080000082000000002000000008000000200004000000000010000004008000000004000000804008008000000000000001002000022010000000000014000000000000020808000000000000080000000000000011000000080004005000000008060081028000000080100040080000000000000000400000004540002000000008081022002008000000000080000000800000000000001000000000000000000010040000000000000000800000002008000400018004420800000000000000',
+        status: '0x1',
+        to: '0x29106d08382d3c73bf477a94333c61db1142e1b6',
+        transactionHash:
+          '0xe12fee9d2d73550236d233e8c541cee3237d7e9dc8085cd576d620fca1b659b7',
+        transactionIndex: '0x5',
+        type: '0x2',
+      },
+    },
+  },
+  step1Long: {
+    bridgeHistoryItem: {
+      quote: {
+        requestId: '8d46a335-a67d-4583-993e-eab0e22e16f4',
+        srcChainId: 42161,
+        srcTokenAmount: '991250000000000',
+        srcAsset: {
+          address: '0x0000000000000000000000000000000000000000',
+          chainId: 42161,
+          symbol: 'ETH',
+          decimals: 18,
+          name: 'ETH',
+          coinKey: 'ETH',
+          logoURI:
+            'https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/ethereum/assets/0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2/logo.png',
+          priceUSD: '2672.2',
+          icon: 'https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/ethereum/assets/0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2/logo.png',
+        },
+        destChainId: 43114,
+        destTokenAmount: '99073691907804692',
+        destAsset: {
+          address: '0x0000000000000000000000000000000000000000',
+          chainId: 43114,
+          symbol: 'AVAX',
+          decimals: 18,
+          name: 'AVAX',
+          coinKey: 'AVAX',
+          logoURI:
+            'https://static.debank.com/image/avax_token/logo_url/avax/0b9c84359c84d6bdd5bfda9c2d4c4a82.png',
+          priceUSD: '26.51',
+          icon: 'https://static.debank.com/image/avax_token/logo_url/avax/0b9c84359c84d6bdd5bfda9c2d4c4a82.png',
+        },
+        feeData: {
+          metabridge: {
+            amount: '8750000000000',
+            asset: {
+              address: '0x0000000000000000000000000000000000000000',
+              chainId: 42161,
+              symbol: 'ETH',
+              decimals: 18,
+              name: 'ETH',
+              coinKey: 'ETH',
+              logoURI:
+                'https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/ethereum/assets/0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2/logo.png',
+              priceUSD: '2672.2',
+              icon: 'https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/ethereum/assets/0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2/logo.png',
+            },
+          },
+        },
+        bridgeId: 'lifi',
+        bridges: ['stargate'],
+        steps: [
+          {
+            action: 'swap',
+            srcChainId: 42161,
+            destChainId: 42161,
+            protocol: {
+              name: 'openocean',
+              displayName: 'OpenOcean',
+              icon: 'https://raw.githubusercontent.com/lifinance/types/main/src/assets/icons/exchanges/openocean.png',
+            },
+            srcAsset: {
+              address: '0x0000000000000000000000000000000000000000',
+              chainId: 42161,
+              symbol: 'ETH',
+              decimals: 18,
+              name: 'ETH',
+              coinKey: 'ETH',
+              logoURI:
+                'https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/ethereum/assets/0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2/logo.png',
+              priceUSD: '2672.2',
+              icon: 'https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/ethereum/assets/0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2/logo.png',
+            },
+            destAsset: {
+              address: '0xaf88d065e77c8cC2239327C5EDb3A432268e5831',
+              chainId: 42161,
+              symbol: 'USDC',
+              decimals: 6,
+              name: 'USD Coin',
+              coinKey: 'USDC',
+              logoURI:
+                'https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/ethereum/assets/0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48/logo.png',
+              priceUSD: '0.9990009990009991',
+              icon: 'https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/ethereum/assets/0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48/logo.png',
+            },
+            srcAmount: '991250000000000',
+            destAmount: '2656446',
+          },
+          {
+            action: 'bridge',
+            srcChainId: 42161,
+            destChainId: 43114,
+            protocol: {
+              name: 'stargate',
+              displayName: 'StargateV2 (Fast mode)',
+              icon: 'https://raw.githubusercontent.com/lifinance/types/5685c638772f533edad80fcb210b4bb89e30a50f/src/assets/icons/bridges/stargate.png',
+            },
+            srcAsset: {
+              address: '0xaf88d065e77c8cC2239327C5EDb3A432268e5831',
+              chainId: 42161,
+              symbol: 'USDC',
+              decimals: 6,
+              name: 'USD Coin',
+              coinKey: 'USDC',
+              logoURI:
+                'https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/ethereum/assets/0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48/logo.png',
+              priceUSD: '0.9990009990009991',
+              icon: 'https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/ethereum/assets/0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48/logo.png',
+            },
+            destAsset: {
+              address: '0xB97EF9Ef8734C71904D8002F8b6Bc66Dd9c48a6E',
+              chainId: 43114,
+              symbol: 'USDC',
+              decimals: 6,
+              name: 'USD Coin',
+              coinKey: 'USDC',
+              logoURI:
+                'https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/ethereum/assets/0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48/logo.png',
+              priceUSD: '0.9990009990009991',
+              icon: 'https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/ethereum/assets/0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48/logo.png',
+            },
+            srcAmount: '2656446',
+            destAmount: '2655659',
+          },
+          {
+            action: 'swap',
+            srcChainId: 43114,
+            destChainId: 43114,
+            protocol: {
+              name: '1inch',
+              displayName: '1inch',
+              icon: 'https://raw.githubusercontent.com/lifinance/types/main/src/assets/icons/exchanges/oneinch.png',
+            },
+            srcAsset: {
+              address: '0xB97EF9Ef8734C71904D8002F8b6Bc66Dd9c48a6E',
+              chainId: 43114,
+              symbol: 'USDC',
+              decimals: 6,
+              name: 'USD Coin',
+              coinKey: 'USDC',
+              logoURI:
+                'https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/ethereum/assets/0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48/logo.png',
+              priceUSD: '0.9990009990009991',
+              icon: 'https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/ethereum/assets/0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48/logo.png',
+            },
+            destAsset: {
+              address: '0x0000000000000000000000000000000000000000',
+              chainId: 43114,
+              symbol: 'AVAX',
+              decimals: 18,
+              name: 'AVAX',
+              coinKey: 'AVAX',
+              logoURI:
+                'https://static.debank.com/image/avax_token/logo_url/avax/0b9c84359c84d6bdd5bfda9c2d4c4a82.png',
+              priceUSD: '26.51',
+              icon: 'https://static.debank.com/image/avax_token/logo_url/avax/0b9c84359c84d6bdd5bfda9c2d4c4a82.png',
+            },
+            srcAmount: '2642380',
+            destAmount: '99073691907804692',
+          },
+        ],
+      },
+      startTime: 1730926316058,
+      estimatedProcessingTimeInSeconds: 105,
+      slippagePercentage: 0,
+      targetContractAddress: '0x23981fc34e69eedfe2bd9a0a9fcb0719fe09dbfc',
+      account: '0xc5fe6ef47965741f6f7a4734bf784bf3ae3f2452',
+      status: {
+        status: 'PENDING',
+        srcChain: {
+          chainId: 42161,
+          txHash:
+            '0x010e1bffe8288956012e6b6132d7eb3eaf9d0bbf066bd13aae13b973c678508f',
+          amount: '991250000000000',
+          token: {
+            address: '0x0000000000000000000000000000000000000000',
+            chainId: 42161,
+            symbol: 'ETH',
+            decimals: 18,
+            name: 'ETH',
+            coinKey: 'ETH',
+            logoURI:
+              'https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/ethereum/assets/0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2/logo.png',
+            priceUSD: '2672.2',
+            icon: 'https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/ethereum/assets/0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2/logo.png',
+          },
+        },
+        destChain: {
+          chainId: '43114',
+          token: {},
+        },
+      },
+    },
+    srcChainTxMeta: {
+      actionId: 1730926316049.0693,
+      chainId: '0xa4b1',
+      id: 'f583d7a0-9c80-11ef-929c-517d218027d6',
+      origin: 'metamask',
+      status: 'submitted',
+      time: 1730926316058,
+      txParams: {
+        from: '0xc5fe6ef47965741f6f7a4734bf784bf3ae3f2452',
+        data: '0x3ce33bff000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004b46d729a445900000000000000000000000000000000000000000000000000000000000000c0000000000000000000000000000000000000000000000000000000000000000d6c6966694164617074657256320000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000011800000000000000000000000001231deb6f5749ef6ce6943a275a1d3e7486f4eae0000000000000000000000001231deb6f5749ef6ce6943a275a1d3e7486f4eae000000000000000000000000000000000000000000000000000000000000a86a0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000038589602234000000000000000000000000000000000000000000000000000000000000000140000000000000000000000000000000000000000000000000000007f544a44c0000000000000000000000000056ca675c3633cc16bd6849e2b431d4e8de5e23bf0000000000000000000000000000000000000000000000000000000000001024a6010a66000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000002200000000000000000000000000000000000000000000000000000000000000be0eec104bed47120f58804c59125ae2572682610d39e80abc3838c99052db28275000000000000000000000000000000000000000000000000000000000000014000000000000000000000000000000000000000000000000000000000000001800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000af88d065e77c8cc2239327c5edb3a432268e5831000000000000000000000000c5fe6ef47965741f6f7a4734bf784bf3ae3f245200000000000000000000000000000000000000000000000000000000002854dc000000000000000000000000000000000000000000000000000000000000a86a00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000a7374617267617465563200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000f6d6574616d61736b2d6272696467650000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000200000000000000000000000006352a56caadc4f1e25cd6c75970fa768a3304e640000000000000000000000006352a56caadc4f1e25cd6c75970fa768a3304e640000000000000000000000000000000000000000000000000000000000000000000000000000000000000000af88d065e77c8cc2239327c5edb3a432268e5831000000000000000000000000000000000000000000000000000385896022340000000000000000000000000000000000000000000000000000000000000000e00000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000086490411a32000000000000000000000000f851d3d46237ec552a4c6e383a973115e781b1a5000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000001c0000000000000000000000000eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee000000000000000000000000af88d065e77c8cc2239327c5edb3a432268e5831000000000000000000000000f851d3d46237ec552a4c6e383a973115e781b1a50000000000000000000000001231deb6f5749ef6ce6943a275a1d3e7486f4eae0000000000000000000000000000000000000000000000000003858960223400000000000000000000000000000000000000000000000000000000000028524100000000000000000000000000000000000000000000000000000000002886200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000933a06c631ed8b5e4f3848c91a1cfc45e5c7eab3000000000000000000000000000000000000000000000000000000000000014000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000001400000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000042000000000000000000000000082af49447d8a07e3bd95bd0d56f35241523fbab10000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000385896022340000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000004d0e30db00000000000000000000000000000000000000000000000000000000000000000000000000000000071cb8a26f2c4eb68288bcc2ebaba4f72b065f07600000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000001043eece7db000000000000000000000000f851d3d46237ec552a4c6e383a973115e781b1a5000000000000000000000000000000000000000000000000000385896022340000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000007fffffff00000000000000000000000000000000000000000000000000000000000000c000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000a7e848aca42d879ef06507fca0e7b33a0a63c1e00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000648a6a1e85000000000000000000000000af88d065e77c8cc2239327c5edb3a432268e5831000000000000000000000000353c1f0bc78fbbc245b3c93ef77b1dcc5b77d2a0000000000000000000000000000000000000000000000000000000000028862000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000001a49f865422000000000000000000000000af88d065e77c8cc2239327c5edb3a432268e583100000000000000000000000000000001000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000004400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000064d1660f99000000000000000000000000af88d065e77c8cc2239327c5edb3a432268e58310000000000000000000000001231deb6f5749ef6ce6943a275a1d3e7486f4eae0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000000000000000000000000000000126eecdd3c4590000000000000000000000000000000000000000000000000000000000000000000000000000000000000000c5fe6ef47965741f6f7a4734bf784bf3ae3f2452000000000000000000000000000000000000000000000000000000000000759a0000000000000000000000001493e7b8d4dfade0a178dad9335470337a3a219a0000000000000000000000000000000000000000000000000000000000285241000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000e000000000000000000000000000000000000000000000000000000000000001200000000000000000000000000000000000000000000000000000000000000380000000000000000000000000000000000000000000000000000000000000001800030100130300000000000000000000000000000008f11000000000000000000000000000000000000000000000000000000000000000000000000000000240eec104bed47120f58804c59125ae2572682610d39e80abc3838c99052db282750000000000000000000000000000000000000000000000000000000000000060000000000000000000000000c5fe6ef47965741f6f7a4734bf784bf3ae3f245200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000020000000000000000000000000111111125421ca6dc452d289314280a0f8842a65000000000000000000000000111111125421ca6dc452d289314280a0f8842a65000000000000000000000000b97ef9ef8734c71904d8002f8b6bc66dd9c48a6e0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000028190200000000000000000000000000000000000000000000000000000000000000e00000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000008883800a8e000000000000000000000000b97ef9ef8734c71904d8002f8b6bc66dd9c48a6e0000000000000000000000000000000000000000000000000000000000281902000000000000000000000000000000000000000000000000015c4b33745816ab18000000000000003b6d03400e0100ab771e9288e0aa97e11557e6654c3a96652a94d114000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000993b046fd255d06d2dd8b115d91923fdcc52bd60070f3bedce2fc45e7e8c6b7e4f1add057efd388c8a24d3eb0e6736cf87170452068cb12b7e09772463e1a5b71c',
+        gas: '0x1ceed0',
+        gasLimit: '0x1ceed0',
+        nonce: '0xc3',
+        to: '0x23981fc34e69eedfe2bd9a0a9fcb0719fe09dbfc',
+        value: '0x04b46d729a4459',
+        maxFeePerGas: '0x104d37c',
+        maxPriorityFeePerGas: '0x0',
+        type: '0x2',
+      },
+      userEditedGasLimit: false,
+      verifiedOnBlockchain: false,
+      type: 'bridge',
+      networkClientId: '1abbfb5d-ed75-4de7-8cff-694d863d8519',
+      defaultGasEstimates: {
+        gas: '0x1ceed0',
+        maxFeePerGas: '0x104d37c',
+        maxPriorityFeePerGas: '0x0',
+        estimateType: 'medium',
+      },
+      userFeeLevel: 'medium',
+      sendFlowHistory: [],
+      history: [
+        {
+          actionId: 1730926316049.0693,
+          chainId: '0xa4b1',
+          id: 'f583d7a0-9c80-11ef-929c-517d218027d6',
+          origin: 'metamask',
+          status: 'unapproved',
+          time: 1730926316058,
+          txParams: {
+            from: '0xc5fe6ef47965741f6f7a4734bf784bf3ae3f2452',
+            data: '0x3ce33bff000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004b46d729a445900000000000000000000000000000000000000000000000000000000000000c0000000000000000000000000000000000000000000000000000000000000000d6c6966694164617074657256320000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000011800000000000000000000000001231deb6f5749ef6ce6943a275a1d3e7486f4eae0000000000000000000000001231deb6f5749ef6ce6943a275a1d3e7486f4eae000000000000000000000000000000000000000000000000000000000000a86a0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000038589602234000000000000000000000000000000000000000000000000000000000000000140000000000000000000000000000000000000000000000000000007f544a44c0000000000000000000000000056ca675c3633cc16bd6849e2b431d4e8de5e23bf0000000000000000000000000000000000000000000000000000000000001024a6010a66000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000002200000000000000000000000000000000000000000000000000000000000000be0eec104bed47120f58804c59125ae2572682610d39e80abc3838c99052db28275000000000000000000000000000000000000000000000000000000000000014000000000000000000000000000000000000000000000000000000000000001800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000af88d065e77c8cc2239327c5edb3a432268e5831000000000000000000000000c5fe6ef47965741f6f7a4734bf784bf3ae3f245200000000000000000000000000000000000000000000000000000000002854dc000000000000000000000000000000000000000000000000000000000000a86a00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000a7374617267617465563200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000f6d6574616d61736b2d6272696467650000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000200000000000000000000000006352a56caadc4f1e25cd6c75970fa768a3304e640000000000000000000000006352a56caadc4f1e25cd6c75970fa768a3304e640000000000000000000000000000000000000000000000000000000000000000000000000000000000000000af88d065e77c8cc2239327c5edb3a432268e5831000000000000000000000000000000000000000000000000000385896022340000000000000000000000000000000000000000000000000000000000000000e00000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000086490411a32000000000000000000000000f851d3d46237ec552a4c6e383a973115e781b1a5000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000001c0000000000000000000000000eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee000000000000000000000000af88d065e77c8cc2239327c5edb3a432268e5831000000000000000000000000f851d3d46237ec552a4c6e383a973115e781b1a50000000000000000000000001231deb6f5749ef6ce6943a275a1d3e7486f4eae0000000000000000000000000000000000000000000000000003858960223400000000000000000000000000000000000000000000000000000000000028524100000000000000000000000000000000000000000000000000000000002886200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000933a06c631ed8b5e4f3848c91a1cfc45e5c7eab3000000000000000000000000000000000000000000000000000000000000014000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000001400000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000042000000000000000000000000082af49447d8a07e3bd95bd0d56f35241523fbab10000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000385896022340000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000004d0e30db00000000000000000000000000000000000000000000000000000000000000000000000000000000071cb8a26f2c4eb68288bcc2ebaba4f72b065f07600000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000001043eece7db000000000000000000000000f851d3d46237ec552a4c6e383a973115e781b1a5000000000000000000000000000000000000000000000000000385896022340000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000007fffffff00000000000000000000000000000000000000000000000000000000000000c000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000a7e848aca42d879ef06507fca0e7b33a0a63c1e00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000648a6a1e85000000000000000000000000af88d065e77c8cc2239327c5edb3a432268e5831000000000000000000000000353c1f0bc78fbbc245b3c93ef77b1dcc5b77d2a0000000000000000000000000000000000000000000000000000000000028862000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000001a49f865422000000000000000000000000af88d065e77c8cc2239327c5edb3a432268e583100000000000000000000000000000001000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000004400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000064d1660f99000000000000000000000000af88d065e77c8cc2239327c5edb3a432268e58310000000000000000000000001231deb6f5749ef6ce6943a275a1d3e7486f4eae0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000000000000000000000000000000126eecdd3c4590000000000000000000000000000000000000000000000000000000000000000000000000000000000000000c5fe6ef47965741f6f7a4734bf784bf3ae3f2452000000000000000000000000000000000000000000000000000000000000759a0000000000000000000000001493e7b8d4dfade0a178dad9335470337a3a219a0000000000000000000000000000000000000000000000000000000000285241000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000e000000000000000000000000000000000000000000000000000000000000001200000000000000000000000000000000000000000000000000000000000000380000000000000000000000000000000000000000000000000000000000000001800030100130300000000000000000000000000000008f11000000000000000000000000000000000000000000000000000000000000000000000000000000240eec104bed47120f58804c59125ae2572682610d39e80abc3838c99052db282750000000000000000000000000000000000000000000000000000000000000060000000000000000000000000c5fe6ef47965741f6f7a4734bf784bf3ae3f245200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000020000000000000000000000000111111125421ca6dc452d289314280a0f8842a65000000000000000000000000111111125421ca6dc452d289314280a0f8842a65000000000000000000000000b97ef9ef8734c71904d8002f8b6bc66dd9c48a6e0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000028190200000000000000000000000000000000000000000000000000000000000000e00000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000008883800a8e000000000000000000000000b97ef9ef8734c71904d8002f8b6bc66dd9c48a6e0000000000000000000000000000000000000000000000000000000000281902000000000000000000000000000000000000000000000000015c4b33745816ab18000000000000003b6d03400e0100ab771e9288e0aa97e11557e6654c3a96652a94d114000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000993b046fd255d06d2dd8b115d91923fdcc52bd60070f3bedce2fc45e7e8c6b7e4f1add057efd388c8a24d3eb0e6736cf87170452068cb12b7e09772463e1a5b71c',
+            gas: '0x1ceed0',
+            gasLimit: '0x1ceed0',
+            to: '0x23981fc34e69eedfe2bd9a0a9fcb0719fe09dbfc',
+            value: '0x04b46d729a4459',
+            maxFeePerGas: '0x104d37c',
+            maxPriorityFeePerGas: '0x0',
+          },
+          userEditedGasLimit: false,
+          verifiedOnBlockchain: false,
+          type: 'bridge',
+          networkClientId: '1abbfb5d-ed75-4de7-8cff-694d863d8519',
+          defaultGasEstimates: {
+            gas: '0x1ceed0',
+            maxFeePerGas: '0x104d37c',
+            maxPriorityFeePerGas: '0x0',
+            estimateType: 'medium',
+          },
+          userFeeLevel: 'medium',
+          sendFlowHistory: [],
+        },
+        [
+          {
+            op: 'add',
+            path: '/txParams/nonce',
+            value: '0xc3',
+            note: 'TransactionController#approveTransaction - Transaction approved',
+            timestamp: 1730926316070,
+          },
+          {
+            op: 'add',
+            path: '/txParams/type',
+            value: '0x2',
+          },
+          {
+            op: 'replace',
+            path: '/status',
+            value: 'approved',
+          },
+        ],
+        [
+          {
+            op: 'replace',
+            path: '/status',
+            value: 'signed',
+            note: 'TransactionController#approveTransaction - RawTransaction added',
+            timestamp: 1730926316079,
+          },
+          {
+            op: 'add',
+            path: '/r',
+            value:
+              '0xdffb2def3272d3cfb47b41bd4e7163f2101aedf4a6315df0e5ac4acd60cd5363',
+          },
+          {
+            op: 'add',
+            path: '/s',
+            value:
+              '0x4269e8777e5f5dba8d8fb8b9ead2b08c90b22642f9525e98539eeeda467a68c5',
+          },
+          {
+            op: 'add',
+            path: '/v',
+            value: '0x1',
+          },
+          {
+            op: 'add',
+            path: '/rawTx',
+            value:
+              '0x02f9131882a4b181c380840104d37c831ceed09423981fc34e69eedfe2bd9a0a9fcb0719fe09dbfc8704b46d729a4459b912a53ce33bff000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004b46d729a445900000000000000000000000000000000000000000000000000000000000000c0000000000000000000000000000000000000000000000000000000000000000d6c6966694164617074657256320000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000011800000000000000000000000001231deb6f5749ef6ce6943a275a1d3e7486f4eae0000000000000000000000001231deb6f5749ef6ce6943a275a1d3e7486f4eae000000000000000000000000000000000000000000000000000000000000a86a0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000038589602234000000000000000000000000000000000000000000000000000000000000000140000000000000000000000000000000000000000000000000000007f544a44c0000000000000000000000000056ca675c3633cc16bd6849e2b431d4e8de5e23bf0000000000000000000000000000000000000000000000000000000000001024a6010a66000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000002200000000000000000000000000000000000000000000000000000000000000be0eec104bed47120f58804c59125ae2572682610d39e80abc3838c99052db28275000000000000000000000000000000000000000000000000000000000000014000000000000000000000000000000000000000000000000000000000000001800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000af88d065e77c8cc2239327c5edb3a432268e5831000000000000000000000000c5fe6ef47965741f6f7a4734bf784bf3ae3f245200000000000000000000000000000000000000000000000000000000002854dc000000000000000000000000000000000000000000000000000000000000a86a00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000a7374617267617465563200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000f6d6574616d61736b2d6272696467650000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000200000000000000000000000006352a56caadc4f1e25cd6c75970fa768a3304e640000000000000000000000006352a56caadc4f1e25cd6c75970fa768a3304e640000000000000000000000000000000000000000000000000000000000000000000000000000000000000000af88d065e77c8cc2239327c5edb3a432268e5831000000000000000000000000000000000000000000000000000385896022340000000000000000000000000000000000000000000000000000000000000000e00000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000086490411a32000000000000000000000000f851d3d46237ec552a4c6e383a973115e781b1a5000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000001c0000000000000000000000000eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee000000000000000000000000af88d065e77c8cc2239327c5edb3a432268e5831000000000000000000000000f851d3d46237ec552a4c6e383a973115e781b1a50000000000000000000000001231deb6f5749ef6ce6943a275a1d3e7486f4eae0000000000000000000000000000000000000000000000000003858960223400000000000000000000000000000000000000000000000000000000000028524100000000000000000000000000000000000000000000000000000000002886200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000933a06c631ed8b5e4f3848c91a1cfc45e5c7eab3000000000000000000000000000000000000000000000000000000000000014000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000001400000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000042000000000000000000000000082af49447d8a07e3bd95bd0d56f35241523fbab10000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000385896022340000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000004d0e30db00000000000000000000000000000000000000000000000000000000000000000000000000000000071cb8a26f2c4eb68288bcc2ebaba4f72b065f07600000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000001043eece7db000000000000000000000000f851d3d46237ec552a4c6e383a973115e781b1a5000000000000000000000000000000000000000000000000000385896022340000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000007fffffff00000000000000000000000000000000000000000000000000000000000000c000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000a7e848aca42d879ef06507fca0e7b33a0a63c1e00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000648a6a1e85000000000000000000000000af88d065e77c8cc2239327c5edb3a432268e5831000000000000000000000000353c1f0bc78fbbc245b3c93ef77b1dcc5b77d2a0000000000000000000000000000000000000000000000000000000000028862000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000001a49f865422000000000000000000000000af88d065e77c8cc2239327c5edb3a432268e583100000000000000000000000000000001000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000004400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000064d1660f99000000000000000000000000af88d065e77c8cc2239327c5edb3a432268e58310000000000000000000000001231deb6f5749ef6ce6943a275a1d3e7486f4eae0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000000000000000000000000000000126eecdd3c4590000000000000000000000000000000000000000000000000000000000000000000000000000000000000000c5fe6ef47965741f6f7a4734bf784bf3ae3f2452000000000000000000000000000000000000000000000000000000000000759a0000000000000000000000001493e7b8d4dfade0a178dad9335470337a3a219a0000000000000000000000000000000000000000000000000000000000285241000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000e000000000000000000000000000000000000000000000000000000000000001200000000000000000000000000000000000000000000000000000000000000380000000000000000000000000000000000000000000000000000000000000001800030100130300000000000000000000000000000008f11000000000000000000000000000000000000000000000000000000000000000000000000000000240eec104bed47120f58804c59125ae2572682610d39e80abc3838c99052db282750000000000000000000000000000000000000000000000000000000000000060000000000000000000000000c5fe6ef47965741f6f7a4734bf784bf3ae3f245200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000020000000000000000000000000111111125421ca6dc452d289314280a0f8842a65000000000000000000000000111111125421ca6dc452d289314280a0f8842a65000000000000000000000000b97ef9ef8734c71904d8002f8b6bc66dd9c48a6e0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000028190200000000000000000000000000000000000000000000000000000000000000e00000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000008883800a8e000000000000000000000000b97ef9ef8734c71904d8002f8b6bc66dd9c48a6e0000000000000000000000000000000000000000000000000000000000281902000000000000000000000000000000000000000000000000015c4b33745816ab18000000000000003b6d03400e0100ab771e9288e0aa97e11557e6654c3a96652a94d114000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000993b046fd255d06d2dd8b115d91923fdcc52bd60070f3bedce2fc45e7e8c6b7e4f1add057efd388c8a24d3eb0e6736cf87170452068cb12b7e09772463e1a5b71cc001a0dffb2def3272d3cfb47b41bd4e7163f2101aedf4a6315df0e5ac4acd60cd5363a04269e8777e5f5dba8d8fb8b9ead2b08c90b22642f9525e98539eeeda467a68c5',
+          },
+        ],
+        [
+          {
+            op: 'replace',
+            path: '/status',
+            value: 'submitted',
+            note: 'TransactionController#approveTransaction - Transaction submitted',
+            timestamp: 1730926316445,
+          },
+          {
+            op: 'add',
+            path: '/gasFeeEstimates',
+            value: {
+              type: 'fee-market',
+              low: {
+                maxFeePerGas: '0x989680',
+                maxPriorityFeePerGas: '0x0',
+              },
+              medium: {
+                maxFeePerGas: '0xcdfe60',
+                maxPriorityFeePerGas: '0x0',
+              },
+              high: {
+                maxFeePerGas: '0x1036640',
+                maxPriorityFeePerGas: '0x0',
+              },
+            },
+          },
+          {
+            op: 'add',
+            path: '/gasFeeEstimatesLoaded',
+            value: true,
+          },
+          {
+            op: 'add',
+            path: '/hash',
+            value:
+              '0x010e1bffe8288956012e6b6132d7eb3eaf9d0bbf066bd13aae13b973c678508f',
+          },
+          {
+            op: 'add',
+            path: '/submittedTime',
+            value: 1730926316444,
+          },
+        ],
+      ],
+      r: '0xdffb2def3272d3cfb47b41bd4e7163f2101aedf4a6315df0e5ac4acd60cd5363',
+      s: '0x4269e8777e5f5dba8d8fb8b9ead2b08c90b22642f9525e98539eeeda467a68c5',
+      v: '0x1',
+      rawTx:
+        '0x02f9131882a4b181c380840104d37c831ceed09423981fc34e69eedfe2bd9a0a9fcb0719fe09dbfc8704b46d729a4459b912a53ce33bff000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004b46d729a445900000000000000000000000000000000000000000000000000000000000000c0000000000000000000000000000000000000000000000000000000000000000d6c6966694164617074657256320000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000011800000000000000000000000001231deb6f5749ef6ce6943a275a1d3e7486f4eae0000000000000000000000001231deb6f5749ef6ce6943a275a1d3e7486f4eae000000000000000000000000000000000000000000000000000000000000a86a0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000038589602234000000000000000000000000000000000000000000000000000000000000000140000000000000000000000000000000000000000000000000000007f544a44c0000000000000000000000000056ca675c3633cc16bd6849e2b431d4e8de5e23bf0000000000000000000000000000000000000000000000000000000000001024a6010a66000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000002200000000000000000000000000000000000000000000000000000000000000be0eec104bed47120f58804c59125ae2572682610d39e80abc3838c99052db28275000000000000000000000000000000000000000000000000000000000000014000000000000000000000000000000000000000000000000000000000000001800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000af88d065e77c8cc2239327c5edb3a432268e5831000000000000000000000000c5fe6ef47965741f6f7a4734bf784bf3ae3f245200000000000000000000000000000000000000000000000000000000002854dc000000000000000000000000000000000000000000000000000000000000a86a00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000a7374617267617465563200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000f6d6574616d61736b2d6272696467650000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000200000000000000000000000006352a56caadc4f1e25cd6c75970fa768a3304e640000000000000000000000006352a56caadc4f1e25cd6c75970fa768a3304e640000000000000000000000000000000000000000000000000000000000000000000000000000000000000000af88d065e77c8cc2239327c5edb3a432268e5831000000000000000000000000000000000000000000000000000385896022340000000000000000000000000000000000000000000000000000000000000000e00000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000086490411a32000000000000000000000000f851d3d46237ec552a4c6e383a973115e781b1a5000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000001c0000000000000000000000000eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee000000000000000000000000af88d065e77c8cc2239327c5edb3a432268e5831000000000000000000000000f851d3d46237ec552a4c6e383a973115e781b1a50000000000000000000000001231deb6f5749ef6ce6943a275a1d3e7486f4eae0000000000000000000000000000000000000000000000000003858960223400000000000000000000000000000000000000000000000000000000000028524100000000000000000000000000000000000000000000000000000000002886200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000933a06c631ed8b5e4f3848c91a1cfc45e5c7eab3000000000000000000000000000000000000000000000000000000000000014000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000001400000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000042000000000000000000000000082af49447d8a07e3bd95bd0d56f35241523fbab10000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000385896022340000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000004d0e30db00000000000000000000000000000000000000000000000000000000000000000000000000000000071cb8a26f2c4eb68288bcc2ebaba4f72b065f07600000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000001043eece7db000000000000000000000000f851d3d46237ec552a4c6e383a973115e781b1a5000000000000000000000000000000000000000000000000000385896022340000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000007fffffff00000000000000000000000000000000000000000000000000000000000000c000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000a7e848aca42d879ef06507fca0e7b33a0a63c1e00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000648a6a1e85000000000000000000000000af88d065e77c8cc2239327c5edb3a432268e5831000000000000000000000000353c1f0bc78fbbc245b3c93ef77b1dcc5b77d2a0000000000000000000000000000000000000000000000000000000000028862000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000001a49f865422000000000000000000000000af88d065e77c8cc2239327c5edb3a432268e583100000000000000000000000000000001000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000004400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000064d1660f99000000000000000000000000af88d065e77c8cc2239327c5edb3a432268e58310000000000000000000000001231deb6f5749ef6ce6943a275a1d3e7486f4eae0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000000000000000000000000000000126eecdd3c4590000000000000000000000000000000000000000000000000000000000000000000000000000000000000000c5fe6ef47965741f6f7a4734bf784bf3ae3f2452000000000000000000000000000000000000000000000000000000000000759a0000000000000000000000001493e7b8d4dfade0a178dad9335470337a3a219a0000000000000000000000000000000000000000000000000000000000285241000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000e000000000000000000000000000000000000000000000000000000000000001200000000000000000000000000000000000000000000000000000000000000380000000000000000000000000000000000000000000000000000000000000001800030100130300000000000000000000000000000008f11000000000000000000000000000000000000000000000000000000000000000000000000000000240eec104bed47120f58804c59125ae2572682610d39e80abc3838c99052db282750000000000000000000000000000000000000000000000000000000000000060000000000000000000000000c5fe6ef47965741f6f7a4734bf784bf3ae3f245200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000020000000000000000000000000111111125421ca6dc452d289314280a0f8842a65000000000000000000000000111111125421ca6dc452d289314280a0f8842a65000000000000000000000000b97ef9ef8734c71904d8002f8b6bc66dd9c48a6e0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000028190200000000000000000000000000000000000000000000000000000000000000e00000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000008883800a8e000000000000000000000000b97ef9ef8734c71904d8002f8b6bc66dd9c48a6e0000000000000000000000000000000000000000000000000000000000281902000000000000000000000000000000000000000000000000015c4b33745816ab18000000000000003b6d03400e0100ab771e9288e0aa97e11557e6654c3a96652a94d114000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000993b046fd255d06d2dd8b115d91923fdcc52bd60070f3bedce2fc45e7e8c6b7e4f1add057efd388c8a24d3eb0e6736cf87170452068cb12b7e09772463e1a5b71cc001a0dffb2def3272d3cfb47b41bd4e7163f2101aedf4a6315df0e5ac4acd60cd5363a04269e8777e5f5dba8d8fb8b9ead2b08c90b22642f9525e98539eeeda467a68c5',
+      gasFeeEstimates: {
+        type: 'fee-market',
+        low: {
+          maxFeePerGas: '0x989680',
+          maxPriorityFeePerGas: '0x0',
+        },
+        medium: {
+          maxFeePerGas: '0xcdfe60',
+          maxPriorityFeePerGas: '0x0',
+        },
+        high: {
+          maxFeePerGas: '0x1036640',
+          maxPriorityFeePerGas: '0x0',
+        },
+      },
+      gasFeeEstimatesLoaded: true,
+      hash: '0x010e1bffe8288956012e6b6132d7eb3eaf9d0bbf066bd13aae13b973c678508f',
+      submittedTime: 1730926316444,
+    },
+  },
+};
+
+export const DefaultStory: StoryFn<typeof BridgeStepList> = () => {
+  return (
+    <Box
+      display={Display.Flex}
+      flexDirection={FlexDirection.Column}
+      gap={1}
+      width={BlockSize.Full}
+    >
+      <BridgeStepList
+        bridgeHistoryItem={Args.step1.bridgeHistoryItem as any}
+        srcChainTxMeta={Args.step1.srcChainTxMeta as any}
+        networkConfigurationsByChainId={networkConfigurationsByChainId as any}
+      />
+
+      <BridgeStepList
+        bridgeHistoryItem={Args.step2.bridgeHistoryItem as any}
+        srcChainTxMeta={Args.step2.srcChainTxMeta as any}
+        networkConfigurationsByChainId={networkConfigurationsByChainId as any}
+      />
+    </Box>
+  );
+};
+DefaultStory.storyName = 'Default';
+
+export const LongNetworkNameStory: StoryFn<typeof BridgeStepList> = () => {
+  return (
+    <Box
+      display={Display.Flex}
+      flexDirection={FlexDirection.Column}
+      gap={1}
+      style={{ width: '350px' }}
+    >
+      <BridgeStepList
+        bridgeHistoryItem={Args.step1Long.bridgeHistoryItem as any}
+        srcChainTxMeta={Args.step1Long.srcChainTxMeta as any}
+        networkConfigurationsByChainId={networkConfigurationsByChainId as any}
+      />
+    </Box>
+  );
+};
+LongNetworkNameStory.storyName = 'Long Network Name';
diff --git a/ui/pages/bridge/transaction-details/bridge-step-list.tsx b/ui/pages/bridge/transaction-details/bridge-step-list.tsx
new file mode 100644
index 000000000000..b715c29e1f0e
--- /dev/null
+++ b/ui/pages/bridge/transaction-details/bridge-step-list.tsx
@@ -0,0 +1,98 @@
+import React from 'react';
+import { NetworkConfiguration } from '@metamask/network-controller';
+import { TransactionMeta } from '@metamask/transaction-controller';
+import { Hex } from '@metamask/utils';
+import { Box } from '../../../components/component-library';
+import {
+  BridgeHistoryItem,
+  StatusTypes,
+} from '../../../../shared/types/bridge-status';
+import { formatDate } from '../../../helpers/utils/util';
+import BridgeStepDescription, {
+  getStepStatus,
+} from './bridge-step-description';
+import StepProgressBarItem from './step-progress-bar-item';
+
+const getTime = (
+  index: number,
+  isLastIndex: boolean,
+  startTime?: number,
+  estimatedProcessingTimeInSeconds?: number,
+) => {
+  if (index === 0) {
+    return startTime;
+  }
+
+  return isLastIndex && startTime && estimatedProcessingTimeInSeconds
+    ? startTime + estimatedProcessingTimeInSeconds * 1000
+    : undefined;
+};
+
+type BridgeStepsProps = {
+  bridgeHistoryItem: BridgeHistoryItem;
+  srcChainTxMeta?: TransactionMeta;
+  networkConfigurationsByChainId: Record<Hex, NetworkConfiguration>;
+};
+
+export default function BridgeStepList({
+  bridgeHistoryItem,
+  srcChainTxMeta,
+  networkConfigurationsByChainId,
+}: BridgeStepsProps) {
+  const { steps } = bridgeHistoryItem.quote;
+  const stepStatuses = steps.map((step) =>
+    getStepStatus(bridgeHistoryItem, step, srcChainTxMeta),
+  );
+
+  return (
+    <Box className="bridge-transaction-details__step-grid">
+      {steps.map((step, i) => {
+        const prevStepStatus = i > 0 ? stepStatuses[i - 1] : null;
+        const stepStatus = stepStatuses[i];
+        const nextStepStatus =
+          i < stepStatuses.length - 1 ? stepStatuses[i + 1] : null;
+
+        const isEdgeComplete =
+          stepStatus === StatusTypes.COMPLETE &&
+          (nextStepStatus === StatusTypes.PENDING ||
+            nextStepStatus === StatusTypes.COMPLETE);
+
+        // Making a distinction betweeen displayedStepStatus and stepStatus
+        // stepStatus is determined independently of other steps
+        // So despite both being technically PENDING,
+        // We only want a single spinner animation at a time, so we need to take into account other steps
+        const displayedStepStatus =
+          prevStepStatus === StatusTypes.PENDING &&
+          stepStatus === StatusTypes.PENDING
+            ? null
+            : stepStatus;
+
+        const time = formatDate(
+          getTime(
+            i,
+            i === steps.length - 1,
+            bridgeHistoryItem.startTime,
+            bridgeHistoryItem.estimatedProcessingTimeInSeconds,
+          ),
+          'hh:mm a',
+        );
+
+        return (
+          <StepProgressBarItem
+            key={`progress-${step.action}-${step.srcChainId}-${step.destChainId}`}
+            stepStatus={displayedStepStatus}
+            isLastItem={i === steps.length - 1}
+            isEdgeComplete={isEdgeComplete}
+          >
+            <BridgeStepDescription
+              step={step}
+              networkConfigurationsByChainId={networkConfigurationsByChainId}
+              stepStatus={displayedStepStatus}
+              time={time}
+            />
+          </StepProgressBarItem>
+        );
+      })}
+    </Box>
+  );
+}
diff --git a/ui/pages/bridge/transaction-details/hollow-circle.tsx b/ui/pages/bridge/transaction-details/hollow-circle.tsx
new file mode 100644
index 000000000000..4f84cf5ec0e7
--- /dev/null
+++ b/ui/pages/bridge/transaction-details/hollow-circle.tsx
@@ -0,0 +1,39 @@
+import * as React from 'react';
+import classnames from 'classnames';
+import {
+  Box,
+  IconProps,
+  IconSize,
+  PolymorphicRef,
+} from '../../../components/component-library';
+import {
+  BackgroundColor,
+  Display,
+} from '../../../helpers/constants/design-system';
+
+const HollowCircle = React.forwardRef(
+  <C extends React.ElementType = 'span'>(
+    { size = IconSize.Md, color, className = '', style }: IconProps<C>,
+    ref?: PolymorphicRef<C>,
+  ) => {
+    return (
+      <Box
+        className={classnames(className, 'mm-icon', `mm-icon--size-${size}`)}
+        ref={ref}
+        as="span"
+        display={Display.InlineBlock}
+        style={{
+          height: '12px',
+          width: '12px',
+          border: `1px solid var(--color-${color})`,
+          borderRadius: '50%',
+          backgroundColor: `var(--color-${BackgroundColor.backgroundDefault})`,
+          zIndex: 1,
+          ...style,
+        }}
+      />
+    );
+  },
+);
+
+export default HollowCircle;
diff --git a/ui/pages/bridge/transaction-details/index.scss b/ui/pages/bridge/transaction-details/index.scss
new file mode 100644
index 000000000000..7832fffdd6a5
--- /dev/null
+++ b/ui/pages/bridge/transaction-details/index.scss
@@ -0,0 +1,50 @@
+.bridge-transaction-details {
+  &__icon-loading {
+    animation: loading-dot 1.2s linear infinite;
+  }
+
+  &__segment {
+    height: 4px;
+    width: 0;
+    transition: width 1.5s cubic-bezier(0.68, -0.55, 0.27, 1.55);
+
+    &--pending {
+      width: 50%;
+    }
+
+    &--complete {
+      width: 100%;
+    }
+  }
+
+  &__step-grid {
+    display: grid;
+    grid-template-columns: 1rem 6fr;
+    column-gap: 1rem;
+    justify-items: center;
+    align-items: center;
+
+    &--desc {
+      justify-self: start;
+    }
+  }
+
+  @keyframes loading-dot {
+    0% {
+      transform: scale(1);
+      opacity: 1;
+    }
+
+    45% {
+      transform: scale(0.7);
+      opacity: 0.7;
+    }
+
+    80% {
+      transform: scale(1);
+      opacity: 1;
+    }
+  }
+}
+
+
diff --git a/ui/pages/bridge/transaction-details/pulsing-circle.tsx b/ui/pages/bridge/transaction-details/pulsing-circle.tsx
new file mode 100644
index 000000000000..9933e3f8f613
--- /dev/null
+++ b/ui/pages/bridge/transaction-details/pulsing-circle.tsx
@@ -0,0 +1,51 @@
+import React from 'react';
+import { Box, IconSize } from '../../../components/component-library';
+import {
+  AlignItems,
+  BackgroundColor,
+  BorderRadius,
+  Display,
+  IconColor,
+  JustifyContent,
+} from '../../../helpers/constants/design-system';
+import HollowCircle from './hollow-circle';
+
+/**
+ * Renders the steps in the Bridge Transaction Details page
+ *
+ * @param options
+ * @param options.iconSize - The size of the icon
+ * @param options.color - The color of the icon
+ */
+export default function PulsingCircle({
+  iconSize,
+  color,
+}: {
+  iconSize: IconSize;
+  color: IconColor;
+}) {
+  return (
+    <Box style={{ position: 'relative' }}>
+      <Box
+        className="bridge-transaction-details__icon-loading" // Needed for animation
+        backgroundColor={BackgroundColor.primaryMuted}
+        display={Display.Flex}
+        justifyContent={JustifyContent.center}
+        alignItems={AlignItems.center}
+        borderRadius={BorderRadius.full}
+        style={{ width: '2rem', height: '2rem' }}
+      ></Box>
+      <HollowCircle
+        size={iconSize}
+        color={color}
+        style={{
+          position: 'absolute',
+          left: '50%',
+          top: '50%',
+          transform: 'translate(-50%, -50%)',
+          borderWidth: '2px',
+        }}
+      />
+    </Box>
+  );
+}
diff --git a/ui/pages/bridge/transaction-details/segment.stories.tsx b/ui/pages/bridge/transaction-details/segment.stories.tsx
new file mode 100644
index 000000000000..d00b3dc8fedd
--- /dev/null
+++ b/ui/pages/bridge/transaction-details/segment.stories.tsx
@@ -0,0 +1,46 @@
+import React, { useEffect } from 'react';
+import { StoryFn, Meta } from '@storybook/react';
+import {
+  BlockSize,
+  Display,
+  FlexDirection,
+} from '../../../helpers/constants/design-system';
+import Segment from './segment';
+import { Box } from '../../../components/component-library';
+import { StatusTypes } from '../../../../shared/types/bridge-status';
+
+export default {
+  title: 'pages/bridge/transaction-details/Segment',
+  component: Segment,
+} as Meta<typeof Segment>;
+
+const types = [StatusTypes.PENDING, StatusTypes.COMPLETE, null];
+
+export const DefaultStory: StoryFn<typeof Segment> = () => {
+  const [typeIndex, setType] = React.useState<StatusTypes | null>(
+    StatusTypes.PENDING,
+  );
+
+  useEffect(() => {
+    let currentIndex = 0;
+
+    const interval = setInterval(() => {
+      currentIndex = (currentIndex + 1) % types.length;
+      setType(types[currentIndex]);
+    }, 2000);
+
+    return () => clearInterval(interval);
+  }, []);
+
+  return (
+    <Box
+      display={Display.Flex}
+      flexDirection={FlexDirection.Column}
+      gap={1}
+      width={BlockSize.Full}
+    >
+      <Segment type={typeIndex} />
+    </Box>
+  );
+};
+DefaultStory.storyName = 'Default';
diff --git a/ui/pages/bridge/transaction-details/segment.tsx b/ui/pages/bridge/transaction-details/segment.tsx
new file mode 100644
index 000000000000..4cbe1354bbe3
--- /dev/null
+++ b/ui/pages/bridge/transaction-details/segment.tsx
@@ -0,0 +1,32 @@
+import React from 'react';
+import classnames from 'classnames';
+import { Box } from '../../../components/component-library';
+import {
+  BackgroundColor,
+  BlockSize,
+  BorderRadius,
+} from '../../../helpers/constants/design-system';
+import { StatusTypes } from '../../../../shared/types/bridge-status';
+
+export default function Segment({ type }: { type: StatusTypes | null }) {
+  return (
+    <Box
+      width={BlockSize.Full}
+      backgroundColor={BackgroundColor.backgroundAlternative}
+      borderRadius={BorderRadius.pill}
+    >
+      <Box
+        width={BlockSize.Full}
+        backgroundColor={BackgroundColor.primaryDefault}
+        borderRadius={BorderRadius.pill}
+        className={classnames({
+          'bridge-transaction-details__segment': true,
+          'bridge-transaction-details__segment--pending':
+            type === StatusTypes.PENDING,
+          'bridge-transaction-details__segment--complete':
+            type === StatusTypes.COMPLETE,
+        })}
+      />
+    </Box>
+  );
+}
diff --git a/ui/pages/bridge/transaction-details/step-progress-bar-item.tsx b/ui/pages/bridge/transaction-details/step-progress-bar-item.tsx
new file mode 100644
index 000000000000..504b2400b7be
--- /dev/null
+++ b/ui/pages/bridge/transaction-details/step-progress-bar-item.tsx
@@ -0,0 +1,82 @@
+import React from 'react';
+import { StatusTypes } from '../../../../shared/types/bridge-status';
+import {
+  Icon,
+  IconName,
+  IconSize,
+} from '../../../components/component-library';
+import { IconColor } from '../../../helpers/constants/design-system';
+import HollowCircle from './hollow-circle';
+import PulsingCircle from './pulsing-circle';
+
+const ICON_SIZE = IconSize.Xs;
+
+const VerticalLine = ({ color }: { color: IconColor }) => (
+  <div
+    style={{
+      height: '60px',
+      marginTop: '-1rem',
+      marginBottom: '-1rem',
+      width: '1px',
+      backgroundColor: `var(--color-${color})`,
+      zIndex: 0.1,
+    }}
+  />
+);
+
+type StepsProgressBarItemProps = {
+  stepStatus: StatusTypes | null;
+  isLastItem: boolean;
+  isEdgeComplete: boolean;
+  children: React.ReactNode;
+};
+
+/**
+ * Renders the steps in the Bridge Transaction Details page
+ *
+ * @param options
+ * @param options.stepStatus - The status of the step
+ * @param options.isLastItem - Whether the step is the last item
+ * @param options.isEdgeComplete - Whether the edge is complete
+ * @param options.children - The description of the step to be rendered
+ */
+export default function StepProgressBarItem({
+  stepStatus,
+  isLastItem,
+  isEdgeComplete,
+  children,
+}: StepsProgressBarItemProps) {
+  return (
+    <>
+      {/* Indicator dots */}
+      {stepStatus === null && (
+        <HollowCircle size={ICON_SIZE} color={IconColor.iconMuted} />
+      )}
+      {stepStatus === StatusTypes.PENDING && (
+        <PulsingCircle iconSize={ICON_SIZE} color={IconColor.primaryDefault} />
+      )}
+      {stepStatus === StatusTypes.COMPLETE && (
+        <Icon
+          name={IconName.FullCircle}
+          color={IconColor.primaryDefault}
+          size={ICON_SIZE}
+        />
+      )}
+
+      {/* Description */}
+      {children}
+
+      {/* Line */}
+      {!isLastItem && (
+        <VerticalLine
+          color={
+            isEdgeComplete ? IconColor.primaryDefault : IconColor.iconMuted
+          }
+        />
+      )}
+
+      {/* Blank div to take up space to make sure everything is aligned */}
+      {!isLastItem && <div />}
+    </>
+  );
+}
diff --git a/ui/pages/bridge/transaction-details/transaction-detail-row.tsx b/ui/pages/bridge/transaction-details/transaction-detail-row.tsx
new file mode 100644
index 000000000000..99b3756ee7e0
--- /dev/null
+++ b/ui/pages/bridge/transaction-details/transaction-detail-row.tsx
@@ -0,0 +1,40 @@
+import React from 'react';
+import { Box, Text } from '../../../components/component-library';
+import {
+  JustifyContent,
+  Display,
+  FlexDirection,
+  AlignItems,
+  TextAlign,
+  TextVariant,
+} from '../../../helpers/constants/design-system';
+
+type TransactionDetailRowProps = {
+  title: string;
+  value: React.ReactNode;
+};
+
+export default function TransactionDetailRow({
+  title,
+  value,
+}: TransactionDetailRowProps) {
+  return (
+    <Box display={Display.Flex} justifyContent={JustifyContent.spaceBetween}>
+      <Box style={{ maxWidth: '40%' }} paddingRight={1}>
+        <Text variant={TextVariant.bodyMd}>{title}</Text>
+      </Box>
+      <Box
+        display={Display.Flex}
+        flexDirection={FlexDirection.Column}
+        alignItems={AlignItems.flexEnd}
+        textAlign={TextAlign.Right}
+        paddingLeft={1}
+        style={{
+          maxWidth: '60%',
+        }}
+      >
+        <Text variant={TextVariant.bodyMd}>{value}</Text>
+      </Box>
+    </Box>
+  );
+}
diff --git a/ui/pages/bridge/transaction-details/transaction-details.tsx b/ui/pages/bridge/transaction-details/transaction-details.tsx
new file mode 100644
index 000000000000..780186a671e0
--- /dev/null
+++ b/ui/pages/bridge/transaction-details/transaction-details.tsx
@@ -0,0 +1,328 @@
+import React from 'react';
+import { useSelector } from 'react-redux';
+import { useHistory, useParams } from 'react-router-dom';
+import { NetworkConfiguration } from '@metamask/network-controller';
+import { TransactionMeta } from '@metamask/transaction-controller';
+import {
+  AvatarNetwork,
+  AvatarNetworkSize,
+  Box,
+  ButtonIcon,
+  ButtonIconSize,
+  IconName,
+  Text,
+} from '../../../components/component-library';
+import { Content, Header } from '../../../components/multichain/pages/page';
+import { selectBridgeHistoryForAccount } from '../../../ducks/bridge-status/selectors';
+import useBridgeChainInfo from '../../../hooks/bridge/useBridgeChainInfo';
+import { getNetworkConfigurationsByChainId } from '../../../../shared/modules/selectors/networks';
+import { getTransactionBreakdownData } from '../../../components/app/transaction-breakdown/transaction-breakdown-utils';
+import { MetaMaskReduxState } from '../../../store/store';
+import { hexToDecimal } from '../../../../shared/modules/conversion.utils';
+import UserPreferencedCurrencyDisplay from '../../../components/app/user-preferenced-currency-display/user-preferenced-currency-display.component';
+import { EtherDenomination } from '../../../../shared/constants/common';
+import { PRIMARY } from '../../../helpers/constants/common';
+import CurrencyDisplay from '../../../components/ui/currency-display/currency-display.component';
+import { StatusTypes } from '../../../../shared/types/bridge-status';
+import {
+  AlignItems,
+  Display,
+  FlexDirection,
+  TextColor,
+  TextTransform,
+} from '../../../helpers/constants/design-system';
+import { formatDate } from '../../../helpers/utils/util';
+import { ConfirmInfoRowDivider as Divider } from '../../../components/app/confirm/info/row';
+import { calcTokenAmount } from '../../../../shared/lib/transactions-controller-utils';
+import { useI18nContext } from '../../../hooks/useI18nContext';
+import { CHAIN_ID_TO_NETWORK_IMAGE_URL_MAP } from '../../../../shared/constants/network';
+import { selectedAddressTxListSelector } from '../../../selectors';
+import TransactionDetailRow from './transaction-detail-row';
+import BridgeExplorerLinks from './bridge-explorer-links';
+import BridgeStepList from './bridge-step-list';
+
+const getBlockExplorerUrl = (
+  networkConfiguration: NetworkConfiguration | undefined,
+  txHash: string | undefined,
+) => {
+  if (!networkConfiguration || !txHash) {
+    return undefined;
+  }
+  const index = networkConfiguration.defaultBlockExplorerUrlIndex;
+  if (index === undefined) {
+    return undefined;
+  }
+
+  const rootUrl = networkConfiguration.blockExplorerUrls[index]?.replace(
+    /\/$/u,
+    '',
+  );
+  return `${rootUrl}/tx/${txHash}`;
+};
+
+const StatusToColorMap: Record<StatusTypes, TextColor> = {
+  [StatusTypes.PENDING]: TextColor.warningDefault,
+  [StatusTypes.COMPLETE]: TextColor.successDefault,
+  [StatusTypes.FAILED]: TextColor.errorDefault,
+  [StatusTypes.UNKNOWN]: TextColor.errorDefault,
+};
+
+const CrossChainSwapTxDetails = () => {
+  const t = useI18nContext();
+  const rootState = useSelector((state) => state);
+  const history = useHistory();
+  const { srcTxHash } = useParams<{ srcTxHash: string }>();
+  const bridgeHistory = useSelector(selectBridgeHistoryForAccount);
+  const selectedAddressTxList = useSelector(
+    selectedAddressTxListSelector,
+  ) as TransactionMeta[];
+  const bridgeHistoryItem = srcTxHash ? bridgeHistory[srcTxHash] : undefined;
+  const networkConfigurationsByChainId = useSelector(
+    getNetworkConfigurationsByChainId,
+  );
+  const { srcNetwork, destNetwork } = useBridgeChainInfo({
+    bridgeHistoryItem,
+  });
+
+  const srcBlockExplorerUrl = getBlockExplorerUrl(srcNetwork, srcTxHash);
+
+  const destTxHash = bridgeHistoryItem?.status.destChain?.txHash;
+  const destBlockExplorerUrl = getBlockExplorerUrl(destNetwork, destTxHash);
+
+  const srcChainTxMeta = selectedAddressTxList.find(
+    (tx) => tx.hash === srcTxHash,
+  );
+
+  const status = bridgeHistoryItem?.status.status;
+
+  const destChainIconUrl = destNetwork
+    ? CHAIN_ID_TO_NETWORK_IMAGE_URL_MAP[
+        destNetwork.chainId as keyof typeof CHAIN_ID_TO_NETWORK_IMAGE_URL_MAP
+      ]
+    : undefined;
+  const bridgeTypeDirection = t('bridgeTypeDirectionTo');
+  const srcNetworkName = srcNetwork?.name;
+  const destNetworkName = destNetwork?.name;
+
+  const data = srcChainTxMeta
+    ? getTransactionBreakdownData({
+        state: rootState as MetaMaskReduxState,
+        transaction: srcChainTxMeta,
+        isTokenApprove: false,
+      })
+    : undefined;
+
+  const bridgeAmount = bridgeHistoryItem
+    ? `${calcTokenAmount(
+        bridgeHistoryItem.quote.srcTokenAmount,
+        bridgeHistoryItem.quote.srcAsset.decimals,
+      ).toFixed()} ${bridgeHistoryItem.quote.srcAsset.symbol}`
+    : undefined;
+
+  return (
+    <div className="bridge">
+      <div className="bridge__container">
+        <Header
+          className="bridge__header"
+          startAccessory={
+            <ButtonIcon
+              iconName={IconName.ArrowLeft}
+              size={ButtonIconSize.Sm}
+              ariaLabel={t('back')}
+              onClick={() => history.goBack()}
+            />
+          }
+        >
+          {t('bridge')} details
+        </Header>
+        <Content className="bridge__content">
+          <Box
+            display={Display.Flex}
+            flexDirection={FlexDirection.Column}
+            gap={4}
+          >
+            {status !== StatusTypes.COMPLETE && bridgeHistoryItem && (
+              <BridgeStepList
+                bridgeHistoryItem={bridgeHistoryItem}
+                srcChainTxMeta={srcChainTxMeta}
+                networkConfigurationsByChainId={networkConfigurationsByChainId}
+              />
+            )}
+
+            {/* Links to block explorers */}
+            <BridgeExplorerLinks
+              srcChainId={srcNetwork?.chainId}
+              destChainId={destNetwork?.chainId}
+              srcBlockExplorerUrl={srcBlockExplorerUrl}
+              destBlockExplorerUrl={destBlockExplorerUrl}
+            />
+
+            <Divider />
+
+            {/* General tx details */}
+            <Box
+              display={Display.Flex}
+              flexDirection={FlexDirection.Column}
+              gap={2}
+            >
+              <TransactionDetailRow
+                title={t('bridgeTxDetailsStatus')}
+                value={
+                  <Text
+                    textTransform={TextTransform.Capitalize}
+                    color={status ? StatusToColorMap[status] : undefined}
+                  >
+                    {status?.toLowerCase()}
+                  </Text>
+                }
+              />
+
+              {status !== StatusTypes.COMPLETE && (
+                <TransactionDetailRow
+                  title={t('bridgeTxDetailsBridgeType')}
+                  value={
+                    <Box
+                      display={Display.Flex}
+                      gap={1}
+                      alignItems={AlignItems.baseline}
+                    >
+                      {bridgeTypeDirection}{' '}
+                      {destNetwork && (
+                        <AvatarNetwork
+                          size={AvatarNetworkSize.Xs}
+                          src={destChainIconUrl}
+                          name={destNetwork?.name}
+                        />
+                      )}
+                      {destNetworkName}
+                    </Box>
+                  }
+                />
+              )}
+              {status === StatusTypes.COMPLETE && (
+                <>
+                  <TransactionDetailRow
+                    title={t('bridgeSource')}
+                    value={srcNetworkName}
+                  />
+                  <TransactionDetailRow
+                    title={t('bridgeDestination')}
+                    value={destNetworkName}
+                  />
+                </>
+              )}
+              <TransactionDetailRow
+                title={t('bridgeTxDetailsTimestamp')}
+                value={t('bridgeTxDetailsTimestampValue', [
+                  formatDate(srcChainTxMeta?.time, 'MMM d, yyyy'),
+                  formatDate(srcChainTxMeta?.time, 'hh:mm a'),
+                ])}
+              />
+              <TransactionDetailRow
+                title={t('bridgeTxDetailsNonce')}
+                value={
+                  srcChainTxMeta?.txParams.nonce
+                    ? hexToDecimal(srcChainTxMeta?.txParams.nonce)
+                    : undefined
+                }
+              />
+            </Box>
+
+            <Divider />
+
+            <Box
+              display={Display.Flex}
+              flexDirection={FlexDirection.Column}
+              gap={2}
+            >
+              <TransactionDetailRow
+                title={t('bridgeTxDetailsBridgeAmount')}
+                value={bridgeAmount}
+              />
+              <TransactionDetailRow
+                title={t('bridgeTxDetailsGasLimit')}
+                value={data?.gas ? hexToDecimal(data?.gas) : undefined}
+              />
+              <TransactionDetailRow
+                title={t('bridgeTxDetailsGasUsed')}
+                value={data?.gasUsed ? hexToDecimal(data?.gasUsed) : undefined}
+              />
+              {data?.isEIP1559Transaction &&
+                typeof data?.baseFee !== 'undefined' && (
+                  <TransactionDetailRow
+                    title={t('bridgeTxDetailsBaseFee')}
+                    value={
+                      <CurrencyDisplay
+                        currency={data?.nativeCurrency}
+                        denomination={EtherDenomination.GWEI}
+                        value={data?.baseFee}
+                        numberOfDecimals={10}
+                        hideLabel
+                      />
+                    }
+                  />
+                )}
+              {data?.isEIP1559Transaction &&
+                typeof data?.priorityFee !== 'undefined' && (
+                  <TransactionDetailRow
+                    title={t('bridgeTxDetailsPriorityFee')}
+                    value={
+                      <CurrencyDisplay
+                        currency={data?.nativeCurrency}
+                        denomination={EtherDenomination.GWEI}
+                        value={data?.priorityFee}
+                        numberOfDecimals={10}
+                        hideLabel
+                      />
+                    }
+                  />
+                )}
+
+              <TransactionDetailRow
+                title={t('bridgeTxDetailsTotalGasFee')}
+                value={
+                  <UserPreferencedCurrencyDisplay
+                    currency={data?.nativeCurrency}
+                    denomination={EtherDenomination.ETH}
+                    numberOfDecimals={6}
+                    value={data?.hexGasTotal}
+                    type={PRIMARY}
+                  />
+                }
+              />
+              <TransactionDetailRow
+                title={t('bridgeTxDetailsMaxFeePerGas')}
+                value={
+                  <UserPreferencedCurrencyDisplay
+                    currency={data?.nativeCurrency}
+                    denomination={EtherDenomination.ETH}
+                    numberOfDecimals={9}
+                    value={data?.maxFeePerGas}
+                    type={PRIMARY}
+                  />
+                }
+              />
+            </Box>
+
+            <Divider />
+
+            <TransactionDetailRow
+              title={t('bridgeTxDetailsTotal')}
+              value={
+                <UserPreferencedCurrencyDisplay
+                  type={PRIMARY}
+                  value={data?.totalInHex}
+                  numberOfDecimals={data?.l1HexGasTotal ? 18 : undefined}
+                />
+              }
+            />
+
+            <Divider />
+          </Box>
+        </Content>
+      </div>
+    </div>
+  );
+};
+
+export default CrossChainSwapTxDetails;
diff --git a/ui/pages/create-account/connect-hardware/index.test.tsx b/ui/pages/create-account/connect-hardware/index.test.tsx
index 3f7782c1416d..d5f367e3d74f 100644
--- a/ui/pages/create-account/connect-hardware/index.test.tsx
+++ b/ui/pages/create-account/connect-hardware/index.test.tsx
@@ -23,6 +23,7 @@ jest.mock('../../../store/actions', () => ({
 
 jest.mock('../../../selectors', () => ({
   getCurrentChainId: () => '0x1',
+  getSelectedAddress: () => '0xselectedAddress',
   getRpcPrefsForCurrentProvider: () => {
     return {};
   },
diff --git a/ui/pages/routes/routes.component.js b/ui/pages/routes/routes.component.js
index bdc026b10a91..c70a808e4478 100644
--- a/ui/pages/routes/routes.component.js
+++ b/ui/pages/routes/routes.component.js
@@ -61,6 +61,7 @@ import {
   NOTIFICATIONS_ROUTE,
   NOTIFICATIONS_SETTINGS_ROUTE,
   CROSS_CHAIN_SWAP_ROUTE,
+  CROSS_CHAIN_SWAP_TX_DETAILS_ROUTE,
 } from '../../helpers/constants/routes';
 
 import {
@@ -87,6 +88,7 @@ import { MultichainMetaFoxLogo } from '../../components/multichain/app-header/mu
 import NetworkConfirmationPopover from '../../components/multichain/network-list-menu/network-confirmation-popover/network-confirmation-popover';
 import { ToastMaster } from '../../components/app/toast-master/toast-master';
 import { mmLazy } from '../../helpers/utils/mm-lazy';
+import CrossChainSwapTxDetails from '../bridge/transaction-details/transaction-details';
 import {
   isCorrectDeveloperTransactionType,
   isCorrectSignatureApprovalType,
@@ -317,6 +319,11 @@ export default class Routes extends Component {
           />
           <Authenticated path={SEND_ROUTE} component={SendPage} exact />
           <Authenticated path={SWAPS_ROUTE} component={Swaps} />
+          <Authenticated
+            path={`${CROSS_CHAIN_SWAP_TX_DETAILS_ROUTE}/:srcTxHash`}
+            component={CrossChainSwapTxDetails}
+            exact
+          />
           <Authenticated
             path={CROSS_CHAIN_SWAP_ROUTE}
             component={CrossChainSwap}

From 16271818cb0c7461de4d7a82e522d41c3e4b30e5 Mon Sep 17 00:00:00 2001
From: David Murdoch <187813+davidmurdoch@users.noreply.github.com>
Date: Mon, 2 Dec 2024 18:47:08 -0500
Subject: [PATCH 013/175] ci: pin image versions used in CI so it remains
 deterministic (#28779)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

We shouldn't use image versions in CI that can update all willy-nilly.
This will result in non-deterministic test runs.

`ubuntu-2404:2024.05.1` is currently the same as `ubuntu-2404:2024.05.1`
(see
https://discuss.circleci.com/t/new-ubuntu-24-04-linux-machine-executor-image/51018#linux-1)

<!--
Please submit this PR as a draft initially.
Do not mark it as "Ready for review" until the template has been
completely filled out, and PR status checks have passed at least once.


## **Description**

<!--
Write a short description of the changes included in this pull request,
also include relevant motivation and context. Have in mind the following
questions:
1. What is the reason for the change?
2. What is the improvement/solution?


[![Open in GitHub
Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/28779?quickstart=1)

## **Related issues**

Fixes:

## **Manual testing steps**

1. Go to this page...
2.
3.

## **Screenshots/Recordings**

### **Before**

### **After**


## **Pre-merge author checklist**

- [ ] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension Coding
Standards](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/CODING_GUIDELINES.md).
- [ ] I've completed the PR template to the best of my ability
- [ ] I’ve included tests if applicable
- [ ] I’ve documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [ ] I’ve applied the right labels on the PR (see [labeling
guidelines](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.

## **Pre-merge reviewer checklist**

- [ ] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed).
- [ ] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.

-->
---
 .circleci/config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index b4b02324da30..6fd9e61215cc 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -15,7 +15,7 @@ executors:
       NODE_OPTIONS: --max_old_space_size=3072
   node-linux-medium:
     machine:
-      image: ubuntu-2404:current
+      image: ubuntu-2404:2024.05.1
     resource_class: medium #// linux medium: 2 CPUs, 7.5 GB RAM, 10 credits/min
     environment:
       NODE_OPTIONS: --max_old_space_size=6144

From 7ab130c56a456913d4ae003a2fbb98f3c6729c0a Mon Sep 17 00:00:00 2001
From: Desi McAdam <desi.mcadam@gmail.com>
Date: Mon, 2 Dec 2024 16:52:27 -0700
Subject: [PATCH 014/175] chore: Improvements to codeowners (#28851)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Extension Devs is no longer in use so removing
- Sometime back the security team asked that we have a group who would
be responsible for being mindful of security concerns as it relates to
things like our CI pipeline. We needed a quick fix for that and so the
library admins group was selected but it should really be a group that
is best suited for that responsibility so we have created a new group
reflecting that here and have added them as code owners for those areas.
- Kumavis showing with the lock icon regularly was confusing for folks
so we have removed them as a specific code owner


<!--
Please submit this PR as a draft initially.
Do not mark it as "Ready for review" until the template has been
completely filled out, and PR status checks have passed at least once.
-->

## **Description**

<!--
Write a short description of the changes included in this pull request,
also include relevant motivation and context. Have in mind the following
questions:
1. What is the reason for the change?
2. What is the improvement/solution?
-->

[![Open in GitHub
Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/28851?quickstart=1)

## **Related issues**

Fixes:

## **Manual testing steps**

1. Go to this page...
2.
3.

## **Screenshots/Recordings**

<!-- If applicable, add screenshots and/or recordings to visualize the
before and after of your change. -->

### **Before**

<!-- [screenshots/recordings] -->

### **After**

<!-- [screenshots/recordings] -->

## **Pre-merge author checklist**

- [x] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension Coding
Standards](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/CODING_GUIDELINES.md).
- [x] I've completed the PR template to the best of my ability
- [x] I’ve included tests if applicable
- [x] I’ve documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [x] I’ve applied the right labels on the PR (see [labeling
guidelines](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.

## **Pre-merge reviewer checklist**

- [ ] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed).
- [ ] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.
---
 .github/CODEOWNERS | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index f37a101e6cb2..fbfad96b0ea3 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -7,9 +7,9 @@
 # follows all policies or without full understanding of the impact of
 # those changes on build, release and publishing outcomes.
 
-*                                    @MetaMask/extension-devs
-development/                         @MetaMask/extension-devs @kumavis
-lavamoat/                            @MetaMask/extension-devs @MetaMask/supply-chain
+*                                    @MetaMask/extension-platform
+development/                         @MetaMask/extension-platform
+lavamoat/                            @MetaMask/extension-platform @MetaMask/supply-chain
 
 # The offscreen.ts script file that is included in the offscreen document html
 # file is responsible, at present, for loading the snaps execution environment
@@ -28,7 +28,7 @@ offscreen/scripts/offscreen.ts       @MetaMask/snaps-devs
 # empower our CI steps. ANY addition of orbs to our CircleCI config
 # should be brought to the attention of engineering leadership for
 # discussion
-.circleci/                           @MetaMask/library-admins @kumavis
+.circleci/                           @MetaMask/extension-security-team
 
 # The privacy-snapshot.json file includes a list of all hosts that the
 # extension communicates with during the E2E test suite runs. It is not a
@@ -45,11 +45,11 @@ privacy-snapshot.json                @MetaMask/extension-privacy-reviewers
 # of contributors. Modifications to this file result in a modification of
 # that agreement and can only be approved by those with the knowledge
 # and responsibility to publish libraries under the MetaMask name.
-.github/CODEOWNERS                   @MetaMask/library-admins @kumavis
+.github/CODEOWNERS                   @MetaMask/extension-privacy-reviewers
 
 # For now, restricting approvals inside the .devcontainer folder to devs
 # who were involved with the Codespaces project.
-.devcontainer/                       @MetaMask/library-admins @HowardBraham @plasmacorral
+.devcontainer/                       @MetaMask/extension-security-team @HowardBraham
 
 # Confirmations team to own code for confirmations on UI.
 app/scripts/lib/ppom                    @MetaMask/confirmations

From 3ed6c7592dab30527a3654e9326645dcc7a18807 Mon Sep 17 00:00:00 2001
From: seaona <54408225+seaona@users.noreply.github.com>
Date: Tue, 3 Dec 2024 08:40:36 +0100
Subject: [PATCH 015/175] chore: cleanup on some names and scripts in ci
 (#28844)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<!--
Please submit this PR as a draft initially.
Do not mark it as "Ready for review" until the template has been
completely filled out, and PR status checks have passed at least once.
-->

## **Description**

After the default branch has been renamed from develop to main, there
were some names that could improve on some ci scripts/files.
This Pr updates them
It also updates how the git diff was run, to use yarn as a better
practice (pointed by Mark on another PR for the rerun-from-failed)

[![Open in GitHub
Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/28844?quickstart=1)

## **Related issues**

Fixes:

## **Manual testing steps**

1. All jobs should continue to work

## **Screenshots/Recordings**

<!-- If applicable, add screenshots and/or recordings to visualize the
before and after of your change. -->

### **Before**

<!-- [screenshots/recordings] -->

### **After**

<!-- [screenshots/recordings] -->

## **Pre-merge author checklist**

- [x] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension Coding
Standards](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/CODING_GUIDELINES.md).
- [x] I've completed the PR template to the best of my ability
- [x] I’ve included tests if applicable
- [x] I’ve documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [x] I’ve applied the right labels on the PR (see [labeling
guidelines](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.

## **Pre-merge reviewer checklist**

- [ ] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed).
- [ ] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.
---
 .circleci/config.yml                                     | 4 +++-
 .../{git-diff-develop.ts => git-diff-default-branch.ts}  | 8 ++++----
 .circleci/scripts/rerun-ci-workflow-from-failed.ts       | 9 +++++----
 package.json                                             | 3 ++-
 4 files changed, 14 insertions(+), 10 deletions(-)
 rename .circleci/scripts/{git-diff-develop.ts => git-diff-default-branch.ts} (95%)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 6fd9e61215cc..37da32cf59f3 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -125,6 +125,8 @@ workflows:
             branches:
               ignore:
                 - master
+          requires:
+            - prep-deps
       - test-deps-audit:
           requires:
             - prep-deps
@@ -491,7 +493,7 @@ jobs:
           at: .
       - run:
           name: Get changed files with git diff
-          command: npx tsx .circleci/scripts/git-diff-develop.ts
+          command: yarn git-diff-default-branch
       - persist_to_workspace:
           root: .
           paths:
diff --git a/.circleci/scripts/git-diff-develop.ts b/.circleci/scripts/git-diff-default-branch.ts
similarity index 95%
rename from .circleci/scripts/git-diff-develop.ts
rename to .circleci/scripts/git-diff-default-branch.ts
index 3800c03d3254..8db64e0f7058 100644
--- a/.circleci/scripts/git-diff-develop.ts
+++ b/.circleci/scripts/git-diff-default-branch.ts
@@ -10,7 +10,7 @@ const PR_NUMBER =
   process.env.CIRCLE_PR_NUMBER ||
   process.env.CIRCLE_PULL_REQUEST?.split('/').pop();
 
-const MAIN_BRANCH = 'main';
+const GITHUB_DEFAULT_BRANCH = 'main';
 const SOURCE_BRANCH = `refs/pull/${PR_NUMBER}/head`;
 
 const CHANGED_FILES_DIR = 'changed-files';
@@ -48,7 +48,7 @@ async function getPrInfo(): Promise<PRInfo | null> {
  */
 async function fetchWithDepth(depth: number): Promise<boolean> {
   try {
-    await exec(`git fetch --depth ${depth} origin "${MAIN_BRANCH}"`);
+    await exec(`git fetch --depth ${depth} origin "${GITHUB_DEFAULT_BRANCH}"`);
     await exec(
       `git fetch --depth ${depth} origin "${SOURCE_BRANCH}:${SOURCE_BRANCH}"`,
     );
@@ -84,7 +84,7 @@ async function fetchUntilMergeBaseFound() {
       }
     }
   }
-  await exec(`git fetch --unshallow origin "${MAIN_BRANCH}"`);
+  await exec(`git fetch --unshallow origin "${GITHUB_DEFAULT_BRANCH}"`);
 }
 
 /**
@@ -137,7 +137,7 @@ async function storeGitDiffOutputAndPrBody() {
     if (!baseRef) {
       console.log('Not a PR, skipping git diff');
       return;
-    } else if (baseRef !== MAIN_BRANCH) {
+    } else if (baseRef !== GITHUB_DEFAULT_BRANCH) {
       console.log(`This is for a PR targeting '${baseRef}', skipping git diff`);
       writePrBodyToFile(prInfo.body);
       return;
diff --git a/.circleci/scripts/rerun-ci-workflow-from-failed.ts b/.circleci/scripts/rerun-ci-workflow-from-failed.ts
index 2863ca5bcda0..3c1826a4971e 100644
--- a/.circleci/scripts/rerun-ci-workflow-from-failed.ts
+++ b/.circleci/scripts/rerun-ci-workflow-from-failed.ts
@@ -1,4 +1,5 @@
 const CIRCLE_TOKEN = process.env.API_V2_TOKEN;
+const GITHUB_DEFAULT_BRANCH = 'main';
 
 interface Actor {
   login: string;
@@ -177,7 +178,7 @@ async function rerunWorkflowById(workflowId: string) {
 }
 
 /**
- * Re-runs failed CircleCI workflows from main branch.
+ * Re-runs failed CircleCI workflows from default branch.
  * The workflow will only be re-runed if:
  *   1. It has the status of 'failed'
  *   2. It has only been run once
@@ -186,9 +187,9 @@ async function rerunWorkflowById(workflowId: string) {
  *
  * @throws Will throw an error if fetching the workflows or re-running a workflow fails.
  */
-async function rerunFailedWorkflowsFromDevelop() {
+async function rerunFailedWorkflowsFromDefaultBranch() {
   console.log('Getting Circle Ci workflows from main branch...');
-  const workflows = await getCircleCiWorkflowsByBranch('main');
+  const workflows = await getCircleCiWorkflowsByBranch(GITHUB_DEFAULT_BRANCH);
 
   console.log('Assessing if any of the workflows needs to be rerun...');
   for (const item of workflows) {
@@ -204,7 +205,7 @@ async function rerunFailedWorkflowsFromDevelop() {
   console.log('Task completed successfully!');
 }
 
-rerunFailedWorkflowsFromDevelop()
+rerunFailedWorkflowsFromDefaultBranch()
   .catch((error) => {
     console.error(error);
     process.exitCode = 1;
diff --git a/package.json b/package.json
index 803853059703..7d346d40cd0a 100644
--- a/package.json
+++ b/package.json
@@ -129,7 +129,8 @@
     "update-mock-cdn": "node test/e2e/mock-cdn/update-mock-cdn-files.js",
     "attributions:check": "./development/attributions-check.sh",
     "attributions:generate": "./development/generate-attributions.sh",
-    "ci-rerun-from-failed": "tsx .circleci/scripts/rerun-ci-workflow-from-failed.ts"
+    "ci-rerun-from-failed": "tsx .circleci/scripts/rerun-ci-workflow-from-failed.ts",
+    "git-diff-default-branch": "tsx .circleci/scripts/git-diff-default-branch.ts"
   },
   "resolutions": {
     "chokidar": "^3.6.0",

From af68fe550a1bf9f8a991c7f35e7cca3e71e11d8d Mon Sep 17 00:00:00 2001
From: chloeYue <105063779+chloeYue@users.noreply.github.com>
Date: Tue, 3 Dec 2024 11:36:54 +0100
Subject: [PATCH 016/175] test: [POM] improve homepage class implementation
 (#28797)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## **Description**

The current homepage class contains methods for asset, NFT, and activity
lists, resulting in a long file that can make it challenging to locate
specific methods. To improve organization and maintainability, I have
refactored the homepage into four separate class files:
- homepage
- asset_list
- nft_list
- activity_list

Changes:
Refactoring: Split the methods into respective class files to streamline
the structure and make the codebase more modular.
Method update: Removed the `waitUntilAssetListHasItems` method, as it
duplicates the functionality of the existing `check_tokenListItem`
method.

I added the `skip-e2e-quality-gate`label, as this PR involves many
import line changes in test specs. However, there are no functional
changes for tests and methods in this PR, i have only splitted original
functions in different files.

[![Open in GitHub
Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/27155?quickstart=1)

## **Related issues**

Fixes:

## **Manual testing steps**
Check code readability, make sure tests pass.

## **Screenshots/Recordings**

<!-- If applicable, add screenshots and/or recordings to visualize the
before and after of your change. -->

### **Before**

<!-- [screenshots/recordings] -->

### **After**

<!-- [screenshots/recordings] -->

## **Pre-merge author checklist**

- [x] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension Coding
Standards](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/CODING_GUIDELINES.md).
- [x] I've completed the PR template to the best of my ability
- [x] I’ve included tests if applicable
- [x] I’ve documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [x] I’ve applied the right labels on the PR (see [labeling
guidelines](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.

## **Pre-merge reviewer checklist**

- [x] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed).
- [x] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.

---------

Co-authored-by: Harika <153644847+hjetpoluru@users.noreply.github.com>
---
 test/e2e/page-objects/flows/login.flow.ts     |   2 +-
 .../flows/send-transaction.flow.ts            |   2 +-
 test/e2e/page-objects/flows/transaction.ts    |   2 +-
 test/e2e/page-objects/pages/asset-list.ts     | 172 ------
 .../page-objects/pages/home/activity-list.ts  | 129 +++++
 .../e2e/page-objects/pages/home/asset-list.ts | 269 ++++++++++
 test/e2e/page-objects/pages/home/homepage.ts  | 179 +++++++
 test/e2e/page-objects/pages/home/nft-list.ts  |  89 ++++
 test/e2e/page-objects/pages/homepage.ts       | 497 ------------------
 test/e2e/tests/account/add-account.spec.ts    |   8 +-
 .../e2e/tests/account/forgot-password.spec.ts |   2 +-
 test/e2e/tests/account/import-flow.spec.ts    |   2 +-
 test/e2e/tests/account/lock-account.spec.ts   |   2 +-
 .../tests/account/migrate-old-vault.spec.ts   |   2 +-
 .../snap-account-contract-interaction.spec.ts |   8 +-
 .../account/snap-account-transfers.spec.ts    |  17 +-
 .../erc20-token-send-redesign.spec.ts         |   2 +-
 .../transactions/native-send-redesign.spec.ts |   2 +-
 .../nft-token-send-redesign.spec.ts           |  13 +-
 .../multichain/aggregated-balances.spec.ts    |   6 +-
 test/e2e/tests/multichain/asset-list.spec.ts  |  15 +-
 test/e2e/tests/network/multi-rpc.spec.ts      |   2 +-
 test/e2e/tests/network/switch-network.spec.ts |   2 +-
 .../importing-private-key-account.spec.ts     |   2 +-
 .../account-syncing/new-user-sync.spec.ts     |   2 +-
 .../onboarding-with-opt-out.spec.ts           |   2 +-
 .../sync-after-adding-account.spec.ts         |   2 +-
 .../sync-after-modifying-account-name.spec.ts |   2 +-
 .../sync-after-onboarding.spec.ts             |   2 +-
 .../sync-with-account-balances.spec.ts        |   2 +-
 test/e2e/tests/onboarding/onboarding.spec.ts  |   2 +-
 .../privacy/account-tracker-api-usage.spec.ts |   2 +-
 .../onboarding-infura-call-privacy.spec.ts    |   2 +-
 ...nboarding-token-price-call-privacy.spec.ts |   2 +-
 test/e2e/tests/privacy/polling.spec.ts        |   2 +-
 .../tests/settings/change-language.spec.ts    |   2 +-
 .../settings-security-reveal-srp.spec.ts      |   2 +-
 test/e2e/tests/tokens/add-hide-token.spec.ts  |  12 +-
 .../tests/tokens/add-token-using-search.ts    |  10 +-
 .../tests/tokens/nft/auto-detect-nft.spec.ts  |   8 +-
 test/e2e/tests/tokens/nft/import-nft.spec.ts  |  31 +-
 .../tokens/watch-asset-call-add-token.ts      |   6 +-
 test/e2e/tests/transaction/ens.spec.ts        |   2 +-
 .../e2e/tests/transaction/simple-send.spec.ts |   8 +-
 .../stuck-approved-transaction.spec.ts        |  11 +-
 test/e2e/vault-decryption-chrome.spec.ts      |   2 +-
 46 files changed, 775 insertions(+), 767 deletions(-)
 delete mode 100644 test/e2e/page-objects/pages/asset-list.ts
 create mode 100644 test/e2e/page-objects/pages/home/activity-list.ts
 create mode 100644 test/e2e/page-objects/pages/home/asset-list.ts
 create mode 100644 test/e2e/page-objects/pages/home/homepage.ts
 create mode 100644 test/e2e/page-objects/pages/home/nft-list.ts
 delete mode 100644 test/e2e/page-objects/pages/homepage.ts

diff --git a/test/e2e/page-objects/flows/login.flow.ts b/test/e2e/page-objects/flows/login.flow.ts
index f5ed61946ce8..0e5f2dd6281c 100644
--- a/test/e2e/page-objects/flows/login.flow.ts
+++ b/test/e2e/page-objects/flows/login.flow.ts
@@ -1,5 +1,5 @@
 import LoginPage from '../pages/login-page';
-import HomePage from '../pages/homepage';
+import HomePage from '../pages/home/homepage';
 import { Driver } from '../../webdriver/driver';
 import { Ganache } from '../../seeder/ganache';
 
diff --git a/test/e2e/page-objects/flows/send-transaction.flow.ts b/test/e2e/page-objects/flows/send-transaction.flow.ts
index 8af88f01aca6..50928f74c8b5 100644
--- a/test/e2e/page-objects/flows/send-transaction.flow.ts
+++ b/test/e2e/page-objects/flows/send-transaction.flow.ts
@@ -1,4 +1,4 @@
-import HomePage from '../pages/homepage';
+import HomePage from '../pages/home/homepage';
 import ConfirmTxPage from '../pages/send/confirm-tx-page';
 import SendTokenPage from '../pages/send/send-token-page';
 import { Driver } from '../../webdriver/driver';
diff --git a/test/e2e/page-objects/flows/transaction.ts b/test/e2e/page-objects/flows/transaction.ts
index e2fdbd652034..c75bf3601572 100644
--- a/test/e2e/page-objects/flows/transaction.ts
+++ b/test/e2e/page-objects/flows/transaction.ts
@@ -1,7 +1,7 @@
 import { TransactionParams } from '@metamask/transaction-controller';
 import { DEFAULT_FIXTURE_ACCOUNT } from '../../constants';
 import { Driver } from '../../webdriver/driver';
-import HomePage from '../pages/homepage';
+import HomePage from '../pages/home/homepage';
 import SendTokenPage from '../pages/send/send-token-page';
 import TestDapp from '../pages/test-dapp';
 
diff --git a/test/e2e/page-objects/pages/asset-list.ts b/test/e2e/page-objects/pages/asset-list.ts
deleted file mode 100644
index 6d6d8af391bd..000000000000
--- a/test/e2e/page-objects/pages/asset-list.ts
+++ /dev/null
@@ -1,172 +0,0 @@
-import { Driver } from '../../webdriver/driver';
-
-class AssetListPage {
-  private readonly driver: Driver;
-
-  private readonly allNetworksOption =
-    '[data-testid="network-filter-all__button"]';
-
-  private readonly currentNetworkOption =
-    '[data-testid="network-filter-current__button"]';
-
-  private readonly networksToggle = '[data-testid="sort-by-networks"]';
-
-  private readonly allNetworksTotal =
-    '[data-testid="network-filter-all__total"]';
-
-  private readonly currentNetworksTotal = `${this.currentNetworkOption} [data-testid="account-value-and-suffix"]`;
-
-  constructor(driver: Driver) {
-    this.driver = driver;
-  }
-
-  async checkNetworkFilterText(expectedText: string): Promise<void> {
-    console.log(
-      `Verify the displayed account label in header is: ${expectedText}`,
-    );
-    await this.driver.waitForSelector({
-      css: this.networksToggle,
-      text: expectedText,
-    });
-  }
-
-  async openNetworksFilter(): Promise<void> {
-    console.log(`Opening the network filter`);
-    await this.driver.clickElement(this.networksToggle);
-    await this.driver.waitUntil(
-      async () => {
-        return await this.driver.findElement(this.allNetworksOption);
-      },
-      {
-        timeout: 5000,
-        interval: 100,
-      },
-    );
-  }
-
-  async getNetworksFilterLabel(): Promise<string> {
-    console.log(`Retrieving the network filter label`);
-    const toggle = await this.driver.findElement(this.networksToggle);
-    const text = await toggle.getText();
-    return text;
-  }
-
-  async clickCurrentNetworkOption(): Promise<void> {
-    console.log(`Clicking on the current network option`);
-    await this.driver.clickElement(this.currentNetworkOption);
-
-    await this.driver.waitUntil(
-      async () => {
-        const label = await this.getNetworksFilterLabel();
-        return label !== 'All networks';
-      },
-      { timeout: 5000, interval: 100 },
-    );
-  }
-
-  async waitUntilAssetListHasItems(expectedItemsCount: number): Promise<void> {
-    console.log(`Waiting until the asset list has ${expectedItemsCount} items`);
-    await this.driver.waitUntil(
-      async () => {
-        const items = await this.getNumberOfAssets();
-        return items === expectedItemsCount;
-      },
-      { timeout: 5000, interval: 100 },
-    );
-  }
-
-  async waitUntilFilterLabelIs(label: string): Promise<void> {
-    console.log(`Waiting until the filter label is ${label}`);
-    await this.driver.waitUntil(
-      async () => {
-        const currentLabel = await this.getNetworksFilterLabel();
-        return currentLabel === label;
-      },
-      { timeout: 5000, interval: 100 },
-    );
-  }
-
-  async getAllNetworksOptionTotal(): Promise<string> {
-    console.log(`Retrieving the "All networks" option fiat value`);
-    const allNetworksValueElement = await this.driver.findElement(
-      this.allNetworksTotal,
-    );
-    const value = await allNetworksValueElement.getText();
-    return value;
-  }
-
-  async clickOnAsset(assetName: string): Promise<void> {
-    const buttons = await this.driver.findElements(
-      '[data-testid="multichain-token-list-button"]',
-    );
-
-    for (const button of buttons) {
-      const text = await button.getText();
-      if (text.includes(assetName)) {
-        await button.click();
-        return;
-      }
-    }
-
-    throw new Error(`${assetName} button not found`);
-  }
-
-  async getCurrentNetworksOptionTotal(): Promise<string> {
-    console.log(`Retrieving the "Current network" option fiat value`);
-    const allNetworksValueElement = await this.driver.findElement(
-      this.currentNetworksTotal,
-    );
-    const value = await allNetworksValueElement.getText();
-    return value;
-  }
-
-  async selectNetworkFilterAllNetworks(): Promise<void> {
-    console.log(`Selecting "All networks" from the network filter`);
-    await this.driver.clickElement(this.allNetworksOption);
-
-    await this.driver.waitUntil(
-      async () => {
-        const label = await this.getNetworksFilterLabel();
-        return label === 'All networks';
-      },
-      { timeout: 5000, interval: 100 },
-    );
-  }
-
-  async selectNetworkFilterCurrentNetwork(): Promise<void> {
-    console.log(`Selecting "Current network" from the network filter`);
-    await this.driver.clickElement(this.currentNetworkOption);
-
-    await this.driver.waitUntil(
-      async () => {
-        const label = await this.getNetworksFilterLabel();
-        return label !== 'All networks';
-      },
-      { timeout: 5000, interval: 100 },
-    );
-  }
-
-  async getNumberOfAssets(): Promise<number> {
-    console.log(`Returning the total number of asset items in the token list`);
-    const assets = await this.driver.findElements(
-      '.multichain-token-list-item',
-    );
-    return assets.length;
-  }
-
-  // Added method to check if an asset is visible
-  async isAssetVisible(assetName: string): Promise<boolean> {
-    const assets = await this.driver.findElements(
-      '[data-testid="multichain-token-list-button"]',
-    );
-    for (const asset of assets) {
-      const text = await asset.getText();
-      if (text.includes(assetName)) {
-        return true;
-      }
-    }
-    return false;
-  }
-}
-
-export default AssetListPage;
diff --git a/test/e2e/page-objects/pages/home/activity-list.ts b/test/e2e/page-objects/pages/home/activity-list.ts
new file mode 100644
index 000000000000..76ea76c5932f
--- /dev/null
+++ b/test/e2e/page-objects/pages/home/activity-list.ts
@@ -0,0 +1,129 @@
+import { strict as assert } from 'assert';
+import { Driver } from '../../../webdriver/driver';
+
+class ActivityListPage {
+  private readonly driver: Driver;
+
+  private readonly completedTransactions = '[data-testid="activity-list-item"]';
+
+  private readonly confirmedTransactions = {
+    text: 'Confirmed',
+    css: '.transaction-status-label--confirmed',
+  };
+
+  private readonly failedTransactions = {
+    text: 'Failed',
+    css: '.transaction-status-label--failed',
+  };
+
+  private readonly transactionAmountsInActivity =
+    '[data-testid="transaction-list-item-primary-currency"]';
+
+  constructor(driver: Driver) {
+    this.driver = driver;
+  }
+
+  /**
+   * This function checks the specified number of completed transactions are displayed in the activity list on the homepage.
+   * It waits up to 10 seconds for the expected number of completed transactions to be visible.
+   *
+   * @param expectedNumber - The number of completed transactions expected to be displayed in the activity list. Defaults to 1.
+   * @returns A promise that resolves if the expected number of completed transactions is displayed within the timeout period.
+   */
+  async check_completedTxNumberDisplayedInActivity(
+    expectedNumber: number = 1,
+  ): Promise<void> {
+    console.log(
+      `Wait for ${expectedNumber} completed transactions to be displayed in activity list`,
+    );
+    await this.driver.wait(async () => {
+      const completedTxs = await this.driver.findElements(
+        this.completedTransactions,
+      );
+      return completedTxs.length === expectedNumber;
+    }, 10000);
+    console.log(
+      `${expectedNumber} completed transactions found in activity list on homepage`,
+    );
+  }
+
+  /**
+   * This function checks if the specified number of confirmed transactions are displayed in the activity list on homepage.
+   * It waits up to 10 seconds for the expected number of confirmed transactions to be visible.
+   *
+   * @param expectedNumber - The number of confirmed transactions expected to be displayed in activity list. Defaults to 1.
+   * @returns A promise that resolves if the expected number of confirmed transactions is displayed within the timeout period.
+   */
+  async check_confirmedTxNumberDisplayedInActivity(
+    expectedNumber: number = 1,
+  ): Promise<void> {
+    console.log(
+      `Wait for ${expectedNumber} confirmed transactions to be displayed in activity list`,
+    );
+    await this.driver.wait(async () => {
+      const confirmedTxs = await this.driver.findElements(
+        this.confirmedTransactions,
+      );
+      return confirmedTxs.length === expectedNumber;
+    }, 10000);
+    console.log(
+      `${expectedNumber} confirmed transactions found in activity list on homepage`,
+    );
+  }
+
+  /**
+   * This function checks if the specified number of failed transactions are displayed in the activity list on homepage.
+   * It waits up to 10 seconds for the expected number of failed transactions to be visible.
+   *
+   * @param expectedNumber - The number of failed transactions expected to be displayed in activity list. Defaults to 1.
+   * @returns A promise that resolves if the expected number of failed transactions is displayed within the timeout period.
+   */
+  async check_failedTxNumberDisplayedInActivity(
+    expectedNumber: number = 1,
+  ): Promise<void> {
+    console.log(
+      `Wait for ${expectedNumber} failed transactions to be displayed in activity list`,
+    );
+    await this.driver.wait(async () => {
+      const failedTxs = await this.driver.findElements(this.failedTransactions);
+      return failedTxs.length === expectedNumber;
+    }, 10000);
+    console.log(
+      `${expectedNumber} failed transactions found in activity list on homepage`,
+    );
+  }
+
+  /**
+   * This function checks if a specified transaction amount at the specified index matches the expected one.
+   *
+   * @param expectedAmount - The expected transaction amount to be displayed. Defaults to '-1 ETH'.
+   * @param expectedNumber - The 1-based index of the transaction in the activity list whose amount is to be checked.
+   * Defaults to 1, indicating the first transaction in the list.
+   * @returns A promise that resolves if the transaction amount at the specified index matches the expected amount.
+   * The promise is rejected if the amounts do not match or if an error occurs during the process.
+   * @example
+   * // To check if the third transaction in the activity list displays an amount of '2 ETH'
+   * await check_txAmountInActivity('2 ETH', 3);
+   */
+  async check_txAmountInActivity(
+    expectedAmount: string = '-1 ETH',
+    expectedNumber: number = 1,
+  ): Promise<void> {
+    const transactionAmounts = await this.driver.findElements(
+      this.transactionAmountsInActivity,
+    );
+    const transactionAmountsText = await transactionAmounts[
+      expectedNumber - 1
+    ].getText();
+    assert.equal(
+      transactionAmountsText,
+      expectedAmount,
+      `${transactionAmountsText} is displayed as transaction amount instead of ${expectedAmount} for transaction ${expectedNumber}`,
+    );
+    console.log(
+      `Amount for transaction ${expectedNumber} is displayed as ${expectedAmount}`,
+    );
+  }
+}
+
+export default ActivityListPage;
diff --git a/test/e2e/page-objects/pages/home/asset-list.ts b/test/e2e/page-objects/pages/home/asset-list.ts
new file mode 100644
index 000000000000..c80eb9e96eed
--- /dev/null
+++ b/test/e2e/page-objects/pages/home/asset-list.ts
@@ -0,0 +1,269 @@
+import { Driver } from '../../../webdriver/driver';
+
+class AssetListPage {
+  private readonly driver: Driver;
+
+  private readonly allNetworksOption =
+    '[data-testid="network-filter-all__button"]';
+
+  private readonly allNetworksTotal =
+    '[data-testid="network-filter-all__total"]';
+
+  private readonly assetOptionsButton = '[data-testid="asset-options__button"]';
+
+  private readonly confirmImportTokenButton =
+    '[data-testid="import-tokens-modal-import-button"]';
+
+  private readonly confirmImportTokenMessage = {
+    text: 'Would you like to import this token?',
+    tag: 'p',
+  };
+
+  private readonly currentNetworkOption =
+    '[data-testid="network-filter-current__button"]';
+
+  private readonly currentNetworksTotal = `${this.currentNetworkOption} [data-testid="account-value-and-suffix"]`;
+
+  private readonly hideTokenButton = '[data-testid="asset-options__hide"]';
+
+  private readonly hideTokenConfirmationButton =
+    '[data-testid="hide-token-confirmation__hide"]';
+
+  private readonly hideTokenConfirmationModalTitle = {
+    text: 'Hide token',
+    css: '.hide-token-confirmation__title',
+  };
+
+  private readonly importTokenModalTitle = { text: 'Import tokens', tag: 'h4' };
+
+  private readonly importTokensButton = '[data-testid="importTokens"]';
+
+  private readonly importTokensNextButton =
+    '[data-testid="import-tokens-button-next"]';
+
+  private readonly networksToggle = '[data-testid="sort-by-networks"]';
+
+  private readonly tokenAmountValue =
+    '[data-testid="multichain-token-list-item-value"]';
+
+  private readonly tokenListItem =
+    '[data-testid="multichain-token-list-button"]';
+
+  private readonly tokenOptionsButton = '[data-testid="import-token-button"]';
+
+  private readonly tokenSearchInput = 'input[placeholder="Search tokens"]';
+
+  constructor(driver: Driver) {
+    this.driver = driver;
+  }
+
+  async clickCurrentNetworkOption(): Promise<void> {
+    console.log(`Clicking on the current network option`);
+    await this.driver.clickElement(this.currentNetworkOption);
+    await this.driver.waitUntil(
+      async () => {
+        const label = await this.getNetworksFilterLabel();
+        return label !== 'All networks';
+      },
+      { timeout: 5000, interval: 100 },
+    );
+  }
+
+  async clickOnAsset(assetName: string): Promise<void> {
+    const buttons = await this.driver.findElements(this.tokenListItem);
+    for (const button of buttons) {
+      const text = await button.getText();
+      if (text.includes(assetName)) {
+        await button.click();
+        return;
+      }
+    }
+    throw new Error(`${assetName} button not found`);
+  }
+
+  async getAllNetworksOptionTotal(): Promise<string> {
+    console.log(`Retrieving the "All networks" option fiat value`);
+    const allNetworksValueElement = await this.driver.findElement(
+      this.allNetworksTotal,
+    );
+    const value = await allNetworksValueElement.getText();
+    return value;
+  }
+
+  async getCurrentNetworksOptionTotal(): Promise<string> {
+    console.log(`Retrieving the "Current network" option fiat value`);
+    const allNetworksValueElement = await this.driver.findElement(
+      this.currentNetworksTotal,
+    );
+    const value = await allNetworksValueElement.getText();
+    return value;
+  }
+
+  async getNetworksFilterLabel(): Promise<string> {
+    console.log(`Retrieving the network filter label`);
+    const toggle = await this.driver.findElement(this.networksToggle);
+    const text = await toggle.getText();
+    return text;
+  }
+
+  async getNumberOfAssets(): Promise<number> {
+    console.log(`Returning the total number of asset items in the token list`);
+    const assets = await this.driver.findElements(this.tokenListItem);
+    return assets.length;
+  }
+
+  /**
+   * Hides a token by clicking on the token name, and confirming the hide modal.
+   *
+   * @param tokenName - The name of the token to hide.
+   */
+  async hideToken(tokenName: string): Promise<void> {
+    console.log(`Hide token ${tokenName} on homepage`);
+    await this.driver.clickElement({ text: tokenName, tag: 'span' });
+    await this.driver.clickElement(this.assetOptionsButton);
+    await this.driver.clickElement(this.hideTokenButton);
+    await this.driver.waitForSelector(this.hideTokenConfirmationModalTitle);
+    await this.driver.clickElementAndWaitToDisappear(
+      this.hideTokenConfirmationButton,
+    );
+  }
+
+  async importTokenBySearch(tokenName: string) {
+    console.log(`Import token ${tokenName} on homepage by search`);
+    await this.driver.clickElement(this.tokenOptionsButton);
+    await this.driver.clickElement(this.importTokensButton);
+    await this.driver.waitForSelector(this.importTokenModalTitle);
+    await this.driver.fill(this.tokenSearchInput, tokenName);
+    await this.driver.clickElement({ text: tokenName, tag: 'p' });
+    await this.driver.clickElement(this.importTokensNextButton);
+    await this.driver.waitForSelector(this.confirmImportTokenMessage);
+    await this.driver.clickElementAndWaitToDisappear(
+      this.confirmImportTokenButton,
+    );
+  }
+
+  async openNetworksFilter(): Promise<void> {
+    console.log(`Opening the network filter`);
+    await this.driver.clickElement(this.networksToggle);
+    await this.driver.waitUntil(
+      async () => {
+        return await this.driver.findElement(this.allNetworksOption);
+      },
+      {
+        timeout: 5000,
+        interval: 100,
+      },
+    );
+  }
+
+  async selectNetworkFilterAllNetworks(): Promise<void> {
+    console.log(`Selecting "All networks" from the network filter`);
+    await this.driver.clickElement(this.allNetworksOption);
+    await this.driver.waitUntil(
+      async () => {
+        const label = await this.getNetworksFilterLabel();
+        return label === 'All networks';
+      },
+      { timeout: 5000, interval: 100 },
+    );
+  }
+
+  async selectNetworkFilterCurrentNetwork(): Promise<void> {
+    console.log(`Selecting "Current network" from the network filter`);
+    await this.driver.clickElement(this.currentNetworkOption);
+    await this.driver.waitUntil(
+      async () => {
+        const label = await this.getNetworksFilterLabel();
+        return label !== 'All networks';
+      },
+      { timeout: 5000, interval: 100 },
+    );
+  }
+
+  async waitUntilFilterLabelIs(label: string): Promise<void> {
+    console.log(`Waiting until the filter label is ${label}`);
+    await this.driver.waitUntil(
+      async () => {
+        const currentLabel = await this.getNetworksFilterLabel();
+        return currentLabel === label;
+      },
+      { timeout: 5000, interval: 100 },
+    );
+  }
+
+  async check_ifAssetIsVisible(assetName: string): Promise<boolean> {
+    const assets = await this.driver.findElements(this.tokenListItem);
+    for (const asset of assets) {
+      const text = await asset.getText();
+      if (text.includes(assetName)) {
+        return true;
+      }
+    }
+    return false;
+  }
+
+  async check_networkFilterText(expectedText: string): Promise<void> {
+    console.log(
+      `Verify the displayed account label in header is: ${expectedText}`,
+    );
+    await this.driver.waitForSelector({
+      css: this.networksToggle,
+      text: expectedText,
+    });
+  }
+
+  /**
+   * Checks if the specified token amount is displayed in the token list.
+   *
+   * @param tokenAmount - The token amount to be checked for.
+   */
+  async check_tokenAmountIsDisplayed(tokenAmount: string): Promise<void> {
+    console.log(`Waiting for token amount ${tokenAmount} to be displayed`);
+    await this.driver.waitForSelector({
+      css: this.tokenAmountValue,
+      text: tokenAmount,
+    });
+  }
+
+  /**
+   * Checks if the specified token amount is displayed in the token details modal.
+   *
+   * @param tokenName - The name of the token to check for.
+   * @param tokenAmount - The token amount to be checked for.
+   */
+  async check_tokenAmountInTokenDetailsModal(
+    tokenName: string,
+    tokenAmount: string,
+  ): Promise<void> {
+    console.log(
+      `Check that token amount ${tokenAmount} is displayed in token details modal for token ${tokenName}`,
+    );
+    await this.driver.clickElement({
+      tag: 'span',
+      text: tokenName,
+    });
+    await this.driver.waitForSelector({
+      css: this.tokenAmountValue,
+      text: tokenAmount,
+    });
+  }
+
+  /**
+   * This function checks if the specified number of token items is displayed in the token list.
+   *
+   * @param expectedNumber - The number of token items expected to be displayed. Defaults to 1.
+   * @returns A promise that resolves if the expected number of token items is displayed.
+   */
+  async check_tokenItemNumber(expectedNumber: number = 1): Promise<void> {
+    console.log(`Waiting for ${expectedNumber} token items to be displayed`);
+    await this.driver.wait(async () => {
+      const tokenItemsNumber = await this.getNumberOfAssets();
+      return tokenItemsNumber === expectedNumber;
+    }, 10000);
+    console.log(
+      `Expected number of token items ${expectedNumber} is displayed.`,
+    );
+  }
+}
+
+export default AssetListPage;
diff --git a/test/e2e/page-objects/pages/home/homepage.ts b/test/e2e/page-objects/pages/home/homepage.ts
new file mode 100644
index 000000000000..6b6197eed797
--- /dev/null
+++ b/test/e2e/page-objects/pages/home/homepage.ts
@@ -0,0 +1,179 @@
+import { Driver } from '../../../webdriver/driver';
+import { Ganache } from '../../../seeder/ganache';
+import { getCleanAppState } from '../../../helpers';
+import HeaderNavbar from '../header-navbar';
+
+class HomePage {
+  private driver: Driver;
+
+  public headerNavbar: HeaderNavbar;
+
+  private readonly activityTab =
+    '[data-testid="account-overview__activity-tab"]';
+
+  private readonly balance = '[data-testid="eth-overview__primary-currency"]';
+
+  private readonly basicFunctionalityOffWarningMessage = {
+    text: 'Basic functionality is off',
+    css: '.mm-banner-alert',
+  };
+
+  private readonly closeUseNetworkNotificationModalButton = {
+    text: 'Got it',
+    tag: 'h6',
+  };
+
+  private readonly nftTab = '[data-testid="account-overview__nfts-tab"]';
+
+  private readonly popoverBackground = '.popover-bg';
+
+  private readonly popoverCloseButton = '[data-testid="popover-close"]';
+
+  private readonly sendButton = '[data-testid="eth-overview-send"]';
+
+  private readonly tokensTab = '[data-testid="account-overview__asset-tab"]';
+
+  constructor(driver: Driver) {
+    this.driver = driver;
+    this.headerNavbar = new HeaderNavbar(driver);
+  }
+
+  async check_pageIsLoaded(): Promise<void> {
+    try {
+      await this.driver.waitForMultipleSelectors([
+        this.sendButton,
+        this.activityTab,
+        this.tokensTab,
+      ]);
+    } catch (e) {
+      console.log('Timeout while waiting for home page to be loaded', e);
+      throw e;
+    }
+    console.log('Home page is loaded');
+  }
+
+  async closePopover(): Promise<void> {
+    console.log('Closing popover');
+    await this.driver.clickElement(this.popoverCloseButton);
+  }
+
+  async closeUseNetworkNotificationModal(): Promise<void> {
+    // We need to use clickElementSafe + assertElementNotPresent as sometimes the network dialog doesn't appear, as per this issue (#25788)
+    // TODO: change the 2 actions for clickElementAndWaitToDisappear, once the issue is fixed
+    await this.driver.assertElementNotPresent(this.popoverBackground);
+    await this.driver.clickElementSafe(
+      this.closeUseNetworkNotificationModalButton,
+    );
+    await this.driver.assertElementNotPresent(
+      this.closeUseNetworkNotificationModalButton,
+    );
+  }
+
+  async goToActivityList(): Promise<void> {
+    console.log(`Open activity tab on homepage`);
+    await this.driver.clickElement(this.activityTab);
+  }
+
+  async goToNftTab(): Promise<void> {
+    console.log(`Go to NFT tab on homepage`);
+    await this.driver.clickElement(this.nftTab);
+  }
+
+  async startSendFlow(): Promise<void> {
+    await this.driver.clickElement(this.sendButton);
+  }
+
+  /**
+   * Checks if the toaster message for adding a network is displayed on the homepage.
+   *
+   * @param networkName - The name of the network that was added.
+   */
+  async check_addNetworkMessageIsDisplayed(networkName: string): Promise<void> {
+    console.log(
+      `Check the toaster message for adding network ${networkName} is displayed on homepage`,
+    );
+    await this.driver.waitForSelector({
+      tag: 'h6',
+      text: `“${networkName}” was successfully added!`,
+    });
+  }
+
+  async check_basicFunctionalityOffWarnigMessageIsDisplayed(): Promise<void> {
+    console.log(
+      'Check if basic functionality off warning message is displayed on homepage',
+    );
+    await this.driver.waitForSelector(this.basicFunctionalityOffWarningMessage);
+  }
+
+  /**
+   * Checks if the toaster message for editing a network is displayed on the homepage.
+   *
+   * @param networkName - The name of the network that was edited.
+   */
+  async check_editNetworkMessageIsDisplayed(
+    networkName: string,
+  ): Promise<void> {
+    console.log(
+      `Check the toaster message for editing network ${networkName} is displayed on homepage`,
+    );
+    await this.driver.waitForSelector({
+      tag: 'h6',
+      text: `“${networkName}” was successfully edited!`,
+    });
+  }
+
+  /**
+   * Checks if the expected balance is displayed on homepage.
+   *
+   * @param expectedBalance - The expected balance to be displayed. Defaults to '0'.
+   * @param symbol - The symbol of the currency or token. Defaults to 'ETH'.
+   */
+  async check_expectedBalanceIsDisplayed(
+    expectedBalance: string = '0',
+    symbol: string = 'ETH',
+  ): Promise<void> {
+    try {
+      await this.driver.waitForSelector({
+        css: this.balance,
+        text: expectedBalance,
+      });
+    } catch (e) {
+      const balance = await this.driver.waitForSelector(this.balance);
+      const currentBalance = parseFloat(await balance.getText());
+      const errorMessage = `Expected balance ${expectedBalance} ${symbol}, got balance ${currentBalance} ${symbol}`;
+      console.log(errorMessage, e);
+      throw e;
+    }
+    console.log(
+      `Expected balance ${expectedBalance} ${symbol} is displayed on homepage`,
+    );
+  }
+
+  /**
+   * This function checks if account syncing has been successfully completed at least once.
+   */
+  async check_hasAccountSyncingSyncedAtLeastOnce(): Promise<void> {
+    console.log('Check if account syncing has synced at least once');
+    await this.driver.wait(async () => {
+      const uiState = await getCleanAppState(this.driver);
+      return uiState.metamask.hasAccountSyncingSyncedAtLeastOnce === true;
+    }, 10000);
+  }
+
+  async check_localBlockchainBalanceIsDisplayed(
+    localBlockchainServer?: Ganache,
+    address = null,
+  ): Promise<void> {
+    let expectedBalance: string;
+    if (localBlockchainServer) {
+      expectedBalance = (
+        await localBlockchainServer.getBalance(address)
+      ).toString();
+    } else {
+      expectedBalance = '0';
+    }
+    await this.check_expectedBalanceIsDisplayed(expectedBalance);
+  }
+}
+
+export default HomePage;
diff --git a/test/e2e/page-objects/pages/home/nft-list.ts b/test/e2e/page-objects/pages/home/nft-list.ts
new file mode 100644
index 000000000000..e26a98e44a92
--- /dev/null
+++ b/test/e2e/page-objects/pages/home/nft-list.ts
@@ -0,0 +1,89 @@
+import { Driver } from '../../../webdriver/driver';
+
+class NftListPage {
+  private readonly driver: Driver;
+
+  private readonly confirmImportNftButton =
+    '[data-testid="import-nfts-modal-import-button"]';
+
+  private readonly importNftAddressInput = '#address';
+
+  private readonly importNftButton = '[data-testid="import-nft-button"]';
+
+  private readonly importNftModalTitle = { text: 'Import NFT', tag: 'header' };
+
+  private readonly importNftTokenIdInput = '#token-id';
+
+  private readonly nftIconOnActivityList = '[data-testid="nft-item"]';
+
+  private readonly successImportNftMessage = {
+    text: 'NFT was successfully added!',
+    tag: 'h6',
+  };
+
+  constructor(driver: Driver) {
+    this.driver = driver;
+  }
+
+  async clickNFTIconOnActivityList() {
+    await this.driver.clickElement(this.nftIconOnActivityList);
+  }
+
+  /**
+   * Imports an NFT by entering the NFT contract address and token ID
+   *
+   * @param nftContractAddress - The address of the NFT contract to import
+   * @param id - The ID of the NFT to import
+   * @param expectedErrorMessage - Expected error message if the import should fail
+   */
+  async importNft(
+    nftContractAddress: string,
+    id: string,
+    expectedErrorMessage?: string,
+  ) {
+    await this.driver.clickElement(this.importNftButton);
+    await this.driver.waitForSelector(this.importNftModalTitle);
+    await this.driver.fill(this.importNftAddressInput, nftContractAddress);
+    await this.driver.fill(this.importNftTokenIdInput, id);
+    if (expectedErrorMessage) {
+      await this.driver.clickElement(this.confirmImportNftButton);
+      await this.driver.waitForSelector({
+        tag: 'p',
+        text: expectedErrorMessage,
+      });
+    } else {
+      await this.driver.clickElementAndWaitToDisappear(
+        this.confirmImportNftButton,
+      );
+    }
+  }
+
+  async check_nftImageIsDisplayed(): Promise<void> {
+    console.log('Check that NFT image is displayed in NFT tab on homepage');
+    await this.driver.waitForSelector(this.nftIconOnActivityList);
+  }
+
+  /**
+   * Checks if the NFT item with the specified name is displayed in the homepage nft tab.
+   *
+   * @param nftName - The name of the NFT to check for.
+   */
+  async check_nftNameIsDisplayed(nftName: string): Promise<void> {
+    console.log(
+      `Check that NFT item ${nftName} is displayed in NFT tab on homepage`,
+    );
+    await this.driver.waitForSelector({
+      tag: 'h5',
+      text: nftName,
+    });
+  }
+
+  async check_successImportNftMessageIsDisplayed(): Promise<void> {
+    console.log(
+      'Check that success imported NFT message is displayed on homepage',
+    );
+    await this.driver.waitForSelector(this.successImportNftMessage);
+  }
+}
+
+export default NftListPage;
diff --git a/test/e2e/page-objects/pages/homepage.ts b/test/e2e/page-objects/pages/homepage.ts
deleted file mode 100644
index 3722f35f98d9..000000000000
--- a/test/e2e/page-objects/pages/homepage.ts
+++ /dev/null
@@ -1,497 +0,0 @@
-import { strict as assert } from 'assert';
-import { Driver } from '../../webdriver/driver';
-import { Ganache } from '../../seeder/ganache';
-import { getCleanAppState } from '../../helpers';
-import HeaderNavbar from './header-navbar';
-
-class HomePage {
-  private driver: Driver;
-
-  public headerNavbar: HeaderNavbar;
-
-  private readonly activityTab =
-    '[data-testid="account-overview__activity-tab"]';
-
-  private readonly balance = '[data-testid="eth-overview__primary-currency"]';
-
-  private readonly basicFunctionalityOffWarningMessage = {
-    text: 'Basic functionality is off',
-    css: '.mm-banner-alert',
-  };
-
-  private readonly closeUseNetworkNotificationModalButton = {
-    text: 'Got it',
-    tag: 'h6',
-  };
-
-  private readonly completedTransactions = '[data-testid="activity-list-item"]';
-
-  private readonly confirmedTransactions = {
-    text: 'Confirmed',
-    css: '.transaction-status-label--confirmed',
-  };
-
-  private readonly failedTransactions = {
-    text: 'Failed',
-    css: '.transaction-status-label--failed',
-  };
-
-  private readonly popoverBackground = '.popover-bg';
-
-  private readonly sendButton = '[data-testid="eth-overview-send"]';
-
-  private readonly tokensTab = '[data-testid="account-overview__asset-tab"]';
-
-  private readonly transactionAmountsInActivity =
-    '[data-testid="transaction-list-item-primary-currency"]';
-
-  // Token tab selectors
-  private readonly assetOptionsButton = '[data-testid="asset-options__button"]';
-
-  private readonly confirmImportTokenButton =
-    '[data-testid="import-tokens-modal-import-button"]';
-
-  private readonly confirmImportTokenMessage = {
-    text: 'Would you like to import this token?',
-    tag: 'p',
-  };
-
-  private readonly hideTokenButton = '[data-testid="asset-options__hide"]';
-
-  private readonly hideTokenConfirmationButton =
-    '[data-testid="hide-token-confirmation__hide"]';
-
-  private readonly hideTokenConfirmationModalTitle = {
-    text: 'Hide token',
-    css: '.hide-token-confirmation__title',
-  };
-
-  private readonly importTokenModalTitle = { text: 'Import tokens', tag: 'h4' };
-
-  private readonly importTokensButton = '[data-testid="importTokens"]';
-
-  private readonly importTokensNextButton =
-    '[data-testid="import-tokens-button-next"]';
-
-  private readonly tokenAmountValue =
-    '[data-testid="multichain-token-list-item-value"]';
-
-  private readonly tokenLisiItem =
-    '[data-testid="multichain-token-list-button"]';
-
-  private readonly tokenOptionsButton = '[data-testid="import-token-button"]';
-
-  private readonly tokenSearchInput = 'input[placeholder="Search tokens"]';
-
-  // NFT selectors
-  private readonly confirmImportNftButton =
-    '[data-testid="import-nfts-modal-import-button"]';
-
-  private readonly importNftAddressInput = '#address';
-
-  private readonly importNftButton = '[data-testid="import-nft-button"]';
-
-  private readonly importNftModalTitle = { text: 'Import NFT', tag: 'header' };
-
-  private readonly importNftTokenIdInput = '#token-id';
-
-  private readonly nftIconOnActivityList = '[data-testid="nft-item"]';
-
-  private readonly nftTab = '[data-testid="account-overview__nfts-tab"]';
-
-  private readonly popoverCloseButton = '[data-testid="popover-close"]';
-
-  private readonly successImportNftMessage = {
-    text: 'NFT was successfully added!',
-    tag: 'h6',
-  };
-
-  constructor(driver: Driver) {
-    this.driver = driver;
-    this.headerNavbar = new HeaderNavbar(driver);
-  }
-
-  async check_pageIsLoaded(): Promise<void> {
-    try {
-      await this.driver.waitForMultipleSelectors([
-        this.sendButton,
-        this.activityTab,
-        this.tokensTab,
-      ]);
-    } catch (e) {
-      console.log('Timeout while waiting for home page to be loaded', e);
-      throw e;
-    }
-    console.log('Home page is loaded');
-  }
-
-  async clickNFTIconOnActivityList() {
-    await this.driver.clickElement(this.nftIconOnActivityList);
-  }
-
-  async closePopover(): Promise<void> {
-    console.log('Closing popover');
-    await this.driver.clickElement(this.popoverCloseButton);
-  }
-
-  async closeUseNetworkNotificationModal(): Promise<void> {
-    // We need to use clickElementSafe + assertElementNotPresent as sometimes the network dialog doesn't appear, as per this issue (#25788)
-    // TODO: change the 2 actions for clickElementAndWaitToDisappear, once the issue is fixed
-    await this.driver.assertElementNotPresent(this.popoverBackground);
-    await this.driver.clickElementSafe(
-      this.closeUseNetworkNotificationModalButton,
-    );
-    await this.driver.assertElementNotPresent(
-      this.closeUseNetworkNotificationModalButton,
-    );
-  }
-
-  async goToActivityList(): Promise<void> {
-    console.log(`Open activity tab on homepage`);
-    await this.driver.clickElement(this.activityTab);
-  }
-
-  async goToNftTab(): Promise<void> {
-    console.log(`Go to NFT tab on homepage`);
-    await this.driver.clickElement(this.nftTab);
-  }
-
-  /**
-   * Hides a token by clicking on the token name, and confirming the hide modal.
-   *
-   * @param tokenName - The name of the token to hide.
-   */
-  async hideToken(tokenName: string): Promise<void> {
-    console.log(`Hide token ${tokenName} on homepage`);
-    await this.driver.clickElement({ text: tokenName, tag: 'span' });
-    await this.driver.clickElement(this.assetOptionsButton);
-    await this.driver.clickElement(this.hideTokenButton);
-    await this.driver.waitForSelector(this.hideTokenConfirmationModalTitle);
-    await this.driver.clickElementAndWaitToDisappear(
-      this.hideTokenConfirmationButton,
-    );
-  }
-
-  async startSendFlow(): Promise<void> {
-    await this.driver.clickElement(this.sendButton);
-  }
-
-  /**
-   * Imports an NFT by entering the NFT contract address and token ID
-   *
-   * @param nftContractAddress - The address of the NFT contract to import
-   * @param id - The ID of the NFT to import
-   * @param expectedErrorMessage - Expected error message if the import should fail
-   */
-  async importNft(
-    nftContractAddress: string,
-    id: string,
-    expectedErrorMessage?: string,
-  ) {
-    await this.driver.clickElement(this.importNftButton);
-    await this.driver.waitForSelector(this.importNftModalTitle);
-    await this.driver.fill(this.importNftAddressInput, nftContractAddress);
-    await this.driver.fill(this.importNftTokenIdInput, id);
-    if (expectedErrorMessage) {
-      await this.driver.clickElement(this.confirmImportNftButton);
-      await this.driver.waitForSelector({
-        tag: 'p',
-        text: expectedErrorMessage,
-      });
-    } else {
-      await this.driver.clickElementAndWaitToDisappear(
-        this.confirmImportNftButton,
-      );
-    }
-  }
-
-  async importTokenBySearch(tokenName: string) {
-    console.log(`Import token ${tokenName} on homepage by search`);
-    await this.driver.clickElement(this.tokenOptionsButton);
-    await this.driver.clickElement(this.importTokensButton);
-    await this.driver.waitForSelector(this.importTokenModalTitle);
-    await this.driver.fill(this.tokenSearchInput, tokenName);
-    await this.driver.clickElement({ text: tokenName, tag: 'p' });
-    await this.driver.clickElement(this.importTokensNextButton);
-    await this.driver.waitForSelector(this.confirmImportTokenMessage);
-    await this.driver.clickElementAndWaitToDisappear(
-      this.confirmImportTokenButton,
-    );
-  }
-
-  /**
-   * Checks if the toaster message for adding a network is displayed on the homepage.
-   *
-   * @param networkName - The name of the network that was added.
-   */
-  async check_addNetworkMessageIsDisplayed(networkName: string): Promise<void> {
-    console.log(
-      `Check the toaster message for adding network ${networkName} is displayed on homepage`,
-    );
-    await this.driver.waitForSelector({
-      tag: 'h6',
-      text: `“${networkName}” was successfully added!`,
-    });
-  }
-
-  async check_basicFunctionalityOffWarnigMessageIsDisplayed(): Promise<void> {
-    console.log(
-      'Check if basic functionality off warning message is displayed on homepage',
-    );
-    await this.driver.waitForSelector(this.basicFunctionalityOffWarningMessage);
-  }
-
-  /**
-   * This function checks the specified number of completed transactions are displayed in the activity list on the homepage.
-   * It waits up to 10 seconds for the expected number of completed transactions to be visible.
-   *
-   * @param expectedNumber - The number of completed transactions expected to be displayed in the activity list. Defaults to 1.
-   * @returns A promise that resolves if the expected number of completed transactions is displayed within the timeout period.
-   */
-  async check_completedTxNumberDisplayedInActivity(
-    expectedNumber: number = 1,
-  ): Promise<void> {
-    console.log(
-      `Wait for ${expectedNumber} completed transactions to be displayed in activity list`,
-    );
-    await this.driver.wait(async () => {
-      const completedTxs = await this.driver.findElements(
-        this.completedTransactions,
-      );
-      return completedTxs.length === expectedNumber;
-    }, 10000);
-    console.log(
-      `${expectedNumber} completed transactions found in activity list on homepage`,
-    );
-  }
-
-  /**
-   * This function checks if the specified number of confirmed transactions are displayed in the activity list on homepage.
-   * It waits up to 10 seconds for the expected number of confirmed transactions to be visible.
-   *
-   * @param expectedNumber - The number of confirmed transactions expected to be displayed in activity list. Defaults to 1.
-   * @returns A promise that resolves if the expected number of confirmed transactions is displayed within the timeout period.
-   */
-  async check_confirmedTxNumberDisplayedInActivity(
-    expectedNumber: number = 1,
-  ): Promise<void> {
-    console.log(
-      `Wait for ${expectedNumber} confirmed transactions to be displayed in activity list`,
-    );
-    await this.driver.wait(async () => {
-      const confirmedTxs = await this.driver.findElements(
-        this.confirmedTransactions,
-      );
-      return confirmedTxs.length === expectedNumber;
-    }, 10000);
-    console.log(
-      `${expectedNumber} confirmed transactions found in activity list on homepage`,
-    );
-  }
-
-  async check_nftImageIsDisplayed(): Promise<void> {
-    console.log('Check that NFT image is displayed in NFT tab on homepage');
-    await this.driver.waitForSelector(this.nftIconOnActivityList);
-  }
-
-  /**
-   * Checks if the toaster message for editing a network is displayed on the homepage.
-   *
-   * @param networkName - The name of the network that was edited.
-   */
-  async check_editNetworkMessageIsDisplayed(
-    networkName: string,
-  ): Promise<void> {
-    console.log(
-      `Check the toaster message for editing network ${networkName} is displayed on homepage`,
-    );
-    await this.driver.waitForSelector({
-      tag: 'h6',
-      text: `“${networkName}” was successfully edited!`,
-    });
-  }
-
-  /**
-   * Checks if the expected balance is displayed on homepage.
-   *
-   * @param expectedBalance - The expected balance to be displayed. Defaults to '0'.
-   * @param symbol - The symbol of the currency or token. Defaults to 'ETH'.
-   */
-  async check_expectedBalanceIsDisplayed(
-    expectedBalance: string = '0',
-    symbol: string = 'ETH',
-  ): Promise<void> {
-    try {
-      await this.driver.waitForSelector({
-        css: this.balance,
-        text: expectedBalance,
-      });
-    } catch (e) {
-      const balance = await this.driver.waitForSelector(this.balance);
-      const currentBalance = parseFloat(await balance.getText());
-      const errorMessage = `Expected balance ${expectedBalance} ${symbol}, got balance ${currentBalance} ${symbol}`;
-      console.log(errorMessage, e);
-      throw e;
-    }
-    console.log(
-      `Expected balance ${expectedBalance} ${symbol} is displayed on homepage`,
-    );
-  }
-
-  /**
-   * This function checks if the specified number of failed transactions are displayed in the activity list on homepage.
-   * It waits up to 10 seconds for the expected number of failed transactions to be visible.
-   *
-   * @param expectedNumber - The number of failed transactions expected to be displayed in activity list. Defaults to 1.
-   * @returns A promise that resolves if the expected number of failed transactions is displayed within the timeout period.
-   */
-  async check_failedTxNumberDisplayedInActivity(
-    expectedNumber: number = 1,
-  ): Promise<void> {
-    console.log(
-      `Wait for ${expectedNumber} failed transactions to be displayed in activity list`,
-    );
-    await this.driver.wait(async () => {
-      const failedTxs = await this.driver.findElements(this.failedTransactions);
-      return failedTxs.length === expectedNumber;
-    }, 10000);
-    console.log(
-      `${expectedNumber} failed transactions found in activity list on homepage`,
-    );
-  }
-
-  async check_localBlockchainBalanceIsDisplayed(
-    localBlockchainServer?: Ganache,
-    address = null,
-  ): Promise<void> {
-    let expectedBalance: string;
-    if (localBlockchainServer) {
-      expectedBalance = (
-        await localBlockchainServer.getBalance(address)
-      ).toString();
-    } else {
-      expectedBalance = '0';
-    }
-    await this.check_expectedBalanceIsDisplayed(expectedBalance);
-  }
-
-  /**
-   * Checks if the NFT item with the specified name is displayed in the homepage nft tab.
-   *
-   * @param nftName - The name of the NFT to check for.
-   */
-  async check_nftNameIsDisplayed(nftName: string): Promise<void> {
-    console.log(
-      `Check that NFT item ${nftName} is displayed in NFT tab on homepage`,
-    );
-    await this.driver.waitForSelector({
-      tag: 'h5',
-      text: nftName,
-    });
-  }
-
-  async check_successImportNftMessageIsDisplayed(): Promise<void> {
-    console.log(
-      'Check that success imported NFT message is displayed on homepage',
-    );
-    await this.driver.waitForSelector(this.successImportNftMessage);
-  }
-
-  /**
-   * Checks if the specified token amount is displayed in the token list.
-   *
-   * @param tokenAmount - The token amount to be checked for.
-   */
-  async check_tokenAmountIsDisplayed(tokenAmount: string): Promise<void> {
-    console.log(`Waiting for token amount ${tokenAmount} to be displayed`);
-    await this.driver.waitForSelector({
-      css: this.tokenAmountValue,
-      text: tokenAmount,
-    });
-  }
-
-  /**
-   * Checks if the specified token amount is displayed in the token details modal.
-   *
-   * @param tokenName - The name of the token to check for.
-   * @param tokenAmount - The token amount to be checked for.
-   */
-  async check_tokenAmountInTokenDetailsModal(
-    tokenName: string,
-    tokenAmount: string,
-  ): Promise<void> {
-    console.log(
-      `Check that token amount ${tokenAmount} is displayed in token details modal for token ${tokenName}`,
-    );
-    await this.driver.clickElement({
-      tag: 'span',
-      text: tokenName,
-    });
-    await this.driver.waitForSelector({
-      css: this.tokenAmountValue,
-      text: tokenAmount,
-    });
-  }
-
-  /**
-   * This function checks if the specified number of token items is displayed in the token list.
-   *
-   * @param expectedNumber - The number of token items expected to be displayed. Defaults to 1.
-   * @returns A promise that resolves if the expected number of token items is displayed.
-   */
-  async check_tokenItemNumber(expectedNumber: number = 1): Promise<void> {
-    console.log(`Waiting for ${expectedNumber} token items to be displayed`);
-    await this.driver.wait(async () => {
-      const tokenItems = await this.driver.findElements(this.tokenLisiItem);
-      return tokenItems.length === expectedNumber;
-    }, 10000);
-    console.log(
-      `Expected number of token items ${expectedNumber} is displayed.`,
-    );
-  }
-
-  /**
-   * This function checks if a specified transaction amount at the specified index matches the expected one.
-   *
-   * @param expectedAmount - The expected transaction amount to be displayed. Defaults to '-1 ETH'.
-   * @param expectedNumber - The 1-based index of the transaction in the activity list whose amount is to be checked.
-   * Defaults to 1, indicating the first transaction in the list.
-   * @returns A promise that resolves if the transaction amount at the specified index matches the expected amount.
-   * The promise is rejected if the amounts do not match or if an error occurs during the process.
-   * @example
-   * // To check if the third transaction in the activity list displays an amount of '2 ETH'
-   * await check_txAmountInActivity('2 ETH', 3);
-   */
-  async check_txAmountInActivity(
-    expectedAmount: string = '-1 ETH',
-    expectedNumber: number = 1,
-  ): Promise<void> {
-    const transactionAmounts = await this.driver.findElements(
-      this.transactionAmountsInActivity,
-    );
-    const transactionAmountsText = await transactionAmounts[
-      expectedNumber - 1
-    ].getText();
-    assert.equal(
-      transactionAmountsText,
-      expectedAmount,
-      `${transactionAmountsText} is displayed as transaction amount instead of ${expectedAmount} for transaction ${expectedNumber}`,
-    );
-    console.log(
-      `Amount for transaction ${expectedNumber} is displayed as ${expectedAmount}`,
-    );
-  }
-
-  /**
-   * This function checks if account syncing has been successfully completed at least once.
-   */
-  async check_hasAccountSyncingSyncedAtLeastOnce(): Promise<void> {
-    console.log('Check if account syncing has synced at least once');
-    await this.driver.wait(async () => {
-      const uiState = await getCleanAppState(this.driver);
-      return uiState.metamask.hasAccountSyncingSyncedAtLeastOnce === true;
-    }, 10000);
-  }
-}
-
-export default HomePage;
diff --git a/test/e2e/tests/account/add-account.spec.ts b/test/e2e/tests/account/add-account.spec.ts
index 906e01f50b4d..46eb27cab900 100644
--- a/test/e2e/tests/account/add-account.spec.ts
+++ b/test/e2e/tests/account/add-account.spec.ts
@@ -10,8 +10,9 @@ import { loginWithBalanceValidation } from '../../page-objects/flows/login.flow'
 import { completeImportSRPOnboardingFlow } from '../../page-objects/flows/onboarding.flow';
 import { sendTransactionToAccount } from '../../page-objects/flows/send-transaction.flow';
 import AccountListPage from '../../page-objects/pages/account-list-page';
+import ActivityListPage from '../../page-objects/pages/home/activity-list';
 import HeaderNavbar from '../../page-objects/pages/header-navbar';
-import HomePage from '../../page-objects/pages/homepage';
+import HomePage from '../../page-objects/pages/home/homepage';
 import LoginPage from '../../page-objects/pages/login-page';
 import ResetPasswordPage from '../../page-objects/pages/reset-password-page';
 
@@ -57,8 +58,9 @@ describe('Add account', function () {
           totalFee: '2.800042',
         });
         await homePage.check_pageIsLoaded();
-        await homePage.check_confirmedTxNumberDisplayedInActivity();
-        await homePage.check_txAmountInActivity('-2.8 ETH');
+        const activityList = new ActivityListPage(driver);
+        await activityList.check_confirmedTxNumberDisplayedInActivity();
+        await activityList.check_txAmountInActivity('-2.8 ETH');
 
         // Lock wallet and recover via SRP in "forget password" option
         await headerNavbar.lockMetaMask();
diff --git a/test/e2e/tests/account/forgot-password.spec.ts b/test/e2e/tests/account/forgot-password.spec.ts
index 698efcbe0819..62d382cd69dc 100644
--- a/test/e2e/tests/account/forgot-password.spec.ts
+++ b/test/e2e/tests/account/forgot-password.spec.ts
@@ -3,7 +3,7 @@ import FixtureBuilder from '../../fixture-builder';
 import { Driver } from '../../webdriver/driver';
 import { E2E_SRP } from '../../default-fixture';
 import { Ganache } from '../../seeder/ganache';
-import HomePage from '../../page-objects/pages/homepage';
+import HomePage from '../../page-objects/pages/home/homepage';
 import LoginPage from '../../page-objects/pages/login-page';
 import ResetPasswordPage from '../../page-objects/pages/reset-password-page';
 import { loginWithBalanceValidation } from '../../page-objects/flows/login.flow';
diff --git a/test/e2e/tests/account/import-flow.spec.ts b/test/e2e/tests/account/import-flow.spec.ts
index 8dc989db4d41..2a8bd0256999 100644
--- a/test/e2e/tests/account/import-flow.spec.ts
+++ b/test/e2e/tests/account/import-flow.spec.ts
@@ -3,7 +3,7 @@ import { withFixtures } from '../../helpers';
 import FixtureBuilder from '../../fixture-builder';
 import AccountListPage from '../../page-objects/pages/account-list-page';
 import HeaderNavbar from '../../page-objects/pages/header-navbar';
-import HomePage from '../../page-objects/pages/homepage';
+import HomePage from '../../page-objects/pages/home/homepage';
 import { loginWithBalanceValidation } from '../../page-objects/flows/login.flow';
 import { completeImportSRPOnboardingFlow } from '../../page-objects/flows/onboarding.flow';
 
diff --git a/test/e2e/tests/account/lock-account.spec.ts b/test/e2e/tests/account/lock-account.spec.ts
index b77170c23676..06e1523889e3 100644
--- a/test/e2e/tests/account/lock-account.spec.ts
+++ b/test/e2e/tests/account/lock-account.spec.ts
@@ -1,7 +1,7 @@
 import { Suite } from 'mocha';
 import { defaultGanacheOptions, withFixtures } from '../../helpers';
 import FixtureBuilder from '../../fixture-builder';
-import HomePage from '../../page-objects/pages/homepage';
+import HomePage from '../../page-objects/pages/home/homepage';
 import { Driver } from '../../webdriver/driver';
 import { Ganache } from '../../seeder/ganache';
 import { loginWithBalanceValidation } from '../../page-objects/flows/login.flow';
diff --git a/test/e2e/tests/account/migrate-old-vault.spec.ts b/test/e2e/tests/account/migrate-old-vault.spec.ts
index 702729bd6fe7..372c94351465 100644
--- a/test/e2e/tests/account/migrate-old-vault.spec.ts
+++ b/test/e2e/tests/account/migrate-old-vault.spec.ts
@@ -3,7 +3,7 @@ import { defaultGanacheOptions, withFixtures } from '../../helpers';
 import FixtureBuilder from '../../fixture-builder';
 import { Driver } from '../../webdriver/driver';
 import { Ganache } from '../../seeder/ganache';
-import HomePage from '../../page-objects/pages/homepage';
+import HomePage from '../../page-objects/pages/home/homepage';
 import { loginWithBalanceValidation } from '../../page-objects/flows/login.flow';
 
 describe('Migrate vault with old encryption', function (this: Suite) {
diff --git a/test/e2e/tests/account/snap-account-contract-interaction.spec.ts b/test/e2e/tests/account/snap-account-contract-interaction.spec.ts
index b5cfd4d2707c..4b12b71b293e 100644
--- a/test/e2e/tests/account/snap-account-contract-interaction.spec.ts
+++ b/test/e2e/tests/account/snap-account-contract-interaction.spec.ts
@@ -10,8 +10,9 @@ import {
   WINDOW_TITLES,
 } from '../../helpers';
 import { SMART_CONTRACTS } from '../../seeder/smart-contracts';
+import ActivityListPage from '../../page-objects/pages/home/activity-list';
 import HeaderNavbar from '../../page-objects/pages/header-navbar';
-import HomePage from '../../page-objects/pages/homepage';
+import HomePage from '../../page-objects/pages/home/homepage';
 import SnapSimpleKeyringPage from '../../page-objects/pages/snap-simple-keyring-page';
 import TestDapp from '../../page-objects/pages/test-dapp';
 import { installSnapSimpleKeyring } from '../../page-objects/flows/snap-simple-keyring.flow';
@@ -75,8 +76,9 @@ describe('Snap Account Contract interaction @no-mmi', function (this: Suite) {
         const homePage = new HomePage(driver);
         await homePage.check_pageIsLoaded();
         await homePage.goToActivityList();
-        await homePage.check_confirmedTxNumberDisplayedInActivity();
-        await homePage.check_txAmountInActivity('-4 ETH');
+        const activityList = new ActivityListPage(driver);
+        await activityList.check_confirmedTxNumberDisplayedInActivity();
+        await activityList.check_txAmountInActivity('-4 ETH');
       },
     );
   });
diff --git a/test/e2e/tests/account/snap-account-transfers.spec.ts b/test/e2e/tests/account/snap-account-transfers.spec.ts
index af2a61a62a39..d6ebff34d642 100644
--- a/test/e2e/tests/account/snap-account-transfers.spec.ts
+++ b/test/e2e/tests/account/snap-account-transfers.spec.ts
@@ -10,9 +10,10 @@ import { DEFAULT_FIXTURE_ACCOUNT } from '../../constants';
 import { Driver } from '../../webdriver/driver';
 import { Ganache } from '../../seeder/ganache';
 import AccountListPage from '../../page-objects/pages/account-list-page';
+import ActivityListPage from '../../page-objects/pages/home/activity-list';
 import FixtureBuilder from '../../fixture-builder';
 import HeaderNavbar from '../../page-objects/pages/header-navbar';
-import HomePage from '../../page-objects/pages/homepage';
+import HomePage from '../../page-objects/pages/home/homepage';
 import SnapSimpleKeyringPage from '../../page-objects/pages/snap-simple-keyring-page';
 import { installSnapSimpleKeyring } from '../../page-objects/flows/snap-simple-keyring.flow';
 import { loginWithBalanceValidation } from '../../page-objects/flows/login.flow';
@@ -172,9 +173,10 @@ describe('Snap Account Transfers @no-mmi', function (this: Suite) {
           });
 
           // check the transaction is failed in MetaMask activity list
-          const homepage = new HomePage(driver);
-          await homepage.check_pageIsLoaded();
-          await homepage.check_failedTxNumberDisplayedInActivity();
+          await new HomePage(driver).check_pageIsLoaded();
+          await new ActivityListPage(
+            driver,
+          ).check_failedTxNumberDisplayedInActivity();
         },
       );
     });
@@ -316,9 +318,10 @@ describe('Snap Account Transfers @no-mmi', function (this: Suite) {
           });
 
           // check the transaction is failed in MetaMask activity list
-          const homepage = new HomePage(driver);
-          await homepage.check_pageIsLoaded();
-          await homepage.check_failedTxNumberDisplayedInActivity();
+          await new HomePage(driver).check_pageIsLoaded();
+          await new ActivityListPage(
+            driver,
+          ).check_failedTxNumberDisplayedInActivity();
         },
       );
     });
diff --git a/test/e2e/tests/confirmations/transactions/erc20-token-send-redesign.spec.ts b/test/e2e/tests/confirmations/transactions/erc20-token-send-redesign.spec.ts
index 2fbe2c553a06..036a8287882c 100644
--- a/test/e2e/tests/confirmations/transactions/erc20-token-send-redesign.spec.ts
+++ b/test/e2e/tests/confirmations/transactions/erc20-token-send-redesign.spec.ts
@@ -9,7 +9,7 @@ import {
 import { Mockttp } from '../../../mock-e2e';
 import WatchAssetConfirmation from '../../../page-objects/pages/confirmations/legacy/watch-asset-confirmation';
 import TokenTransferTransactionConfirmation from '../../../page-objects/pages/confirmations/redesign/token-transfer-confirmation';
-import HomePage from '../../../page-objects/pages/homepage';
+import HomePage from '../../../page-objects/pages/home/homepage';
 import SendTokenPage from '../../../page-objects/pages/send/send-token-page';
 import TestDapp from '../../../page-objects/pages/test-dapp';
 import ContractAddressRegistry from '../../../seeder/contract-address-registry';
diff --git a/test/e2e/tests/confirmations/transactions/native-send-redesign.spec.ts b/test/e2e/tests/confirmations/transactions/native-send-redesign.spec.ts
index 46318e113c35..bbf7481a9fc1 100644
--- a/test/e2e/tests/confirmations/transactions/native-send-redesign.spec.ts
+++ b/test/e2e/tests/confirmations/transactions/native-send-redesign.spec.ts
@@ -7,7 +7,7 @@ import {
   WINDOW_TITLES,
 } from '../../../helpers';
 import TokenTransferTransactionConfirmation from '../../../page-objects/pages/confirmations/redesign/token-transfer-confirmation';
-import HomePage from '../../../page-objects/pages/homepage';
+import HomePage from '../../../page-objects/pages/home/homepage';
 import SendTokenPage from '../../../page-objects/pages/send/send-token-page';
 import TestDapp from '../../../page-objects/pages/test-dapp';
 import { Driver } from '../../../webdriver/driver';
diff --git a/test/e2e/tests/confirmations/transactions/nft-token-send-redesign.spec.ts b/test/e2e/tests/confirmations/transactions/nft-token-send-redesign.spec.ts
index 6fc048c7f11b..09bd9d4b32a2 100644
--- a/test/e2e/tests/confirmations/transactions/nft-token-send-redesign.spec.ts
+++ b/test/e2e/tests/confirmations/transactions/nft-token-send-redesign.spec.ts
@@ -10,7 +10,8 @@ import { Mockttp } from '../../../mock-e2e';
 import WatchAssetConfirmation from '../../../page-objects/pages/confirmations/legacy/watch-asset-confirmation';
 import TokenTransferTransactionConfirmation from '../../../page-objects/pages/confirmations/redesign/token-transfer-confirmation';
 import TransactionConfirmation from '../../../page-objects/pages/confirmations/redesign/transaction-confirmation';
-import HomePage from '../../../page-objects/pages/homepage';
+import HomePage from '../../../page-objects/pages/home/homepage';
+import NFTListPage from '../../../page-objects/pages/home/nft-list';
 import NFTDetailsPage from '../../../page-objects/pages/nft-details-page';
 import SendTokenPage from '../../../page-objects/pages/send/send-token-page';
 import TestDapp from '../../../page-objects/pages/test-dapp';
@@ -206,9 +207,8 @@ async function createERC721WalletInitiatedTransactionAndAssertDetails(
 
   await driver.switchToWindowWithTitle(WINDOW_TITLES.ExtensionInFullScreenView);
 
-  const homePage = new HomePage(driver);
-  await homePage.goToNftTab();
-  await homePage.clickNFTIconOnActivityList();
+  await new HomePage(driver).goToNftTab();
+  await new NFTListPage(driver).clickNFTIconOnActivityList();
 
   const nftDetailsPage = new NFTDetailsPage(driver);
   await nftDetailsPage.clickNFTSendButton();
@@ -295,9 +295,8 @@ async function createERC1155WalletInitiatedTransactionAndAssertDetails(
   await watchAssetConfirmation.clickFooterConfirmButton();
 
   await driver.switchToWindowWithTitle(WINDOW_TITLES.ExtensionInFullScreenView);
-  const homePage = new HomePage(driver);
-  await homePage.goToNftTab();
-  await homePage.clickNFTIconOnActivityList();
+  await new HomePage(driver).goToNftTab();
+  await new NFTListPage(driver).clickNFTIconOnActivityList();
 
   const nftDetailsPage = new NFTDetailsPage(driver);
   await nftDetailsPage.clickNFTSendButton();
diff --git a/test/e2e/tests/multichain/aggregated-balances.spec.ts b/test/e2e/tests/multichain/aggregated-balances.spec.ts
index 57df2362b236..5e99c2e909e7 100644
--- a/test/e2e/tests/multichain/aggregated-balances.spec.ts
+++ b/test/e2e/tests/multichain/aggregated-balances.spec.ts
@@ -8,10 +8,10 @@ import { loginWithBalanceValidation } from '../../page-objects/flows/login.flow'
 import { SMART_CONTRACTS } from '../../seeder/smart-contracts';
 import HeaderNavbar from '../../page-objects/pages/header-navbar';
 import SelectNetwork from '../../page-objects/pages/dialog/select-network';
-import HomePage from '../../page-objects/pages/homepage';
+import HomePage from '../../page-objects/pages/home/homepage';
 import SettingsPage from '../../page-objects/pages/settings/settings-page';
 import AccountListPage from '../../page-objects/pages/account-list-page';
-import AssetListPage from '../../page-objects/pages/asset-list';
+import AssetListPage from '../../page-objects/pages/home/asset-list';
 import SendTokenPage from '../../page-objects/pages/send/send-token-page';
 
 const EXPECTED_MAINNET_BALANCE_USD = '$84,985.04';
@@ -118,7 +118,7 @@ describe('Multichain Aggregated Balances', function (this: Suite) {
           EXPECTED_SEPOLIA_BALANCE_NATIVE,
           SEPOLIA_NATIVE_TOKEN,
         );
-        await assetListPage.checkNetworkFilterText(NETWORK_NAME_SEPOLIA);
+        await assetListPage.check_networkFilterText(NETWORK_NAME_SEPOLIA);
 
         // Step 11: Enable fiat display on testnets in settings
         await headerNavbar.openSettingsPage();
diff --git a/test/e2e/tests/multichain/asset-list.spec.ts b/test/e2e/tests/multichain/asset-list.spec.ts
index d7120a1fcace..b206ef1b4e56 100644
--- a/test/e2e/tests/multichain/asset-list.spec.ts
+++ b/test/e2e/tests/multichain/asset-list.spec.ts
@@ -9,7 +9,7 @@ import HeaderNavbar from '../../page-objects/pages/header-navbar';
 import SelectNetwork from '../../page-objects/pages/dialog/select-network';
 import { SMART_CONTRACTS } from '../../seeder/smart-contracts';
 import SendTokenPage from '../../page-objects/pages/send/send-token-page';
-import AssetListPage from '../../page-objects/pages/asset-list';
+import AssetListPage from '../../page-objects/pages/home/asset-list';
 
 const NETWORK_NAME_MAINNET = 'Ethereum Mainnet';
 const LINEA_NAME_MAINNET = 'Linea Mainnet';
@@ -50,13 +50,13 @@ describe('Multichain Asset List', function (this: Suite) {
         const assetListPage = new AssetListPage(driver);
         await headerNavbar.clickSwitchNetworkDropDown();
         await selectNetworkDialog.selectNetworkName(NETWORK_NAME_MAINNET);
-        await assetListPage.waitUntilAssetListHasItems(3);
+        await assetListPage.check_tokenItemNumber(3);
         await assetListPage.openNetworksFilter();
         await assetListPage.clickCurrentNetworkOption();
         await headerNavbar.clickSwitchNetworkDropDown();
         await selectNetworkDialog.selectNetworkName(LINEA_NAME_MAINNET);
         await assetListPage.waitUntilFilterLabelIs(LINEA_NAME_MAINNET);
-        await assetListPage.waitUntilAssetListHasItems(1);
+        await assetListPage.check_tokenItemNumber(1);
         assert.equal(
           await assetListPage.getNetworksFilterLabel(),
           LINEA_NAME_MAINNET,
@@ -80,7 +80,7 @@ describe('Multichain Asset List', function (this: Suite) {
         const assetListPage = new AssetListPage(driver);
         await headerNavbar.clickSwitchNetworkDropDown();
         await selectNetworkDialog.selectNetworkName(NETWORK_NAME_MAINNET);
-        await assetListPage.waitUntilAssetListHasItems(3);
+        await assetListPage.check_tokenItemNumber(3);
         await driver.clickElement('.multichain-token-list-item');
         const coinOverviewElement = await driver.findElement(
           '[data-testid="coin-overview-buy"]',
@@ -113,7 +113,7 @@ describe('Multichain Asset List', function (this: Suite) {
         await headerNavbar.clickSwitchNetworkDropDown();
         await selectNetworkDialog.selectNetworkName(NETWORK_NAME_MAINNET);
         const sendPage = new SendTokenPage(driver);
-        await assetListPage.waitUntilAssetListHasItems(4);
+        await assetListPage.check_tokenItemNumber(4);
         await assetListPage.clickOnAsset('TST');
         await driver.clickElement('[data-testid="eth-overview-send"]');
         await sendPage.check_networkChange(POLYGON_NAME_MAINNET);
@@ -147,7 +147,7 @@ describe('Multichain Asset List', function (this: Suite) {
         const assetListPage = new AssetListPage(driver);
         await headerNavbar.clickSwitchNetworkDropDown();
         await selectNetworkDialog.selectNetworkName(NETWORK_NAME_MAINNET);
-        await assetListPage.waitUntilAssetListHasItems(4);
+        await assetListPage.check_tokenItemNumber(4);
         await assetListPage.clickOnAsset('TST');
         await driver.clickElement('.mm-box > button:nth-of-type(3)');
         const toastTextElement = await driver.findElement('.toast-text');
@@ -176,8 +176,7 @@ describe('Multichain Asset List', function (this: Suite) {
         const selectNetworkDialog = new SelectNetwork(driver);
         await headerNavbar.clickSwitchNetworkDropDown();
         await selectNetworkDialog.selectNetworkName(LINEA_NAME_MAINNET);
-        await assetListPage.waitUntilAssetListHasItems(3);
-
+        await assetListPage.check_tokenItemNumber(3);
         await assetListPage.clickOnAsset('Ethereum');
 
         const swapButton = await driver.findElement(
diff --git a/test/e2e/tests/network/multi-rpc.spec.ts b/test/e2e/tests/network/multi-rpc.spec.ts
index f5c40259a33b..ebf8604a76ea 100644
--- a/test/e2e/tests/network/multi-rpc.spec.ts
+++ b/test/e2e/tests/network/multi-rpc.spec.ts
@@ -10,7 +10,7 @@ import {
 } from '../../helpers/mock-server';
 import EditNetworkModal from '../../page-objects/pages/dialog/edit-network';
 import HeaderNavbar from '../../page-objects/pages/header-navbar';
-import HomePage from '../../page-objects/pages/homepage';
+import HomePage from '../../page-objects/pages/home/homepage';
 import OnboardingCompletePage from '../../page-objects/pages/onboarding/onboarding-complete-page';
 import OnboardingPrivacySettingsPage from '../../page-objects/pages/onboarding/onboarding-privacy-settings-page';
 import SelectNetwork from '../../page-objects/pages/dialog/select-network';
diff --git a/test/e2e/tests/network/switch-network.spec.ts b/test/e2e/tests/network/switch-network.spec.ts
index b320e095cc69..78862ecb30b5 100644
--- a/test/e2e/tests/network/switch-network.spec.ts
+++ b/test/e2e/tests/network/switch-network.spec.ts
@@ -4,7 +4,7 @@ import { withFixtures, defaultGanacheOptions } from '../../helpers';
 import FixtureBuilder from '../../fixture-builder';
 import { Ganache } from '../../seeder/ganache';
 import { loginWithBalanceValidation } from '../../page-objects/flows/login.flow';
-import HomePage from '../../page-objects/pages/homepage';
+import HomePage from '../../page-objects/pages/home/homepage';
 import HeaderNavbar from '../../page-objects/pages/header-navbar';
 import {
   switchToNetworkFlow,
diff --git a/test/e2e/tests/notifications/account-syncing/importing-private-key-account.spec.ts b/test/e2e/tests/notifications/account-syncing/importing-private-key-account.spec.ts
index 1940d4bf3fd6..2c56f79e2c99 100644
--- a/test/e2e/tests/notifications/account-syncing/importing-private-key-account.spec.ts
+++ b/test/e2e/tests/notifications/account-syncing/importing-private-key-account.spec.ts
@@ -11,7 +11,7 @@ import {
 import { UserStorageMockttpController } from '../../../helpers/user-storage/userStorageMockttpController';
 import HeaderNavbar from '../../../page-objects/pages/header-navbar';
 import AccountListPage from '../../../page-objects/pages/account-list-page';
-import HomePage from '../../../page-objects/pages/homepage';
+import HomePage from '../../../page-objects/pages/home/homepage';
 import { completeImportSRPOnboardingFlow } from '../../../page-objects/flows/onboarding.flow';
 import { accountsSyncMockResponse } from './mockData';
 import { IS_ACCOUNT_SYNCING_ENABLED } from './helpers';
diff --git a/test/e2e/tests/notifications/account-syncing/new-user-sync.spec.ts b/test/e2e/tests/notifications/account-syncing/new-user-sync.spec.ts
index ae283c47fa8b..aead37e63002 100644
--- a/test/e2e/tests/notifications/account-syncing/new-user-sync.spec.ts
+++ b/test/e2e/tests/notifications/account-syncing/new-user-sync.spec.ts
@@ -7,7 +7,7 @@ import { NOTIFICATIONS_TEAM_PASSWORD } from '../constants';
 import { UserStorageMockttpController } from '../../../helpers/user-storage/userStorageMockttpController';
 import HeaderNavbar from '../../../page-objects/pages/header-navbar';
 import AccountListPage from '../../../page-objects/pages/account-list-page';
-import HomePage from '../../../page-objects/pages/homepage';
+import HomePage from '../../../page-objects/pages/home/homepage';
 import {
   completeCreateNewWalletOnboardingFlow,
   completeImportSRPOnboardingFlow,
diff --git a/test/e2e/tests/notifications/account-syncing/onboarding-with-opt-out.spec.ts b/test/e2e/tests/notifications/account-syncing/onboarding-with-opt-out.spec.ts
index 3ec44e4fd07e..f164ced25cdc 100644
--- a/test/e2e/tests/notifications/account-syncing/onboarding-with-opt-out.spec.ts
+++ b/test/e2e/tests/notifications/account-syncing/onboarding-with-opt-out.spec.ts
@@ -10,7 +10,7 @@ import {
 import { UserStorageMockttpController } from '../../../helpers/user-storage/userStorageMockttpController';
 import AccountListPage from '../../../page-objects/pages/account-list-page';
 import HeaderNavbar from '../../../page-objects/pages/header-navbar';
-import HomePage from '../../../page-objects/pages/homepage';
+import HomePage from '../../../page-objects/pages/home/homepage';
 import OnboardingCompletePage from '../../../page-objects/pages/onboarding/onboarding-complete-page';
 import OnboardingPrivacySettingsPage from '../../../page-objects/pages/onboarding/onboarding-privacy-settings-page';
 import {
diff --git a/test/e2e/tests/notifications/account-syncing/sync-after-adding-account.spec.ts b/test/e2e/tests/notifications/account-syncing/sync-after-adding-account.spec.ts
index 1c1f7b3119d7..7a8e19cc4f13 100644
--- a/test/e2e/tests/notifications/account-syncing/sync-after-adding-account.spec.ts
+++ b/test/e2e/tests/notifications/account-syncing/sync-after-adding-account.spec.ts
@@ -10,7 +10,7 @@ import {
 import { UserStorageMockttpController } from '../../../helpers/user-storage/userStorageMockttpController';
 import HeaderNavbar from '../../../page-objects/pages/header-navbar';
 import AccountListPage from '../../../page-objects/pages/account-list-page';
-import HomePage from '../../../page-objects/pages/homepage';
+import HomePage from '../../../page-objects/pages/home/homepage';
 import { completeImportSRPOnboardingFlow } from '../../../page-objects/flows/onboarding.flow';
 import { accountsSyncMockResponse } from './mockData';
 import { IS_ACCOUNT_SYNCING_ENABLED } from './helpers';
diff --git a/test/e2e/tests/notifications/account-syncing/sync-after-modifying-account-name.spec.ts b/test/e2e/tests/notifications/account-syncing/sync-after-modifying-account-name.spec.ts
index 22618d70f3c5..97d56f66cf8d 100644
--- a/test/e2e/tests/notifications/account-syncing/sync-after-modifying-account-name.spec.ts
+++ b/test/e2e/tests/notifications/account-syncing/sync-after-modifying-account-name.spec.ts
@@ -10,7 +10,7 @@ import {
 import { UserStorageMockttpController } from '../../../helpers/user-storage/userStorageMockttpController';
 import HeaderNavbar from '../../../page-objects/pages/header-navbar';
 import AccountListPage from '../../../page-objects/pages/account-list-page';
-import HomePage from '../../../page-objects/pages/homepage';
+import HomePage from '../../../page-objects/pages/home/homepage';
 import { completeImportSRPOnboardingFlow } from '../../../page-objects/flows/onboarding.flow';
 import { accountsSyncMockResponse } from './mockData';
 import { IS_ACCOUNT_SYNCING_ENABLED } from './helpers';
diff --git a/test/e2e/tests/notifications/account-syncing/sync-after-onboarding.spec.ts b/test/e2e/tests/notifications/account-syncing/sync-after-onboarding.spec.ts
index be2b2604633c..f328244710ea 100644
--- a/test/e2e/tests/notifications/account-syncing/sync-after-onboarding.spec.ts
+++ b/test/e2e/tests/notifications/account-syncing/sync-after-onboarding.spec.ts
@@ -10,7 +10,7 @@ import {
 import { UserStorageMockttpController } from '../../../helpers/user-storage/userStorageMockttpController';
 import HeaderNavbar from '../../../page-objects/pages/header-navbar';
 import AccountListPage from '../../../page-objects/pages/account-list-page';
-import HomePage from '../../../page-objects/pages/homepage';
+import HomePage from '../../../page-objects/pages/home/homepage';
 import { completeImportSRPOnboardingFlow } from '../../../page-objects/flows/onboarding.flow';
 import { accountsSyncMockResponse } from './mockData';
 import { IS_ACCOUNT_SYNCING_ENABLED } from './helpers';
diff --git a/test/e2e/tests/notifications/account-syncing/sync-with-account-balances.spec.ts b/test/e2e/tests/notifications/account-syncing/sync-with-account-balances.spec.ts
index 8ecaff943721..6c6ce2dfd48a 100644
--- a/test/e2e/tests/notifications/account-syncing/sync-with-account-balances.spec.ts
+++ b/test/e2e/tests/notifications/account-syncing/sync-with-account-balances.spec.ts
@@ -9,7 +9,7 @@ import {
 import { UserStorageMockttpController } from '../../../helpers/user-storage/userStorageMockttpController';
 import HeaderNavbar from '../../../page-objects/pages/header-navbar';
 import AccountListPage from '../../../page-objects/pages/account-list-page';
-import HomePage from '../../../page-objects/pages/homepage';
+import HomePage from '../../../page-objects/pages/home/homepage';
 import { completeImportSRPOnboardingFlow } from '../../../page-objects/flows/onboarding.flow';
 import { accountsSyncMockResponse } from './mockData';
 import { IS_ACCOUNT_SYNCING_ENABLED } from './helpers';
diff --git a/test/e2e/tests/onboarding/onboarding.spec.ts b/test/e2e/tests/onboarding/onboarding.spec.ts
index 979e416f5090..b55ddc193569 100644
--- a/test/e2e/tests/onboarding/onboarding.spec.ts
+++ b/test/e2e/tests/onboarding/onboarding.spec.ts
@@ -7,7 +7,7 @@ import {
 import { Driver } from '../../webdriver/driver';
 import FixtureBuilder from '../../fixture-builder';
 import { FirstTimeFlowType } from '../../../../shared/constants/onboarding';
-import HomePage from '../../page-objects/pages/homepage';
+import HomePage from '../../page-objects/pages/home/homepage';
 import OnboardingCompletePage from '../../page-objects/pages/onboarding/onboarding-complete-page';
 import OnboardingMetricsPage from '../../page-objects/pages/onboarding/onboarding-metrics-page';
 import OnboardingPasswordPage from '../../page-objects/pages/onboarding/onboarding-password-page';
diff --git a/test/e2e/tests/privacy/account-tracker-api-usage.spec.ts b/test/e2e/tests/privacy/account-tracker-api-usage.spec.ts
index 24f2318fa13b..d5c9b3e82076 100644
--- a/test/e2e/tests/privacy/account-tracker-api-usage.spec.ts
+++ b/test/e2e/tests/privacy/account-tracker-api-usage.spec.ts
@@ -8,7 +8,7 @@ import {
   withFixtures,
 } from '../../helpers';
 import { Mockttp } from '../../mock-e2e';
-import HomePage from '../../page-objects/pages/homepage';
+import HomePage from '../../page-objects/pages/home/homepage';
 import { loginWithoutBalanceValidation } from '../../page-objects/flows/login.flow';
 
 async function mockInfura(mockServer: Mockttp): Promise<MockedEndpoint[]> {
diff --git a/test/e2e/tests/privacy/onboarding-infura-call-privacy.spec.ts b/test/e2e/tests/privacy/onboarding-infura-call-privacy.spec.ts
index f1bdc08166b7..aca018eb52ee 100644
--- a/test/e2e/tests/privacy/onboarding-infura-call-privacy.spec.ts
+++ b/test/e2e/tests/privacy/onboarding-infura-call-privacy.spec.ts
@@ -2,7 +2,7 @@ import assert from 'assert';
 import { Mockttp, MockedEndpoint } from 'mockttp';
 import { withFixtures, regularDelayMs } from '../../helpers';
 import FixtureBuilder from '../../fixture-builder';
-import HomePage from '../../page-objects/pages/homepage';
+import HomePage from '../../page-objects/pages/home/homepage';
 import OnboardingCompletePage from '../../page-objects/pages/onboarding/onboarding-complete-page';
 import {
   importSRPOnboardingFlow,
diff --git a/test/e2e/tests/privacy/onboarding-token-price-call-privacy.spec.ts b/test/e2e/tests/privacy/onboarding-token-price-call-privacy.spec.ts
index f565c0bb354e..7085c1317610 100644
--- a/test/e2e/tests/privacy/onboarding-token-price-call-privacy.spec.ts
+++ b/test/e2e/tests/privacy/onboarding-token-price-call-privacy.spec.ts
@@ -2,7 +2,7 @@ import assert from 'assert';
 import { Mockttp, MockedEndpoint } from 'mockttp';
 import { withFixtures, regularDelayMs } from '../../helpers';
 import FixtureBuilder from '../../fixture-builder';
-import HomePage from '../../page-objects/pages/homepage';
+import HomePage from '../../page-objects/pages/home/homepage';
 import OnboardingCompletePage from '../../page-objects/pages/onboarding/onboarding-complete-page';
 import {
   importSRPOnboardingFlow,
diff --git a/test/e2e/tests/privacy/polling.spec.ts b/test/e2e/tests/privacy/polling.spec.ts
index b63e1bce6191..b91a72e9d23e 100644
--- a/test/e2e/tests/privacy/polling.spec.ts
+++ b/test/e2e/tests/privacy/polling.spec.ts
@@ -5,7 +5,7 @@ import { expect } from '@playwright/test';
 import FixtureBuilder from '../../fixture-builder';
 import { defaultGanacheOptions, withFixtures } from '../../helpers';
 import { Mockttp } from '../../mock-e2e';
-import HomePage from '../../page-objects/pages/homepage';
+import HomePage from '../../page-objects/pages/home/homepage';
 import { loginWithoutBalanceValidation } from '../../page-objects/flows/login.flow';
 
 const infuraMainnetUrl =
diff --git a/test/e2e/tests/settings/change-language.spec.ts b/test/e2e/tests/settings/change-language.spec.ts
index 469ad3ceec30..234f83eb1271 100644
--- a/test/e2e/tests/settings/change-language.spec.ts
+++ b/test/e2e/tests/settings/change-language.spec.ts
@@ -6,7 +6,7 @@ import FixtureBuilder from '../../fixture-builder';
 import AdvancedSettings from '../../page-objects/pages/settings/advanced-settings';
 import GeneralSettings from '../../page-objects/pages/settings/general-settings';
 import HeaderNavbar from '../../page-objects/pages/header-navbar';
-import Homepage from '../../page-objects/pages/homepage';
+import Homepage from '../../page-objects/pages/home/homepage';
 import SendTokenPage from '../../page-objects/pages/send/send-token-page';
 import SettingsPage from '../../page-objects/pages/settings/settings-page';
 import { loginWithBalanceValidation } from '../../page-objects/flows/login.flow';
diff --git a/test/e2e/tests/settings/settings-security-reveal-srp.spec.ts b/test/e2e/tests/settings/settings-security-reveal-srp.spec.ts
index 6ee57ae02490..eb9739e67bce 100644
--- a/test/e2e/tests/settings/settings-security-reveal-srp.spec.ts
+++ b/test/e2e/tests/settings/settings-security-reveal-srp.spec.ts
@@ -2,7 +2,7 @@ import { withFixtures } from '../../helpers';
 import FixtureBuilder from '../../fixture-builder';
 import { E2E_SRP } from '../../default-fixture';
 import HeaderNavbar from '../../page-objects/pages/header-navbar';
-import HomePage from '../../page-objects/pages/homepage';
+import HomePage from '../../page-objects/pages/home/homepage';
 import PrivacySettings from '../../page-objects/pages/settings/privacy-settings';
 import SettingsPage from '../../page-objects/pages/settings/settings-page';
 import { loginWithBalanceValidation } from '../../page-objects/flows/login.flow';
diff --git a/test/e2e/tests/tokens/add-hide-token.spec.ts b/test/e2e/tests/tokens/add-hide-token.spec.ts
index 8f85f2d9914e..f6d21430cd18 100644
--- a/test/e2e/tests/tokens/add-hide-token.spec.ts
+++ b/test/e2e/tests/tokens/add-hide-token.spec.ts
@@ -1,7 +1,7 @@
 import { toHex } from '@metamask/controller-utils';
 import { withFixtures } from '../../helpers';
 import FixtureBuilder from '../../fixture-builder';
-import HomePage from '../../page-objects/pages/homepage';
+import AssetListPage from '../../page-objects/pages/home/asset-list';
 import { loginWithBalanceValidation } from '../../page-objects/flows/login.flow';
 
 describe('Add hide token', function () {
@@ -38,12 +38,12 @@ describe('Add hide token', function () {
       },
       async ({ driver }) => {
         await loginWithBalanceValidation(driver);
-        const homepage = new HomePage(driver);
-        await homepage.check_tokenItemNumber(2);
-        await homepage.check_tokenAmountIsDisplayed('0 TST');
+        const assetListPage = new AssetListPage(driver);
+        await assetListPage.check_tokenItemNumber(2);
+        await assetListPage.check_tokenAmountIsDisplayed('0 TST');
 
-        await homepage.hideToken('TST');
-        await homepage.check_tokenItemNumber(1);
+        await assetListPage.hideToken('TST');
+        await assetListPage.check_tokenItemNumber(1);
       },
     );
   });
diff --git a/test/e2e/tests/tokens/add-token-using-search.ts b/test/e2e/tests/tokens/add-token-using-search.ts
index 79b4715afb91..c1ae188a39b9 100644
--- a/test/e2e/tests/tokens/add-token-using-search.ts
+++ b/test/e2e/tests/tokens/add-token-using-search.ts
@@ -2,7 +2,7 @@ import { MockedEndpoint, Mockttp } from 'mockttp';
 import { defaultGanacheOptions, withFixtures } from '../../helpers';
 import FixtureBuilder from '../../fixture-builder';
 import { CHAIN_IDS } from '../../../../shared/constants/network';
-import HomePage from '../../page-objects/pages/homepage';
+import AssetListPage from '../../page-objects/pages/home/asset-list';
 import { loginWithoutBalanceValidation } from '../../page-objects/flows/login.flow';
 
 describe('Add existing token using search', function () {
@@ -56,10 +56,10 @@ describe('Add existing token using search', function () {
       },
       async ({ driver }) => {
         await loginWithoutBalanceValidation(driver);
-        const homepage = new HomePage(driver);
-        await homepage.check_tokenAmountIsDisplayed('25 BNB');
-        await homepage.importTokenBySearch('BAT');
-        await homepage.check_tokenAmountInTokenDetailsModal(
+        const assetListPage = new AssetListPage(driver);
+        await assetListPage.check_tokenAmountIsDisplayed('25 BNB');
+        await assetListPage.importTokenBySearch('BAT');
+        await assetListPage.check_tokenAmountInTokenDetailsModal(
           'Basic Attention Token',
           '0 BAT',
         );
diff --git a/test/e2e/tests/tokens/nft/auto-detect-nft.spec.ts b/test/e2e/tests/tokens/nft/auto-detect-nft.spec.ts
index c70a3860dd63..a1bc9005a2f3 100644
--- a/test/e2e/tests/tokens/nft/auto-detect-nft.spec.ts
+++ b/test/e2e/tests/tokens/nft/auto-detect-nft.spec.ts
@@ -1,7 +1,8 @@
 import { withFixtures } from '../../../helpers';
 import FixtureBuilder from '../../../fixture-builder';
 import HeaderNavbar from '../../../page-objects/pages/header-navbar';
-import Homepage from '../../../page-objects/pages/homepage';
+import Homepage from '../../../page-objects/pages/home/homepage';
+import NFTListPage from '../../../page-objects/pages/home/nft-list';
 import PrivacySettings from '../../../page-objects/pages/settings/privacy-settings';
 import SettingsPage from '../../../page-objects/pages/settings/settings-page';
 import { loginWithBalanceValidation } from '../../../page-objects/flows/login.flow';
@@ -39,10 +40,11 @@ describe('NFT detection', function () {
         await homepage.check_pageIsLoaded();
         await homepage.check_expectedBalanceIsDisplayed();
         await homepage.goToNftTab();
-        await homepage.check_nftNameIsDisplayed(
+        const nftListPage = new NFTListPage(driver);
+        await nftListPage.check_nftNameIsDisplayed(
           'ENS: Ethereum Name Service (1)',
         );
-        await homepage.check_nftImageIsDisplayed();
+        await nftListPage.check_nftImageIsDisplayed();
       },
     );
   });
diff --git a/test/e2e/tests/tokens/nft/import-nft.spec.ts b/test/e2e/tests/tokens/nft/import-nft.spec.ts
index bc709ba463c0..5983d1002035 100644
--- a/test/e2e/tests/tokens/nft/import-nft.spec.ts
+++ b/test/e2e/tests/tokens/nft/import-nft.spec.ts
@@ -3,7 +3,8 @@ import { SMART_CONTRACTS } from '../../../seeder/smart-contracts';
 import FixtureBuilder from '../../../fixture-builder';
 import AccountListPage from '../../../page-objects/pages/account-list-page';
 import HeaderNavbar from '../../../page-objects/pages/header-navbar';
-import Homepage from '../../../page-objects/pages/homepage';
+import Homepage from '../../../page-objects/pages/home/homepage';
+import NftListPage from '../../../page-objects/pages/home/nft-list';
 import { loginWithBalanceValidation } from '../../../page-objects/flows/login.flow';
 
 describe('Import NFT', function () {
@@ -27,11 +28,11 @@ describe('Import NFT', function () {
 
         const homepage = new Homepage(driver);
         await homepage.goToNftTab();
-        await homepage.importNft(contractAddress, '1');
-        await homepage.check_successImportNftMessageIsDisplayed();
-
-        await homepage.check_nftNameIsDisplayed('TestDappNFTs');
-        await homepage.check_nftImageIsDisplayed();
+        const nftList = new NftListPage(driver);
+        await nftList.importNft(contractAddress, '1');
+        await nftList.check_successImportNftMessageIsDisplayed();
+        await nftList.check_nftNameIsDisplayed('TestDappNFTs');
+        await nftList.check_nftImageIsDisplayed();
       },
     );
   });
@@ -55,10 +56,11 @@ describe('Import NFT', function () {
         // Import a NFT and check that it is displayed in the NFT tab on homepage
         const homepage = new Homepage(driver);
         await homepage.goToNftTab();
-        await homepage.importNft(contractAddress, '1');
-        await homepage.check_successImportNftMessageIsDisplayed();
-        await homepage.check_nftNameIsDisplayed('TestDappNFTs');
-        await homepage.check_nftImageIsDisplayed();
+        const nftList = new NftListPage(driver);
+        await nftList.importNft(contractAddress, '1');
+        await nftList.check_successImportNftMessageIsDisplayed();
+        await nftList.check_nftNameIsDisplayed('TestDappNFTs');
+        await nftList.check_nftImageIsDisplayed();
 
         // Create new account with default name Account 2
         const headerNavbar = new HeaderNavbar(driver);
@@ -76,8 +78,8 @@ describe('Import NFT', function () {
         await accountListPage.switchToAccount('Account 1');
         await headerNavbar.check_accountLabel('Account 1');
         await homepage.check_localBlockchainBalanceIsDisplayed(ganacheServer);
-        await homepage.check_nftNameIsDisplayed('TestDappNFTs');
-        await homepage.check_nftImageIsDisplayed();
+        await nftList.check_nftNameIsDisplayed('TestDappNFTs');
+        await nftList.check_nftImageIsDisplayed();
       },
     );
   });
@@ -98,9 +100,8 @@ describe('Import NFT', function () {
           contractRegistry.getContractAddress(smartContract);
         await loginWithBalanceValidation(driver, ganacheServer);
 
-        const homepage = new Homepage(driver);
-        await homepage.goToNftTab();
-        await homepage.importNft(
+        await new Homepage(driver).goToNftTab();
+        await new NftListPage(driver).importNft(
           contractAddress,
           '2',
           'NFT can’t be added as the ownership details do not match. Make sure you have entered correct information.',
diff --git a/test/e2e/tests/tokens/watch-asset-call-add-token.ts b/test/e2e/tests/tokens/watch-asset-call-add-token.ts
index 35c66dda8ce6..b1dc4ae98746 100644
--- a/test/e2e/tests/tokens/watch-asset-call-add-token.ts
+++ b/test/e2e/tests/tokens/watch-asset-call-add-token.ts
@@ -6,7 +6,7 @@ import {
 import FixtureBuilder from '../../fixture-builder';
 import { SMART_CONTRACTS } from '../../seeder/smart-contracts';
 import AddTokenConfirmation from '../../page-objects/pages/confirmations/redesign/add-token-confirmations';
-import HomePage from '../../page-objects/pages/homepage';
+import AssetListPage from '../../page-objects/pages/home/asset-list';
 import TestDapp from '../../page-objects/pages/test-dapp';
 import { loginWithBalanceValidation } from '../../page-objects/flows/login.flow';
 
@@ -55,7 +55,7 @@ describe('Add token using wallet_watchAsset', function () {
         await driver.switchToWindowWithTitle(
           WINDOW_TITLES.ExtensionInFullScreenView,
         );
-        await new HomePage(driver).check_tokenAmountIsDisplayed('0 TST');
+        await new AssetListPage(driver).check_tokenAmountIsDisplayed('0 TST');
       },
     );
   });
@@ -102,7 +102,7 @@ describe('Add token using wallet_watchAsset', function () {
         await driver.switchToWindowWithTitle(
           WINDOW_TITLES.ExtensionInFullScreenView,
         );
-        await new HomePage(driver).check_tokenItemNumber(1);
+        await new AssetListPage(driver).check_tokenItemNumber(1);
       },
     );
   });
diff --git a/test/e2e/tests/transaction/ens.spec.ts b/test/e2e/tests/transaction/ens.spec.ts
index 3291287ab5a4..b36765475b62 100644
--- a/test/e2e/tests/transaction/ens.spec.ts
+++ b/test/e2e/tests/transaction/ens.spec.ts
@@ -4,7 +4,7 @@ import { defaultGanacheOptions, withFixtures } from '../../helpers';
 import { Driver } from '../../webdriver/driver';
 import FixtureBuilder from '../../fixture-builder';
 import { loginWithoutBalanceValidation } from '../../page-objects/flows/login.flow';
-import HomePage from '../../page-objects/pages/homepage';
+import HomePage from '../../page-objects/pages/home/homepage';
 import SendTokenPage from '../../page-objects/pages/send/send-token-page';
 import { mockServerJsonRpc } from '../ppom/mocks/mock-server-json-rpc';
 import { mockMultiNetworkBalancePolling } from '../../mock-balance-polling/mock-balance-polling';
diff --git a/test/e2e/tests/transaction/simple-send.spec.ts b/test/e2e/tests/transaction/simple-send.spec.ts
index 7d2f4835cdca..9ac091744974 100644
--- a/test/e2e/tests/transaction/simple-send.spec.ts
+++ b/test/e2e/tests/transaction/simple-send.spec.ts
@@ -9,7 +9,8 @@ import {
 import FixtureBuilder from '../../fixture-builder';
 import { loginWithBalanceValidation } from '../../page-objects/flows/login.flow';
 import { sendTransactionToAddress } from '../../page-objects/flows/send-transaction.flow';
-import HomePage from '../../page-objects/pages/homepage';
+import ActivityListPage from '../../page-objects/pages/home/activity-list';
+import HomePage from '../../page-objects/pages/home/homepage';
 
 describe('Simple send eth', function (this: Suite) {
   it('can send a simple transaction from one account to another', async function () {
@@ -39,8 +40,9 @@ describe('Simple send eth', function (this: Suite) {
         });
         const homePage = new HomePage(driver);
         await homePage.check_pageIsLoaded();
-        await homePage.check_confirmedTxNumberDisplayedInActivity();
-        await homePage.check_txAmountInActivity();
+        const activityList = new ActivityListPage(driver);
+        await activityList.check_confirmedTxNumberDisplayedInActivity();
+        await activityList.check_txAmountInActivity();
       },
     );
   });
diff --git a/test/e2e/tests/transaction/stuck-approved-transaction.spec.ts b/test/e2e/tests/transaction/stuck-approved-transaction.spec.ts
index 7afedc3187dd..5e2665627910 100644
--- a/test/e2e/tests/transaction/stuck-approved-transaction.spec.ts
+++ b/test/e2e/tests/transaction/stuck-approved-transaction.spec.ts
@@ -4,7 +4,8 @@ import FixtureBuilder from '../../fixture-builder';
 import { Driver } from '../../webdriver/driver';
 import { Ganache } from '../../seeder/ganache';
 import { loginWithBalanceValidation } from '../../page-objects/flows/login.flow';
-import HomePage from '../../page-objects/pages/homepage';
+import ActivityListPage from '../../page-objects/pages/home/activity-list';
+import HomePage from '../../page-objects/pages/home/homepage';
 
 describe('Editing Confirm Transaction', function (this: Suite) {
   it('approves a transaction stuck in approved state on boot', async function () {
@@ -25,10 +26,10 @@ describe('Editing Confirm Transaction', function (this: Suite) {
       }) => {
         await loginWithBalanceValidation(driver, ganacheServer);
 
-        const homePage = new HomePage(driver);
-        await homePage.goToActivityList();
-        await homePage.check_completedTxNumberDisplayedInActivity();
-        await homePage.check_txAmountInActivity();
+        new HomePage(driver).goToActivityList();
+        const activityList = new ActivityListPage(driver);
+        await activityList.check_completedTxNumberDisplayedInActivity();
+        await activityList.check_txAmountInActivity();
       },
     );
   });
diff --git a/test/e2e/vault-decryption-chrome.spec.ts b/test/e2e/vault-decryption-chrome.spec.ts
index 939494b00a60..110b7726a614 100644
--- a/test/e2e/vault-decryption-chrome.spec.ts
+++ b/test/e2e/vault-decryption-chrome.spec.ts
@@ -5,7 +5,7 @@ import level from 'level';
 import { Driver } from './webdriver/driver';
 import { withFixtures, WALLET_PASSWORD } from './helpers';
 import HeaderNavbar from './page-objects/pages/header-navbar';
-import HomePage from './page-objects/pages/homepage';
+import HomePage from './page-objects/pages/home/homepage';
 import PrivacySettings from './page-objects/pages/settings/privacy-settings';
 import SettingsPage from './page-objects/pages/settings/settings-page';
 import VaultDecryptorPage from './page-objects/pages/vault-decryptor-page';

From 589d7e4d1b45723183b825ba958d482fad53a23b Mon Sep 17 00:00:00 2001
From: Danica Shen <zhaodanica@gmail.com>
Date: Tue, 3 Dec 2024 16:09:34 +0000
Subject: [PATCH 017/175] feat(27256): implement remote feature flag feature
 (#28684)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<!--
Please submit this PR as a draft initially.
Do not mark it as "Ready for review" until the template has been
completely filled out, and PR status checks have passed at least once.
-->

## **Description**

- Consume feature-flag-controller built in
https://github.com/MetaMask/metamask-extension/issues/27254.
- And When Basic Functionality toggle is OFF, feature flag request
should not be made, not call getFeatureFlags, which can be aligned with
https://github.com/MetaMask/mobile-planning/issues/1975

<!--
Write a short description of the changes included in this pull request,
also include relevant motivation and context. Have in mind the following
questions:
1. What is the reason for the change?
2. What is the improvement/solution?
-->

[![Open in GitHub
Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/28684?quickstart=1)

## **Related issues**

Fixes: https://github.com/MetaMask/metamask-extension/issues/27256

## **Manual testing steps**

1.  Load the extension
2. Option 1: input `chrome.storage.local.get(console.log)` in dev tools
console, and you'll find in `data` => `RemoteFeatureFlagController` =>
contains 2 dataset, `cacheTimestamp` and `remoteFeatureFlags` with value
3. Option 2: go to settings => advanced, and click `download stage logs`
button, you'll find `remoteFeatureFlags` with cached value in your
state.
4. Option 3: Settings => about page, if you open console in dev tools,
there's a log after `Feature flag fetched successfully`, which will be
removed after we implement 1st feature flag in production

## **Screenshots/Recordings**

<!-- If applicable, add screenshots and/or recordings to visualize the
before and after of your change. -->

### **Before**

<!-- [screenshots/recordings] -->

### **After**

<!-- [screenshots/recordings] -->

## **Pre-merge author checklist**

- [ ] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension Coding
Standards](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/CODING_GUIDELINES.md).
- [ ] I've completed the PR template to the best of my ability
- [ ] I’ve included tests if applicable
- [ ] I’ve documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [ ] I’ve applied the right labels on the PR (see [labeling
guidelines](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.

## **Pre-merge reviewer checklist**

- [ ] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed).
- [ ] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.

---------

Co-authored-by: Mark Stacey <markjstacey@gmail.com>
Co-authored-by: MetaMask Bot <metamaskbot@users.noreply.github.com>
Co-authored-by: Dan J Miller <danjm.com@gmail.com>
---
 app/scripts/background.js                     |  19 ++-
 app/scripts/constants/sentry-state.ts         |   4 +
 app/scripts/metamask-controller.js            |  66 +++++++++
 app/scripts/metamask-controller.test.js       | 126 ++++++++++++++++++
 lavamoat/browserify/beta/policy.json          |   6 +
 lavamoat/browserify/flask/policy.json         |   6 +
 lavamoat/browserify/main/policy.json          |   6 +
 lavamoat/browserify/mmi/policy.json           |   6 +
 package.json                                  |   1 +
 privacy-snapshot.json                         |   1 +
 test/e2e/fixture-builder.js                   |   6 +
 test/e2e/mock-e2e.js                          |  17 ++-
 ...rs-after-init-opt-in-background-state.json |  22 +--
 .../errors-after-init-opt-in-ui-state.json    |  14 +-
 .../tests/remote-feature-flag/mock-data.ts    |   4 +
 .../remote-feature-flag.spec.ts               |  42 ++++++
 .../settings/info-tab/info-tab.component.js   |  10 ++
 .../settings/info-tab/info-tab.stories.js     |   2 +-
 ui/pages/settings/info-tab/info-tab.test.tsx  |   4 +-
 ui/pages/settings/settings.component.js       |   9 +-
 ui/pages/settings/settings.container.js       |   4 +-
 ui/pages/settings/settings.stories.js         |   1 +
 ui/pages/settings/settings.test.js            |   1 +
 ui/selectors/selectors.js                     |   4 +
 ui/selectors/selectors.test.js                |  15 +++
 yarn.lock                                     |  12 ++
 26 files changed, 386 insertions(+), 22 deletions(-)
 create mode 100644 test/e2e/tests/remote-feature-flag/mock-data.ts
 create mode 100644 test/e2e/tests/remote-feature-flag/remote-feature-flag.spec.ts

diff --git a/app/scripts/background.js b/app/scripts/background.js
index 2b2f5c4693df..be72e879e627 100644
--- a/app/scripts/background.js
+++ b/app/scripts/background.js
@@ -772,7 +772,6 @@ export function setupController(
   //
   // MetaMask Controller
   //
-
   controller = new MetamaskController({
     infuraProjectId: process.env.INFURA_PROJECT_ID,
     // User confirmation callbacks:
@@ -892,6 +891,8 @@ export function setupController(
       controller.isClientOpen = true;
       controller.setupTrustedCommunication(portStream, remotePort.sender);
 
+      initializeRemoteFeatureFlags();
+
       if (processName === ENVIRONMENT_TYPE_POPUP) {
         openPopupCount += 1;
         finished(portStream, () => {
@@ -1094,6 +1095,22 @@ export function setupController(
     }
   }
 
+  /**
+   * Initializes remote feature flags by making a request to fetch them from the clientConfigApi.
+   * This function is called when MM is during internal process.
+   * If the request fails, the error will be logged but won't interrupt extension initialization.
+   *
+   * @returns {Promise<void>} A promise that resolves when the remote feature flags have been updated.
+   */
+  async function initializeRemoteFeatureFlags() {
+    try {
+      // initialize the request to fetch remote feature flags
+      await controller.remoteFeatureFlagController.updateRemoteFeatureFlags();
+    } catch (error) {
+      log.error('Error initializing remote feature flags:', error);
+    }
+  }
+
   function getPendingApprovalCount() {
     try {
       let pendingApprovalCount =
diff --git a/app/scripts/constants/sentry-state.ts b/app/scripts/constants/sentry-state.ts
index 9823b2ada540..1087b5ac608b 100644
--- a/app/scripts/constants/sentry-state.ts
+++ b/app/scripts/constants/sentry-state.ts
@@ -270,6 +270,10 @@ export const SENTRY_BACKGROUND_STATE = {
     useTransactionSimulations: true,
     enableMV3TimestampSave: true,
   },
+  RemoteFeatureFlagController: {
+    remoteFeatureFlags: true,
+    cacheTimestamp: false,
+  },
   NotificationServicesPushController: {
     fcmToken: false,
   },
diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
index 1eaf354b4caf..ae42d59db747 100644
--- a/app/scripts/metamask-controller.js
+++ b/app/scripts/metamask-controller.js
@@ -104,6 +104,13 @@ import {
 } from '@metamask/controller-utils';
 
 import { AccountsController } from '@metamask/accounts-controller';
+import {
+  RemoteFeatureFlagController,
+  ClientConfigApiService,
+  ClientType,
+  DistributionType,
+  EnvironmentType,
+} from '@metamask/remote-feature-flag-controller';
 
 ///: BEGIN:ONLY_INCLUDE_IF(build-mmi)
 import {
@@ -241,6 +248,7 @@ import { endTrace, trace } from '../../shared/lib/trace';
 // eslint-disable-next-line import/no-restricted-paths
 import { isSnapId } from '../../ui/helpers/utils/snaps';
 import { BridgeStatusAction } from '../../shared/types/bridge-status';
+import { ENVIRONMENT } from '../../development/build/constants';
 import fetchWithCache from '../../shared/lib/fetch-with-cache';
 import { BalancesController as MultichainBalancesController } from './lib/accounts/BalancesController';
 import {
@@ -393,6 +401,17 @@ const PHISHING_SAFELIST = 'metamask-phishing-safelist';
 // OneKey devices can connect to Metamask using Trezor USB transport. They use a specific device minor version (99) to differentiate between genuine Trezor and OneKey devices.
 export const ONE_KEY_VIA_TREZOR_MINOR_VERSION = 99;
 
+const environmentMappingForRemoteFeatureFlag = {
+  [ENVIRONMENT.DEVELOPMENT]: EnvironmentType.Development,
+  [ENVIRONMENT.RELEASE_CANDIDATE]: EnvironmentType.ReleaseCandidate,
+  [ENVIRONMENT.PRODUCTION]: EnvironmentType.Production,
+};
+
+const buildTypeMappingForRemoteFeatureFlag = {
+  flask: DistributionType.Flask,
+  main: DistributionType.Main,
+};
+
 export default class MetamaskController extends EventEmitter {
   /**
    * @param {object} opts
@@ -2342,6 +2361,40 @@ export default class MetamaskController extends EventEmitter {
       clearPendingConfirmations.bind(this),
     );
 
+    // RemoteFeatureFlagController has subscription for preferences changes
+    this.controllerMessenger.subscribe(
+      'PreferencesController:stateChange',
+      previousValueComparator((prevState, currState) => {
+        const { useExternalServices: prevUseExternalServices } = prevState;
+        const { useExternalServices: currUseExternalServices } = currState;
+        if (currUseExternalServices && !prevUseExternalServices) {
+          this.remoteFeatureFlagController.enable();
+          this.remoteFeatureFlagController.updateRemoteFeatureFlags();
+        } else if (!currUseExternalServices && prevUseExternalServices) {
+          this.remoteFeatureFlagController.disable();
+        }
+      }, this.preferencesController.state),
+    );
+
+    // Initialize RemoteFeatureFlagController
+    this.remoteFeatureFlagController = new RemoteFeatureFlagController({
+      messenger: this.controllerMessenger.getRestricted({
+        name: 'RemoteFeatureFlagController',
+        allowedActions: [],
+        allowedEvents: [],
+      }),
+      disabled: !this.preferencesController.state.useExternalServices,
+      clientConfigApiService: new ClientConfigApiService({
+        fetch: globalThis.fetch.bind(globalThis),
+        config: {
+          client: ClientType.Extension,
+          distribution:
+            this._getConfigForRemoteFeatureFlagRequest().distribution,
+          environment: this._getConfigForRemoteFeatureFlagRequest().environment,
+        },
+      }),
+    });
+
     this.metamaskMiddleware = createMetamaskMiddleware({
       static: {
         eth_syncing: false,
@@ -2508,6 +2561,7 @@ export default class MetamaskController extends EventEmitter {
       NotificationServicesController: this.notificationServicesController,
       NotificationServicesPushController:
         this.notificationServicesPushController,
+      RemoteFeatureFlagController: this.remoteFeatureFlagController,
       ...resetOnRestartStore,
     });
 
@@ -2563,6 +2617,7 @@ export default class MetamaskController extends EventEmitter {
         QueuedRequestController: this.queuedRequestController,
         NotificationServicesPushController:
           this.notificationServicesPushController,
+        RemoteFeatureFlagController: this.remoteFeatureFlagController,
         ...resetOnRestartStore,
       },
       controllerMessenger: this.controllerMessenger,
@@ -7364,6 +7419,17 @@ export default class MetamaskController extends EventEmitter {
     };
   }
 
+  _getConfigForRemoteFeatureFlagRequest() {
+    const distribution =
+      buildTypeMappingForRemoteFeatureFlag[process.env.METAMASK_BUILD_TYPE] ||
+      DistributionType.Main;
+    const environment =
+      environmentMappingForRemoteFeatureFlag[
+        process.env.METAMASK_ENVIRONMENT
+      ] || EnvironmentType.Development;
+    return { distribution, environment };
+  }
+
   #checkTokenListPolling(currentState, previousState) {
     const previousEnabled = this.#isTokenListPollingRequired(previousState);
     const newEnabled = this.#isTokenListPollingRequired(currentState);
diff --git a/app/scripts/metamask-controller.test.js b/app/scripts/metamask-controller.test.js
index f7115f9364bd..29e6f3a954d6 100644
--- a/app/scripts/metamask-controller.test.js
+++ b/app/scripts/metamask-controller.test.js
@@ -42,6 +42,7 @@ import { flushPromises } from '../../test/lib/timer-helpers';
 import { ETH_EOA_METHODS } from '../../shared/constants/eth-methods';
 import { createMockInternalAccount } from '../../test/jest/mocks';
 import { mockNetworkState } from '../../test/stub/networks';
+import { ENVIRONMENT } from '../../development/build/constants';
 import { SECOND } from '../../shared/constants/time';
 import {
   BalancesController as MultichainBalancesController,
@@ -2607,6 +2608,131 @@ describe('MetaMaskController', () => {
         );
       });
     });
+
+    describe('RemoteFeatureFlagController', () => {
+      let localMetamaskController;
+
+      beforeEach(() => {
+        localMetamaskController = new MetaMaskController({
+          showUserConfirmation: noop,
+          encryptor: mockEncryptor,
+          initState: {
+            ...cloneDeep(firstTimeState),
+            PreferencesController: {
+              useExternalServices: false,
+            },
+          },
+          initLangCode: 'en_US',
+          platform: {
+            showTransactionNotification: () => undefined,
+            getVersion: () => 'foo',
+          },
+          browser: browserPolyfillMock,
+          infuraProjectId: 'foo',
+          isFirstMetaMaskControllerSetup: true,
+        });
+      });
+
+      afterEach(() => {
+        jest.clearAllMocks();
+      });
+
+      it('should initialize RemoteFeatureFlagController in disabled state when useExternalServices is false', async () => {
+        const { remoteFeatureFlagController, preferencesController } =
+          localMetamaskController;
+
+        expect(preferencesController.state.useExternalServices).toBe(false);
+        expect(remoteFeatureFlagController.state).toStrictEqual({
+          remoteFeatureFlags: {},
+          cacheTimestamp: 0,
+        });
+      });
+
+      it('should disable feature flag fetching when useExternalServices is disabled', async () => {
+        const { remoteFeatureFlagController } = localMetamaskController;
+
+        // First enable external services
+        await simulatePreferencesChange({
+          useExternalServices: true,
+        });
+
+        // Then disable them
+        await simulatePreferencesChange({
+          useExternalServices: false,
+        });
+
+        expect(remoteFeatureFlagController.state).toStrictEqual({
+          remoteFeatureFlags: {},
+          cacheTimestamp: 0,
+        });
+      });
+
+      it('should handle errors during feature flag updates', async () => {
+        const { remoteFeatureFlagController } = localMetamaskController;
+        const mockError = new Error('Failed to fetch');
+
+        jest
+          .spyOn(remoteFeatureFlagController, 'updateRemoteFeatureFlags')
+          .mockRejectedValue(mockError);
+
+        await simulatePreferencesChange({
+          useExternalServices: true,
+        });
+
+        expect(remoteFeatureFlagController.state).toStrictEqual({
+          remoteFeatureFlags: {},
+          cacheTimestamp: 0,
+        });
+      });
+
+      it('should maintain feature flag state across preference toggles', async () => {
+        const { remoteFeatureFlagController } = localMetamaskController;
+        const mockFlags = { testFlag: true };
+
+        jest
+          .spyOn(remoteFeatureFlagController, 'updateRemoteFeatureFlags')
+          .mockResolvedValue(mockFlags);
+
+        // Enable external services
+        await simulatePreferencesChange({
+          useExternalServices: true,
+        });
+
+        // Disable external services
+        await simulatePreferencesChange({
+          useExternalServices: false,
+        });
+
+        // Verify state is cleared
+        expect(remoteFeatureFlagController.state).toStrictEqual({
+          remoteFeatureFlags: {},
+          cacheTimestamp: 0,
+        });
+      });
+    });
+
+    describe('_getConfigForRemoteFeatureFlagRequest', () => {
+      it('returns config in mapping', async () => {
+        const result =
+          await metamaskController._getConfigForRemoteFeatureFlagRequest();
+        expect(result).toStrictEqual({
+          distribution: 'main',
+          environment: 'dev',
+        });
+      });
+
+      it('returna config when not matching default mapping', async () => {
+        process.env.METAMASK_BUILD_TYPE = 'beta';
+        process.env.METAMASK_ENVIRONMENT = ENVIRONMENT.RELEASE_CANDIDATE;
+
+        const result =
+          await metamaskController._getConfigForRemoteFeatureFlagRequest();
+        expect(result).toStrictEqual({
+          distribution: 'main',
+          environment: 'rc',
+        });
+      });
+    });
   });
 
   describe('onFeatureFlagResponseReceived', () => {
diff --git a/lavamoat/browserify/beta/policy.json b/lavamoat/browserify/beta/policy.json
index 47227aeef932..77c0940ef550 100644
--- a/lavamoat/browserify/beta/policy.json
+++ b/lavamoat/browserify/beta/policy.json
@@ -2338,6 +2338,12 @@
         "semver": true
       }
     },
+    "@metamask/remote-feature-flag-controller": {
+      "packages": {
+        "@metamask/base-controller": true,
+        "cockatiel": true
+      }
+    },
     "@metamask/rpc-errors": {
       "packages": {
         "@metamask/rpc-errors>fast-safe-stringify": true,
diff --git a/lavamoat/browserify/flask/policy.json b/lavamoat/browserify/flask/policy.json
index 47227aeef932..77c0940ef550 100644
--- a/lavamoat/browserify/flask/policy.json
+++ b/lavamoat/browserify/flask/policy.json
@@ -2338,6 +2338,12 @@
         "semver": true
       }
     },
+    "@metamask/remote-feature-flag-controller": {
+      "packages": {
+        "@metamask/base-controller": true,
+        "cockatiel": true
+      }
+    },
     "@metamask/rpc-errors": {
       "packages": {
         "@metamask/rpc-errors>fast-safe-stringify": true,
diff --git a/lavamoat/browserify/main/policy.json b/lavamoat/browserify/main/policy.json
index 47227aeef932..77c0940ef550 100644
--- a/lavamoat/browserify/main/policy.json
+++ b/lavamoat/browserify/main/policy.json
@@ -2338,6 +2338,12 @@
         "semver": true
       }
     },
+    "@metamask/remote-feature-flag-controller": {
+      "packages": {
+        "@metamask/base-controller": true,
+        "cockatiel": true
+      }
+    },
     "@metamask/rpc-errors": {
       "packages": {
         "@metamask/rpc-errors>fast-safe-stringify": true,
diff --git a/lavamoat/browserify/mmi/policy.json b/lavamoat/browserify/mmi/policy.json
index 89eedc822794..142c348220e3 100644
--- a/lavamoat/browserify/mmi/policy.json
+++ b/lavamoat/browserify/mmi/policy.json
@@ -2430,6 +2430,12 @@
         "semver": true
       }
     },
+    "@metamask/remote-feature-flag-controller": {
+      "packages": {
+        "@metamask/base-controller": true,
+        "cockatiel": true
+      }
+    },
     "@metamask/rpc-errors": {
       "packages": {
         "@metamask/rpc-errors>fast-safe-stringify": true,
diff --git a/package.json b/package.json
index 7d346d40cd0a..3190f5deb970 100644
--- a/package.json
+++ b/package.json
@@ -336,6 +336,7 @@
     "@metamask/providers": "^18.2.0",
     "@metamask/queued-request-controller": "^7.0.1",
     "@metamask/rate-limit-controller": "^6.0.0",
+    "@metamask/remote-feature-flag-controller": "^1.1.0",
     "@metamask/rpc-errors": "^7.0.0",
     "@metamask/safe-event-emitter": "^3.1.1",
     "@metamask/scure-bip39": "^2.0.3",
diff --git a/privacy-snapshot.json b/privacy-snapshot.json
index 5620903a5c73..d133a74b3b30 100644
--- a/privacy-snapshot.json
+++ b/privacy-snapshot.json
@@ -16,6 +16,7 @@
   "cdn.segment.io",
   "cdnjs.cloudflare.com",
   "chainid.network",
+  "client-config.api.cx.metamask.io",
   "client-side-detection.api.cx.metamask.io",
   "configuration.dev.metamask-institutional.io",
   "configuration.metamask-institutional.io",
diff --git a/test/e2e/fixture-builder.js b/test/e2e/fixture-builder.js
index 7269bda82153..d2dc32297737 100644
--- a/test/e2e/fixture-builder.js
+++ b/test/e2e/fixture-builder.js
@@ -235,6 +235,12 @@ class FixtureBuilder {
     });
   }
 
+  withUseBasicFunctionalityDisabled() {
+    return this.withPreferencesController({
+      useExternalServices: false,
+    });
+  }
+
   withGasFeeController(data) {
     merge(this.fixture.data.GasFeeController, data);
     return this;
diff --git a/test/e2e/mock-e2e.js b/test/e2e/mock-e2e.js
index fc6b1ea4397a..2c56c5797a32 100644
--- a/test/e2e/mock-e2e.js
+++ b/test/e2e/mock-e2e.js
@@ -125,7 +125,6 @@ async function setupMocking(
   });
 
   const mockedEndpoint = await testSpecificMock(server);
-
   // Mocks below this line can be overridden by test-specific mocks
 
   // Account link
@@ -738,6 +737,22 @@ async function setupMocking(
     };
   });
 
+  // remote feature flags
+  await server
+    .forGet('https://client-config.api.cx.metamask.io/v1/flags')
+    .withQuery({
+      client: 'extension',
+      distribution: 'main',
+      environment: 'dev',
+    })
+    .thenCallback(() => {
+      return {
+        ok: true,
+        statusCode: 200,
+        json: [{ feature1: true }, { feature2: false }],
+      };
+    });
+
   /**
    * Returns an array of alphanumerically sorted hostnames that were requested
    * during the current test suite.
diff --git a/test/e2e/tests/metrics/state-snapshots/errors-after-init-opt-in-background-state.json b/test/e2e/tests/metrics/state-snapshots/errors-after-init-opt-in-background-state.json
index 8351032761a7..ecd0b1d0db7a 100644
--- a/test/e2e/tests/metrics/state-snapshots/errors-after-init-opt-in-background-state.json
+++ b/test/e2e/tests/metrics/state-snapshots/errors-after-init-opt-in-background-state.json
@@ -233,17 +233,17 @@
       "petnamesEnabled": true,
       "showMultiRpcModal": "boolean",
       "isRedesignedConfirmationsDeveloperEnabled": "boolean",
-      "redesignedConfirmationsEnabled": true,
-      "redesignedTransactionsEnabled": "boolean",
       "tokenSortConfig": "object",
+      "shouldShowAggregatedBalancePopover": "boolean",
       "tokenNetworkFilter": {
         "0x1": "boolean",
-        "0x539": "boolean",
         "0xaa36a7": "boolean",
         "0xe705": "boolean",
-        "0xe708": "boolean"
+        "0xe708": "boolean",
+        "0x539": "boolean"
       },
-      "shouldShowAggregatedBalancePopover": "boolean"
+      "redesignedConfirmationsEnabled": true,
+      "redesignedTransactionsEnabled": "boolean"
     },
     "ipfsGateway": "string",
     "isIpfsGatewayEnabled": "boolean",
@@ -260,6 +260,10 @@
     "showIncomingTransactions": "object"
   },
   "QueuedRequestController": { "queuedRequestCount": 0 },
+  "RemoteFeatureFlagController": {
+    "remoteFeatureFlags": { "feature1": true, "feature2": false },
+    "cacheTimestamp": "number"
+  },
   "SelectedNetworkController": { "domains": "object" },
   "SignatureController": {
     "signatureRequests": "object",
@@ -320,15 +324,13 @@
       "swapsFeatureFlags": {}
     }
   },
-  "TokenBalancesController": {
-    "tokenBalances": "object"
-  },
+  "TokenBalancesController": { "tokenBalances": "object" },
   "TokenListController": {
     "tokenList": "object",
     "tokensChainsCache": {
       "0x1": "object",
-      "0x539": "object",
-      "0xe708": "object"
+      "0xe708": "object",
+      "0x539": "object"
     },
     "preventPollingOnNetworkRestart": false
   },
diff --git a/test/e2e/tests/metrics/state-snapshots/errors-after-init-opt-in-ui-state.json b/test/e2e/tests/metrics/state-snapshots/errors-after-init-opt-in-ui-state.json
index 5d79ca5964b8..ccecc8669c81 100644
--- a/test/e2e/tests/metrics/state-snapshots/errors-after-init-opt-in-ui-state.json
+++ b/test/e2e/tests/metrics/state-snapshots/errors-after-init-opt-in-ui-state.json
@@ -36,14 +36,14 @@
       "showMultiRpcModal": "boolean",
       "isRedesignedConfirmationsDeveloperEnabled": "boolean",
       "tokenSortConfig": "object",
+      "shouldShowAggregatedBalancePopover": "boolean",
       "tokenNetworkFilter": {
         "0x1": "boolean",
-        "0x539": "boolean",
         "0xaa36a7": "boolean",
         "0xe705": "boolean",
-        "0xe708": "boolean"
+        "0xe708": "boolean",
+        "0x539": "boolean"
       },
-      "shouldShowAggregatedBalancePopover": "boolean",
       "redesignedConfirmationsEnabled": true,
       "redesignedTransactionsEnabled": "boolean"
     },
@@ -181,10 +181,9 @@
     "tokenList": "object",
     "tokensChainsCache": {
       "0x1": "object",
-      "0x539": "object",
-      "0xe708": "object"
+      "0xe708": "object",
+      "0x539": "object"
     },
-    "tokenBalances": "object",
     "preventPollingOnNetworkRestart": false,
     "tokens": "object",
     "ignoredTokens": "object",
@@ -192,6 +191,7 @@
     "allTokens": {},
     "allIgnoredTokens": {},
     "allDetectedTokens": {},
+    "tokenBalances": "object",
     "smartTransactionsState": {
       "fees": {},
       "feesByChainId": "object",
@@ -240,6 +240,8 @@
     "isCheckingAccountsPresence": "boolean",
     "queuedRequestCount": 0,
     "fcmToken": "string",
+    "remoteFeatureFlags": { "feature1": true, "feature2": false },
+    "cacheTimestamp": "number",
     "accounts": "object",
     "accountsByChainId": "object",
     "marketData": "object",
diff --git a/test/e2e/tests/remote-feature-flag/mock-data.ts b/test/e2e/tests/remote-feature-flag/mock-data.ts
new file mode 100644
index 000000000000..5d05dc9367f9
--- /dev/null
+++ b/test/e2e/tests/remote-feature-flag/mock-data.ts
@@ -0,0 +1,4 @@
+export const MOCK_REMOTE_FEATURE_FLAGS_RESPONSE = {
+  feature1: true,
+  feature2: false,
+};
diff --git a/test/e2e/tests/remote-feature-flag/remote-feature-flag.spec.ts b/test/e2e/tests/remote-feature-flag/remote-feature-flag.spec.ts
new file mode 100644
index 000000000000..d8d6878e37c4
--- /dev/null
+++ b/test/e2e/tests/remote-feature-flag/remote-feature-flag.spec.ts
@@ -0,0 +1,42 @@
+import { strict as assert } from 'assert';
+import { Suite } from 'mocha';
+import { getCleanAppState, withFixtures } from '../../helpers';
+import FixtureBuilder from '../../fixture-builder';
+import { TestSuiteArguments } from '../confirmations/transactions/shared';
+import { loginWithBalanceValidation } from '../../page-objects/flows/login.flow';
+import { MOCK_REMOTE_FEATURE_FLAGS_RESPONSE } from './mock-data';
+
+describe('Remote feature flag', function (this: Suite) {
+  it('should be fetched when basic functionality toggle is on', async function () {
+    await withFixtures(
+      {
+        fixtures: new FixtureBuilder().build(),
+        title: this.test?.fullTitle(),
+      },
+      async ({ driver }: TestSuiteArguments) => {
+        await loginWithBalanceValidation(driver);
+        const uiState = await getCleanAppState(driver);
+        assert.deepStrictEqual(
+          uiState.metamask.remoteFeatureFlags,
+          MOCK_REMOTE_FEATURE_FLAGS_RESPONSE,
+        );
+      },
+    );
+  });
+
+  it('should not be fetched when basic functionality toggle is off', async function () {
+    await withFixtures(
+      {
+        fixtures: new FixtureBuilder()
+          .withUseBasicFunctionalityDisabled()
+          .build(),
+        title: this.test?.fullTitle(),
+      },
+      async ({ driver }: TestSuiteArguments) => {
+        await loginWithBalanceValidation(driver);
+        const uiState = await getCleanAppState(driver);
+        assert.deepStrictEqual(uiState.metamask.remoteFeatureFlags, {});
+      },
+    );
+  });
+});
diff --git a/ui/pages/settings/info-tab/info-tab.component.js b/ui/pages/settings/info-tab/info-tab.component.js
index 121f29e7c52c..6c6efac729bb 100644
--- a/ui/pages/settings/info-tab/info-tab.component.js
+++ b/ui/pages/settings/info-tab/info-tab.component.js
@@ -28,6 +28,10 @@ import {
 } from '../../../../shared/lib/ui-utils';
 
 export default class InfoTab extends PureComponent {
+  static propTypes = {
+    remoteFeatureFlags: PropTypes.object.isRequired,
+  };
+
   state = {
     version: process.env.METAMASK_VERSION,
   };
@@ -53,6 +57,12 @@ export default class InfoTab extends PureComponent {
   componentDidMount() {
     const { t } = this.context;
     handleSettingsRefs(t, t('about'), this.settingsRefs);
+    if (this.props.remoteFeatureFlags.testBooleanFlag) {
+      // eslint-disable-next-line no-console
+      console.log(
+        `Fetch remote feature flag success, eg: testBooleanFlag has value ${this.props.remoteFeatureFlags.testBooleanFlag}`,
+      );
+    }
   }
 
   renderInfoLinks() {
diff --git a/ui/pages/settings/info-tab/info-tab.stories.js b/ui/pages/settings/info-tab/info-tab.stories.js
index 34f855172d1c..020f60d2516e 100644
--- a/ui/pages/settings/info-tab/info-tab.stories.js
+++ b/ui/pages/settings/info-tab/info-tab.stories.js
@@ -5,6 +5,6 @@ export default {
   title: 'Pages/Settings/InfoTab',
 };
 
-export const DefaultStory = () => <InfoTab />;
+export const DefaultStory = () => <InfoTab remoteFeatureFlags={{}} />;
 
 DefaultStory.storyName = 'Default';
diff --git a/ui/pages/settings/info-tab/info-tab.test.tsx b/ui/pages/settings/info-tab/info-tab.test.tsx
index b25be3f8ed5e..7625caf09efb 100644
--- a/ui/pages/settings/info-tab/info-tab.test.tsx
+++ b/ui/pages/settings/info-tab/info-tab.test.tsx
@@ -7,7 +7,9 @@ describe('InfoTab', () => {
     let getByText: (text: string) => HTMLElement;
 
     beforeEach(() => {
-      const renderResult = renderWithProvider(<InfoTab />);
+      const renderResult = renderWithProvider(
+        <InfoTab remoteFeatureFlags={{}} />,
+      );
       getByText = renderResult.getByText;
     });
 
diff --git a/ui/pages/settings/settings.component.js b/ui/pages/settings/settings.component.js
index 6cd630245819..724c661c9aeb 100644
--- a/ui/pages/settings/settings.component.js
+++ b/ui/pages/settings/settings.component.js
@@ -69,6 +69,7 @@ class SettingsPage extends PureComponent {
     isPopup: PropTypes.bool,
     mostRecentOverviewPage: PropTypes.string.isRequired,
     pathnameI18nKey: PropTypes.string,
+    remoteFeatureFlags: PropTypes.object.isRequired,
     toggleNetworkMenu: PropTypes.func.isRequired,
     useExternalServices: PropTypes.bool,
   };
@@ -382,7 +383,13 @@ class SettingsPage extends PureComponent {
             />
           )}
         />
-        <Route exact path={ABOUT_US_ROUTE} component={InfoTab} />
+        <Route
+          exact
+          path={ABOUT_US_ROUTE}
+          render={() => (
+            <InfoTab remoteFeatureFlags={this.props.remoteFeatureFlags} />
+          )}
+        />
         <Route exact path={ADVANCED_ROUTE} component={AdvancedTab} />
         <Route
           exact
diff --git a/ui/pages/settings/settings.container.js b/ui/pages/settings/settings.container.js
index db500f8b1d46..d8380c05b8e0 100644
--- a/ui/pages/settings/settings.container.js
+++ b/ui/pages/settings/settings.container.js
@@ -3,6 +3,7 @@ import { connect } from 'react-redux';
 import { withRouter } from 'react-router-dom';
 import {
   getAddressBookEntryOrAccountName,
+  getRemoteFeatureFlags,
   getUseExternalServices,
 } from '../../selectors';
 import { ENVIRONMENT_TYPE_POPUP } from '../../../shared/constants/app';
@@ -60,7 +61,7 @@ const mapStateToProps = (state, ownProps) => {
   const {
     metamask: { currencyRates },
   } = state;
-
+  const remoteFeatureFlags = getRemoteFeatureFlags(state);
   const conversionDate = currencyRates[ticker]?.conversionDate;
 
   const pathNameTail = pathname.match(/[^/]+$/u)[0];
@@ -113,6 +114,7 @@ const mapStateToProps = (state, ownProps) => {
     isPopup,
     mostRecentOverviewPage: getMostRecentOverviewPage(state),
     pathnameI18nKey,
+    remoteFeatureFlags,
     useExternalServices,
   };
 };
diff --git a/ui/pages/settings/settings.stories.js b/ui/pages/settings/settings.stories.js
index a23cd3c1e1cf..53437f4175db 100644
--- a/ui/pages/settings/settings.stories.js
+++ b/ui/pages/settings/settings.stories.js
@@ -61,6 +61,7 @@ const Settings = ({ history }) => {
         history={history}
         pathnameI18nKey={pathnameI18nKey}
         backRoute={SETTINGS_ROUTE}
+        remoteFeatureFlags={{}}
       />
     </div>
   );
diff --git a/ui/pages/settings/settings.test.js b/ui/pages/settings/settings.test.js
index 238b50f3ce5b..061175865fce 100644
--- a/ui/pages/settings/settings.test.js
+++ b/ui/pages/settings/settings.test.js
@@ -19,6 +19,7 @@ describe('SettingsPage', () => {
     isSnapViewPage: false,
     mostRecentOverviewPage: '/',
     pathnameI18nKey: '',
+    remoteFeatureFlags: {},
   };
 
   const mockStore = configureMockStore()(mockState);
diff --git a/ui/selectors/selectors.js b/ui/selectors/selectors.js
index deb18c1c5309..591b569874ec 100644
--- a/ui/selectors/selectors.js
+++ b/ui/selectors/selectors.js
@@ -2904,6 +2904,10 @@ export function getMetaMetricsDataDeletionStatus(state) {
   return state.metamask.metaMetricsDataDeletionStatus;
 }
 
+export function getRemoteFeatureFlags(state) {
+  return state.metamask.remoteFeatureFlags;
+}
+
 /**
  * To get all installed snaps with proper metadata
  *
diff --git a/ui/selectors/selectors.test.js b/ui/selectors/selectors.test.js
index ba0544af729e..b4b748104189 100644
--- a/ui/selectors/selectors.test.js
+++ b/ui/selectors/selectors.test.js
@@ -2163,4 +2163,19 @@ describe('#getConnectedSitesList', () => {
       expect(getCurrentChainIdSpy).not.toHaveBeenCalled(); // Ensure overrideChainId is used
     });
   });
+
+  describe('#getRemoteFeatureFlags', () => {
+    it('returns remoteFeatureFlags in state', () => {
+      const state = {
+        metamask: {
+          remoteFeatureFlags: {
+            existingFlag: true,
+          },
+        },
+      };
+      expect(selectors.getRemoteFeatureFlags(state)).toStrictEqual({
+        existingFlag: true,
+      });
+    });
+  });
 });
diff --git a/yarn.lock b/yarn.lock
index c88156929c17..222d18e5dcb6 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6139,6 +6139,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@metamask/remote-feature-flag-controller@npm:^1.1.0":
+  version: 1.1.0
+  resolution: "@metamask/remote-feature-flag-controller@npm:1.1.0"
+  dependencies:
+    "@metamask/base-controller": "npm:^7.0.2"
+    "@metamask/utils": "npm:^10.0.0"
+    cockatiel: "npm:^3.1.2"
+  checksum: 10/b4b9be277a0da57e8214bdb5ad832c46cdacf8f824426fc377fb40535d9c277f1c1b17c3290343a00f37fa3514232c21dcc18a2eaf5bb47267b3b4c09b150acb
+  languageName: node
+  linkType: hard
+
 "@metamask/rpc-errors@npm:^6.0.0, @metamask/rpc-errors@npm:^6.2.1, @metamask/rpc-errors@npm:^6.3.0, @metamask/rpc-errors@npm:^6.3.1":
   version: 6.4.0
   resolution: "@metamask/rpc-errors@npm:6.4.0"
@@ -26552,6 +26563,7 @@ __metadata:
     "@metamask/providers": "npm:^18.2.0"
     "@metamask/queued-request-controller": "npm:^7.0.1"
     "@metamask/rate-limit-controller": "npm:^6.0.0"
+    "@metamask/remote-feature-flag-controller": "npm:^1.1.0"
     "@metamask/rpc-errors": "npm:^7.0.0"
     "@metamask/safe-event-emitter": "npm:^3.1.1"
     "@metamask/scure-bip39": "npm:^2.0.3"

From 4534f9a55a11c92daca4d750e889614f68718a33 Mon Sep 17 00:00:00 2001
From: Mathieu Artu <mathieu.artu@consensys.net>
Date: Tue, 3 Dec 2024 19:38:26 +0100
Subject: [PATCH 018/175] fix: check if a user is signed in before attempting
 to sign them out (#28874)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## **Description**

This PR adds a `isUserSignedIn` check before attempting to sign him out.

[![Open in GitHub
Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/28874?quickstart=1)

## **Related issues**

Fixes: https://github.com/MetaMask/MetaMask-planning/issues/3709

## **Manual testing steps**

1. Go to this page...
2.
3.

## **Screenshots/Recordings**

<!-- If applicable, add screenshots and/or recordings to visualize the
before and after of your change. -->

### **Before**

<!-- [screenshots/recordings] -->

### **After**

<!-- [screenshots/recordings] -->

## **Pre-merge author checklist**

- [x] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension Coding
Standards](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/CODING_GUIDELINES.md).
- [x] I've completed the PR template to the best of my ability
- [x] I’ve included tests if applicable
- [x] I’ve documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [x] I’ve applied the right labels on the PR (see [labeling
guidelines](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.

## **Pre-merge reviewer checklist**

- [x] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed).
- [x] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.
---
 ui/hooks/metamask-notifications/useMetametrics.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ui/hooks/metamask-notifications/useMetametrics.ts b/ui/hooks/metamask-notifications/useMetametrics.ts
index 0f9f1c2f666f..47292c8050a0 100644
--- a/ui/hooks/metamask-notifications/useMetametrics.ts
+++ b/ui/hooks/metamask-notifications/useMetametrics.ts
@@ -72,6 +72,7 @@ export function useDisableMetametrics(): {
 } {
   const dispatch = useDispatch();
   const isProfileSyncingEnabled = useSelector(selectIsProfileSyncingEnabled);
+  const isUserSignedIn = useSelector(selectIsSignedIn);
 
   const [loading, setLoading] = useState<boolean>(false);
   const [error, setError] = useState<string | null>(null);
@@ -82,7 +83,7 @@ export function useDisableMetametrics(): {
     setError(null);
 
     try {
-      if (isProfileSyncingEnabled) {
+      if (isProfileSyncingEnabled && isUserSignedIn) {
         await dispatch(performSignOut());
       }
       await dispatch(setParticipateInMetaMetrics(false));

From f8ae136673c1f1c37f91e4a412e2fbb77a9d35e1 Mon Sep 17 00:00:00 2001
From: Nidhi Kumari <nidhi.kumari@consensys.net>
Date: Wed, 4 Dec 2024 09:40:16 +0000
Subject: [PATCH 019/175] fix: updated analytics preferences to be logged
 during onboarding (#28897)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

During onboarding while clicking on I agree button, the analytics
preferences event was not being triggered. This PR is to ensure
analytics preferences are logged when user click on `I agree` button in
Onboarding Page

## **Related issues**

Fixes:
[https://github.com/MetaMask/MetaMask-planning/issues/3723](https://github.com/MetaMask/MetaMask-planning/issues/3723)

## **Manual testing steps**

1. Run extension with yarn start
2. Add console.log in trackEvent in ui/contexts/metametrics.js to see
the payload
3. Do a fresh install and go on onboading flow
4. Click on I agree button on onboarding screen, check analytics
preferences selected are being logged in console

## **Screenshots/Recordings**

<!-- If applicable, add screenshots and/or recordings to visualize the
before and after of your change. -->

### **Before**


### **After**


https://github.com/user-attachments/assets/35e156a1-ea81-4dd6-a037-87cfcd581773
## **Pre-merge author checklist**

- [ ] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension Coding
Standards](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/CODING_GUIDELINES.md).
- [ ] I've completed the PR template to the best of my ability
- [ ] I’ve included tests if applicable
- [ ] I’ve documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [ ] I’ve applied the right labels on the PR (see [labeling
guidelines](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.

## **Pre-merge reviewer checklist**

- [ ] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed).
- [ ] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.
---
 .../metametrics/metametrics.js                | 30 ++++++++-----------
 1 file changed, 13 insertions(+), 17 deletions(-)

diff --git a/ui/pages/onboarding-flow/metametrics/metametrics.js b/ui/pages/onboarding-flow/metametrics/metametrics.js
index 242638b08c5e..3a36ea90bb14 100644
--- a/ui/pages/onboarding-flow/metametrics/metametrics.js
+++ b/ui/pages/onboarding-flow/metametrics/metametrics.js
@@ -17,7 +17,6 @@ import {
   setDataCollectionForMarketing,
 } from '../../../store/actions';
 import {
-  getParticipateInMetaMetrics,
   getDataCollectionForMarketing,
   getFirstTimeFlowType,
   getFirstTimeFlowTypeRouteAfterMetaMetricsOptIn,
@@ -53,7 +52,6 @@ export default function OnboardingMetametrics() {
   const firstTimeFlowType = useSelector(getFirstTimeFlowType);
 
   const dataCollectionForMarketing = useSelector(getDataCollectionForMarketing);
-  const participateInMetaMetrics = useSelector(getParticipateInMetaMetrics);
 
   const trackEvent = useContext(MetaMetricsContext);
 
@@ -82,22 +80,20 @@ export default function OnboardingMetametrics() {
         },
       );
 
-      if (participateInMetaMetrics) {
-        trackEvent({
-          category: MetaMetricsEventCategory.Onboarding,
-          event: MetaMetricsEventName.AppInstalled,
-        });
+      trackEvent({
+        category: MetaMetricsEventCategory.Onboarding,
+        event: MetaMetricsEventName.AppInstalled,
+      });
 
-        trackEvent({
-          category: MetaMetricsEventCategory.Onboarding,
-          event: MetaMetricsEventName.AnalyticsPreferenceSelected,
-          properties: {
-            is_metrics_opted_in: true,
-            has_marketing_consent: Boolean(dataCollectionForMarketing),
-            location: 'onboarding_metametrics',
-          },
-        });
-      }
+      trackEvent({
+        category: MetaMetricsEventCategory.Onboarding,
+        event: MetaMetricsEventName.AnalyticsPreferenceSelected,
+        properties: {
+          is_metrics_opted_in: true,
+          has_marketing_consent: Boolean(dataCollectionForMarketing),
+          location: 'onboarding_metametrics',
+        },
+      });
     } finally {
       history.push(nextRoute);
     }

From fc8e51e9479890a0c25caca246ce9f2515d51a42 Mon Sep 17 00:00:00 2001
From: Jyoti Puri <jyotipuri@gmail.com>
Date: Wed, 4 Dec 2024 17:01:59 +0530
Subject: [PATCH 020/175] fix: decoding data display for ERC-1155 tokens
 (#28921)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## **Description**

Signatuare decoding data was not being displayed for ERC-1155 tokens,
this PR fixes it.

## **Related issues**

Fixes: https://github.com/MetaMask/metamask-extension/issues/28903

## **Manual testing steps**
Detailed
[here](https://www.notion.so/metamask-consensys/Signature-Decoding-v12-9-QA-151f86d67d68802baddfebf3e44aea5e?pvs=4#151f86d67d6880f5a69aff17d227329d)

## **Screenshots/Recordings**
<img width="359" alt="Screenshot 2024-12-04 at 4 01 53 PM"
src="https://github.com/user-attachments/assets/b6e5096e-7b39-49cd-b012-f96c231dc7f1">

## **Pre-merge author checklist**

- [X] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension Coding
Standards](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/CODING_GUIDELINES.md).
- [X] I've completed the PR template to the best of my ability
- [X] I’ve included tests if applicable
- [X] I’ve documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [X] I’ve applied the right labels on the PR (see [labeling
guidelines](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.

## **Pre-merge reviewer checklist**

- [ ] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed).
- [ ] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.
---
 .../decoded-simulation.test.tsx               | 55 +++++++++++++++++++
 .../decoded-simulation/decoded-simulation.tsx |  3 +-
 2 files changed, 57 insertions(+), 1 deletion(-)

diff --git a/ui/pages/confirmations/components/confirm/info/typed-sign/typed-sign-v4-simulation/decoded-simulation/decoded-simulation.test.tsx b/ui/pages/confirmations/components/confirm/info/typed-sign/typed-sign-v4-simulation/decoded-simulation/decoded-simulation.test.tsx
index 93cc6b9e4474..26b4c46f26cd 100644
--- a/ui/pages/confirmations/components/confirm/info/typed-sign/typed-sign-v4-simulation/decoded-simulation/decoded-simulation.test.tsx
+++ b/ui/pages/confirmations/components/confirm/info/typed-sign/typed-sign-v4-simulation/decoded-simulation/decoded-simulation.test.tsx
@@ -41,6 +41,23 @@ const decodingDataListing: DecodingDataStateChanges = [
   },
 ];
 
+const decodingDataListingERC1155: DecodingDataStateChanges = [
+  {
+    assetType: 'NATIVE',
+    changeType: DecodingDataChangeType.Receive,
+    address: '',
+    amount: '900000000000000000',
+    contractAddress: '',
+  },
+  {
+    assetType: 'ERC1155',
+    changeType: DecodingDataChangeType.Listing,
+    address: '',
+    amount: '',
+    contractAddress: '0xafd4896984CA60d2feF66136e57f958dCe9482d5',
+    tokenID: '2233',
+  },
+];
 const decodingDataBidding: DecodingDataStateChanges = [
   {
     assetType: 'ERC721',
@@ -78,6 +95,44 @@ describe('DecodedSimulation', () => {
     expect(await findByText('1,461,501,637,3...')).toBeInTheDocument();
   });
 
+  it('render correctly for ERC712 token', async () => {
+    const state = getMockTypedSignConfirmStateForRequest({
+      ...permitSignatureMsg,
+      decodingLoading: false,
+      decodingData: { stateChanges: decodingDataListing },
+    });
+    const mockStore = configureMockStore([])(state);
+
+    const { findByText } = renderWithConfirmContextProvider(
+      <PermitSimulation />,
+      mockStore,
+    );
+
+    expect(await findByText('Estimated changes')).toBeInTheDocument();
+    expect(await findByText('You receive')).toBeInTheDocument();
+    expect(await findByText('You list')).toBeInTheDocument();
+    expect(await findByText('#2101')).toBeInTheDocument();
+  });
+
+  it('render correctly for ERC1155 token', async () => {
+    const state = getMockTypedSignConfirmStateForRequest({
+      ...permitSignatureMsg,
+      decodingLoading: false,
+      decodingData: { stateChanges: decodingDataListingERC1155 },
+    });
+    const mockStore = configureMockStore([])(state);
+
+    const { findByText } = renderWithConfirmContextProvider(
+      <PermitSimulation />,
+      mockStore,
+    );
+
+    expect(await findByText('Estimated changes')).toBeInTheDocument();
+    expect(await findByText('You receive')).toBeInTheDocument();
+    expect(await findByText('You list')).toBeInTheDocument();
+    expect(await findByText('#2233')).toBeInTheDocument();
+  });
+
   it('renders unavailable message if no state change is returned', async () => {
     const state = getMockTypedSignConfirmStateForRequest(permitSignatureMsg);
     const mockStore = configureMockStore([])(state);
diff --git a/ui/pages/confirmations/components/confirm/info/typed-sign/typed-sign-v4-simulation/decoded-simulation/decoded-simulation.tsx b/ui/pages/confirmations/components/confirm/info/typed-sign/typed-sign-v4-simulation/decoded-simulation/decoded-simulation.tsx
index 55197e689600..ec07ae253405 100644
--- a/ui/pages/confirmations/components/confirm/info/typed-sign/typed-sign-v4-simulation/decoded-simulation/decoded-simulation.tsx
+++ b/ui/pages/confirmations/components/confirm/info/typed-sign/typed-sign-v4-simulation/decoded-simulation/decoded-simulation.tsx
@@ -75,7 +75,8 @@ const StateChangeRow = ({
       tooltip={tooltip}
     >
       {(assetType === TokenStandard.ERC20 ||
-        assetType === TokenStandard.ERC721) && (
+        assetType === TokenStandard.ERC721 ||
+        assetType === TokenStandard.ERC1155) && (
         <TokenValueDisplay
           tokenContract={contractAddress}
           value={amount}

From 95301f48f819080a7c5124601815cbee7dfdddce Mon Sep 17 00:00:00 2001
From: Daniel <80175477+dan437@users.noreply.github.com>
Date: Wed, 4 Dec 2024 19:13:12 +0100
Subject: [PATCH 021/175] chore: Update a mock for tests (#28934)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## **Description**

The mock has been updated to be less specific, so that the mocked
network response is used in more situations. This is meant to address a
frequently failing flaky test (example:
https://app.circleci.com/pipelines/github/MetaMask/metamask-extension/113905/workflows/1140e350-cf29-45ff-916e-6fa0f3befc67/jobs/4268755/parallel-runs/16)

[![Open in GitHub
Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/28934?quickstart=1)

## **Related issues**

No issue yet

## **Manual testing steps**

N/A

## **Screenshots/Recordings**

N/A

## **Pre-merge author checklist**

- [x] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension Coding
Standards](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/CODING_GUIDELINES.md).
- [x] I've completed the PR template to the best of my ability
- [x] I’ve included tests if applicable
- [x] I’ve documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [x] I’ve applied the right labels on the PR (see [labeling
guidelines](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.

## **Pre-merge reviewer checklist**

- [ ] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed).
- [ ] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.
---
 test/e2e/tests/smart-transactions/mock-requests-for-swap-test.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/test/e2e/tests/smart-transactions/mock-requests-for-swap-test.ts b/test/e2e/tests/smart-transactions/mock-requests-for-swap-test.ts
index bf9740c257ad..5792e4ed4d30 100644
--- a/test/e2e/tests/smart-transactions/mock-requests-for-swap-test.ts
+++ b/test/e2e/tests/smart-transactions/mock-requests-for-swap-test.ts
@@ -11,7 +11,6 @@ const GET_FEES_REQUEST_INCLUDES = {
       from: '0x5cfe73b6021e818b776b421b1c4db2474086a7e1',
       to: '0x881D40237659C251811CEC9c364ef91dC08D300C',
       value: '0x1bc16d674ec80000',
-      gas: '0xf4240',
       nonce: '0x0',
     },
   ],

From b1e173a6e731dadbff27960104a693d147cc25d5 Mon Sep 17 00:00:00 2001
From: Michele Esposito <34438276+mikesposito@users.noreply.github.com>
Date: Wed, 4 Dec 2024 22:05:47 +0100
Subject: [PATCH 022/175] chore: force `@solana/web3.js` version resolution
 (#28926)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<!--
Please submit this PR as a draft initially.
Do not mark it as "Ready for review" until the template has been
completely filled out, and PR status checks have passed at least once.
-->

## **Description**

<!--
Write a short description of the changes included in this pull request,
also include relevant motivation and context. Have in mind the following
questions:
1. What is the reason for the change?
2. What is the improvement/solution?
-->

Due to this
[Advisory](https://github.com/advisories/GHSA-2mhj-xmf4-pr8m), this PR
forces the resolution of the affected package version to the current one
(unaffected), avoiding unintentional updates to affected versions

[![Open in GitHub
Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/28926?quickstart=1)

## **Related issues**

Fixes:

## **Manual testing steps**

N/A

## **Screenshots/Recordings**

<!-- If applicable, add screenshots and/or recordings to visualize the
before and after of your change. -->

### **Before**

<!-- [screenshots/recordings] -->

### **After**

<!-- [screenshots/recordings] -->

## **Pre-merge author checklist**

- [ ] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension Coding
Standards](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/CODING_GUIDELINES.md).
- [ ] I've completed the PR template to the best of my ability
- [ ] I’ve included tests if applicable
- [ ] I’ve documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [ ] I’ve applied the right labels on the PR (see [labeling
guidelines](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.

## **Pre-merge reviewer checklist**

- [ ] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed).
- [ ] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.

---------

Co-authored-by: Dan J Miller <danjm.com@gmail.com>
---
 .yarnrc.yml  | 8 ++++++++
 package.json | 3 ++-
 yarn.lock    | 8 ++++----
 3 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/.yarnrc.yml b/.yarnrc.yml
index 8e12d8037c6a..652a13c3c19c 100644
--- a/.yarnrc.yml
+++ b/.yarnrc.yml
@@ -43,6 +43,14 @@ npmAuditIgnoreAdvisories:
   # not appear to be used.
   - 1092461
 
+  # Issue: Malware in @solana/web3.js
+  # URL: https://github.com/advisories/GHSA-2mhj-xmf4-pr8m
+  # we patched this to ensure the vulnerable versions are not included, but the advisory
+  # was mistakenly originally created to flag all versions as vulnerable
+  - 1101059
+
+
+
   # Temp fix for https://github.com/MetaMask/metamask-extension/pull/16920 for the sake of 11.7.1 hotfix
   # This will be removed in this ticket https://github.com/MetaMask/metamask-extension/issues/22299
   - 'ts-custom-error (deprecation)'
diff --git a/package.json b/package.json
index 3190f5deb970..1b30892f9616 100644
--- a/package.json
+++ b/package.json
@@ -252,7 +252,8 @@
     "@ledgerhq/hw-app-eth/axios": "^0.28.0",
     "@ledgerhq/hw-app-eth@npm:^6.39.0": "patch:@ledgerhq/hw-app-eth@npm%3A6.39.0#~/.yarn/patches/@ledgerhq-hw-app-eth-npm-6.39.0-866309bbbe.patch",
     "@ledgerhq/evm-tools@npm:^1.2.3": "patch:@ledgerhq/evm-tools@npm%3A1.2.3#~/.yarn/patches/@ledgerhq-evm-tools-npm-1.2.3-414f44baa9.patch",
-    "cross-spawn@npm:^5.0.1": "^7.0.5"
+    "cross-spawn@npm:^5.0.1": "^7.0.5",
+    "@solana/web3.js@npm:^1.95.0": "^1.95.8"
   },
   "dependencies": {
     "@babel/runtime": "patch:@babel/runtime@npm%3A7.25.9#~/.yarn/patches/@babel-runtime-npm-7.25.9-fe8c62510a.patch",
diff --git a/yarn.lock b/yarn.lock
index 222d18e5dcb6..57ecfaef99be 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8125,9 +8125,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@solana/web3.js@npm:^1.95.0":
-  version: 1.95.4
-  resolution: "@solana/web3.js@npm:1.95.4"
+"@solana/web3.js@npm:^1.95.8":
+  version: 1.95.8
+  resolution: "@solana/web3.js@npm:1.95.8"
   dependencies:
     "@babel/runtime": "npm:^7.25.0"
     "@noble/curves": "npm:^1.4.2"
@@ -8144,7 +8144,7 @@ __metadata:
     node-fetch: "npm:^2.7.0"
     rpc-websockets: "npm:^9.0.2"
     superstruct: "npm:^2.0.2"
-  checksum: 10/353e04ac1110035ff108f16af4029c7a98f71cce841d45877c9bc4a354cdc58a051681603c92289b81e3dc5ef6b1567c6f866e4ba56a434db145e38a5a41d276
+  checksum: 10/25fb38f46f4ba47019f17f686219a75f821455737bbf1153deb8b3f1141c3996c1ac0dc8603bbac50cd04f61058e472772d866aa38d01aef4e1609e53e442075
   languageName: node
   linkType: hard
 

From 79de169cd091ec7458166025bf4a68b77ddcda35 Mon Sep 17 00:00:00 2001
From: Mathieu Artu <mathieu.artu@consensys.net>
Date: Wed, 4 Dec 2024 23:03:44 +0100
Subject: [PATCH 023/175] chore: change ownership of profile sync from
 notifications to identity (#28901)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## **Description**

This PR takes care of all the necessary changes in order to decouple
"Profile Sync" from the notifications feature.
This also underlines the ownership change from @MetaMask/notifications
to @MetaMask/identity.

The changes made here will help transitioning to cleaner separation of
concerns for features leveraging profile sync (i.e Notifications,
Account syncing...).

⚠️ This PR does not add missing tests nor introduces any changes. This
is only moving files around and separating concerns.

[![Open in GitHub
Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/28901?quickstart=1)

## **Related issues**

Fixes https://github.com/MetaMask/metamask-extension/issues/28900

## **Manual testing steps**

No testing steps since this PR does not change the implementation of
existing features.

## **Screenshots/Recordings**

<!-- If applicable, add screenshots and/or recordings to visualize the
before and after of your change. -->

### **Before**

<!-- [screenshots/recordings] -->

### **After**

<!-- [screenshots/recordings] -->

## **Pre-merge author checklist**

- [x] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension Coding
Standards](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/CODING_GUIDELINES.md).
- [x] I've completed the PR template to the best of my ability
- [x] I’ve included tests if applicable
- [x] I’ve documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [x] I’ve applied the right labels on the PR (see [labeling
guidelines](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.

## **Pre-merge reviewer checklist**

- [x] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed).
- [x] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.

---------

Co-authored-by: Mark Stacey <markjstacey@gmail.com>
---
 .github/CODEOWNERS                                    | 11 +++++++----
 .../basic-configuration-modal.tsx                     |  2 +-
 .../confirm-turn-off-profile-syncing.test.tsx         |  4 ++--
 .../turn-on-metamask-notifications.tsx                |  2 +-
 ui/components/multichain/global-menu/global-menu.js   |  2 +-
 .../metamask-notifications/metamask-notifications.tsx |  4 ++--
 .../useCreateSession.test.ts                          |  0
 .../useCreateSession.ts                               |  4 ++--
 .../useMetametrics.test.tsx                           |  0
 .../useMetametrics.ts                                 |  4 ++--
 .../useProfileSyncing/accountSyncing.test.tsx         |  0
 .../useProfileSyncing/accountSyncing.ts               |  0
 .../useProfileSyncing/index.ts                        |  0
 .../useProfileSyncing/profileSyncing.test.tsx         |  0
 .../useProfileSyncing/profileSyncing.ts               |  4 ++--
 .../metamask-notifications/useNotifications.test.tsx  |  2 +-
 .../notifications-settings-allow-notifications.tsx    |  2 +-
 .../creation-successful/creation-successful.js        |  4 ++--
 .../onboarding-flow/pin-extension/pin-extension.js    |  4 ++--
 .../privacy-settings/privacy-settings.js              |  4 ++--
 .../settings/developer-options-tab/profile-sync.tsx   |  2 +-
 .../metametrics-toggle/metametrics-toggle.test.tsx    |  2 +-
 .../metametrics-toggle/metametrics-toggle.tsx         |  6 +++---
 .../profile-sync-toggle/profile-sync-toggle.test.tsx  |  2 +-
 .../profile-sync-toggle/profile-sync-toggle.tsx       |  4 ++--
 .../authentication.test.ts                            |  0
 .../authentication.ts                                 |  0
 .../profile-syncing.test.ts                           |  0
 .../profile-syncing.ts                                |  0
 29 files changed, 36 insertions(+), 33 deletions(-)
 rename ui/hooks/{metamask-notifications => identity}/useCreateSession.test.ts (100%)
 rename ui/hooks/{metamask-notifications => identity}/useCreateSession.ts (92%)
 rename ui/hooks/{metamask-notifications => identity}/useMetametrics.test.tsx (100%)
 rename ui/hooks/{metamask-notifications => identity}/useMetametrics.ts (94%)
 rename ui/hooks/{metamask-notifications => identity}/useProfileSyncing/accountSyncing.test.tsx (100%)
 rename ui/hooks/{metamask-notifications => identity}/useProfileSyncing/accountSyncing.ts (100%)
 rename ui/hooks/{metamask-notifications => identity}/useProfileSyncing/index.ts (100%)
 rename ui/hooks/{metamask-notifications => identity}/useProfileSyncing/profileSyncing.test.tsx (100%)
 rename ui/hooks/{metamask-notifications => identity}/useProfileSyncing/profileSyncing.ts (96%)
 rename ui/selectors/{metamask-notifications => identity}/authentication.test.ts (100%)
 rename ui/selectors/{metamask-notifications => identity}/authentication.ts (100%)
 rename ui/selectors/{metamask-notifications => identity}/profile-syncing.test.ts (100%)
 rename ui/selectors/{metamask-notifications => identity}/profile-syncing.ts (100%)

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index fbfad96b0ea3..b0f8f1abe46b 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -69,14 +69,11 @@ ui/selectors/institutional           @MetaMask/mmi
 # Slack handle: @metamask-design-system-team | Slack channel: #metamask-design-system
 ui/components/component-library      @MetaMask/design-system-engineers
 
-# The Notifications team is responsible for code related to notifications,
-# authentication, and profile syncing inside the Extension.
+# The Notifications team is responsible for code related to notifications
 
 # Controllers
-**/controllers/authentication/**                    @MetaMask/notifications
 **/controllers/metamask-notifications/**            @MetaMask/notifications
 **/controllers/push-platform-notifications/**       @MetaMask/notifications
-**/controllers/user-storage/**                      @MetaMask/notifications
 
 # UI
 **/metamask-notifications/**                        @MetaMask/notifications
@@ -84,6 +81,12 @@ ui/components/component-library      @MetaMask/design-system-engineers
 **/pages/notification*/**                           @MetaMask/notifications
 **/utils/notification.util.ts                       @MetaMask/notifications
 
+# Identity team is responsible for authentication and profile syncing inside the Extension.
+# Slack handle: @identity_team | Slack channel: #metamask-identity
+**/identity/**                                          @MetaMask/identity
+ui/pages/settings/security-tab/profile-sync-toggle      @MetaMask/identity
+
+
 # Accounts team is responsible for code related with snap management accounts
 # Slack handle: @accounts-team-devs | Slack channel: #metamask-accounts-team
 
diff --git a/ui/components/app/basic-configuration-modal/basic-configuration-modal.tsx b/ui/components/app/basic-configuration-modal/basic-configuration-modal.tsx
index a6b083eccc16..52faaf0384af 100644
--- a/ui/components/app/basic-configuration-modal/basic-configuration-modal.tsx
+++ b/ui/components/app/basic-configuration-modal/basic-configuration-modal.tsx
@@ -37,7 +37,7 @@ import {
 import { MetaMetricsContext } from '../../../contexts/metametrics';
 import { getUseExternalServices } from '../../../selectors';
 import { selectIsMetamaskNotificationsEnabled } from '../../../selectors/metamask-notifications/metamask-notifications';
-import { selectIsProfileSyncingEnabled } from '../../../selectors/metamask-notifications/profile-syncing';
+import { selectIsProfileSyncingEnabled } from '../../../selectors/identity/profile-syncing';
 import {
   hideBasicFunctionalityModal,
   onboardingToggleBasicFunctionalityOff,
diff --git a/ui/components/app/modals/confirm-turn-off-profile-syncing/confirm-turn-off-profile-syncing.test.tsx b/ui/components/app/modals/confirm-turn-off-profile-syncing/confirm-turn-off-profile-syncing.test.tsx
index 84d12e7e24b1..dfec73dae0e3 100644
--- a/ui/components/app/modals/confirm-turn-off-profile-syncing/confirm-turn-off-profile-syncing.test.tsx
+++ b/ui/components/app/modals/confirm-turn-off-profile-syncing/confirm-turn-off-profile-syncing.test.tsx
@@ -1,7 +1,7 @@
 import React from 'react';
 import { render, fireEvent, waitFor } from '@testing-library/react';
 import { useModalProps } from '../../../../hooks/useModalProps';
-import { useDisableProfileSyncing } from '../../../../hooks/metamask-notifications/useProfileSyncing';
+import { useDisableProfileSyncing } from '../../../../hooks/identity/useProfileSyncing';
 import { I18nContext } from '../../../../contexts/i18n';
 import ConfirmTurnOffProfileSyncing from './confirm-turn-off-profile-syncing';
 
@@ -9,7 +9,7 @@ jest.mock('../../../../hooks/useModalProps', () => ({
   useModalProps: jest.fn(),
 }));
 
-jest.mock('../../../../hooks/metamask-notifications/useProfileSyncing', () => ({
+jest.mock('../../../../hooks/identity/useProfileSyncing', () => ({
   useDisableProfileSyncing: jest.fn(),
 }));
 
diff --git a/ui/components/app/modals/turn-on-metamask-notifications/turn-on-metamask-notifications.tsx b/ui/components/app/modals/turn-on-metamask-notifications/turn-on-metamask-notifications.tsx
index b340ee8c5e60..7bdd188f3974 100644
--- a/ui/components/app/modals/turn-on-metamask-notifications/turn-on-metamask-notifications.tsx
+++ b/ui/components/app/modals/turn-on-metamask-notifications/turn-on-metamask-notifications.tsx
@@ -13,7 +13,7 @@ import {
   selectIsMetamaskNotificationsEnabled,
   getIsUpdatingMetamaskNotifications,
 } from '../../../../selectors/metamask-notifications/metamask-notifications';
-import { selectIsProfileSyncingEnabled } from '../../../../selectors/metamask-notifications/profile-syncing';
+import { selectIsProfileSyncingEnabled } from '../../../../selectors/identity/profile-syncing';
 import { useCreateNotifications } from '../../../../hooks/metamask-notifications/useNotifications';
 import { NOTIFICATIONS_ROUTE } from '../../../../helpers/constants/routes';
 
diff --git a/ui/components/multichain/global-menu/global-menu.js b/ui/components/multichain/global-menu/global-menu.js
index 84906fdd3e11..88aefc15ac02 100644
--- a/ui/components/multichain/global-menu/global-menu.js
+++ b/ui/components/multichain/global-menu/global-menu.js
@@ -24,7 +24,7 @@ import {
   selectIsMetamaskNotificationsEnabled,
   selectIsMetamaskNotificationsFeatureSeen,
 } from '../../../selectors/metamask-notifications/metamask-notifications';
-import { selectIsProfileSyncingEnabled } from '../../../selectors/metamask-notifications/profile-syncing';
+import { selectIsProfileSyncingEnabled } from '../../../selectors/identity/profile-syncing';
 import {
   Box,
   IconName,
diff --git a/ui/contexts/metamask-notifications/metamask-notifications.tsx b/ui/contexts/metamask-notifications/metamask-notifications.tsx
index 2b1824c6d131..12a193a202c3 100644
--- a/ui/contexts/metamask-notifications/metamask-notifications.tsx
+++ b/ui/contexts/metamask-notifications/metamask-notifications.tsx
@@ -2,8 +2,8 @@ import React, { createContext, useContext, useEffect, useMemo } from 'react';
 import { useSelector } from 'react-redux';
 import type { NotificationServicesController } from '@metamask/notification-services-controller';
 import { useListNotifications } from '../../hooks/metamask-notifications/useNotifications';
-import { useAccountSyncingEffect } from '../../hooks/metamask-notifications/useProfileSyncing';
-import { selectIsProfileSyncingEnabled } from '../../selectors/metamask-notifications/profile-syncing';
+import { useAccountSyncingEffect } from '../../hooks/identity/useProfileSyncing';
+import { selectIsProfileSyncingEnabled } from '../../selectors/identity/profile-syncing';
 import { selectIsMetamaskNotificationsEnabled } from '../../selectors/metamask-notifications/metamask-notifications';
 import { getUseExternalServices } from '../../selectors';
 import { getIsUnlocked } from '../../ducks/metamask/metamask';
diff --git a/ui/hooks/metamask-notifications/useCreateSession.test.ts b/ui/hooks/identity/useCreateSession.test.ts
similarity index 100%
rename from ui/hooks/metamask-notifications/useCreateSession.test.ts
rename to ui/hooks/identity/useCreateSession.test.ts
diff --git a/ui/hooks/metamask-notifications/useCreateSession.ts b/ui/hooks/identity/useCreateSession.ts
similarity index 92%
rename from ui/hooks/metamask-notifications/useCreateSession.ts
rename to ui/hooks/identity/useCreateSession.ts
index ebc475ece4e3..5ccd8bad40e5 100644
--- a/ui/hooks/metamask-notifications/useCreateSession.ts
+++ b/ui/hooks/identity/useCreateSession.ts
@@ -4,8 +4,8 @@ import log from 'loglevel';
 import {
   selectIsSignedIn,
   selectParticipateInMetaMetrics,
-} from '../../selectors/metamask-notifications/authentication';
-import { selectIsProfileSyncingEnabled } from '../../selectors/metamask-notifications/profile-syncing';
+} from '../../selectors/identity/authentication';
+import { selectIsProfileSyncingEnabled } from '../../selectors/identity/profile-syncing';
 import { performSignIn, disableProfileSyncing } from '../../store/actions';
 
 /**
diff --git a/ui/hooks/metamask-notifications/useMetametrics.test.tsx b/ui/hooks/identity/useMetametrics.test.tsx
similarity index 100%
rename from ui/hooks/metamask-notifications/useMetametrics.test.tsx
rename to ui/hooks/identity/useMetametrics.test.tsx
diff --git a/ui/hooks/metamask-notifications/useMetametrics.ts b/ui/hooks/identity/useMetametrics.ts
similarity index 94%
rename from ui/hooks/metamask-notifications/useMetametrics.ts
rename to ui/hooks/identity/useMetametrics.ts
index 47292c8050a0..ec159f22453e 100644
--- a/ui/hooks/metamask-notifications/useMetametrics.ts
+++ b/ui/hooks/identity/useMetametrics.ts
@@ -1,8 +1,8 @@
 import { useState, useCallback } from 'react';
 import { useSelector, useDispatch } from 'react-redux';
 import log from 'loglevel';
-import { selectIsSignedIn } from '../../selectors/metamask-notifications/authentication';
-import { selectIsProfileSyncingEnabled } from '../../selectors/metamask-notifications/profile-syncing';
+import { selectIsSignedIn } from '../../selectors/identity/authentication';
+import { selectIsProfileSyncingEnabled } from '../../selectors/identity/profile-syncing';
 import {
   performSignOut,
   performSignIn,
diff --git a/ui/hooks/metamask-notifications/useProfileSyncing/accountSyncing.test.tsx b/ui/hooks/identity/useProfileSyncing/accountSyncing.test.tsx
similarity index 100%
rename from ui/hooks/metamask-notifications/useProfileSyncing/accountSyncing.test.tsx
rename to ui/hooks/identity/useProfileSyncing/accountSyncing.test.tsx
diff --git a/ui/hooks/metamask-notifications/useProfileSyncing/accountSyncing.ts b/ui/hooks/identity/useProfileSyncing/accountSyncing.ts
similarity index 100%
rename from ui/hooks/metamask-notifications/useProfileSyncing/accountSyncing.ts
rename to ui/hooks/identity/useProfileSyncing/accountSyncing.ts
diff --git a/ui/hooks/metamask-notifications/useProfileSyncing/index.ts b/ui/hooks/identity/useProfileSyncing/index.ts
similarity index 100%
rename from ui/hooks/metamask-notifications/useProfileSyncing/index.ts
rename to ui/hooks/identity/useProfileSyncing/index.ts
diff --git a/ui/hooks/metamask-notifications/useProfileSyncing/profileSyncing.test.tsx b/ui/hooks/identity/useProfileSyncing/profileSyncing.test.tsx
similarity index 100%
rename from ui/hooks/metamask-notifications/useProfileSyncing/profileSyncing.test.tsx
rename to ui/hooks/identity/useProfileSyncing/profileSyncing.test.tsx
diff --git a/ui/hooks/metamask-notifications/useProfileSyncing/profileSyncing.ts b/ui/hooks/identity/useProfileSyncing/profileSyncing.ts
similarity index 96%
rename from ui/hooks/metamask-notifications/useProfileSyncing/profileSyncing.ts
rename to ui/hooks/identity/useProfileSyncing/profileSyncing.ts
index 57820d2e633b..dcac4c9cdd64 100644
--- a/ui/hooks/metamask-notifications/useProfileSyncing/profileSyncing.ts
+++ b/ui/hooks/identity/useProfileSyncing/profileSyncing.ts
@@ -9,11 +9,11 @@ import {
   hideLoadingIndication,
 } from '../../../store/actions';
 
-import { selectIsSignedIn } from '../../../selectors/metamask-notifications/authentication';
+import { selectIsSignedIn } from '../../../selectors/identity/authentication';
 import {
   selectIsAccountSyncingReadyToBeDispatched,
   selectIsProfileSyncingEnabled,
-} from '../../../selectors/metamask-notifications/profile-syncing';
+} from '../../../selectors/identity/profile-syncing';
 import { getUseExternalServices } from '../../../selectors';
 import {
   getIsUnlocked,
diff --git a/ui/hooks/metamask-notifications/useNotifications.test.tsx b/ui/hooks/metamask-notifications/useNotifications.test.tsx
index a4723750c8d0..52097f3c04b4 100644
--- a/ui/hooks/metamask-notifications/useNotifications.test.tsx
+++ b/ui/hooks/metamask-notifications/useNotifications.test.tsx
@@ -25,7 +25,7 @@ jest.mock('../../store/actions', () => ({
   disableMetamaskNotifications: jest.fn(),
 }));
 
-jest.mock('./useProfileSyncing', () => ({
+jest.mock('../identity/useProfileSyncing', () => ({
   useEnableProfileSyncing: jest.fn(() => ({
     enableProfileSyncing: jest.fn(),
   })),
diff --git a/ui/pages/notifications-settings/notifications-settings-allow-notifications.tsx b/ui/pages/notifications-settings/notifications-settings-allow-notifications.tsx
index a202acea1831..b442a4092185 100644
--- a/ui/pages/notifications-settings/notifications-settings-allow-notifications.tsx
+++ b/ui/pages/notifications-settings/notifications-settings-allow-notifications.tsx
@@ -20,7 +20,7 @@ import {
   selectIsMetamaskNotificationsEnabled,
   getIsUpdatingMetamaskNotifications,
 } from '../../selectors/metamask-notifications/metamask-notifications';
-import { selectIsProfileSyncingEnabled } from '../../selectors/metamask-notifications/profile-syncing';
+import { selectIsProfileSyncingEnabled } from '../../selectors/identity/profile-syncing';
 import { useMetamaskNotificationsContext } from '../../contexts/metamask-notifications/metamask-notifications';
 import { Box, Text } from '../../components/component-library';
 import {
diff --git a/ui/pages/onboarding-flow/creation-successful/creation-successful.js b/ui/pages/onboarding-flow/creation-successful/creation-successful.js
index d91e3e54746d..a763b398cdea 100644
--- a/ui/pages/onboarding-flow/creation-successful/creation-successful.js
+++ b/ui/pages/onboarding-flow/creation-successful/creation-successful.js
@@ -34,8 +34,8 @@ import {
   MetaMetricsEventName,
 } from '../../../../shared/constants/metametrics';
 import { MetaMetricsContext } from '../../../contexts/metametrics';
-import { useCreateSession } from '../../../hooks/metamask-notifications/useCreateSession';
-import { selectIsProfileSyncingEnabled } from '../../../selectors/metamask-notifications/profile-syncing';
+import { useCreateSession } from '../../../hooks/identity/useCreateSession';
+import { selectIsProfileSyncingEnabled } from '../../../selectors/identity/profile-syncing';
 
 export default function CreationSuccessful() {
   const history = useHistory();
diff --git a/ui/pages/onboarding-flow/pin-extension/pin-extension.js b/ui/pages/onboarding-flow/pin-extension/pin-extension.js
index 775095c2aa61..85cfafa66478 100644
--- a/ui/pages/onboarding-flow/pin-extension/pin-extension.js
+++ b/ui/pages/onboarding-flow/pin-extension/pin-extension.js
@@ -40,8 +40,8 @@ import {
   getFirstTimeFlowType,
   getExternalServicesOnboardingToggleState,
 } from '../../../selectors';
-import { selectIsProfileSyncingEnabled } from '../../../selectors/metamask-notifications/profile-syncing';
-import { selectParticipateInMetaMetrics } from '../../../selectors/metamask-notifications/authentication';
+import { selectIsProfileSyncingEnabled } from '../../../selectors/identity/profile-syncing';
+import { selectParticipateInMetaMetrics } from '../../../selectors/identity/authentication';
 import {
   MetaMetricsEventCategory,
   MetaMetricsEventName,
diff --git a/ui/pages/onboarding-flow/privacy-settings/privacy-settings.js b/ui/pages/onboarding-flow/privacy-settings/privacy-settings.js
index 3e0d2e19de48..163091e41958 100644
--- a/ui/pages/onboarding-flow/privacy-settings/privacy-settings.js
+++ b/ui/pages/onboarding-flow/privacy-settings/privacy-settings.js
@@ -10,7 +10,7 @@ import { addUrlProtocolPrefix } from '../../../../app/scripts/lib/util';
 import {
   useSetIsProfileSyncingEnabled,
   useEnableProfileSyncing,
-} from '../../../hooks/metamask-notifications/useProfileSyncing';
+} from '../../../hooks/identity/useProfileSyncing';
 import {
   MetaMetricsEventCategory,
   MetaMetricsEventName,
@@ -53,7 +53,7 @@ import {
   getExternalServicesOnboardingToggleState,
 } from '../../../selectors';
 import { getNetworkConfigurationsByChainId } from '../../../../shared/modules/selectors/networks';
-import { selectIsProfileSyncingEnabled } from '../../../selectors/metamask-notifications/profile-syncing';
+import { selectIsProfileSyncingEnabled } from '../../../selectors/identity/profile-syncing';
 import {
   setIpfsGateway,
   setUseCurrencyRateCheck,
diff --git a/ui/pages/settings/developer-options-tab/profile-sync.tsx b/ui/pages/settings/developer-options-tab/profile-sync.tsx
index 033b12ae8c9a..91ddb8db436d 100644
--- a/ui/pages/settings/developer-options-tab/profile-sync.tsx
+++ b/ui/pages/settings/developer-options-tab/profile-sync.tsx
@@ -17,7 +17,7 @@ import {
   JustifyContent,
   AlignItems,
 } from '../../../helpers/constants/design-system';
-import { useDeleteAccountSyncingDataFromUserStorage } from '../../../hooks/metamask-notifications/useProfileSyncing';
+import { useDeleteAccountSyncingDataFromUserStorage } from '../../../hooks/identity/useProfileSyncing';
 
 const AccountSyncDeleteDataFromUserStorage = () => {
   const [hasDeletedAccountSyncEntries, setHasDeletedAccountSyncEntries] =
diff --git a/ui/pages/settings/security-tab/metametrics-toggle/metametrics-toggle.test.tsx b/ui/pages/settings/security-tab/metametrics-toggle/metametrics-toggle.test.tsx
index 5e93bc9feaab..d0bd3d352030 100644
--- a/ui/pages/settings/security-tab/metametrics-toggle/metametrics-toggle.test.tsx
+++ b/ui/pages/settings/security-tab/metametrics-toggle/metametrics-toggle.test.tsx
@@ -2,7 +2,7 @@ import React from 'react';
 import { Provider } from 'react-redux';
 import configureMockStore from 'redux-mock-store';
 import { render, fireEvent } from '@testing-library/react';
-import * as MetametricsHooks from '../../../../hooks/metamask-notifications/useMetametrics';
+import * as MetametricsHooks from '../../../../hooks/identity/useMetametrics';
 import MetametricsToggle from './metametrics-toggle';
 
 let mockUseSelectorReturnValue = false;
diff --git a/ui/pages/settings/security-tab/metametrics-toggle/metametrics-toggle.tsx b/ui/pages/settings/security-tab/metametrics-toggle/metametrics-toggle.tsx
index 661dd7f974b4..5ee8ed292b08 100644
--- a/ui/pages/settings/security-tab/metametrics-toggle/metametrics-toggle.tsx
+++ b/ui/pages/settings/security-tab/metametrics-toggle/metametrics-toggle.tsx
@@ -5,9 +5,9 @@ import { MetaMetricsContext } from '../../../../contexts/metametrics';
 import {
   useEnableMetametrics,
   useDisableMetametrics,
-} from '../../../../hooks/metamask-notifications/useMetametrics';
-import { selectIsProfileSyncingEnabled } from '../../../../selectors/metamask-notifications/profile-syncing';
-import { selectParticipateInMetaMetrics } from '../../../../selectors/metamask-notifications/authentication';
+} from '../../../../hooks/identity/useMetametrics';
+import { selectIsProfileSyncingEnabled } from '../../../../selectors/identity/profile-syncing';
+import { selectParticipateInMetaMetrics } from '../../../../selectors/identity/authentication';
 import {
   MetaMetricsEventCategory,
   MetaMetricsEventName,
diff --git a/ui/pages/settings/security-tab/profile-sync-toggle/profile-sync-toggle.test.tsx b/ui/pages/settings/security-tab/profile-sync-toggle/profile-sync-toggle.test.tsx
index 2c24456b590c..525dd49e4b7e 100644
--- a/ui/pages/settings/security-tab/profile-sync-toggle/profile-sync-toggle.test.tsx
+++ b/ui/pages/settings/security-tab/profile-sync-toggle/profile-sync-toggle.test.tsx
@@ -3,7 +3,7 @@ import * as Redux from 'react-redux';
 import configureMockStore from 'redux-mock-store';
 import { render, fireEvent } from '@testing-library/react';
 import { MetamaskNotificationsProvider } from '../../../../contexts/metamask-notifications';
-import * as ProfileSyncingHook from '../../../../hooks/metamask-notifications/useProfileSyncing/profileSyncing';
+import * as ProfileSyncingHook from '../../../../hooks/identity/useProfileSyncing/profileSyncing';
 import ProfileSyncToggle from './profile-sync-toggle';
 
 const mockStore = configureMockStore();
diff --git a/ui/pages/settings/security-tab/profile-sync-toggle/profile-sync-toggle.tsx b/ui/pages/settings/security-tab/profile-sync-toggle/profile-sync-toggle.tsx
index d71d503faaeb..1222f663c854 100644
--- a/ui/pages/settings/security-tab/profile-sync-toggle/profile-sync-toggle.tsx
+++ b/ui/pages/settings/security-tab/profile-sync-toggle/profile-sync-toggle.tsx
@@ -5,7 +5,7 @@ import { MetaMetricsContext } from '../../../../contexts/metametrics';
 import {
   useEnableProfileSyncing,
   useDisableProfileSyncing,
-} from '../../../../hooks/metamask-notifications/useProfileSyncing';
+} from '../../../../hooks/identity/useProfileSyncing';
 import {
   MetaMetricsEventCategory,
   MetaMetricsEventName,
@@ -13,7 +13,7 @@ import {
 import {
   selectIsProfileSyncingEnabled,
   selectIsProfileSyncingUpdateLoading,
-} from '../../../../selectors/metamask-notifications/profile-syncing';
+} from '../../../../selectors/identity/profile-syncing';
 import { selectIsMetamaskNotificationsEnabled } from '../../../../selectors/metamask-notifications/metamask-notifications';
 import { showModal } from '../../../../store/actions';
 import { Box, Text } from '../../../../components/component-library';
diff --git a/ui/selectors/metamask-notifications/authentication.test.ts b/ui/selectors/identity/authentication.test.ts
similarity index 100%
rename from ui/selectors/metamask-notifications/authentication.test.ts
rename to ui/selectors/identity/authentication.test.ts
diff --git a/ui/selectors/metamask-notifications/authentication.ts b/ui/selectors/identity/authentication.ts
similarity index 100%
rename from ui/selectors/metamask-notifications/authentication.ts
rename to ui/selectors/identity/authentication.ts
diff --git a/ui/selectors/metamask-notifications/profile-syncing.test.ts b/ui/selectors/identity/profile-syncing.test.ts
similarity index 100%
rename from ui/selectors/metamask-notifications/profile-syncing.test.ts
rename to ui/selectors/identity/profile-syncing.test.ts
diff --git a/ui/selectors/metamask-notifications/profile-syncing.ts b/ui/selectors/identity/profile-syncing.ts
similarity index 100%
rename from ui/selectors/metamask-notifications/profile-syncing.ts
rename to ui/selectors/identity/profile-syncing.ts

From fc06d3447e97ac3aea654f4d5fb0e29108b5f18b Mon Sep 17 00:00:00 2001
From: cryptodev-2s <109512101+cryptodev-2s@users.noreply.github.com>
Date: Wed, 4 Dec 2024 23:05:49 +0100
Subject: [PATCH 024/175] feat: migrate `AppStateController` to inherit from
 BaseController V2 (#28784)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<!--
Please submit this PR as a draft initially.
Do not mark it as "Ready for review" until the template has been
completely filled out, and PR status checks have passed at least once.
-->

## **Description**

This PR migrate `AppStateController` to inherit from BaseController V2

<!--
Write a short description of the changes included in this pull request,
also include relevant motivation and context. Have in mind the following
questions:
1. What is the reason for the change?
2. What is the improvement/solution?
-->

[![Open in GitHub
Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/28784?quickstart=1)

## **Related issues**

Fixes: https://github.com/MetaMask/metamask-extension/issues/25916

## **Manual testing steps**


## **Screenshots/Recordings**

<!-- If applicable, add screenshots and/or recordings to visualize the
before and after of your change. -->

### **Before**

<!-- [screenshots/recordings] -->

### **After**

<!-- [screenshots/recordings] -->

## **Pre-merge author checklist**

- [x] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension Coding
Standards](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/CODING_GUIDELINES.md).
- [x] I've completed the PR template to the best of my ability
- [ ] I’ve included tests if applicable
- [ ] I’ve documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [x] I’ve applied the right labels on the PR (see [labeling
guidelines](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.

## **Pre-merge reviewer checklist**

- [ ] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed).
- [ ] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.
---
 app/scripts/background.js                     |   4 +-
 .../controllers/app-state-controller.test.ts  | 954 ++++++++----------
 .../controllers/app-state-controller.ts       | 501 +++++----
 .../controllers/metametrics-controller.ts     |   1 -
 .../controllers/mmi-controller.test.ts        |   2 +-
 .../createRPCMethodTrackingMiddleware.test.js |  18 +-
 app/scripts/metamask-controller.js            |   9 +-
 7 files changed, 780 insertions(+), 709 deletions(-)

diff --git a/app/scripts/background.js b/app/scripts/background.js
index be72e879e627..1b037f09328b 100644
--- a/app/scripts/background.js
+++ b/app/scripts/background.js
@@ -1025,8 +1025,8 @@ export function setupController(
     METAMASK_CONTROLLER_EVENTS.UPDATE_BADGE,
     updateBadge,
   );
-  controller.appStateController.on(
-    METAMASK_CONTROLLER_EVENTS.UPDATE_BADGE,
+  controller.controllerMessenger.subscribe(
+    METAMASK_CONTROLLER_EVENTS.APP_STATE_UNLOCK_CHANGE,
     updateBadge,
   );
 
diff --git a/app/scripts/controllers/app-state-controller.test.ts b/app/scripts/controllers/app-state-controller.test.ts
index f830e0ee1cdf..727df9b853e1 100644
--- a/app/scripts/controllers/app-state-controller.test.ts
+++ b/app/scripts/controllers/app-state-controller.test.ts
@@ -1,4 +1,9 @@
 import { ControllerMessenger } from '@metamask/base-controller';
+import type {
+  AcceptRequest,
+  AddApprovalRequest,
+} from '@metamask/approval-controller';
+import { KeyringControllerQRKeyringStateChangeEvent } from '@metamask/keyring-controller';
 import { Browser } from 'webextension-polyfill';
 import {
   ENVIRONMENT_TYPE_POPUP,
@@ -6,15 +11,18 @@ import {
   POLLING_TOKEN_ENVIRONMENT_TYPES,
 } from '../../../shared/constants/app';
 import { AccountOverviewTabKey } from '../../../shared/constants/app-state';
+import { MINUTE } from '../../../shared/constants/time';
 import { AppStateController } from './app-state-controller';
 import type {
-  AllowedActions,
-  AllowedEvents,
   AppStateControllerActions,
   AppStateControllerEvents,
-  AppStateControllerState,
+  AppStateControllerOptions,
 } from './app-state-controller';
-import { PreferencesControllerState } from './preferences-controller';
+import type {
+  PreferencesControllerState,
+  PreferencesControllerGetStateAction,
+  PreferencesControllerStateChangeEvent,
+} from './preferences-controller';
 
 jest.mock('webextension-polyfill');
 
@@ -25,12 +33,6 @@ jest.mock('../../../shared/modules/mv3.utils', () => ({
   },
 }));
 
-let appStateController: AppStateController;
-let controllerMessenger: ControllerMessenger<
-  AppStateControllerActions | AllowedActions,
-  AppStateControllerEvents | AllowedEvents
->;
-
 const extensionMock = {
   alarms: {
     getAll: jest.fn(() => Promise.resolve([])),
@@ -43,680 +45,590 @@ const extensionMock = {
 } as unknown as jest.Mocked<Browser>;
 
 describe('AppStateController', () => {
-  const createAppStateController = (
-    initState: Partial<AppStateControllerState> = {},
-  ): {
-    appStateController: AppStateController;
-    controllerMessenger: typeof controllerMessenger;
-  } => {
-    controllerMessenger = new ControllerMessenger();
-    jest.spyOn(ControllerMessenger.prototype, 'call');
-    const appStateMessenger = controllerMessenger.getRestricted({
-      name: 'AppStateController',
-      allowedActions: [
-        `ApprovalController:addRequest`,
-        `ApprovalController:acceptRequest`,
-        `PreferencesController:getState`,
-      ],
-      allowedEvents: [
-        `PreferencesController:stateChange`,
-        `KeyringController:qrKeyringStateChange`,
-      ],
-    });
-    controllerMessenger.registerActionHandler(
-      'PreferencesController:getState',
-      jest.fn().mockReturnValue({
-        preferences: {
-          autoLockTimeLimit: 0,
-        },
-      }),
-    );
-    controllerMessenger.registerActionHandler(
-      'ApprovalController:addRequest',
-      jest.fn().mockReturnValue({
-        catch: jest.fn(),
-      }),
-    );
-    appStateController = new AppStateController({
-      addUnlockListener: jest.fn(),
-      isUnlocked: jest.fn(() => true),
-      initState,
-      onInactiveTimeout: jest.fn(),
-      messenger: appStateMessenger,
-      extension: extensionMock,
-    });
-
-    return { appStateController, controllerMessenger };
-  };
-
-  const createIsUnlockedMock = (isUnlocked: boolean) => {
-    return jest
-      .spyOn(
-        appStateController as unknown as { isUnlocked: () => boolean },
-        'isUnlocked',
-      )
-      .mockReturnValue(isUnlocked);
-  };
-
-  beforeEach(() => {
-    ({ appStateController } = createAppStateController());
-  });
-
   describe('setOutdatedBrowserWarningLastShown', () => {
-    it('sets the last shown time', () => {
-      ({ appStateController } = createAppStateController());
-      const timestamp: number = Date.now();
+    it('sets the last shown time', async () => {
+      await withController(({ controller }) => {
+        const timestamp: number = Date.now();
 
-      appStateController.setOutdatedBrowserWarningLastShown(timestamp);
+        controller.setOutdatedBrowserWarningLastShown(timestamp);
 
-      expect(
-        appStateController.store.getState().outdatedBrowserWarningLastShown,
-      ).toStrictEqual(timestamp);
+        expect(controller.state.outdatedBrowserWarningLastShown).toStrictEqual(
+          timestamp,
+        );
+      });
     });
 
-    it('sets outdated browser warning last shown timestamp', () => {
-      const lastShownTimestamp: number = Date.now();
-      ({ appStateController } = createAppStateController());
-      const updateStateSpy = jest.spyOn(
-        appStateController.store,
-        'updateState',
-      );
+    it('sets outdated browser warning last shown timestamp', async () => {
+      await withController(({ controller }) => {
+        const lastShownTimestamp: number = Date.now();
 
-      appStateController.setOutdatedBrowserWarningLastShown(lastShownTimestamp);
+        controller.setOutdatedBrowserWarningLastShown(lastShownTimestamp);
 
-      expect(updateStateSpy).toHaveBeenCalledTimes(1);
-      expect(updateStateSpy).toHaveBeenCalledWith({
-        outdatedBrowserWarningLastShown: lastShownTimestamp,
+        expect(controller.state.outdatedBrowserWarningLastShown).toStrictEqual(
+          lastShownTimestamp,
+        );
       });
-
-      updateStateSpy.mockRestore();
     });
   });
 
   describe('getUnlockPromise', () => {
     it('waits for unlock if the extension is locked', async () => {
-      ({ appStateController } = createAppStateController());
-      const isUnlockedMock = createIsUnlockedMock(false);
-      const waitForUnlockSpy = jest.spyOn(appStateController, 'waitForUnlock');
-
-      appStateController.getUnlockPromise(true);
-      expect(isUnlockedMock).toHaveBeenCalled();
-      expect(waitForUnlockSpy).toHaveBeenCalledWith(expect.any(Function), true);
+      await withController(({ controller }) => {
+        const isUnlockedMock = jest
+          .spyOn(controller, 'isUnlocked')
+          .mockReturnValue(false);
+        expect(controller.waitingForUnlock).toHaveLength(0);
+
+        controller.getUnlockPromise(true);
+        expect(isUnlockedMock).toHaveBeenCalled();
+        expect(controller.waitingForUnlock).toHaveLength(1);
+      });
     });
 
     it('resolves immediately if the extension is already unlocked', async () => {
-      ({ appStateController } = createAppStateController());
-      const isUnlockedMock = createIsUnlockedMock(true);
+      await withController(async ({ controller }) => {
+        const isUnlockedMock = jest
+          .spyOn(controller, 'isUnlocked')
+          .mockReturnValue(true);
 
-      await expect(
-        appStateController.getUnlockPromise(false),
-      ).resolves.toBeUndefined();
+        await expect(
+          controller.getUnlockPromise(false),
+        ).resolves.toBeUndefined();
 
-      expect(isUnlockedMock).toHaveBeenCalled();
+        expect(isUnlockedMock).toHaveBeenCalled();
+      });
     });
-  });
 
-  describe('waitForUnlock', () => {
-    it('resolves immediately if already unlocked', async () => {
-      const emitSpy = jest.spyOn(appStateController, 'emit');
-      const resolveFn: () => void = jest.fn();
-      appStateController.waitForUnlock(resolveFn, false);
-      expect(emitSpy).toHaveBeenCalledWith('updateBadge');
-      expect(controllerMessenger.call).toHaveBeenCalledTimes(1);
+    it('publishes an unlock change event when isUnlocked is set to false', async () => {
+      await withController(async ({ controller, controllerMessenger }) => {
+        jest.spyOn(controller, 'isUnlocked').mockReturnValue(false);
+        const unlockChangeSpy = jest.fn();
+        controllerMessenger.subscribe(
+          'AppStateController:unlockChange',
+          unlockChangeSpy,
+        );
+        const unlockPromise = controller.getUnlockPromise(false);
+
+        const timeoutPromise = new Promise((resolve) =>
+          setTimeout(() => resolve('timeout'), 100),
+        );
+
+        const result = await Promise.race([unlockPromise, timeoutPromise]);
+
+        expect(result).toBe('timeout');
+
+        expect(unlockChangeSpy).toHaveBeenCalled();
+      });
     });
 
     it('creates approval request when waitForUnlock is called with shouldShowUnlockRequest as true', async () => {
-      createIsUnlockedMock(false);
-
-      const resolveFn: () => void = jest.fn();
-      appStateController.waitForUnlock(resolveFn, true);
-
-      expect(controllerMessenger.call).toHaveBeenCalledTimes(2);
-      expect(controllerMessenger.call).toHaveBeenCalledWith(
-        'ApprovalController:addRequest',
-        expect.objectContaining({
-          id: expect.any(String),
-          origin: ORIGIN_METAMASK,
-          type: 'unlock',
-        }),
-        true,
-      );
+      const addRequestMock = jest.fn().mockResolvedValue(undefined);
+      await withController({ addRequestMock }, async ({ controller }) => {
+        jest.spyOn(controller, 'isUnlocked').mockReturnValue(false);
+
+        controller.getUnlockPromise(true);
+
+        expect(addRequestMock).toHaveBeenCalled();
+        expect(addRequestMock).toHaveBeenCalledWith(
+          {
+            id: expect.any(String),
+            origin: ORIGIN_METAMASK,
+            type: 'unlock',
+          },
+          true,
+        );
+      });
     });
-  });
 
-  describe('handleUnlock', () => {
-    beforeEach(() => {
-      createIsUnlockedMock(false);
-    });
-    afterEach(() => {
-      jest.clearAllMocks();
-    });
     it('accepts approval request revolving all the related promises', async () => {
-      const emitSpy = jest.spyOn(appStateController, 'emit');
-      const resolveFn: () => void = jest.fn();
-      appStateController.waitForUnlock(resolveFn, true);
-
-      appStateController.handleUnlock();
-
-      expect(emitSpy).toHaveBeenCalled();
-      expect(emitSpy).toHaveBeenCalledWith('updateBadge');
-      expect(controllerMessenger.call).toHaveBeenCalled();
-      expect(controllerMessenger.call).toHaveBeenCalledWith(
-        'ApprovalController:acceptRequest',
-        expect.any(String),
+      let unlockListener: () => void;
+      const addRequestMock = jest.fn().mockResolvedValue(undefined);
+      await withController(
+        {
+          addRequestMock,
+          options: {
+            addUnlockListener: (listener) => {
+              unlockListener = listener;
+            },
+          },
+        },
+        ({ controller, controllerMessenger }) => {
+          jest.spyOn(controller, 'isUnlocked').mockReturnValue(false);
+          const unlockChangeSpy = jest.fn();
+          controllerMessenger.subscribe(
+            'AppStateController:unlockChange',
+            unlockChangeSpy,
+          );
+
+          controller.getUnlockPromise(true);
+
+          unlockListener();
+
+          expect(unlockChangeSpy).toHaveBeenCalled();
+          expect(addRequestMock).toHaveBeenCalled();
+          expect(addRequestMock).toHaveBeenCalledWith(
+            {
+              id: expect.any(String),
+              origin: ORIGIN_METAMASK,
+              type: 'unlock',
+            },
+            true,
+          );
+        },
       );
     });
   });
 
   describe('setDefaultHomeActiveTabName', () => {
-    it('sets the default home tab name', () => {
-      appStateController.setDefaultHomeActiveTabName(
-        AccountOverviewTabKey.Activity,
-      );
-      expect(appStateController.store.getState().defaultHomeActiveTabName).toBe(
-        AccountOverviewTabKey.Activity,
-      );
+    it('sets the default home tab name', async () => {
+      await withController(({ controller }) => {
+        controller.setDefaultHomeActiveTabName(AccountOverviewTabKey.Activity);
+
+        expect(controller.state.defaultHomeActiveTabName).toBe(
+          AccountOverviewTabKey.Activity,
+        );
+      });
     });
   });
 
   describe('setConnectedStatusPopoverHasBeenShown', () => {
-    it('sets connected status popover as shown', () => {
-      appStateController.setConnectedStatusPopoverHasBeenShown();
-      expect(
-        appStateController.store.getState().connectedStatusPopoverHasBeenShown,
-      ).toBe(true);
+    it('sets connected status popover as shown', async () => {
+      await withController(({ controller }) => {
+        controller.setConnectedStatusPopoverHasBeenShown();
+
+        expect(controller.state.connectedStatusPopoverHasBeenShown).toBe(true);
+      });
     });
   });
 
   describe('setRecoveryPhraseReminderHasBeenShown', () => {
-    it('sets recovery phrase reminder as shown', () => {
-      appStateController.setRecoveryPhraseReminderHasBeenShown();
-      expect(
-        appStateController.store.getState().recoveryPhraseReminderHasBeenShown,
-      ).toBe(true);
+    it('sets recovery phrase reminder as shown', async () => {
+      await withController(({ controller }) => {
+        controller.setRecoveryPhraseReminderHasBeenShown();
+
+        expect(controller.state.recoveryPhraseReminderHasBeenShown).toBe(true);
+      });
     });
   });
 
   describe('setRecoveryPhraseReminderLastShown', () => {
-    it('sets the last shown time of recovery phrase reminder', () => {
-      const timestamp: number = Date.now();
-      appStateController.setRecoveryPhraseReminderLastShown(timestamp);
-
-      expect(
-        appStateController.store.getState().recoveryPhraseReminderLastShown,
-      ).toBe(timestamp);
+    it('sets the last shown time of recovery phrase reminder', async () => {
+      await withController(({ controller }) => {
+        const timestamp = Date.now();
+        controller.setRecoveryPhraseReminderLastShown(timestamp);
+
+        expect(controller.state.recoveryPhraseReminderLastShown).toBe(
+          timestamp,
+        );
+      });
     });
   });
 
   describe('setLastActiveTime', () => {
-    it('sets the last active time to the current time', () => {
-      const spy = jest.spyOn(
-        appStateController as unknown as { _resetTimer: () => void },
-        '_resetTimer',
-      );
-      appStateController.setLastActiveTime();
-
-      expect(spy).toHaveBeenCalled();
+    it('sets the timer if timeoutMinutes is set', async () => {
+      await withController(({ controller, controllerMessenger }) => {
+        const timeout = Date.now();
+        controllerMessenger.publish(
+          'PreferencesController:stateChange',
+          {
+            preferences: { autoLockTimeLimit: timeout },
+          } as unknown as PreferencesControllerState,
+          [],
+        );
+        jest.spyOn(global, 'setTimeout');
+
+        controller.setLastActiveTime();
+
+        expect(setTimeout).toHaveBeenCalledWith(
+          expect.any(Function),
+          timeout * MINUTE,
+        );
+      });
     });
 
-    it('sets the timer if timeoutMinutes is set', () => {
-      const timeout = Date.now();
-      controllerMessenger.publish(
-        'PreferencesController:stateChange',
-        {
-          preferences: { autoLockTimeLimit: timeout },
-        } as unknown as PreferencesControllerState,
-        [],
-      );
-      const spy = jest.spyOn(
-        appStateController as unknown as { _resetTimer: () => void },
-        '_resetTimer',
-      );
-      appStateController.setLastActiveTime();
+    it("doesn't set the timer if timeoutMinutes is not set", async () => {
+      await withController(({ controller }) => {
+        jest.spyOn(global, 'setTimeout');
+
+        controller.setLastActiveTime();
 
-      expect(spy).toHaveBeenCalled();
+        expect(setTimeout).toHaveBeenCalledTimes(0);
+      });
     });
   });
 
   describe('setBrowserEnvironment', () => {
-    it('sets the current browser and OS environment', () => {
-      appStateController.setBrowserEnvironment('Windows', 'Chrome');
-      expect(
-        appStateController.store.getState().browserEnvironment,
-      ).toStrictEqual({
-        os: 'Windows',
-        browser: 'Chrome',
+    it('sets the current browser and OS environment', async () => {
+      await withController(({ controller }) => {
+        controller.setBrowserEnvironment('Windows', 'Chrome');
+
+        expect(controller.state.browserEnvironment).toStrictEqual({
+          os: 'Windows',
+          browser: 'Chrome',
+        });
       });
     });
   });
 
   describe('addPollingToken', () => {
-    it('adds a pollingToken for a given environmentType', () => {
-      const pollingTokenType =
-        POLLING_TOKEN_ENVIRONMENT_TYPES[ENVIRONMENT_TYPE_POPUP];
-      appStateController.addPollingToken('token1', pollingTokenType);
-      expect(appStateController.store.getState()[pollingTokenType]).toContain(
-        'token1',
-      );
+    it('adds a pollingToken for a given environmentType', async () => {
+      await withController(({ controller }) => {
+        const pollingTokenType =
+          POLLING_TOKEN_ENVIRONMENT_TYPES[ENVIRONMENT_TYPE_POPUP];
+        controller.addPollingToken('token1', pollingTokenType);
+
+        expect(controller.state[pollingTokenType]).toContain('token1');
+      });
     });
   });
 
   describe('removePollingToken', () => {
-    it('removes a pollingToken for a given environmentType', () => {
-      const pollingTokenType =
-        POLLING_TOKEN_ENVIRONMENT_TYPES[ENVIRONMENT_TYPE_POPUP];
-      appStateController.addPollingToken('token1', pollingTokenType);
-      appStateController.removePollingToken('token1', pollingTokenType);
-      expect(
-        appStateController.store.getState()[pollingTokenType],
-      ).not.toContain('token1');
+    it('removes a pollingToken for a given environmentType', async () => {
+      await withController(({ controller }) => {
+        const pollingTokenType =
+          POLLING_TOKEN_ENVIRONMENT_TYPES[ENVIRONMENT_TYPE_POPUP];
+
+        controller.addPollingToken('token1', pollingTokenType);
+        controller.removePollingToken('token1', pollingTokenType);
+
+        expect(controller.state[pollingTokenType]).not.toContain('token1');
+      });
     });
   });
 
   describe('clearPollingTokens', () => {
-    it('clears all pollingTokens', () => {
-      appStateController.addPollingToken('token1', 'popupGasPollTokens');
-      appStateController.addPollingToken('token2', 'notificationGasPollTokens');
-      appStateController.addPollingToken('token3', 'fullScreenGasPollTokens');
-      appStateController.clearPollingTokens();
-
-      expect(
-        appStateController.store.getState().popupGasPollTokens,
-      ).toStrictEqual([]);
-      expect(
-        appStateController.store.getState().notificationGasPollTokens,
-      ).toStrictEqual([]);
-      expect(
-        appStateController.store.getState().fullScreenGasPollTokens,
-      ).toStrictEqual([]);
+    it('clears all pollingTokens', async () => {
+      await withController(({ controller }) => {
+        controller.addPollingToken('token1', 'popupGasPollTokens');
+        controller.addPollingToken('token2', 'notificationGasPollTokens');
+        controller.addPollingToken('token3', 'fullScreenGasPollTokens');
+        controller.clearPollingTokens();
+
+        expect(controller.state.popupGasPollTokens).toStrictEqual([]);
+        expect(controller.state.notificationGasPollTokens).toStrictEqual([]);
+        expect(controller.state.fullScreenGasPollTokens).toStrictEqual([]);
+      });
     });
   });
 
   describe('setShowTestnetMessageInDropdown', () => {
-    it('sets whether the testnet dismissal link should be shown in the network dropdown', () => {
-      appStateController.setShowTestnetMessageInDropdown(true);
-      expect(
-        appStateController.store.getState().showTestnetMessageInDropdown,
-      ).toBe(true);
+    it('sets whether the testnet dismissal link should be shown in the network dropdown', async () => {
+      await withController(({ controller }) => {
+        controller.setShowTestnetMessageInDropdown(true);
+
+        expect(controller.state.showTestnetMessageInDropdown).toBe(true);
 
-      appStateController.setShowTestnetMessageInDropdown(false);
-      expect(
-        appStateController.store.getState().showTestnetMessageInDropdown,
-      ).toBe(false);
+        controller.setShowTestnetMessageInDropdown(false);
+
+        expect(controller.state.showTestnetMessageInDropdown).toBe(false);
+      });
     });
   });
 
   describe('setShowBetaHeader', () => {
-    it('sets whether the beta notification heading on the home page', () => {
-      appStateController.setShowBetaHeader(true);
-      expect(appStateController.store.getState().showBetaHeader).toBe(true);
+    it('sets whether the beta notification heading on the home page', async () => {
+      await withController(({ controller }) => {
+        controller.setShowBetaHeader(true);
 
-      appStateController.setShowBetaHeader(false);
-      expect(appStateController.store.getState().showBetaHeader).toBe(false);
+        expect(controller.state.showBetaHeader).toBe(true);
+
+        controller.setShowBetaHeader(false);
+
+        expect(controller.state.showBetaHeader).toBe(false);
+      });
     });
   });
 
   describe('setCurrentPopupId', () => {
-    it('sets the currentPopupId in the appState', () => {
-      const popupId = 12345;
+    it('sets the currentPopupId in the appState', async () => {
+      await withController(({ controller }) => {
+        const popupId = 12345;
+
+        controller.setCurrentPopupId(popupId);
 
-      appStateController.setCurrentPopupId(popupId);
-      expect(appStateController.store.getState().currentPopupId).toBe(popupId);
+        expect(controller.state.currentPopupId).toBe(popupId);
+      });
     });
   });
 
   describe('getCurrentPopupId', () => {
-    it('retrieves the currentPopupId saved in the appState', () => {
-      const popupId = 54321;
+    it('retrieves the currentPopupId saved in the appState', async () => {
+      await withController(({ controller }) => {
+        const popupId = 54321;
+
+        controller.setCurrentPopupId(popupId);
 
-      appStateController.setCurrentPopupId(popupId);
-      expect(appStateController.getCurrentPopupId()).toBe(popupId);
+        expect(controller.getCurrentPopupId()).toBe(popupId);
+      });
     });
   });
 
   describe('setLastInteractedConfirmationInfo', () => {
-    it('sets information about last confirmation user has interacted with', () => {
-      const lastInteractedConfirmationInfo = {
-        id: '123',
-        chainId: '0x1',
-        timestamp: new Date().getTime(),
-      };
-      appStateController.setLastInteractedConfirmationInfo(
-        lastInteractedConfirmationInfo,
-      );
-      expect(appStateController.getLastInteractedConfirmationInfo()).toBe(
-        lastInteractedConfirmationInfo,
-      );
+    it('sets information about last confirmation user has interacted with', async () => {
+      await withController(({ controller }) => {
+        const lastInteractedConfirmationInfo = {
+          id: '123',
+          chainId: '0x1',
+          timestamp: new Date().getTime(),
+        };
 
-      appStateController.setLastInteractedConfirmationInfo(undefined);
-      expect(appStateController.getLastInteractedConfirmationInfo()).toBe(
-        undefined,
-      );
+        controller.setLastInteractedConfirmationInfo(
+          lastInteractedConfirmationInfo,
+        );
+
+        expect(controller.getLastInteractedConfirmationInfo()).toBe(
+          lastInteractedConfirmationInfo,
+        );
+
+        controller.setLastInteractedConfirmationInfo(undefined);
+
+        expect(controller.getLastInteractedConfirmationInfo()).toBe(undefined);
+      });
     });
   });
 
   describe('setSnapsInstallPrivacyWarningShownStatus', () => {
-    it('updates the status of snaps install privacy warning', () => {
-      ({ appStateController } = createAppStateController());
-      const updateStateSpy = jest.spyOn(
-        appStateController.store,
-        'updateState',
-      );
+    it('updates the status of snaps install privacy warning', async () => {
+      await withController(({ controller }) => {
+        controller.setSnapsInstallPrivacyWarningShownStatus(true);
 
-      appStateController.setSnapsInstallPrivacyWarningShownStatus(true);
-
-      expect(updateStateSpy).toHaveBeenCalledTimes(1);
-      expect(updateStateSpy).toHaveBeenCalledWith({
-        snapsInstallPrivacyWarningShown: true,
+        expect(controller.state.snapsInstallPrivacyWarningShown).toStrictEqual(
+          true,
+        );
       });
-
-      updateStateSpy.mockRestore();
     });
   });
 
   describe('institutional', () => {
-    it('set the interactive replacement token with a url and the old refresh token', () => {
-      ({ appStateController } = createAppStateController());
-      const updateStateSpy = jest.spyOn(
-        appStateController.store,
-        'updateState',
-      );
-
-      const mockParams = {
-        url: 'https://example.com',
-        oldRefreshToken: 'old',
-      };
-
-      appStateController.showInteractiveReplacementTokenBanner(mockParams);
-
-      expect(updateStateSpy).toHaveBeenCalledTimes(1);
-      expect(updateStateSpy).toHaveBeenCalledWith({
-        interactiveReplacementToken: mockParams,
+    it('set the interactive replacement token with a url and the old refresh token', async () => {
+      await withController(({ controller }) => {
+        const mockParams = {
+          url: 'https://example.com',
+          oldRefreshToken: 'old',
+        };
+
+        controller.showInteractiveReplacementTokenBanner(mockParams);
+
+        expect(controller.state.interactiveReplacementToken).toStrictEqual(
+          mockParams,
+        );
       });
-
-      updateStateSpy.mockRestore();
     });
 
-    it('set the setCustodianDeepLink with the fromAddress and custodyId', () => {
-      ({ appStateController } = createAppStateController());
-      const updateStateSpy = jest.spyOn(
-        appStateController.store,
-        'updateState',
-      );
-
-      const mockParams = {
-        fromAddress: '0x',
-        custodyId: 'custodyId',
-      };
+    it('set the setCustodianDeepLink with the fromAddress and custodyId', async () => {
+      await withController(({ controller }) => {
+        const mockParams = {
+          fromAddress: '0x',
+          custodyId: 'custodyId',
+        };
 
-      appStateController.setCustodianDeepLink(mockParams);
+        controller.setCustodianDeepLink(mockParams);
 
-      expect(updateStateSpy).toHaveBeenCalledTimes(1);
-      expect(updateStateSpy).toHaveBeenCalledWith({
-        custodianDeepLink: mockParams,
+        expect(controller.state.custodianDeepLink).toStrictEqual(mockParams);
       });
-
-      updateStateSpy.mockRestore();
     });
 
-    it('set the setNoteToTraderMessage with a message', () => {
-      ({ appStateController } = createAppStateController());
-      const updateStateSpy = jest.spyOn(
-        appStateController.store,
-        'updateState',
-      );
-
-      const mockParams = 'some message';
+    it('set the setNoteToTraderMessage with a message', async () => {
+      await withController(({ controller }) => {
+        const mockParams = 'some message';
 
-      appStateController.setNoteToTraderMessage(mockParams);
+        controller.setNoteToTraderMessage(mockParams);
 
-      expect(updateStateSpy).toHaveBeenCalledTimes(1);
-      expect(updateStateSpy).toHaveBeenCalledWith({
-        noteToTraderMessage: mockParams,
+        expect(controller.state.noteToTraderMessage).toStrictEqual(mockParams);
       });
-
-      updateStateSpy.mockRestore();
     });
   });
 
   describe('setSurveyLinkLastClickedOrClosed', () => {
-    it('set the surveyLinkLastClickedOrClosed time', () => {
-      ({ appStateController } = createAppStateController());
-      const updateStateSpy = jest.spyOn(
-        appStateController.store,
-        'updateState',
-      );
+    it('set the surveyLinkLastClickedOrClosed time', async () => {
+      await withController(({ controller }) => {
+        const mockParams = Date.now();
 
-      const mockParams = Date.now();
+        controller.setSurveyLinkLastClickedOrClosed(mockParams);
 
-      appStateController.setSurveyLinkLastClickedOrClosed(mockParams);
-
-      expect(updateStateSpy).toHaveBeenCalledTimes(1);
-      expect(updateStateSpy).toHaveBeenCalledWith({
-        surveyLinkLastClickedOrClosed: mockParams,
+        expect(controller.state.surveyLinkLastClickedOrClosed).toStrictEqual(
+          mockParams,
+        );
       });
-
-      updateStateSpy.mockRestore();
     });
   });
 
   describe('setOnboardingDate', () => {
-    it('set the onboardingDate', () => {
-      ({ appStateController } = createAppStateController());
-      const updateStateSpy = jest.spyOn(
-        appStateController.store,
-        'updateState',
-      );
-
-      appStateController.setOnboardingDate();
+    it('set the onboardingDate', async () => {
+      await withController(({ controller }) => {
+        const mockDateNow = 1620000000000;
+        jest.spyOn(Date, 'now').mockReturnValue(mockDateNow);
 
-      expect(updateStateSpy).toHaveBeenCalledTimes(1);
+        controller.setOnboardingDate();
 
-      updateStateSpy.mockRestore();
+        expect(controller.state.onboardingDate).toStrictEqual(mockDateNow);
+      });
     });
   });
 
   describe('setLastViewedUserSurvey', () => {
-    it('set the lastViewedUserSurvey with id 1', () => {
-      ({ appStateController } = createAppStateController());
-      const updateStateSpy = jest.spyOn(
-        appStateController.store,
-        'updateState',
-      );
+    it('set the lastViewedUserSurvey with id 1', async () => {
+      await withController(({ controller }) => {
+        const mockParams = 1;
 
-      const mockParams = 1;
+        controller.setLastViewedUserSurvey(mockParams);
 
-      appStateController.setLastViewedUserSurvey(mockParams);
-
-      expect(updateStateSpy).toHaveBeenCalledTimes(1);
-      expect(updateStateSpy).toHaveBeenCalledWith({
-        lastViewedUserSurvey: mockParams,
+        expect(controller.state.lastViewedUserSurvey).toStrictEqual(mockParams);
       });
-
-      updateStateSpy.mockRestore();
     });
   });
 
   describe('setNewPrivacyPolicyToastClickedOrClosed', () => {
-    it('set the newPrivacyPolicyToastClickedOrClosed to true', () => {
-      ({ appStateController } = createAppStateController());
-      const updateStateSpy = jest.spyOn(
-        appStateController.store,
-        'updateState',
-      );
-
-      appStateController.setNewPrivacyPolicyToastClickedOrClosed();
-
-      expect(updateStateSpy).toHaveBeenCalledTimes(1);
-      expect(
-        appStateController.store.getState()
-          .newPrivacyPolicyToastClickedOrClosed,
-      ).toStrictEqual(true);
+    it('set the newPrivacyPolicyToastClickedOrClosed to true', async () => {
+      await withController(({ controller }) => {
+        controller.setNewPrivacyPolicyToastClickedOrClosed();
 
-      updateStateSpy.mockRestore();
+        expect(
+          controller.state.newPrivacyPolicyToastClickedOrClosed,
+        ).toStrictEqual(true);
+      });
     });
   });
 
   describe('setNewPrivacyPolicyToastShownDate', () => {
-    it('set the newPrivacyPolicyToastShownDate', () => {
-      ({ appStateController } = createAppStateController());
-      const updateStateSpy = jest.spyOn(
-        appStateController.store,
-        'updateState',
-      );
+    it('set the newPrivacyPolicyToastShownDate', async () => {
+      await withController(({ controller }) => {
+        const mockParams = Date.now();
 
-      const mockParams = Date.now();
+        controller.setNewPrivacyPolicyToastShownDate(mockParams);
 
-      appStateController.setNewPrivacyPolicyToastShownDate(mockParams);
-
-      expect(updateStateSpy).toHaveBeenCalledTimes(1);
-      expect(updateStateSpy).toHaveBeenCalledWith({
-        newPrivacyPolicyToastShownDate: mockParams,
+        expect(controller.state.newPrivacyPolicyToastShownDate).toStrictEqual(
+          mockParams,
+        );
       });
-      expect(
-        appStateController.store.getState().newPrivacyPolicyToastShownDate,
-      ).toStrictEqual(mockParams);
-
-      updateStateSpy.mockRestore();
     });
   });
 
   describe('setTermsOfUseLastAgreed', () => {
-    it('set the termsOfUseLastAgreed timestamp', () => {
-      ({ appStateController } = createAppStateController());
-      const updateStateSpy = jest.spyOn(
-        appStateController.store,
-        'updateState',
-      );
-
-      const mockParams = Date.now();
+    it('set the termsOfUseLastAgreed timestamp', async () => {
+      await withController(({ controller }) => {
+        const mockParams = Date.now();
 
-      appStateController.setTermsOfUseLastAgreed(mockParams);
+        controller.setTermsOfUseLastAgreed(mockParams);
 
-      expect(updateStateSpy).toHaveBeenCalledTimes(1);
-      expect(updateStateSpy).toHaveBeenCalledWith({
-        termsOfUseLastAgreed: mockParams,
+        expect(controller.state.termsOfUseLastAgreed).toStrictEqual(mockParams);
       });
-      expect(
-        appStateController.store.getState().termsOfUseLastAgreed,
-      ).toStrictEqual(mockParams);
-
-      updateStateSpy.mockRestore();
     });
   });
 
   describe('onPreferencesStateChange', () => {
-    it('should update the timeoutMinutes with the autoLockTimeLimit', () => {
-      ({ appStateController, controllerMessenger } =
-        createAppStateController());
-      const timeout = Date.now();
-
-      controllerMessenger.publish(
-        'PreferencesController:stateChange',
-        {
-          preferences: { autoLockTimeLimit: timeout },
-        } as unknown as PreferencesControllerState,
-        [],
-      );
-
-      expect(appStateController.store.getState().timeoutMinutes).toStrictEqual(
-        timeout,
-      );
+    it('should update the timeoutMinutes with the autoLockTimeLimit', async () => {
+      await withController(({ controller, controllerMessenger }) => {
+        const timeout = Date.now();
+
+        controllerMessenger.publish(
+          'PreferencesController:stateChange',
+          {
+            preferences: { autoLockTimeLimit: timeout },
+          } as unknown as PreferencesControllerState,
+          [],
+        );
+
+        expect(controller.state.timeoutMinutes).toStrictEqual(timeout);
+      });
     });
   });
 
   describe('isManifestV3', () => {
-    it('creates alarm when isManifestV3 is true', () => {
+    it('creates alarm when isManifestV3 is true', async () => {
       mockIsManifestV3.mockReturnValue(true);
-      ({ appStateController } = createAppStateController());
-
-      const timeout = Date.now();
-      controllerMessenger.publish(
-        'PreferencesController:stateChange',
-        {
-          preferences: { autoLockTimeLimit: timeout },
-        } as unknown as PreferencesControllerState,
-        [],
-      );
-      const spy = jest.spyOn(
-        appStateController as unknown as { _resetTimer: () => void },
-        '_resetTimer',
-      );
-      appStateController.setLastActiveTime();
-
-      expect(spy).toHaveBeenCalled();
-      expect(extensionMock.alarms.clear).toHaveBeenCalled();
-      expect(extensionMock.alarms.onAlarm.addListener).toHaveBeenCalled();
+      await withController(({ controller, controllerMessenger }) => {
+        const timeout = Date.now();
+        controllerMessenger.publish(
+          'PreferencesController:stateChange',
+          {
+            preferences: { autoLockTimeLimit: timeout },
+          } as unknown as PreferencesControllerState,
+          [],
+        );
+        controller.setLastActiveTime();
+
+        expect(extensionMock.alarms.clear).toHaveBeenCalled();
+        expect(extensionMock.alarms.onAlarm.addListener).toHaveBeenCalled();
+      });
     });
   });
+});
 
-  describe('AppStateController:getState', () => {
-    it('should return the current state of the property', () => {
-      expect(
-        appStateController.store.getState().recoveryPhraseReminderHasBeenShown,
-      ).toStrictEqual(false);
-      expect(
-        controllerMessenger.call('AppStateController:getState')
-          .recoveryPhraseReminderHasBeenShown,
-      ).toStrictEqual(false);
-    });
+type WithControllerOptions = {
+  options?: Partial<AppStateControllerOptions>;
+  addRequestMock?: jest.Mock;
+};
+
+type WithControllerCallback<ReturnValue> = ({
+  controller,
+  controllerMessenger,
+}: {
+  controller: AppStateController;
+  controllerMessenger: ControllerMessenger<
+    | AppStateControllerActions
+    | AddApprovalRequest
+    | AcceptRequest
+    | PreferencesControllerGetStateAction,
+    | AppStateControllerEvents
+    | PreferencesControllerStateChangeEvent
+    | KeyringControllerQRKeyringStateChangeEvent
+  >;
+}) => ReturnValue;
+
+type WithControllerArgs<ReturnValue> =
+  | [WithControllerCallback<ReturnValue>]
+  | [WithControllerOptions, WithControllerCallback<ReturnValue>];
+
+async function withController<ReturnValue>(
+  ...args: WithControllerArgs<ReturnValue>
+): Promise<ReturnValue> {
+  const [{ ...rest }, fn] = args.length === 2 ? args : [{}, args[0]];
+  const { addRequestMock, options = {} } = rest;
+
+  const controllerMessenger = new ControllerMessenger<
+    | AppStateControllerActions
+    | AddApprovalRequest
+    | AcceptRequest
+    | PreferencesControllerGetStateAction,
+    | AppStateControllerEvents
+    | PreferencesControllerStateChangeEvent
+    | KeyringControllerQRKeyringStateChangeEvent
+  >();
+  const appStateMessenger = controllerMessenger.getRestricted({
+    name: 'AppStateController',
+    allowedActions: [
+      `ApprovalController:addRequest`,
+      `ApprovalController:acceptRequest`,
+      `PreferencesController:getState`,
+    ],
+    allowedEvents: [
+      `PreferencesController:stateChange`,
+      `KeyringController:qrKeyringStateChange`,
+    ],
   });
-
-  describe('AppStateController:stateChange', () => {
-    it('subscribers will recieve the state when published', () => {
-      expect(
-        appStateController.store.getState().surveyLinkLastClickedOrClosed,
-      ).toStrictEqual(null);
-      const timeNow = Date.now();
-      controllerMessenger.subscribe(
-        'AppStateController:stateChange',
-        (state: Partial<AppStateControllerState>) => {
-          if (typeof state.surveyLinkLastClickedOrClosed === 'number') {
-            appStateController.setSurveyLinkLastClickedOrClosed(
-              state.surveyLinkLastClickedOrClosed,
-            );
-          }
-        },
-      );
-
-      controllerMessenger.publish(
-        'AppStateController:stateChange',
-        {
-          surveyLinkLastClickedOrClosed: timeNow,
-        } as unknown as AppStateControllerState,
-        [],
-      );
-
-      expect(
-        appStateController.store.getState().surveyLinkLastClickedOrClosed,
-      ).toStrictEqual(timeNow);
-      expect(
-        controllerMessenger.call('AppStateController:getState')
-          .surveyLinkLastClickedOrClosed,
-      ).toStrictEqual(timeNow);
-    });
-
-    it('state will be published when there is state change', () => {
-      expect(
-        appStateController.store.getState().surveyLinkLastClickedOrClosed,
-      ).toStrictEqual(null);
-      const timeNow = Date.now();
-      controllerMessenger.subscribe(
-        'AppStateController:stateChange',
-        (state: Partial<AppStateControllerState>) => {
-          expect(state.surveyLinkLastClickedOrClosed).toStrictEqual(timeNow);
-        },
-      );
-
-      appStateController.setSurveyLinkLastClickedOrClosed(timeNow);
-
-      expect(
-        appStateController.store.getState().surveyLinkLastClickedOrClosed,
-      ).toStrictEqual(timeNow);
-      expect(
-        controllerMessenger.call('AppStateController:getState')
-          .surveyLinkLastClickedOrClosed,
-      ).toStrictEqual(timeNow);
-    });
+  controllerMessenger.registerActionHandler(
+    'PreferencesController:getState',
+    jest.fn().mockReturnValue({
+      preferences: {
+        autoLockTimeLimit: 0,
+      },
+    }),
+  );
+  controllerMessenger.registerActionHandler(
+    'ApprovalController:addRequest',
+    addRequestMock || jest.fn().mockResolvedValue(undefined),
+  );
+
+  return fn({
+    controller: new AppStateController({
+      addUnlockListener: jest.fn(),
+      isUnlocked: jest.fn(() => true),
+      onInactiveTimeout: jest.fn(),
+      messenger: appStateMessenger,
+      extension: extensionMock,
+      ...options,
+    }),
+    controllerMessenger,
   });
-});
+}
diff --git a/app/scripts/controllers/app-state-controller.ts b/app/scripts/controllers/app-state-controller.ts
index c506dc329e94..612f328eb82d 100644
--- a/app/scripts/controllers/app-state-controller.ts
+++ b/app/scripts/controllers/app-state-controller.ts
@@ -1,17 +1,19 @@
-import EventEmitter from 'events';
-import { ObservableStore } from '@metamask/obs-store';
 import { v4 as uuid } from 'uuid';
 import log from 'loglevel';
 import { ApprovalType } from '@metamask/controller-utils';
 import { KeyringControllerQRKeyringStateChangeEvent } from '@metamask/keyring-controller';
-import { RestrictedControllerMessenger } from '@metamask/base-controller';
+import {
+  BaseController,
+  ControllerGetStateAction,
+  ControllerStateChangeEvent,
+  RestrictedControllerMessenger,
+} from '@metamask/base-controller';
 import {
   AcceptRequest,
   AddApprovalRequest,
 } from '@metamask/approval-controller';
 import { Json } from '@metamask/utils';
 import { Browser } from 'webextension-polyfill';
-import { METAMASK_CONTROLLER_EVENTS } from '../metamask-controller';
 import { MINUTE } from '../../../shared/constants/time';
 import { AUTO_LOCK_TIMEOUT_ALARM } from '../../../shared/constants/alarms';
 import { isManifestV3 } from '../../../shared/modules/mv3.utils';
@@ -81,10 +83,10 @@ const controllerName = 'AppStateController';
 /**
  * Returns the state of the {@link AppStateController}.
  */
-export type AppStateControllerGetStateAction = {
-  type: 'AppStateController:getState';
-  handler: () => AppStateControllerState;
-};
+export type AppStateControllerGetStateAction = ControllerGetStateAction<
+  typeof controllerName,
+  AppStateControllerState
+>;
 
 /**
  * Actions exposed by the {@link AppStateController}.
@@ -94,7 +96,7 @@ export type AppStateControllerActions = AppStateControllerGetStateAction;
 /**
  * Actions that this controller is allowed to call.
  */
-export type AllowedActions =
+type AllowedActions =
   | AddApprovalRequest
   | AcceptRequest
   | PreferencesControllerGetStateAction;
@@ -102,20 +104,27 @@ export type AllowedActions =
 /**
  * Event emitted when the state of the {@link AppStateController} changes.
  */
-export type AppStateControllerStateChangeEvent = {
-  type: 'AppStateController:stateChange';
-  payload: [AppStateControllerState, []];
+export type AppStateControllerStateChangeEvent = ControllerStateChangeEvent<
+  typeof controllerName,
+  AppStateControllerState
+>;
+
+export type AppStateControllerUnlockChangeEvent = {
+  type: 'AppStateController:unlockChange';
+  payload: [];
 };
 
 /**
  * Events emitted by {@link AppStateController}.
  */
-export type AppStateControllerEvents = AppStateControllerStateChangeEvent;
+export type AppStateControllerEvents =
+  | AppStateControllerStateChangeEvent
+  | AppStateControllerUnlockChangeEvent;
 
 /**
  * Events that this controller is allowed to subscribe.
  */
-export type AllowedEvents =
+type AllowedEvents =
   | PreferencesControllerStateChangeEvent
   | KeyringControllerQRKeyringStateChangeEvent;
 
@@ -137,26 +146,22 @@ type AppStateControllerInitState = Partial<
     AppStateControllerState,
     | 'qrHardware'
     | 'nftsDropdownState'
-    | 'surveyLinkLastClickedOrClosed'
     | 'signatureSecurityAlertResponses'
     | 'switchedNetworkDetails'
-    | 'switchedNetworkNeverShowMessage'
     | 'currentExtensionPopupId'
   >
 >;
 
-type AppStateControllerOptions = {
+export type AppStateControllerOptions = {
   addUnlockListener: (callback: () => void) => void;
   isUnlocked: () => boolean;
-  initState?: AppStateControllerInitState;
+  state?: AppStateControllerInitState;
   onInactiveTimeout?: () => void;
   messenger: AppStateControllerMessenger;
   extension: Browser;
 };
 
-const getDefaultAppStateControllerState = (
-  initState?: AppStateControllerInitState,
-): AppStateControllerState => ({
+const getDefaultAppStateControllerState = (): AppStateControllerState => ({
   timeoutMinutes: DEFAULT_AUTO_LOCK_TIME_LIMIT,
   connectedStatusPopoverHasBeenShown: true,
   defaultHomeActiveTabName: null,
@@ -179,64 +184,221 @@ const getDefaultAppStateControllerState = (
   newPrivacyPolicyToastClickedOrClosed: null,
   newPrivacyPolicyToastShownDate: null,
   hadAdvancedGasFeesSetPriorToMigration92_3: false,
-  ...initState,
-  qrHardware: {},
-  nftsDropdownState: {},
   surveyLinkLastClickedOrClosed: null,
-  signatureSecurityAlertResponses: {},
-  switchedNetworkDetails: null,
   switchedNetworkNeverShowMessage: false,
-  currentExtensionPopupId: 0,
+  ...getInitialStateOverrides(),
 });
 
-export class AppStateController extends EventEmitter {
-  private readonly extension: AppStateControllerOptions['extension'];
+function getInitialStateOverrides() {
+  return {
+    qrHardware: {},
+    nftsDropdownState: {},
+    signatureSecurityAlertResponses: {},
+    switchedNetworkDetails: null,
+    currentExtensionPopupId: 0,
+  };
+}
 
-  private readonly onInactiveTimeout: () => void;
+const controllerMetadata = {
+  timeoutMinutes: {
+    persist: true,
+    anonymous: true,
+  },
+  connectedStatusPopoverHasBeenShown: {
+    persist: true,
+    anonymous: true,
+  },
+  defaultHomeActiveTabName: {
+    persist: true,
+    anonymous: true,
+  },
+  browserEnvironment: {
+    persist: true,
+    anonymous: true,
+  },
+  popupGasPollTokens: {
+    persist: false,
+    anonymous: true,
+  },
+  notificationGasPollTokens: {
+    persist: false,
+    anonymous: true,
+  },
+  fullScreenGasPollTokens: {
+    persist: false,
+    anonymous: true,
+  },
+  recoveryPhraseReminderHasBeenShown: {
+    persist: true,
+    anonymous: true,
+  },
+  recoveryPhraseReminderLastShown: {
+    persist: true,
+    anonymous: true,
+  },
+  outdatedBrowserWarningLastShown: {
+    persist: true,
+    anonymous: true,
+  },
+  nftsDetectionNoticeDismissed: {
+    persist: true,
+    anonymous: true,
+  },
+  showTestnetMessageInDropdown: {
+    persist: true,
+    anonymous: true,
+  },
+  showBetaHeader: {
+    persist: true,
+    anonymous: true,
+  },
+  showPermissionsTour: {
+    persist: true,
+    anonymous: true,
+  },
+  showNetworkBanner: {
+    persist: true,
+    anonymous: true,
+  },
+  showAccountBanner: {
+    persist: true,
+    anonymous: true,
+  },
+  trezorModel: {
+    persist: true,
+    anonymous: true,
+  },
+  currentPopupId: {
+    persist: false,
+    anonymous: true,
+  },
+  onboardingDate: {
+    persist: true,
+    anonymous: true,
+  },
+  lastViewedUserSurvey: {
+    persist: true,
+    anonymous: true,
+  },
+  newPrivacyPolicyToastClickedOrClosed: {
+    persist: true,
+    anonymous: true,
+  },
+  newPrivacyPolicyToastShownDate: {
+    persist: true,
+    anonymous: true,
+  },
+  hadAdvancedGasFeesSetPriorToMigration92_3: {
+    persist: true,
+    anonymous: true,
+  },
+  qrHardware: {
+    persist: false,
+    anonymous: true,
+  },
+  nftsDropdownState: {
+    persist: false,
+    anonymous: true,
+  },
+  surveyLinkLastClickedOrClosed: {
+    persist: true,
+    anonymous: true,
+  },
+  signatureSecurityAlertResponses: {
+    persist: false,
+    anonymous: true,
+  },
+  switchedNetworkDetails: {
+    persist: false,
+    anonymous: true,
+  },
+  switchedNetworkNeverShowMessage: {
+    persist: true,
+    anonymous: true,
+  },
+  currentExtensionPopupId: {
+    persist: false,
+    anonymous: true,
+  },
+  lastInteractedConfirmationInfo: {
+    persist: true,
+    anonymous: true,
+  },
+  termsOfUseLastAgreed: {
+    persist: true,
+    anonymous: true,
+  },
+  snapsInstallPrivacyWarningShown: {
+    persist: true,
+    anonymous: true,
+  },
+  interactiveReplacementToken: {
+    persist: true,
+    anonymous: true,
+  },
+  noteToTraderMessage: {
+    persist: true,
+    anonymous: true,
+  },
+  custodianDeepLink: {
+    persist: true,
+    anonymous: true,
+  },
+};
 
-  store: ObservableStore<AppStateControllerState>;
+export class AppStateController extends BaseController<
+  typeof controllerName,
+  AppStateControllerState,
+  AppStateControllerMessenger
+> {
+  readonly #extension: AppStateControllerOptions['extension'];
 
-  private timer: NodeJS.Timeout | null;
+  readonly #onInactiveTimeout: () => void;
 
-  isUnlocked: () => boolean;
+  #timer: NodeJS.Timeout | null;
 
-  private readonly waitingForUnlock: { resolve: () => void }[];
+  isUnlocked: () => boolean;
 
-  private readonly messagingSystem: AppStateControllerMessenger;
+  readonly waitingForUnlock: { resolve: () => void }[];
 
   #approvalRequestId: string | null;
 
-  constructor(opts: AppStateControllerOptions) {
-    const {
-      addUnlockListener,
-      isUnlocked,
-      initState,
-      onInactiveTimeout,
+  constructor({
+    state = {},
+    messenger,
+    addUnlockListener,
+    isUnlocked,
+    onInactiveTimeout,
+    extension,
+  }: AppStateControllerOptions) {
+    super({
+      name: controllerName,
+      metadata: controllerMetadata,
+      state: {
+        ...getDefaultAppStateControllerState(),
+        ...state,
+        ...getInitialStateOverrides(),
+      },
       messenger,
-      extension,
-    } = opts;
-    super();
-
-    this.extension = extension;
-    this.onInactiveTimeout = onInactiveTimeout || (() => undefined);
-    this.store = new ObservableStore(
-      getDefaultAppStateControllerState(initState),
-    );
-    this.timer = null;
+    });
+
+    this.#extension = extension;
+    this.#onInactiveTimeout = onInactiveTimeout || (() => undefined);
+    this.#timer = null;
 
     this.isUnlocked = isUnlocked;
     this.waitingForUnlock = [];
-    addUnlockListener(this.handleUnlock.bind(this));
+    addUnlockListener(this.#handleUnlock.bind(this));
 
     messenger.subscribe(
       'PreferencesController:stateChange',
       ({ preferences }: { preferences: Partial<Preferences> }) => {
-        const currentState = this.store.getState();
+        const currentState = this.state;
         if (
           typeof preferences?.autoLockTimeLimit === 'number' &&
           currentState.timeoutMinutes !== preferences.autoLockTimeLimit
         ) {
-          this._setInactiveTimeout(preferences.autoLockTimeLimit);
+          this.#setInactiveTimeout(preferences.autoLockTimeLimit);
         }
       },
     );
@@ -244,24 +406,17 @@ export class AppStateController extends EventEmitter {
     messenger.subscribe(
       'KeyringController:qrKeyringStateChange',
       (qrHardware: Json) =>
-        this.store.updateState({
-          qrHardware,
+        this.update((currentState) => {
+          // @ts-expect-error this is caused by a bug in Immer, not being able to handle recursive types like Json
+          currentState.qrHardware = qrHardware;
         }),
     );
 
     const { preferences } = messenger.call('PreferencesController:getState');
     if (typeof preferences.autoLockTimeLimit === 'number') {
-      this._setInactiveTimeout(preferences.autoLockTimeLimit);
+      this.#setInactiveTimeout(preferences.autoLockTimeLimit);
     }
 
-    this.messagingSystem = messenger;
-    this.messagingSystem.registerActionHandler(
-      'AppStateController:getState',
-      () => this.store.getState(),
-    );
-    this.store.subscribe((state: AppStateControllerState) => {
-      this.messagingSystem.publish('AppStateController:stateChange', state, []);
-    });
     this.#approvalRequestId = null;
   }
 
@@ -279,7 +434,7 @@ export class AppStateController extends EventEmitter {
       if (this.isUnlocked()) {
         resolve();
       } else {
-        this.waitForUnlock(resolve, shouldShowUnlockRequest);
+        this.#waitForUnlock(resolve, shouldShowUnlockRequest);
       }
     });
   }
@@ -293,26 +448,26 @@ export class AppStateController extends EventEmitter {
    * @param shouldShowUnlockRequest - Whether the extension notification
    * popup should be opened.
    */
-  waitForUnlock(resolve: () => void, shouldShowUnlockRequest: boolean): void {
+  #waitForUnlock(resolve: () => void, shouldShowUnlockRequest: boolean): void {
     this.waitingForUnlock.push({ resolve });
-    this.emit(METAMASK_CONTROLLER_EVENTS.UPDATE_BADGE);
+    this.messagingSystem.publish('AppStateController:unlockChange');
     if (shouldShowUnlockRequest) {
-      this._requestApproval();
+      this.#requestApproval();
     }
   }
 
   /**
    * Drains the waitingForUnlock queue, resolving all the related Promises.
    */
-  handleUnlock(): void {
+  #handleUnlock(): void {
     if (this.waitingForUnlock.length > 0) {
       while (this.waitingForUnlock.length > 0) {
         this.waitingForUnlock.shift()?.resolve();
       }
-      this.emit(METAMASK_CONTROLLER_EVENTS.UPDATE_BADGE);
+      this.messagingSystem.publish('AppStateController:unlockChange');
     }
 
-    this._acceptApproval();
+    this.#acceptApproval();
   }
 
   /**
@@ -323,8 +478,8 @@ export class AppStateController extends EventEmitter {
   setDefaultHomeActiveTabName(
     defaultHomeActiveTabName: AccountOverviewTabKey | null,
   ): void {
-    this.store.updateState({
-      defaultHomeActiveTabName,
+    this.update((state) => {
+      state.defaultHomeActiveTabName = defaultHomeActiveTabName;
     });
   }
 
@@ -332,8 +487,8 @@ export class AppStateController extends EventEmitter {
    * Record that the user has seen the connected status info popover
    */
   setConnectedStatusPopoverHasBeenShown(): void {
-    this.store.updateState({
-      connectedStatusPopoverHasBeenShown: true,
+    this.update((state) => {
+      state.connectedStatusPopoverHasBeenShown = true;
     });
   }
 
@@ -341,38 +496,38 @@ export class AppStateController extends EventEmitter {
    * Record that the user has been shown the recovery phrase reminder.
    */
   setRecoveryPhraseReminderHasBeenShown(): void {
-    this.store.updateState({
-      recoveryPhraseReminderHasBeenShown: true,
+    this.update((state) => {
+      state.recoveryPhraseReminderHasBeenShown = true;
     });
   }
 
   setSurveyLinkLastClickedOrClosed(time: number): void {
-    this.store.updateState({
-      surveyLinkLastClickedOrClosed: time,
+    this.update((state) => {
+      state.surveyLinkLastClickedOrClosed = time;
     });
   }
 
   setOnboardingDate(): void {
-    this.store.updateState({
-      onboardingDate: Date.now(),
+    this.update((state) => {
+      state.onboardingDate = Date.now();
     });
   }
 
   setLastViewedUserSurvey(id: number) {
-    this.store.updateState({
-      lastViewedUserSurvey: id,
+    this.update((state) => {
+      state.lastViewedUserSurvey = id;
     });
   }
 
   setNewPrivacyPolicyToastClickedOrClosed(): void {
-    this.store.updateState({
-      newPrivacyPolicyToastClickedOrClosed: true,
+    this.update((state) => {
+      state.newPrivacyPolicyToastClickedOrClosed = true;
     });
   }
 
   setNewPrivacyPolicyToastShownDate(time: number): void {
-    this.store.updateState({
-      newPrivacyPolicyToastShownDate: time,
+    this.update((state) => {
+      state.newPrivacyPolicyToastShownDate = time;
     });
   }
 
@@ -382,8 +537,8 @@ export class AppStateController extends EventEmitter {
    * @param lastShown - timestamp when user was last shown the reminder.
    */
   setRecoveryPhraseReminderLastShown(lastShown: number): void {
-    this.store.updateState({
-      recoveryPhraseReminderLastShown: lastShown,
+    this.update((state) => {
+      state.recoveryPhraseReminderLastShown = lastShown;
     });
   }
 
@@ -393,8 +548,8 @@ export class AppStateController extends EventEmitter {
    * @param lastAgreed - timestamp when user last accepted the terms of use
    */
   setTermsOfUseLastAgreed(lastAgreed: number): void {
-    this.store.updateState({
-      termsOfUseLastAgreed: lastAgreed,
+    this.update((state) => {
+      state.termsOfUseLastAgreed = lastAgreed;
     });
   }
 
@@ -405,8 +560,8 @@ export class AppStateController extends EventEmitter {
    * @param shown - shown status
    */
   setSnapsInstallPrivacyWarningShownStatus(shown: boolean): void {
-    this.store.updateState({
-      snapsInstallPrivacyWarningShown: shown,
+    this.update((state) => {
+      state.snapsInstallPrivacyWarningShown = shown;
     });
   }
 
@@ -416,8 +571,8 @@ export class AppStateController extends EventEmitter {
    * @param lastShown - Timestamp (in milliseconds) of when the user was last shown the warning.
    */
   setOutdatedBrowserWarningLastShown(lastShown: number): void {
-    this.store.updateState({
-      outdatedBrowserWarningLastShown: lastShown,
+    this.update((state) => {
+      state.outdatedBrowserWarningLastShown = lastShown;
     });
   }
 
@@ -425,7 +580,7 @@ export class AppStateController extends EventEmitter {
    * Sets the last active time to the current time.
    */
   setLastActiveTime(): void {
-    this._resetTimer();
+    this.#resetTimer();
   }
 
   /**
@@ -433,12 +588,12 @@ export class AppStateController extends EventEmitter {
    *
    * @param timeoutMinutes - The inactive timeout in minutes.
    */
-  private _setInactiveTimeout(timeoutMinutes: number): void {
-    this.store.updateState({
-      timeoutMinutes,
+  #setInactiveTimeout(timeoutMinutes: number): void {
+    this.update((state) => {
+      state.timeoutMinutes = timeoutMinutes;
     });
 
-    this._resetTimer();
+    this.#resetTimer();
   }
 
   /**
@@ -448,13 +603,13 @@ export class AppStateController extends EventEmitter {
    * timer will not be created.
    *
    */
-  private _resetTimer(): void {
-    const { timeoutMinutes } = this.store.getState();
+  #resetTimer(): void {
+    const { timeoutMinutes } = this.state;
 
-    if (this.timer) {
-      clearTimeout(this.timer);
+    if (this.#timer) {
+      clearTimeout(this.#timer);
     } else if (isManifestV3) {
-      this.extension.alarms.clear(AUTO_LOCK_TIMEOUT_ALARM);
+      this.#extension.alarms.clear(AUTO_LOCK_TIMEOUT_ALARM);
     }
 
     if (!timeoutMinutes) {
@@ -471,21 +626,21 @@ export class AppStateController extends EventEmitter {
     const timeoutToSet = Number(timeoutMinutes);
 
     if (isManifestV3) {
-      this.extension.alarms.create(AUTO_LOCK_TIMEOUT_ALARM, {
+      this.#extension.alarms.create(AUTO_LOCK_TIMEOUT_ALARM, {
         delayInMinutes: timeoutToSet,
         periodInMinutes: timeoutToSet,
       });
-      this.extension.alarms.onAlarm.addListener(
+      this.#extension.alarms.onAlarm.addListener(
         (alarmInfo: { name: string }) => {
           if (alarmInfo.name === AUTO_LOCK_TIMEOUT_ALARM) {
-            this.onInactiveTimeout();
-            this.extension.alarms.clear(AUTO_LOCK_TIMEOUT_ALARM);
+            this.#onInactiveTimeout();
+            this.#extension.alarms.clear(AUTO_LOCK_TIMEOUT_ALARM);
           }
         },
       );
     } else {
-      this.timer = setTimeout(
-        () => this.onInactiveTimeout(),
+      this.#timer = setTimeout(
+        () => this.#onInactiveTimeout(),
         timeoutToSet * MINUTE,
       );
     }
@@ -498,7 +653,9 @@ export class AppStateController extends EventEmitter {
    * @param browser
    */
   setBrowserEnvironment(os: string, browser: string): void {
-    this.store.updateState({ browserEnvironment: { os, browser } });
+    this.update((state) => {
+      state.browserEnvironment = { os, browser };
+    });
   }
 
   /**
@@ -531,9 +688,8 @@ export class AppStateController extends EventEmitter {
     pollingToken: string,
     pollingTokenType: PollingTokenType,
   ) {
-    const currentTokens: string[] = this.store.getState()[pollingTokenType];
-    this.store.updateState({
-      [pollingTokenType]: [...currentTokens, pollingToken],
+    this.update((state) => {
+      state[pollingTokenType].push(pollingToken);
     });
   }
 
@@ -551,12 +707,12 @@ export class AppStateController extends EventEmitter {
       pollingTokenType.toString() !==
       POLLING_TOKEN_ENVIRONMENT_TYPES[ENVIRONMENT_TYPE_BACKGROUND]
     ) {
-      const currentTokens: string[] = this.store.getState()[pollingTokenType];
+      const currentTokens: string[] = this.state[pollingTokenType];
       if (this.#isValidPollingTokenType(pollingTokenType)) {
-        this.store.updateState({
-          [pollingTokenType]: currentTokens.filter(
+        this.update((state) => {
+          state[pollingTokenType] = currentTokens.filter(
             (token: string) => token !== pollingToken,
-          ),
+          );
         });
       }
     }
@@ -582,10 +738,10 @@ export class AppStateController extends EventEmitter {
    * clears all pollingTokens
    */
   clearPollingTokens(): void {
-    this.store.updateState({
-      popupGasPollTokens: [],
-      notificationGasPollTokens: [],
-      fullScreenGasPollTokens: [],
+    this.update((state) => {
+      state.popupGasPollTokens = [];
+      state.notificationGasPollTokens = [];
+      state.fullScreenGasPollTokens = [];
     });
   }
 
@@ -595,7 +751,9 @@ export class AppStateController extends EventEmitter {
    * @param showTestnetMessageInDropdown
    */
   setShowTestnetMessageInDropdown(showTestnetMessageInDropdown: boolean): void {
-    this.store.updateState({ showTestnetMessageInDropdown });
+    this.update((state) => {
+      state.showTestnetMessageInDropdown = showTestnetMessageInDropdown;
+    });
   }
 
   /**
@@ -604,7 +762,9 @@ export class AppStateController extends EventEmitter {
    * @param showBetaHeader
    */
   setShowBetaHeader(showBetaHeader: boolean): void {
-    this.store.updateState({ showBetaHeader });
+    this.update((state) => {
+      state.showBetaHeader = showBetaHeader;
+    });
   }
 
   /**
@@ -613,7 +773,9 @@ export class AppStateController extends EventEmitter {
    * @param showPermissionsTour
    */
   setShowPermissionsTour(showPermissionsTour: boolean): void {
-    this.store.updateState({ showPermissionsTour });
+    this.update((state) => {
+      state.showPermissionsTour = showPermissionsTour;
+    });
   }
 
   /**
@@ -622,7 +784,9 @@ export class AppStateController extends EventEmitter {
    * @param showNetworkBanner
    */
   setShowNetworkBanner(showNetworkBanner: boolean): void {
-    this.store.updateState({ showNetworkBanner });
+    this.update((state) => {
+      state.showNetworkBanner = showNetworkBanner;
+    });
   }
 
   /**
@@ -631,7 +795,9 @@ export class AppStateController extends EventEmitter {
    * @param showAccountBanner
    */
   setShowAccountBanner(showAccountBanner: boolean): void {
-    this.store.updateState({ showAccountBanner });
+    this.update((state) => {
+      state.showAccountBanner = showAccountBanner;
+    });
   }
 
   /**
@@ -640,7 +806,9 @@ export class AppStateController extends EventEmitter {
    * @param currentExtensionPopupId
    */
   setCurrentExtensionPopupId(currentExtensionPopupId: number): void {
-    this.store.updateState({ currentExtensionPopupId });
+    this.update((state) => {
+      state.currentExtensionPopupId = currentExtensionPopupId;
+    });
   }
 
   /**
@@ -652,14 +820,18 @@ export class AppStateController extends EventEmitter {
   setSwitchedNetworkDetails(
     switchedNetworkDetails: { origin: string; networkClientId: string } | null,
   ): void {
-    this.store.updateState({ switchedNetworkDetails });
+    this.update((state) => {
+      state.switchedNetworkDetails = switchedNetworkDetails;
+    });
   }
 
   /**
    * Clears the switched network details in state
    */
   clearSwitchedNetworkDetails(): void {
-    this.store.updateState({ switchedNetworkDetails: null });
+    this.update((state) => {
+      state.switchedNetworkDetails = null;
+    });
   }
 
   /**
@@ -671,9 +843,9 @@ export class AppStateController extends EventEmitter {
   setSwitchedNetworkNeverShowMessage(
     switchedNetworkNeverShowMessage: boolean,
   ): void {
-    this.store.updateState({
-      switchedNetworkDetails: null,
-      switchedNetworkNeverShowMessage,
+    this.update((state) => {
+      state.switchedNetworkDetails = null;
+      state.switchedNetworkNeverShowMessage = switchedNetworkNeverShowMessage;
     });
   }
 
@@ -683,7 +855,9 @@ export class AppStateController extends EventEmitter {
    * @param trezorModel - The Trezor model.
    */
   setTrezorModel(trezorModel: string | null): void {
-    this.store.updateState({ trezorModel });
+    this.update((state) => {
+      state.trezorModel = trezorModel;
+    });
   }
 
   /**
@@ -692,8 +866,8 @@ export class AppStateController extends EventEmitter {
    * @param nftsDropdownState
    */
   updateNftDropDownState(nftsDropdownState: Json): void {
-    this.store.updateState({
-      nftsDropdownState,
+    this.update((state) => {
+      state.nftsDropdownState = nftsDropdownState;
     });
   }
 
@@ -712,11 +886,11 @@ export class AppStateController extends EventEmitter {
     url: string;
     oldRefreshToken: string;
   }): void {
-    this.store.updateState({
-      interactiveReplacementToken: {
+    this.update((state) => {
+      state.interactiveReplacementToken = {
         url,
         oldRefreshToken,
-      },
+      };
     });
   }
 
@@ -734,14 +908,14 @@ export class AppStateController extends EventEmitter {
     fromAddress: string;
     custodyId: string;
   }): void {
-    this.store.updateState({
-      custodianDeepLink: { fromAddress, custodyId },
+    this.update((state) => {
+      state.custodianDeepLink = { fromAddress, custodyId };
     });
   }
 
   setNoteToTraderMessage(message: string): void {
-    this.store.updateState({
-      noteToTraderMessage: message,
+    this.update((state) => {
+      state.noteToTraderMessage = message;
     });
   }
 
@@ -750,23 +924,17 @@ export class AppStateController extends EventEmitter {
   getSignatureSecurityAlertResponse(
     securityAlertId: string,
   ): SecurityAlertResponse {
-    return this.store.getState().signatureSecurityAlertResponses[
-      securityAlertId
-    ];
+    return this.state.signatureSecurityAlertResponses[securityAlertId];
   }
 
   addSignatureSecurityAlertResponse(
     securityAlertResponse: SecurityAlertResponse,
   ): void {
-    const currentState = this.store.getState();
-    const { signatureSecurityAlertResponses } = currentState;
     if (securityAlertResponse.securityAlertId) {
-      this.store.updateState({
-        signatureSecurityAlertResponses: {
-          ...signatureSecurityAlertResponses,
-          [String(securityAlertResponse.securityAlertId)]:
-            securityAlertResponse,
-        },
+      this.update((state) => {
+        state.signatureSecurityAlertResponses[
+          String(securityAlertResponse.securityAlertId)
+        ] = securityAlertResponse;
       });
     }
   }
@@ -777,8 +945,8 @@ export class AppStateController extends EventEmitter {
    * @param currentPopupId
    */
   setCurrentPopupId(currentPopupId: number): void {
-    this.store.updateState({
-      currentPopupId,
+    this.update((state) => {
+      state.currentPopupId = currentPopupId;
     });
   }
 
@@ -788,7 +956,7 @@ export class AppStateController extends EventEmitter {
   getLastInteractedConfirmationInfo():
     | LastInteractedConfirmationInfo
     | undefined {
-    return this.store.getState().lastInteractedConfirmationInfo;
+    return this.state.lastInteractedConfirmationInfo;
   }
 
   /**
@@ -799,8 +967,8 @@ export class AppStateController extends EventEmitter {
   setLastInteractedConfirmationInfo(
     lastInteractedConfirmationInfo: LastInteractedConfirmationInfo | undefined,
   ): void {
-    this.store.updateState({
-      lastInteractedConfirmationInfo,
+    this.update((state) => {
+      state.lastInteractedConfirmationInfo = lastInteractedConfirmationInfo;
     });
   }
 
@@ -808,10 +976,10 @@ export class AppStateController extends EventEmitter {
    * A getter to retrieve currentPopupId saved in the appState
    */
   getCurrentPopupId(): number | undefined {
-    return this.store.getState().currentPopupId;
+    return this.state.currentPopupId;
   }
 
-  private _requestApproval(): void {
+  #requestApproval(): void {
     // If we already have a pending request this is a no-op
     if (this.#approvalRequestId) {
       return;
@@ -834,12 +1002,7 @@ export class AppStateController extends EventEmitter {
       });
   }
 
-  // Override emit method to provide strong typing for events
-  emit(event: string) {
-    return super.emit(event);
-  }
-
-  private _acceptApproval(): void {
+  #acceptApproval(): void {
     if (!this.#approvalRequestId) {
       return;
     }
diff --git a/app/scripts/controllers/metametrics-controller.ts b/app/scripts/controllers/metametrics-controller.ts
index b2b78a4e6406..e286a3a47d02 100644
--- a/app/scripts/controllers/metametrics-controller.ts
+++ b/app/scripts/controllers/metametrics-controller.ts
@@ -584,7 +584,6 @@ export default class MetaMetricsController extends BaseController<
       : {};
 
     this.update((state) => {
-      // @ts-expect-error this is caused by a bug in Immer, not being able to handle recursive types like Json
       state.fragments[id] = merge(additionalFragmentProps, fragment);
     });
 
diff --git a/app/scripts/controllers/mmi-controller.test.ts b/app/scripts/controllers/mmi-controller.test.ts
index 71c8329b3dcd..8e52655ee11e 100644
--- a/app/scripts/controllers/mmi-controller.test.ts
+++ b/app/scripts/controllers/mmi-controller.test.ts
@@ -273,7 +273,7 @@ describe('MMIController', function () {
       appStateController: new AppStateController({
         addUnlockListener: jest.fn(),
         isUnlocked: jest.fn(() => true),
-        initState: {},
+        state: {},
         onInactiveTimeout: jest.fn(),
         showUnlockRequest: jest.fn(),
         messenger: {
diff --git a/app/scripts/lib/createRPCMethodTrackingMiddleware.test.js b/app/scripts/lib/createRPCMethodTrackingMiddleware.test.js
index 1949ca7f876e..98bb790cfa32 100644
--- a/app/scripts/lib/createRPCMethodTrackingMiddleware.test.js
+++ b/app/scripts/lib/createRPCMethodTrackingMiddleware.test.js
@@ -36,20 +36,16 @@ const expectedMetametricsEventUndefinedProps = {
 };
 
 const appStateController = {
-  store: {
-    getState: () => ({
-      signatureSecurityAlertResponses: {
-        1: {
-          result_type: BlockaidResultType.Malicious,
-          reason: BlockaidReason.maliciousDomain,
-        },
+  state: {
+    signatureSecurityAlertResponses: {
+      1: {
+        result_type: BlockaidResultType.Malicious,
+        reason: BlockaidReason.maliciousDomain,
       },
-    }),
+    },
   },
   getSignatureSecurityAlertResponse: (id) => {
-    return appStateController.store.getState().signatureSecurityAlertResponses[
-      id
-    ];
+    return appStateController.state.signatureSecurityAlertResponses[id];
   },
 };
 
diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
index ae42d59db747..9f700738403b 100644
--- a/app/scripts/metamask-controller.js
+++ b/app/scripts/metamask-controller.js
@@ -388,6 +388,7 @@ export const METAMASK_CONTROLLER_EVENTS = {
   UPDATE_BADGE: 'updateBadge',
   // TODO: Add this and similar enums to the `controllers` repo and export them
   APPROVAL_STATE_CHANGE: 'ApprovalController:stateChange',
+  APP_STATE_UNLOCK_CHANGE: 'AppStateController:unlockChange',
   QUEUED_REQUEST_STATE_CHANGE: 'QueuedRequestController:stateChange',
   METAMASK_NOTIFICATIONS_LIST_UPDATED:
     'NotificationServicesController:notificationsListUpdated',
@@ -876,7 +877,7 @@ export default class MetamaskController extends EventEmitter {
     this.appStateController = new AppStateController({
       addUnlockListener: this.on.bind(this, 'unlock'),
       isUnlocked: this.isUnlocked.bind(this),
-      initState: initState.AppStateController,
+      state: initState.AppStateController,
       onInactiveTimeout: () => this.setLocked(),
       messenger: this.controllerMessenger.getRestricted({
         name: 'AppStateController',
@@ -2512,7 +2513,7 @@ export default class MetamaskController extends EventEmitter {
 
     this.store.updateStructure({
       AccountsController: this.accountsController,
-      AppStateController: this.appStateController.store,
+      AppStateController: this.appStateController,
       AppMetadataController: this.appMetadataController,
       MultichainBalancesController: this.multichainBalancesController,
       TransactionController: this.txController,
@@ -2568,7 +2569,7 @@ export default class MetamaskController extends EventEmitter {
     this.memStore = new ComposableObservableStore({
       config: {
         AccountsController: this.accountsController,
-        AppStateController: this.appStateController.store,
+        AppStateController: this.appStateController,
         AppMetadataController: this.appMetadataController,
         MultichainBalancesController: this.multichainBalancesController,
         NetworkController: this.networkController,
@@ -6906,7 +6907,7 @@ export default class MetamaskController extends EventEmitter {
     const appStatePollingTokenType =
       POLLING_TOKEN_ENVIRONMENT_TYPES[environmentType];
     const pollingTokensToDisconnect =
-      this.appStateController.store.getState()[appStatePollingTokenType];
+      this.appStateController.state[appStatePollingTokenType];
     pollingTokensToDisconnect.forEach((pollingToken) => {
       this.gasFeeController.stopPollingByPollingToken(pollingToken);
       this.currencyRateController.stopPollingByPollingToken(pollingToken);

From f7fc1c92c674c89f009205a5c38856990164f16a Mon Sep 17 00:00:00 2001
From: cryptodev-2s <109512101+cryptodev-2s@users.noreply.github.com>
Date: Wed, 4 Dec 2024 23:13:27 +0100
Subject: [PATCH 025/175] chore: update controllers as of core release v244
 (#28905)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<!--
Please submit this PR as a draft initially.
Do not mark it as "Ready for review" until the template has been
completely filled out, and PR status checks have passed at least once.
-->

## **Description**

This PR bumps the following packages:
- `@metamask/ens-controller` to `^15.0.0`
- `@metamask/network-controller` to `^22.1.0`
- `@metamask/gas-fee-controller` to `^22.0.1`
- `@metamask/user-operation-controller` to `^20.0.1`
- `@metamask/polling-controller` to `^12.0.1`
- `@metamask/selected-network-controller` to `^19.0.0`

<!--
Write a short description of the changes included in this pull request,
also include relevant motivation and context. Have in mind the following
questions:
1. What is the reason for the change?
2. What is the improvement/solution?
-->

[![Open in GitHub
Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/28781?quickstart=1)

## **Related issues**

Fixes: https://github.com/MetaMask/metamask-extension/issues/28495,
https://github.com/MetaMask/MetaMask-planning/issues/3698

## **Manual testing steps**

## **Screenshots/Recordings**

<!-- If applicable, add screenshots and/or recordings to visualize the
before and after of your change. -->

### **Before**

<!-- [screenshots/recordings] -->

### **After**

<!-- [screenshots/recordings] -->

## **Pre-merge author checklist**

- [x] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension Coding
Standards](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/CODING_GUIDELINES.md).
- [x] I've completed the PR template to the best of my ability
- [ ] I’ve included tests if applicable
- [ ] I’ve documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [x] I’ve applied the right labels on the PR (see [labeling
guidelines](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.

## **Pre-merge reviewer checklist**

- [ ] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed).
- [ ] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.

---------

Co-authored-by: MetaMask Bot <metamaskbot@users.noreply.github.com>
Co-authored-by: Elliot Winkler <elliot.winkler@gmail.com>
---
 ...ork-controller-npm-21.0.0-559aa8e395.patch |  33 ---
 ...ork-controller-npm-22.1.0-621c281f70.patch |  35 +++
 lavamoat/browserify/beta/policy.json          | 168 ++-----------
 lavamoat/browserify/flask/policy.json         | 168 ++-----------
 lavamoat/browserify/main/policy.json          | 168 ++-----------
 lavamoat/browserify/mmi/policy.json           | 168 ++-----------
 package.json                                  |  17 +-
 yarn.lock                                     | 233 ++++++------------
 8 files changed, 206 insertions(+), 784 deletions(-)
 delete mode 100644 .yarn/patches/@metamask-network-controller-npm-21.0.0-559aa8e395.patch
 create mode 100644 .yarn/patches/@metamask-network-controller-npm-22.1.0-621c281f70.patch

diff --git a/.yarn/patches/@metamask-network-controller-npm-21.0.0-559aa8e395.patch b/.yarn/patches/@metamask-network-controller-npm-21.0.0-559aa8e395.patch
deleted file mode 100644
index 5719ae0284f7..000000000000
--- a/.yarn/patches/@metamask-network-controller-npm-21.0.0-559aa8e395.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff --git a/PATCH.txt b/PATCH.txt
-new file mode 100644
-index 0000000000000000000000000000000000000000..78b9156dc2b0bf7c33dadf325cb3ec0bfae71ccb
---- /dev/null
-+++ b/PATCH.txt
-@@ -0,0 +1,3 @@
-+We remove `lookupNetwork` from `initializeProvider` in the network controller to prevent network requests before user onboarding is completed.
-+The network lookup is done after onboarding is completed, and when the extension reloads if onboarding has been completed.
-+This patch is part of a temporary fix that will be reverted soon to make way for a more permanent solution. https://github.com/MetaMask/metamask-extension/pull/23005
-diff --git a/dist/chunk-BV3ZGWII.mjs b/dist/chunk-BV3ZGWII.mjs
-index 0d1bf3b6348ad4ec7a799083fcadf36f9fc74851..48a09c6e474da9c18115bec88130a88888337044 100644
---- a/dist/chunk-BV3ZGWII.mjs
-+++ b/dist/chunk-BV3ZGWII.mjs
-@@ -468,7 +468,6 @@ var NetworkController = class extends BaseController {
-    */
-   async initializeProvider() {
-     __privateMethod(this, _applyNetworkSelection, applyNetworkSelection_fn).call(this, this.state.selectedNetworkClientId);
--    await this.lookupNetwork();
-   }
-   /**
-    * Refreshes the network meta with EIP-1559 support and the network status
-diff --git a/dist/chunk-YOHMQPGM.js b/dist/chunk-YOHMQPGM.js
-index ff15cd78ef90b35f86aae9dc64d17d1d2efe352d..14a8bba39c204585164dfb252d0a183844a58d63 100644
---- a/dist/chunk-YOHMQPGM.js
-+++ b/dist/chunk-YOHMQPGM.js
-@@ -468,7 +468,6 @@ var NetworkController = class extends _basecontroller.BaseController {
-    */
-   async initializeProvider() {
-     _chunkZ4BLTVTBjs.__privateMethod.call(void 0, this, _applyNetworkSelection, applyNetworkSelection_fn).call(this, this.state.selectedNetworkClientId);
--    await this.lookupNetwork();
-   }
-   /**
-    * Refreshes the network meta with EIP-1559 support and the network status
diff --git a/.yarn/patches/@metamask-network-controller-npm-22.1.0-621c281f70.patch b/.yarn/patches/@metamask-network-controller-npm-22.1.0-621c281f70.patch
new file mode 100644
index 000000000000..027c44b96395
--- /dev/null
+++ b/.yarn/patches/@metamask-network-controller-npm-22.1.0-621c281f70.patch
@@ -0,0 +1,35 @@
+diff --git a/PATCH.txt b/PATCH.txt
+new file mode 100644
+index 0000000000000000000000000000000000000000..ce3b18534f055ee00aa5821793f855fd300fb72c
+--- /dev/null
++++ b/PATCH.txt
+@@ -0,0 +1,4 @@
++We remove lookupNetwork from initializeProvider in the network controller to prevent network requests before user onboarding is completed.
++The network lookup is done after onboarding is completed, and when the extension reloads if onboarding has been completed.
++This patch is part of a temporary fix that will be reverted soon to make way for a more permanent solution. https://github.com/MetaMask/metamask-extension/pull/23005
++You can see the changes before compilation on this branch: https://github.com/MetaMask/core/compare/pnf/ext-23622-review?expand=1
+\ No newline at end of file
+diff --git a/dist/NetworkController.cjs b/dist/NetworkController.cjs
+index cc9793f576eb39a51ab141b7d03de57cf99e5570..c573b5134d40f522217a6ab6df129040d02e9660 100644
+--- a/dist/NetworkController.cjs
++++ b/dist/NetworkController.cjs
+@@ -422,7 +422,6 @@ class NetworkController extends base_controller_1.BaseController {
+      */
+     async initializeProvider() {
+         __classPrivateFieldGet(this, _NetworkController_instances, "m", _NetworkController_applyNetworkSelection).call(this, this.state.selectedNetworkClientId);
+-        await this.lookupNetwork();
+     }
+     /**
+      * Refreshes the network meta with EIP-1559 support and the network status
+diff --git a/dist/NetworkController.mjs b/dist/NetworkController.mjs
+index 806f32edeffaad9f7eb1cafa4184368ec95f63e7..9268947cbed4bf717729ca6ac8ea83a8b91b6e8a 100644
+--- a/dist/NetworkController.mjs
++++ b/dist/NetworkController.mjs
+@@ -397,7 +397,6 @@ export class NetworkController extends BaseController {
+      */
+     async initializeProvider() {
+         __classPrivateFieldGet(this, _NetworkController_instances, "m", _NetworkController_applyNetworkSelection).call(this, this.state.selectedNetworkClientId);
+-        await this.lookupNetwork();
+     }
+     /**
+      * Refreshes the network meta with EIP-1559 support and the network status
diff --git a/lavamoat/browserify/beta/policy.json b/lavamoat/browserify/beta/policy.json
index 77c0940ef550..eae2b15640e3 100644
--- a/lavamoat/browserify/beta/policy.json
+++ b/lavamoat/browserify/beta/policy.json
@@ -675,13 +675,13 @@
         "@ethersproject/contracts": true,
         "@ethersproject/providers": true,
         "@metamask/abi-utils": true,
-        "@metamask/assets-controllers>@metamask/polling-controller": true,
         "@metamask/base-controller": true,
         "@metamask/contract-metadata": true,
         "@metamask/controller-utils": true,
         "@metamask/eth-query": true,
         "@metamask/metamask-eth-abis": true,
         "@metamask/name-controller>async-mutex": true,
+        "@metamask/polling-controller": true,
         "@metamask/rpc-errors": true,
         "@metamask/utils": true,
         "bn.js": true,
@@ -692,18 +692,6 @@
         "uuid": true
       }
     },
-    "@metamask/assets-controllers>@metamask/polling-controller": {
-      "globals": {
-        "clearTimeout": true,
-        "console.error": true,
-        "setTimeout": true
-      },
-      "packages": {
-        "@metamask/base-controller": true,
-        "@metamask/snaps-utils>fast-json-stable-stringify": true,
-        "uuid": true
-      }
-    },
     "@metamask/base-controller": {
       "globals": {
         "setTimeout": true
@@ -796,25 +784,10 @@
         "@ethersproject/providers": true,
         "@metamask/base-controller": true,
         "@metamask/controller-utils": true,
-        "@metamask/ens-controller>@metamask/utils": true,
+        "@metamask/utils": true,
         "punycode": true
       }
     },
-    "@metamask/ens-controller>@metamask/utils": {
-      "globals": {
-        "TextDecoder": true,
-        "TextEncoder": true
-      },
-      "packages": {
-        "@metamask/utils>@metamask/superstruct": true,
-        "@metamask/utils>@scure/base": true,
-        "@metamask/utils>pony-cause": true,
-        "@noble/hashes": true,
-        "browserify>buffer": true,
-        "nock>debug": true,
-        "semver": true
-      }
-    },
     "@metamask/eth-json-rpc-filters": {
       "globals": {
         "console.error": true
@@ -1737,54 +1710,34 @@
       "packages": {
         "@metamask/base-controller": true,
         "@metamask/controller-utils": true,
+        "@metamask/eth-json-rpc-middleware": true,
         "@metamask/eth-json-rpc-provider": true,
         "@metamask/eth-query": true,
-        "@metamask/eth-token-tracker>@metamask/eth-block-tracker": true,
+        "@metamask/json-rpc-engine": true,
+        "@metamask/network-controller>@metamask/eth-block-tracker": true,
         "@metamask/network-controller>@metamask/eth-json-rpc-infura": true,
-        "@metamask/network-controller>@metamask/eth-json-rpc-middleware": true,
-        "@metamask/network-controller>@metamask/json-rpc-engine": true,
-        "@metamask/network-controller>@metamask/rpc-errors": true,
         "@metamask/network-controller>@metamask/swappable-obj-proxy": true,
-        "@metamask/network-controller>@metamask/utils": true,
         "@metamask/network-controller>reselect": true,
-        "browserify>assert": true,
-        "browserify>util": true,
+        "@metamask/rpc-errors": true,
+        "@metamask/utils": true,
+        "eslint>fast-deep-equal": true,
         "uri-js": true,
         "uuid": true
       }
     },
-    "@metamask/network-controller>@metamask/eth-json-rpc-infura": {
+    "@metamask/network-controller>@metamask/eth-block-tracker": {
       "globals": {
+        "clearTimeout": true,
+        "console.error": true,
         "setTimeout": true
       },
       "packages": {
-        "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/eth-json-rpc-provider": true,
-        "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/json-rpc-engine": true,
-        "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/rpc-errors": true,
-        "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/utils": true,
-        "node-fetch": true
-      }
-    },
-    "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/eth-json-rpc-provider": {
-      "packages": {
-        "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/json-rpc-engine": true,
-        "@metamask/safe-event-emitter": true
-      }
-    },
-    "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/json-rpc-engine": {
-      "packages": {
-        "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/rpc-errors": true,
-        "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/utils": true,
+        "@metamask/eth-query>json-rpc-random-id": true,
+        "@metamask/network-controller>@metamask/eth-block-tracker>@metamask/utils": true,
         "@metamask/safe-event-emitter": true
       }
     },
-    "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/rpc-errors": {
-      "packages": {
-        "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/rpc-errors>@metamask/utils": true,
-        "@metamask/rpc-errors>fast-safe-stringify": true
-      }
-    },
-    "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/rpc-errors>@metamask/utils": {
+    "@metamask/network-controller>@metamask/eth-block-tracker>@metamask/utils": {
       "globals": {
         "TextDecoder": true,
         "TextEncoder": true
@@ -1799,67 +1752,19 @@
         "semver": true
       }
     },
-    "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/utils": {
-      "globals": {
-        "TextDecoder": true,
-        "TextEncoder": true
-      },
-      "packages": {
-        "@metamask/utils>@metamask/superstruct": true,
-        "@metamask/utils>@scure/base": true,
-        "@metamask/utils>pony-cause": true,
-        "@noble/hashes": true,
-        "browserify>buffer": true,
-        "nock>debug": true,
-        "semver": true
-      }
-    },
-    "@metamask/network-controller>@metamask/eth-json-rpc-middleware": {
+    "@metamask/network-controller>@metamask/eth-json-rpc-infura": {
       "globals": {
-        "URL": true,
-        "console.error": true,
+        "fetch": true,
         "setTimeout": true
       },
       "packages": {
-        "@metamask/eth-json-rpc-middleware>klona": true,
-        "@metamask/eth-json-rpc-middleware>safe-stable-stringify": true,
-        "@metamask/eth-sig-util": true,
-        "@metamask/network-controller>@metamask/eth-json-rpc-middleware>@metamask/utils": true,
-        "@metamask/network-controller>@metamask/json-rpc-engine": true,
-        "@metamask/network-controller>@metamask/rpc-errors": true,
-        "bn.js": true,
-        "pify": true
-      }
-    },
-    "@metamask/network-controller>@metamask/eth-json-rpc-middleware>@metamask/utils": {
-      "globals": {
-        "TextDecoder": true,
-        "TextEncoder": true
-      },
-      "packages": {
-        "@metamask/utils>@metamask/superstruct": true,
-        "@metamask/utils>@scure/base": true,
-        "@metamask/utils>pony-cause": true,
-        "@noble/hashes": true,
-        "browserify>buffer": true,
-        "nock>debug": true,
-        "semver": true
-      }
-    },
-    "@metamask/network-controller>@metamask/json-rpc-engine": {
-      "packages": {
-        "@metamask/network-controller>@metamask/rpc-errors": true,
-        "@metamask/network-controller>@metamask/utils": true,
-        "@metamask/safe-event-emitter": true
-      }
-    },
-    "@metamask/network-controller>@metamask/rpc-errors": {
-      "packages": {
-        "@metamask/network-controller>@metamask/utils": true,
-        "@metamask/rpc-errors>fast-safe-stringify": true
+        "@metamask/eth-json-rpc-provider": true,
+        "@metamask/json-rpc-engine": true,
+        "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/utils": true,
+        "@metamask/rpc-errors": true
       }
     },
-    "@metamask/network-controller>@metamask/utils": {
+    "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/utils": {
       "globals": {
         "TextDecoder": true,
         "TextEncoder": true
@@ -2445,9 +2350,9 @@
         "@ethersproject/bytes": true,
         "@metamask/controller-utils": true,
         "@metamask/eth-query": true,
+        "@metamask/polling-controller": true,
         "@metamask/smart-transactions-controller>@ethereumjs/tx": true,
         "@metamask/smart-transactions-controller>@ethereumjs/util": true,
-        "@metamask/smart-transactions-controller>@metamask/polling-controller": true,
         "@metamask/smart-transactions-controller>bignumber.js": true,
         "@metamask/transaction-controller": true,
         "browserify>buffer": true,
@@ -2479,18 +2384,6 @@
         "crypto.getRandomValues": true
       }
     },
-    "@metamask/smart-transactions-controller>@metamask/polling-controller": {
-      "globals": {
-        "clearTimeout": true,
-        "console.error": true,
-        "setTimeout": true
-      },
-      "packages": {
-        "@metamask/base-controller": true,
-        "@metamask/snaps-utils>fast-json-stable-stringify": true,
-        "uuid": true
-      }
-    },
     "@metamask/smart-transactions-controller>bignumber.js": {
       "globals": {
         "crypto": true,
@@ -2793,7 +2686,7 @@
         "@metamask/polling-controller": true,
         "@metamask/rpc-errors": true,
         "@metamask/transaction-controller": true,
-        "@metamask/user-operation-controller>@metamask/utils": true,
+        "@metamask/utils": true,
         "@metamask/utils>@metamask/superstruct": true,
         "bn.js": true,
         "lodash": true,
@@ -2801,21 +2694,6 @@
         "webpack>events": true
       }
     },
-    "@metamask/user-operation-controller>@metamask/utils": {
-      "globals": {
-        "TextDecoder": true,
-        "TextEncoder": true
-      },
-      "packages": {
-        "@metamask/utils>@metamask/superstruct": true,
-        "@metamask/utils>@scure/base": true,
-        "@metamask/utils>pony-cause": true,
-        "@noble/hashes": true,
-        "browserify>buffer": true,
-        "nock>debug": true,
-        "semver": true
-      }
-    },
     "@metamask/utils": {
       "globals": {
         "TextDecoder": true,
diff --git a/lavamoat/browserify/flask/policy.json b/lavamoat/browserify/flask/policy.json
index 77c0940ef550..eae2b15640e3 100644
--- a/lavamoat/browserify/flask/policy.json
+++ b/lavamoat/browserify/flask/policy.json
@@ -675,13 +675,13 @@
         "@ethersproject/contracts": true,
         "@ethersproject/providers": true,
         "@metamask/abi-utils": true,
-        "@metamask/assets-controllers>@metamask/polling-controller": true,
         "@metamask/base-controller": true,
         "@metamask/contract-metadata": true,
         "@metamask/controller-utils": true,
         "@metamask/eth-query": true,
         "@metamask/metamask-eth-abis": true,
         "@metamask/name-controller>async-mutex": true,
+        "@metamask/polling-controller": true,
         "@metamask/rpc-errors": true,
         "@metamask/utils": true,
         "bn.js": true,
@@ -692,18 +692,6 @@
         "uuid": true
       }
     },
-    "@metamask/assets-controllers>@metamask/polling-controller": {
-      "globals": {
-        "clearTimeout": true,
-        "console.error": true,
-        "setTimeout": true
-      },
-      "packages": {
-        "@metamask/base-controller": true,
-        "@metamask/snaps-utils>fast-json-stable-stringify": true,
-        "uuid": true
-      }
-    },
     "@metamask/base-controller": {
       "globals": {
         "setTimeout": true
@@ -796,25 +784,10 @@
         "@ethersproject/providers": true,
         "@metamask/base-controller": true,
         "@metamask/controller-utils": true,
-        "@metamask/ens-controller>@metamask/utils": true,
+        "@metamask/utils": true,
         "punycode": true
       }
     },
-    "@metamask/ens-controller>@metamask/utils": {
-      "globals": {
-        "TextDecoder": true,
-        "TextEncoder": true
-      },
-      "packages": {
-        "@metamask/utils>@metamask/superstruct": true,
-        "@metamask/utils>@scure/base": true,
-        "@metamask/utils>pony-cause": true,
-        "@noble/hashes": true,
-        "browserify>buffer": true,
-        "nock>debug": true,
-        "semver": true
-      }
-    },
     "@metamask/eth-json-rpc-filters": {
       "globals": {
         "console.error": true
@@ -1737,54 +1710,34 @@
       "packages": {
         "@metamask/base-controller": true,
         "@metamask/controller-utils": true,
+        "@metamask/eth-json-rpc-middleware": true,
         "@metamask/eth-json-rpc-provider": true,
         "@metamask/eth-query": true,
-        "@metamask/eth-token-tracker>@metamask/eth-block-tracker": true,
+        "@metamask/json-rpc-engine": true,
+        "@metamask/network-controller>@metamask/eth-block-tracker": true,
         "@metamask/network-controller>@metamask/eth-json-rpc-infura": true,
-        "@metamask/network-controller>@metamask/eth-json-rpc-middleware": true,
-        "@metamask/network-controller>@metamask/json-rpc-engine": true,
-        "@metamask/network-controller>@metamask/rpc-errors": true,
         "@metamask/network-controller>@metamask/swappable-obj-proxy": true,
-        "@metamask/network-controller>@metamask/utils": true,
         "@metamask/network-controller>reselect": true,
-        "browserify>assert": true,
-        "browserify>util": true,
+        "@metamask/rpc-errors": true,
+        "@metamask/utils": true,
+        "eslint>fast-deep-equal": true,
         "uri-js": true,
         "uuid": true
       }
     },
-    "@metamask/network-controller>@metamask/eth-json-rpc-infura": {
+    "@metamask/network-controller>@metamask/eth-block-tracker": {
       "globals": {
+        "clearTimeout": true,
+        "console.error": true,
         "setTimeout": true
       },
       "packages": {
-        "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/eth-json-rpc-provider": true,
-        "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/json-rpc-engine": true,
-        "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/rpc-errors": true,
-        "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/utils": true,
-        "node-fetch": true
-      }
-    },
-    "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/eth-json-rpc-provider": {
-      "packages": {
-        "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/json-rpc-engine": true,
-        "@metamask/safe-event-emitter": true
-      }
-    },
-    "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/json-rpc-engine": {
-      "packages": {
-        "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/rpc-errors": true,
-        "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/utils": true,
+        "@metamask/eth-query>json-rpc-random-id": true,
+        "@metamask/network-controller>@metamask/eth-block-tracker>@metamask/utils": true,
         "@metamask/safe-event-emitter": true
       }
     },
-    "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/rpc-errors": {
-      "packages": {
-        "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/rpc-errors>@metamask/utils": true,
-        "@metamask/rpc-errors>fast-safe-stringify": true
-      }
-    },
-    "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/rpc-errors>@metamask/utils": {
+    "@metamask/network-controller>@metamask/eth-block-tracker>@metamask/utils": {
       "globals": {
         "TextDecoder": true,
         "TextEncoder": true
@@ -1799,67 +1752,19 @@
         "semver": true
       }
     },
-    "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/utils": {
-      "globals": {
-        "TextDecoder": true,
-        "TextEncoder": true
-      },
-      "packages": {
-        "@metamask/utils>@metamask/superstruct": true,
-        "@metamask/utils>@scure/base": true,
-        "@metamask/utils>pony-cause": true,
-        "@noble/hashes": true,
-        "browserify>buffer": true,
-        "nock>debug": true,
-        "semver": true
-      }
-    },
-    "@metamask/network-controller>@metamask/eth-json-rpc-middleware": {
+    "@metamask/network-controller>@metamask/eth-json-rpc-infura": {
       "globals": {
-        "URL": true,
-        "console.error": true,
+        "fetch": true,
         "setTimeout": true
       },
       "packages": {
-        "@metamask/eth-json-rpc-middleware>klona": true,
-        "@metamask/eth-json-rpc-middleware>safe-stable-stringify": true,
-        "@metamask/eth-sig-util": true,
-        "@metamask/network-controller>@metamask/eth-json-rpc-middleware>@metamask/utils": true,
-        "@metamask/network-controller>@metamask/json-rpc-engine": true,
-        "@metamask/network-controller>@metamask/rpc-errors": true,
-        "bn.js": true,
-        "pify": true
-      }
-    },
-    "@metamask/network-controller>@metamask/eth-json-rpc-middleware>@metamask/utils": {
-      "globals": {
-        "TextDecoder": true,
-        "TextEncoder": true
-      },
-      "packages": {
-        "@metamask/utils>@metamask/superstruct": true,
-        "@metamask/utils>@scure/base": true,
-        "@metamask/utils>pony-cause": true,
-        "@noble/hashes": true,
-        "browserify>buffer": true,
-        "nock>debug": true,
-        "semver": true
-      }
-    },
-    "@metamask/network-controller>@metamask/json-rpc-engine": {
-      "packages": {
-        "@metamask/network-controller>@metamask/rpc-errors": true,
-        "@metamask/network-controller>@metamask/utils": true,
-        "@metamask/safe-event-emitter": true
-      }
-    },
-    "@metamask/network-controller>@metamask/rpc-errors": {
-      "packages": {
-        "@metamask/network-controller>@metamask/utils": true,
-        "@metamask/rpc-errors>fast-safe-stringify": true
+        "@metamask/eth-json-rpc-provider": true,
+        "@metamask/json-rpc-engine": true,
+        "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/utils": true,
+        "@metamask/rpc-errors": true
       }
     },
-    "@metamask/network-controller>@metamask/utils": {
+    "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/utils": {
       "globals": {
         "TextDecoder": true,
         "TextEncoder": true
@@ -2445,9 +2350,9 @@
         "@ethersproject/bytes": true,
         "@metamask/controller-utils": true,
         "@metamask/eth-query": true,
+        "@metamask/polling-controller": true,
         "@metamask/smart-transactions-controller>@ethereumjs/tx": true,
         "@metamask/smart-transactions-controller>@ethereumjs/util": true,
-        "@metamask/smart-transactions-controller>@metamask/polling-controller": true,
         "@metamask/smart-transactions-controller>bignumber.js": true,
         "@metamask/transaction-controller": true,
         "browserify>buffer": true,
@@ -2479,18 +2384,6 @@
         "crypto.getRandomValues": true
       }
     },
-    "@metamask/smart-transactions-controller>@metamask/polling-controller": {
-      "globals": {
-        "clearTimeout": true,
-        "console.error": true,
-        "setTimeout": true
-      },
-      "packages": {
-        "@metamask/base-controller": true,
-        "@metamask/snaps-utils>fast-json-stable-stringify": true,
-        "uuid": true
-      }
-    },
     "@metamask/smart-transactions-controller>bignumber.js": {
       "globals": {
         "crypto": true,
@@ -2793,7 +2686,7 @@
         "@metamask/polling-controller": true,
         "@metamask/rpc-errors": true,
         "@metamask/transaction-controller": true,
-        "@metamask/user-operation-controller>@metamask/utils": true,
+        "@metamask/utils": true,
         "@metamask/utils>@metamask/superstruct": true,
         "bn.js": true,
         "lodash": true,
@@ -2801,21 +2694,6 @@
         "webpack>events": true
       }
     },
-    "@metamask/user-operation-controller>@metamask/utils": {
-      "globals": {
-        "TextDecoder": true,
-        "TextEncoder": true
-      },
-      "packages": {
-        "@metamask/utils>@metamask/superstruct": true,
-        "@metamask/utils>@scure/base": true,
-        "@metamask/utils>pony-cause": true,
-        "@noble/hashes": true,
-        "browserify>buffer": true,
-        "nock>debug": true,
-        "semver": true
-      }
-    },
     "@metamask/utils": {
       "globals": {
         "TextDecoder": true,
diff --git a/lavamoat/browserify/main/policy.json b/lavamoat/browserify/main/policy.json
index 77c0940ef550..eae2b15640e3 100644
--- a/lavamoat/browserify/main/policy.json
+++ b/lavamoat/browserify/main/policy.json
@@ -675,13 +675,13 @@
         "@ethersproject/contracts": true,
         "@ethersproject/providers": true,
         "@metamask/abi-utils": true,
-        "@metamask/assets-controllers>@metamask/polling-controller": true,
         "@metamask/base-controller": true,
         "@metamask/contract-metadata": true,
         "@metamask/controller-utils": true,
         "@metamask/eth-query": true,
         "@metamask/metamask-eth-abis": true,
         "@metamask/name-controller>async-mutex": true,
+        "@metamask/polling-controller": true,
         "@metamask/rpc-errors": true,
         "@metamask/utils": true,
         "bn.js": true,
@@ -692,18 +692,6 @@
         "uuid": true
       }
     },
-    "@metamask/assets-controllers>@metamask/polling-controller": {
-      "globals": {
-        "clearTimeout": true,
-        "console.error": true,
-        "setTimeout": true
-      },
-      "packages": {
-        "@metamask/base-controller": true,
-        "@metamask/snaps-utils>fast-json-stable-stringify": true,
-        "uuid": true
-      }
-    },
     "@metamask/base-controller": {
       "globals": {
         "setTimeout": true
@@ -796,25 +784,10 @@
         "@ethersproject/providers": true,
         "@metamask/base-controller": true,
         "@metamask/controller-utils": true,
-        "@metamask/ens-controller>@metamask/utils": true,
+        "@metamask/utils": true,
         "punycode": true
       }
     },
-    "@metamask/ens-controller>@metamask/utils": {
-      "globals": {
-        "TextDecoder": true,
-        "TextEncoder": true
-      },
-      "packages": {
-        "@metamask/utils>@metamask/superstruct": true,
-        "@metamask/utils>@scure/base": true,
-        "@metamask/utils>pony-cause": true,
-        "@noble/hashes": true,
-        "browserify>buffer": true,
-        "nock>debug": true,
-        "semver": true
-      }
-    },
     "@metamask/eth-json-rpc-filters": {
       "globals": {
         "console.error": true
@@ -1737,54 +1710,34 @@
       "packages": {
         "@metamask/base-controller": true,
         "@metamask/controller-utils": true,
+        "@metamask/eth-json-rpc-middleware": true,
         "@metamask/eth-json-rpc-provider": true,
         "@metamask/eth-query": true,
-        "@metamask/eth-token-tracker>@metamask/eth-block-tracker": true,
+        "@metamask/json-rpc-engine": true,
+        "@metamask/network-controller>@metamask/eth-block-tracker": true,
         "@metamask/network-controller>@metamask/eth-json-rpc-infura": true,
-        "@metamask/network-controller>@metamask/eth-json-rpc-middleware": true,
-        "@metamask/network-controller>@metamask/json-rpc-engine": true,
-        "@metamask/network-controller>@metamask/rpc-errors": true,
         "@metamask/network-controller>@metamask/swappable-obj-proxy": true,
-        "@metamask/network-controller>@metamask/utils": true,
         "@metamask/network-controller>reselect": true,
-        "browserify>assert": true,
-        "browserify>util": true,
+        "@metamask/rpc-errors": true,
+        "@metamask/utils": true,
+        "eslint>fast-deep-equal": true,
         "uri-js": true,
         "uuid": true
       }
     },
-    "@metamask/network-controller>@metamask/eth-json-rpc-infura": {
+    "@metamask/network-controller>@metamask/eth-block-tracker": {
       "globals": {
+        "clearTimeout": true,
+        "console.error": true,
         "setTimeout": true
       },
       "packages": {
-        "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/eth-json-rpc-provider": true,
-        "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/json-rpc-engine": true,
-        "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/rpc-errors": true,
-        "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/utils": true,
-        "node-fetch": true
-      }
-    },
-    "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/eth-json-rpc-provider": {
-      "packages": {
-        "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/json-rpc-engine": true,
-        "@metamask/safe-event-emitter": true
-      }
-    },
-    "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/json-rpc-engine": {
-      "packages": {
-        "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/rpc-errors": true,
-        "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/utils": true,
+        "@metamask/eth-query>json-rpc-random-id": true,
+        "@metamask/network-controller>@metamask/eth-block-tracker>@metamask/utils": true,
         "@metamask/safe-event-emitter": true
       }
     },
-    "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/rpc-errors": {
-      "packages": {
-        "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/rpc-errors>@metamask/utils": true,
-        "@metamask/rpc-errors>fast-safe-stringify": true
-      }
-    },
-    "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/rpc-errors>@metamask/utils": {
+    "@metamask/network-controller>@metamask/eth-block-tracker>@metamask/utils": {
       "globals": {
         "TextDecoder": true,
         "TextEncoder": true
@@ -1799,67 +1752,19 @@
         "semver": true
       }
     },
-    "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/utils": {
-      "globals": {
-        "TextDecoder": true,
-        "TextEncoder": true
-      },
-      "packages": {
-        "@metamask/utils>@metamask/superstruct": true,
-        "@metamask/utils>@scure/base": true,
-        "@metamask/utils>pony-cause": true,
-        "@noble/hashes": true,
-        "browserify>buffer": true,
-        "nock>debug": true,
-        "semver": true
-      }
-    },
-    "@metamask/network-controller>@metamask/eth-json-rpc-middleware": {
+    "@metamask/network-controller>@metamask/eth-json-rpc-infura": {
       "globals": {
-        "URL": true,
-        "console.error": true,
+        "fetch": true,
         "setTimeout": true
       },
       "packages": {
-        "@metamask/eth-json-rpc-middleware>klona": true,
-        "@metamask/eth-json-rpc-middleware>safe-stable-stringify": true,
-        "@metamask/eth-sig-util": true,
-        "@metamask/network-controller>@metamask/eth-json-rpc-middleware>@metamask/utils": true,
-        "@metamask/network-controller>@metamask/json-rpc-engine": true,
-        "@metamask/network-controller>@metamask/rpc-errors": true,
-        "bn.js": true,
-        "pify": true
-      }
-    },
-    "@metamask/network-controller>@metamask/eth-json-rpc-middleware>@metamask/utils": {
-      "globals": {
-        "TextDecoder": true,
-        "TextEncoder": true
-      },
-      "packages": {
-        "@metamask/utils>@metamask/superstruct": true,
-        "@metamask/utils>@scure/base": true,
-        "@metamask/utils>pony-cause": true,
-        "@noble/hashes": true,
-        "browserify>buffer": true,
-        "nock>debug": true,
-        "semver": true
-      }
-    },
-    "@metamask/network-controller>@metamask/json-rpc-engine": {
-      "packages": {
-        "@metamask/network-controller>@metamask/rpc-errors": true,
-        "@metamask/network-controller>@metamask/utils": true,
-        "@metamask/safe-event-emitter": true
-      }
-    },
-    "@metamask/network-controller>@metamask/rpc-errors": {
-      "packages": {
-        "@metamask/network-controller>@metamask/utils": true,
-        "@metamask/rpc-errors>fast-safe-stringify": true
+        "@metamask/eth-json-rpc-provider": true,
+        "@metamask/json-rpc-engine": true,
+        "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/utils": true,
+        "@metamask/rpc-errors": true
       }
     },
-    "@metamask/network-controller>@metamask/utils": {
+    "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/utils": {
       "globals": {
         "TextDecoder": true,
         "TextEncoder": true
@@ -2445,9 +2350,9 @@
         "@ethersproject/bytes": true,
         "@metamask/controller-utils": true,
         "@metamask/eth-query": true,
+        "@metamask/polling-controller": true,
         "@metamask/smart-transactions-controller>@ethereumjs/tx": true,
         "@metamask/smart-transactions-controller>@ethereumjs/util": true,
-        "@metamask/smart-transactions-controller>@metamask/polling-controller": true,
         "@metamask/smart-transactions-controller>bignumber.js": true,
         "@metamask/transaction-controller": true,
         "browserify>buffer": true,
@@ -2479,18 +2384,6 @@
         "crypto.getRandomValues": true
       }
     },
-    "@metamask/smart-transactions-controller>@metamask/polling-controller": {
-      "globals": {
-        "clearTimeout": true,
-        "console.error": true,
-        "setTimeout": true
-      },
-      "packages": {
-        "@metamask/base-controller": true,
-        "@metamask/snaps-utils>fast-json-stable-stringify": true,
-        "uuid": true
-      }
-    },
     "@metamask/smart-transactions-controller>bignumber.js": {
       "globals": {
         "crypto": true,
@@ -2793,7 +2686,7 @@
         "@metamask/polling-controller": true,
         "@metamask/rpc-errors": true,
         "@metamask/transaction-controller": true,
-        "@metamask/user-operation-controller>@metamask/utils": true,
+        "@metamask/utils": true,
         "@metamask/utils>@metamask/superstruct": true,
         "bn.js": true,
         "lodash": true,
@@ -2801,21 +2694,6 @@
         "webpack>events": true
       }
     },
-    "@metamask/user-operation-controller>@metamask/utils": {
-      "globals": {
-        "TextDecoder": true,
-        "TextEncoder": true
-      },
-      "packages": {
-        "@metamask/utils>@metamask/superstruct": true,
-        "@metamask/utils>@scure/base": true,
-        "@metamask/utils>pony-cause": true,
-        "@noble/hashes": true,
-        "browserify>buffer": true,
-        "nock>debug": true,
-        "semver": true
-      }
-    },
     "@metamask/utils": {
       "globals": {
         "TextDecoder": true,
diff --git a/lavamoat/browserify/mmi/policy.json b/lavamoat/browserify/mmi/policy.json
index 142c348220e3..70019837e27e 100644
--- a/lavamoat/browserify/mmi/policy.json
+++ b/lavamoat/browserify/mmi/policy.json
@@ -767,13 +767,13 @@
         "@ethersproject/contracts": true,
         "@ethersproject/providers": true,
         "@metamask/abi-utils": true,
-        "@metamask/assets-controllers>@metamask/polling-controller": true,
         "@metamask/base-controller": true,
         "@metamask/contract-metadata": true,
         "@metamask/controller-utils": true,
         "@metamask/eth-query": true,
         "@metamask/metamask-eth-abis": true,
         "@metamask/name-controller>async-mutex": true,
+        "@metamask/polling-controller": true,
         "@metamask/rpc-errors": true,
         "@metamask/utils": true,
         "bn.js": true,
@@ -784,18 +784,6 @@
         "uuid": true
       }
     },
-    "@metamask/assets-controllers>@metamask/polling-controller": {
-      "globals": {
-        "clearTimeout": true,
-        "console.error": true,
-        "setTimeout": true
-      },
-      "packages": {
-        "@metamask/base-controller": true,
-        "@metamask/snaps-utils>fast-json-stable-stringify": true,
-        "uuid": true
-      }
-    },
     "@metamask/base-controller": {
       "globals": {
         "setTimeout": true
@@ -888,25 +876,10 @@
         "@ethersproject/providers": true,
         "@metamask/base-controller": true,
         "@metamask/controller-utils": true,
-        "@metamask/ens-controller>@metamask/utils": true,
+        "@metamask/utils": true,
         "punycode": true
       }
     },
-    "@metamask/ens-controller>@metamask/utils": {
-      "globals": {
-        "TextDecoder": true,
-        "TextEncoder": true
-      },
-      "packages": {
-        "@metamask/utils>@metamask/superstruct": true,
-        "@metamask/utils>@scure/base": true,
-        "@metamask/utils>pony-cause": true,
-        "@noble/hashes": true,
-        "browserify>buffer": true,
-        "nock>debug": true,
-        "semver": true
-      }
-    },
     "@metamask/eth-json-rpc-filters": {
       "globals": {
         "console.error": true
@@ -1829,54 +1802,34 @@
       "packages": {
         "@metamask/base-controller": true,
         "@metamask/controller-utils": true,
+        "@metamask/eth-json-rpc-middleware": true,
         "@metamask/eth-json-rpc-provider": true,
         "@metamask/eth-query": true,
-        "@metamask/eth-token-tracker>@metamask/eth-block-tracker": true,
+        "@metamask/json-rpc-engine": true,
+        "@metamask/network-controller>@metamask/eth-block-tracker": true,
         "@metamask/network-controller>@metamask/eth-json-rpc-infura": true,
-        "@metamask/network-controller>@metamask/eth-json-rpc-middleware": true,
-        "@metamask/network-controller>@metamask/json-rpc-engine": true,
-        "@metamask/network-controller>@metamask/rpc-errors": true,
         "@metamask/network-controller>@metamask/swappable-obj-proxy": true,
-        "@metamask/network-controller>@metamask/utils": true,
         "@metamask/network-controller>reselect": true,
-        "browserify>assert": true,
-        "browserify>util": true,
+        "@metamask/rpc-errors": true,
+        "@metamask/utils": true,
+        "eslint>fast-deep-equal": true,
         "uri-js": true,
         "uuid": true
       }
     },
-    "@metamask/network-controller>@metamask/eth-json-rpc-infura": {
+    "@metamask/network-controller>@metamask/eth-block-tracker": {
       "globals": {
+        "clearTimeout": true,
+        "console.error": true,
         "setTimeout": true
       },
       "packages": {
-        "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/eth-json-rpc-provider": true,
-        "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/json-rpc-engine": true,
-        "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/rpc-errors": true,
-        "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/utils": true,
-        "node-fetch": true
-      }
-    },
-    "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/eth-json-rpc-provider": {
-      "packages": {
-        "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/json-rpc-engine": true,
-        "@metamask/safe-event-emitter": true
-      }
-    },
-    "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/json-rpc-engine": {
-      "packages": {
-        "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/rpc-errors": true,
-        "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/utils": true,
+        "@metamask/eth-query>json-rpc-random-id": true,
+        "@metamask/network-controller>@metamask/eth-block-tracker>@metamask/utils": true,
         "@metamask/safe-event-emitter": true
       }
     },
-    "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/rpc-errors": {
-      "packages": {
-        "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/rpc-errors>@metamask/utils": true,
-        "@metamask/rpc-errors>fast-safe-stringify": true
-      }
-    },
-    "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/rpc-errors>@metamask/utils": {
+    "@metamask/network-controller>@metamask/eth-block-tracker>@metamask/utils": {
       "globals": {
         "TextDecoder": true,
         "TextEncoder": true
@@ -1891,67 +1844,19 @@
         "semver": true
       }
     },
-    "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/utils": {
-      "globals": {
-        "TextDecoder": true,
-        "TextEncoder": true
-      },
-      "packages": {
-        "@metamask/utils>@metamask/superstruct": true,
-        "@metamask/utils>@scure/base": true,
-        "@metamask/utils>pony-cause": true,
-        "@noble/hashes": true,
-        "browserify>buffer": true,
-        "nock>debug": true,
-        "semver": true
-      }
-    },
-    "@metamask/network-controller>@metamask/eth-json-rpc-middleware": {
+    "@metamask/network-controller>@metamask/eth-json-rpc-infura": {
       "globals": {
-        "URL": true,
-        "console.error": true,
+        "fetch": true,
         "setTimeout": true
       },
       "packages": {
-        "@metamask/eth-json-rpc-middleware>klona": true,
-        "@metamask/eth-json-rpc-middleware>safe-stable-stringify": true,
-        "@metamask/eth-sig-util": true,
-        "@metamask/network-controller>@metamask/eth-json-rpc-middleware>@metamask/utils": true,
-        "@metamask/network-controller>@metamask/json-rpc-engine": true,
-        "@metamask/network-controller>@metamask/rpc-errors": true,
-        "bn.js": true,
-        "pify": true
-      }
-    },
-    "@metamask/network-controller>@metamask/eth-json-rpc-middleware>@metamask/utils": {
-      "globals": {
-        "TextDecoder": true,
-        "TextEncoder": true
-      },
-      "packages": {
-        "@metamask/utils>@metamask/superstruct": true,
-        "@metamask/utils>@scure/base": true,
-        "@metamask/utils>pony-cause": true,
-        "@noble/hashes": true,
-        "browserify>buffer": true,
-        "nock>debug": true,
-        "semver": true
-      }
-    },
-    "@metamask/network-controller>@metamask/json-rpc-engine": {
-      "packages": {
-        "@metamask/network-controller>@metamask/rpc-errors": true,
-        "@metamask/network-controller>@metamask/utils": true,
-        "@metamask/safe-event-emitter": true
-      }
-    },
-    "@metamask/network-controller>@metamask/rpc-errors": {
-      "packages": {
-        "@metamask/network-controller>@metamask/utils": true,
-        "@metamask/rpc-errors>fast-safe-stringify": true
+        "@metamask/eth-json-rpc-provider": true,
+        "@metamask/json-rpc-engine": true,
+        "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/utils": true,
+        "@metamask/rpc-errors": true
       }
     },
-    "@metamask/network-controller>@metamask/utils": {
+    "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/utils": {
       "globals": {
         "TextDecoder": true,
         "TextEncoder": true
@@ -2537,9 +2442,9 @@
         "@ethersproject/bytes": true,
         "@metamask/controller-utils": true,
         "@metamask/eth-query": true,
+        "@metamask/polling-controller": true,
         "@metamask/smart-transactions-controller>@ethereumjs/tx": true,
         "@metamask/smart-transactions-controller>@ethereumjs/util": true,
-        "@metamask/smart-transactions-controller>@metamask/polling-controller": true,
         "@metamask/smart-transactions-controller>bignumber.js": true,
         "@metamask/transaction-controller": true,
         "browserify>buffer": true,
@@ -2571,18 +2476,6 @@
         "crypto.getRandomValues": true
       }
     },
-    "@metamask/smart-transactions-controller>@metamask/polling-controller": {
-      "globals": {
-        "clearTimeout": true,
-        "console.error": true,
-        "setTimeout": true
-      },
-      "packages": {
-        "@metamask/base-controller": true,
-        "@metamask/snaps-utils>fast-json-stable-stringify": true,
-        "uuid": true
-      }
-    },
     "@metamask/smart-transactions-controller>bignumber.js": {
       "globals": {
         "crypto": true,
@@ -2885,7 +2778,7 @@
         "@metamask/polling-controller": true,
         "@metamask/rpc-errors": true,
         "@metamask/transaction-controller": true,
-        "@metamask/user-operation-controller>@metamask/utils": true,
+        "@metamask/utils": true,
         "@metamask/utils>@metamask/superstruct": true,
         "bn.js": true,
         "lodash": true,
@@ -2893,21 +2786,6 @@
         "webpack>events": true
       }
     },
-    "@metamask/user-operation-controller>@metamask/utils": {
-      "globals": {
-        "TextDecoder": true,
-        "TextEncoder": true
-      },
-      "packages": {
-        "@metamask/utils>@metamask/superstruct": true,
-        "@metamask/utils>@scure/base": true,
-        "@metamask/utils>pony-cause": true,
-        "@noble/hashes": true,
-        "browserify>buffer": true,
-        "nock>debug": true,
-        "semver": true
-      }
-    },
     "@metamask/utils": {
       "globals": {
         "TextDecoder": true,
diff --git a/package.json b/package.json
index 1b30892f9616..1029f45e232d 100644
--- a/package.json
+++ b/package.json
@@ -242,9 +242,8 @@
     "@expo/config-plugins/glob": "^10.3.10",
     "@solana/web3.js/rpc-websockets": "^8.0.1",
     "@metamask/nonce-tracker@npm:^5.0.0": "patch:@metamask/nonce-tracker@npm%3A5.0.0#~/.yarn/patches/@metamask-nonce-tracker-npm-5.0.0-d81478218e.patch",
-    "@metamask/network-controller@npm:^17.0.0": "patch:@metamask/network-controller@npm%3A21.0.0#~/.yarn/patches/@metamask-network-controller-npm-21.0.0-559aa8e395.patch",
-    "@metamask/network-controller@npm:^19.0.0": "patch:@metamask/network-controller@npm%3A21.0.0#~/.yarn/patches/@metamask-network-controller-npm-21.0.0-559aa8e395.patch",
-    "@metamask/network-controller@npm:^20.0.0": "patch:@metamask/network-controller@npm%3A21.0.0#~/.yarn/patches/@metamask-network-controller-npm-21.0.0-559aa8e395.patch",
+    "@metamask/network-controller@npm:^21.0.0": "patch:@metamask/network-controller@npm%3A22.0.2#~/.yarn/patches/@metamask-network-controller-npm-22.0.2-6fc65c500a.patch",
+    "@metamask/network-controller@npm:^22.0.0": "patch:@metamask/network-controller@npm%3A22.1.0#~/.yarn/patches/@metamask-network-controller-npm-22.1.0-621c281f70.patch",
     "path-to-regexp": "1.9.0",
     "@ledgerhq/cryptoassets-evm-signatures/axios": "^0.28.0",
     "@ledgerhq/domain-service/axios": "^0.28.0",
@@ -296,7 +295,7 @@
     "@metamask/contract-metadata": "^2.5.0",
     "@metamask/controller-utils": "^11.4.0",
     "@metamask/design-tokens": "^4.0.0",
-    "@metamask/ens-controller": "^14.0.0",
+    "@metamask/ens-controller": "^15.0.0",
     "@metamask/ens-resolver-snap": "^0.1.2",
     "@metamask/eth-json-rpc-filters": "^9.0.0",
     "@metamask/eth-json-rpc-middleware": "^15.0.0",
@@ -310,7 +309,7 @@
     "@metamask/ethjs": "^0.6.0",
     "@metamask/ethjs-contract": "^0.4.1",
     "@metamask/ethjs-query": "^0.7.1",
-    "@metamask/gas-fee-controller": "^21.0.0",
+    "@metamask/gas-fee-controller": "^22.0.1",
     "@metamask/jazzicon": "^2.0.0",
     "@metamask/json-rpc-engine": "^10.0.0",
     "@metamask/json-rpc-middleware-stream": "^8.0.4",
@@ -322,14 +321,14 @@
     "@metamask/message-signing-snap": "^0.4.0",
     "@metamask/metamask-eth-abis": "^3.1.1",
     "@metamask/name-controller": "^8.0.0",
-    "@metamask/network-controller": "patch:@metamask/network-controller@npm%3A21.0.0#~/.yarn/patches/@metamask-network-controller-npm-21.0.0-559aa8e395.patch",
+    "@metamask/network-controller": "patch:@metamask/network-controller@npm%3A22.1.0#~/.yarn/patches/@metamask-network-controller-npm-22.1.0-621c281f70.patch",
     "@metamask/notification-services-controller": "^0.14.0",
     "@metamask/object-multiplex": "^2.0.0",
     "@metamask/obs-store": "^9.0.0",
     "@metamask/permission-controller": "^11.0.0",
     "@metamask/permission-log-controller": "^3.0.1",
     "@metamask/phishing-controller": "^12.3.0",
-    "@metamask/polling-controller": "^11.0.0",
+    "@metamask/polling-controller": "^12.0.1",
     "@metamask/post-message-stream": "^8.0.0",
     "@metamask/ppom-validator": "0.35.1",
     "@metamask/preinstalled-example-snap": "^0.2.0",
@@ -341,7 +340,7 @@
     "@metamask/rpc-errors": "^7.0.0",
     "@metamask/safe-event-emitter": "^3.1.1",
     "@metamask/scure-bip39": "^2.0.3",
-    "@metamask/selected-network-controller": "^18.0.2",
+    "@metamask/selected-network-controller": "^19.0.0",
     "@metamask/signature-controller": "^23.0.0",
     "@metamask/smart-transactions-controller": "^15.0.0",
     "@metamask/snaps-controllers": "^9.14.0",
@@ -351,7 +350,7 @@
     "@metamask/snaps-utils": "^8.6.0",
     "@metamask/solana-wallet-snap": "^0.1.9",
     "@metamask/transaction-controller": "^41.0.0",
-    "@metamask/user-operation-controller": "^16.0.0",
+    "@metamask/user-operation-controller": "^19.0.0",
     "@metamask/utils": "^10.0.1",
     "@ngraveio/bc-ur": "^1.1.12",
     "@noble/hashes": "^1.3.3",
diff --git a/yarn.lock b/yarn.lock
index 57ecfaef99be..14aac38669f7 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5056,9 +5056,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/controller-utils@npm:^11.0.0, @metamask/controller-utils@npm:^11.1.0, @metamask/controller-utils@npm:^11.2.0, @metamask/controller-utils@npm:^11.3.0, @metamask/controller-utils@npm:^11.4.0, @metamask/controller-utils@npm:^11.4.1, @metamask/controller-utils@npm:^11.4.2, @metamask/controller-utils@npm:^11.4.3":
-  version: 11.4.3
-  resolution: "@metamask/controller-utils@npm:11.4.3"
+"@metamask/controller-utils@npm:^11.0.0, @metamask/controller-utils@npm:^11.1.0, @metamask/controller-utils@npm:^11.2.0, @metamask/controller-utils@npm:^11.3.0, @metamask/controller-utils@npm:^11.4.0, @metamask/controller-utils@npm:^11.4.1, @metamask/controller-utils@npm:^11.4.2, @metamask/controller-utils@npm:^11.4.3, @metamask/controller-utils@npm:^11.4.4":
+  version: 11.4.4
+  resolution: "@metamask/controller-utils@npm:11.4.4"
   dependencies:
     "@ethereumjs/util": "npm:^8.1.0"
     "@metamask/eth-query": "npm:^4.0.0"
@@ -5070,7 +5070,9 @@ __metadata:
     bn.js: "npm:^5.2.1"
     eth-ens-namehash: "npm:^2.0.8"
     fast-deep-equal: "npm:^3.1.3"
-  checksum: 10/5703b0721daf679cf44affc690f2b313e40893b64b0aafaf203e69ee51438197cc3634ef7094145f580a8a8aaadcb79026b2fbd4065c1bb4a8c26627a2c4c69a
+  peerDependencies:
+    "@babel/runtime": ^7.0.0
+  checksum: 10/0833800d4733f52fbf232efedc97ce66603430fd20ec10e71e6dc4c23295b3b59cc3c8109b86b8039b9ae0c0d2428815428924c367b88f9ea6013152a86d862b
   languageName: node
   linkType: hard
 
@@ -5081,18 +5083,18 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/ens-controller@npm:^14.0.0":
-  version: 14.0.1
-  resolution: "@metamask/ens-controller@npm:14.0.1"
+"@metamask/ens-controller@npm:^15.0.0":
+  version: 15.0.0
+  resolution: "@metamask/ens-controller@npm:15.0.0"
   dependencies:
     "@ethersproject/providers": "npm:^5.7.0"
     "@metamask/base-controller": "npm:^7.0.1"
-    "@metamask/controller-utils": "npm:^11.3.0"
-    "@metamask/utils": "npm:^9.1.0"
+    "@metamask/controller-utils": "npm:^11.4.0"
+    "@metamask/utils": "npm:^10.0.0"
     punycode: "npm:^2.1.1"
   peerDependencies:
-    "@metamask/network-controller": ^21.0.0
-  checksum: 10/1b57a781f4c53d7e60afda11b3994e977af1149aa5651c20b4dc56010de597fd9c9ada28847491d3fe862f0a8f08b96b17a759f742e870ca5911609e07f5dc6c
+    "@metamask/network-controller": ^22.0.0
+  checksum: 10/e61a3e469802689c73821faf8c9fce3efee9e52156d07da8afa674f973787a77fb39bc3faad53fe054644a9e4489f7c5ec67e00ce80c6062ce97f68dee20076e
   languageName: node
   linkType: hard
 
@@ -5237,38 +5239,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/eth-json-rpc-infura@npm:^9.1.0":
-  version: 9.1.0
-  resolution: "@metamask/eth-json-rpc-infura@npm:9.1.0"
-  dependencies:
-    "@metamask/eth-json-rpc-provider": "npm:^2.1.0"
-    "@metamask/json-rpc-engine": "npm:^7.1.1"
-    "@metamask/rpc-errors": "npm:^6.0.0"
-    "@metamask/utils": "npm:^8.1.0"
-    node-fetch: "npm:^2.7.0"
-  checksum: 10/9e01b3eb76d3f1b4989ba368f11acb124eb846321020e2fba8c7ff77dc5258fa2df1556f40812d736d63ee159a944beab6a761a661f72e722badcb4f78b5f0f6
-  languageName: node
-  linkType: hard
-
-"@metamask/eth-json-rpc-middleware@npm:^13.0.0":
-  version: 13.0.0
-  resolution: "@metamask/eth-json-rpc-middleware@npm:13.0.0"
-  dependencies:
-    "@metamask/eth-block-tracker": "npm:^10.0.0"
-    "@metamask/eth-json-rpc-provider": "npm:^4.0.0"
-    "@metamask/eth-sig-util": "npm:^7.0.0"
-    "@metamask/json-rpc-engine": "npm:^9.0.0"
-    "@metamask/rpc-errors": "npm:^6.0.0"
-    "@metamask/utils": "npm:^8.1.0"
-    "@types/bn.js": "npm:^5.1.5"
-    bn.js: "npm:^5.2.1"
-    klona: "npm:^2.0.6"
-    pify: "npm:^5.0.0"
-    safe-stable-stringify: "npm:^2.4.3"
-  checksum: 10/e2b38da46b15e7c3d75fc0a1191ff5e2a0161c847c415640024155bea635016a0c94a4bd352b5aa6aa7e95615cb45c030a0f1cbc90c2dca331de3f5306df3d3a
-  languageName: node
-  linkType: hard
-
 "@metamask/eth-json-rpc-middleware@npm:^15.0.0":
   version: 15.0.0
   resolution: "@metamask/eth-json-rpc-middleware@npm:15.0.0"
@@ -5288,18 +5258,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/eth-json-rpc-provider@npm:^2.1.0":
-  version: 2.3.2
-  resolution: "@metamask/eth-json-rpc-provider@npm:2.3.2"
-  dependencies:
-    "@metamask/json-rpc-engine": "npm:^7.3.2"
-    "@metamask/safe-event-emitter": "npm:^3.0.0"
-    "@metamask/utils": "npm:^8.3.0"
-  checksum: 10/e6731271aad3b972d85b9230c26d35a9b88722f3bd3024675ad2f568e634e9fdfef4717ef2892f3cc512d381cf17a4e20dbd5eb808ced765082bea3379ad6ddc
-  languageName: node
-  linkType: hard
-
-"@metamask/eth-json-rpc-provider@npm:^4.0.0, @metamask/eth-json-rpc-provider@npm:^4.1.3, @metamask/eth-json-rpc-provider@npm:^4.1.5, @metamask/eth-json-rpc-provider@npm:^4.1.6":
+"@metamask/eth-json-rpc-provider@npm:^4.0.0, @metamask/eth-json-rpc-provider@npm:^4.1.5, @metamask/eth-json-rpc-provider@npm:^4.1.6":
   version: 4.1.6
   resolution: "@metamask/eth-json-rpc-provider@npm:4.1.6"
   dependencies:
@@ -5336,7 +5295,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/eth-sig-util@npm:^7.0.0, @metamask/eth-sig-util@npm:^7.0.1, @metamask/eth-sig-util@npm:^7.0.3":
+"@metamask/eth-sig-util@npm:^7.0.1, @metamask/eth-sig-util@npm:^7.0.3":
   version: 7.0.3
   resolution: "@metamask/eth-sig-util@npm:7.0.3"
   dependencies:
@@ -5560,23 +5519,23 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/gas-fee-controller@npm:^21.0.0":
-  version: 21.0.0
-  resolution: "@metamask/gas-fee-controller@npm:21.0.0"
+"@metamask/gas-fee-controller@npm:^22.0.1":
+  version: 22.0.1
+  resolution: "@metamask/gas-fee-controller@npm:22.0.1"
   dependencies:
-    "@metamask/base-controller": "npm:^7.0.1"
-    "@metamask/controller-utils": "npm:^11.3.0"
+    "@metamask/base-controller": "npm:^7.0.2"
+    "@metamask/controller-utils": "npm:^11.4.3"
     "@metamask/eth-query": "npm:^4.0.0"
     "@metamask/ethjs-unit": "npm:^0.3.0"
-    "@metamask/polling-controller": "npm:^11.0.0"
-    "@metamask/utils": "npm:^9.1.0"
+    "@metamask/polling-controller": "npm:^12.0.1"
+    "@metamask/utils": "npm:^10.0.0"
     "@types/bn.js": "npm:^5.1.5"
     "@types/uuid": "npm:^8.3.0"
     bn.js: "npm:^5.2.1"
     uuid: "npm:^8.3.2"
   peerDependencies:
-    "@metamask/network-controller": ^21.0.0
-  checksum: 10/8b41c7257f7dc17deb3f550cfdde0288da142d11536bb55c998bec8267fa62243e36fb6468a44224cd90ed2f49ba3ba1dbe93c2b0834a725752c5a66ae283303
+    "@metamask/network-controller": ^22.0.0
+  checksum: 10/c52d4bb6359824198fe3169114a685fd8f881feb580eb7b9c9c1ba383e02664f0e7d65e9fcbb0ec1508acb55bd3b273b28b516ad134e9a273b00ed562b771140
   languageName: node
   linkType: hard
 
@@ -5601,18 +5560,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/json-rpc-engine@npm:^7.1.1, @metamask/json-rpc-engine@npm:^7.3.2":
-  version: 7.3.3
-  resolution: "@metamask/json-rpc-engine@npm:7.3.3"
-  dependencies:
-    "@metamask/rpc-errors": "npm:^6.2.1"
-    "@metamask/safe-event-emitter": "npm:^3.0.0"
-    "@metamask/utils": "npm:^8.3.0"
-  checksum: 10/116664c974c522d280335d9a02cba731e4f08562c2980415f7535513cd308c7e612e52618086996e5ac2b67db7f1e6ac1bd8201aba7825163db17a25f2874cc9
-  languageName: node
-  linkType: hard
-
-"@metamask/json-rpc-engine@npm:^9.0.0, @metamask/json-rpc-engine@npm:^9.0.2, @metamask/json-rpc-engine@npm:^9.0.3":
+"@metamask/json-rpc-engine@npm:^9.0.3":
   version: 9.0.3
   resolution: "@metamask/json-rpc-engine@npm:9.0.3"
   dependencies:
@@ -5789,37 +5737,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/network-controller@npm:21.0.0":
-  version: 21.0.0
-  resolution: "@metamask/network-controller@npm:21.0.0"
-  dependencies:
-    "@metamask/base-controller": "npm:^7.0.0"
-    "@metamask/controller-utils": "npm:^11.2.0"
-    "@metamask/eth-block-tracker": "npm:^10.0.0"
-    "@metamask/eth-json-rpc-infura": "npm:^9.1.0"
-    "@metamask/eth-json-rpc-middleware": "npm:^13.0.0"
-    "@metamask/eth-json-rpc-provider": "npm:^4.1.3"
-    "@metamask/eth-query": "npm:^4.0.0"
-    "@metamask/json-rpc-engine": "npm:^9.0.2"
-    "@metamask/rpc-errors": "npm:^6.3.1"
-    "@metamask/swappable-obj-proxy": "npm:^2.2.0"
-    "@metamask/utils": "npm:^9.1.0"
-    async-mutex: "npm:^0.5.0"
-    immer: "npm:^9.0.6"
-    loglevel: "npm:^1.8.1"
-    reselect: "npm:^5.1.1"
-    uri-js: "npm:^4.4.1"
-    uuid: "npm:^8.3.2"
-  checksum: 10/b44804720a7338a89edfc4e82c5652d429f6e3589de4fe1ebbba921d1d9af6c82a78c79591c0c8a6cb9b4439dbd77ede5b6aa8a72d24996ccedd8a7854fc7d46
-  languageName: node
-  linkType: hard
-
-"@metamask/network-controller@npm:^22.0.2":
-  version: 22.0.2
-  resolution: "@metamask/network-controller@npm:22.0.2"
+"@metamask/network-controller@npm:22.1.0, @metamask/network-controller@npm:^22.0.2":
+  version: 22.1.0
+  resolution: "@metamask/network-controller@npm:22.1.0"
   dependencies:
     "@metamask/base-controller": "npm:^7.0.2"
-    "@metamask/controller-utils": "npm:^11.4.3"
+    "@metamask/controller-utils": "npm:^11.4.4"
     "@metamask/eth-block-tracker": "npm:^11.0.2"
     "@metamask/eth-json-rpc-infura": "npm:^10.0.0"
     "@metamask/eth-json-rpc-middleware": "npm:^15.0.0"
@@ -5830,37 +5753,39 @@ __metadata:
     "@metamask/swappable-obj-proxy": "npm:^2.2.0"
     "@metamask/utils": "npm:^10.0.0"
     async-mutex: "npm:^0.5.0"
+    fast-deep-equal: "npm:^3.1.3"
     immer: "npm:^9.0.6"
     loglevel: "npm:^1.8.1"
     reselect: "npm:^5.1.1"
     uri-js: "npm:^4.4.1"
     uuid: "npm:^8.3.2"
-  checksum: 10/9da27189a4263ef7fa4596ada2000d7f944bc3f4dea63a77cf6f8b2ea89412d499068cf0542785088d19437263bd0b3b3bb3299533f87439729ccd8ecee2b625
+  checksum: 10/587ad3eba45e898d83a06c800c1649c1dc1ae708c53114a2e8a82bb18fc3773eaca2abc9b8f2afd46106aa96e22a28e79d2d5bd620d9de1606e5180b5a8996df
   languageName: node
   linkType: hard
 
-"@metamask/network-controller@patch:@metamask/network-controller@npm%3A21.0.0#~/.yarn/patches/@metamask-network-controller-npm-21.0.0-559aa8e395.patch":
-  version: 21.0.0
-  resolution: "@metamask/network-controller@patch:@metamask/network-controller@npm%3A21.0.0#~/.yarn/patches/@metamask-network-controller-npm-21.0.0-559aa8e395.patch::version=21.0.0&hash=1a5039"
+"@metamask/network-controller@patch:@metamask/network-controller@npm%3A22.1.0#~/.yarn/patches/@metamask-network-controller-npm-22.1.0-621c281f70.patch":
+  version: 22.1.0
+  resolution: "@metamask/network-controller@patch:@metamask/network-controller@npm%3A22.1.0#~/.yarn/patches/@metamask-network-controller-npm-22.1.0-621c281f70.patch::version=22.1.0&hash=93e992"
   dependencies:
-    "@metamask/base-controller": "npm:^7.0.0"
-    "@metamask/controller-utils": "npm:^11.2.0"
-    "@metamask/eth-block-tracker": "npm:^10.0.0"
-    "@metamask/eth-json-rpc-infura": "npm:^9.1.0"
-    "@metamask/eth-json-rpc-middleware": "npm:^13.0.0"
-    "@metamask/eth-json-rpc-provider": "npm:^4.1.3"
+    "@metamask/base-controller": "npm:^7.0.2"
+    "@metamask/controller-utils": "npm:^11.4.4"
+    "@metamask/eth-block-tracker": "npm:^11.0.2"
+    "@metamask/eth-json-rpc-infura": "npm:^10.0.0"
+    "@metamask/eth-json-rpc-middleware": "npm:^15.0.0"
+    "@metamask/eth-json-rpc-provider": "npm:^4.1.6"
     "@metamask/eth-query": "npm:^4.0.0"
-    "@metamask/json-rpc-engine": "npm:^9.0.2"
-    "@metamask/rpc-errors": "npm:^6.3.1"
+    "@metamask/json-rpc-engine": "npm:^10.0.1"
+    "@metamask/rpc-errors": "npm:^7.0.1"
     "@metamask/swappable-obj-proxy": "npm:^2.2.0"
-    "@metamask/utils": "npm:^9.1.0"
+    "@metamask/utils": "npm:^10.0.0"
     async-mutex: "npm:^0.5.0"
+    fast-deep-equal: "npm:^3.1.3"
     immer: "npm:^9.0.6"
     loglevel: "npm:^1.8.1"
     reselect: "npm:^5.1.1"
     uri-js: "npm:^4.4.1"
     uuid: "npm:^8.3.2"
-  checksum: 10/6c3fdf78360df8bf39a0045f7d5e6d0b7fd8984eaee7a3348bd688ee2740669c654803790dbf2429f8559b69d88101de0add0cc76e5c42661cf2eec14b263cb0
+  checksum: 10/21427a6bc57fa318dadd223342d3eda07c077705ef641c3448fb4dc438fb9f87e730e0bd5f7c9fc3f785bfce87c6a52f9b4ae5e17d933ecb5792e0bdc5ea4746
   languageName: node
   linkType: hard
 
@@ -5985,22 +5910,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/polling-controller@npm:^11.0.0":
-  version: 11.0.0
-  resolution: "@metamask/polling-controller@npm:11.0.0"
-  dependencies:
-    "@metamask/base-controller": "npm:^7.0.1"
-    "@metamask/controller-utils": "npm:^11.3.0"
-    "@metamask/utils": "npm:^9.1.0"
-    "@types/uuid": "npm:^8.3.0"
-    fast-json-stable-stringify: "npm:^2.1.0"
-    uuid: "npm:^8.3.2"
-  peerDependencies:
-    "@metamask/network-controller": ^21.0.0
-  checksum: 10/67b563a5d1ce02dc9c2db25ad4ad1fb9f75d5578cf380cce85176ff2cd136addce612c3982653254647b9d8c535374e93d96abb6e500e42076bf3a524a72e75f
-  languageName: node
-  linkType: hard
-
 "@metamask/polling-controller@npm:^12.0.0, @metamask/polling-controller@npm:^12.0.1":
   version: 12.0.1
   resolution: "@metamask/polling-controller@npm:12.0.1"
@@ -6150,7 +6059,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/rpc-errors@npm:^6.0.0, @metamask/rpc-errors@npm:^6.2.1, @metamask/rpc-errors@npm:^6.3.0, @metamask/rpc-errors@npm:^6.3.1":
+"@metamask/rpc-errors@npm:^6.2.1, @metamask/rpc-errors@npm:^6.3.0, @metamask/rpc-errors@npm:^6.3.1":
   version: 6.4.0
   resolution: "@metamask/rpc-errors@npm:6.4.0"
   dependencies:
@@ -6187,18 +6096,18 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/selected-network-controller@npm:^18.0.2":
-  version: 18.0.2
-  resolution: "@metamask/selected-network-controller@npm:18.0.2"
+"@metamask/selected-network-controller@npm:^19.0.0":
+  version: 19.0.0
+  resolution: "@metamask/selected-network-controller@npm:19.0.0"
   dependencies:
     "@metamask/base-controller": "npm:^7.0.1"
     "@metamask/json-rpc-engine": "npm:^10.0.0"
     "@metamask/swappable-obj-proxy": "npm:^2.2.0"
-    "@metamask/utils": "npm:^9.1.0"
+    "@metamask/utils": "npm:^10.0.0"
   peerDependencies:
-    "@metamask/network-controller": ^21.0.0
+    "@metamask/network-controller": ^22.0.0
     "@metamask/permission-controller": ^11.0.0
-  checksum: 10/cf46a1a7d4ca19d6327aeb5918b2e904933b3ae6959184a2d5773be294d1b0dbe4d16189c46bfcbd83f33d95fe0c6e5cb64e4745fa0c75243db4c8304ab6ec8e
+  checksum: 10/738a1c749f442b732c279c7446e0db2cc7d72fa03fd485da15121559077bb6ffeaa3233435a028f4ea69015a40ca35ba66972dc0fd3a7f61a7ea5eee43df30a6
   languageName: node
   linkType: hard
 
@@ -6475,28 +6384,28 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/user-operation-controller@npm:^16.0.0":
-  version: 16.0.0
-  resolution: "@metamask/user-operation-controller@npm:16.0.0"
+"@metamask/user-operation-controller@npm:^19.0.0":
+  version: 19.0.0
+  resolution: "@metamask/user-operation-controller@npm:19.0.0"
   dependencies:
-    "@metamask/base-controller": "npm:^7.0.1"
-    "@metamask/controller-utils": "npm:^11.3.0"
+    "@metamask/base-controller": "npm:^7.0.2"
+    "@metamask/controller-utils": "npm:^11.4.3"
     "@metamask/eth-query": "npm:^4.0.0"
-    "@metamask/polling-controller": "npm:^11.0.0"
-    "@metamask/rpc-errors": "npm:^7.0.0"
+    "@metamask/polling-controller": "npm:^12.0.1"
+    "@metamask/rpc-errors": "npm:^7.0.1"
     "@metamask/superstruct": "npm:^3.1.0"
-    "@metamask/utils": "npm:^9.1.0"
+    "@metamask/utils": "npm:^10.0.0"
     bn.js: "npm:^5.2.1"
     immer: "npm:^9.0.6"
     lodash: "npm:^4.17.21"
     uuid: "npm:^8.3.2"
   peerDependencies:
     "@metamask/approval-controller": ^7.0.0
-    "@metamask/gas-fee-controller": ^21.0.0
-    "@metamask/keyring-controller": ^17.0.0
-    "@metamask/network-controller": ^21.0.0
-    "@metamask/transaction-controller": ^37.0.0
-  checksum: 10/36ef43910f9e94ae7823902113acdaf7d4031423930f0a35fe4dd3b948a00e8088ea590354afbdb507b32712761720727f0ee905ad6d3db83ef3f0f145b8452d
+    "@metamask/gas-fee-controller": ^22.0.0
+    "@metamask/keyring-controller": ^19.0.0
+    "@metamask/network-controller": ^22.0.0
+    "@metamask/transaction-controller": ^40.0.0
+  checksum: 10/ca3d8ee77243eb3bdc455420185d5c41d45cb5520735af0b05c1792d66fdb6a7404c557b053b16b6fded57124da21c3bb0b6b1c943d290e9808164f05453a8d9
   languageName: node
   linkType: hard
 
@@ -26512,7 +26421,7 @@ __metadata:
     "@metamask/contract-metadata": "npm:^2.5.0"
     "@metamask/controller-utils": "npm:^11.4.0"
     "@metamask/design-tokens": "npm:^4.0.0"
-    "@metamask/ens-controller": "npm:^14.0.0"
+    "@metamask/ens-controller": "npm:^15.0.0"
     "@metamask/ens-resolver-snap": "npm:^0.1.2"
     "@metamask/eslint-config": "npm:^9.0.0"
     "@metamask/eslint-config-jest": "npm:^9.0.0"
@@ -26534,7 +26443,7 @@ __metadata:
     "@metamask/ethjs-contract": "npm:^0.4.1"
     "@metamask/ethjs-query": "npm:^0.7.1"
     "@metamask/forwarder": "npm:^1.1.0"
-    "@metamask/gas-fee-controller": "npm:^21.0.0"
+    "@metamask/gas-fee-controller": "npm:^22.0.1"
     "@metamask/jazzicon": "npm:^2.0.0"
     "@metamask/json-rpc-engine": "npm:^10.0.0"
     "@metamask/json-rpc-middleware-stream": "npm:^8.0.4"
@@ -26546,7 +26455,7 @@ __metadata:
     "@metamask/message-signing-snap": "npm:^0.4.0"
     "@metamask/metamask-eth-abis": "npm:^3.1.1"
     "@metamask/name-controller": "npm:^8.0.0"
-    "@metamask/network-controller": "patch:@metamask/network-controller@npm%3A21.0.0#~/.yarn/patches/@metamask-network-controller-npm-21.0.0-559aa8e395.patch"
+    "@metamask/network-controller": "patch:@metamask/network-controller@npm%3A22.1.0#~/.yarn/patches/@metamask-network-controller-npm-22.1.0-621c281f70.patch"
     "@metamask/notification-services-controller": "npm:^0.14.0"
     "@metamask/object-multiplex": "npm:^2.0.0"
     "@metamask/obs-store": "npm:^9.0.0"
@@ -26554,7 +26463,7 @@ __metadata:
     "@metamask/permission-log-controller": "npm:^3.0.1"
     "@metamask/phishing-controller": "npm:^12.3.0"
     "@metamask/phishing-warning": "npm:^4.1.0"
-    "@metamask/polling-controller": "npm:^11.0.0"
+    "@metamask/polling-controller": "npm:^12.0.1"
     "@metamask/post-message-stream": "npm:^8.0.0"
     "@metamask/ppom-validator": "npm:0.35.1"
     "@metamask/preferences-controller": "npm:^14.0.0"
@@ -26567,7 +26476,7 @@ __metadata:
     "@metamask/rpc-errors": "npm:^7.0.0"
     "@metamask/safe-event-emitter": "npm:^3.1.1"
     "@metamask/scure-bip39": "npm:^2.0.3"
-    "@metamask/selected-network-controller": "npm:^18.0.2"
+    "@metamask/selected-network-controller": "npm:^19.0.0"
     "@metamask/signature-controller": "npm:^23.0.0"
     "@metamask/smart-transactions-controller": "npm:^15.0.0"
     "@metamask/snaps-controllers": "npm:^9.14.0"
@@ -26579,7 +26488,7 @@ __metadata:
     "@metamask/test-bundler": "npm:^1.0.0"
     "@metamask/test-dapp": "npm:8.13.0"
     "@metamask/transaction-controller": "npm:^41.0.0"
-    "@metamask/user-operation-controller": "npm:^16.0.0"
+    "@metamask/user-operation-controller": "npm:^19.0.0"
     "@metamask/utils": "npm:^10.0.1"
     "@ngraveio/bc-ur": "npm:^1.1.12"
     "@noble/hashes": "npm:^1.3.3"

From bf946bc494c71bfaaef89ae3b0c43f8e25490613 Mon Sep 17 00:00:00 2001
From: Jyoti Puri <jyotipuri@gmail.com>
Date: Thu, 5 Dec 2024 04:38:25 +0530
Subject: [PATCH 026/175] feat: Adding production URL for signature decoding
 (#28918)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## **Description**

Production URL for signature decoding.

## **Related issues**

Fixes: https://github.com/MetaMask/metamask-extension/issues/28892

## **Manual testing steps**
NA

## **Screenshots/Recordings**
NA

## **Pre-merge author checklist**

- [X] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension Coding
Standards](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/CODING_GUIDELINES.md).
- [X] I've completed the PR template to the best of my ability
- [X] I’ve included tests if applicable
- [X] I’ve documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [X] I’ve applied the right labels on the PR (see [labeling
guidelines](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.

## **Pre-merge reviewer checklist**

- [ ] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed).
- [ ] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.
---
 builds.yml                              | 2 +-
 privacy-snapshot.json                   | 2 +-
 test/e2e/tests/confirmations/helpers.ts | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/builds.yml b/builds.yml
index 7985f464b73f..fd071904a961 100644
--- a/builds.yml
+++ b/builds.yml
@@ -236,7 +236,7 @@ env:
   # Used to enable confirmation redesigned pages
   - ENABLE_CONFIRMATION_REDESIGN: ''
   # URL of the decoding API used to provide additional data from signature requests
-  - DECODING_API_URL: 'https://qtgdj2huxh.execute-api.us-east-2.amazonaws.com/uat/v1'
+  - DECODING_API_URL: 'https://signature-insights.api.cx.metamask.io/v1'
   # Determines if feature flagged Settings Page - Developer Options should be used
   - ENABLE_SETTINGS_PAGE_DEV_OPTIONS: false
   # Used for debugging changes to the phishing warning page.
diff --git a/privacy-snapshot.json b/privacy-snapshot.json
index d133a74b3b30..49eedf275364 100644
--- a/privacy-snapshot.json
+++ b/privacy-snapshot.json
@@ -49,7 +49,7 @@
   "price.api.cx.metamask.io",
   "proxy.api.cx.metamask.io",
   "proxy.dev-api.cx.metamask.io",
-  "qtgdj2huxh.execute-api.us-east-2.amazonaws.com",
+  "signature-insights.api.cx.metamask.io",
   "raw.githubusercontent.com",
   "registry.npmjs.org",
   "responsive-rpc.test",
diff --git a/test/e2e/tests/confirmations/helpers.ts b/test/e2e/tests/confirmations/helpers.ts
index e838ad3a9093..3e8bc10cc217 100644
--- a/test/e2e/tests/confirmations/helpers.ts
+++ b/test/e2e/tests/confirmations/helpers.ts
@@ -11,7 +11,7 @@ import { Driver } from '../../webdriver/driver';
 import Confirmation from '../../page-objects/pages/confirmations/redesign/confirmation';
 
 export const DECODING_E2E_API_URL =
-  'https://qtgdj2huxh.execute-api.us-east-2.amazonaws.com/uat/v1';
+  'https://signature-insights.api.cx.metamask.io/v1';
 
 export async function scrollAndConfirmAndAssertConfirm(driver: Driver) {
   const confirmation = new Confirmation(driver);

From 64a69f709834947c4f459206ade1e2f856ea7874 Mon Sep 17 00:00:00 2001
From: Dan J Miller <danjm.com@gmail.com>
Date: Wed, 4 Dec 2024 21:28:18 -0330
Subject: [PATCH 027/175] =?UTF-8?q?chore:=20Skip=20flaky=20smart-transacti?=
 =?UTF-8?q?ons.spec.ts=20until=20we=20determine=20the=20root=20cau?=
 =?UTF-8?q?=E2=80=A6=20(#28943)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

…se of the flakiness


<!--
Please submit this PR as a draft initially.
Do not mark it as "Ready for review" until the template has been
completely filled out, and PR status checks have passed at least once.
-->

## **Description**

We are seeing fairly consistent failures of this test:
https://app.circleci.com/pipelines/github/MetaMask/metamask-extension/113978/workflows/8fa39e5f-3b57-4124-9af1-30e9bf63fad0/jobs/4272132/tests

This PR skips it so that we can unblock merges while we investigate the
root cause of the flakiness

[![Open in GitHub
Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/28943?quickstart=1)

## **Related issues**

Fixes:

## **Manual testing steps**

1. Go to this page...
2.
3.

## **Screenshots/Recordings**

<!-- If applicable, add screenshots and/or recordings to visualize the
before and after of your change. -->

### **Before**

<!-- [screenshots/recordings] -->

### **After**

<!-- [screenshots/recordings] -->

## **Pre-merge author checklist**

- [ ] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension Coding
Standards](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/CODING_GUIDELINES.md).
- [ ] I've completed the PR template to the best of my ability
- [ ] I’ve included tests if applicable
- [ ] I’ve documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [ ] I’ve applied the right labels on the PR (see [labeling
guidelines](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.

## **Pre-merge reviewer checklist**

- [ ] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed).
- [ ] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.
---
 test/e2e/tests/smart-transactions/smart-transactions.spec.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/e2e/tests/smart-transactions/smart-transactions.spec.ts b/test/e2e/tests/smart-transactions/smart-transactions.spec.ts
index 36324b9ea797..b2bb04a68b44 100644
--- a/test/e2e/tests/smart-transactions/smart-transactions.spec.ts
+++ b/test/e2e/tests/smart-transactions/smart-transactions.spec.ts
@@ -64,7 +64,7 @@ export const waitForTransactionToComplete = async (
 };
 
 describe('smart transactions @no-mmi', function () {
-  it('Completes a Swap', async function () {
+  it.skip('Completes a Swap', async function () {
     await withFixturesForSmartTransactions(
       {
         title: this.test?.fullTitle(),

From dbf580a190149cd2a5e66a73ad949028f4b9beca Mon Sep 17 00:00:00 2001
From: MetaMask Bot <37885440+metamaskbot@users.noreply.github.com>
Date: Wed, 4 Dec 2024 22:02:53 -0300
Subject: [PATCH 028/175] chore: Update coverage.json (#28092)

This PR is automatically opened to update the coverage.json file when
test coverage increases. Coverage increased from 71% to 72%.

Co-authored-by: MetaMask Bot <metamaskbot@users.noreply.github.com>
---
 coverage.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/coverage.json b/coverage.json
index 9887e06e2db6..6035036ba23b 100644
--- a/coverage.json
+++ b/coverage.json
@@ -1 +1 @@
-{ "coverage": 71 }
+{ "coverage": 72 }

From 79a8f57d2ac22bd36b09bfe63084f6ee8936785d Mon Sep 17 00:00:00 2001
From: sahar-fehri <sahar.fehri@consensys.net>
Date: Thu, 5 Dec 2024 03:21:11 +0100
Subject: [PATCH 029/175] fix: fix check for undefined marketData (#28870)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## **Description**

This PR fixes app crash after user removes a network then adds it back
and clicks on import token banner

[![Open in GitHub
Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/28870?quickstart=1)

## **Related issues**

Fixes:
https://github.com/MetaMask/metamask-extension/issues/28019#issuecomment-2513839152
Fixes: https://github.com/MetaMask/metamask-extension/issues/28882
Fixes: https://github.com/MetaMask/metamask-extension/issues/28864

## **Manual testing steps**
Manual steps are also described in the github
[issue](https://github.com/MetaMask/metamask-extension/issues/28019#issuecomment-2513839152).
However; I do not think that the Show native token as main balance needs
to be ONt o repro the initial issue. Also no need to add new RPC from
chainList;

Settings:
1. Show balance and token price OFF
2. Token autodetect ON

On main view

1. Select an account which has some ERC20 tokens in Polygon
2. Add Polygon default network
3. See tokens are autodetected and you can open the modal -> but don't
import the tokens!
4. Switch to another network
5. Delete Polygon network
6. Re-add Polygon default network
7. Click Import tokens --> Wallet should not crash

12. ## **Screenshots/Recordings**

<!-- If applicable, add screenshots and/or recordings to visualize the
before and after of your change. -->

### **Before**

<!-- [screenshots/recordings] -->

### **After**

<!-- [screenshots/recordings] -->

## **Pre-merge author checklist**

- [ ] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension Coding
Standards](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/CODING_GUIDELINES.md).
- [ ] I've completed the PR template to the best of my ability
- [ ] I’ve included tests if applicable
- [ ] I’ve documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [ ] I’ve applied the right labels on the PR (see [labeling
guidelines](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.

## **Pre-merge reviewer checklist**

- [ ] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed).
- [ ] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.

---------

Co-authored-by: Nick Gambino <35090461+gambinish@users.noreply.github.com>
---
 .../asset-list-control-bar.tsx                |  2 +-
 .../app/assets/asset-list/asset-list.tsx      |  5 +++--
 .../app/assets/token-list/token-list.tsx      |  4 +---
 ui/hooks/useTokenFiatAmount.js                | 19 ++++++++++---------
 4 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/ui/components/app/assets/asset-list/asset-list-control-bar/asset-list-control-bar.tsx b/ui/components/app/assets/asset-list/asset-list-control-bar/asset-list-control-bar.tsx
index 8e6abb940d1c..00e0692cfc73 100644
--- a/ui/components/app/assets/asset-list/asset-list-control-bar/asset-list-control-bar.tsx
+++ b/ui/components/app/assets/asset-list/asset-list-control-bar/asset-list-control-bar.tsx
@@ -99,7 +99,7 @@ const AssetListControlBar = ({ showTokensLinks }: AssetListControlBarProps) => {
   // When a network gets added/removed we want to make sure that we switch to the filtered list of the current network
   // We only want to do this if the "Current Network" filter is selected
   useEffect(() => {
-    if (Object.keys(tokenNetworkFilter).length === 1) {
+    if (Object.keys(tokenNetworkFilter || {}).length === 1) {
       dispatch(setTokenNetworkFilter({ [currentNetwork.chainId]: true }));
     }
   }, [Object.keys(allNetworks).length]);
diff --git a/ui/components/app/assets/asset-list/asset-list.tsx b/ui/components/app/assets/asset-list/asset-list.tsx
index 6a3036f88764..ab2adb308bf4 100644
--- a/ui/components/app/assets/asset-list/asset-list.tsx
+++ b/ui/components/app/assets/asset-list/asset-list.tsx
@@ -117,14 +117,15 @@ const AssetList = ({ onClickAsset, showTokensLinks }: AssetListProps) => {
   );
 
   const totalTokens =
-    process.env.PORTFOLIO_VIEW && !allNetworksFilterShown
+    process.env.PORTFOLIO_VIEW &&
+    !allNetworksFilterShown &&
+    detectedTokensMultichain
       ? (Object.values(detectedTokensMultichain).reduce(
           // @ts-expect-error TS18046: 'tokenArray' is of type 'unknown'
           (count, tokenArray) => count + tokenArray.length,
           0,
         ) as number)
       : detectedTokens.length;
-
   return (
     <>
       {totalTokens &&
diff --git a/ui/components/app/assets/token-list/token-list.tsx b/ui/components/app/assets/token-list/token-list.tsx
index 5e25c7ff5f41..d3e67f6204cc 100644
--- a/ui/components/app/assets/token-list/token-list.tsx
+++ b/ui/components/app/assets/token-list/token-list.tsx
@@ -116,8 +116,7 @@ export default function TokenList({
       const allNetworkFilters = Object.fromEntries(
         Object.keys(allNetworks).map((chainId) => [chainId, true]),
       );
-
-      if (Object.keys(tokenNetworkFilter).length > 1) {
+      if (Object.keys(tokenNetworkFilter || {}).length > 1) {
         dispatch(setTokenNetworkFilter(allNetworkFilters));
       }
     }
@@ -125,7 +124,6 @@ export default function TokenList({
 
   const consolidatedBalances = () => {
     const tokensWithBalance: TokenWithFiatAmount[] = [];
-
     Object.entries(selectedAccountTokensChains).forEach(
       ([stringChainKey, tokens]) => {
         const chainId = stringChainKey as Hex;
diff --git a/ui/hooks/useTokenFiatAmount.js b/ui/hooks/useTokenFiatAmount.js
index 486b8ba14fd6..325dbf5eea22 100644
--- a/ui/hooks/useTokenFiatAmount.js
+++ b/ui/hooks/useTokenFiatAmount.js
@@ -42,15 +42,16 @@ export function useTokenFiatAmount(
     shallowEqual,
   );
 
-  const contractMarketData = chainId
-    ? Object.entries(allMarketData[chainId]).reduce(
-        (acc, [address, marketData]) => {
-          acc[address] = marketData?.price ?? null;
-          return acc;
-        },
-        {},
-      )
-    : null;
+  const contractMarketData =
+    chainId && allMarketData[chainId]
+      ? Object.entries(allMarketData[chainId]).reduce(
+          (acc, [address, marketData]) => {
+            acc[address] = marketData?.price ?? null;
+            return acc;
+          },
+          {},
+        )
+      : null;
 
   const tokenMarketData = chainId ? contractMarketData : contractExchangeRates;
 

From 176854541f8a321e2a17b3828fbdd8bd2341b30c Mon Sep 17 00:00:00 2001
From: Davide Brocchetto <davide.brocchetto@consensys.net>
Date: Thu, 5 Dec 2024 00:24:45 -0800
Subject: [PATCH 030/175] test: Fixed e2e swap tests test failures  (#28913)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<!--
Please submit this PR as a draft initially.
Do not mark it as "Ready for review" until the template has been
completely filled out, and PR status checks have passed at least once.
-->

## **Description**

This PR addresses e2e Swap tests test failures. The failures are not due
to the test code. For some reasons the wallet balance remains zero
although the account has been funded on Tenderly. This fix allow the
test to skip in case that happens. However I will still need to
investigate the root cause. Tests are running fine on local

[![Open in GitHub
Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/28913?quickstart=1)

## **Related issues**

Fixes:

## **Manual testing steps**

1. Go to this page...
2.
3.

## **Screenshots/Recordings**

<!-- If applicable, add screenshots and/or recordings to visualize the
before and after of your change. -->

### **Before**

<!-- [screenshots/recordings] -->

### **After**

<!-- [screenshots/recordings] -->

## **Pre-merge author checklist**

- [x] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension Coding
Standards](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/CODING_GUIDELINES.md).
- [x] I've completed the PR template to the best of my ability
- [ ] I’ve included tests if applicable
- [ ] I’ve documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [ ] I’ve applied the right labels on the PR (see [labeling
guidelines](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.

## **Pre-merge reviewer checklist**

- [x] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed).
- [ ] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.
---
 .../shared/pageObjects/network-controller-page.ts      |  3 +++
 test/e2e/playwright/shared/pageObjects/wallet-page.ts  |  2 --
 test/e2e/playwright/swap/specs/swap.spec.ts            | 10 +++++++---
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/test/e2e/playwright/shared/pageObjects/network-controller-page.ts b/test/e2e/playwright/shared/pageObjects/network-controller-page.ts
index 1986de15dd88..cc496f2c9a36 100644
--- a/test/e2e/playwright/shared/pageObjects/network-controller-page.ts
+++ b/test/e2e/playwright/shared/pageObjects/network-controller-page.ts
@@ -88,6 +88,9 @@ export class NetworkController {
     await this.networkTicker.fill(options.symbol);
     await this.saveBtn.waitFor({ state: 'visible' });
     await this.saveBtn.click({ timeout: 60000 });
+    await this.page.waitForSelector(`text=/was successfully edited/`, {
+      timeout: 30000,
+    });
   }
 
   async addPopularNetwork(options: { networkName: string }) {
diff --git a/test/e2e/playwright/shared/pageObjects/wallet-page.ts b/test/e2e/playwright/shared/pageObjects/wallet-page.ts
index 1e0049be5d3e..10b4be84aef8 100644
--- a/test/e2e/playwright/shared/pageObjects/wallet-page.ts
+++ b/test/e2e/playwright/shared/pageObjects/wallet-page.ts
@@ -59,8 +59,6 @@ export class WalletPage {
     await this.importAccountButton.click();
     await this.page.fill('#private-key-box', accountPK);
     await this.importAccountConfirmBtn.click();
-    await this.page.waitForTimeout(2000);
-    return await this.accountMenu.textContent();
   }
 
   async selectTokenWallet() {
diff --git a/test/e2e/playwright/swap/specs/swap.spec.ts b/test/e2e/playwright/swap/specs/swap.spec.ts
index d7d369c469f4..ec9cd73858da 100644
--- a/test/e2e/playwright/swap/specs/swap.spec.ts
+++ b/test/e2e/playwright/swap/specs/swap.spec.ts
@@ -73,9 +73,8 @@ test.beforeAll(
     walletPage = new WalletPage(page);
 
     await networkController.addCustomNetwork(Tenderly.Mainnet);
-    const accountName = await walletPage.importAccount(wallet.privateKey);
-    expect(accountName).toEqual('Account 2');
-    await walletPage.waitforTokenBalance('1 ETH');
+    await walletPage.importAccount(wallet.privateKey);
+    expect(walletPage.accountMenu).toHaveText('Account 2', { timeout: 30000 });
   },
 );
 
@@ -83,6 +82,11 @@ testSet.forEach((options) => {
   test(`should swap ${options.type} token ${options.source} to ${options.destination} on ${options.network.name}'`, async () => {
     await walletPage.selectTokenWallet();
     await networkController.selectNetwork(options.network);
+    const balance = await walletPage.getTokenBalance();
+    if (balance === '0 ETH') {
+      test.skip();
+    }
+
     await walletPage.selectSwapAction();
     // Allow balance label to populate
     await walletPage.page.waitForTimeout(3000);

From fc5c01fe9c7b987bd54e419798995486d9bccb60 Mon Sep 17 00:00:00 2001
From: Priya <priya.narayanaswamy@consensys.net>
Date: Thu, 5 Dec 2024 17:41:07 +0800
Subject: [PATCH 031/175] =?UTF-8?q?test:=20Add=20integration=20test=20for?=
 =?UTF-8?q?=20signing=20and=20submitting=20alert=20and=20fix=20b=E2=80=A6?=
 =?UTF-8?q?=20(#28616)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

…ug of confirm button not being disabled


<!--
Please submit this PR as a draft initially.
Do not mark it as "Ready for review" until the template has been
completely filled out, and PR status checks have passed at least once.
-->

## **Description**

- Adds integration test to check alert for signing and submitting
- Fixes bug 'Confirm button not disabled when alert is displayed'

[![Open in GitHub
Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/28616?quickstart=1)

## **Related issues**

Fixes:
[#2975](https://github.com/MetaMask/MetaMask-planning/issues/2975)

## **Manual testing steps**

1. Go to this page...
2.
3.

## **Screenshots/Recordings**

<!-- If applicable, add screenshots and/or recordings to visualize the
before and after of your change. -->

### **Before**

<!-- [screenshots/recordings] -->

### **After**

<!-- [screenshots/recordings] -->

## **Pre-merge author checklist**

- [ ] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension Coding
Standards](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/CODING_GUIDELINES.md).
- [ ] I've completed the PR template to the best of my ability
- [ ] I’ve included tests if applicable
- [ ] I’ve documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [ ] I’ve applied the right labels on the PR (see [labeling
guidelines](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.

## **Pre-merge reviewer checklist**

- [ ] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed).
- [ ] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.
---
 .../transactions/alerts.test.tsx              | 69 +++++++++++++++++++
 1 file changed, 69 insertions(+)

diff --git a/test/integration/confirmations/transactions/alerts.test.tsx b/test/integration/confirmations/transactions/alerts.test.tsx
index 1bbf9d1fd2c5..ffbad48b352b 100644
--- a/test/integration/confirmations/transactions/alerts.test.tsx
+++ b/test/integration/confirmations/transactions/alerts.test.tsx
@@ -411,4 +411,73 @@ describe('Contract Interaction Confirmation Alerts', () => {
       await screen.findByTestId('alert-modal-action-showGasFeeModal'),
     ).toHaveTextContent('Update gas options');
   });
+
+  it('displays the alert for signing and submitting alerts', async () => {
+    const account =
+      mockMetaMaskState.internalAccounts.accounts[
+        mockMetaMaskState.internalAccounts
+          .selectedAccount as keyof typeof mockMetaMaskState.internalAccounts.accounts
+      ];
+
+    const mockedMetaMaskState =
+      getMetaMaskStateWithUnapprovedApproveTransaction(account.address);
+    const unapprovedTransaction = mockedMetaMaskState.transactions[0];
+    const signedTransaction = getUnapprovedApproveTransaction(
+      account.address,
+      randomUUID(),
+      pendingTransactionTime - 1000,
+    );
+    signedTransaction.status = 'signed';
+
+    await act(async () => {
+      await integrationTestRender({
+        preloadedState: {
+          ...mockedMetaMaskState,
+          gasEstimateType: 'none',
+          pendingApprovalCount: 2,
+          pendingApprovals: {
+            [pendingTransactionId]: {
+              id: pendingTransactionId,
+              origin: 'origin',
+              time: pendingTransactionTime,
+              type: ApprovalType.Transaction,
+              requestData: {
+                txId: pendingTransactionId,
+              },
+              requestState: null,
+              expectsResult: false,
+            },
+            [signedTransaction.id]: {
+              id: signedTransaction.id,
+              origin: 'origin',
+              time: pendingTransactionTime - 1000,
+              type: ApprovalType.Transaction,
+              requestData: {
+                txId: signedTransaction.id,
+              },
+              requestState: null,
+              expectsResult: false,
+            },
+          },
+          transactions: [unapprovedTransaction, signedTransaction],
+        },
+        backgroundConnection: backgroundConnectionMocked,
+      });
+    });
+
+    const alerts = await screen.findAllByTestId('confirm-banner-alert');
+
+    expect(
+      alerts.some((alert) =>
+        alert.textContent?.includes(
+          'This transaction will only go through once your previous transaction is complete.',
+        ),
+      ),
+    ).toBe(true);
+
+    expect(
+      await screen.findByTestId('confirm-footer-button'),
+    ).toBeInTheDocument();
+    expect(await screen.findByTestId('confirm-footer-button')).toBeEnabled();
+  });
 });

From a894ba5f96ebb48889f57472e291904f09222c03 Mon Sep 17 00:00:00 2001
From: Priya <priya.narayanaswamy@consensys.net>
Date: Thu, 5 Dec 2024 19:38:13 +0800
Subject: [PATCH 032/175] test: fix flaky ppom test (#28923)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<!--
Please submit this PR as a draft initially.
Do not mark it as "Ready for review" until the template has been
completely filled out, and PR status checks have passed at least once.
-->

## **Description**

Sometimes it takes a little longer for the spinner to go away and for
the blockaid banner to show up. Just increasing the dynamic timeout
waiting for the spinner to be removed from the page so that in the
situations where it takes a little longer the tests don't fail.

[![Open in GitHub
Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/28923?quickstart=1)

## **Related issues**

Fixes:
[#28872](https://github.com/MetaMask/metamask-extension/issues/28872)

## **Manual testing steps**

1. Go to this page...
2.
3.

## **Screenshots/Recordings**

<!-- If applicable, add screenshots and/or recordings to visualize the
before and after of your change. -->

### **Before**

<!-- [screenshots/recordings] -->

### **After**

<!-- [screenshots/recordings] -->

## **Pre-merge author checklist**

- [ ] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension Coding
Standards](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/CODING_GUIDELINES.md).
- [ ] I've completed the PR template to the best of my ability
- [ ] I’ve included tests if applicable
- [ ] I’ve documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [ ] I’ve applied the right labels on the PR (see [labeling
guidelines](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.

## **Pre-merge reviewer checklist**

- [ ] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed).
- [ ] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.

Co-authored-by: Howard Braham <howrad@gmail.com>
---
 .../ppom/ppom-blockaid-alert-trade-order-farming.spec.js      | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/test/e2e/tests/ppom/ppom-blockaid-alert-trade-order-farming.spec.js b/test/e2e/tests/ppom/ppom-blockaid-alert-trade-order-farming.spec.js
index ac17614bc5af..d312daa340e1 100644
--- a/test/e2e/tests/ppom/ppom-blockaid-alert-trade-order-farming.spec.js
+++ b/test/e2e/tests/ppom/ppom-blockaid-alert-trade-order-farming.spec.js
@@ -118,7 +118,9 @@ describe('PPOM Blockaid Alert - Set Trade farming order @no-mmi', function () {
         await driver.clickElement('#maliciousTradeOrder');
         await driver.switchToWindowWithTitle(WINDOW_TITLES.Dialog);
 
-        await driver.assertElementNotPresent('.loading-indicator');
+        await driver.assertElementNotPresent('.loading-indicator', {
+          timeout: 20000,
+        });
 
         await driver.waitForSelector({
           css: '.mm-text--body-lg-medium',

From c375dd5f501eb716c8355fb1852ae78a85a93687 Mon Sep 17 00:00:00 2001
From: Vinicius Stevam <45455812+vinistevam@users.noreply.github.com>
Date: Thu, 5 Dec 2024 11:40:54 +0000
Subject: [PATCH 033/175] fix: Capture raw 4byte hex (#28773)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<!--
Please submit this PR as a draft initially.
Do not mark it as "Ready for review" until the template has been
completely filled out, and PR status checks have passed at least once.
-->

## **Description**

This PR aims to include in the events the property
`transaction_contract_method_4byte` to improve the metrics when we are
not able to identify the name of the function with our current sources.

<!--
Write a short description of the changes included in this pull request,
also include relevant motivation and context. Have in mind the following
questions:
1. What is the reason for the change?
2. What is the improvement/solution?
-->

[![Open in GitHub
Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/28773?quickstart=1)

## **Related issues**

Fixes: https://github.com/MetaMask/MetaMask-planning/issues/3468

## **Manual testing steps**

1. Go to this page test dapp
2. Deploy a contract
3. Click in Mint and check Segment events

## **Screenshots/Recordings**


[4byte-event.webm](https://github.com/user-attachments/assets/eb711a3c-d754-489e-87a3-f905b43362bf)

<!-- If applicable, add screenshots and/or recordings to visualize the
before and after of your change. -->

### **Before**

<!-- [screenshots/recordings] -->

### **After**

<!-- [screenshots/recordings] -->

## **Pre-merge author checklist**

- [x] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension Coding
Standards](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/CODING_GUIDELINES.md).
- [x] I've completed the PR template to the best of my ability
- [x] I’ve included tests if applicable
- [x] I’ve documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [x] I’ve applied the right labels on the PR (see [labeling
guidelines](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.

## **Pre-merge reviewer checklist**

- [ ] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed).
- [ ] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.
---
 app/scripts/lib/transaction/metrics.ts | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/app/scripts/lib/transaction/metrics.ts b/app/scripts/lib/transaction/metrics.ts
index 375a8bd4a8ab..edc8e8aa703a 100644
--- a/app/scripts/lib/transaction/metrics.ts
+++ b/app/scripts/lib/transaction/metrics.ts
@@ -906,6 +906,7 @@ async function buildEventFragmentProperties({
   let transactionApprovalAmountVsBalanceRatio;
   let transactionContractAddress;
   let transactionType = TransactionType.simpleSend;
+  let transactionContractMethod4Byte;
   if (type === TransactionType.swapAndSend) {
     transactionType = TransactionType.swapAndSend;
   } else if (type === TransactionType.cancel) {
@@ -918,6 +919,10 @@ async function buildEventFragmentProperties({
     transactionType = TransactionType.contractInteraction;
     transactionContractMethod = contractMethodName;
     transactionContractAddress = transactionMeta.txParams?.to;
+    transactionContractMethod4Byte = transactionMeta.txParams?.data?.slice(
+      0,
+      10,
+    );
     if (
       transactionContractMethod === contractMethodNames.APPROVE &&
       tokenStandard === TokenStandard.ERC20
@@ -1071,6 +1076,7 @@ async function buildEventFragmentProperties({
     gas_limit: gasLimit,
     transaction_replaced: transactionReplaced,
     transaction_contract_address: transactionContractAddress,
+    transaction_contract_method_4byte: transactionContractMethod4Byte,
     ...extraParams,
     ...gasParamsInGwei,
     // TODO: Replace `any` with type

From e8f72c3b3b666720d5777ad5b010fd0ba8cd8788 Mon Sep 17 00:00:00 2001
From: Pedro Figueiredo <pedro.figueiredo@consensys.net>
Date: Thu, 5 Dec 2024 12:19:46 +0000
Subject: [PATCH 034/175] feat: Add 'transaction_internal_id' property on all
 transaction events (#28919)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<!--
Please submit this PR as a draft initially.
Do not mark it as "Ready for review" until the template has been
completely filled out, and PR status checks have passed at least once.
-->

## **Description**

<!--
Write a short description of the changes included in this pull request,
also include relevant motivation and context. Have in mind the following
questions:
1. What is the reason for the change?
2. What is the improvement/solution?
-->

Adds a "transaction_internal_id" property that exists in all transaction
events stays the same if the transaction is sped up.

[![Open in GitHub
Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/28919?quickstart=1)

## **Related issues**

Fixes: https://github.com/MetaMask/MetaMask-planning/issues/3596

## **Manual testing steps**

1. Go to this page...
2.
3.

## **Screenshots/Recordings**

<!-- If applicable, add screenshots and/or recordings to visualize the
before and after of your change. -->

### **Before**

<!-- [screenshots/recordings] -->

### **After**

<img width="320" alt="Screenshot 2024-12-03 at 18 06 32"
src="https://github.com/user-attachments/assets/db512c47-893f-4486-8d47-7ce748621cb8">
<img width="320" alt="Screenshot 2024-12-03 at 18 05 47"
src="https://github.com/user-attachments/assets/25bf9308-6820-4f90-a861-da4805c88d78">
<img width="320" alt="Screenshot 2024-12-03 at 18 02 12"
src="https://github.com/user-attachments/assets/dcd27148-e27a-4a3c-bbf3-adb40e176eea">


## **Pre-merge author checklist**

- [ ] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension Coding
Standards](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/CODING_GUIDELINES.md).
- [ ] I've completed the PR template to the best of my ability
- [ ] I’ve included tests if applicable
- [ ] I’ve documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [ ] I’ve applied the right labels on the PR (see [labeling
guidelines](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.

## **Pre-merge reviewer checklist**

- [ ] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed).
- [ ] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.
---
 app/scripts/lib/transaction/metrics.test.ts | 1 +
 app/scripts/lib/transaction/metrics.ts      | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/app/scripts/lib/transaction/metrics.test.ts b/app/scripts/lib/transaction/metrics.test.ts
index c4ddf9d29e5a..2fea8da0dcb7 100644
--- a/app/scripts/lib/transaction/metrics.test.ts
+++ b/app/scripts/lib/transaction/metrics.test.ts
@@ -161,6 +161,7 @@ describe('Transaction metrics', () => {
       ui_customizations: ['redesigned_confirmation'],
       transaction_advanced_view: undefined,
       transaction_contract_method: undefined,
+      transaction_internal_id: '1',
     };
 
     expectedSensitiveProperties = {
diff --git a/app/scripts/lib/transaction/metrics.ts b/app/scripts/lib/transaction/metrics.ts
index edc8e8aa703a..3cb33af60d3f 100644
--- a/app/scripts/lib/transaction/metrics.ts
+++ b/app/scripts/lib/transaction/metrics.ts
@@ -792,6 +792,7 @@ async function buildEventFragmentProperties({
     finalApprovalAmount,
     securityProviderResponse,
     simulationFails,
+    id,
   } = transactionMeta;
   const query = new EthQuery(transactionMetricsRequest.provider);
   const source = referrer === ORIGIN_METAMASK ? 'user' : 'dapp';
@@ -1043,6 +1044,7 @@ async function buildEventFragmentProperties({
     token_standard: tokenStandard,
     transaction_type: transactionType,
     transaction_speed_up: type === TransactionType.retry,
+    transaction_internal_id: id,
     ...blockaidProperties,
     // ui_customizations must come after ...blockaidProperties
     ui_customizations: uiCustomizations.length > 0 ? uiCustomizations : null,

From 6814e8a64ee39574fda117cdc80741fd34484499 Mon Sep 17 00:00:00 2001
From: Frederik Bolding <frederik.bolding@gmail.com>
Date: Thu, 5 Dec 2024 13:55:18 +0100
Subject: [PATCH 035/175] chore: Bump Snaps packages (#28922)

<!--
Please submit this PR as a draft initially.
Do not mark it as "Ready for review" until the template has been
completely filled out, and PR status checks have passed at least once.
-->

## **Description**

<!--
Write a short description of the changes included in this pull request,
also include relevant motivation and context. Have in mind the following
questions:
1. What is the reason for the change?
2. What is the improvement/solution?
-->

Bump Snaps packages and handle any required changes.

Summary of Snaps changes:
- Add `size` prop to `Text`
- Allow `Field` in `Box`
- Add JSX `content` property to `snap_notify` (will be used in a follow
up PR)
- Use WebCrypto API for key derivation
- Add `getClientCryptography` hook for specifying custom cryptography
functions

[![Open in GitHub
Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/28922?quickstart=1)
---
 app/scripts/metamask-controller.js            |  2 +
 lavamoat/browserify/beta/policy.json          | 20 ++----
 lavamoat/browserify/flask/policy.json         | 20 ++----
 lavamoat/browserify/main/policy.json          | 20 ++----
 lavamoat/browserify/mmi/policy.json           | 20 ++----
 package.json                                  | 10 +--
 test/e2e/snaps/enums.js                       |  2 +-
 test/e2e/snaps/test-snap-metrics.spec.js      |  4 +-
 .../snaps/snap-ui-renderer/components/text.ts |  3 +-
 yarn.lock                                     | 69 ++++++++++---------
 10 files changed, 63 insertions(+), 107 deletions(-)

diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
index 9f700738403b..e089bd0d07b4 100644
--- a/app/scripts/metamask-controller.js
+++ b/app/scripts/metamask-controller.js
@@ -2965,6 +2965,8 @@ export default class MetamaskController extends EventEmitter {
             this.controllerMessenger,
             'SnapInterfaceController:getInterface',
           ),
+          // We don't currently use special cryptography for the extension client.
+          getClientCryptography: () => ({}),
           ///: BEGIN:ONLY_INCLUDE_IF(keyring-snaps)
           getSnapKeyring: this.getSnapKeyring.bind(this),
           ///: END:ONLY_INCLUDE_IF
diff --git a/lavamoat/browserify/beta/policy.json b/lavamoat/browserify/beta/policy.json
index eae2b15640e3..d29b923eebe4 100644
--- a/lavamoat/browserify/beta/policy.json
+++ b/lavamoat/browserify/beta/policy.json
@@ -2508,29 +2508,17 @@
       }
     },
     "@metamask/snaps-sdk>@metamask/key-tree": {
+      "globals": {
+        "crypto.subtle": true
+      },
       "packages": {
         "@metamask/message-signing-snap>@noble/curves": true,
         "@metamask/scure-bip39": true,
-        "@metamask/snaps-sdk>@metamask/key-tree>@metamask/utils": true,
+        "@metamask/utils": true,
         "@metamask/utils>@scure/base": true,
         "@noble/hashes": true
       }
     },
-    "@metamask/snaps-sdk>@metamask/key-tree>@metamask/utils": {
-      "globals": {
-        "TextDecoder": true,
-        "TextEncoder": true
-      },
-      "packages": {
-        "@metamask/utils>@metamask/superstruct": true,
-        "@metamask/utils>@scure/base": true,
-        "@metamask/utils>pony-cause": true,
-        "@noble/hashes": true,
-        "browserify>buffer": true,
-        "nock>debug": true,
-        "semver": true
-      }
-    },
     "@metamask/snaps-utils": {
       "globals": {
         "File": true,
diff --git a/lavamoat/browserify/flask/policy.json b/lavamoat/browserify/flask/policy.json
index eae2b15640e3..d29b923eebe4 100644
--- a/lavamoat/browserify/flask/policy.json
+++ b/lavamoat/browserify/flask/policy.json
@@ -2508,29 +2508,17 @@
       }
     },
     "@metamask/snaps-sdk>@metamask/key-tree": {
+      "globals": {
+        "crypto.subtle": true
+      },
       "packages": {
         "@metamask/message-signing-snap>@noble/curves": true,
         "@metamask/scure-bip39": true,
-        "@metamask/snaps-sdk>@metamask/key-tree>@metamask/utils": true,
+        "@metamask/utils": true,
         "@metamask/utils>@scure/base": true,
         "@noble/hashes": true
       }
     },
-    "@metamask/snaps-sdk>@metamask/key-tree>@metamask/utils": {
-      "globals": {
-        "TextDecoder": true,
-        "TextEncoder": true
-      },
-      "packages": {
-        "@metamask/utils>@metamask/superstruct": true,
-        "@metamask/utils>@scure/base": true,
-        "@metamask/utils>pony-cause": true,
-        "@noble/hashes": true,
-        "browserify>buffer": true,
-        "nock>debug": true,
-        "semver": true
-      }
-    },
     "@metamask/snaps-utils": {
       "globals": {
         "File": true,
diff --git a/lavamoat/browserify/main/policy.json b/lavamoat/browserify/main/policy.json
index eae2b15640e3..d29b923eebe4 100644
--- a/lavamoat/browserify/main/policy.json
+++ b/lavamoat/browserify/main/policy.json
@@ -2508,29 +2508,17 @@
       }
     },
     "@metamask/snaps-sdk>@metamask/key-tree": {
+      "globals": {
+        "crypto.subtle": true
+      },
       "packages": {
         "@metamask/message-signing-snap>@noble/curves": true,
         "@metamask/scure-bip39": true,
-        "@metamask/snaps-sdk>@metamask/key-tree>@metamask/utils": true,
+        "@metamask/utils": true,
         "@metamask/utils>@scure/base": true,
         "@noble/hashes": true
       }
     },
-    "@metamask/snaps-sdk>@metamask/key-tree>@metamask/utils": {
-      "globals": {
-        "TextDecoder": true,
-        "TextEncoder": true
-      },
-      "packages": {
-        "@metamask/utils>@metamask/superstruct": true,
-        "@metamask/utils>@scure/base": true,
-        "@metamask/utils>pony-cause": true,
-        "@noble/hashes": true,
-        "browserify>buffer": true,
-        "nock>debug": true,
-        "semver": true
-      }
-    },
     "@metamask/snaps-utils": {
       "globals": {
         "File": true,
diff --git a/lavamoat/browserify/mmi/policy.json b/lavamoat/browserify/mmi/policy.json
index 70019837e27e..718e8229680f 100644
--- a/lavamoat/browserify/mmi/policy.json
+++ b/lavamoat/browserify/mmi/policy.json
@@ -2600,29 +2600,17 @@
       }
     },
     "@metamask/snaps-sdk>@metamask/key-tree": {
+      "globals": {
+        "crypto.subtle": true
+      },
       "packages": {
         "@metamask/message-signing-snap>@noble/curves": true,
         "@metamask/scure-bip39": true,
-        "@metamask/snaps-sdk>@metamask/key-tree>@metamask/utils": true,
+        "@metamask/utils": true,
         "@metamask/utils>@scure/base": true,
         "@noble/hashes": true
       }
     },
-    "@metamask/snaps-sdk>@metamask/key-tree>@metamask/utils": {
-      "globals": {
-        "TextDecoder": true,
-        "TextEncoder": true
-      },
-      "packages": {
-        "@metamask/utils>@metamask/superstruct": true,
-        "@metamask/utils>@scure/base": true,
-        "@metamask/utils>pony-cause": true,
-        "@noble/hashes": true,
-        "browserify>buffer": true,
-        "nock>debug": true,
-        "semver": true
-      }
-    },
     "@metamask/snaps-utils": {
       "globals": {
         "File": true,
diff --git a/package.json b/package.json
index 1029f45e232d..d5d55fc295e5 100644
--- a/package.json
+++ b/package.json
@@ -230,7 +230,7 @@
     "semver@7.3.8": "^7.5.4",
     "@trezor/schema-utils@npm:1.0.2": "patch:@trezor/schema-utils@npm%3A1.0.2#~/.yarn/patches/@trezor-schema-utils-npm-1.0.2-7dd48689b2.patch",
     "lavamoat-core@npm:^15.1.1": "patch:lavamoat-core@npm%3A15.1.1#~/.yarn/patches/lavamoat-core-npm-15.1.1-51fbe39988.patch",
-    "@metamask/snaps-sdk": "^6.12.0",
+    "@metamask/snaps-sdk": "^6.13.0",
     "@swc/types@0.1.5": "^0.1.6",
     "@babel/core": "patch:@babel/core@npm%3A7.25.9#~/.yarn/patches/@babel-core-npm-7.25.9-4ae3bff7f3.patch",
     "@babel/runtime": "patch:@babel/runtime@npm%3A7.25.9#~/.yarn/patches/@babel-runtime-npm-7.25.9-fe8c62510a.patch",
@@ -343,11 +343,11 @@
     "@metamask/selected-network-controller": "^19.0.0",
     "@metamask/signature-controller": "^23.0.0",
     "@metamask/smart-transactions-controller": "^15.0.0",
-    "@metamask/snaps-controllers": "^9.14.0",
+    "@metamask/snaps-controllers": "^9.15.0",
     "@metamask/snaps-execution-environments": "^6.10.0",
-    "@metamask/snaps-rpc-methods": "^11.6.0",
-    "@metamask/snaps-sdk": "^6.12.0",
-    "@metamask/snaps-utils": "^8.6.0",
+    "@metamask/snaps-rpc-methods": "^11.7.0",
+    "@metamask/snaps-sdk": "^6.13.0",
+    "@metamask/snaps-utils": "^8.6.1",
     "@metamask/solana-wallet-snap": "^0.1.9",
     "@metamask/transaction-controller": "^41.0.0",
     "@metamask/user-operation-controller": "^19.0.0",
diff --git a/test/e2e/snaps/enums.js b/test/e2e/snaps/enums.js
index 30037479fca8..c17c4bd9eff7 100644
--- a/test/e2e/snaps/enums.js
+++ b/test/e2e/snaps/enums.js
@@ -1,3 +1,3 @@
 module.exports = {
-  TEST_SNAPS_WEBSITE_URL: 'https://metamask.github.io/snaps/test-snaps/2.15.3',
+  TEST_SNAPS_WEBSITE_URL: 'https://metamask.github.io/snaps/test-snaps/2.15.4',
 };
diff --git a/test/e2e/snaps/test-snap-metrics.spec.js b/test/e2e/snaps/test-snap-metrics.spec.js
index 6c8ac7b9530f..0b3ef8db2bf6 100644
--- a/test/e2e/snaps/test-snap-metrics.spec.js
+++ b/test/e2e/snaps/test-snap-metrics.spec.js
@@ -245,7 +245,7 @@ describe('Test Snap Metrics', function () {
         assert.deepStrictEqual(events[1].properties, {
           snap_id: 'npm:@metamask/notification-example-snap',
           origin: 'https://metamask.github.io',
-          version: '2.1.4',
+          version: '2.2.0',
           category: 'Snaps',
           locale: 'en',
           chain_id: '0x539',
@@ -545,7 +545,7 @@ describe('Test Snap Metrics', function () {
         const events = await getEventPayloads(driver, mockedEndpoints);
         assert.deepStrictEqual(events[0].properties, {
           snap_id: 'npm:@metamask/notification-example-snap',
-          version: '2.1.4',
+          version: '2.2.0',
           category: 'Snaps',
           locale: 'en',
           chain_id: '0x539',
diff --git a/ui/components/app/snaps/snap-ui-renderer/components/text.ts b/ui/components/app/snaps/snap-ui-renderer/components/text.ts
index b0e30a6d15d1..fe9194817ca3 100644
--- a/ui/components/app/snaps/snap-ui-renderer/components/text.ts
+++ b/ui/components/app/snaps/snap-ui-renderer/components/text.ts
@@ -39,7 +39,8 @@ export const text: UIComponentFactory<TextElement> = ({
       params,
     ),
     props: {
-      variant: TextVariant.bodyMd,
+      variant:
+        element.props.size === 'sm' ? TextVariant.bodySm : TextVariant.bodyMd,
       overflowWrap: OverflowWrap.Anywhere,
       color: getTextColor(),
       className: 'snap-ui-renderer__text',
diff --git a/yarn.lock b/yarn.lock
index 14aac38669f7..4433f04769b4 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5583,16 +5583,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/key-tree@npm:^9.1.2":
-  version: 9.1.2
-  resolution: "@metamask/key-tree@npm:9.1.2"
+"@metamask/key-tree@npm:^10.0.1":
+  version: 10.0.1
+  resolution: "@metamask/key-tree@npm:10.0.1"
   dependencies:
     "@metamask/scure-bip39": "npm:^2.1.1"
-    "@metamask/utils": "npm:^9.0.0"
+    "@metamask/utils": "npm:^10.0.1"
     "@noble/curves": "npm:^1.2.0"
     "@noble/hashes": "npm:^1.3.2"
     "@scure/base": "npm:^1.0.0"
-  checksum: 10/9b178a4156b2f36bf630564dd0530c41c6356492971d2bcc8f979c79c81144945823a5b770e4097e12b89b42133b81f00c95a7b8fe9931ea1dd928989ee3c406
+  checksum: 10/a49902ef2b6f1f0c461eb4510b0c1a07d2bae2a13c4fd0f05e9c50116f6cf3db997ae9bc039197fa705e60ca410d32c52ded2d349d37452a3f2682263a1a6472
   languageName: node
   linkType: hard
 
@@ -6167,23 +6167,24 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/snaps-controllers@npm:^9.10.0, @metamask/snaps-controllers@npm:^9.14.0":
-  version: 9.14.0
-  resolution: "@metamask/snaps-controllers@npm:9.14.0"
+"@metamask/snaps-controllers@npm:^9.10.0, @metamask/snaps-controllers@npm:^9.15.0":
+  version: 9.15.0
+  resolution: "@metamask/snaps-controllers@npm:9.15.0"
   dependencies:
     "@metamask/approval-controller": "npm:^7.1.1"
     "@metamask/base-controller": "npm:^7.0.2"
     "@metamask/json-rpc-engine": "npm:^10.0.1"
     "@metamask/json-rpc-middleware-stream": "npm:^8.0.5"
+    "@metamask/key-tree": "npm:^10.0.1"
     "@metamask/object-multiplex": "npm:^2.0.0"
     "@metamask/permission-controller": "npm:^11.0.3"
     "@metamask/phishing-controller": "npm:^12.0.2"
     "@metamask/post-message-stream": "npm:^8.1.1"
     "@metamask/rpc-errors": "npm:^7.0.1"
     "@metamask/snaps-registry": "npm:^3.2.2"
-    "@metamask/snaps-rpc-methods": "npm:^11.6.0"
-    "@metamask/snaps-sdk": "npm:^6.12.0"
-    "@metamask/snaps-utils": "npm:^8.6.0"
+    "@metamask/snaps-rpc-methods": "npm:^11.7.0"
+    "@metamask/snaps-sdk": "npm:^6.13.0"
+    "@metamask/snaps-utils": "npm:^8.6.1"
     "@metamask/utils": "npm:^10.0.0"
     "@xstate/fsm": "npm:^2.0.0"
     browserify-zlib: "npm:^0.2.0"
@@ -6201,7 +6202,7 @@ __metadata:
   peerDependenciesMeta:
     "@metamask/snaps-execution-environments":
       optional: true
-  checksum: 10/cce5a4d7af65d70a2a2902f9a89b15145590edccf8171b3994e2ddde74c6700abf49d7b800275d7ab3b216ef3dfca3be82c4145b5986d20ec1df8b4c50b95314
+  checksum: 10/dd849398c4deefbca55b3b4a5e3fe885c45012cd8132bb83367d024c0c2dc99b13be036aa84049d5a1ba1431f9fd66897623f3961a34ebbbf70fe7bce4db322e
   languageName: node
   linkType: hard
 
@@ -6236,48 +6237,48 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/snaps-rpc-methods@npm:^11.6.0":
-  version: 11.6.0
-  resolution: "@metamask/snaps-rpc-methods@npm:11.6.0"
+"@metamask/snaps-rpc-methods@npm:^11.7.0":
+  version: 11.7.0
+  resolution: "@metamask/snaps-rpc-methods@npm:11.7.0"
   dependencies:
-    "@metamask/key-tree": "npm:^9.1.2"
+    "@metamask/key-tree": "npm:^10.0.1"
     "@metamask/permission-controller": "npm:^11.0.3"
     "@metamask/rpc-errors": "npm:^7.0.1"
-    "@metamask/snaps-sdk": "npm:^6.12.0"
-    "@metamask/snaps-utils": "npm:^8.6.0"
+    "@metamask/snaps-sdk": "npm:^6.13.0"
+    "@metamask/snaps-utils": "npm:^8.6.1"
     "@metamask/superstruct": "npm:^3.1.0"
     "@metamask/utils": "npm:^10.0.0"
     "@noble/hashes": "npm:^1.3.1"
-  checksum: 10/6788717e1ccab8eb40876fce15a4b66b44f267b33fe953efa56c0fee94f651391704556eaf9f3f9e6787e0bbbe6b0fb470a9da45d68d78b587ad96b6a3f246ac
+  checksum: 10/92e4131d15b8dd68a29bd845e6c795aab8c3299048eaff2c3970db78a5eb476d8841f6a612b42e878812bb0757f2126287581f4e12259846851f02d6e6d836f5
   languageName: node
   linkType: hard
 
-"@metamask/snaps-sdk@npm:^6.12.0":
-  version: 6.12.0
-  resolution: "@metamask/snaps-sdk@npm:6.12.0"
+"@metamask/snaps-sdk@npm:^6.13.0":
+  version: 6.13.0
+  resolution: "@metamask/snaps-sdk@npm:6.13.0"
   dependencies:
-    "@metamask/key-tree": "npm:^9.1.2"
+    "@metamask/key-tree": "npm:^10.0.1"
     "@metamask/providers": "npm:^18.1.1"
     "@metamask/rpc-errors": "npm:^7.0.1"
     "@metamask/superstruct": "npm:^3.1.0"
     "@metamask/utils": "npm:^10.0.0"
-  checksum: 10/b0e24fee2c90ac2f456aeb5babc180c74f56b8cf94f38abdd9b022c65a9cac4a10015e3d4053784292c184238f97704cb2b6a41f6e7a04f23ffaa8d519d2a39e
+  checksum: 10/115c738cb140810856ded055ac92a538c011adbd6a5f32a4e1fde42dcbd162c7eac182aab904de6b65af99b9520995d768627bd7f460da11d0aa359700e05b04
   languageName: node
   linkType: hard
 
-"@metamask/snaps-utils@npm:^8.3.0, @metamask/snaps-utils@npm:^8.6.0":
-  version: 8.6.0
-  resolution: "@metamask/snaps-utils@npm:8.6.0"
+"@metamask/snaps-utils@npm:^8.3.0, @metamask/snaps-utils@npm:^8.6.0, @metamask/snaps-utils@npm:^8.6.1":
+  version: 8.6.1
+  resolution: "@metamask/snaps-utils@npm:8.6.1"
   dependencies:
     "@babel/core": "npm:^7.23.2"
     "@babel/types": "npm:^7.23.0"
     "@metamask/base-controller": "npm:^7.0.2"
-    "@metamask/key-tree": "npm:^9.1.2"
+    "@metamask/key-tree": "npm:^10.0.1"
     "@metamask/permission-controller": "npm:^11.0.3"
     "@metamask/rpc-errors": "npm:^7.0.1"
     "@metamask/slip44": "npm:^4.0.0"
     "@metamask/snaps-registry": "npm:^3.2.2"
-    "@metamask/snaps-sdk": "npm:^6.11.0"
+    "@metamask/snaps-sdk": "npm:^6.13.0"
     "@metamask/superstruct": "npm:^3.1.0"
     "@metamask/utils": "npm:^10.0.0"
     "@noble/hashes": "npm:^1.3.1"
@@ -6292,7 +6293,7 @@ __metadata:
     semver: "npm:^7.5.4"
     ses: "npm:^1.1.0"
     validate-npm-package-name: "npm:^5.0.0"
-  checksum: 10/c0f538f3f95e1875f6557b6ecc32f981bc4688d581af8cdc62c6c3ab8951c138286cd0b2d1cd82f769df24fcec10f71dcda67ae9a47edcff9ff73d52672df191
+  checksum: 10/d58e276b2849662e764a4ce5f45a03df361a5c65e9c09814e41b723407dffbd3a215626f5d9a8c4705a0cad73b702e10d76201174b44f92fbc68fdf59fb24d5d
   languageName: node
   linkType: hard
 
@@ -26479,11 +26480,11 @@ __metadata:
     "@metamask/selected-network-controller": "npm:^19.0.0"
     "@metamask/signature-controller": "npm:^23.0.0"
     "@metamask/smart-transactions-controller": "npm:^15.0.0"
-    "@metamask/snaps-controllers": "npm:^9.14.0"
+    "@metamask/snaps-controllers": "npm:^9.15.0"
     "@metamask/snaps-execution-environments": "npm:^6.10.0"
-    "@metamask/snaps-rpc-methods": "npm:^11.6.0"
-    "@metamask/snaps-sdk": "npm:^6.12.0"
-    "@metamask/snaps-utils": "npm:^8.6.0"
+    "@metamask/snaps-rpc-methods": "npm:^11.7.0"
+    "@metamask/snaps-sdk": "npm:^6.13.0"
+    "@metamask/snaps-utils": "npm:^8.6.1"
     "@metamask/solana-wallet-snap": "npm:^0.1.9"
     "@metamask/test-bundler": "npm:^1.0.0"
     "@metamask/test-dapp": "npm:8.13.0"

From c6564af481577d960f7c20a1a11d9bd8651ede4c Mon Sep 17 00:00:00 2001
From: George Weiler <georgejweiler@gmail.com>
Date: Thu, 5 Dec 2024 06:22:06 -0700
Subject: [PATCH 036/175] chore: adds ramp-dev-team to codeowners (#28933)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## **Description**

Adds ramp-dev-team to the CODEOWNERS file so that ramps files require
the correct approvals.


[![Open in GitHub
Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/28933?quickstart=1)

## **Related issues**

Fixes:

## **Manual testing steps**

1. Go to this page...
2.
3.

## **Screenshots/Recordings**

<!-- If applicable, add screenshots and/or recordings to visualize the
before and after of your change. -->

### **Before**

<!-- [screenshots/recordings] -->

### **After**

<!-- [screenshots/recordings] -->

## **Pre-merge author checklist**

- [ ] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension Coding
Standards](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/CODING_GUIDELINES.md).
- [ ] I've completed the PR template to the best of my ability
- [ ] I’ve included tests if applicable
- [ ] I’ve documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [ ] I’ve applied the right labels on the PR (see [labeling
guidelines](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.

## **Pre-merge reviewer checklist**

- [ ] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed).
- [ ] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.

---------

Co-authored-by: Dan J Miller <danjm.com@gmail.com>
---
 .github/CODEOWNERS | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index b0f8f1abe46b..48ad55708f52 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -96,6 +96,9 @@ app/scripts/lib/snap-keyring         @MetaMask/accounts-engineers
 ui/pages/swaps                                        @MetaMask/swaps-engineers
 app/scripts/controllers/swaps                         @MetaMask/swaps-engineers
 
+# Ramps team to own code for the ramps folder
+**/ramps/**                                           @MetaMask/ramp
+
 # Snaps
 **/snaps/**                          @MetaMask/snaps-devs
 shared/constants/permissions.ts      @MetaMask/snaps-devs

From 9e90905067f98d7de30bbc30f1c1ee05f50250dc Mon Sep 17 00:00:00 2001
From: Mathieu Artu <mathieu.artu@consensys.net>
Date: Thu, 5 Dec 2024 15:35:34 +0100
Subject: [PATCH 037/175] chore: transfer ownership of auth & profile sync e2e
 to identity (#28946)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## **Description**

This PR takes care of all the necessary changes in order to decouple
Auth & Profile Sync E2E files from the notifications E2E files.
This also underlines the ownership change from @MetaMask/notifications
to @MetaMask/identity.

The changes made here will help transitioning to cleaner separation of
concerns for features leveraging profile sync (i.e Notifications,
Account syncing...).

⚠️ This PR does not add missing tests nor introduces any changes. This
is only moving files around and separating concerns.

[![Open in GitHub
Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/28946?quickstart=1)

## **Related issues**

Fixes:

## **Manual testing steps**

No testing steps since this PR does not change the implementation of
existing features.

## **Screenshots/Recordings**

<!-- If applicable, add screenshots and/or recordings to visualize the
before and after of your change. -->

### **Before**

<!-- [screenshots/recordings] -->

### **After**

<!-- [screenshots/recordings] -->

## **Pre-merge author checklist**

- [x] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension Coding
Standards](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/CODING_GUIDELINES.md).
- [x] I've completed the PR template to the best of my ability
- [x] I’ve included tests if applicable
- [x] I’ve documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [x] I’ve applied the right labels on the PR (see [labeling
guidelines](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.

## **Pre-merge reviewer checklist**

- [x] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed).
- [x] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.
---
 .../userStorageMockttpController.test.ts      |   0
 .../userStorageMockttpController.ts           |   0
 test/e2e/mock-e2e.js                          |   4 +
 .../account-syncing/helpers.ts                |   0
 .../importing-private-key-account.spec.ts     |  30 ++--
 .../account-syncing/mockData.ts               |   0
 .../account-syncing/new-user-sync.spec.ts     |  24 ++--
 .../onboarding-with-opt-out.spec.ts           |  35 ++---
 .../sync-after-adding-account.spec.ts         |  44 +++---
 .../sync-after-modifying-account-name.spec.ts |  26 ++--
 .../sync-after-onboarding.spec.ts             |  17 +--
 .../sync-with-account-balances.spec.ts        |  20 +--
 test/e2e/tests/identity/constants.ts          |   9 ++
 test/e2e/tests/identity/mocks.ts              | 136 ++++++++++++++++++
 test/e2e/tests/notifications/mocks.ts         |  92 +-----------
 15 files changed, 226 insertions(+), 211 deletions(-)
 rename test/e2e/helpers/{ => identity}/user-storage/userStorageMockttpController.test.ts (100%)
 rename test/e2e/helpers/{ => identity}/user-storage/userStorageMockttpController.ts (100%)
 rename test/e2e/tests/{notifications => identity}/account-syncing/helpers.ts (100%)
 rename test/e2e/tests/{notifications => identity}/account-syncing/importing-private-key-account.spec.ts (83%)
 rename test/e2e/tests/{notifications => identity}/account-syncing/mockData.ts (100%)
 rename test/e2e/tests/{notifications => identity}/account-syncing/new-user-sync.spec.ts (87%)
 rename test/e2e/tests/{notifications => identity}/account-syncing/onboarding-with-opt-out.spec.ts (89%)
 rename test/e2e/tests/{notifications => identity}/account-syncing/sync-after-adding-account.spec.ts (86%)
 rename test/e2e/tests/{notifications => identity}/account-syncing/sync-after-modifying-account-name.spec.ts (85%)
 rename test/e2e/tests/{notifications => identity}/account-syncing/sync-after-onboarding.spec.ts (84%)
 rename test/e2e/tests/{notifications => identity}/account-syncing/sync-with-account-balances.spec.ts (93%)
 create mode 100644 test/e2e/tests/identity/constants.ts
 create mode 100644 test/e2e/tests/identity/mocks.ts

diff --git a/test/e2e/helpers/user-storage/userStorageMockttpController.test.ts b/test/e2e/helpers/identity/user-storage/userStorageMockttpController.test.ts
similarity index 100%
rename from test/e2e/helpers/user-storage/userStorageMockttpController.test.ts
rename to test/e2e/helpers/identity/user-storage/userStorageMockttpController.test.ts
diff --git a/test/e2e/helpers/user-storage/userStorageMockttpController.ts b/test/e2e/helpers/identity/user-storage/userStorageMockttpController.ts
similarity index 100%
rename from test/e2e/helpers/user-storage/userStorageMockttpController.ts
rename to test/e2e/helpers/identity/user-storage/userStorageMockttpController.ts
diff --git a/test/e2e/mock-e2e.js b/test/e2e/mock-e2e.js
index 2c56c5797a32..c7d8b02d4c7d 100644
--- a/test/e2e/mock-e2e.js
+++ b/test/e2e/mock-e2e.js
@@ -50,6 +50,7 @@ const {
   mockEmptyStalelistAndHotlist,
 } = require('./tests/phishing-controller/mocks');
 const { mockNotificationServices } = require('./tests/notifications/mocks');
+const { mockIdentityServices } = require('./tests/identity/mocks');
 
 const emptyHtmlPage = () => `<!DOCTYPE html>
 <html lang="en">
@@ -731,6 +732,9 @@ async function setupMocking(
   // Notification APIs
   await mockNotificationServices(server);
 
+  // Identity APIs
+  await mockIdentityServices(server);
+
   await server.forGet(/^https:\/\/sourcify.dev\/(.*)/u).thenCallback(() => {
     return {
       statusCode: 404,
diff --git a/test/e2e/tests/notifications/account-syncing/helpers.ts b/test/e2e/tests/identity/account-syncing/helpers.ts
similarity index 100%
rename from test/e2e/tests/notifications/account-syncing/helpers.ts
rename to test/e2e/tests/identity/account-syncing/helpers.ts
diff --git a/test/e2e/tests/notifications/account-syncing/importing-private-key-account.spec.ts b/test/e2e/tests/identity/account-syncing/importing-private-key-account.spec.ts
similarity index 83%
rename from test/e2e/tests/notifications/account-syncing/importing-private-key-account.spec.ts
rename to test/e2e/tests/identity/account-syncing/importing-private-key-account.spec.ts
index 2c56f79e2c99..6647a78f42d3 100644
--- a/test/e2e/tests/notifications/account-syncing/importing-private-key-account.spec.ts
+++ b/test/e2e/tests/identity/account-syncing/importing-private-key-account.spec.ts
@@ -2,13 +2,13 @@ import { Mockttp } from 'mockttp';
 import { USER_STORAGE_FEATURE_NAMES } from '@metamask/profile-sync-controller/sdk';
 import { withFixtures } from '../../../helpers';
 import FixtureBuilder from '../../../fixture-builder';
-import { mockNotificationServices } from '../mocks';
+import { mockIdentityServices } from '../mocks';
 import {
-  NOTIFICATIONS_TEAM_IMPORTED_PRIVATE_KEY,
-  NOTIFICATIONS_TEAM_PASSWORD,
-  NOTIFICATIONS_TEAM_SEED_PHRASE,
+  IDENTITY_TEAM_IMPORTED_PRIVATE_KEY,
+  IDENTITY_TEAM_PASSWORD,
+  IDENTITY_TEAM_SEED_PHRASE,
 } from '../constants';
-import { UserStorageMockttpController } from '../../../helpers/user-storage/userStorageMockttpController';
+import { UserStorageMockttpController } from '../../../helpers/identity/user-storage/userStorageMockttpController';
 import HeaderNavbar from '../../../page-objects/pages/header-navbar';
 import AccountListPage from '../../../page-objects/pages/account-list-page';
 import HomePage from '../../../page-objects/pages/home/homepage';
@@ -37,17 +37,14 @@ describe('Account syncing - Import With Private Key @no-mmi', function () {
               },
             );
 
-            return mockNotificationServices(
-              server,
-              userStorageMockttpController,
-            );
+            return mockIdentityServices(server, userStorageMockttpController);
           },
         },
         async ({ driver }) => {
           await completeImportSRPOnboardingFlow({
             driver,
-            seedPhrase: NOTIFICATIONS_TEAM_SEED_PHRASE,
-            password: NOTIFICATIONS_TEAM_PASSWORD,
+            seedPhrase: IDENTITY_TEAM_SEED_PHRASE,
+            password: IDENTITY_TEAM_PASSWORD,
           });
           const homePage = new HomePage(driver);
           await homePage.check_pageIsLoaded();
@@ -71,7 +68,7 @@ describe('Account syncing - Import With Private Key @no-mmi', function () {
           );
           await accountListPage.openAccountOptionsMenu();
           await accountListPage.addNewImportedAccount(
-            NOTIFICATIONS_TEAM_IMPORTED_PRIVATE_KEY,
+            IDENTITY_TEAM_IMPORTED_PRIVATE_KEY,
           );
         },
       );
@@ -85,17 +82,14 @@ describe('Account syncing - Import With Private Key @no-mmi', function () {
               USER_STORAGE_FEATURE_NAMES.accounts,
               server,
             );
-            return mockNotificationServices(
-              server,
-              userStorageMockttpController,
-            );
+            return mockIdentityServices(server, userStorageMockttpController);
           },
         },
         async ({ driver }) => {
           await completeImportSRPOnboardingFlow({
             driver,
-            seedPhrase: NOTIFICATIONS_TEAM_SEED_PHRASE,
-            password: NOTIFICATIONS_TEAM_PASSWORD,
+            seedPhrase: IDENTITY_TEAM_SEED_PHRASE,
+            password: IDENTITY_TEAM_PASSWORD,
           });
           const homePage = new HomePage(driver);
           await homePage.check_pageIsLoaded();
diff --git a/test/e2e/tests/notifications/account-syncing/mockData.ts b/test/e2e/tests/identity/account-syncing/mockData.ts
similarity index 100%
rename from test/e2e/tests/notifications/account-syncing/mockData.ts
rename to test/e2e/tests/identity/account-syncing/mockData.ts
diff --git a/test/e2e/tests/notifications/account-syncing/new-user-sync.spec.ts b/test/e2e/tests/identity/account-syncing/new-user-sync.spec.ts
similarity index 87%
rename from test/e2e/tests/notifications/account-syncing/new-user-sync.spec.ts
rename to test/e2e/tests/identity/account-syncing/new-user-sync.spec.ts
index aead37e63002..e9a82b128352 100644
--- a/test/e2e/tests/notifications/account-syncing/new-user-sync.spec.ts
+++ b/test/e2e/tests/identity/account-syncing/new-user-sync.spec.ts
@@ -2,9 +2,9 @@ import { Mockttp } from 'mockttp';
 import { USER_STORAGE_FEATURE_NAMES } from '@metamask/profile-sync-controller/sdk';
 import { withFixtures } from '../../../helpers';
 import FixtureBuilder from '../../../fixture-builder';
-import { mockNotificationServices } from '../mocks';
-import { NOTIFICATIONS_TEAM_PASSWORD } from '../constants';
-import { UserStorageMockttpController } from '../../../helpers/user-storage/userStorageMockttpController';
+import { mockIdentityServices } from '../mocks';
+import { IDENTITY_TEAM_PASSWORD } from '../constants';
+import { UserStorageMockttpController } from '../../../helpers/identity/user-storage/userStorageMockttpController';
 import HeaderNavbar from '../../../page-objects/pages/header-navbar';
 import AccountListPage from '../../../page-objects/pages/account-list-page';
 import HomePage from '../../../page-objects/pages/home/homepage';
@@ -36,17 +36,14 @@ describe('Account syncing - New User @no-mmi', function () {
               server,
             );
 
-            return mockNotificationServices(
-              server,
-              userStorageMockttpController,
-            );
+            return mockIdentityServices(server, userStorageMockttpController);
           },
         },
         async ({ driver }) => {
           // Create a new wallet
           await completeCreateNewWalletOnboardingFlow({
             driver,
-            password: NOTIFICATIONS_TEAM_PASSWORD,
+            password: IDENTITY_TEAM_PASSWORD,
           });
           const homePage = new HomePage(driver);
           await homePage.check_pageIsLoaded();
@@ -81,9 +78,7 @@ describe('Account syncing - New User @no-mmi', function () {
           await privacySettings.check_pageIsLoaded();
           await privacySettings.openRevealSrpQuiz();
           await privacySettings.completeRevealSrpQuiz();
-          await privacySettings.fillPasswordToRevealSrp(
-            NOTIFICATIONS_TEAM_PASSWORD,
-          );
+          await privacySettings.fillPasswordToRevealSrp(IDENTITY_TEAM_PASSWORD);
           walletSrp = await privacySettings.getSrpInRevealSrpDialog();
           if (!walletSrp) {
             throw new Error('Wallet SRP was not set');
@@ -100,10 +95,7 @@ describe('Account syncing - New User @no-mmi', function () {
               USER_STORAGE_FEATURE_NAMES.accounts,
               server,
             );
-            return mockNotificationServices(
-              server,
-              userStorageMockttpController,
-            );
+            return mockIdentityServices(server, userStorageMockttpController);
           },
         },
         async ({ driver }) => {
@@ -111,7 +103,7 @@ describe('Account syncing - New User @no-mmi', function () {
           await completeImportSRPOnboardingFlow({
             driver,
             seedPhrase: walletSrp,
-            password: NOTIFICATIONS_TEAM_PASSWORD,
+            password: IDENTITY_TEAM_PASSWORD,
           });
           const homePage = new HomePage(driver);
           await homePage.check_pageIsLoaded();
diff --git a/test/e2e/tests/notifications/account-syncing/onboarding-with-opt-out.spec.ts b/test/e2e/tests/identity/account-syncing/onboarding-with-opt-out.spec.ts
similarity index 89%
rename from test/e2e/tests/notifications/account-syncing/onboarding-with-opt-out.spec.ts
rename to test/e2e/tests/identity/account-syncing/onboarding-with-opt-out.spec.ts
index f164ced25cdc..19908211181b 100644
--- a/test/e2e/tests/notifications/account-syncing/onboarding-with-opt-out.spec.ts
+++ b/test/e2e/tests/identity/account-syncing/onboarding-with-opt-out.spec.ts
@@ -2,12 +2,12 @@ import { Mockttp } from 'mockttp';
 import { USER_STORAGE_FEATURE_NAMES } from '@metamask/profile-sync-controller/sdk';
 import { withFixtures } from '../../../helpers';
 import FixtureBuilder from '../../../fixture-builder';
-import { mockNotificationServices } from '../mocks';
+import { mockIdentityServices } from '../mocks';
 import {
-  NOTIFICATIONS_TEAM_PASSWORD,
-  NOTIFICATIONS_TEAM_SEED_PHRASE,
+  IDENTITY_TEAM_PASSWORD,
+  IDENTITY_TEAM_SEED_PHRASE,
 } from '../constants';
-import { UserStorageMockttpController } from '../../../helpers/user-storage/userStorageMockttpController';
+import { UserStorageMockttpController } from '../../../helpers/identity/user-storage/userStorageMockttpController';
 import AccountListPage from '../../../page-objects/pages/account-list-page';
 import HeaderNavbar from '../../../page-objects/pages/header-navbar';
 import HomePage from '../../../page-objects/pages/home/homepage';
@@ -45,17 +45,14 @@ describe('Account syncing - Opt-out Profile Sync @no-mmi', function () {
                 getResponse: accountsSyncMockResponse,
               },
             );
-            return mockNotificationServices(
-              server,
-              userStorageMockttpController,
-            );
+            return mockIdentityServices(server, userStorageMockttpController);
           },
         },
         async ({ driver }) => {
           await importSRPOnboardingFlow({
             driver,
-            seedPhrase: NOTIFICATIONS_TEAM_SEED_PHRASE,
-            password: NOTIFICATIONS_TEAM_PASSWORD,
+            seedPhrase: IDENTITY_TEAM_SEED_PHRASE,
+            password: IDENTITY_TEAM_PASSWORD,
           });
           const onboardingCompletePage = new OnboardingCompletePage(driver);
           await onboardingCompletePage.check_pageIsLoaded();
@@ -105,16 +102,13 @@ describe('Account syncing - Opt-out Profile Sync @no-mmi', function () {
               USER_STORAGE_FEATURE_NAMES.accounts,
               server,
             );
-            return mockNotificationServices(
-              server,
-              userStorageMockttpController,
-            );
+            return mockIdentityServices(server, userStorageMockttpController);
           },
         },
         async ({ driver }) => {
           await createNewWalletOnboardingFlow({
             driver,
-            password: NOTIFICATIONS_TEAM_PASSWORD,
+            password: IDENTITY_TEAM_PASSWORD,
           });
           const onboardingCompletePage = new OnboardingCompletePage(driver);
           await onboardingCompletePage.check_pageIsLoaded();
@@ -154,9 +148,7 @@ describe('Account syncing - Opt-out Profile Sync @no-mmi', function () {
           await privacySettings.check_pageIsLoaded();
           await privacySettings.openRevealSrpQuiz();
           await privacySettings.completeRevealSrpQuiz();
-          await privacySettings.fillPasswordToRevealSrp(
-            NOTIFICATIONS_TEAM_PASSWORD,
-          );
+          await privacySettings.fillPasswordToRevealSrp(IDENTITY_TEAM_PASSWORD);
           walletSrp = await privacySettings.getSrpInRevealSrpDialog();
           if (!walletSrp) {
             throw new Error('Wallet SRP was not set');
@@ -174,17 +166,14 @@ describe('Account syncing - Opt-out Profile Sync @no-mmi', function () {
               USER_STORAGE_FEATURE_NAMES.accounts,
               server,
             );
-            return mockNotificationServices(
-              server,
-              userStorageMockttpController,
-            );
+            return mockIdentityServices(server, userStorageMockttpController);
           },
         },
         async ({ driver }) => {
           await completeImportSRPOnboardingFlow({
             driver,
             seedPhrase: walletSrp,
-            password: NOTIFICATIONS_TEAM_PASSWORD,
+            password: IDENTITY_TEAM_PASSWORD,
           });
           const homePage = new HomePage(driver);
           await homePage.check_pageIsLoaded();
diff --git a/test/e2e/tests/notifications/account-syncing/sync-after-adding-account.spec.ts b/test/e2e/tests/identity/account-syncing/sync-after-adding-account.spec.ts
similarity index 86%
rename from test/e2e/tests/notifications/account-syncing/sync-after-adding-account.spec.ts
rename to test/e2e/tests/identity/account-syncing/sync-after-adding-account.spec.ts
index 7a8e19cc4f13..9c2fdb69c7e9 100644
--- a/test/e2e/tests/notifications/account-syncing/sync-after-adding-account.spec.ts
+++ b/test/e2e/tests/identity/account-syncing/sync-after-adding-account.spec.ts
@@ -2,12 +2,12 @@ import { Mockttp } from 'mockttp';
 import { USER_STORAGE_FEATURE_NAMES } from '@metamask/profile-sync-controller/sdk';
 import { withFixtures } from '../../../helpers';
 import FixtureBuilder from '../../../fixture-builder';
-import { mockNotificationServices } from '../mocks';
+import { mockIdentityServices } from '../mocks';
 import {
-  NOTIFICATIONS_TEAM_PASSWORD,
-  NOTIFICATIONS_TEAM_SEED_PHRASE,
+  IDENTITY_TEAM_PASSWORD,
+  IDENTITY_TEAM_SEED_PHRASE,
 } from '../constants';
-import { UserStorageMockttpController } from '../../../helpers/user-storage/userStorageMockttpController';
+import { UserStorageMockttpController } from '../../../helpers/identity/user-storage/userStorageMockttpController';
 import HeaderNavbar from '../../../page-objects/pages/header-navbar';
 import AccountListPage from '../../../page-objects/pages/account-list-page';
 import HomePage from '../../../page-objects/pages/home/homepage';
@@ -36,17 +36,14 @@ describe('Account syncing - Add Account @no-mmi', function () {
               },
             );
 
-            return mockNotificationServices(
-              server,
-              userStorageMockttpController,
-            );
+            return mockIdentityServices(server, userStorageMockttpController);
           },
         },
         async ({ driver }) => {
           await completeImportSRPOnboardingFlow({
             driver,
-            seedPhrase: NOTIFICATIONS_TEAM_SEED_PHRASE,
-            password: NOTIFICATIONS_TEAM_PASSWORD,
+            seedPhrase: IDENTITY_TEAM_SEED_PHRASE,
+            password: IDENTITY_TEAM_PASSWORD,
           });
           const homePage = new HomePage(driver);
           await homePage.check_pageIsLoaded();
@@ -81,17 +78,14 @@ describe('Account syncing - Add Account @no-mmi', function () {
               USER_STORAGE_FEATURE_NAMES.accounts,
               server,
             );
-            return mockNotificationServices(
-              server,
-              userStorageMockttpController,
-            );
+            return mockIdentityServices(server, userStorageMockttpController);
           },
         },
         async ({ driver }) => {
           await completeImportSRPOnboardingFlow({
             driver,
-            seedPhrase: NOTIFICATIONS_TEAM_SEED_PHRASE,
-            password: NOTIFICATIONS_TEAM_PASSWORD,
+            seedPhrase: IDENTITY_TEAM_SEED_PHRASE,
+            password: IDENTITY_TEAM_PASSWORD,
           });
           const homePage = new HomePage(driver);
           await homePage.check_pageIsLoaded();
@@ -141,17 +135,14 @@ describe('Account syncing - Add Account @no-mmi', function () {
               },
             );
 
-            return mockNotificationServices(
-              server,
-              userStorageMockttpController,
-            );
+            return mockIdentityServices(server, userStorageMockttpController);
           },
         },
         async ({ driver }) => {
           await completeImportSRPOnboardingFlow({
             driver,
-            seedPhrase: NOTIFICATIONS_TEAM_SEED_PHRASE,
-            password: NOTIFICATIONS_TEAM_PASSWORD,
+            seedPhrase: IDENTITY_TEAM_SEED_PHRASE,
+            password: IDENTITY_TEAM_PASSWORD,
           });
           const homePage = new HomePage(driver);
           await homePage.check_pageIsLoaded();
@@ -186,17 +177,14 @@ describe('Account syncing - Add Account @no-mmi', function () {
               USER_STORAGE_FEATURE_NAMES.accounts,
               server,
             );
-            return mockNotificationServices(
-              server,
-              userStorageMockttpController,
-            );
+            return mockIdentityServices(server, userStorageMockttpController);
           },
         },
         async ({ driver }) => {
           await completeImportSRPOnboardingFlow({
             driver,
-            seedPhrase: NOTIFICATIONS_TEAM_SEED_PHRASE,
-            password: NOTIFICATIONS_TEAM_PASSWORD,
+            seedPhrase: IDENTITY_TEAM_SEED_PHRASE,
+            password: IDENTITY_TEAM_PASSWORD,
           });
           const homePage = new HomePage(driver);
           await homePage.check_pageIsLoaded();
diff --git a/test/e2e/tests/notifications/account-syncing/sync-after-modifying-account-name.spec.ts b/test/e2e/tests/identity/account-syncing/sync-after-modifying-account-name.spec.ts
similarity index 85%
rename from test/e2e/tests/notifications/account-syncing/sync-after-modifying-account-name.spec.ts
rename to test/e2e/tests/identity/account-syncing/sync-after-modifying-account-name.spec.ts
index 97d56f66cf8d..07f6e4848aba 100644
--- a/test/e2e/tests/notifications/account-syncing/sync-after-modifying-account-name.spec.ts
+++ b/test/e2e/tests/identity/account-syncing/sync-after-modifying-account-name.spec.ts
@@ -2,12 +2,12 @@ import { Mockttp } from 'mockttp';
 import { USER_STORAGE_FEATURE_NAMES } from '@metamask/profile-sync-controller/sdk';
 import { withFixtures } from '../../../helpers';
 import FixtureBuilder from '../../../fixture-builder';
-import { mockNotificationServices } from '../mocks';
+import { mockIdentityServices } from '../mocks';
 import {
-  NOTIFICATIONS_TEAM_PASSWORD,
-  NOTIFICATIONS_TEAM_SEED_PHRASE,
+  IDENTITY_TEAM_PASSWORD,
+  IDENTITY_TEAM_SEED_PHRASE,
 } from '../constants';
-import { UserStorageMockttpController } from '../../../helpers/user-storage/userStorageMockttpController';
+import { UserStorageMockttpController } from '../../../helpers/identity/user-storage/userStorageMockttpController';
 import HeaderNavbar from '../../../page-objects/pages/header-navbar';
 import AccountListPage from '../../../page-objects/pages/account-list-page';
 import HomePage from '../../../page-objects/pages/home/homepage';
@@ -36,17 +36,14 @@ describe('Account syncing - Rename Accounts @no-mmi', function () {
               },
             );
 
-            return mockNotificationServices(
-              server,
-              userStorageMockttpController,
-            );
+            return mockIdentityServices(server, userStorageMockttpController);
           },
         },
         async ({ driver }) => {
           await completeImportSRPOnboardingFlow({
             driver,
-            seedPhrase: NOTIFICATIONS_TEAM_SEED_PHRASE,
-            password: NOTIFICATIONS_TEAM_PASSWORD,
+            seedPhrase: IDENTITY_TEAM_SEED_PHRASE,
+            password: IDENTITY_TEAM_PASSWORD,
           });
           const homePage = new HomePage(driver);
           await homePage.check_pageIsLoaded();
@@ -82,17 +79,14 @@ describe('Account syncing - Rename Accounts @no-mmi', function () {
               USER_STORAGE_FEATURE_NAMES.accounts,
               server,
             );
-            return mockNotificationServices(
-              server,
-              userStorageMockttpController,
-            );
+            return mockIdentityServices(server, userStorageMockttpController);
           },
         },
         async ({ driver }) => {
           await completeImportSRPOnboardingFlow({
             driver,
-            seedPhrase: NOTIFICATIONS_TEAM_SEED_PHRASE,
-            password: NOTIFICATIONS_TEAM_PASSWORD,
+            seedPhrase: IDENTITY_TEAM_SEED_PHRASE,
+            password: IDENTITY_TEAM_PASSWORD,
           });
           const homePage = new HomePage(driver);
           await homePage.check_pageIsLoaded();
diff --git a/test/e2e/tests/notifications/account-syncing/sync-after-onboarding.spec.ts b/test/e2e/tests/identity/account-syncing/sync-after-onboarding.spec.ts
similarity index 84%
rename from test/e2e/tests/notifications/account-syncing/sync-after-onboarding.spec.ts
rename to test/e2e/tests/identity/account-syncing/sync-after-onboarding.spec.ts
index f328244710ea..8d714bb6b273 100644
--- a/test/e2e/tests/notifications/account-syncing/sync-after-onboarding.spec.ts
+++ b/test/e2e/tests/identity/account-syncing/sync-after-onboarding.spec.ts
@@ -2,12 +2,12 @@ import { Mockttp } from 'mockttp';
 import { USER_STORAGE_FEATURE_NAMES } from '@metamask/profile-sync-controller/sdk';
 import { withFixtures } from '../../../helpers';
 import FixtureBuilder from '../../../fixture-builder';
-import { mockNotificationServices } from '../mocks';
+import { mockIdentityServices } from '../mocks';
 import {
-  NOTIFICATIONS_TEAM_PASSWORD,
-  NOTIFICATIONS_TEAM_SEED_PHRASE,
+  IDENTITY_TEAM_PASSWORD,
+  IDENTITY_TEAM_SEED_PHRASE,
 } from '../constants';
-import { UserStorageMockttpController } from '../../../helpers/user-storage/userStorageMockttpController';
+import { UserStorageMockttpController } from '../../../helpers/identity/user-storage/userStorageMockttpController';
 import HeaderNavbar from '../../../page-objects/pages/header-navbar';
 import AccountListPage from '../../../page-objects/pages/account-list-page';
 import HomePage from '../../../page-objects/pages/home/homepage';
@@ -35,17 +35,14 @@ describe('Account syncing - Onboarding @no-mmi', function () {
                 getResponse: accountsSyncMockResponse,
               },
             );
-            return mockNotificationServices(
-              server,
-              userStorageMockttpController,
-            );
+            return mockIdentityServices(server, userStorageMockttpController);
           },
         },
         async ({ driver }) => {
           await completeImportSRPOnboardingFlow({
             driver,
-            seedPhrase: NOTIFICATIONS_TEAM_SEED_PHRASE,
-            password: NOTIFICATIONS_TEAM_PASSWORD,
+            seedPhrase: IDENTITY_TEAM_SEED_PHRASE,
+            password: IDENTITY_TEAM_PASSWORD,
           });
           const homePage = new HomePage(driver);
           await homePage.check_pageIsLoaded();
diff --git a/test/e2e/tests/notifications/account-syncing/sync-with-account-balances.spec.ts b/test/e2e/tests/identity/account-syncing/sync-with-account-balances.spec.ts
similarity index 93%
rename from test/e2e/tests/notifications/account-syncing/sync-with-account-balances.spec.ts
rename to test/e2e/tests/identity/account-syncing/sync-with-account-balances.spec.ts
index 6c6ce2dfd48a..6fcc9e9cc0d0 100644
--- a/test/e2e/tests/notifications/account-syncing/sync-with-account-balances.spec.ts
+++ b/test/e2e/tests/identity/account-syncing/sync-with-account-balances.spec.ts
@@ -3,10 +3,10 @@ import { unlockWallet, withFixtures } from '../../../helpers';
 import FixtureBuilder from '../../../fixture-builder';
 import { mockInfuraAndAccountSync } from '../mocks';
 import {
-  NOTIFICATIONS_TEAM_PASSWORD,
-  NOTIFICATIONS_TEAM_SEED_PHRASE,
+  IDENTITY_TEAM_PASSWORD,
+  IDENTITY_TEAM_SEED_PHRASE,
 } from '../constants';
-import { UserStorageMockttpController } from '../../../helpers/user-storage/userStorageMockttpController';
+import { UserStorageMockttpController } from '../../../helpers/identity/user-storage/userStorageMockttpController';
 import HeaderNavbar from '../../../page-objects/pages/header-navbar';
 import AccountListPage from '../../../page-objects/pages/account-list-page';
 import HomePage from '../../../page-objects/pages/home/homepage';
@@ -81,8 +81,8 @@ describe('Account syncing - User already has balances on multple accounts @no-mm
           // Complete initial setup with provided seed phrase
           await completeImportSRPOnboardingFlow({
             driver,
-            seedPhrase: NOTIFICATIONS_TEAM_SEED_PHRASE,
-            password: NOTIFICATIONS_TEAM_PASSWORD,
+            seedPhrase: IDENTITY_TEAM_SEED_PHRASE,
+            password: IDENTITY_TEAM_PASSWORD,
           });
 
           // Verify initial state and balance
@@ -132,8 +132,8 @@ describe('Account syncing - User already has balances on multple accounts @no-mm
           // Complete setup again for new session
           await completeImportSRPOnboardingFlow({
             driver,
-            seedPhrase: NOTIFICATIONS_TEAM_SEED_PHRASE,
-            password: NOTIFICATIONS_TEAM_PASSWORD,
+            seedPhrase: IDENTITY_TEAM_SEED_PHRASE,
+            password: IDENTITY_TEAM_PASSWORD,
           });
 
           const homePage = new HomePage(driver);
@@ -185,8 +185,8 @@ describe('Account syncing - User already has balances on multple accounts @no-mm
           // Complete setup for final verification
           await completeImportSRPOnboardingFlow({
             driver,
-            seedPhrase: NOTIFICATIONS_TEAM_SEED_PHRASE,
-            password: NOTIFICATIONS_TEAM_PASSWORD,
+            seedPhrase: IDENTITY_TEAM_SEED_PHRASE,
+            password: IDENTITY_TEAM_PASSWORD,
           });
 
           const homePage = new HomePage(driver);
@@ -210,7 +210,7 @@ describe('Account syncing - User already has balances on multple accounts @no-mm
           // Lock and unlock wallet to ensure that number of preloaded accounts have not gone up
           await homePage.headerNavbar.lockMetaMask();
           await unlockWallet(driver, {
-            password: NOTIFICATIONS_TEAM_PASSWORD,
+            password: IDENTITY_TEAM_PASSWORD,
             waitLoginSuccess: true,
             navigate: true,
           });
diff --git a/test/e2e/tests/identity/constants.ts b/test/e2e/tests/identity/constants.ts
new file mode 100644
index 000000000000..4819a2368606
--- /dev/null
+++ b/test/e2e/tests/identity/constants.ts
@@ -0,0 +1,9 @@
+// As we rely on profile syncing for most of our features, we need to use the same SRP for all of our tests
+export const IDENTITY_TEAM_SEED_PHRASE =
+  'leisure swallow trip elbow prison wait rely keep supply hole general mountain';
+export const IDENTITY_TEAM_PASSWORD = 'notify_password';
+// You can use the storage key below to generate mock data
+export const IDENTITY_TEAM_STORAGE_KEY =
+  '0d55d30da233959674d14076737198c05ae3fb8631a17e20d3c28c60dddd82f7';
+export const IDENTITY_TEAM_IMPORTED_PRIVATE_KEY =
+  '0179f7453ff337aba89d04b00085764092cf8c0cfe91d5614c39c2be902ad582';
diff --git a/test/e2e/tests/identity/mocks.ts b/test/e2e/tests/identity/mocks.ts
new file mode 100644
index 000000000000..e81f70f2d4a5
--- /dev/null
+++ b/test/e2e/tests/identity/mocks.ts
@@ -0,0 +1,136 @@
+import { Mockttp, RequestRuleBuilder } from 'mockttp';
+import { AuthenticationController } from '@metamask/profile-sync-controller';
+import { USER_STORAGE_FEATURE_NAMES } from '@metamask/profile-sync-controller/sdk';
+import { UserStorageMockttpController } from '../../helpers/identity/user-storage/userStorageMockttpController';
+import { accountsSyncMockResponse } from './account-syncing/mockData';
+
+const AuthMocks = AuthenticationController.Mocks;
+
+type MockResponse = {
+  url: string | RegExp;
+  requestMethod: 'GET' | 'POST' | 'PUT' | 'DELETE';
+  response: unknown;
+};
+
+/**
+ * E2E mock setup for identity APIs (Auth, UserStorage, Profile syncing)
+ *
+ * @param server - server obj used to mock our endpoints
+ * @param userStorageMockttpControllerInstance - optional instance of UserStorageMockttpController, useful if you need persisted user storage between tests
+ */
+export async function mockIdentityServices(
+  server: Mockttp,
+  userStorageMockttpControllerInstance: UserStorageMockttpController = new UserStorageMockttpController(),
+) {
+  // Auth
+  mockAPICall(server, AuthMocks.getMockAuthNonceResponse());
+  mockAPICall(server, AuthMocks.getMockAuthLoginResponse());
+  mockAPICall(server, AuthMocks.getMockAuthAccessTokenResponse());
+
+  // Storage
+  if (
+    !userStorageMockttpControllerInstance?.paths.get(
+      USER_STORAGE_FEATURE_NAMES.accounts,
+    )
+  ) {
+    userStorageMockttpControllerInstance.setupPath(
+      USER_STORAGE_FEATURE_NAMES.accounts,
+      server,
+    );
+  }
+  if (
+    !userStorageMockttpControllerInstance?.paths.get(
+      USER_STORAGE_FEATURE_NAMES.networks,
+    )
+  ) {
+    userStorageMockttpControllerInstance.setupPath(
+      USER_STORAGE_FEATURE_NAMES.networks,
+      server,
+    );
+  }
+}
+
+function mockAPICall(server: Mockttp, response: MockResponse) {
+  let requestRuleBuilder: RequestRuleBuilder | undefined;
+
+  if (response.requestMethod === 'GET') {
+    requestRuleBuilder = server.forGet(response.url);
+  }
+
+  if (response.requestMethod === 'POST') {
+    requestRuleBuilder = server.forPost(response.url);
+  }
+
+  if (response.requestMethod === 'PUT') {
+    requestRuleBuilder = server.forPut(response.url);
+  }
+
+  if (response.requestMethod === 'DELETE') {
+    requestRuleBuilder = server.forDelete(response.url);
+  }
+
+  requestRuleBuilder?.thenCallback(() => ({
+    statusCode: 200,
+    json: response.response,
+  }));
+}
+
+type MockInfuraAndAccountSyncOptions = {
+  accountsToMock?: string[];
+  accountsSyncResponse?: typeof accountsSyncMockResponse;
+};
+
+const MOCK_ETH_BALANCE = '0xde0b6b3a7640000';
+const INFURA_URL =
+  'https://mainnet.infura.io/v3/00000000000000000000000000000000';
+
+/**
+ * Sets up mock responses for Infura balance checks and account syncing
+ *
+ * @param mockServer - The Mockttp server instance
+ * @param userStorageMockttpController - Controller for user storage mocks
+ * @param options - Configuration options for mocking
+ */
+export async function mockInfuraAndAccountSync(
+  mockServer: Mockttp,
+  userStorageMockttpController: UserStorageMockttpController,
+  options: MockInfuraAndAccountSyncOptions = {},
+): Promise<void> {
+  const accounts = options.accountsToMock ?? [];
+
+  // Set up User Storage / Account Sync mock
+  userStorageMockttpController.setupPath(
+    USER_STORAGE_FEATURE_NAMES.accounts,
+    mockServer,
+  );
+
+  userStorageMockttpController.setupPath(
+    USER_STORAGE_FEATURE_NAMES.accounts,
+    mockServer,
+    {
+      getResponse: options.accountsSyncResponse ?? undefined,
+    },
+  );
+
+  // Account Balances
+  if (accounts.length > 0) {
+    accounts.forEach((account) => {
+      mockServer
+        .forPost(INFURA_URL)
+        .withJsonBodyIncluding({
+          method: 'eth_getBalance',
+          params: [account.toLowerCase()],
+        })
+        .thenCallback(() => ({
+          statusCode: 200,
+          json: {
+            jsonrpc: '2.0',
+            id: '1111111111111111',
+            result: MOCK_ETH_BALANCE,
+          },
+        }));
+    });
+  }
+
+  mockIdentityServices(mockServer, userStorageMockttpController);
+}
diff --git a/test/e2e/tests/notifications/mocks.ts b/test/e2e/tests/notifications/mocks.ts
index b7069447fd45..c6f65d58dbb7 100644
--- a/test/e2e/tests/notifications/mocks.ts
+++ b/test/e2e/tests/notifications/mocks.ts
@@ -1,14 +1,11 @@
 import { Mockttp, RequestRuleBuilder } from 'mockttp';
-import { AuthenticationController } from '@metamask/profile-sync-controller';
 import {
   NotificationServicesController,
   NotificationServicesPushController,
 } from '@metamask/notification-services-controller';
 import { USER_STORAGE_FEATURE_NAMES } from '@metamask/profile-sync-controller/sdk';
-import { UserStorageMockttpController } from '../../helpers/user-storage/userStorageMockttpController';
-import { accountsSyncMockResponse } from './account-syncing/mockData';
+import { UserStorageMockttpController } from '../../helpers/identity/user-storage/userStorageMockttpController';
 
-const AuthMocks = AuthenticationController.Mocks;
 const NotificationMocks = NotificationServicesController.Mocks;
 const PushMocks = NotificationServicesPushController.Mocks;
 
@@ -19,7 +16,7 @@ type MockResponse = {
 };
 
 /**
- * E2E mock setup for notification APIs (Auth, UserStorage, Notifications, Push Notifications, Profile syncing)
+ * E2E mock setup for notification APIs (Notifications, Push Notifications)
  *
  * @param server - server obj used to mock our endpoints
  * @param userStorageMockttpControllerInstance - optional instance of UserStorageMockttpController, useful if you need persisted user storage between tests
@@ -28,32 +25,7 @@ export async function mockNotificationServices(
   server: Mockttp,
   userStorageMockttpControllerInstance: UserStorageMockttpController = new UserStorageMockttpController(),
 ) {
-  // Auth
-  mockAPICall(server, AuthMocks.getMockAuthNonceResponse());
-  mockAPICall(server, AuthMocks.getMockAuthLoginResponse());
-  mockAPICall(server, AuthMocks.getMockAuthAccessTokenResponse());
-
   // Storage
-  if (
-    !userStorageMockttpControllerInstance?.paths.get(
-      USER_STORAGE_FEATURE_NAMES.accounts,
-    )
-  ) {
-    userStorageMockttpControllerInstance.setupPath(
-      USER_STORAGE_FEATURE_NAMES.accounts,
-      server,
-    );
-  }
-  if (
-    !userStorageMockttpControllerInstance?.paths.get(
-      USER_STORAGE_FEATURE_NAMES.networks,
-    )
-  ) {
-    userStorageMockttpControllerInstance.setupPath(
-      USER_STORAGE_FEATURE_NAMES.networks,
-      server,
-    );
-  }
   if (
     !userStorageMockttpControllerInstance?.paths.get(
       USER_STORAGE_FEATURE_NAMES.notifications,
@@ -106,63 +78,3 @@ function mockAPICall(server: Mockttp, response: MockResponse) {
     json: response.response,
   }));
 }
-
-type MockInfuraAndAccountSyncOptions = {
-  accountsToMock?: string[];
-  accountsSyncResponse?: typeof accountsSyncMockResponse;
-};
-
-const MOCK_ETH_BALANCE = '0xde0b6b3a7640000';
-const INFURA_URL =
-  'https://mainnet.infura.io/v3/00000000000000000000000000000000';
-
-/**
- * Sets up mock responses for Infura balance checks and account syncing
- *
- * @param mockServer - The Mockttp server instance
- * @param userStorageMockttpController - Controller for user storage mocks
- * @param options - Configuration options for mocking
- */
-export async function mockInfuraAndAccountSync(
-  mockServer: Mockttp,
-  userStorageMockttpController: UserStorageMockttpController,
-  options: MockInfuraAndAccountSyncOptions = {},
-): Promise<void> {
-  const accounts = options.accountsToMock ?? [];
-
-  // Set up User Storage / Account Sync mock
-  userStorageMockttpController.setupPath(
-    USER_STORAGE_FEATURE_NAMES.accounts,
-    mockServer,
-  );
-
-  userStorageMockttpController.setupPath(
-    USER_STORAGE_FEATURE_NAMES.accounts,
-    mockServer,
-    {
-      getResponse: options.accountsSyncResponse ?? undefined,
-    },
-  );
-
-  // Account Balances
-  if (accounts.length > 0) {
-    accounts.forEach((account) => {
-      mockServer
-        .forPost(INFURA_URL)
-        .withJsonBodyIncluding({
-          method: 'eth_getBalance',
-          params: [account.toLowerCase()],
-        })
-        .thenCallback(() => ({
-          statusCode: 200,
-          json: {
-            jsonrpc: '2.0',
-            id: '1111111111111111',
-            result: MOCK_ETH_BALANCE,
-          },
-        }));
-    });
-  }
-
-  mockNotificationServices(mockServer, userStorageMockttpController);
-}

From bffd3002c1ca7fa1f096e7d84916db5ea9c473b8 Mon Sep 17 00:00:00 2001
From: Pedro Figueiredo <pedro.figueiredo@consensys.net>
Date: Thu, 5 Dec 2024 14:35:58 +0000
Subject: [PATCH 038/175] feat: Migrate remaining e2e tests to redesigned
 confirmations (#28780)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<!--
Please submit this PR as a draft initially.
Do not mark it as "Ready for review" until the template has been
completely filled out, and PR status checks have passed at least once.
-->

## **Description**

Below are the test files that are migrated on this PR. This includes
creating duplicate tests that rely on
`tempToggleSettingRedesignedTransactionConfirmations`, removing it in
those duplicates and making the necessary changes so that those tests
pass.

- test/e2e/json-rpc/eth_sendTransaction.spec.js
- test/e2e/tests/account/add-account.spec.ts
- test/e2e/tests/petnames/petnames-transactions.spec.js
- test/e2e/tests/ppom/ppom-blockaid-alert-simple-send.spec.js
- test/e2e/tests/responsive-ui/metamask-responsive-ui.spec.js
- test/e2e/tests/tokens/custom-token-send-transfer.spec.js
- test/e2e/tests/transaction/change-assets.spec.js
- test/e2e/tests/transaction/edit-gas-fee.spec.js
- test/e2e/tests/transaction/gas-estimates.spec.js
- test/e2e/tests/transaction/multiple-transactions.spec.js
- test/e2e/tests/transaction/navigate-transactions.spec.js
- test/e2e/tests/transaction/send-edit.spec.js
- test/e2e/tests/transaction/send-eth.spec.js
- test/e2e/tests/transaction/send-hex-address.spec.js

On a subsequent ticket that removes the old confirmation flow
(https://github.com/MetaMask/MetaMask-planning/issues/3030), the
original tests that rely on
`tempToggleSettingRedesignedTransactionConfirmations` to pass and to
test the old confirmation flows will be deleted.

Additionally, the following e2e tests will not be migrated to redesigned
confirmations, and will also be deleted on
https://github.com/MetaMask/MetaMask-planning/issues/3030.

- test/e2e/tests/dapp-interactions/contract-interactions.spec.js
- test/e2e/tests/dapp-interactions/dapp-tx-edit.spec.js
- test/e2e/tests/dapp-interactions/failing-contract.spec.js
- test/e2e/tests/network/network-error.spec.js
- test/e2e/tests/settings/4byte-directory.spec.js
- test/e2e/tests/settings/show-hex-data.spec.js
- test/e2e/tests/tokens/custom-token-add-approve.spec.js
- test/e2e/tests/tokens/increase-token-allowance.spec.js
- test/e2e/tests/transaction/simple-send.spec.ts
- test/e2e/tests/tokens/nft/erc721-interaction.spec.js
- test/e2e/tests/tokens/nft/erc1155-interaction.spec.js
- test/e2e/tests/tokens/nft/send-nft.spec.js


[![Open in GitHub
Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/28780?quickstart=1)

## **Related issues**

Fixes: https://github.com/MetaMask/MetaMask-planning/issues/3700

## **Manual testing steps**

N/A

## **Screenshots/Recordings**

<!-- If applicable, add screenshots and/or recordings to visualize the
before and after of your change. -->

### **Before**

<!-- [screenshots/recordings] -->

### **After**

<!-- [screenshots/recordings] -->

## **Pre-merge author checklist**

- [ ] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension Coding
Standards](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/CODING_GUIDELINES.md).
- [ ] I've completed the PR template to the best of my ability
- [ ] I’ve included tests if applicable
- [ ] I’ve documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [ ] I’ve applied the right labels on the PR (see [labeling
guidelines](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.

## **Pre-merge reviewer checklist**

- [ ] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed).
- [ ] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.
---
 test/e2e/json-rpc/eth_sendTransaction.spec.js |  247 ++-
 .../flows/send-transaction.flow.ts            |   36 +
 .../confirmations/redesign/confirmation.ts    |   33 +
 test/e2e/tests/account/add-account.spec.ts    |  296 ++--
 test/e2e/tests/petnames/petnames-helpers.js   |    6 +
 .../petnames/petnames-transactions.spec.js    |  272 ++-
 .../ppom-blockaid-alert-simple-send.spec.js   |  256 +--
 .../metamask-responsive-ui.spec.js            |  381 ++--
 .../tokens/custom-token-send-transfer.spec.js |  603 ++++---
 .../tokens/nft/erc721-interaction.spec.js     | 1559 +++++++++++------
 .../tests/transaction/change-assets.spec.js   | 1067 +++++++----
 .../tests/transaction/edit-gas-fee.spec.js    |  668 ++++---
 .../tests/transaction/gas-estimates.spec.js   |  695 +++++---
 .../transaction/multiple-transactions.spec.js |  363 ++--
 .../transaction/navigate-transactions.spec.js |  494 ++++--
 test/e2e/tests/transaction/send-edit.spec.js  |  511 ++++--
 test/e2e/tests/transaction/send-eth.spec.js   | 1015 +++++++----
 .../transaction/send-hex-address.spec.js      |  587 ++++---
 .../confirm/info/hooks/use-token-values.ts    |    1 -
 .../transaction-flow-section.test.tsx.snap    |    2 +
 .../transaction-flow-section.tsx              |    4 +-
 .../nav/__snapshots__/nav.test.tsx.snap       |    1 +
 .../components/confirm/nav/nav.tsx            |    1 +
 23 files changed, 5990 insertions(+), 3108 deletions(-)

diff --git a/test/e2e/json-rpc/eth_sendTransaction.spec.js b/test/e2e/json-rpc/eth_sendTransaction.spec.js
index ed740d17bfc1..2167fe6586c5 100644
--- a/test/e2e/json-rpc/eth_sendTransaction.spec.js
+++ b/test/e2e/json-rpc/eth_sendTransaction.spec.js
@@ -11,105 +11,166 @@ const FixtureBuilder = require('../fixture-builder');
 describe('eth_sendTransaction', function () {
   const expectedHash =
     '0x855951a65dcf5949dc54beb032adfb604c52a0a548a0f616799d6873a9521470';
-  it('confirms a new transaction', async function () {
-    await withFixtures(
-      {
-        dapp: true,
-        fixtures: new FixtureBuilder()
-          .withPermissionControllerConnectedToTestDapp()
-          .build(),
-        ganacheOptions: generateGanacheOptions({ hardfork: 'london' }),
-        title: this.test.fullTitle(),
-      },
-      async ({ driver }) => {
-        await unlockWallet(driver);
 
-        // eth_sendTransaction
-        await driver.openNewPage(`http://127.0.0.1:8080`);
-        const request = JSON.stringify({
-          jsonrpc: '2.0',
-          method: 'eth_sendTransaction',
-          params: [
-            {
-              to: '0x5cfe73b6021e818b776b421b1c4db2474086a7e1',
-              from: '0x5cfe73b6021e818b776b421b1c4db2474086a7e1',
-              value: '0x0',
-              maxPriorityFeePerGas: '0x3b9aca00',
-              maxFeePerGas: '0x2540be400',
-            },
-          ],
-          id: 0,
-        });
-        await driver.executeScript(
-          `window.transactionHash = window.ethereum.request(${request})`,
-        );
+  describe('Old confirmation screens', function () {
+    it('rejects a new transaction', async function () {
+      await withFixtures(
+        {
+          dapp: true,
+          fixtures: new FixtureBuilder()
+            .withPermissionControllerConnectedToTestDapp()
+            .build(),
+          ganacheOptions: generateGanacheOptions({ hardfork: 'london' }),
+          title: this.test.fullTitle(),
+        },
+        async ({ driver }) => {
+          await unlockWallet(driver);
 
-        // confirm transaction in mm popup
-        await driver.waitUntilXWindowHandles(3);
-        await driver.switchToWindowWithTitle(WINDOW_TITLES.Dialog);
-        await driver.clickElement({ text: 'Confirm', tag: 'button' });
-        await driver.switchToWindowWithTitle('E2E Test Dapp');
-        const actualHash = await driver.executeScript(
-          `return window.transactionHash;`,
-        );
-        assert.equal(actualHash, expectedHash);
-      },
-    );
+          await tempToggleSettingRedesignedTransactionConfirmations(driver);
+
+          // eth_sendTransaction
+          await driver.openNewPage(`http://127.0.0.1:8080`);
+          const request = JSON.stringify({
+            jsonrpc: '2.0',
+            method: 'eth_sendTransaction',
+            params: [
+              {
+                to: '0x5cfe73b6021e818b776b421b1c4db2474086a7e1',
+                from: '0x5cfe73b6021e818b776b421b1c4db2474086a7e1',
+                value: '0x0',
+                maxPriorityFeePerGas: '0x3b9aca00',
+                maxFeePerGas: '0x2540be400',
+              },
+            ],
+            id: 0,
+          });
+          await driver.executeScript(
+            `window.transactionHash = window.ethereum.request(${request})`,
+          );
+
+          // reject transaction in mm popup
+          await driver.waitUntilXWindowHandles(3);
+          await driver.switchToWindowWithTitle(WINDOW_TITLES.Dialog);
+          await driver.clickElement({ text: 'Reject', tag: 'button' });
+          await driver.switchToWindowWithTitle('E2E Test Dapp');
+          const result = await driver
+            .executeScript(`return window.transactionHash;`)
+            .then((data) => {
+              return data;
+            })
+            .catch((err) => {
+              return err;
+            });
+          assert.ok(
+            result.message.includes(
+              'MetaMask Tx Signature: User denied transaction signature.',
+            ),
+          );
+        },
+      );
+    });
   });
-  it('rejects a new transaction', async function () {
-    await withFixtures(
-      {
-        dapp: true,
-        fixtures: new FixtureBuilder()
-          .withPermissionControllerConnectedToTestDapp()
-          .build(),
-        ganacheOptions: generateGanacheOptions({ hardfork: 'london' }),
-        title: this.test.fullTitle(),
-      },
-      async ({ driver }) => {
-        await unlockWallet(driver);
 
-        await tempToggleSettingRedesignedTransactionConfirmations(driver);
+  describe('Redesigned confirmation screens', function () {
+    it('confirms a new transaction', async function () {
+      await withFixtures(
+        {
+          dapp: true,
+          fixtures: new FixtureBuilder()
+            .withPermissionControllerConnectedToTestDapp()
+            .build(),
+          ganacheOptions: generateGanacheOptions({ hardfork: 'london' }),
+          title: this.test.fullTitle(),
+        },
+        async ({ driver }) => {
+          await unlockWallet(driver);
 
-        // eth_sendTransaction
-        await driver.openNewPage(`http://127.0.0.1:8080`);
-        const request = JSON.stringify({
-          jsonrpc: '2.0',
-          method: 'eth_sendTransaction',
-          params: [
-            {
-              to: '0x5cfe73b6021e818b776b421b1c4db2474086a7e1',
-              from: '0x5cfe73b6021e818b776b421b1c4db2474086a7e1',
-              value: '0x0',
-              maxPriorityFeePerGas: '0x3b9aca00',
-              maxFeePerGas: '0x2540be400',
-            },
-          ],
-          id: 0,
-        });
-        await driver.executeScript(
-          `window.transactionHash = window.ethereum.request(${request})`,
-        );
+          // eth_sendTransaction
+          await driver.openNewPage(`http://127.0.0.1:8080`);
+          const request = JSON.stringify({
+            jsonrpc: '2.0',
+            method: 'eth_sendTransaction',
+            params: [
+              {
+                to: '0x5cfe73b6021e818b776b421b1c4db2474086a7e1',
+                from: '0x5cfe73b6021e818b776b421b1c4db2474086a7e1',
+                value: '0x0',
+                maxPriorityFeePerGas: '0x3b9aca00',
+                maxFeePerGas: '0x2540be400',
+              },
+            ],
+            id: 0,
+          });
+          await driver.executeScript(
+            `window.transactionHash = window.ethereum.request(${request})`,
+          );
 
-        // reject transaction in mm popup
-        await driver.waitUntilXWindowHandles(3);
-        await driver.switchToWindowWithTitle(WINDOW_TITLES.Dialog);
-        await driver.clickElement({ text: 'Reject', tag: 'button' });
-        await driver.switchToWindowWithTitle('E2E Test Dapp');
-        const result = await driver
-          .executeScript(`return window.transactionHash;`)
-          .then((data) => {
-            return data;
-          })
-          .catch((err) => {
-            return err;
+          // confirm transaction in mm popup
+          await driver.waitUntilXWindowHandles(3);
+          await driver.switchToWindowWithTitle(WINDOW_TITLES.Dialog);
+          await driver.clickElement({ text: 'Confirm', tag: 'button' });
+          await driver.switchToWindowWithTitle('E2E Test Dapp');
+          const actualHash = await driver.executeScript(
+            `return window.transactionHash;`,
+          );
+          assert.equal(actualHash, expectedHash);
+        },
+      );
+    });
+
+    it('rejects a new transaction', async function () {
+      await withFixtures(
+        {
+          dapp: true,
+          fixtures: new FixtureBuilder()
+            .withPermissionControllerConnectedToTestDapp()
+            .build(),
+          ganacheOptions: generateGanacheOptions({ hardfork: 'london' }),
+          title: this.test.fullTitle(),
+        },
+        async ({ driver }) => {
+          await unlockWallet(driver);
+
+          // eth_sendTransaction
+          await driver.openNewPage(`http://127.0.0.1:8080`);
+          const request = JSON.stringify({
+            jsonrpc: '2.0',
+            method: 'eth_sendTransaction',
+            params: [
+              {
+                to: '0x5cfe73b6021e818b776b421b1c4db2474086a7e1',
+                from: '0x5cfe73b6021e818b776b421b1c4db2474086a7e1',
+                value: '0x0',
+                maxPriorityFeePerGas: '0x3b9aca00',
+                maxFeePerGas: '0x2540be400',
+              },
+            ],
+            id: 0,
           });
-        assert.ok(
-          result.message.includes(
-            'MetaMask Tx Signature: User denied transaction signature.',
-          ),
-        );
-      },
-    );
+          await driver.executeScript(
+            `window.transactionHash = window.ethereum.request(${request})`,
+          );
+
+          // reject transaction in mm popup
+          await driver.waitUntilXWindowHandles(3);
+          await driver.switchToWindowWithTitle(WINDOW_TITLES.Dialog);
+          await driver.clickElement({ text: 'Cancel', tag: 'button' });
+          await driver.switchToWindowWithTitle('E2E Test Dapp');
+          const result = await driver
+            .executeScript(`return window.transactionHash;`)
+            .then((data) => {
+              return data;
+            })
+            .catch((err) => {
+              return err;
+            });
+          assert.ok(
+            result.message.includes(
+              'MetaMask Tx Signature: User denied transaction signature.',
+            ),
+          );
+        },
+      );
+    });
   });
 });
diff --git a/test/e2e/page-objects/flows/send-transaction.flow.ts b/test/e2e/page-objects/flows/send-transaction.flow.ts
index 50928f74c8b5..d33302f25510 100644
--- a/test/e2e/page-objects/flows/send-transaction.flow.ts
+++ b/test/e2e/page-objects/flows/send-transaction.flow.ts
@@ -84,6 +84,42 @@ export const sendRedesignedTransactionToAddress = async ({
   await transactionConfirmationPage.clickFooterConfirmButton();
 };
 
+/**
+ * This function initiates the steps required to send a transaction from the homepage to final confirmation.
+ *
+ * @param params - An object containing the parameters.
+ * @param params.driver - The webdriver instance.
+ * @param params.recipientAccount - The recipient account.
+ * @param params.amount - The amount of the asset to be sent in the transaction.
+ */
+export const sendRedesignedTransactionToAccount = async ({
+  driver,
+  recipientAccount,
+  amount,
+}: {
+  driver: Driver;
+  recipientAccount: string;
+  amount: string;
+}): Promise<void> => {
+  console.log(
+    `Start flow to send amount ${amount} to recipient account ${recipientAccount} on home screen`,
+  );
+  // click send button on homepage to start flow
+  const homePage = new HomePage(driver);
+  await homePage.startSendFlow();
+
+  // user should land on send token screen to fill recipient and amount
+  const sendToPage = new SendTokenPage(driver);
+  await sendToPage.check_pageIsLoaded();
+  await sendToPage.selectRecipientAccount(recipientAccount);
+  await sendToPage.fillAmount(amount);
+  await sendToPage.goToNextScreen();
+
+  // confirm transaction when user lands on confirm transaction screen
+  const transactionConfirmationPage = new TransactionConfirmation(driver);
+  await transactionConfirmationPage.clickFooterConfirmButton();
+};
+
 /**
  * This function initiates the steps required to send a transaction from the homepage to final confirmation.
  *
diff --git a/test/e2e/page-objects/pages/confirmations/redesign/confirmation.ts b/test/e2e/page-objects/pages/confirmations/redesign/confirmation.ts
index 1ebaf95b7dcf..9ad3e4f81007 100644
--- a/test/e2e/page-objects/pages/confirmations/redesign/confirmation.ts
+++ b/test/e2e/page-objects/pages/confirmations/redesign/confirmation.ts
@@ -20,6 +20,12 @@ class Confirmation {
     text: 'Alert',
   };
 
+  private nextPageButton: RawLocator;
+
+  private previousPageButton: RawLocator;
+
+  private navigationTitle: RawLocator;
+
   constructor(driver: Driver) {
     this.driver = driver;
 
@@ -28,6 +34,10 @@ class Confirmation {
     this.headerAccountDetailsButton =
       '[data-testid="header-info__account-details-button"]';
     this.footerCancelButton = '[data-testid="confirm-footer-cancel-button"]';
+    this.nextPageButton = '[data-testid="confirm-nav__next-confirmation"]';
+    this.previousPageButton =
+      '[data-testid="confirm-nav__previous-confirmation"]';
+    this.navigationTitle = '[data-testid="confirm-page-nav-position"]';
   }
 
   async clickScrollToBottomButton() {
@@ -58,6 +68,29 @@ class Confirmation {
   async clickInlineAlert() {
     await this.driver.clickElement(this.inlineAlertButton);
   }
+
+  async clickNextPage(): Promise<void> {
+    await this.driver.clickElement(this.nextPageButton);
+  }
+
+  async clickPreviousPage(): Promise<void> {
+    await this.driver.clickElement(this.previousPageButton);
+  }
+
+  async check_pageNumbers(
+    currentPage: number,
+    totalPages: number,
+  ): Promise<void> {
+    try {
+      await this.driver.findElement({
+        css: this.navigationTitle,
+        text: `${currentPage} of ${totalPages}`,
+      });
+    } catch (e) {
+      console.log('Timeout while waiting for navigation page numbers', e);
+      throw e;
+    }
+  }
 }
 
 export default Confirmation;
diff --git a/test/e2e/tests/account/add-account.spec.ts b/test/e2e/tests/account/add-account.spec.ts
index 46eb27cab900..db62927b91d7 100644
--- a/test/e2e/tests/account/add-account.spec.ts
+++ b/test/e2e/tests/account/add-account.spec.ts
@@ -8,7 +8,10 @@ import {
 } from '../../helpers';
 import { loginWithBalanceValidation } from '../../page-objects/flows/login.flow';
 import { completeImportSRPOnboardingFlow } from '../../page-objects/flows/onboarding.flow';
-import { sendTransactionToAccount } from '../../page-objects/flows/send-transaction.flow';
+import {
+  sendRedesignedTransactionToAccount,
+  sendTransactionToAccount,
+} from '../../page-objects/flows/send-transaction.flow';
 import AccountListPage from '../../page-objects/pages/account-list-page';
 import ActivityListPage from '../../page-objects/pages/home/activity-list';
 import HeaderNavbar from '../../page-objects/pages/header-navbar';
@@ -17,116 +20,189 @@ import LoginPage from '../../page-objects/pages/login-page';
 import ResetPasswordPage from '../../page-objects/pages/reset-password-page';
 
 describe('Add account', function () {
-  it('should not affect public address when using secret recovery phrase to recover account with non-zero balance @no-mmi', async function () {
-    await withFixtures(
-      {
-        fixtures: new FixtureBuilder({ onboarding: true }).build(),
-        ganacheOptions: defaultGanacheOptions,
-        title: this.test?.fullTitle(),
-      },
-      async ({ driver, ganacheServer }) => {
-        await completeImportSRPOnboardingFlow({ driver });
-
-        await tempToggleSettingRedesignedTransactionConfirmations(driver);
-
-        const homePage = new HomePage(driver);
-        await homePage.check_pageIsLoaded();
-        await homePage.check_localBlockchainBalanceIsDisplayed(ganacheServer);
-        const headerNavbar = new HeaderNavbar(driver);
-        await headerNavbar.openAccountMenu();
-
-        // Create new account with default name `newAccountName`
-        const newAccountName = 'Account 2';
-        const accountListPage = new AccountListPage(driver);
-        await accountListPage.check_pageIsLoaded();
-        await accountListPage.addNewAccount();
-        await headerNavbar.check_accountLabel(newAccountName);
-        await homePage.check_expectedBalanceIsDisplayed();
-
-        // Switch back to the first account and transfer some balance to 2nd account so they will not be removed after recovering SRP
-        await headerNavbar.openAccountMenu();
-        await accountListPage.check_pageIsLoaded();
-        await accountListPage.check_accountDisplayedInAccountList('Account 1');
-        await accountListPage.switchToAccount('Account 1');
-        await headerNavbar.check_accountLabel('Account 1');
-        await homePage.check_localBlockchainBalanceIsDisplayed(ganacheServer);
-        await sendTransactionToAccount({
-          driver,
-          recipientAccount: newAccountName,
-          amount: '2.8',
-          gasFee: '0.000042',
-          totalFee: '2.800042',
-        });
-        await homePage.check_pageIsLoaded();
-        const activityList = new ActivityListPage(driver);
-        await activityList.check_confirmedTxNumberDisplayedInActivity();
-        await activityList.check_txAmountInActivity('-2.8 ETH');
-
-        // Lock wallet and recover via SRP in "forget password" option
-        await headerNavbar.lockMetaMask();
-        await new LoginPage(driver).gotoResetPasswordPage();
-        const resetPasswordPage = new ResetPasswordPage(driver);
-        await resetPasswordPage.check_pageIsLoaded();
-        await resetPasswordPage.resetPassword(E2E_SRP, WALLET_PASSWORD);
-
-        // Check wallet balance for both accounts
-        await homePage.check_pageIsLoaded();
-        await homePage.check_localBlockchainBalanceIsDisplayed(ganacheServer);
-        await headerNavbar.openAccountMenu();
-        await accountListPage.check_pageIsLoaded();
-        await accountListPage.check_accountDisplayedInAccountList(
-          newAccountName,
-        );
-        await accountListPage.switchToAccount(newAccountName);
-        await headerNavbar.check_accountLabel(newAccountName);
-        await homePage.check_expectedBalanceIsDisplayed('2.8');
-      },
-    );
+  describe('Old confirmation screens', function () {
+    it('should not affect public address when using secret recovery phrase to recover account with non-zero balance @no-mmi', async function () {
+      await withFixtures(
+        {
+          fixtures: new FixtureBuilder({ onboarding: true }).build(),
+          ganacheOptions: defaultGanacheOptions,
+          title: this.test?.fullTitle(),
+        },
+        async ({ driver, ganacheServer }) => {
+          await completeImportSRPOnboardingFlow({ driver });
+
+          await tempToggleSettingRedesignedTransactionConfirmations(driver);
+
+          const homePage = new HomePage(driver);
+          await homePage.check_pageIsLoaded();
+          await homePage.check_localBlockchainBalanceIsDisplayed(ganacheServer);
+          const headerNavbar = new HeaderNavbar(driver);
+          await headerNavbar.openAccountMenu();
+
+          // Create new account with default name `newAccountName`
+          const newAccountName = 'Account 2';
+          const accountListPage = new AccountListPage(driver);
+          await accountListPage.check_pageIsLoaded();
+          await accountListPage.addNewAccount();
+          await headerNavbar.check_accountLabel(newAccountName);
+          await homePage.check_expectedBalanceIsDisplayed();
+
+          // Switch back to the first account and transfer some balance to 2nd account so they will not be removed after recovering SRP
+          await headerNavbar.openAccountMenu();
+          await accountListPage.check_pageIsLoaded();
+          await accountListPage.check_accountDisplayedInAccountList(
+            'Account 1',
+          );
+          await accountListPage.switchToAccount('Account 1');
+          await headerNavbar.check_accountLabel('Account 1');
+          await homePage.check_localBlockchainBalanceIsDisplayed(ganacheServer);
+          await sendTransactionToAccount({
+            driver,
+            recipientAccount: newAccountName,
+            amount: '2.8',
+            gasFee: '0.000042',
+            totalFee: '2.800042',
+          });
+          await homePage.check_pageIsLoaded();
+          const activityList = new ActivityListPage(driver);
+          await activityList.check_confirmedTxNumberDisplayedInActivity();
+          await activityList.check_txAmountInActivity('-2.8 ETH');
+
+          // Lock wallet and recover via SRP in "forget password" option
+          await headerNavbar.lockMetaMask();
+          await new LoginPage(driver).gotoResetPasswordPage();
+          const resetPasswordPage = new ResetPasswordPage(driver);
+          await resetPasswordPage.check_pageIsLoaded();
+          await resetPasswordPage.resetPassword(E2E_SRP, WALLET_PASSWORD);
+
+          // Check wallet balance for both accounts
+          await homePage.check_pageIsLoaded();
+          await homePage.check_localBlockchainBalanceIsDisplayed(ganacheServer);
+          await headerNavbar.openAccountMenu();
+          await accountListPage.check_pageIsLoaded();
+          await accountListPage.check_accountDisplayedInAccountList(
+            newAccountName,
+          );
+          await accountListPage.switchToAccount(newAccountName);
+          await headerNavbar.check_accountLabel(newAccountName);
+          await homePage.check_expectedBalanceIsDisplayed('2.8');
+        },
+      );
+    });
   });
 
-  it('should be possible to remove an account imported with a private key, but should not be possible to remove an account generated from the SRP imported in onboarding @no-mmi', async function () {
-    const testPrivateKey: string =
-      '14abe6f4aab7f9f626fe981c864d0adeb5685f289ac9270c27b8fd790b4235d6';
-
-    await withFixtures(
-      {
-        fixtures: new FixtureBuilder().build(),
-        title: this.test?.fullTitle(),
-      },
-      async ({ driver }) => {
-        await loginWithBalanceValidation(driver);
-        const headerNavbar = new HeaderNavbar(driver);
-        const homePage = new HomePage(driver);
-        await headerNavbar.openAccountMenu();
-
-        // Create new account with default name Account 2
-        const accountListPage = new AccountListPage(driver);
-        await accountListPage.check_pageIsLoaded();
-        await accountListPage.addNewAccount();
-        await headerNavbar.check_accountLabel('Account 2');
-        await homePage.check_expectedBalanceIsDisplayed();
-
-        // Check user cannot delete 2nd account generated from the SRP imported in onboarding
-        await headerNavbar.openAccountMenu();
-        await accountListPage.check_removeAccountButtonIsNotDisplayed(
-          'Account 1',
-        );
-
-        // Create 3rd account with private key
-        await accountListPage.addNewImportedAccount(testPrivateKey);
-        await headerNavbar.check_accountLabel('Account 3');
-        await homePage.check_expectedBalanceIsDisplayed();
-
-        // Remove the 3rd account imported with a private key
-        await headerNavbar.openAccountMenu();
-        await accountListPage.removeAccount('Account 3');
-        await homePage.check_pageIsLoaded();
-        await homePage.check_expectedBalanceIsDisplayed();
-        await headerNavbar.openAccountMenu();
-        await accountListPage.check_accountIsNotDisplayedInAccountList(
-          'Account 3',
-        );
-      },
-    );
+  describe('Redesigned confirmation screens', function () {
+    it('should not affect public address when using secret recovery phrase to recover account with non-zero balance @no-mmi', async function () {
+      await withFixtures(
+        {
+          fixtures: new FixtureBuilder({ onboarding: true }).build(),
+          ganacheOptions: defaultGanacheOptions,
+          title: this.test?.fullTitle(),
+        },
+        async ({ driver, ganacheServer }) => {
+          await completeImportSRPOnboardingFlow({ driver });
+
+          const homePage = new HomePage(driver);
+          await homePage.check_pageIsLoaded();
+          await homePage.check_localBlockchainBalanceIsDisplayed(ganacheServer);
+          const headerNavbar = new HeaderNavbar(driver);
+          await headerNavbar.openAccountMenu();
+
+          // Create new account with default name `newAccountName`
+          const newAccountName = 'Account 2';
+          const accountListPage = new AccountListPage(driver);
+          await accountListPage.check_pageIsLoaded();
+          await accountListPage.addNewAccount();
+          await headerNavbar.check_accountLabel(newAccountName);
+          await homePage.check_expectedBalanceIsDisplayed();
+
+          // Switch back to the first account and transfer some balance to 2nd account so they will not be removed after recovering SRP
+          await headerNavbar.openAccountMenu();
+          await accountListPage.check_pageIsLoaded();
+          await accountListPage.check_accountDisplayedInAccountList(
+            'Account 1',
+          );
+          await accountListPage.switchToAccount('Account 1');
+          await headerNavbar.check_accountLabel('Account 1');
+          await homePage.check_localBlockchainBalanceIsDisplayed(ganacheServer);
+
+          await sendRedesignedTransactionToAccount({
+            driver,
+            recipientAccount: newAccountName,
+            amount: '2.8',
+          });
+
+          await homePage.check_pageIsLoaded();
+          const activityList = new ActivityListPage(driver);
+          await activityList.check_confirmedTxNumberDisplayedInActivity();
+          await activityList.check_txAmountInActivity('-2.8 ETH');
+
+          // Lock wallet and recover via SRP in "forget password" option
+          await headerNavbar.lockMetaMask();
+          await new LoginPage(driver).gotoResetPasswordPage();
+          const resetPasswordPage = new ResetPasswordPage(driver);
+          await resetPasswordPage.check_pageIsLoaded();
+          await resetPasswordPage.resetPassword(E2E_SRP, WALLET_PASSWORD);
+
+          // Check wallet balance for both accounts
+          await homePage.check_pageIsLoaded();
+          await homePage.check_localBlockchainBalanceIsDisplayed(ganacheServer);
+          await headerNavbar.openAccountMenu();
+          await accountListPage.check_pageIsLoaded();
+          await accountListPage.check_accountDisplayedInAccountList(
+            newAccountName,
+          );
+          await accountListPage.switchToAccount(newAccountName);
+          await headerNavbar.check_accountLabel(newAccountName);
+          await homePage.check_expectedBalanceIsDisplayed('2.8');
+        },
+      );
+    });
+
+    it('should be possible to remove an account imported with a private key, but should not be possible to remove an account generated from the SRP imported in onboarding @no-mmi', async function () {
+      const testPrivateKey: string =
+        '14abe6f4aab7f9f626fe981c864d0adeb5685f289ac9270c27b8fd790b4235d6';
+
+      await withFixtures(
+        {
+          fixtures: new FixtureBuilder().build(),
+          title: this.test?.fullTitle(),
+        },
+        async ({ driver }) => {
+          await loginWithBalanceValidation(driver);
+          const headerNavbar = new HeaderNavbar(driver);
+          const homePage = new HomePage(driver);
+          await headerNavbar.openAccountMenu();
+
+          // Create new account with default name Account 2
+          const accountListPage = new AccountListPage(driver);
+          await accountListPage.check_pageIsLoaded();
+          await accountListPage.addNewAccount();
+          await headerNavbar.check_accountLabel('Account 2');
+          await homePage.check_expectedBalanceIsDisplayed();
+
+          // Check user cannot delete 2nd account generated from the SRP imported in onboarding
+          await headerNavbar.openAccountMenu();
+          await accountListPage.check_removeAccountButtonIsNotDisplayed(
+            'Account 1',
+          );
+
+          // Create 3rd account with private key
+          await accountListPage.addNewImportedAccount(testPrivateKey);
+          await headerNavbar.check_accountLabel('Account 3');
+          await homePage.check_expectedBalanceIsDisplayed();
+
+          // Remove the 3rd account imported with a private key
+          await headerNavbar.openAccountMenu();
+          await accountListPage.removeAccount('Account 3');
+          await homePage.check_pageIsLoaded();
+          await homePage.check_expectedBalanceIsDisplayed();
+          await headerNavbar.openAccountMenu();
+          await accountListPage.check_accountIsNotDisplayedInAccountList(
+            'Account 3',
+          );
+        },
+      );
+    });
   });
 });
diff --git a/test/e2e/tests/petnames/petnames-helpers.js b/test/e2e/tests/petnames/petnames-helpers.js
index 03747caba4be..c019cfbfa886 100644
--- a/test/e2e/tests/petnames/petnames-helpers.js
+++ b/test/e2e/tests/petnames/petnames-helpers.js
@@ -3,6 +3,11 @@ async function rejectSignatureOrTransactionRequest(driver) {
   await driver.delay(3000);
 }
 
+async function rejectRedesignedSignatureOrTransactionRequest(driver) {
+  await driver.clickElement({ text: 'Cancel', tag: 'button' });
+  await driver.delay(3000);
+}
+
 async function focusTestDapp(driver) {
   const windowHandles = await driver.getAllWindowHandles();
   await driver.switchToWindowWithTitle('E2E Test Dapp', windowHandles);
@@ -49,6 +54,7 @@ async function saveName(driver, value, name, proposedName) {
 
 module.exports = {
   rejectSignatureOrTransactionRequest,
+  rejectRedesignedSignatureOrTransactionRequest,
   focusTestDapp,
   expectName,
   clickName,
diff --git a/test/e2e/tests/petnames/petnames-transactions.spec.js b/test/e2e/tests/petnames/petnames-transactions.spec.js
index 55c295c51c3a..5546de0b4b82 100644
--- a/test/e2e/tests/petnames/petnames-transactions.spec.js
+++ b/test/e2e/tests/petnames/petnames-transactions.spec.js
@@ -13,6 +13,7 @@ const {
   focusTestDapp,
   rejectSignatureOrTransactionRequest,
   saveName,
+  rejectRedesignedSignatureOrTransactionRequest,
 } = require('./petnames-helpers');
 
 async function createDappSendTransaction(driver) {
@@ -37,89 +38,196 @@ const CUSTOM_NAME_MOCK = 'Custom Name';
 const PROPOSED_NAME_MOCK = 'test4.lens';
 
 describe('Petnames - Transactions', function () {
-  it('can save petnames for addresses in dapp send transactions', async function () {
-    await withFixtures(
-      {
-        dapp: true,
-        fixtures: new FixtureBuilder()
-          .withPermissionControllerConnectedToTestDapp()
-          .withNoNames()
-          .build(),
-        ganacheOptions: defaultGanacheOptions,
-        title: this.test.fullTitle(),
-      },
-      async ({ driver }) => {
-        await unlockWallet(driver);
-
-        await tempToggleSettingRedesignedTransactionConfirmations(driver);
-
-        await openDapp(driver);
-        await createDappSendTransaction(driver);
-        await switchToNotificationWindow(driver, 3);
-        await expectName(driver, ABBREVIATED_ADDRESS_MOCK, false);
-
-        // Test custom name.
-        await saveName(
-          driver,
-          ABBREVIATED_ADDRESS_MOCK,
-          CUSTOM_NAME_MOCK,
-          undefined,
-        );
-        await rejectSignatureOrTransactionRequest(driver);
-        await focusTestDapp(driver);
-        await createDappSendTransaction(driver);
-        await switchToNotificationWindow(driver, 3);
-        await expectName(driver, CUSTOM_NAME_MOCK, true);
-
-        // Test proposed name.
-        await saveName(driver, CUSTOM_NAME_MOCK, undefined, PROPOSED_NAME_MOCK);
-        await rejectSignatureOrTransactionRequest(driver);
-        await focusTestDapp(driver);
-        await createDappSendTransaction(driver);
-        await switchToNotificationWindow(driver, 3);
-        await expectName(driver, PROPOSED_NAME_MOCK, true);
-      },
-    );
+  describe('Old confirmation screens', function () {
+    it('can save petnames for addresses in dapp send transactions', async function () {
+      await withFixtures(
+        {
+          dapp: true,
+          fixtures: new FixtureBuilder()
+            .withPermissionControllerConnectedToTestDapp()
+            .withNoNames()
+            .build(),
+          ganacheOptions: defaultGanacheOptions,
+          title: this.test.fullTitle(),
+        },
+        async ({ driver }) => {
+          await unlockWallet(driver);
+
+          await tempToggleSettingRedesignedTransactionConfirmations(driver);
+
+          await openDapp(driver);
+          await createDappSendTransaction(driver);
+          await switchToNotificationWindow(driver, 3);
+          await expectName(driver, ABBREVIATED_ADDRESS_MOCK, false);
+
+          // Test custom name.
+          await saveName(
+            driver,
+            ABBREVIATED_ADDRESS_MOCK,
+            CUSTOM_NAME_MOCK,
+            undefined,
+          );
+          await rejectSignatureOrTransactionRequest(driver);
+          await focusTestDapp(driver);
+          await createDappSendTransaction(driver);
+          await switchToNotificationWindow(driver, 3);
+          await expectName(driver, CUSTOM_NAME_MOCK, true);
+
+          // Test proposed name.
+          await saveName(
+            driver,
+            CUSTOM_NAME_MOCK,
+            undefined,
+            PROPOSED_NAME_MOCK,
+          );
+          await rejectSignatureOrTransactionRequest(driver);
+          await focusTestDapp(driver);
+          await createDappSendTransaction(driver);
+          await switchToNotificationWindow(driver, 3);
+          await expectName(driver, PROPOSED_NAME_MOCK, true);
+        },
+      );
+    });
+
+    it('can save petnames for addresses in wallet send transactions', async function () {
+      await withFixtures(
+        {
+          fixtures: new FixtureBuilder()
+            .withPreferencesController({
+              featureFlags: {
+                sendHexData: true,
+              },
+            })
+            .withNoNames()
+            .build(),
+          ganacheOptions: defaultGanacheOptions,
+          title: this.test.fullTitle(),
+        },
+        async ({ driver }) => {
+          await unlockWallet(driver);
+          await tempToggleSettingRedesignedTransactionConfirmations(driver);
+
+          await createWalletSendTransaction(driver, ADDRESS_MOCK);
+          await expectName(driver, ABBREVIATED_ADDRESS_MOCK, false);
+
+          // Test custom name.
+          await saveName(
+            driver,
+            ABBREVIATED_ADDRESS_MOCK,
+            CUSTOM_NAME_MOCK,
+            undefined,
+          );
+          await rejectSignatureOrTransactionRequest(driver);
+          await createWalletSendTransaction(driver, ADDRESS_MOCK);
+          await expectName(driver, CUSTOM_NAME_MOCK, true);
+
+          // Test proposed name.
+          await saveName(
+            driver,
+            CUSTOM_NAME_MOCK,
+            undefined,
+            PROPOSED_NAME_MOCK,
+          );
+          await rejectSignatureOrTransactionRequest(driver);
+          await createWalletSendTransaction(driver, ADDRESS_MOCK);
+          await expectName(driver, PROPOSED_NAME_MOCK, true);
+        },
+      );
+    });
   });
 
-  it('can save petnames for addresses in wallet send transactions', async function () {
-    await withFixtures(
-      {
-        fixtures: new FixtureBuilder()
-          .withPreferencesController({
-            featureFlags: {
-              sendHexData: true,
-            },
-          })
-          .withNoNames()
-          .build(),
-        ganacheOptions: defaultGanacheOptions,
-        title: this.test.fullTitle(),
-      },
-      async ({ driver }) => {
-        await unlockWallet(driver);
-        await tempToggleSettingRedesignedTransactionConfirmations(driver);
-
-        await createWalletSendTransaction(driver, ADDRESS_MOCK);
-        await expectName(driver, ABBREVIATED_ADDRESS_MOCK, false);
-
-        // Test custom name.
-        await saveName(
-          driver,
-          ABBREVIATED_ADDRESS_MOCK,
-          CUSTOM_NAME_MOCK,
-          undefined,
-        );
-        await rejectSignatureOrTransactionRequest(driver);
-        await createWalletSendTransaction(driver, ADDRESS_MOCK);
-        await expectName(driver, CUSTOM_NAME_MOCK, true);
-
-        // Test proposed name.
-        await saveName(driver, CUSTOM_NAME_MOCK, undefined, PROPOSED_NAME_MOCK);
-        await rejectSignatureOrTransactionRequest(driver);
-        await createWalletSendTransaction(driver, ADDRESS_MOCK);
-        await expectName(driver, PROPOSED_NAME_MOCK, true);
-      },
-    );
+  describe('Redesigned confirmation screens', function () {
+    it('can save petnames for addresses in dapp send transactions', async function () {
+      await withFixtures(
+        {
+          dapp: true,
+          fixtures: new FixtureBuilder()
+            .withPermissionControllerConnectedToTestDapp()
+            .withNoNames()
+            .build(),
+          ganacheOptions: defaultGanacheOptions,
+          title: this.test.fullTitle(),
+        },
+        async ({ driver }) => {
+          await unlockWallet(driver);
+
+          await openDapp(driver);
+          await createDappSendTransaction(driver);
+          await switchToNotificationWindow(driver, 3);
+          await expectName(driver, ABBREVIATED_ADDRESS_MOCK, false);
+
+          // Test custom name.
+          await saveName(
+            driver,
+            ABBREVIATED_ADDRESS_MOCK,
+            CUSTOM_NAME_MOCK,
+            undefined,
+          );
+          await rejectRedesignedSignatureOrTransactionRequest(driver);
+          await focusTestDapp(driver);
+          await createDappSendTransaction(driver);
+          await switchToNotificationWindow(driver, 3);
+          await expectName(driver, CUSTOM_NAME_MOCK, true);
+
+          // Test proposed name.
+          await saveName(
+            driver,
+            CUSTOM_NAME_MOCK,
+            undefined,
+            PROPOSED_NAME_MOCK,
+          );
+          await rejectRedesignedSignatureOrTransactionRequest(driver);
+          await focusTestDapp(driver);
+          await createDappSendTransaction(driver);
+          await switchToNotificationWindow(driver, 3);
+          await expectName(driver, PROPOSED_NAME_MOCK, true);
+        },
+      );
+    });
+
+    it('can save petnames for addresses in wallet send transactions', async function () {
+      await withFixtures(
+        {
+          fixtures: new FixtureBuilder()
+            .withPreferencesController({
+              featureFlags: {
+                sendHexData: true,
+              },
+            })
+            .withNoNames()
+            .build(),
+          ganacheOptions: defaultGanacheOptions,
+          title: this.test.fullTitle(),
+        },
+        async ({ driver }) => {
+          await unlockWallet(driver);
+
+          await createWalletSendTransaction(driver, ADDRESS_MOCK);
+          await expectName(driver, ABBREVIATED_ADDRESS_MOCK, false);
+
+          // Test custom name.
+          await saveName(
+            driver,
+            ABBREVIATED_ADDRESS_MOCK,
+            CUSTOM_NAME_MOCK,
+            undefined,
+          );
+          await rejectRedesignedSignatureOrTransactionRequest(driver);
+          await createWalletSendTransaction(driver, ADDRESS_MOCK);
+          await expectName(driver, CUSTOM_NAME_MOCK, true);
+
+          // Test proposed name.
+          await saveName(
+            driver,
+            CUSTOM_NAME_MOCK,
+            undefined,
+            PROPOSED_NAME_MOCK,
+          );
+          await rejectRedesignedSignatureOrTransactionRequest(driver);
+          await createWalletSendTransaction(driver, ADDRESS_MOCK);
+          await expectName(driver, PROPOSED_NAME_MOCK, true);
+        },
+      );
+    });
   });
 });
diff --git a/test/e2e/tests/ppom/ppom-blockaid-alert-simple-send.spec.js b/test/e2e/tests/ppom/ppom-blockaid-alert-simple-send.spec.js
index 5368c2617f13..370aab17a499 100644
--- a/test/e2e/tests/ppom/ppom-blockaid-alert-simple-send.spec.js
+++ b/test/e2e/tests/ppom/ppom-blockaid-alert-simple-send.spec.js
@@ -119,115 +119,157 @@ async function mockInfuraWithFailedResponses(mockServer) {
  * @see {@link https://wobbly-nutmeg-8a5.notion.site/MM-E2E-Testing-1e51b617f79240a49cd3271565c6e12d}
  */
 describe('Simple Send Security Alert - Blockaid @no-mmi', function () {
-  it('should not show security alerts for benign requests', async function () {
-    await withFixtures(
-      {
-        dapp: true,
-        fixtures: new FixtureBuilder()
-          .withNetworkControllerOnMainnet()
-          .withPreferencesController({
-            securityAlertsEnabled: true,
-          })
-          .build(),
-        defaultGanacheOptions,
-        testSpecificMock: mockInfuraWithBenignResponses,
-        title: this.test.fullTitle(),
-      },
-
-      async ({ driver }) => {
-        await logInWithBalanceValidation(driver);
-
-        await sendScreenToConfirmScreen(driver, mockBenignAddress, '1');
-
-        const isPresent = await driver.isElementPresent(bannerAlertSelector);
-        assert.equal(isPresent, false, `Banner alert unexpectedly found.`);
-      },
-    );
-  });
+  describe('Old confirmation screens', function () {
+    it('should show "Be careful" if the PPOM request fails to check transaction', async function () {
+      await withFixtures(
+        {
+          dapp: true,
+          fixtures: new FixtureBuilder()
+            .withNetworkControllerOnMainnet()
+            .withPreferencesController({
+              securityAlertsEnabled: true,
+            })
+            .build(),
+          defaultGanacheOptions,
+          testSpecificMock: mockInfuraWithFailedResponses,
+          title: this.test.fullTitle(),
+        },
+
+        async ({ driver }) => {
+          await logInWithBalanceValidation(driver);
+
+          await tempToggleSettingRedesignedTransactionConfirmations(driver);
 
-  /**
-   * Disclaimer: This test does not test all reason types. e.g. 'blur_farming',
-   * 'malicious_domain'. Some other tests are found in other files:
-   * e.g. test/e2e/flask/ppom-blockaid-alert-<name>.spec.js
-   */
-  it('should show security alerts for malicious requests', async function () {
-    await withFixtures(
-      // we need to use localhost instead of the ip
-      // see issue: https://github.com/MetaMask/MetaMask-planning/issues/3560
-      {
-        dapp: true,
-        fixtures: new FixtureBuilder()
-          .withNetworkControllerOnMainnet()
-          .withPermissionControllerConnectedToTestDapp({
-            useLocalhostHostname: true,
-          })
-          .withPreferencesController({
-            securityAlertsEnabled: true,
-          })
-          .build(),
-        defaultGanacheOptions,
-        testSpecificMock: mockInfuraWithMaliciousResponses,
-        title: this.test.fullTitle(),
-      },
-
-      async ({ driver }) => {
-        await logInWithBalanceValidation(driver);
-
-        await driver.openNewPage('http://localhost:8080');
-
-        await driver.clickElement('#maliciousRawEthButton');
-        await driver.switchToWindowWithTitle(WINDOW_TITLES.Dialog);
-
-        await driver.waitForSelector({
-          css: '.mm-text--body-lg-medium',
-          text: expectedMaliciousTitle,
-        });
-
-        await driver.waitForSelector({
-          css: '.mm-text--body-md',
-          text: expectedMaliciousDescription,
-        });
-      },
-    );
+          await sendScreenToConfirmScreen(
+            driver,
+            '0xB8c77482e45F1F44dE1745F52C74426C631bDD52',
+            '1.1',
+          );
+          const expectedTitle = 'Be careful';
+
+          const bannerAlert = await driver.findElement({
+            css: bannerAlertSelector,
+            text: expectedTitle,
+          });
+
+          assert(
+            bannerAlert,
+            `Banner alert not found. Expected Title: ${expectedTitle}`,
+          );
+        },
+      );
+    });
   });
 
-  it('should show "Be careful" if the PPOM request fails to check transaction', async function () {
-    await withFixtures(
-      {
-        dapp: true,
-        fixtures: new FixtureBuilder()
-          .withNetworkControllerOnMainnet()
-          .withPreferencesController({
-            securityAlertsEnabled: true,
-          })
-          .build(),
-        defaultGanacheOptions,
-        testSpecificMock: mockInfuraWithFailedResponses,
-        title: this.test.fullTitle(),
-      },
-
-      async ({ driver }) => {
-        await logInWithBalanceValidation(driver);
-
-        await tempToggleSettingRedesignedTransactionConfirmations(driver);
-
-        await sendScreenToConfirmScreen(
-          driver,
-          '0xB8c77482e45F1F44dE1745F52C74426C631bDD52',
-          '1.1',
-        );
-        const expectedTitle = 'Be careful';
-
-        const bannerAlert = await driver.findElement({
-          css: bannerAlertSelector,
-          text: expectedTitle,
-        });
-
-        assert(
-          bannerAlert,
-          `Banner alert not found. Expected Title: ${expectedTitle}`,
-        );
-      },
-    );
+  describe('Redesigned confirmation screens', function () {
+    it('should not show security alerts for benign requests', async function () {
+      await withFixtures(
+        {
+          dapp: true,
+          fixtures: new FixtureBuilder()
+            .withNetworkControllerOnMainnet()
+            .withPreferencesController({
+              securityAlertsEnabled: true,
+            })
+            .build(),
+          defaultGanacheOptions,
+          testSpecificMock: mockInfuraWithBenignResponses,
+          title: this.test.fullTitle(),
+        },
+
+        async ({ driver }) => {
+          await logInWithBalanceValidation(driver);
+
+          await sendScreenToConfirmScreen(driver, mockBenignAddress, '1');
+
+          const isPresent = await driver.isElementPresent(bannerAlertSelector);
+          assert.equal(isPresent, false, `Banner alert unexpectedly found.`);
+        },
+      );
+    });
+
+    /**
+     * Disclaimer: This test does not test all reason types. e.g. 'blur_farming',
+     * 'malicious_domain'. Some other tests are found in other files:
+     * e.g. test/e2e/flask/ppom-blockaid-alert-<name>.spec.js
+     */
+    it('should show security alerts for malicious requests', async function () {
+      await withFixtures(
+        // we need to use localhost instead of the ip
+        // see issue: https://github.com/MetaMask/MetaMask-planning/issues/3560
+        {
+          dapp: true,
+          fixtures: new FixtureBuilder()
+            .withNetworkControllerOnMainnet()
+            .withPermissionControllerConnectedToTestDapp({
+              useLocalhostHostname: true,
+            })
+            .withPreferencesController({
+              securityAlertsEnabled: true,
+            })
+            .build(),
+          defaultGanacheOptions,
+          testSpecificMock: mockInfuraWithMaliciousResponses,
+          title: this.test.fullTitle(),
+        },
+
+        async ({ driver }) => {
+          await logInWithBalanceValidation(driver);
+
+          await driver.openNewPage('http://localhost:8080');
+
+          await driver.clickElement('#maliciousRawEthButton');
+          await driver.switchToWindowWithTitle(WINDOW_TITLES.Dialog);
+
+          await driver.waitForSelector({
+            css: '.mm-text--body-lg-medium',
+            text: expectedMaliciousTitle,
+          });
+
+          await driver.waitForSelector({
+            css: '.mm-text--body-md',
+            text: expectedMaliciousDescription,
+          });
+        },
+      );
+    });
+
+    it('should show "Be careful" if the PPOM request fails to check transaction', async function () {
+      await withFixtures(
+        {
+          dapp: true,
+          fixtures: new FixtureBuilder()
+            .withNetworkControllerOnMainnet()
+            .withPreferencesController({
+              securityAlertsEnabled: true,
+            })
+            .build(),
+          defaultGanacheOptions,
+          testSpecificMock: mockInfuraWithFailedResponses,
+          title: this.test.fullTitle(),
+        },
+
+        async ({ driver }) => {
+          await logInWithBalanceValidation(driver);
+
+          await sendScreenToConfirmScreen(
+            driver,
+            '0xB8c77482e45F1F44dE1745F52C74426C631bDD52',
+            '1.1',
+          );
+          const expectedTitle = 'Be careful';
+
+          const bannerAlert = await driver.findElement({
+            css: '[data-testid="confirm-banner-alert"]',
+            text: expectedTitle,
+          });
+
+          assert(
+            bannerAlert,
+            `Banner alert not found. Expected Title: ${expectedTitle}`,
+          );
+        },
+      );
+    });
   });
 });
diff --git a/test/e2e/tests/responsive-ui/metamask-responsive-ui.spec.js b/test/e2e/tests/responsive-ui/metamask-responsive-ui.spec.js
index c1ff9f3477ab..db43124355c2 100644
--- a/test/e2e/tests/responsive-ui/metamask-responsive-ui.spec.js
+++ b/test/e2e/tests/responsive-ui/metamask-responsive-ui.spec.js
@@ -11,165 +11,234 @@ const {
 const FixtureBuilder = require('../../fixture-builder');
 
 describe('MetaMask Responsive UI', function () {
-  it('Creating a new wallet @no-mmi', async function () {
-    const driverOptions = { constrainWindowSize: true };
-
-    await withFixtures(
-      {
-        fixtures: new FixtureBuilder({ onboarding: true }).build(),
-        driverOptions,
-        title: this.test.fullTitle(),
-      },
-      async ({ driver }) => {
-        await driver.navigate();
-
-        // agree to terms of use
-        await driver.clickElement('[data-testid="onboarding-terms-checkbox"]');
-
-        // welcome
-        await driver.clickElement('[data-testid="onboarding-create-wallet"]');
-
-        // metrics
-        await driver.clickElement('[data-testid="metametrics-no-thanks"]');
-
-        // create password
-        await driver.fill(
-          '[data-testid="create-password-new"]',
-          'correct horse battery staple',
-        );
-        await driver.fill(
-          '[data-testid="create-password-confirm"]',
-          'correct horse battery staple',
-        );
-        await driver.clickElement('[data-testid="create-password-terms"]');
-        await driver.clickElement('[data-testid="create-password-wallet"]');
-
-        // secure wallet
-        await driver.clickElement('[data-testid="secure-wallet-recommended"]');
-
-        // review
-        await driver.clickElement('[data-testid="recovery-phrase-reveal"]');
-        const chipTwo = await (
-          await driver.findElement('[data-testid="recovery-phrase-chip-2"]')
-        ).getText();
-        const chipThree = await (
-          await driver.findElement('[data-testid="recovery-phrase-chip-3"]')
-        ).getText();
-        const chipSeven = await (
-          await driver.findElement('[data-testid="recovery-phrase-chip-7"]')
-        ).getText();
-        await driver.clickElement('[data-testid="recovery-phrase-next"]');
-
-        // confirm
-        await driver.fill('[data-testid="recovery-phrase-input-2"]', chipTwo);
-        await driver.fill('[data-testid="recovery-phrase-input-3"]', chipThree);
-        await driver.fill('[data-testid="recovery-phrase-input-7"]', chipSeven);
-        await driver.clickElement('[data-testid="recovery-phrase-confirm"]');
-
-        // complete
-        await driver.clickElement('[data-testid="onboarding-complete-done"]');
-
-        // pin extension
-        await driver.clickElement('[data-testid="pin-extension-next"]');
-        await driver.clickElement('[data-testid="pin-extension-done"]');
-        await driver.assertElementNotPresent('.loading-overlay__spinner');
-        // assert balance
-        await driver.waitForSelector({
-          css: '[data-testid="eth-overview__primary-currency"]',
-          text: '0',
-        });
-      },
-    );
-  });
+  describe('Old confirmation screens', function () {
+    it('Send Transaction from responsive window', async function () {
+      const driverOptions = { constrainWindowSize: true };
+      await withFixtures(
+        {
+          fixtures: new FixtureBuilder().build(),
+          driverOptions,
+          ganacheOptions: defaultGanacheOptions,
+          title: this.test.fullTitle(),
+        },
+        async ({ driver, ganacheServer }) => {
+          await logInWithBalanceValidation(driver, ganacheServer);
+
+          await tempToggleSettingRedesignedTransactionConfirmations(driver);
+
+          // Send ETH from inside MetaMask
+          // starts to send a transaction
+          await openActionMenuAndStartSendFlow(driver);
+          await driver.fill(
+            'input[placeholder="Enter public address (0x) or domain name"]',
+            '0x2f318C334780961FB129D2a6c30D0763d9a5C970',
+          );
+
+          const inputAmount = await driver.fill('input[placeholder="0"]', '1');
+
+          const inputValue = await inputAmount.getProperty('value');
+          assert.equal(inputValue, '1');
+          await driver.clickElement({ text: 'Continue', tag: 'button' });
 
-  it('Importing existing wallet from lock page', async function () {
-    const driverOptions = { constrainWindowSize: true };
-
-    await withFixtures(
-      {
-        fixtures: new FixtureBuilder().build(),
-        driverOptions,
-        title: this.test.fullTitle(),
-      },
-      async ({ driver, ganacheServer }) => {
-        await driver.navigate();
-
-        // Import Secret Recovery Phrase
-        await driver.waitForSelector({
-          tag: 'span',
-          text: 'Localhost 8545',
-        });
-        await driver.clickElement({
-          css: '.unlock-page__link',
-          text: 'Forgot password?',
-        });
-
-        await driver.pasteIntoField(
-          '[data-testid="import-srp__srp-word-0"]',
-          TEST_SEED_PHRASE_TWO,
-        );
-
-        await driver.fill('#password', 'correct horse battery staple');
-        await driver.fill('#confirm-password', 'correct horse battery staple');
-        await driver.press('#confirm-password', driver.Key.ENTER);
-
-        // balance renders
-        await locateAccountBalanceDOM(driver, ganacheServer);
-      },
-    );
+          // wait for transaction value to be rendered and confirm
+          await driver.waitForSelector({
+            css: '.currency-display-component__text',
+            text: '1.000042',
+          });
+          await driver.clickElement({ text: 'Confirm', tag: 'button' });
+
+          // finds the transaction in the transactions list
+          await driver.clickElement(
+            '[data-testid="account-overview__activity-tab"]',
+          );
+          await driver.wait(async () => {
+            const confirmedTxes = await driver.findElements(
+              '.transaction-list__completed-transactions .activity-list-item',
+            );
+            return confirmedTxes.length === 1;
+          }, 10000);
+
+          await driver.waitForSelector({
+            css: '[data-testid="transaction-list-item-primary-currency"]',
+            text: '-1 ETH',
+          });
+        },
+      );
+    });
   });
 
-  it('Send Transaction from responsive window', async function () {
-    const driverOptions = { constrainWindowSize: true };
-    await withFixtures(
-      {
-        fixtures: new FixtureBuilder().build(),
-        driverOptions,
-        ganacheOptions: defaultGanacheOptions,
-        title: this.test.fullTitle(),
-      },
-      async ({ driver, ganacheServer }) => {
-        await logInWithBalanceValidation(driver, ganacheServer);
-
-        await tempToggleSettingRedesignedTransactionConfirmations(driver);
-
-        // Send ETH from inside MetaMask
-        // starts to send a transaction
-        await openActionMenuAndStartSendFlow(driver);
-        await driver.fill(
-          'input[placeholder="Enter public address (0x) or domain name"]',
-          '0x2f318C334780961FB129D2a6c30D0763d9a5C970',
-        );
-
-        const inputAmount = await driver.fill('input[placeholder="0"]', '1');
-
-        const inputValue = await inputAmount.getProperty('value');
-        assert.equal(inputValue, '1');
-        await driver.clickElement({ text: 'Continue', tag: 'button' });
-
-        // wait for transaction value to be rendered and confirm
-        await driver.waitForSelector({
-          css: '.currency-display-component__text',
-          text: '1.000042',
-        });
-        await driver.clickElement({ text: 'Confirm', tag: 'button' });
-
-        // finds the transaction in the transactions list
-        await driver.clickElement(
-          '[data-testid="account-overview__activity-tab"]',
-        );
-        await driver.wait(async () => {
-          const confirmedTxes = await driver.findElements(
-            '.transaction-list__completed-transactions .activity-list-item',
+  describe('Redesigned confirmation screens', function () {
+    it('Creating a new wallet @no-mmi', async function () {
+      const driverOptions = { constrainWindowSize: true };
+
+      await withFixtures(
+        {
+          fixtures: new FixtureBuilder({ onboarding: true }).build(),
+          driverOptions,
+          title: this.test.fullTitle(),
+        },
+        async ({ driver }) => {
+          await driver.navigate();
+
+          // agree to terms of use
+          await driver.clickElement(
+            '[data-testid="onboarding-terms-checkbox"]',
+          );
+
+          // welcome
+          await driver.clickElement('[data-testid="onboarding-create-wallet"]');
+
+          // metrics
+          await driver.clickElement('[data-testid="metametrics-no-thanks"]');
+
+          // create password
+          await driver.fill(
+            '[data-testid="create-password-new"]',
+            'correct horse battery staple',
+          );
+          await driver.fill(
+            '[data-testid="create-password-confirm"]',
+            'correct horse battery staple',
+          );
+          await driver.clickElement('[data-testid="create-password-terms"]');
+          await driver.clickElement('[data-testid="create-password-wallet"]');
+
+          // secure wallet
+          await driver.clickElement(
+            '[data-testid="secure-wallet-recommended"]',
+          );
+
+          // review
+          await driver.clickElement('[data-testid="recovery-phrase-reveal"]');
+          const chipTwo = await (
+            await driver.findElement('[data-testid="recovery-phrase-chip-2"]')
+          ).getText();
+          const chipThree = await (
+            await driver.findElement('[data-testid="recovery-phrase-chip-3"]')
+          ).getText();
+          const chipSeven = await (
+            await driver.findElement('[data-testid="recovery-phrase-chip-7"]')
+          ).getText();
+          await driver.clickElement('[data-testid="recovery-phrase-next"]');
+
+          // confirm
+          await driver.fill('[data-testid="recovery-phrase-input-2"]', chipTwo);
+          await driver.fill(
+            '[data-testid="recovery-phrase-input-3"]',
+            chipThree,
+          );
+          await driver.fill(
+            '[data-testid="recovery-phrase-input-7"]',
+            chipSeven,
+          );
+          await driver.clickElement('[data-testid="recovery-phrase-confirm"]');
+
+          // complete
+          await driver.clickElement('[data-testid="onboarding-complete-done"]');
+
+          // pin extension
+          await driver.clickElement('[data-testid="pin-extension-next"]');
+          await driver.clickElement('[data-testid="pin-extension-done"]');
+          await driver.assertElementNotPresent('.loading-overlay__spinner');
+          // assert balance
+          await driver.waitForSelector({
+            css: '[data-testid="eth-overview__primary-currency"]',
+            text: '0',
+          });
+        },
+      );
+    });
+
+    it('Importing existing wallet from lock page', async function () {
+      const driverOptions = { constrainWindowSize: true };
+
+      await withFixtures(
+        {
+          fixtures: new FixtureBuilder().build(),
+          driverOptions,
+          title: this.test.fullTitle(),
+        },
+        async ({ driver, ganacheServer }) => {
+          await driver.navigate();
+
+          // Import Secret Recovery Phrase
+          await driver.waitForSelector({
+            tag: 'span',
+            text: 'Localhost 8545',
+          });
+          await driver.clickElement({
+            css: '.unlock-page__link',
+            text: 'Forgot password?',
+          });
+
+          await driver.pasteIntoField(
+            '[data-testid="import-srp__srp-word-0"]',
+            TEST_SEED_PHRASE_TWO,
+          );
+
+          await driver.fill('#password', 'correct horse battery staple');
+          await driver.fill(
+            '#confirm-password',
+            'correct horse battery staple',
+          );
+          await driver.press('#confirm-password', driver.Key.ENTER);
+
+          // balance renders
+          await locateAccountBalanceDOM(driver, ganacheServer);
+        },
+      );
+    });
+
+    it('Send Transaction from responsive window', async function () {
+      const driverOptions = { constrainWindowSize: true };
+      await withFixtures(
+        {
+          fixtures: new FixtureBuilder().build(),
+          driverOptions,
+          ganacheOptions: defaultGanacheOptions,
+          title: this.test.fullTitle(),
+        },
+        async ({ driver, ganacheServer }) => {
+          await logInWithBalanceValidation(driver, ganacheServer);
+
+          // Send ETH from inside MetaMask
+          // starts to send a transaction
+          await openActionMenuAndStartSendFlow(driver);
+          await driver.fill(
+            'input[placeholder="Enter public address (0x) or domain name"]',
+            '0x2f318C334780961FB129D2a6c30D0763d9a5C970',
+          );
+
+          const inputAmount = await driver.fill('input[placeholder="0"]', '1');
+
+          const inputValue = await inputAmount.getProperty('value');
+          assert.equal(inputValue, '1');
+          await driver.clickElement({ text: 'Continue', tag: 'button' });
+
+          // wait for transaction value to be rendered and confirm
+          await driver.waitForSelector({
+            css: 'h2',
+            text: '1 ETH',
+          });
+          await driver.clickElement({ text: 'Confirm', tag: 'button' });
+
+          // finds the transaction in the transactions list
+          await driver.clickElement(
+            '[data-testid="account-overview__activity-tab"]',
           );
-          return confirmedTxes.length === 1;
-        }, 10000);
-
-        await driver.waitForSelector({
-          css: '[data-testid="transaction-list-item-primary-currency"]',
-          text: '-1 ETH',
-        });
-      },
-    );
+          await driver.wait(async () => {
+            const confirmedTxes = await driver.findElements(
+              '.transaction-list__completed-transactions .activity-list-item',
+            );
+            return confirmedTxes.length === 1;
+          }, 10000);
+
+          await driver.waitForSelector({
+            css: '[data-testid="transaction-list-item-primary-currency"]',
+            text: '-1 ETH',
+          });
+        },
+      );
+    });
   });
 });
diff --git a/test/e2e/tests/tokens/custom-token-send-transfer.spec.js b/test/e2e/tests/tokens/custom-token-send-transfer.spec.js
index 0c5498a82cca..3774af82ae1c 100644
--- a/test/e2e/tests/tokens/custom-token-send-transfer.spec.js
+++ b/test/e2e/tests/tokens/custom-token-send-transfer.spec.js
@@ -1,4 +1,7 @@
 const { strict: assert } = require('assert');
+const {
+  mockedSourcifyTokenSend,
+} = require('../confirmations/transactions/erc20-token-send-redesign.spec');
 const {
   withFixtures,
   defaultGanacheOptions,
@@ -18,215 +21,409 @@ const recipientAddress = '0x2f318C334780961FB129D2a6c30D0763d9a5C970';
 
 describe('Transfer custom tokens @no-mmi', function () {
   const smartContract = SMART_CONTRACTS.HST;
-  it('send custom tokens from extension customizing gas values', async function () {
-    await withFixtures(
-      {
-        dapp: true,
-        fixtures: new FixtureBuilder().withTokensControllerERC20().build(),
-        ganacheOptions: defaultGanacheOptions,
-        smartContract,
-        title: this.test.fullTitle(),
-      },
-      async ({ driver }) => {
-        await unlockWallet(driver);
-
-        await tempToggleSettingRedesignedTransactionConfirmations(driver);
-
-        // go to custom tokens view on extension, perform send tokens
-        await driver.clickElement({
-          css: '[data-testid="multichain-token-list-item-value"]',
-          text: '10 TST',
-        });
-        await driver.delay(500);
-        await driver.clickElement('[data-testid="eth-overview-send"]');
-        await driver.fill(
-          'input[placeholder="Enter public address (0x) or domain name"]',
-          recipientAddress,
-        );
-        await driver.waitForSelector({
-          css: '.ens-input__selected-input__title',
-          text: '0x2f318...5C970',
-        });
-        await driver.fill('input[placeholder="0"]', '1');
-        await driver.clickElement({ text: 'Continue', tag: 'button' });
-
-        // check transaction details
-        await driver.waitForSelector({
-          text: '1 TST',
-          tag: 'h1',
-        });
-        await driver.waitForSelector({
-          text: 'Transfer',
-          css: '.confirm-page-container-summary__action__name',
-        });
-        const estimatedGasFee = await driver.findElements(
-          '.currency-display-component__text',
-        );
-        assert.notEqual(
-          await estimatedGasFee[1].getText(),
-          '0',
-          'Estimated gas fee should not be 0',
-        );
-
-        // check function name and hex data details in hex tab
-        await clickNestedButton(driver, 'Hex');
-        await driver.waitForSelector({
-          text: 'Transfer',
-          tag: 'span',
-        });
-        await driver.waitForSelector({
-          tag: 'p',
-          text: '0xa9059cbb0000000000000000000000002f318c334780961fb129d2a6c30d0763d9a5c97',
-        });
-
-        // edit gas fee
-        await clickNestedButton(driver, 'Details');
-        await driver.clickElement({ text: 'Edit', tag: 'button' });
-        await editGasFeeForm(driver, '60000', '10');
-        await driver.clickElement({ text: 'Confirm', tag: 'button' });
-
-        // check that transaction has completed correctly and is displayed in the activity list
-        await driver.waitForSelector({
-          css: '[data-testid="activity-list-item-action"]',
-          text: 'Send TST',
-        });
-        await driver.waitForSelector(
-          {
-            css: '.transaction-list__completed-transactions [data-testid="transaction-list-item-primary-currency"]',
-            text: '-1 TST',
-          },
-          { timeout: 10000 },
-        );
-      },
-    );
-  });
 
-  it('transfer custom tokens from dapp customizing gas values', async function () {
-    await withFixtures(
-      {
-        dapp: true,
-        fixtures: new FixtureBuilder()
-          .withPermissionControllerConnectedToTestDapp()
-          .withTokensControllerERC20()
-          .build(),
-        ganacheOptions: defaultGanacheOptions,
-        smartContract,
-        title: this.test.fullTitle(),
-      },
-      async ({ driver, contractRegistry }) => {
-        const contractAddress = await contractRegistry.getContractAddress(
+  describe('Old confirmation screens', function () {
+    it('send custom tokens from extension customizing gas values', async function () {
+      await withFixtures(
+        {
+          dapp: true,
+          fixtures: new FixtureBuilder().withTokensControllerERC20().build(),
+          ganacheOptions: defaultGanacheOptions,
           smartContract,
-        );
-        await unlockWallet(driver);
-
-        await tempToggleSettingRedesignedTransactionConfirmations(driver);
-
-        // transfer token from dapp
-        await openDapp(driver, contractAddress);
-        await driver.delay(veryLargeDelayMs);
-
-        await driver.clickElement({ text: 'Transfer Tokens', tag: 'button' });
-
-        await driver.switchToWindowWithTitle(WINDOW_TITLES.Dialog);
-        await driver.waitForSelector({ text: '1.5 TST', tag: 'h1' });
-
-        // edit gas fee
-        await driver.clickElement({ text: 'Edit', tag: 'button' });
-        await editGasFeeForm(driver, '60000', '10');
-        await driver.clickElement({ text: 'Confirm', tag: 'button' });
-
-        // in extension, check that transaction has completed correctly and is displayed in the activity list
-        await driver.switchToWindowWithTitle(
-          WINDOW_TITLES.ExtensionInFullScreenView,
-        );
-        await clickNestedButton(driver, 'Activity');
-        await driver.waitForSelector({
-          css: '[data-testid="transaction-list-item-primary-currency"]',
-          text: '-1.5 TST',
-        });
-
-        // this selector helps prevent flakiness. it allows driver to wait until send transfer is "confirmed"
-        await driver.waitForSelector({
-          text: 'Confirmed',
-          tag: 'div',
-        });
-
-        // check token amount is correct after transaction
-        await clickNestedButton(driver, 'Tokens');
-        const tokenAmount = await driver.findElement(
-          {
+          title: this.test.fullTitle(),
+        },
+        async ({ driver }) => {
+          await unlockWallet(driver);
+
+          await tempToggleSettingRedesignedTransactionConfirmations(driver);
+
+          // go to custom tokens view on extension, perform send tokens
+          await driver.clickElement({
             css: '[data-testid="multichain-token-list-item-value"]',
-            text: '8.5 TST',
-          },
-          { timeout: 10000 },
-        );
-        assert.ok(tokenAmount, 'Token amount is not correct');
-      },
-    );
+            text: '10 TST',
+          });
+          await driver.delay(500);
+          await driver.clickElement('[data-testid="eth-overview-send"]');
+          await driver.fill(
+            'input[placeholder="Enter public address (0x) or domain name"]',
+            recipientAddress,
+          );
+          await driver.waitForSelector({
+            css: '.ens-input__selected-input__title',
+            text: '0x2f318...5C970',
+          });
+          await driver.fill('input[placeholder="0"]', '1');
+          await driver.clickElement({ text: 'Continue', tag: 'button' });
+
+          // check transaction details
+          await driver.waitForSelector({
+            text: '1 TST',
+            tag: 'h1',
+          });
+          await driver.waitForSelector({
+            text: 'Transfer',
+            css: '.confirm-page-container-summary__action__name',
+          });
+          const estimatedGasFee = await driver.findElements(
+            '.currency-display-component__text',
+          );
+          assert.notEqual(
+            await estimatedGasFee[1].getText(),
+            '0',
+            'Estimated gas fee should not be 0',
+          );
+
+          // check function name and hex data details in hex tab
+          await clickNestedButton(driver, 'Hex');
+          await driver.waitForSelector({
+            text: 'Transfer',
+            tag: 'span',
+          });
+          await driver.waitForSelector({
+            tag: 'p',
+            text: '0xa9059cbb0000000000000000000000002f318c334780961fb129d2a6c30d0763d9a5c97',
+          });
+
+          // edit gas fee
+          await clickNestedButton(driver, 'Details');
+          await driver.clickElement({ text: 'Edit', tag: 'button' });
+          await editGasFeeForm(driver, '60000', '10');
+          await driver.clickElement({ text: 'Confirm', tag: 'button' });
+
+          // check that transaction has completed correctly and is displayed in the activity list
+          await driver.waitForSelector({
+            css: '[data-testid="activity-list-item-action"]',
+            text: 'Send TST',
+          });
+          await driver.waitForSelector(
+            {
+              css: '.transaction-list__completed-transactions [data-testid="transaction-list-item-primary-currency"]',
+              text: '-1 TST',
+            },
+            { timeout: 10000 },
+          );
+        },
+      );
+    });
+
+    it('transfer custom tokens from dapp customizing gas values', async function () {
+      await withFixtures(
+        {
+          dapp: true,
+          fixtures: new FixtureBuilder()
+            .withPermissionControllerConnectedToTestDapp()
+            .withTokensControllerERC20()
+            .build(),
+          ganacheOptions: defaultGanacheOptions,
+          smartContract,
+          title: this.test.fullTitle(),
+        },
+        async ({ driver, contractRegistry }) => {
+          const contractAddress = await contractRegistry.getContractAddress(
+            smartContract,
+          );
+          await unlockWallet(driver);
+
+          await tempToggleSettingRedesignedTransactionConfirmations(driver);
+
+          // transfer token from dapp
+          await openDapp(driver, contractAddress);
+          await driver.delay(veryLargeDelayMs);
+
+          await driver.clickElement({ text: 'Transfer Tokens', tag: 'button' });
+
+          await driver.switchToWindowWithTitle(WINDOW_TITLES.Dialog);
+          await driver.waitForSelector({ text: '1.5 TST', tag: 'h1' });
+
+          // edit gas fee
+          await driver.clickElement({ text: 'Edit', tag: 'button' });
+          await editGasFeeForm(driver, '60000', '10');
+          await driver.clickElement({ text: 'Confirm', tag: 'button' });
+
+          // in extension, check that transaction has completed correctly and is displayed in the activity list
+          await driver.switchToWindowWithTitle(
+            WINDOW_TITLES.ExtensionInFullScreenView,
+          );
+          await clickNestedButton(driver, 'Activity');
+          await driver.waitForSelector({
+            css: '[data-testid="transaction-list-item-primary-currency"]',
+            text: '-1.5 TST',
+          });
+
+          // this selector helps prevent flakiness. it allows driver to wait until send transfer is "confirmed"
+          await driver.waitForSelector({
+            text: 'Confirmed',
+            tag: 'div',
+          });
+
+          // check token amount is correct after transaction
+          await clickNestedButton(driver, 'Tokens');
+          const tokenAmount = await driver.findElement(
+            {
+              css: '[data-testid="multichain-token-list-item-value"]',
+              text: '8.5 TST',
+            },
+            { timeout: 10000 },
+          );
+          assert.ok(tokenAmount, 'Token amount is not correct');
+        },
+      );
+    });
+
+    it('transfer custom tokens from dapp without specifying gas', async function () {
+      await withFixtures(
+        {
+          dapp: true,
+          fixtures: new FixtureBuilder()
+            .withPermissionControllerConnectedToTestDapp()
+            .withTokensControllerERC20()
+            .build(),
+          ganacheOptions: defaultGanacheOptions,
+          smartContract,
+          title: this.test.fullTitle(),
+        },
+        async ({ driver, contractRegistry }) => {
+          const contractAddress = await contractRegistry.getContractAddress(
+            smartContract,
+          );
+          await unlockWallet(driver);
+
+          await tempToggleSettingRedesignedTransactionConfirmations(driver);
+
+          // transfer token from dapp
+          await openDapp(driver, contractAddress);
+          await driver.delay(veryLargeDelayMs);
+          await driver.clickElement({
+            text: 'Transfer Tokens Without Gas',
+            tag: 'button',
+          });
+          await switchToNotificationWindow(driver);
+          await driver.waitForSelector({ text: '1.5 TST', tag: 'h1' });
+          await driver.clickElement({ text: 'Confirm', tag: 'button' });
+
+          // in extension, check that transaction has completed correctly and is displayed in the activity list
+          await driver.switchToWindowWithTitle(
+            WINDOW_TITLES.ExtensionInFullScreenView,
+          );
+          await clickNestedButton(driver, 'Activity');
+          await driver.waitForSelector({
+            css: '[data-testid="transaction-list-item-primary-currency"]',
+            text: '-1.5 TST',
+          });
+          await driver.waitForSelector({
+            css: '[data-testid="activity-list-item-action"]',
+            text: 'Send TST',
+          });
+
+          // this selector helps prevent flakiness. it allows driver to wait until send transfer is "confirmed"
+          await driver.waitForSelector({
+            text: 'Confirmed',
+            tag: 'div',
+          });
+
+          // check token amount is correct after transaction
+          await clickNestedButton(driver, 'Tokens');
+          const tokenAmount = await driver.findElement(
+            {
+              css: '[data-testid="multichain-token-list-item-value"]',
+              text: '8.5 TST',
+            },
+            { timeout: 10000 },
+          );
+          assert.ok(tokenAmount, 'Token amount is not correct');
+        },
+      );
+    });
   });
 
-  it('transfer custom tokens from dapp without specifying gas', async function () {
-    await withFixtures(
-      {
-        dapp: true,
-        fixtures: new FixtureBuilder()
-          .withPermissionControllerConnectedToTestDapp()
-          .withTokensControllerERC20()
-          .build(),
-        ganacheOptions: defaultGanacheOptions,
-        smartContract,
-        title: this.test.fullTitle(),
-      },
-      async ({ driver, contractRegistry }) => {
-        const contractAddress = await contractRegistry.getContractAddress(
+  describe('Redesigned confirmation screens', function () {
+    it('send custom tokens from extension customizing gas values', async function () {
+      await withFixtures(
+        {
+          dapp: true,
+          fixtures: new FixtureBuilder().withTokensControllerERC20().build(),
+          ganacheOptions: defaultGanacheOptions,
           smartContract,
-        );
-        await unlockWallet(driver);
-
-        await tempToggleSettingRedesignedTransactionConfirmations(driver);
-
-        // transfer token from dapp
-        await openDapp(driver, contractAddress);
-        await driver.delay(veryLargeDelayMs);
-        await driver.clickElement({
-          text: 'Transfer Tokens Without Gas',
-          tag: 'button',
-        });
-        await switchToNotificationWindow(driver);
-        await driver.waitForSelector({ text: '1.5 TST', tag: 'h1' });
-        await driver.clickElement({ text: 'Confirm', tag: 'button' });
-
-        // in extension, check that transaction has completed correctly and is displayed in the activity list
-        await driver.switchToWindowWithTitle(
-          WINDOW_TITLES.ExtensionInFullScreenView,
-        );
-        await clickNestedButton(driver, 'Activity');
-        await driver.waitForSelector({
-          css: '[data-testid="transaction-list-item-primary-currency"]',
-          text: '-1.5 TST',
-        });
-        await driver.waitForSelector({
-          css: '[data-testid="activity-list-item-action"]',
-          text: 'Send TST',
-        });
-
-        // this selector helps prevent flakiness. it allows driver to wait until send transfer is "confirmed"
-        await driver.waitForSelector({
-          text: 'Confirmed',
-          tag: 'div',
-        });
-
-        // check token amount is correct after transaction
-        await clickNestedButton(driver, 'Tokens');
-        const tokenAmount = await driver.findElement(
-          {
+          title: this.test.fullTitle(),
+          testSpecificMock: mocks,
+        },
+        async ({ driver }) => {
+          await unlockWallet(driver);
+
+          // go to custom tokens view on extension, perform send tokens
+          await driver.clickElement({
             css: '[data-testid="multichain-token-list-item-value"]',
-            text: '8.5 TST',
-          },
-          { timeout: 10000 },
-        );
-        assert.ok(tokenAmount, 'Token amount is not correct');
-      },
-    );
+            text: '10 TST',
+          });
+          await driver.delay(500);
+          await driver.clickElement('[data-testid="eth-overview-send"]');
+          await driver.fill(
+            'input[placeholder="Enter public address (0x) or domain name"]',
+            recipientAddress,
+          );
+          await driver.waitForSelector({
+            css: '.ens-input__selected-input__title',
+            text: '0x2f318...5C970',
+          });
+          await driver.fill('input[placeholder="0"]', '1');
+          await driver.clickElement({ text: 'Continue', tag: 'button' });
+
+          // check transaction details
+          await driver.waitForSelector({
+            text: '1 TST',
+            tag: 'h2',
+          });
+
+          // edit gas fee
+          await driver.clickElement('[data-testid="edit-gas-fee-icon"]');
+          await editGasFeeForm(driver, '60000', '10');
+          await driver.clickElement({ text: 'Confirm', tag: 'button' });
+
+          // check that transaction has completed correctly and is displayed in the activity list
+          await driver.waitForSelector({
+            css: '[data-testid="activity-list-item-action"]',
+            text: 'Send TST',
+          });
+          await driver.waitForSelector(
+            {
+              css: '.transaction-list__completed-transactions [data-testid="transaction-list-item-primary-currency"]',
+              text: '-1 TST',
+            },
+            { timeout: 10000 },
+          );
+        },
+      );
+    });
+
+    it('transfer custom tokens from dapp customizing gas values', async function () {
+      await withFixtures(
+        {
+          dapp: true,
+          fixtures: new FixtureBuilder()
+            .withPermissionControllerConnectedToTestDapp()
+            .withTokensControllerERC20()
+            .build(),
+          ganacheOptions: defaultGanacheOptions,
+          smartContract,
+          title: this.test.fullTitle(),
+          testSpecificMock: mocks,
+        },
+        async ({ driver, contractRegistry }) => {
+          const contractAddress = await contractRegistry.getContractAddress(
+            smartContract,
+          );
+          await unlockWallet(driver);
+
+          // transfer token from dapp
+          await openDapp(driver, contractAddress);
+          await driver.delay(veryLargeDelayMs);
+
+          await driver.clickElement({ text: 'Transfer Tokens', tag: 'button' });
+
+          await driver.switchToWindowWithTitle(WINDOW_TITLES.Dialog);
+          await driver.waitForSelector({ text: '1.5 TST', tag: 'h2' });
+
+          // edit gas fee
+          await driver.clickElement('[data-testid="edit-gas-fee-icon"]');
+          await editGasFeeForm(driver, '60000', '10');
+          await driver.clickElement({ text: 'Confirm', tag: 'button' });
+
+          // in extension, check that transaction has completed correctly and is displayed in the activity list
+          await driver.switchToWindowWithTitle(
+            WINDOW_TITLES.ExtensionInFullScreenView,
+          );
+          await clickNestedButton(driver, 'Activity');
+          await driver.waitForSelector({
+            css: '[data-testid="transaction-list-item-primary-currency"]',
+            text: '-1.5 TST',
+          });
+
+          // this selector helps prevent flakiness. it allows driver to wait until send transfer is "confirmed"
+          await driver.waitForSelector({
+            text: 'Confirmed',
+            tag: 'div',
+          });
+
+          // check token amount is correct after transaction
+          await clickNestedButton(driver, 'Tokens');
+          const tokenAmount = await driver.findElement(
+            {
+              css: '[data-testid="multichain-token-list-item-value"]',
+              text: '8.5 TST',
+            },
+            { timeout: 10000 },
+          );
+          assert.ok(tokenAmount, 'Token amount is not correct');
+        },
+      );
+    });
+
+    it('transfer custom tokens from dapp without specifying gas', async function () {
+      await withFixtures(
+        {
+          dapp: true,
+          fixtures: new FixtureBuilder()
+            .withPermissionControllerConnectedToTestDapp()
+            .withTokensControllerERC20()
+            .build(),
+          ganacheOptions: defaultGanacheOptions,
+          smartContract,
+          title: this.test.fullTitle(),
+          testSpecificMock: mocks,
+        },
+        async ({ driver, contractRegistry }) => {
+          const contractAddress = await contractRegistry.getContractAddress(
+            smartContract,
+          );
+          await unlockWallet(driver);
+
+          // transfer token from dapp
+          await openDapp(driver, contractAddress);
+          await driver.delay(veryLargeDelayMs);
+          await driver.clickElement({
+            text: 'Transfer Tokens Without Gas',
+            tag: 'button',
+          });
+          await switchToNotificationWindow(driver);
+          await driver.waitForSelector({ text: '1.5 TST', tag: 'h2' });
+          await driver.clickElement({ text: 'Confirm', tag: 'button' });
+
+          // in extension, check that transaction has completed correctly and is displayed in the activity list
+          await driver.switchToWindowWithTitle(
+            WINDOW_TITLES.ExtensionInFullScreenView,
+          );
+          await clickNestedButton(driver, 'Activity');
+          await driver.waitForSelector({
+            css: '[data-testid="transaction-list-item-primary-currency"]',
+            text: '-1.5 TST',
+          });
+          await driver.waitForSelector({
+            css: '[data-testid="activity-list-item-action"]',
+            text: 'Send TST',
+          });
+
+          // this selector helps prevent flakiness. it allows driver to wait until send transfer is "confirmed"
+          await driver.waitForSelector({
+            text: 'Confirmed',
+            tag: 'div',
+          });
+
+          // check token amount is correct after transaction
+          await clickNestedButton(driver, 'Tokens');
+          const tokenAmount = await driver.findElement(
+            {
+              css: '[data-testid="multichain-token-list-item-value"]',
+              text: '8.5 TST',
+            },
+            { timeout: 10000 },
+          );
+          assert.ok(tokenAmount, 'Token amount is not correct');
+        },
+      );
+    });
+
+    async function mocks(server) {
+      return [await mockedSourcifyTokenSend(server)];
+    }
   });
 });
diff --git a/test/e2e/tests/tokens/nft/erc721-interaction.spec.js b/test/e2e/tests/tokens/nft/erc721-interaction.spec.js
index 8b634ffc3ce3..ecd614f1b8a4 100644
--- a/test/e2e/tests/tokens/nft/erc721-interaction.spec.js
+++ b/test/e2e/tests/tokens/nft/erc721-interaction.spec.js
@@ -11,551 +11,1028 @@ const {
 const { SMART_CONTRACTS } = require('../../../seeder/smart-contracts');
 const FixtureBuilder = require('../../../fixture-builder');
 
-describe('ERC721 NFTs testdapp interaction', function () {
-  const smartContract = SMART_CONTRACTS.NFTS;
-
-  it('should add NFTs to state by parsing tx logs without having to click on watch NFT', async function () {
-    await withFixtures(
-      {
-        dapp: true,
-        fixtures: new FixtureBuilder()
-          .withPermissionControllerConnectedToTestDapp()
-          .build(),
-        ganacheOptions: defaultGanacheOptions,
-        smartContract,
-        title: this.test.fullTitle(),
-      },
-      async ({ driver, _, contractRegistry }) => {
-        const contract = contractRegistry.getContractAddress(smartContract);
-        await unlockWallet(driver);
-
-        await tempToggleSettingRedesignedTransactionConfirmations(driver);
-
-        // Open Dapp and wait for deployed contract
-        await openDapp(driver, contract);
-        await driver.findClickableElement('#deployButton');
-
-        // mint NFTs
-        await driver.fill('#mintAmountInput', '5');
-        await driver.clickElement({ text: 'Mint', tag: 'button' });
-
-        // Notification
-        await driver.waitUntilXWindowHandles(3);
-        await driver.switchToWindowWithTitle(WINDOW_TITLES.Dialog);
-        await driver.waitForSelector({
-          css: '.confirm-page-container-summary__action__name',
-          text: 'Deposit',
-        });
-        await driver.clickElement({ text: 'Confirm', tag: 'button' });
-        await driver.waitUntilXWindowHandles(2);
-        await driver.switchToWindowWithTitle(
-          WINDOW_TITLES.ExtensionInFullScreenView,
-        );
-        await driver.clickElement(
-          '[data-testid="account-overview__activity-tab"]',
-        );
-        await driver.waitForSelector({
-          css: '[data-testid="activity-list-item-action"]',
-          text: 'Deposit',
-        });
-
-        // verify the mint transaction has finished
-        await driver.switchToWindowWithTitle(WINDOW_TITLES.TestDApp);
-        await driver.waitForSelector({
-          css: '#nftsStatus',
-          text: 'Mint completed',
-        });
-
-        await driver.switchToWindowWithTitle(
-          WINDOW_TITLES.ExtensionInFullScreenView,
-        );
-        await clickNestedButton(driver, 'NFTs');
-        await driver.findElement({ text: 'TestDappNFTs (5)' });
-        const nftsListItemsFirstCheck = await driver.findElements(
-          '.nft-item__container',
-        );
-        assert.equal(nftsListItemsFirstCheck.length, 5);
-      },
-    );
-  });
-
-  it('should prompt users to add their NFTs to their wallet (one by one) @no-mmi', async function () {
-    await withFixtures(
-      {
-        dapp: true,
-        fixtures: new FixtureBuilder()
-          .withPermissionControllerConnectedToTestDapp()
-          .build(),
-        ganacheOptions: defaultGanacheOptions,
-        smartContract,
-        title: this.test.fullTitle(),
-      },
-      async ({ driver, _, contractRegistry }) => {
-        const contract = contractRegistry.getContractAddress(smartContract);
-        await unlockWallet(driver);
-
-        await tempToggleSettingRedesignedTransactionConfirmations(driver);
-
-        // Open Dapp and wait for deployed contract
-        await openDapp(driver, contract);
-        await driver.findClickableElement('#deployButton');
-
-        // mint NFT
-        await driver.fill('#mintAmountInput', '5');
-        await driver.clickElement({ text: 'Mint', tag: 'button' });
-
-        // Notification
-        await driver.waitUntilXWindowHandles(3);
-        await driver.switchToWindowWithTitle(WINDOW_TITLES.Dialog);
-        await driver.waitForSelector({
-          css: '.confirm-page-container-summary__action__name',
-          text: 'Deposit',
-        });
-        await driver.clickElement({ text: 'Confirm', tag: 'button' });
-        await driver.waitUntilXWindowHandles(2);
-        await driver.switchToWindowWithTitle(
-          WINDOW_TITLES.ExtensionInFullScreenView,
-        );
-        await driver.clickElement(
-          '[data-testid="account-overview__activity-tab"]',
-        );
-        await driver.waitForSelector({
-          css: '[data-testid="activity-list-item-action"]',
-          text: 'Deposit',
-        });
-
-        // verify the mint transaction has finished
-        await driver.switchToWindowWithTitle(WINDOW_TITLES.TestDApp);
-        const nftsMintStatus = await driver.findElement({
-          css: '#nftsStatus',
-          text: 'Mint completed',
-        });
-        assert.equal(await nftsMintStatus.isDisplayed(), true);
-
-        // watch 3 of the nfts
-        await driver.fill('#watchNFTInput', '1');
-        await driver.clickElement({ text: 'Watch NFT', tag: 'button' });
-        await driver.fill('#watchNFTInput', '2');
-        await driver.clickElement({ text: 'Watch NFT', tag: 'button' });
-        await driver.fill('#watchNFTInput', '3');
-        await driver.clickElement({ text: 'Watch NFT', tag: 'button' });
-
-        await driver.switchToWindowWithTitle(WINDOW_TITLES.Dialog);
-
-        // avoid race condition
-        await driver.waitForSelector({
-          css: '.confirm-add-suggested-nft__nft-tokenId',
-          text: '#3',
-        });
-
-        // confirm watchNFT
-        await driver.waitForSelector({
-          css: '.mm-text--heading-lg',
-          text: 'Add suggested NFTs',
-        });
-        await driver.clickElement({ text: 'Add NFTs', tag: 'button' });
-        await driver.switchToWindowWithTitle(
-          WINDOW_TITLES.ExtensionInFullScreenView,
-        );
-        await clickNestedButton(driver, 'NFTs');
-        // Changed this check from 3 to 6, because after mint all nfts has been added to state,
-        await driver.findElement({ text: 'TestDappNFTs (6)' });
-        const nftsListItemsFirstCheck = await driver.findElements(
-          '.nft-item__container',
-        );
-        assert.equal(nftsListItemsFirstCheck.length, 6);
-
-        await driver.switchToWindowWithTitle(WINDOW_TITLES.TestDApp);
-        await driver.fill('#watchNFTInput', '4');
-
-        await driver.clickElement({ text: 'Watch NFT', tag: 'button' });
-        await driver.fill('#watchNFTInput', '5');
-        await driver.clickElement({ text: 'Watch NFT', tag: 'button' });
-        await driver.fill('#watchNFTInput', '6');
-        await driver.clickElement({ text: 'Watch NFT', tag: 'button' });
-
-        await driver.waitUntilXWindowHandles(3);
-        await driver.switchToWindowWithTitle(WINDOW_TITLES.Dialog);
-
-        // avoid race condition
-        await driver.waitForSelector({
-          css: '.confirm-add-suggested-nft__nft-tokenId',
-          text: '#6',
-        });
-
-        // confirm watchNFT
-        await driver.waitForSelector({
-          css: '.mm-text--heading-lg',
-          text: 'Add suggested NFTs',
-        });
-        await driver.clickElement({ text: 'Add NFTs', tag: 'button' });
-        await driver.switchToWindowWithTitle(
-          WINDOW_TITLES.ExtensionInFullScreenView,
-        );
-        await clickNestedButton(driver, 'NFTs');
-        await driver.findElement({ text: 'TestDappNFTs (6)' });
-        const nftsListItemsSecondCheck = await driver.findElements(
-          '.nft-item__container',
-        );
-        assert.equal(nftsListItemsSecondCheck.length, 6);
-      },
-    );
-  });
+// describe('Old confirmation screens', function () {
+//   // ...
+// });
 
-  it('should prompt users to add their NFTs to their wallet (all at once)', async function () {
-    await withFixtures(
-      {
-        dapp: true,
-        fixtures: new FixtureBuilder()
-          .withPermissionControllerConnectedToTestDapp()
-          .build(),
-        ganacheOptions: defaultGanacheOptions,
-        smartContract,
-        title: this.test.fullTitle(),
-      },
-      async ({ driver, _, contractRegistry }) => {
-        const contract = contractRegistry.getContractAddress(smartContract);
-        await unlockWallet(driver);
-
-        await tempToggleSettingRedesignedTransactionConfirmations(driver);
-
-        // Open Dapp and wait for deployed contract
-        await openDapp(driver, contract);
-        await driver.findClickableElement('#deployButton');
-
-        // mint NFT
-        await driver.fill('#mintAmountInput', '5');
-        await driver.clickElement({ text: 'Mint', tag: 'button' });
-
-        // Notification
-        await driver.switchToWindowWithTitle(WINDOW_TITLES.Dialog);
-        await driver.waitForSelector({
-          css: '.confirm-page-container-summary__action__name',
-          text: 'Deposit',
-        });
-        await driver.clickElementAndWaitForWindowToClose({
-          text: 'Confirm',
-          tag: 'button',
-        });
-        await driver.switchToWindowWithTitle(
-          WINDOW_TITLES.ExtensionInFullScreenView,
-        );
-        await driver.clickElement(
-          '[data-testid="account-overview__activity-tab"]',
-        );
-
-        // We need to wait until the transaction is confirmed before looking for the tx
-        // otherwise the element becomes stale, as it updates from 'pending' to 'confirmed'
-        await driver.waitForSelector('.transaction-status-label--confirmed');
-
-        await driver.waitForSelector({
-          css: '[data-testid="activity-list-item-action"]',
-          text: 'Deposit',
-        });
-        // verify the mint transaction has finished
-        await driver.switchToWindowWithTitle(WINDOW_TITLES.TestDApp);
-        await driver.waitForSelector({
-          css: '#nftsStatus',
-          text: 'Mint completed',
-        });
-
-        // watch all nfts
-        await driver.clickElement({ text: 'Watch all NFTs', tag: 'button' });
-
-        await driver.switchToWindowWithTitle(WINDOW_TITLES.Dialog);
-
-        // confirm watchNFT
-        await driver.waitForSelector({
-          css: '.mm-text--heading-lg',
-          text: 'Add suggested NFTs',
-        });
-
-        await driver.findElements('.confirm-add-suggested-nft__nft-list-item');
-        const suggestedNftListItems = await driver.findElements(
-          '.confirm-add-suggested-nft__nft-list-item',
-        );
-        // there are 6 nfts to add because one is minted as part of the fixture
-        assert.equal(suggestedNftListItems.length, 6);
-
-        // remove one nft from the list
-        const removeButtons = await driver.findElements(
-          '.confirm-add-suggested-nft__nft-remove',
-        );
-        await removeButtons[0].click();
-
-        await driver.clickElementAndWaitForWindowToClose({
-          text: 'Add NFTs',
-          tag: 'button',
-        });
-
-        await driver.switchToWindowWithTitle(
-          WINDOW_TITLES.ExtensionInFullScreenView,
-        );
-        await clickNestedButton(driver, 'NFTs');
-        await driver.findElement({ text: 'TestDappNFTs (5)' });
-        const nftsListItemsSecondCheck = await driver.findElements(
-          '.nft-item__container',
-        );
-
-        assert.equal(nftsListItemsSecondCheck.length, 5);
-      },
-    );
-  });
-
-  it('should transfer a single ERC721 NFT from one account to another', async function () {
-    await withFixtures(
-      {
-        dapp: true,
-        fixtures: new FixtureBuilder()
-          .withPermissionControllerConnectedToTestDapp()
-          .build(),
-        ganacheOptions: defaultGanacheOptions,
-        smartContract,
-        title: this.test.fullTitle(),
-      },
-      async ({ driver, _, contractRegistry }) => {
-        const contract = contractRegistry.getContractAddress(smartContract);
-        await unlockWallet(driver);
-
-        await tempToggleSettingRedesignedTransactionConfirmations(driver);
-
-        // Open Dapp and wait for deployed contract
-        await openDapp(driver, contract);
-        await driver.findClickableElement('#deployButton');
-
-        // Click Transfer
-        await driver.fill('#transferTokenInput', '1');
-        await driver.clickElement('#transferFromButton');
-        await driver.switchToWindowWithTitle(WINDOW_TITLES.Dialog);
-
-        // Confirm transfer
-        await driver.waitForSelector({
-          css: '.mm-text--heading-md',
-          text: 'TestDappNFTs',
-        });
-        await driver.clickElement({ text: 'Confirm', tag: 'button' });
-        await driver.waitUntilXWindowHandles(2);
-        await driver.switchToWindowWithTitle(
-          WINDOW_TITLES.ExtensionInFullScreenView,
-        );
-        await driver.clickElement(
-          '[data-testid="account-overview__activity-tab"]',
-        );
-        await driver.waitForSelector(
-          '.transaction-list__completed-transactions .activity-list-item:nth-of-type(1)',
-        );
-
-        // Verify transaction
-        await driver.findElement({ text: 'Send TDN' });
-      },
-    );
-  });
+// describe('Redesigned confirmation screens', function () {
+//   // ...
+// });
 
-  it('should approve an address to transfer a single ERC721 NFT', async function () {
-    await withFixtures(
-      {
-        dapp: true,
-        fixtures: new FixtureBuilder()
-          .withPermissionControllerConnectedToTestDapp()
-          .build(),
-        ganacheOptions: defaultGanacheOptions,
-        smartContract,
-        title: this.test.fullTitle(),
-      },
-      async ({ driver, _, contractRegistry }) => {
-        const contract = contractRegistry.getContractAddress(smartContract);
-        await unlockWallet(driver);
-
-        await tempToggleSettingRedesignedTransactionConfirmations(driver);
-
-        // Open Dapp and wait for deployed contract
-        await openDapp(driver, contract);
-        await driver.findClickableElement('#deployButton');
-
-        // Click Approve
-        const approveInput = await driver.findElement('#approveTokenInput');
-        await approveInput.clear();
-        await approveInput.sendKeys('1');
-        await driver.clickElement('#approveButton');
-
-        await driver.waitUntilXWindowHandles(3);
-        await driver.switchToWindowWithTitle(WINDOW_TITLES.Dialog);
-
-        // Verify dialog
-        const title = await driver.findElement(
-          '[data-testid="confirm-approve-title"]',
-        );
-        await driver.clickElement({
-          text: 'View full transaction details',
-          css: '.confirm-approve-content__small-blue-text',
-        });
-        const [func] = await driver.findElements(
-          '.confirm-approve-content__data .confirm-approve-content__small-text',
-        );
-        assert.equal(
-          await title.getText(),
-          'Allow access to and transfer of your TestDappNFTs (#1)?',
-        );
-        assert.equal(await func.getText(), 'Function: Approve');
-
-        // Confirm approval
-        await driver.clickElement({ text: 'Confirm', tag: 'button' });
-        await driver.waitUntilXWindowHandles(2);
-        await driver.switchToWindowWithTitle(
-          WINDOW_TITLES.ExtensionInFullScreenView,
-        );
-        await driver.clickElement(
-          '[data-testid="account-overview__activity-tab"]',
-        );
-        await driver.waitForSelector(
-          '.transaction-list__completed-transactions .transaction-list-item:nth-of-type(1)',
-        );
-
-        // Verify transaction
-        await driver.waitForSelector({
-          css: '[data-testid="activity-list-item-action"]',
-          text: 'Approve TDN spending cap',
-        });
-      },
-    );
-  });
+describe('ERC721 NFTs testdapp interaction', function () {
+  const smartContract = SMART_CONTRACTS.NFTS;
 
-  it('should enable approval for a third party address to manage all ERC721 NFTs @no-mmi', async function () {
-    await withFixtures(
-      {
-        dapp: true,
-        fixtures: new FixtureBuilder()
-          .withPermissionControllerConnectedToTestDapp()
-          .build(),
-        ganacheOptions: defaultGanacheOptions,
-        smartContract,
-        title: this.test.fullTitle(),
-      },
-      async ({ driver, _, contractRegistry }) => {
-        const contract = contractRegistry.getContractAddress(smartContract);
-        await unlockWallet(driver);
-
-        await tempToggleSettingRedesignedTransactionConfirmations(driver);
-
-        // Open Dapp and wait for deployed contract
-        await openDapp(driver, contract);
-        await driver.findClickableElement('#deployButton');
-
-        // Enable Set approval for all
-        await driver.clickElement('#setApprovalForAllButton');
-        await driver.waitUntilXWindowHandles(3);
-        await driver.switchToWindowWithTitle(WINDOW_TITLES.Dialog);
-
-        // Verify dialog
-        const title = await driver.findElement(
-          '[data-testid="confirm-approve-title"]',
-        );
-        await driver.clickElement({
-          text: 'View full transaction details',
-          css: '.confirm-approve-content__small-blue-text',
-        });
-        const [func, params] = await driver.findElements(
-          '.confirm-approve-content__data .confirm-approve-content__small-text',
-        );
-        assert.equal(
-          await title.getText(),
-          'Allow access to and transfer of all your TestDappNFTs?',
-        );
-        assert.equal(await func.getText(), 'Function: SetApprovalForAll');
-        assert.equal(await params.getText(), 'Parameters: true');
-
-        // Confirm enabling set approval for all
-        await driver.clickElement({ text: 'Confirm', tag: 'button' });
-        await driver.clickElement({ text: 'Approve', tag: 'button' });
-
-        await driver.waitUntilXWindowHandles(2);
-        await driver.switchToWindowWithTitle(
-          WINDOW_TITLES.ExtensionInFullScreenView,
-        );
-        await driver.clickElement(
-          '[data-testid="account-overview__activity-tab"]',
-        );
-        await driver.waitForSelector(
-          '.transaction-list__completed-transactions .activity-list-item:nth-of-type(1)',
-        );
-
-        // Verify transaction
-        await driver.waitForSelector({
-          css: '[data-testid="activity-list-item-action"]',
-          text: 'Approve TDN with no spend limit',
-        });
-      },
-    );
+  describe('Old confirmation screens', function () {
+    it('should add NFTs to state by parsing tx logs without having to click on watch NFT', async function () {
+      await withFixtures(
+        {
+          dapp: true,
+          fixtures: new FixtureBuilder()
+            .withPermissionControllerConnectedToTestDapp()
+            .build(),
+          ganacheOptions: defaultGanacheOptions,
+          smartContract,
+          title: this.test.fullTitle(),
+        },
+        async ({ driver, _, contractRegistry }) => {
+          const contract = contractRegistry.getContractAddress(smartContract);
+          await unlockWallet(driver);
+
+          await tempToggleSettingRedesignedTransactionConfirmations(driver);
+
+          // Open Dapp and wait for deployed contract
+          await openDapp(driver, contract);
+          await driver.findClickableElement('#deployButton');
+
+          // mint NFTs
+          await driver.fill('#mintAmountInput', '5');
+          await driver.clickElement({ text: 'Mint', tag: 'button' });
+
+          // Notification
+          await driver.waitUntilXWindowHandles(3);
+          await driver.switchToWindowWithTitle(WINDOW_TITLES.Dialog);
+          await driver.waitForSelector({
+            css: '.confirm-page-container-summary__action__name',
+            text: 'Deposit',
+          });
+          await driver.clickElement({ text: 'Confirm', tag: 'button' });
+          await driver.waitUntilXWindowHandles(2);
+          await driver.switchToWindowWithTitle(
+            WINDOW_TITLES.ExtensionInFullScreenView,
+          );
+          await driver.clickElement(
+            '[data-testid="account-overview__activity-tab"]',
+          );
+          await driver.waitForSelector({
+            css: '[data-testid="activity-list-item-action"]',
+            text: 'Deposit',
+          });
+
+          // verify the mint transaction has finished
+          await driver.switchToWindowWithTitle(WINDOW_TITLES.TestDApp);
+          await driver.waitForSelector({
+            css: '#nftsStatus',
+            text: 'Mint completed',
+          });
+
+          await driver.switchToWindowWithTitle(
+            WINDOW_TITLES.ExtensionInFullScreenView,
+          );
+          await clickNestedButton(driver, 'NFTs');
+          await driver.findElement({ text: 'TestDappNFTs (5)' });
+          const nftsListItemsFirstCheck = await driver.findElements(
+            '.nft-item__container',
+          );
+          assert.equal(nftsListItemsFirstCheck.length, 5);
+        },
+      );
+    });
+
+    it('should prompt users to add their NFTs to their wallet (one by one) @no-mmi', async function () {
+      await withFixtures(
+        {
+          dapp: true,
+          fixtures: new FixtureBuilder()
+            .withPermissionControllerConnectedToTestDapp()
+            .build(),
+          ganacheOptions: defaultGanacheOptions,
+          smartContract,
+          title: this.test.fullTitle(),
+        },
+        async ({ driver, _, contractRegistry }) => {
+          const contract = contractRegistry.getContractAddress(smartContract);
+          await unlockWallet(driver);
+
+          await tempToggleSettingRedesignedTransactionConfirmations(driver);
+
+          // Open Dapp and wait for deployed contract
+          await openDapp(driver, contract);
+          await driver.findClickableElement('#deployButton');
+
+          // mint NFT
+          await driver.fill('#mintAmountInput', '5');
+          await driver.clickElement({ text: 'Mint', tag: 'button' });
+
+          // Notification
+          await driver.waitUntilXWindowHandles(3);
+          await driver.switchToWindowWithTitle(WINDOW_TITLES.Dialog);
+          await driver.waitForSelector({
+            css: '.confirm-page-container-summary__action__name',
+            text: 'Deposit',
+          });
+          await driver.clickElement({ text: 'Confirm', tag: 'button' });
+          await driver.waitUntilXWindowHandles(2);
+          await driver.switchToWindowWithTitle(
+            WINDOW_TITLES.ExtensionInFullScreenView,
+          );
+          await driver.clickElement(
+            '[data-testid="account-overview__activity-tab"]',
+          );
+          await driver.waitForSelector({
+            css: '[data-testid="activity-list-item-action"]',
+            text: 'Deposit',
+          });
+
+          // verify the mint transaction has finished
+          await driver.switchToWindowWithTitle(WINDOW_TITLES.TestDApp);
+          const nftsMintStatus = await driver.findElement({
+            css: '#nftsStatus',
+            text: 'Mint completed',
+          });
+          assert.equal(await nftsMintStatus.isDisplayed(), true);
+
+          // watch 3 of the nfts
+          await driver.fill('#watchNFTInput', '1');
+          await driver.clickElement({ text: 'Watch NFT', tag: 'button' });
+          await driver.fill('#watchNFTInput', '2');
+          await driver.clickElement({ text: 'Watch NFT', tag: 'button' });
+          await driver.fill('#watchNFTInput', '3');
+          await driver.clickElement({ text: 'Watch NFT', tag: 'button' });
+
+          await driver.switchToWindowWithTitle(WINDOW_TITLES.Dialog);
+
+          // avoid race condition
+          await driver.waitForSelector({
+            css: '.confirm-add-suggested-nft__nft-tokenId',
+            text: '#3',
+          });
+
+          // confirm watchNFT
+          await driver.waitForSelector({
+            css: '.mm-text--heading-lg',
+            text: 'Add suggested NFTs',
+          });
+          await driver.clickElement({ text: 'Add NFTs', tag: 'button' });
+          await driver.switchToWindowWithTitle(
+            WINDOW_TITLES.ExtensionInFullScreenView,
+          );
+          await clickNestedButton(driver, 'NFTs');
+          // Changed this check from 3 to 6, because after mint all nfts has been added to state,
+          await driver.findElement({ text: 'TestDappNFTs (6)' });
+          const nftsListItemsFirstCheck = await driver.findElements(
+            '.nft-item__container',
+          );
+          assert.equal(nftsListItemsFirstCheck.length, 6);
+
+          await driver.switchToWindowWithTitle(WINDOW_TITLES.TestDApp);
+          await driver.fill('#watchNFTInput', '4');
+
+          await driver.clickElement({ text: 'Watch NFT', tag: 'button' });
+          await driver.fill('#watchNFTInput', '5');
+          await driver.clickElement({ text: 'Watch NFT', tag: 'button' });
+          await driver.fill('#watchNFTInput', '6');
+          await driver.clickElement({ text: 'Watch NFT', tag: 'button' });
+
+          await driver.waitUntilXWindowHandles(3);
+          await driver.switchToWindowWithTitle(WINDOW_TITLES.Dialog);
+
+          // avoid race condition
+          await driver.waitForSelector({
+            css: '.confirm-add-suggested-nft__nft-tokenId',
+            text: '#6',
+          });
+
+          // confirm watchNFT
+          await driver.waitForSelector({
+            css: '.mm-text--heading-lg',
+            text: 'Add suggested NFTs',
+          });
+          await driver.clickElement({ text: 'Add NFTs', tag: 'button' });
+          await driver.switchToWindowWithTitle(
+            WINDOW_TITLES.ExtensionInFullScreenView,
+          );
+          await clickNestedButton(driver, 'NFTs');
+          await driver.findElement({ text: 'TestDappNFTs (6)' });
+          const nftsListItemsSecondCheck = await driver.findElements(
+            '.nft-item__container',
+          );
+          assert.equal(nftsListItemsSecondCheck.length, 6);
+        },
+      );
+    });
+
+    it('should prompt users to add their NFTs to their wallet (all at once)', async function () {
+      await withFixtures(
+        {
+          dapp: true,
+          fixtures: new FixtureBuilder()
+            .withPermissionControllerConnectedToTestDapp()
+            .build(),
+          ganacheOptions: defaultGanacheOptions,
+          smartContract,
+          title: this.test.fullTitle(),
+        },
+        async ({ driver, _, contractRegistry }) => {
+          const contract = contractRegistry.getContractAddress(smartContract);
+          await unlockWallet(driver);
+
+          await tempToggleSettingRedesignedTransactionConfirmations(driver);
+
+          // Open Dapp and wait for deployed contract
+          await openDapp(driver, contract);
+          await driver.findClickableElement('#deployButton');
+
+          // mint NFT
+          await driver.fill('#mintAmountInput', '5');
+          await driver.clickElement({ text: 'Mint', tag: 'button' });
+
+          // Notification
+          await driver.switchToWindowWithTitle(WINDOW_TITLES.Dialog);
+          await driver.waitForSelector({
+            css: '.confirm-page-container-summary__action__name',
+            text: 'Deposit',
+          });
+          await driver.clickElementAndWaitForWindowToClose({
+            text: 'Confirm',
+            tag: 'button',
+          });
+          await driver.switchToWindowWithTitle(
+            WINDOW_TITLES.ExtensionInFullScreenView,
+          );
+          await driver.clickElement(
+            '[data-testid="account-overview__activity-tab"]',
+          );
+
+          // We need to wait until the transaction is confirmed before looking for the tx
+          // otherwise the element becomes stale, as it updates from 'pending' to 'confirmed'
+          await driver.waitForSelector('.transaction-status-label--confirmed');
+
+          await driver.waitForSelector({
+            css: '[data-testid="activity-list-item-action"]',
+            text: 'Deposit',
+          });
+          // verify the mint transaction has finished
+          await driver.switchToWindowWithTitle(WINDOW_TITLES.TestDApp);
+          await driver.waitForSelector({
+            css: '#nftsStatus',
+            text: 'Mint completed',
+          });
+
+          // watch all nfts
+          await driver.clickElement({ text: 'Watch all NFTs', tag: 'button' });
+
+          await driver.switchToWindowWithTitle(WINDOW_TITLES.Dialog);
+
+          // confirm watchNFT
+          await driver.waitForSelector({
+            css: '.mm-text--heading-lg',
+            text: 'Add suggested NFTs',
+          });
+
+          await driver.findElements(
+            '.confirm-add-suggested-nft__nft-list-item',
+          );
+          const suggestedNftListItems = await driver.findElements(
+            '.confirm-add-suggested-nft__nft-list-item',
+          );
+          // there are 6 nfts to add because one is minted as part of the fixture
+          assert.equal(suggestedNftListItems.length, 6);
+
+          // remove one nft from the list
+          const removeButtons = await driver.findElements(
+            '.confirm-add-suggested-nft__nft-remove',
+          );
+          await removeButtons[0].click();
+
+          await driver.clickElementAndWaitForWindowToClose({
+            text: 'Add NFTs',
+            tag: 'button',
+          });
+
+          await driver.switchToWindowWithTitle(
+            WINDOW_TITLES.ExtensionInFullScreenView,
+          );
+          await clickNestedButton(driver, 'NFTs');
+          await driver.findElement({ text: 'TestDappNFTs (5)' });
+          const nftsListItemsSecondCheck = await driver.findElements(
+            '.nft-item__container',
+          );
+
+          assert.equal(nftsListItemsSecondCheck.length, 5);
+        },
+      );
+    });
+
+    it('should transfer a single ERC721 NFT from one account to another', async function () {
+      await withFixtures(
+        {
+          dapp: true,
+          fixtures: new FixtureBuilder()
+            .withPermissionControllerConnectedToTestDapp()
+            .build(),
+          ganacheOptions: defaultGanacheOptions,
+          smartContract,
+          title: this.test.fullTitle(),
+        },
+        async ({ driver, _, contractRegistry }) => {
+          const contract = contractRegistry.getContractAddress(smartContract);
+          await unlockWallet(driver);
+
+          await tempToggleSettingRedesignedTransactionConfirmations(driver);
+
+          // Open Dapp and wait for deployed contract
+          await openDapp(driver, contract);
+          await driver.findClickableElement('#deployButton');
+
+          // Click Transfer
+          await driver.fill('#transferTokenInput', '1');
+          await driver.clickElement('#transferFromButton');
+          await driver.switchToWindowWithTitle(WINDOW_TITLES.Dialog);
+
+          // Confirm transfer
+          await driver.waitForSelector({
+            css: '.mm-text--heading-md',
+            text: 'TestDappNFTs',
+          });
+          await driver.clickElement({ text: 'Confirm', tag: 'button' });
+          await driver.waitUntilXWindowHandles(2);
+          await driver.switchToWindowWithTitle(
+            WINDOW_TITLES.ExtensionInFullScreenView,
+          );
+          await driver.clickElement(
+            '[data-testid="account-overview__activity-tab"]',
+          );
+          await driver.waitForSelector(
+            '.transaction-list__completed-transactions .activity-list-item:nth-of-type(1)',
+          );
+
+          // Verify transaction
+          await driver.findElement({ text: 'Send TDN' });
+        },
+      );
+    });
+
+    it('should approve an address to transfer a single ERC721 NFT', async function () {
+      await withFixtures(
+        {
+          dapp: true,
+          fixtures: new FixtureBuilder()
+            .withPermissionControllerConnectedToTestDapp()
+            .build(),
+          ganacheOptions: defaultGanacheOptions,
+          smartContract,
+          title: this.test.fullTitle(),
+        },
+        async ({ driver, _, contractRegistry }) => {
+          const contract = contractRegistry.getContractAddress(smartContract);
+          await unlockWallet(driver);
+
+          await tempToggleSettingRedesignedTransactionConfirmations(driver);
+
+          // Open Dapp and wait for deployed contract
+          await openDapp(driver, contract);
+          await driver.findClickableElement('#deployButton');
+
+          // Click Approve
+          const approveInput = await driver.findElement('#approveTokenInput');
+          await approveInput.clear();
+          await approveInput.sendKeys('1');
+          await driver.clickElement('#approveButton');
+
+          await driver.waitUntilXWindowHandles(3);
+          await driver.switchToWindowWithTitle(WINDOW_TITLES.Dialog);
+
+          // Verify dialog
+          const title = await driver.findElement(
+            '[data-testid="confirm-approve-title"]',
+          );
+          await driver.clickElement({
+            text: 'View full transaction details',
+            css: '.confirm-approve-content__small-blue-text',
+          });
+          const [func] = await driver.findElements(
+            '.confirm-approve-content__data .confirm-approve-content__small-text',
+          );
+          assert.equal(
+            await title.getText(),
+            'Allow access to and transfer of your TestDappNFTs (#1)?',
+          );
+          assert.equal(await func.getText(), 'Function: Approve');
+
+          // Confirm approval
+          await driver.clickElement({ text: 'Confirm', tag: 'button' });
+          await driver.waitUntilXWindowHandles(2);
+          await driver.switchToWindowWithTitle(
+            WINDOW_TITLES.ExtensionInFullScreenView,
+          );
+          await driver.clickElement(
+            '[data-testid="account-overview__activity-tab"]',
+          );
+          await driver.waitForSelector(
+            '.transaction-list__completed-transactions .transaction-list-item:nth-of-type(1)',
+          );
+
+          // Verify transaction
+          await driver.waitForSelector({
+            css: '[data-testid="activity-list-item-action"]',
+            text: 'Approve TDN spending cap',
+          });
+        },
+      );
+    });
+
+    it('should enable approval for a third party address to manage all ERC721 NFTs @no-mmi', async function () {
+      await withFixtures(
+        {
+          dapp: true,
+          fixtures: new FixtureBuilder()
+            .withPermissionControllerConnectedToTestDapp()
+            .build(),
+          ganacheOptions: defaultGanacheOptions,
+          smartContract,
+          title: this.test.fullTitle(),
+        },
+        async ({ driver, _, contractRegistry }) => {
+          const contract = contractRegistry.getContractAddress(smartContract);
+          await unlockWallet(driver);
+
+          await tempToggleSettingRedesignedTransactionConfirmations(driver);
+
+          // Open Dapp and wait for deployed contract
+          await openDapp(driver, contract);
+          await driver.findClickableElement('#deployButton');
+
+          // Enable Set approval for all
+          await driver.clickElement('#setApprovalForAllButton');
+          await driver.waitUntilXWindowHandles(3);
+          await driver.switchToWindowWithTitle(WINDOW_TITLES.Dialog);
+
+          // Verify dialog
+          const title = await driver.findElement(
+            '[data-testid="confirm-approve-title"]',
+          );
+          await driver.clickElement({
+            text: 'View full transaction details',
+            css: '.confirm-approve-content__small-blue-text',
+          });
+          const [func, params] = await driver.findElements(
+            '.confirm-approve-content__data .confirm-approve-content__small-text',
+          );
+          assert.equal(
+            await title.getText(),
+            'Allow access to and transfer of all your TestDappNFTs?',
+          );
+          assert.equal(await func.getText(), 'Function: SetApprovalForAll');
+          assert.equal(await params.getText(), 'Parameters: true');
+
+          // Confirm enabling set approval for all
+          await driver.clickElement({ text: 'Confirm', tag: 'button' });
+          await driver.clickElement({ text: 'Approve', tag: 'button' });
+
+          await driver.waitUntilXWindowHandles(2);
+          await driver.switchToWindowWithTitle(
+            WINDOW_TITLES.ExtensionInFullScreenView,
+          );
+          await driver.clickElement(
+            '[data-testid="account-overview__activity-tab"]',
+          );
+          await driver.waitForSelector(
+            '.transaction-list__completed-transactions .activity-list-item:nth-of-type(1)',
+          );
+
+          // Verify transaction
+          await driver.waitForSelector({
+            css: '[data-testid="activity-list-item-action"]',
+            text: 'Approve TDN with no spend limit',
+          });
+        },
+      );
+    });
+
+    it('should disable approval for a third party address to manage all ERC721 NFTs @no-mmi', async function () {
+      await withFixtures(
+        {
+          dapp: true,
+          fixtures: new FixtureBuilder()
+            .withPermissionControllerConnectedToTestDapp()
+            .build(),
+          ganacheOptions: defaultGanacheOptions,
+          smartContract,
+          title: this.test.fullTitle(),
+        },
+        async ({ driver, _, contractRegistry }) => {
+          const contract = contractRegistry.getContractAddress(smartContract);
+          await unlockWallet(driver);
+
+          await tempToggleSettingRedesignedTransactionConfirmations(driver);
+
+          // Open Dapp and wait for deployed contract
+          await openDapp(driver, contract);
+          await driver.findClickableElement('#deployButton');
+
+          // Disable Set approval for all
+          await driver.clickElement('#revokeButton');
+          await driver.waitUntilXWindowHandles(3);
+          await driver.switchToWindowWithTitle(WINDOW_TITLES.Dialog);
+
+          // Verify dialog
+          const title = await driver.findElement(
+            '[data-testid="confirm-approve-title"]',
+          );
+          await driver.clickElement({
+            text: 'View full transaction details',
+            css: '.confirm-approve-content__small-blue-text',
+          });
+          const [func, params] = await driver.findElements(
+            '.confirm-approve-content__data .confirm-approve-content__small-text',
+          );
+          const proceedWithCautionIsDisplayed = await driver.isElementPresent(
+            '.dialog--error',
+          );
+          assert.equal(
+            await title.getText(),
+            'Revoke permission to access and transfer all of your TestDappNFTs?',
+          );
+          assert.equal(await func.getText(), 'Function: SetApprovalForAll');
+          assert.equal(await params.getText(), 'Parameters: false');
+          assert.equal(proceedWithCautionIsDisplayed, false);
+
+          // Confirm disabling set approval for all
+          await driver.clickElement({ text: 'Confirm', tag: 'button' });
+
+          await driver.waitUntilXWindowHandles(2);
+          await driver.switchToWindowWithTitle(
+            WINDOW_TITLES.ExtensionInFullScreenView,
+          );
+          await driver.clickElement(
+            '[data-testid="account-overview__activity-tab"]',
+          );
+          await driver.waitForSelector(
+            '.transaction-list__completed-transactions .transaction-list-item:nth-of-type(1)',
+          );
+
+          // Verify transaction
+          await driver.waitForSelector({
+            css: '[data-testid="activity-list-item-action"]',
+            text: 'Approve TDN with no spend limit',
+          });
+        },
+      );
+    });
   });
 
-  it('should disable approval for a third party address to manage all ERC721 NFTs @no-mmi', async function () {
-    await withFixtures(
-      {
-        dapp: true,
-        fixtures: new FixtureBuilder()
-          .withPermissionControllerConnectedToTestDapp()
-          .build(),
-        ganacheOptions: defaultGanacheOptions,
-        smartContract,
-        title: this.test.fullTitle(),
-      },
-      async ({ driver, _, contractRegistry }) => {
-        const contract = contractRegistry.getContractAddress(smartContract);
-        await unlockWallet(driver);
-
-        await tempToggleSettingRedesignedTransactionConfirmations(driver);
-
-        // Open Dapp and wait for deployed contract
-        await openDapp(driver, contract);
-        await driver.findClickableElement('#deployButton');
-
-        // Disable Set approval for all
-        await driver.clickElement('#revokeButton');
-        await driver.waitUntilXWindowHandles(3);
-        await driver.switchToWindowWithTitle(WINDOW_TITLES.Dialog);
-
-        // Verify dialog
-        const title = await driver.findElement(
-          '[data-testid="confirm-approve-title"]',
-        );
-        await driver.clickElement({
-          text: 'View full transaction details',
-          css: '.confirm-approve-content__small-blue-text',
-        });
-        const [func, params] = await driver.findElements(
-          '.confirm-approve-content__data .confirm-approve-content__small-text',
-        );
-        const proceedWithCautionIsDisplayed = await driver.isElementPresent(
-          '.dialog--error',
-        );
-        assert.equal(
-          await title.getText(),
-          'Revoke permission to access and transfer all of your TestDappNFTs?',
-        );
-        assert.equal(await func.getText(), 'Function: SetApprovalForAll');
-        assert.equal(await params.getText(), 'Parameters: false');
-        assert.equal(proceedWithCautionIsDisplayed, false);
-
-        // Confirm disabling set approval for all
-        await driver.clickElement({ text: 'Confirm', tag: 'button' });
-
-        await driver.waitUntilXWindowHandles(2);
-        await driver.switchToWindowWithTitle(
-          WINDOW_TITLES.ExtensionInFullScreenView,
-        );
-        await driver.clickElement(
-          '[data-testid="account-overview__activity-tab"]',
-        );
-        await driver.waitForSelector(
-          '.transaction-list__completed-transactions .transaction-list-item:nth-of-type(1)',
-        );
-
-        // Verify transaction
-        await driver.waitForSelector({
-          css: '[data-testid="activity-list-item-action"]',
-          text: 'Approve TDN with no spend limit',
-        });
-      },
-    );
+  describe('Redesigned confirmation screens', function () {
+    it('should add NFTs to state by parsing tx logs without having to click on watch NFT', async function () {
+      await withFixtures(
+        {
+          dapp: true,
+          fixtures: new FixtureBuilder()
+            .withPermissionControllerConnectedToTestDapp()
+            .build(),
+          ganacheOptions: defaultGanacheOptions,
+          smartContract,
+          title: this.test.fullTitle(),
+        },
+        async ({ driver, _, contractRegistry }) => {
+          const contract = contractRegistry.getContractAddress(smartContract);
+          await unlockWallet(driver);
+
+          // Open Dapp and wait for deployed contract
+          await openDapp(driver, contract);
+          await driver.findClickableElement('#deployButton');
+
+          // mint NFTs
+          await driver.fill('#mintAmountInput', '5');
+          await driver.clickElement({ text: 'Mint', tag: 'button' });
+
+          // Notification
+          await driver.waitUntilXWindowHandles(3);
+          await driver.switchToWindowWithTitle(WINDOW_TITLES.Dialog);
+          await driver.clickElement({ text: 'Confirm', tag: 'button' });
+          await driver.waitUntilXWindowHandles(2);
+          await driver.switchToWindowWithTitle(
+            WINDOW_TITLES.ExtensionInFullScreenView,
+          );
+          await driver.clickElement(
+            '[data-testid="account-overview__activity-tab"]',
+          );
+          await driver.waitForSelector({
+            css: '[data-testid="activity-list-item-action"]',
+            text: 'Deposit',
+          });
+
+          // verify the mint transaction has finished
+          await driver.switchToWindowWithTitle(WINDOW_TITLES.TestDApp);
+          await driver.waitForSelector({
+            css: '#nftsStatus',
+            text: 'Mint completed',
+          });
+
+          await driver.switchToWindowWithTitle(
+            WINDOW_TITLES.ExtensionInFullScreenView,
+          );
+          await clickNestedButton(driver, 'NFTs');
+          await driver.findElement({ text: 'TestDappNFTs (5)' });
+          const nftsListItemsFirstCheck = await driver.findElements(
+            '.nft-item__container',
+          );
+          assert.equal(nftsListItemsFirstCheck.length, 5);
+        },
+      );
+    });
+
+    it('should prompt users to add their NFTs to their wallet (one by one) @no-mmi', async function () {
+      await withFixtures(
+        {
+          dapp: true,
+          fixtures: new FixtureBuilder()
+            .withPermissionControllerConnectedToTestDapp()
+            .build(),
+          ganacheOptions: defaultGanacheOptions,
+          smartContract,
+          title: this.test.fullTitle(),
+        },
+        async ({ driver, _, contractRegistry }) => {
+          const contract = contractRegistry.getContractAddress(smartContract);
+          await unlockWallet(driver);
+
+          // Open Dapp and wait for deployed contract
+          await openDapp(driver, contract);
+          await driver.findClickableElement('#deployButton');
+
+          // mint NFT
+          await driver.fill('#mintAmountInput', '5');
+          await driver.clickElement({ text: 'Mint', tag: 'button' });
+
+          // Notification
+          await driver.waitUntilXWindowHandles(3);
+          await driver.switchToWindowWithTitle(WINDOW_TITLES.Dialog);
+          await driver.clickElement({ text: 'Confirm', tag: 'button' });
+          await driver.waitUntilXWindowHandles(2);
+          await driver.switchToWindowWithTitle(
+            WINDOW_TITLES.ExtensionInFullScreenView,
+          );
+          await driver.clickElement(
+            '[data-testid="account-overview__activity-tab"]',
+          );
+          await driver.waitForSelector({
+            css: '[data-testid="activity-list-item-action"]',
+            text: 'Deposit',
+          });
+
+          // verify the mint transaction has finished
+          await driver.switchToWindowWithTitle(WINDOW_TITLES.TestDApp);
+          const nftsMintStatus = await driver.findElement({
+            css: '#nftsStatus',
+            text: 'Mint completed',
+          });
+          assert.equal(await nftsMintStatus.isDisplayed(), true);
+
+          // watch 3 of the nfts
+          await driver.fill('#watchNFTInput', '1');
+          await driver.clickElement({ text: 'Watch NFT', tag: 'button' });
+          await driver.fill('#watchNFTInput', '2');
+          await driver.clickElement({ text: 'Watch NFT', tag: 'button' });
+          await driver.fill('#watchNFTInput', '3');
+          await driver.clickElement({ text: 'Watch NFT', tag: 'button' });
+
+          await driver.switchToWindowWithTitle(WINDOW_TITLES.Dialog);
+
+          // avoid race condition
+          await driver.waitForSelector({
+            css: '.confirm-add-suggested-nft__nft-tokenId',
+            text: '#3',
+          });
+
+          // confirm watchNFT
+          await driver.waitForSelector({
+            css: '.mm-text--heading-lg',
+            text: 'Add suggested NFTs',
+          });
+          await driver.clickElement({ text: 'Add NFTs', tag: 'button' });
+          await driver.switchToWindowWithTitle(
+            WINDOW_TITLES.ExtensionInFullScreenView,
+          );
+          await clickNestedButton(driver, 'NFTs');
+          // Changed this check from 3 to 6, because after mint all nfts has been added to state,
+          await driver.findElement({ text: 'TestDappNFTs (6)' });
+          const nftsListItemsFirstCheck = await driver.findElements(
+            '.nft-item__container',
+          );
+          assert.equal(nftsListItemsFirstCheck.length, 6);
+
+          await driver.switchToWindowWithTitle(WINDOW_TITLES.TestDApp);
+          await driver.fill('#watchNFTInput', '4');
+
+          await driver.clickElement({ text: 'Watch NFT', tag: 'button' });
+          await driver.fill('#watchNFTInput', '5');
+          await driver.clickElement({ text: 'Watch NFT', tag: 'button' });
+          await driver.fill('#watchNFTInput', '6');
+          await driver.clickElement({ text: 'Watch NFT', tag: 'button' });
+
+          await driver.waitUntilXWindowHandles(3);
+          await driver.switchToWindowWithTitle(WINDOW_TITLES.Dialog);
+
+          // avoid race condition
+          await driver.waitForSelector({
+            css: '.confirm-add-suggested-nft__nft-tokenId',
+            text: '#6',
+          });
+
+          // confirm watchNFT
+          await driver.waitForSelector({
+            css: '.mm-text--heading-lg',
+            text: 'Add suggested NFTs',
+          });
+          await driver.clickElement({ text: 'Add NFTs', tag: 'button' });
+          await driver.switchToWindowWithTitle(
+            WINDOW_TITLES.ExtensionInFullScreenView,
+          );
+          await clickNestedButton(driver, 'NFTs');
+          await driver.findElement({ text: 'TestDappNFTs (6)' });
+          const nftsListItemsSecondCheck = await driver.findElements(
+            '.nft-item__container',
+          );
+          assert.equal(nftsListItemsSecondCheck.length, 6);
+        },
+      );
+    });
+
+    it('should prompt users to add their NFTs to their wallet (all at once)', async function () {
+      await withFixtures(
+        {
+          dapp: true,
+          fixtures: new FixtureBuilder()
+            .withPermissionControllerConnectedToTestDapp()
+            .build(),
+          ganacheOptions: defaultGanacheOptions,
+          smartContract,
+          title: this.test.fullTitle(),
+        },
+        async ({ driver, _, contractRegistry }) => {
+          const contract = contractRegistry.getContractAddress(smartContract);
+          await unlockWallet(driver);
+
+          // Open Dapp and wait for deployed contract
+          await openDapp(driver, contract);
+          await driver.findClickableElement('#deployButton');
+
+          // mint NFT
+          await driver.fill('#mintAmountInput', '5');
+          await driver.clickElement({ text: 'Mint', tag: 'button' });
+
+          // Notification
+          await driver.switchToWindowWithTitle(WINDOW_TITLES.Dialog);
+          await driver.clickElementAndWaitForWindowToClose({
+            text: 'Confirm',
+            tag: 'button',
+          });
+          await driver.switchToWindowWithTitle(
+            WINDOW_TITLES.ExtensionInFullScreenView,
+          );
+          await driver.clickElement(
+            '[data-testid="account-overview__activity-tab"]',
+          );
+
+          // We need to wait until the transaction is confirmed before looking for the tx
+          // otherwise the element becomes stale, as it updates from 'pending' to 'confirmed'
+          await driver.waitForSelector('.transaction-status-label--confirmed');
+
+          await driver.waitForSelector({
+            css: '[data-testid="activity-list-item-action"]',
+            text: 'Deposit',
+          });
+          // verify the mint transaction has finished
+          await driver.switchToWindowWithTitle(WINDOW_TITLES.TestDApp);
+          await driver.waitForSelector({
+            css: '#nftsStatus',
+            text: 'Mint completed',
+          });
+
+          // watch all nfts
+          await driver.clickElement({ text: 'Watch all NFTs', tag: 'button' });
+
+          await driver.switchToWindowWithTitle(WINDOW_TITLES.Dialog);
+
+          // confirm watchNFT
+          await driver.waitForSelector({
+            css: '.mm-text--heading-lg',
+            text: 'Add suggested NFTs',
+          });
+
+          await driver.findElements(
+            '.confirm-add-suggested-nft__nft-list-item',
+          );
+          const suggestedNftListItems = await driver.findElements(
+            '.confirm-add-suggested-nft__nft-list-item',
+          );
+          // there are 6 nfts to add because one is minted as part of the fixture
+          assert.equal(suggestedNftListItems.length, 6);
+
+          // remove one nft from the list
+          const removeButtons = await driver.findElements(
+            '.confirm-add-suggested-nft__nft-remove',
+          );
+          await removeButtons[0].click();
+
+          await driver.clickElementAndWaitForWindowToClose({
+            text: 'Add NFTs',
+            tag: 'button',
+          });
+
+          await driver.switchToWindowWithTitle(
+            WINDOW_TITLES.ExtensionInFullScreenView,
+          );
+          await clickNestedButton(driver, 'NFTs');
+          await driver.findElement({ text: 'TestDappNFTs (5)' });
+          const nftsListItemsSecondCheck = await driver.findElements(
+            '.nft-item__container',
+          );
+
+          assert.equal(nftsListItemsSecondCheck.length, 5);
+        },
+      );
+    });
+
+    it('should transfer a single ERC721 NFT from one account to another', async function () {
+      await withFixtures(
+        {
+          dapp: true,
+          fixtures: new FixtureBuilder()
+            .withPermissionControllerConnectedToTestDapp()
+            .build(),
+          ganacheOptions: defaultGanacheOptions,
+          smartContract,
+          title: this.test.fullTitle(),
+        },
+        async ({ driver, _, contractRegistry }) => {
+          const contract = contractRegistry.getContractAddress(smartContract);
+          await unlockWallet(driver);
+
+          // Open Dapp and wait for deployed contract
+          await openDapp(driver, contract);
+          await driver.findClickableElement('#deployButton');
+
+          // Click Transfer
+          await driver.fill('#transferTokenInput', '1');
+          await driver.clickElement('#transferFromButton');
+          await driver.switchToWindowWithTitle(WINDOW_TITLES.Dialog);
+
+          // Confirm transfer
+          await driver.waitForSelector({
+            css: 'h2',
+            text: 'TestDappNFTs',
+          });
+          await driver.clickElement({ text: 'Confirm', tag: 'button' });
+          await driver.waitUntilXWindowHandles(2);
+          await driver.switchToWindowWithTitle(
+            WINDOW_TITLES.ExtensionInFullScreenView,
+          );
+          await driver.clickElement(
+            '[data-testid="account-overview__activity-tab"]',
+          );
+          await driver.waitForSelector(
+            '.transaction-list__completed-transactions .activity-list-item:nth-of-type(1)',
+          );
+
+          // Verify transaction
+          await driver.findElement({ text: 'Send TDN' });
+        },
+      );
+    });
+
+    it('should approve an address to transfer a single ERC721 NFT', async function () {
+      await withFixtures(
+        {
+          dapp: true,
+          fixtures: new FixtureBuilder()
+            .withPermissionControllerConnectedToTestDapp()
+            .build(),
+          ganacheOptions: defaultGanacheOptions,
+          smartContract,
+          title: this.test.fullTitle(),
+        },
+        async ({ driver, _, contractRegistry }) => {
+          const contract = contractRegistry.getContractAddress(smartContract);
+          await unlockWallet(driver);
+
+          // Open Dapp and wait for deployed contract
+          await openDapp(driver, contract);
+          await driver.findClickableElement('#deployButton');
+
+          // Click Approve
+          const approveInput = await driver.findElement('#approveTokenInput');
+          await approveInput.clear();
+          await approveInput.sendKeys('1');
+          await driver.clickElement('#approveButton');
+
+          await driver.waitUntilXWindowHandles(3);
+          await driver.switchToWindowWithTitle(WINDOW_TITLES.Dialog);
+
+          // Confirm approval
+          await driver.clickElement({ text: 'Confirm', tag: 'button' });
+          await driver.waitUntilXWindowHandles(2);
+          await driver.switchToWindowWithTitle(
+            WINDOW_TITLES.ExtensionInFullScreenView,
+          );
+          await driver.clickElement(
+            '[data-testid="account-overview__activity-tab"]',
+          );
+          await driver.waitForSelector(
+            '.transaction-list__completed-transactions .transaction-list-item:nth-of-type(1)',
+          );
+
+          // Verify transaction
+          await driver.waitForSelector({
+            css: '[data-testid="activity-list-item-action"]',
+            text: 'Approve TDN spending cap',
+          });
+        },
+      );
+    });
+
+    it('should enable approval for a third party address to manage all ERC721 NFTs @no-mmi', async function () {
+      await withFixtures(
+        {
+          dapp: true,
+          fixtures: new FixtureBuilder()
+            .withPermissionControllerConnectedToTestDapp()
+            .build(),
+          ganacheOptions: defaultGanacheOptions,
+          smartContract,
+          title: this.test.fullTitle(),
+        },
+        async ({ driver, _, contractRegistry }) => {
+          const contract = contractRegistry.getContractAddress(smartContract);
+          await unlockWallet(driver);
+
+          // Open Dapp and wait for deployed contract
+          await openDapp(driver, contract);
+          await driver.findClickableElement('#deployButton');
+
+          // Enable Set approval for all
+          await driver.clickElement('#setApprovalForAllButton');
+          await driver.waitUntilXWindowHandles(3);
+          await driver.switchToWindowWithTitle(WINDOW_TITLES.Dialog);
+
+          // Confirm enabling set approval for all
+          await driver.clickElement({ text: 'Confirm', tag: 'button' });
+
+          await driver.waitUntilXWindowHandles(2);
+          await driver.switchToWindowWithTitle(
+            WINDOW_TITLES.ExtensionInFullScreenView,
+          );
+          await driver.clickElement(
+            '[data-testid="account-overview__activity-tab"]',
+          );
+          await driver.waitForSelector(
+            '.transaction-list__completed-transactions .activity-list-item:nth-of-type(1)',
+          );
+
+          // Verify transaction
+          await driver.waitForSelector({
+            css: '[data-testid="activity-list-item-action"]',
+            text: 'Approve TDN with no spend limit',
+          });
+        },
+      );
+    });
+
+    it('should disable approval for a third party address to manage all ERC721 NFTs @no-mmi', async function () {
+      await withFixtures(
+        {
+          dapp: true,
+          fixtures: new FixtureBuilder()
+            .withPermissionControllerConnectedToTestDapp()
+            .build(),
+          ganacheOptions: defaultGanacheOptions,
+          smartContract,
+          title: this.test.fullTitle(),
+        },
+        async ({ driver, _, contractRegistry }) => {
+          const contract = contractRegistry.getContractAddress(smartContract);
+          await unlockWallet(driver);
+
+          // Open Dapp and wait for deployed contract
+          await openDapp(driver, contract);
+          await driver.findClickableElement('#deployButton');
+
+          // Disable Set approval for all
+          await driver.clickElement('#revokeButton');
+          await driver.waitUntilXWindowHandles(3);
+          await driver.switchToWindowWithTitle(WINDOW_TITLES.Dialog);
+
+          // Confirm disabling set approval for all
+          await driver.clickElement({ text: 'Confirm', tag: 'button' });
+
+          await driver.waitUntilXWindowHandles(2);
+          await driver.switchToWindowWithTitle(
+            WINDOW_TITLES.ExtensionInFullScreenView,
+          );
+          await driver.clickElement(
+            '[data-testid="account-overview__activity-tab"]',
+          );
+          await driver.waitForSelector(
+            '.transaction-list__completed-transactions .transaction-list-item:nth-of-type(1)',
+          );
+
+          // Verify transaction
+          await driver.waitForSelector({
+            css: '[data-testid="activity-list-item-action"]',
+            text: 'Approve TDN with no spend limit',
+          });
+        },
+      );
+    });
   });
 });
diff --git a/test/e2e/tests/transaction/change-assets.spec.js b/test/e2e/tests/transaction/change-assets.spec.js
index f6a997c164e9..9764941771b7 100644
--- a/test/e2e/tests/transaction/change-assets.spec.js
+++ b/test/e2e/tests/transaction/change-assets.spec.js
@@ -10,360 +10,721 @@ const { SMART_CONTRACTS } = require('../../seeder/smart-contracts');
 const { tEn } = require('../../../lib/i18n-helpers');
 
 describe('Change assets', function () {
-  it('sends the correct asset when switching from native currency to NFT', async function () {
-    const smartContract = SMART_CONTRACTS.NFTS;
-    await withFixtures(
-      {
-        dapp: true,
-        fixtures: new FixtureBuilder().withNftControllerERC721().build(),
-        ganacheOptions: defaultGanacheOptions,
-        smartContract,
-        title: this.test.fullTitle(),
-      },
-      async ({ driver, ganacheServer }) => {
-        await logInWithBalanceValidation(driver, ganacheServer);
-
-        await tempToggleSettingRedesignedTransactionConfirmations(driver);
-
-        // Wait for balance to load
-        await driver.delay(500);
-
-        // Click the Send button
-        await driver.clickElement('[data-testid="eth-overview-send"]');
-
-        // Chose a recipient
-        await driver.clickElement('.multichain-account-list-item');
-
-        // Populate an amount, continue
-        await driver.clickElement('[data-testid="currency-input"]');
-        await driver.press('[data-testid="currency-input"]', '2');
-        await driver.clickElement({ text: 'Continue', css: 'button' });
-
-        // Validate the send amount
-        await driver.waitForSelector({
-          css: '.currency-display-component__text',
-          text: '2.000042',
-        });
-
-        // Click edit
-        await driver.clickElement(
-          '[data-testid="confirm-page-back-edit-button"]',
-        );
-
-        // Open the Amount modal
-        await driver.clickElement('.asset-picker__symbol');
-
-        // Choose an NFT instead
-        await driver.clickElement({ css: 'button', text: 'NFTs' });
-        await driver.clickElement('[data-testid="nft-default-image"]');
-
-        // Validate that an NFT is chosen in the AssetAmountPicker
-        await driver.waitForSelector({
-          css: '.asset-picker__symbol',
-          text: 'TDN',
-        });
-        await driver.waitForSelector({ css: 'p', text: '#1' });
-
-        // Click continue
-        await driver.assertElementNotPresent('.mm-modal-content');
-        await driver.clickElement({ text: 'Continue', css: 'button' });
-
-        // Ensure NFT is showing
-        await driver.waitForSelector(
-          '.confirm-page-container-summary__title img',
-        );
-        await driver.waitForSelector({ css: 'h3', text: 'Test Dapp NFTs #1' });
-
-        // Send it!
-        await driver.clickElement({ text: 'Confirm', css: 'button' });
-
-        // Ensure it was sent
-        await driver.waitForSelector({
-          css: 'p',
-          text: 'Send Test Dapp NFTs #1',
-        });
-      },
-    );
+  describe('Old confirmation screens', function () {
+    it('sends the correct asset when switching from native currency to NFT', async function () {
+      const smartContract = SMART_CONTRACTS.NFTS;
+      await withFixtures(
+        {
+          dapp: true,
+          fixtures: new FixtureBuilder().withNftControllerERC721().build(),
+          ganacheOptions: defaultGanacheOptions,
+          smartContract,
+          title: this.test.fullTitle(),
+        },
+        async ({ driver, ganacheServer }) => {
+          await logInWithBalanceValidation(driver, ganacheServer);
+
+          await tempToggleSettingRedesignedTransactionConfirmations(driver);
+
+          // Wait for balance to load
+          await driver.delay(500);
+
+          // Click the Send button
+          await driver.clickElement('[data-testid="eth-overview-send"]');
+
+          // Chose a recipient
+          await driver.clickElement('.multichain-account-list-item');
+
+          // Populate an amount, continue
+          await driver.clickElement('[data-testid="currency-input"]');
+          await driver.press('[data-testid="currency-input"]', '2');
+          await driver.clickElement({ text: 'Continue', css: 'button' });
+
+          // Validate the send amount
+          await driver.waitForSelector({
+            css: '.currency-display-component__text',
+            text: '2.000042',
+          });
+
+          // Click edit
+          await driver.clickElement(
+            '[data-testid="confirm-page-back-edit-button"]',
+          );
+
+          // Open the Amount modal
+          await driver.clickElement('.asset-picker__symbol');
+
+          // Choose an NFT instead
+          await driver.clickElement({ css: 'button', text: 'NFTs' });
+          await driver.clickElement('[data-testid="nft-default-image"]');
+
+          // Validate that an NFT is chosen in the AssetAmountPicker
+          await driver.waitForSelector({
+            css: '.asset-picker__symbol',
+            text: 'TDN',
+          });
+          await driver.waitForSelector({ css: 'p', text: '#1' });
+
+          // Click continue
+          await driver.assertElementNotPresent('.mm-modal-content');
+          await driver.clickElement({ text: 'Continue', css: 'button' });
+
+          // Ensure NFT is showing
+          await driver.waitForSelector(
+            '.confirm-page-container-summary__title img',
+          );
+          await driver.waitForSelector({
+            css: 'h3',
+            text: 'Test Dapp NFTs #1',
+          });
+
+          // Send it!
+          await driver.clickElement({ text: 'Confirm', css: 'button' });
+
+          // Ensure it was sent
+          await driver.waitForSelector({
+            css: 'p',
+            text: 'Send Test Dapp NFTs #1',
+          });
+        },
+      );
+    });
+
+    it('sends the correct asset when switching from ERC20 to NFT', async function () {
+      const smartContract = SMART_CONTRACTS.NFTS;
+      const tokenContract = SMART_CONTRACTS.HST;
+      await withFixtures(
+        {
+          dapp: true,
+          fixtures: new FixtureBuilder()
+            .withTokensControllerERC20()
+            .withNftControllerERC721()
+            .build(),
+          ganacheOptions: defaultGanacheOptions,
+          smartContract: [smartContract, tokenContract],
+          title: this.test.fullTitle(),
+        },
+        async ({ driver, ganacheServer }) => {
+          await logInWithBalanceValidation(driver, ganacheServer);
+
+          await tempToggleSettingRedesignedTransactionConfirmations(driver);
+
+          // Click the Send button
+          await driver.clickElement({
+            css: '[data-testid="multichain-token-list-button"] span',
+            text: 'TST',
+          });
+
+          // Wait for balance to load
+          await driver.delay(500);
+
+          await driver.clickElement('[data-testid="eth-overview-send"]');
+
+          // Chose a recipient
+          await driver.clickElement('.multichain-account-list-item');
+
+          // Populate an amount, continue
+          await driver.clickElement('[data-testid="currency-input"]');
+          await driver.press('[data-testid="currency-input"]', '0');
+          await driver.clickElement({ text: 'Continue', css: 'button' });
+
+          // Validate the send amount
+          await driver.waitForSelector({
+            css: '.currency-display-component__text',
+            text: '0.00008455',
+          });
+
+          // Click edit
+          await driver.clickElement(
+            '[data-testid="confirm-page-back-edit-button"]',
+          );
+
+          // Open the Amount modal
+          await driver.clickElement('.asset-picker__symbol');
+
+          // Choose an NFT instead
+          await driver.clickElement({ css: 'button', text: 'NFTs' });
+          await driver.clickElement('[data-testid="nft-default-image"]');
+
+          // Validate that an NFT is chosen in the AssetAmountPicker
+          await driver.waitForSelector({
+            css: '.asset-picker__symbol',
+            text: 'TDN',
+          });
+          await driver.waitForSelector({ css: 'p', text: '#1' });
+
+          // Click continue
+          await driver.assertElementNotPresent('.mm-modal-content');
+          await driver.clickElement({ text: 'Continue', css: 'button' });
+
+          // Ensure NFT is showing
+          await driver.waitForSelector(
+            '.confirm-page-container-summary__title img',
+          );
+          await driver.waitForSelector({
+            css: 'h3',
+            text: 'Test Dapp NFTs #1',
+          });
+
+          // Send it!
+          await driver.clickElement({ text: 'Confirm', css: 'button' });
+
+          // Ensure it was sent
+          await driver.waitForSelector({
+            css: 'p',
+            text: 'Send Test Dapp NFTs #1',
+          });
+        },
+      );
+    });
+
+    it('sends the correct asset when switching from NFT to native currency', async function () {
+      const smartContract = SMART_CONTRACTS.NFTS;
+      await withFixtures(
+        {
+          dapp: true,
+          fixtures: new FixtureBuilder().withNftControllerERC721().build(),
+          ganacheOptions: defaultGanacheOptions,
+          smartContract,
+          title: this.test.fullTitle(),
+        },
+        async ({ driver, ganacheServer }) => {
+          await logInWithBalanceValidation(driver, ganacheServer);
+
+          await tempToggleSettingRedesignedTransactionConfirmations(driver);
+
+          // Choose the nft
+          await driver.clickElement(
+            '[data-testid="account-overview__nfts-tab"]',
+          );
+          await driver.clickElement('[data-testid="nft-default-image"]');
+          await driver.clickElement('[data-testid="nft-send-button"]');
+
+          // Chose a recipient
+          await driver.clickElement('.multichain-account-list-item');
+
+          // Validate that an NFT is chosen in the AssetAmountPicker
+          await driver.waitForSelector({
+            css: '.asset-picker__symbol',
+            text: 'TDN',
+          });
+          await driver.waitForSelector({ css: 'p', text: '#1' });
+          await driver.clickElement({ text: 'Continue', css: 'button' });
+
+          // Ensure NFT is showing
+          await driver.waitForSelector(
+            '.confirm-page-container-summary__title img',
+          );
+          await driver.waitForSelector({
+            css: 'h3',
+            text: 'Test Dapp NFTs #1',
+          });
+
+          // Click edit
+          await driver.clickElement(
+            '[data-testid="confirm-page-back-edit-button"]',
+          );
+
+          // Open the Amount modal
+          await driver.clickElement('.asset-picker__symbol');
+
+          // Choose tokens
+          await driver.clickElement({ css: 'button', text: 'Tokens' });
+          await driver.clickElement(
+            '[data-testid="multichain-token-list-button"]',
+          );
+
+          // Ensure correct token selected
+          await driver.waitForSelector({
+            css: '.asset-picker__symbol',
+            text: 'ETH',
+          });
+
+          // Populate an amount, continue
+          await driver.clickElement('[data-testid="currency-input"]');
+          await driver.press('[data-testid="currency-input"]', '2');
+          await driver.assertElementNotPresent('.mm-modal-content');
+          await driver.clickElement({ text: 'Continue', css: 'button' });
+
+          // Validate the send amount
+          await driver.waitForSelector({
+            css: '.currency-display-component__text',
+            text: '2.000042',
+          });
+
+          // Send it!
+          await driver.clickElement({ text: 'Confirm', css: 'button' });
+
+          // Ensure it was sent
+          await driver.waitForSelector({ css: 'p', text: 'Send' });
+          await driver.waitForSelector({
+            css: '[data-testid="transaction-list-item-primary-currency"]',
+            text: '-2 ETH',
+          });
+        },
+      );
+    });
+
+    it('changes to native currency when switching accounts during a NFT send', async function () {
+      const smartContract = SMART_CONTRACTS.NFTS;
+      await withFixtures(
+        {
+          dapp: true,
+          fixtures: new FixtureBuilder()
+            .withNftControllerERC721()
+            .withPreferencesController({
+              featureFlags: {
+                sendHexData: true,
+              },
+            })
+            .build(),
+          ganacheOptions: defaultGanacheOptions,
+          smartContract,
+          title: this.test.fullTitle(),
+        },
+        async ({ driver, ganacheServer }) => {
+          await logInWithBalanceValidation(driver, ganacheServer);
+
+          await tempToggleSettingRedesignedTransactionConfirmations(driver);
+
+          // Create second account
+          await driver.clickElement('[data-testid="account-menu-icon"]');
+          await driver.clickElement(
+            '[data-testid="multichain-account-menu-popover-action-button"]',
+          );
+          await driver.clickElement(
+            '[data-testid="multichain-account-menu-popover-add-account"]',
+          );
+          await driver.fill('[placeholder="Account 2"]', 'Account 2');
+          await driver.clickElement({ text: tEn('addAccount'), tag: 'button' });
+
+          // Go back to Account 1
+          await driver.clickElement('[data-testid="account-menu-icon"]');
+          await driver.clickElement({
+            css: `.multichain-account-list-item .multichain-account-list-item__account-name__button`,
+            text: 'Account 1',
+          });
+
+          // Choose the nft
+          await driver.clickElement(
+            '[data-testid="account-overview__nfts-tab"]',
+          );
+          await driver.clickElement('[data-testid="nft-default-image"]');
+          await driver.clickElement('[data-testid="nft-send-button"]');
+
+          // Chose a recipient
+          await driver.clickElement('.multichain-account-list-item');
+
+          // Validate that an NFT is chosen in the AssetAmountPicker
+          await driver.waitForSelector({
+            css: '.asset-picker__symbol',
+            text: 'TDN',
+          });
+          await driver.waitForSelector({ css: 'p', text: '#1' });
+
+          // Switch to Account 2
+          await driver.clickElement('[data-testid="send-page-account-picker"]');
+          await driver.clickElement({
+            css: `.multichain-account-list-item .multichain-account-list-item__account-name__button`,
+            text: 'Account 2',
+          });
+
+          // Ensure that the AssetPicker shows native currency and 0 value
+          await driver.waitForSelector({
+            css: '.asset-picker__symbol',
+            text: 'ETH',
+          });
+
+          // Go back to Account 1
+          await driver.clickElement('[data-testid="send-page-account-picker"]');
+          await driver.clickElement({
+            css: `.multichain-account-list-item .multichain-account-list-item__account-name__button`,
+            text: 'Account 1',
+          });
+
+          // Ensure that the AssetPicker shows native currency and 0 value
+          await driver.waitForSelector({
+            css: '.asset-picker__symbol',
+            text: 'ETH',
+          });
+
+          // Populate an amount, continue
+          await driver.clickElement('[data-testid="currency-input"]');
+          await driver.press('[data-testid="currency-input"]', '2');
+
+          // Make sure hex data is cleared after switching assets
+          const hexDataLocator = await driver.findElement(
+            '[data-testid="send-hex-textarea"]',
+          );
+          const hexDataValue = await hexDataLocator.getProperty('value');
+          assert.equal(
+            hexDataValue,
+            '',
+            'Hex data has not been cleared after switching assets.',
+          );
+
+          // Make sure gas is updated by resetting amount and hex data
+          // Note: this is needed until the race condition is fixed on the wallet level (issue #25243)
+          await driver.fill('[data-testid="currency-input"]', '2.000042');
+          await hexDataLocator.fill('0x');
+          await hexDataLocator.fill('');
+
+          // Go to the last confirmation screen
+          await driver.clickElement({ text: 'Continue', css: 'button' });
+
+          // Validate the send amount
+          await driver.waitForSelector({
+            css: '.currency-display-component__text',
+            text: '2.000042',
+          });
+        },
+      );
+    });
   });
 
-  it('sends the correct asset when switching from ERC20 to NFT', async function () {
-    const smartContract = SMART_CONTRACTS.NFTS;
-    const tokenContract = SMART_CONTRACTS.HST;
-    await withFixtures(
-      {
-        dapp: true,
-        fixtures: new FixtureBuilder()
-          .withTokensControllerERC20()
-          .withNftControllerERC721()
-          .build(),
-        ganacheOptions: defaultGanacheOptions,
-        smartContract: [smartContract, tokenContract],
-        title: this.test.fullTitle(),
-      },
-      async ({ driver, ganacheServer }) => {
-        await logInWithBalanceValidation(driver, ganacheServer);
-
-        await tempToggleSettingRedesignedTransactionConfirmations(driver);
-
-        // Click the Send button
-        await driver.clickElement({
-          css: '[data-testid="multichain-token-list-button"] span',
-          text: 'TST',
-        });
-
-        // Wait for balance to load
-        await driver.delay(500);
-
-        await driver.clickElement('[data-testid="eth-overview-send"]');
-
-        // Chose a recipient
-        await driver.clickElement('.multichain-account-list-item');
-
-        // Populate an amount, continue
-        await driver.clickElement('[data-testid="currency-input"]');
-        await driver.press('[data-testid="currency-input"]', '0');
-        await driver.clickElement({ text: 'Continue', css: 'button' });
-
-        // Validate the send amount
-        await driver.waitForSelector({
-          css: '.currency-display-component__text',
-          text: '0.00008455',
-        });
-
-        // Click edit
-        await driver.clickElement(
-          '[data-testid="confirm-page-back-edit-button"]',
-        );
-
-        // Open the Amount modal
-        await driver.clickElement('.asset-picker__symbol');
-
-        // Choose an NFT instead
-        await driver.clickElement({ css: 'button', text: 'NFTs' });
-        await driver.clickElement('[data-testid="nft-default-image"]');
-
-        // Validate that an NFT is chosen in the AssetAmountPicker
-        await driver.waitForSelector({
-          css: '.asset-picker__symbol',
-          text: 'TDN',
-        });
-        await driver.waitForSelector({ css: 'p', text: '#1' });
-
-        // Click continue
-        await driver.assertElementNotPresent('.mm-modal-content');
-        await driver.clickElement({ text: 'Continue', css: 'button' });
-
-        // Ensure NFT is showing
-        await driver.waitForSelector(
-          '.confirm-page-container-summary__title img',
-        );
-        await driver.waitForSelector({ css: 'h3', text: 'Test Dapp NFTs #1' });
-
-        // Send it!
-        await driver.clickElement({ text: 'Confirm', css: 'button' });
-
-        // Ensure it was sent
-        await driver.waitForSelector({
-          css: 'p',
-          text: 'Send Test Dapp NFTs #1',
-        });
-      },
-    );
-  });
-
-  it('sends the correct asset when switching from NFT to native currency', async function () {
-    const smartContract = SMART_CONTRACTS.NFTS;
-    await withFixtures(
-      {
-        dapp: true,
-        fixtures: new FixtureBuilder().withNftControllerERC721().build(),
-        ganacheOptions: defaultGanacheOptions,
-        smartContract,
-        title: this.test.fullTitle(),
-      },
-      async ({ driver, ganacheServer }) => {
-        await logInWithBalanceValidation(driver, ganacheServer);
-
-        await tempToggleSettingRedesignedTransactionConfirmations(driver);
-
-        // Choose the nft
-        await driver.clickElement('[data-testid="account-overview__nfts-tab"]');
-        await driver.clickElement('[data-testid="nft-default-image"]');
-        await driver.clickElement('[data-testid="nft-send-button"]');
-
-        // Chose a recipient
-        await driver.clickElement('.multichain-account-list-item');
-
-        // Validate that an NFT is chosen in the AssetAmountPicker
-        await driver.waitForSelector({
-          css: '.asset-picker__symbol',
-          text: 'TDN',
-        });
-        await driver.waitForSelector({ css: 'p', text: '#1' });
-        await driver.clickElement({ text: 'Continue', css: 'button' });
-
-        // Ensure NFT is showing
-        await driver.waitForSelector(
-          '.confirm-page-container-summary__title img',
-        );
-        await driver.waitForSelector({ css: 'h3', text: 'Test Dapp NFTs #1' });
-
-        // Click edit
-        await driver.clickElement(
-          '[data-testid="confirm-page-back-edit-button"]',
-        );
-
-        // Open the Amount modal
-        await driver.clickElement('.asset-picker__symbol');
-
-        // Choose tokens
-        await driver.clickElement({ css: 'button', text: 'Tokens' });
-        await driver.clickElement(
-          '[data-testid="multichain-token-list-button"]',
-        );
-
-        // Ensure correct token selected
-        await driver.waitForSelector({
-          css: '.asset-picker__symbol',
-          text: 'ETH',
-        });
-
-        // Populate an amount, continue
-        await driver.clickElement('[data-testid="currency-input"]');
-        await driver.press('[data-testid="currency-input"]', '2');
-        await driver.assertElementNotPresent('.mm-modal-content');
-        await driver.clickElement({ text: 'Continue', css: 'button' });
-
-        // Validate the send amount
-        await driver.waitForSelector({
-          css: '.currency-display-component__text',
-          text: '2.000042',
-        });
-
-        // Send it!
-        await driver.clickElement({ text: 'Confirm', css: 'button' });
-
-        // Ensure it was sent
-        await driver.waitForSelector({ css: 'p', text: 'Send' });
-        await driver.waitForSelector({
-          css: '[data-testid="transaction-list-item-primary-currency"]',
-          text: '-2 ETH',
-        });
-      },
-    );
-  });
-
-  it('changes to native currency when switching accounts during a NFT send', async function () {
-    const smartContract = SMART_CONTRACTS.NFTS;
-    await withFixtures(
-      {
-        dapp: true,
-        fixtures: new FixtureBuilder()
-          .withNftControllerERC721()
-          .withPreferencesController({
-            featureFlags: {
-              sendHexData: true,
-            },
-          })
-          .build(),
-        ganacheOptions: defaultGanacheOptions,
-        smartContract,
-        title: this.test.fullTitle(),
-      },
-      async ({ driver, ganacheServer }) => {
-        await logInWithBalanceValidation(driver, ganacheServer);
-
-        await tempToggleSettingRedesignedTransactionConfirmations(driver);
-
-        // Create second account
-        await driver.clickElement('[data-testid="account-menu-icon"]');
-        await driver.clickElement(
-          '[data-testid="multichain-account-menu-popover-action-button"]',
-        );
-        await driver.clickElement(
-          '[data-testid="multichain-account-menu-popover-add-account"]',
-        );
-        await driver.fill('[placeholder="Account 2"]', 'Account 2');
-        await driver.clickElement({ text: tEn('addAccount'), tag: 'button' });
-
-        // Go back to Account 1
-        await driver.clickElement('[data-testid="account-menu-icon"]');
-        await driver.clickElement({
-          css: `.multichain-account-list-item .multichain-account-list-item__account-name__button`,
-          text: 'Account 1',
-        });
-
-        // Choose the nft
-        await driver.clickElement('[data-testid="account-overview__nfts-tab"]');
-        await driver.clickElement('[data-testid="nft-default-image"]');
-        await driver.clickElement('[data-testid="nft-send-button"]');
-
-        // Chose a recipient
-        await driver.clickElement('.multichain-account-list-item');
-
-        // Validate that an NFT is chosen in the AssetAmountPicker
-        await driver.waitForSelector({
-          css: '.asset-picker__symbol',
-          text: 'TDN',
-        });
-        await driver.waitForSelector({ css: 'p', text: '#1' });
-
-        // Switch to Account 2
-        await driver.clickElement('[data-testid="send-page-account-picker"]');
-        await driver.clickElement({
-          css: `.multichain-account-list-item .multichain-account-list-item__account-name__button`,
-          text: 'Account 2',
-        });
-
-        // Ensure that the AssetPicker shows native currency and 0 value
-        await driver.waitForSelector({
-          css: '.asset-picker__symbol',
-          text: 'ETH',
-        });
-
-        // Go back to Account 1
-        await driver.clickElement('[data-testid="send-page-account-picker"]');
-        await driver.clickElement({
-          css: `.multichain-account-list-item .multichain-account-list-item__account-name__button`,
-          text: 'Account 1',
-        });
-
-        // Ensure that the AssetPicker shows native currency and 0 value
-        await driver.waitForSelector({
-          css: '.asset-picker__symbol',
-          text: 'ETH',
-        });
-
-        // Populate an amount, continue
-        await driver.clickElement('[data-testid="currency-input"]');
-        await driver.press('[data-testid="currency-input"]', '2');
-
-        // Make sure hex data is cleared after switching assets
-        const hexDataLocator = await driver.findElement(
-          '[data-testid="send-hex-textarea"]',
-        );
-        const hexDataValue = await hexDataLocator.getProperty('value');
-        assert.equal(
-          hexDataValue,
-          '',
-          'Hex data has not been cleared after switching assets.',
-        );
-
-        // Make sure gas is updated by resetting amount and hex data
-        // Note: this is needed until the race condition is fixed on the wallet level (issue #25243)
-        await driver.fill('[data-testid="currency-input"]', '2.000042');
-        await hexDataLocator.fill('0x');
-        await hexDataLocator.fill('');
-
-        // Go to the last confirmation screen
-        await driver.clickElement({ text: 'Continue', css: 'button' });
-
-        // Validate the send amount
-        await driver.waitForSelector({
-          css: '.currency-display-component__text',
-          text: '2.000042',
-        });
-      },
-    );
+  describe('Redesigned confirmation screens', function () {
+    it('sends the correct asset when switching from native currency to NFT', async function () {
+      const smartContract = SMART_CONTRACTS.NFTS;
+      await withFixtures(
+        {
+          dapp: true,
+          fixtures: new FixtureBuilder().withNftControllerERC721().build(),
+          ganacheOptions: defaultGanacheOptions,
+          smartContract,
+          title: this.test.fullTitle(),
+        },
+        async ({ driver, ganacheServer }) => {
+          await logInWithBalanceValidation(driver, ganacheServer);
+
+          // Wait for balance to load
+          await driver.delay(500);
+
+          // Click the Send button
+          await driver.clickElement('[data-testid="eth-overview-send"]');
+
+          // Chose a recipient
+          await driver.clickElement('.multichain-account-list-item');
+
+          // Populate an amount, continue
+          await driver.clickElement('[data-testid="currency-input"]');
+          await driver.press('[data-testid="currency-input"]', '2');
+          await driver.clickElement({ text: 'Continue', css: 'button' });
+
+          // Click edit
+          await driver.clickElement(
+            '[data-testid="wallet-initiated-header-back-button"]',
+          );
+
+          // Open the Amount modal
+          await driver.clickElement('.asset-picker__symbol');
+
+          // Choose an NFT instead
+          await driver.clickElement({ css: 'button', text: 'NFTs' });
+          await driver.clickElement('[data-testid="nft-default-image"]');
+
+          // Validate that an NFT is chosen in the AssetAmountPicker
+          await driver.waitForSelector({
+            css: '.asset-picker__symbol',
+            text: 'TDN',
+          });
+          await driver.waitForSelector({ css: 'p', text: '#1' });
+
+          // Click continue
+          await driver.assertElementNotPresent('.mm-modal-content');
+          await driver.clickElement({ text: 'Continue', css: 'button' });
+
+          // Ensure NFT is showing
+          await driver.waitForSelector('[data-testid="nft-default-image"]');
+          await driver.waitForSelector({
+            css: 'h2',
+            text: 'Test Dapp NFTs #1',
+          });
+
+          // Send it!
+          await driver.clickElement({ text: 'Confirm', css: 'button' });
+
+          // Ensure it was sent
+          await driver.waitForSelector({
+            css: 'p',
+            text: 'Send Test Dapp NFTs #1',
+          });
+        },
+      );
+    });
+
+    it('sends the correct asset when switching from ERC20 to NFT', async function () {
+      const smartContract = SMART_CONTRACTS.NFTS;
+      const tokenContract = SMART_CONTRACTS.HST;
+      await withFixtures(
+        {
+          dapp: true,
+          fixtures: new FixtureBuilder()
+            .withTokensControllerERC20()
+            .withNftControllerERC721()
+            .build(),
+          ganacheOptions: defaultGanacheOptions,
+          smartContract: [smartContract, tokenContract],
+          title: this.test.fullTitle(),
+        },
+        async ({ driver, ganacheServer }) => {
+          await logInWithBalanceValidation(driver, ganacheServer);
+
+          // Click the Send button
+          await driver.clickElement({
+            css: '[data-testid="multichain-token-list-button"] span',
+            text: 'TST',
+          });
+
+          // Wait for balance to load
+          await driver.delay(500);
+
+          await driver.clickElement('[data-testid="eth-overview-send"]');
+
+          // Chose a recipient
+          await driver.clickElement('.multichain-account-list-item');
+
+          // Populate an amount, continue
+          await driver.clickElement('[data-testid="currency-input"]');
+          await driver.press('[data-testid="currency-input"]', '0');
+          await driver.clickElement({ text: 'Continue', css: 'button' });
+
+          // Click edit
+          await driver.clickElement(
+            '[data-testid="wallet-initiated-header-back-button"]',
+          );
+
+          // Open the Amount modal
+          await driver.clickElement('.asset-picker__symbol');
+
+          // Choose an NFT instead
+          await driver.clickElement({ css: 'button', text: 'NFTs' });
+          await driver.clickElement('[data-testid="nft-default-image"]');
+
+          // Validate that an NFT is chosen in the AssetAmountPicker
+          await driver.waitForSelector({
+            css: '.asset-picker__symbol',
+            text: 'TDN',
+          });
+          await driver.waitForSelector({ css: 'p', text: '#1' });
+
+          // Click continue
+          await driver.assertElementNotPresent('.mm-modal-content');
+          await driver.clickElement({ text: 'Continue', css: 'button' });
+
+          // Ensure NFT is showing
+          await driver.waitForSelector('[data-testid="nft-default-image"]');
+          await driver.waitForSelector({
+            css: 'h2',
+            text: 'Test Dapp NFTs #1',
+          });
+
+          // Send it!
+          await driver.clickElement({ text: 'Confirm', css: 'button' });
+
+          // Ensure it was sent
+          await driver.waitForSelector({
+            css: 'p',
+            text: 'Send Test Dapp NFTs #1',
+          });
+        },
+      );
+    });
+
+    it('sends the correct asset when switching from NFT to native currency', async function () {
+      const smartContract = SMART_CONTRACTS.NFTS;
+      await withFixtures(
+        {
+          dapp: true,
+          fixtures: new FixtureBuilder().withNftControllerERC721().build(),
+          ganacheOptions: defaultGanacheOptions,
+          smartContract,
+          title: this.test.fullTitle(),
+        },
+        async ({ driver, ganacheServer }) => {
+          await logInWithBalanceValidation(driver, ganacheServer);
+
+          // Choose the nft
+          await driver.clickElement(
+            '[data-testid="account-overview__nfts-tab"]',
+          );
+          await driver.clickElement('[data-testid="nft-default-image"]');
+          await driver.clickElement('[data-testid="nft-send-button"]');
+
+          // Chose a recipient
+          await driver.clickElement('.multichain-account-list-item');
+
+          // Validate that an NFT is chosen in the AssetAmountPicker
+          await driver.waitForSelector({
+            css: '.asset-picker__symbol',
+            text: 'TDN',
+          });
+          await driver.waitForSelector({ css: 'p', text: '#1' });
+          await driver.clickElement({ text: 'Continue', css: 'button' });
+
+          // Ensure NFT is showing
+          await driver.waitForSelector('[data-testid="nft-default-image"]');
+          await driver.waitForSelector({
+            css: 'h2',
+            text: 'Test Dapp NFTs #1',
+          });
+
+          // Click edit
+          await driver.clickElement(
+            '[data-testid="wallet-initiated-header-back-button"]',
+          );
+
+          // Open the Amount modal
+          await driver.clickElement('.asset-picker__symbol');
+
+          // Choose tokens
+          await driver.clickElement({ css: 'button', text: 'Tokens' });
+          await driver.clickElement(
+            '[data-testid="multichain-token-list-button"]',
+          );
+
+          // Ensure correct token selected
+          await driver.waitForSelector({
+            css: '.asset-picker__symbol',
+            text: 'ETH',
+          });
+
+          // Populate an amount, continue
+          await driver.clickElement('[data-testid="currency-input"]');
+          await driver.press('[data-testid="currency-input"]', '2');
+          await driver.assertElementNotPresent('.mm-modal-content');
+          await driver.clickElement({ text: 'Continue', css: 'button' });
+
+          // Validate the send amount
+          await driver.waitForSelector({
+            css: 'h2',
+            text: '2',
+          });
+
+          // Send it!
+          await driver.clickElement({ text: 'Confirm', css: 'button' });
+
+          // Ensure it was sent
+          await driver.waitForSelector({ css: 'p', text: 'Send' });
+          await driver.waitForSelector({
+            css: '[data-testid="transaction-list-item-primary-currency"]',
+            text: '-2 ETH',
+          });
+        },
+      );
+    });
+
+    it('changes to native currency when switching accounts during a NFT send', async function () {
+      const smartContract = SMART_CONTRACTS.NFTS;
+      await withFixtures(
+        {
+          dapp: true,
+          fixtures: new FixtureBuilder()
+            .withNftControllerERC721()
+            .withPreferencesController({
+              featureFlags: {
+                sendHexData: true,
+              },
+            })
+            .build(),
+          ganacheOptions: defaultGanacheOptions,
+          smartContract,
+          title: this.test.fullTitle(),
+        },
+        async ({ driver, ganacheServer }) => {
+          await logInWithBalanceValidation(driver, ganacheServer);
+
+          // Create second account
+          await driver.clickElement('[data-testid="account-menu-icon"]');
+          await driver.clickElement(
+            '[data-testid="multichain-account-menu-popover-action-button"]',
+          );
+          await driver.clickElement(
+            '[data-testid="multichain-account-menu-popover-add-account"]',
+          );
+          await driver.fill('[placeholder="Account 2"]', 'Account 2');
+          await driver.clickElement({ text: tEn('addAccount'), tag: 'button' });
+
+          // Go back to Account 1
+          await driver.clickElement('[data-testid="account-menu-icon"]');
+          await driver.clickElement({
+            css: `.multichain-account-list-item .multichain-account-list-item__account-name__button`,
+            text: 'Account 1',
+          });
+
+          // Choose the nft
+          await driver.clickElement(
+            '[data-testid="account-overview__nfts-tab"]',
+          );
+          await driver.clickElement('[data-testid="nft-default-image"]');
+          await driver.clickElement('[data-testid="nft-send-button"]');
+
+          // Chose a recipient
+          await driver.clickElement('.multichain-account-list-item');
+
+          // Validate that an NFT is chosen in the AssetAmountPicker
+          await driver.waitForSelector({
+            css: '.asset-picker__symbol',
+            text: 'TDN',
+          });
+          await driver.waitForSelector({ css: 'p', text: '#1' });
+
+          // Switch to Account 2
+          await driver.clickElement('[data-testid="send-page-account-picker"]');
+          await driver.clickElement({
+            css: `.multichain-account-list-item .multichain-account-list-item__account-name__button`,
+            text: 'Account 2',
+          });
+
+          // Ensure that the AssetPicker shows native currency and 0 value
+          await driver.waitForSelector({
+            css: '.asset-picker__symbol',
+            text: 'ETH',
+          });
+
+          // Go back to Account 1
+          await driver.clickElement('[data-testid="send-page-account-picker"]');
+          await driver.clickElement({
+            css: `.multichain-account-list-item .multichain-account-list-item__account-name__button`,
+            text: 'Account 1',
+          });
+
+          // Ensure that the AssetPicker shows native currency and 0 value
+          await driver.waitForSelector({
+            css: '.asset-picker__symbol',
+            text: 'ETH',
+          });
+
+          // Populate an amount, continue
+          await driver.clickElement('[data-testid="currency-input"]');
+          await driver.press('[data-testid="currency-input"]', '2');
+
+          // Make sure hex data is cleared after switching assets
+          const hexDataLocator = await driver.findElement(
+            '[data-testid="send-hex-textarea"]',
+          );
+          const hexDataValue = await hexDataLocator.getProperty('value');
+          assert.equal(
+            hexDataValue,
+            '',
+            'Hex data has not been cleared after switching assets.',
+          );
+
+          // Make sure gas is updated by resetting amount and hex data
+          // Note: this is needed until the race condition is fixed on the wallet level (issue #25243)
+          await driver.fill('[data-testid="currency-input"]', '2.000042');
+          await hexDataLocator.fill('0x');
+          await hexDataLocator.fill('');
+
+          // Go to the last confirmation screen
+          await driver.clickElement({ text: 'Continue', css: 'button' });
+
+          // Validate the send amount
+          await driver.waitForSelector({
+            css: 'h2',
+            text: '2 ETH',
+          });
+        },
+      );
+    });
   });
 });
diff --git a/test/e2e/tests/transaction/edit-gas-fee.spec.js b/test/e2e/tests/transaction/edit-gas-fee.spec.js
index 3e7655750594..4e30fb8c0be1 100644
--- a/test/e2e/tests/transaction/edit-gas-fee.spec.js
+++ b/test/e2e/tests/transaction/edit-gas-fee.spec.js
@@ -14,228 +14,456 @@ const {
 const FixtureBuilder = require('../../fixture-builder');
 
 describe('Editing Confirm Transaction', function () {
-  it('allows selecting high, medium, low gas estimates on edit gas fee popover @no-mmi', async function () {
-    await withFixtures(
-      {
-        fixtures: new FixtureBuilder().build(),
-        ganacheOptions: generateGanacheOptions({ hardfork: 'london' }),
-        title: this.test.fullTitle(),
-      },
-      async ({ driver }) => {
-        await unlockWallet(driver);
-
-        await tempToggleSettingRedesignedTransactionConfirmations(driver);
-
-        await createInternalTransaction(driver);
-
-        await driver.findElement({
-          css: '.currency-display-component__text',
-          text: '1',
-        });
-
-        // update estimates to high
-        await driver.clickElement('[data-testid="edit-gas-fee-icon"]');
-        await driver.waitForSelector({
-          text: 'sec',
-          tag: 'span',
-        });
-        await driver.clickElement(
-          '[data-testid="edit-gas-fee-item-high"] > span:first-child',
-        );
-
-        await driver.waitForSelector({
-          text: 'Aggressive',
-        });
-
-        // update estimates to medium
-        await driver.clickElement('[data-testid="edit-gas-fee-icon"]');
-        await driver.clickElement(
-          '[data-testid="edit-gas-fee-item-medium"] > span:first-child',
-        );
-
-        await driver.waitForSelector({
-          text: 'Market',
-        });
-
-        // update estimates to low
-        await driver.clickElement('[data-testid="edit-gas-fee-icon"]');
-        await driver.clickElement(
-          '[data-testid="edit-gas-fee-item-low"] > span:first-child',
-        );
-
-        await driver.waitForSelector({
-          text: 'Slow',
-        });
-        await driver.waitForSelector('[data-testid="low-gas-fee-alert"]');
-
-        // confirms the transaction
-        await driver.clickElement({ text: 'Confirm', tag: 'button' });
-
-        await driver.clickElement(
-          '[data-testid="account-overview__activity-tab"]',
-        );
-        await driver.wait(async () => {
-          const confirmedTxes = await driver.findElements(
-            '.transaction-list__completed-transactions .activity-list-item',
-          );
-          return confirmedTxes.length === 1;
-        }, 10000);
-
-        const txValues = await driver.findElements(
-          '[data-testid="transaction-list-item-primary-currency"]',
-        );
-        assert.equal(txValues.length, 1);
-        assert.ok(/-1\s*ETH/u.test(await txValues[0].getText()));
-      },
-    );
-  });
+  describe('Old confirmation screens', function () {
+    it('allows selecting high, medium, low gas estimates on edit gas fee popover @no-mmi', async function () {
+      await withFixtures(
+        {
+          fixtures: new FixtureBuilder().build(),
+          ganacheOptions: generateGanacheOptions({ hardfork: 'london' }),
+          title: this.test.fullTitle(),
+        },
+        async ({ driver }) => {
+          await unlockWallet(driver);
+
+          await tempToggleSettingRedesignedTransactionConfirmations(driver);
+
+          await createInternalTransaction(driver);
+
+          await driver.findElement({
+            css: '.currency-display-component__text',
+            text: '1',
+          });
+
+          // update estimates to high
+          await driver.clickElement('[data-testid="edit-gas-fee-icon"]');
+          await driver.waitForSelector({
+            text: 'sec',
+            tag: 'span',
+          });
+          await driver.clickElement(
+            '[data-testid="edit-gas-fee-item-high"] > span:first-child',
+          );
+
+          await driver.waitForSelector({
+            text: 'Aggressive',
+          });
+
+          // update estimates to medium
+          await driver.clickElement('[data-testid="edit-gas-fee-icon"]');
+          await driver.clickElement(
+            '[data-testid="edit-gas-fee-item-medium"] > span:first-child',
+          );
+
+          await driver.waitForSelector({
+            text: 'Market',
+          });
 
-  it('allows accessing advance gas fee popover from edit gas fee popover', async function () {
-    await withFixtures(
-      {
-        fixtures: new FixtureBuilder().build(),
-        ganacheOptions: generateGanacheOptions({ hardfork: 'london' }),
-        title: this.test.fullTitle(),
-      },
-      async ({ driver }) => {
-        await unlockWallet(driver);
-
-        await tempToggleSettingRedesignedTransactionConfirmations(driver);
-
-        await createInternalTransaction(driver);
-
-        await driver.findElement({
-          css: '.currency-display-component__text',
-          text: '1',
-        });
-
-        // update estimates to high
-        await driver.clickElement('[data-testid="edit-gas-fee-icon"]');
-        await driver.waitForSelector({
-          text: 'sec',
-          tag: 'span',
-        });
-        await driver.clickElement('[data-testid="edit-gas-fee-item-custom"]');
-
-        // enter max fee
-        await driver.fill('[data-testid="base-fee-input"]', '8.5');
-
-        // enter priority fee
-        await driver.fill('[data-testid="priority-fee-input"]', '8.5');
-
-        // save default values
-        await driver.clickElement('input[type="checkbox"]');
-
-        // edit gas limit
-        await driver.clickElement('[data-testid="advanced-gas-fee-edit"]');
-        await driver.fill('[data-testid="gas-limit-input"]', '100000');
-
-        // Submit gas fee changes
-        await driver.clickElement({ text: 'Save', tag: 'button' });
-
-        // has correct updated value on the confirm screen the transaction
-        await driver.waitForSelector({
-          css: '.currency-display-component__text',
-          text: '0.00085',
-        });
-        await driver.waitForSelector({
-          css: '.currency-display-component__suffix',
-          text: 'ETH',
-        });
-
-        // confirms the transaction
-        await driver.clickElement({ text: 'Confirm', tag: 'button' });
-
-        await driver.clickElement(
-          '[data-testid="account-overview__activity-tab"]',
-        );
-        await driver.wait(async () => {
-          const confirmedTxes = await driver.findElements(
-            '.transaction-list__completed-transactions .activity-list-item',
-          );
-          return confirmedTxes.length === 1;
-        }, 10000);
-
-        const txValues = await driver.findElements(
-          '[data-testid="transaction-list-item-primary-currency"]',
-        );
-        assert.equal(txValues.length, 1);
-        assert.ok(/-1\s*ETH/u.test(await txValues[0].getText()));
-      },
-    );
+          // update estimates to low
+          await driver.clickElement('[data-testid="edit-gas-fee-icon"]');
+          await driver.clickElement(
+            '[data-testid="edit-gas-fee-item-low"] > span:first-child',
+          );
+
+          await driver.waitForSelector({
+            text: 'Slow',
+          });
+          await driver.waitForSelector('[data-testid="low-gas-fee-alert"]');
+
+          // confirms the transaction
+          await driver.clickElement({ text: 'Confirm', tag: 'button' });
+
+          await driver.clickElement(
+            '[data-testid="account-overview__activity-tab"]',
+          );
+          await driver.wait(async () => {
+            const confirmedTxes = await driver.findElements(
+              '.transaction-list__completed-transactions .activity-list-item',
+            );
+            return confirmedTxes.length === 1;
+          }, 10000);
+
+          const txValues = await driver.findElements(
+            '[data-testid="transaction-list-item-primary-currency"]',
+          );
+          assert.equal(txValues.length, 1);
+          assert.ok(/-1\s*ETH/u.test(await txValues[0].getText()));
+        },
+      );
+    });
+
+    it('allows accessing advance gas fee popover from edit gas fee popover', async function () {
+      await withFixtures(
+        {
+          fixtures: new FixtureBuilder().build(),
+          ganacheOptions: generateGanacheOptions({ hardfork: 'london' }),
+          title: this.test.fullTitle(),
+        },
+        async ({ driver }) => {
+          await unlockWallet(driver);
+
+          await tempToggleSettingRedesignedTransactionConfirmations(driver);
+
+          await createInternalTransaction(driver);
+
+          await driver.findElement({
+            css: '.currency-display-component__text',
+            text: '1',
+          });
+
+          // update estimates to high
+          await driver.clickElement('[data-testid="edit-gas-fee-icon"]');
+          await driver.waitForSelector({
+            text: 'sec',
+            tag: 'span',
+          });
+          await driver.clickElement('[data-testid="edit-gas-fee-item-custom"]');
+
+          // enter max fee
+          await driver.fill('[data-testid="base-fee-input"]', '8.5');
+
+          // enter priority fee
+          await driver.fill('[data-testid="priority-fee-input"]', '8.5');
+
+          // save default values
+          await driver.clickElement('input[type="checkbox"]');
+
+          // edit gas limit
+          await driver.clickElement('[data-testid="advanced-gas-fee-edit"]');
+          await driver.fill('[data-testid="gas-limit-input"]', '100000');
+
+          // Submit gas fee changes
+          await driver.clickElement({ text: 'Save', tag: 'button' });
+
+          // has correct updated value on the confirm screen the transaction
+          await driver.waitForSelector({
+            css: '.currency-display-component__text',
+            text: '0.00085',
+          });
+          await driver.waitForSelector({
+            css: '.currency-display-component__suffix',
+            text: 'ETH',
+          });
+
+          // confirms the transaction
+          await driver.clickElement({ text: 'Confirm', tag: 'button' });
+
+          await driver.clickElement(
+            '[data-testid="account-overview__activity-tab"]',
+          );
+          await driver.wait(async () => {
+            const confirmedTxes = await driver.findElements(
+              '.transaction-list__completed-transactions .activity-list-item',
+            );
+            return confirmedTxes.length === 1;
+          }, 10000);
+
+          const txValues = await driver.findElements(
+            '[data-testid="transaction-list-item-primary-currency"]',
+          );
+          assert.equal(txValues.length, 1);
+          assert.ok(/-1\s*ETH/u.test(await txValues[0].getText()));
+        },
+      );
+    });
+
+    it('should use dapp suggested estimates for transaction coming from dapp @no-mmi', async function () {
+      await withFixtures(
+        {
+          fixtures: new FixtureBuilder()
+            .withPermissionControllerConnectedToTestDapp()
+            .build(),
+          ganacheOptions: generateGanacheOptions({ hardfork: 'london' }),
+          title: this.test.fullTitle(),
+          dapp: true,
+        },
+        async ({ driver }) => {
+          // login to extension
+          await unlockWallet(driver);
+
+          await tempToggleSettingRedesignedTransactionConfirmations(driver);
+
+          await createDappTransaction(driver, {
+            maxFeePerGas: '0x2000000000',
+            maxPriorityFeePerGas: '0x1000000000',
+          });
+
+          // check transaction in extension popup
+          await driver.switchToWindowWithTitle(WINDOW_TITLES.Dialog);
+          await driver.waitForSelector({
+            text: 'Site suggested',
+          });
+
+          await driver.clickElement('[data-testid="edit-gas-fee-icon"]');
+          // -- should render the popover with no error
+          // this is to test in MV3 a racing issue when request for suggestedGasFees is not fetched properly
+          // some data would not be defined yet
+          await driver.waitForSelector('.edit-gas-fee-popover');
+          await driver.clickElement(
+            '[data-testid="edit-gas-fee-item-dappSuggested"]',
+          );
+
+          const transactionAmounts = await driver.findElements(
+            '.currency-display-component__text',
+          );
+          const transactionAmount = transactionAmounts[0];
+          assert.equal(await transactionAmount.getText(), '0.001');
+
+          // has correct updated value on the confirm screen the transaction
+          await driver.waitForSelector({
+            css: '.currency-display-component__text',
+            text: '0.00185144',
+          });
+
+          // confirms the transaction
+          await driver.clickElement({ text: 'Confirm', tag: 'button' });
+
+          // transaction should correct values in activity tab
+          await driver.switchToWindowWithTitle(
+            WINDOW_TITLES.ExtensionInFullScreenView,
+          );
+          await driver.clickElement(
+            '[data-testid="account-overview__activity-tab"]',
+          );
+          await driver.wait(async () => {
+            const confirmedTxes = await driver.findElements(
+              '.transaction-list__completed-transactions .activity-list-item',
+            );
+            return confirmedTxes.length === 1;
+          }, 10000);
+
+          const txValues = await driver.findElements(
+            '[data-testid="transaction-list-item-primary-currency"]',
+          );
+          assert.equal(txValues.length, 1);
+          assert.ok(/-0.001\s*ETH/u.test(await txValues[0].getText()));
+        },
+      );
+    });
   });
 
-  it('should use dapp suggested estimates for transaction coming from dapp @no-mmi', async function () {
-    await withFixtures(
-      {
-        fixtures: new FixtureBuilder()
-          .withPermissionControllerConnectedToTestDapp()
-          .build(),
-        ganacheOptions: generateGanacheOptions({ hardfork: 'london' }),
-        title: this.test.fullTitle(),
-        dapp: true,
-      },
-      async ({ driver }) => {
-        // login to extension
-        await unlockWallet(driver);
-
-        await tempToggleSettingRedesignedTransactionConfirmations(driver);
-
-        await createDappTransaction(driver, {
-          maxFeePerGas: '0x2000000000',
-          maxPriorityFeePerGas: '0x1000000000',
-        });
-
-        // check transaction in extension popup
-        await driver.switchToWindowWithTitle(WINDOW_TITLES.Dialog);
-        await driver.waitForSelector({
-          text: 'Site suggested',
-        });
-
-        await driver.clickElement('[data-testid="edit-gas-fee-icon"]');
-        // -- should render the popover with no error
-        // this is to test in MV3 a racing issue when request for suggestedGasFees is not fetched properly
-        // some data would not be defined yet
-        await driver.waitForSelector('.edit-gas-fee-popover');
-        await driver.clickElement(
-          '[data-testid="edit-gas-fee-item-dappSuggested"]',
-        );
-
-        const transactionAmounts = await driver.findElements(
-          '.currency-display-component__text',
-        );
-        const transactionAmount = transactionAmounts[0];
-        assert.equal(await transactionAmount.getText(), '0.001');
-
-        // has correct updated value on the confirm screen the transaction
-        await driver.waitForSelector({
-          css: '.currency-display-component__text',
-          text: '0.00185144',
-        });
-
-        // confirms the transaction
-        await driver.clickElement({ text: 'Confirm', tag: 'button' });
-
-        // transaction should correct values in activity tab
-        await driver.switchToWindowWithTitle(
-          WINDOW_TITLES.ExtensionInFullScreenView,
-        );
-        await driver.clickElement(
-          '[data-testid="account-overview__activity-tab"]',
-        );
-        await driver.wait(async () => {
-          const confirmedTxes = await driver.findElements(
-            '.transaction-list__completed-transactions .activity-list-item',
-          );
-          return confirmedTxes.length === 1;
-        }, 10000);
-
-        const txValues = await driver.findElements(
-          '[data-testid="transaction-list-item-primary-currency"]',
-        );
-        assert.equal(txValues.length, 1);
-        assert.ok(/-0.001\s*ETH/u.test(await txValues[0].getText()));
-      },
-    );
+  describe('Redesigned confirmation screens', function () {
+    it('allows selecting high, medium, low gas estimates on edit gas fee popover @no-mmi', async function () {
+      await withFixtures(
+        {
+          fixtures: new FixtureBuilder().build(),
+          ganacheOptions: generateGanacheOptions({ hardfork: 'london' }),
+          title: this.test.fullTitle(),
+        },
+        async ({ driver }) => {
+          await unlockWallet(driver);
+
+          await createInternalTransaction(driver);
+
+          await driver.findElement({
+            css: 'h2',
+            text: '1 ETH',
+          });
+
+          // update estimates to high
+          await driver.clickElement('[data-testid="edit-gas-fee-icon"]');
+          await driver.waitForSelector({
+            text: 'sec',
+            tag: 'span',
+          });
+          await driver.clickElement(
+            '[data-testid="edit-gas-fee-item-high"] > span:first-child',
+          );
+
+          await driver.waitForSelector({
+            text: 'Aggressive',
+          });
+
+          // update estimates to medium
+          await driver.clickElement('[data-testid="edit-gas-fee-icon"]');
+          await driver.clickElement(
+            '[data-testid="edit-gas-fee-item-medium"] > span:first-child',
+          );
+
+          await driver.waitForSelector({
+            text: 'Market',
+          });
+
+          // update estimates to low
+          await driver.clickElement('[data-testid="edit-gas-fee-icon"]');
+          await driver.clickElement(
+            '[data-testid="edit-gas-fee-item-low"] > span:first-child',
+          );
+
+          await driver.waitForSelector({
+            text: 'Slow',
+          });
+          await driver.waitForSelector('[data-testid="inline-alert"]');
+
+          // confirms the transaction
+          await driver.clickElement({ text: 'Confirm', tag: 'button' });
+
+          await driver.clickElement(
+            '[data-testid="account-overview__activity-tab"]',
+          );
+          await driver.wait(async () => {
+            const confirmedTxes = await driver.findElements(
+              '.transaction-list__completed-transactions .activity-list-item',
+            );
+            return confirmedTxes.length === 1;
+          }, 10000);
+
+          const txValues = await driver.findElements(
+            '[data-testid="transaction-list-item-primary-currency"]',
+          );
+          assert.equal(txValues.length, 1);
+          assert.ok(/-1\s*ETH/u.test(await txValues[0].getText()));
+        },
+      );
+    });
+
+    it('allows accessing advance gas fee popover from edit gas fee popover', async function () {
+      await withFixtures(
+        {
+          fixtures: new FixtureBuilder().build(),
+          ganacheOptions: generateGanacheOptions({ hardfork: 'london' }),
+          title: this.test.fullTitle(),
+        },
+        async ({ driver }) => {
+          await unlockWallet(driver);
+
+          await createInternalTransaction(driver);
+
+          await driver.findElement({
+            css: 'h2',
+            text: '1 ETH',
+          });
+
+          // update estimates to high
+          await driver.clickElement('[data-testid="edit-gas-fee-icon"]');
+          await driver.waitForSelector({
+            text: 'sec',
+            tag: 'span',
+          });
+          await driver.clickElement('[data-testid="edit-gas-fee-item-custom"]');
+
+          // enter max fee
+          await driver.fill('[data-testid="base-fee-input"]', '8.5');
+
+          // enter priority fee
+          await driver.fill('[data-testid="priority-fee-input"]', '8.5');
+
+          // save default values
+          await driver.clickElement('input[type="checkbox"]');
+
+          // edit gas limit
+          await driver.clickElement('[data-testid="advanced-gas-fee-edit"]');
+          await driver.fill('[data-testid="gas-limit-input"]', '100000');
+
+          // Submit gas fee changes
+          await driver.clickElement({ text: 'Save', tag: 'button' });
+
+          // has correct updated value on the confirm screen the transaction
+          await driver.waitForSelector({
+            css: '[data-testid="first-gas-field"]',
+            text: '0.0008 ETH',
+          });
+
+          await driver.waitForSelector({
+            css: '[data-testid="native-currency"]',
+            text: '$1.44',
+          });
+
+          // confirms the transaction
+          await driver.clickElement({ text: 'Confirm', tag: 'button' });
+
+          await driver.clickElement(
+            '[data-testid="account-overview__activity-tab"]',
+          );
+          await driver.wait(async () => {
+            const confirmedTxes = await driver.findElements(
+              '.transaction-list__completed-transactions .activity-list-item',
+            );
+            return confirmedTxes.length === 1;
+          }, 10000);
+
+          const txValues = await driver.findElements(
+            '[data-testid="transaction-list-item-primary-currency"]',
+          );
+          assert.equal(txValues.length, 1);
+          assert.ok(/-1\s*ETH/u.test(await txValues[0].getText()));
+        },
+      );
+    });
+
+    it('should use dapp suggested estimates for transaction coming from dapp @no-mmi', async function () {
+      await withFixtures(
+        {
+          fixtures: new FixtureBuilder()
+            .withPermissionControllerConnectedToTestDapp()
+            .build(),
+          ganacheOptions: generateGanacheOptions({ hardfork: 'london' }),
+          title: this.test.fullTitle(),
+          dapp: true,
+        },
+        async ({ driver }) => {
+          // login to extension
+          await unlockWallet(driver);
+
+          await createDappTransaction(driver, {
+            maxFeePerGas: '0x2000000000',
+            maxPriorityFeePerGas: '0x1000000000',
+          });
+
+          // check transaction in extension popup
+          await driver.switchToWindowWithTitle(WINDOW_TITLES.Dialog);
+          await driver.waitForSelector({
+            text: 'Site suggested',
+          });
+
+          await driver.clickElement('[data-testid="edit-gas-fee-icon"]');
+          // -- should render the popover with no error
+          // this is to test in MV3 a racing issue when request for suggestedGasFees is not fetched properly
+          // some data would not be defined yet
+          await driver.waitForSelector('.edit-gas-fee-popover');
+          await driver.clickElement(
+            '[data-testid="edit-gas-fee-item-dappSuggested"]',
+          );
+
+          await driver.findElements({
+            css: 'h2',
+            text: '0.001 ETH',
+          });
+
+          // has correct updated value on the confirm screen the transaction
+          await driver.waitForSelector({
+            css: '[data-testid="first-gas-field"]',
+            text: '0.0019',
+          });
+
+          await driver.waitForSelector({
+            css: '[data-testid="native-currency"]',
+            text: '$3.15',
+          });
+
+          // confirms the transaction
+          await driver.clickElement({ text: 'Confirm', tag: 'button' });
+
+          // transaction should correct values in activity tab
+          await driver.switchToWindowWithTitle(
+            WINDOW_TITLES.ExtensionInFullScreenView,
+          );
+          await driver.clickElement(
+            '[data-testid="account-overview__activity-tab"]',
+          );
+          await driver.wait(async () => {
+            const confirmedTxes = await driver.findElements(
+              '.transaction-list__completed-transactions .activity-list-item',
+            );
+            return confirmedTxes.length === 1;
+          }, 10000);
+
+          const txValues = await driver.findElements(
+            '[data-testid="transaction-list-item-primary-currency"]',
+          );
+          assert.equal(txValues.length, 1);
+          assert.ok(/-0.001\s*ETH/u.test(await txValues[0].getText()));
+        },
+      );
+    });
   });
 });
diff --git a/test/e2e/tests/transaction/gas-estimates.spec.js b/test/e2e/tests/transaction/gas-estimates.spec.js
index f12275ad4d9f..77027bc67901 100644
--- a/test/e2e/tests/transaction/gas-estimates.spec.js
+++ b/test/e2e/tests/transaction/gas-estimates.spec.js
@@ -17,237 +17,488 @@ describe('Gas estimates generated by MetaMask', function () {
     hardfork: 'london',
   });
 
-  describe('Send on a network that is EIP-1559 compatible', function () {
-    it('show expected gas defaults', async function () {
-      await withFixtures(
-        {
-          fixtures: new FixtureBuilder().build(),
-          ganacheOptions: postLondonGanacheOptions,
-          title: this.test.fullTitle(),
-        },
-        async ({ driver, ganacheServer }) => {
-          await logInWithBalanceValidation(driver, ganacheServer);
-
-          await tempToggleSettingRedesignedTransactionConfirmations(driver);
-
-          await openActionMenuAndStartSendFlow(driver);
-
-          await driver.fill(
-            'input[placeholder="Enter public address (0x) or domain name"]',
-            '0x2f318C334780961FB129D2a6c30D0763d9a5C970',
-          );
-
-          await driver.fill('input[placeholder="0"]', '1');
-
-          await driver.clickElement({ css: 'button', text: 'Continue' });
-
-          // Check that the gas estimation is what we expect
-          await driver.findElement({
-            cass: '[data-testid="confirm-gas-display"]',
-            text: '0.00043983',
-          });
-        },
-      );
-    });
+  describe('Old confirmation screens', function () {
+    describe('Send on a network that is EIP-1559 compatible', function () {
+      it('show expected gas defaults', async function () {
+        await withFixtures(
+          {
+            fixtures: new FixtureBuilder().build(),
+            ganacheOptions: postLondonGanacheOptions,
+            title: this.test.fullTitle(),
+          },
+          async ({ driver, ganacheServer }) => {
+            await logInWithBalanceValidation(driver, ganacheServer);
+
+            await tempToggleSettingRedesignedTransactionConfirmations(driver);
+
+            await openActionMenuAndStartSendFlow(driver);
+
+            await driver.fill(
+              'input[placeholder="Enter public address (0x) or domain name"]',
+              '0x2f318C334780961FB129D2a6c30D0763d9a5C970',
+            );
+
+            await driver.fill('input[placeholder="0"]', '1');
+
+            await driver.clickElement({ css: 'button', text: 'Continue' });
+
+            // Check that the gas estimation is what we expect
+            await driver.findElement({
+              css: '[data-testid="confirm-gas-display"]',
+              text: '0.00043983',
+            });
+          },
+        );
+      });
+
+      it('show expected gas defaults when API is down', async function () {
+        await withFixtures(
+          {
+            fixtures: new FixtureBuilder().build(),
+            ganacheOptions: postLondonGanacheOptions,
+            testSpecificMock: (mockServer) => {
+              mockServer
+                .forGet(`${GAS_API_BASE_URL}/networks/1337/suggestedGasFees`)
+                .thenCallback(() => {
+                  return {
+                    json: {
+                      error: 'cannot get gas prices for chain id 1337',
+                    },
+                    statusCode: 503,
+                  };
+                });
+            },
+            title: this.test.fullTitle(),
+          },
+          async ({ driver, ganacheServer }) => {
+            await logInWithBalanceValidation(driver, ganacheServer);
+
+            await tempToggleSettingRedesignedTransactionConfirmations(driver);
+
+            await openActionMenuAndStartSendFlow(driver);
+
+            await driver.fill(
+              'input[placeholder="Enter public address (0x) or domain name"]',
+              '0x2f318C334780961FB129D2a6c30D0763d9a5C970',
+            );
+
+            await driver.fill('input[placeholder="0"]', '1');
+
+            await driver.clickElement({ css: 'button', text: 'Continue' });
+
+            // Check that the gas estimation is what we expect
+            await driver.findElement({
+              css: '[data-testid="confirm-gas-display"]',
+              text: '0.00043983',
+            });
+          },
+        );
+      });
+
+      it('show expected gas defaults when the network is not supported', async function () {
+        await withFixtures(
+          {
+            fixtures: new FixtureBuilder().build(),
+            ganacheOptions: postLondonGanacheOptions,
+            testSpecificMock: (mockServer) => {
+              mockServer
+                .forGet(`${GAS_API_BASE_URL}/networks/1337/suggestedGasFees`)
+                .thenCallback(() => {
+                  return {
+                    statusCode: 422,
+                  };
+                });
+            },
+            title: this.test.fullTitle(),
+          },
+          async ({ driver, ganacheServer }) => {
+            await logInWithBalanceValidation(driver, ganacheServer);
+
+            await tempToggleSettingRedesignedTransactionConfirmations(driver);
 
-    it('show expected gas defaults when API is down', async function () {
-      await withFixtures(
-        {
-          fixtures: new FixtureBuilder().build(),
-          ganacheOptions: postLondonGanacheOptions,
-          testSpecificMock: (mockServer) => {
-            mockServer
-              .forGet(`${GAS_API_BASE_URL}/networks/1337/suggestedGasFees`)
-              .thenCallback(() => {
-                return {
-                  json: {
-                    error: 'cannot get gas prices for chain id 1337',
-                  },
-                  statusCode: 503,
-                };
-              });
-          },
-          title: this.test.fullTitle(),
-        },
-        async ({ driver, ganacheServer }) => {
-          await logInWithBalanceValidation(driver, ganacheServer);
-
-          await tempToggleSettingRedesignedTransactionConfirmations(driver);
-
-          await openActionMenuAndStartSendFlow(driver);
-
-          await driver.fill(
-            'input[placeholder="Enter public address (0x) or domain name"]',
-            '0x2f318C334780961FB129D2a6c30D0763d9a5C970',
-          );
-
-          await driver.fill('input[placeholder="0"]', '1');
-
-          await driver.clickElement({ css: 'button', text: 'Continue' });
-
-          // Check that the gas estimation is what we expect
-          await driver.findElement({
-            cass: '[data-testid="confirm-gas-display"]',
-            text: '0.00043983',
-          });
-        },
-      );
+            await openActionMenuAndStartSendFlow(driver);
+
+            await driver.fill(
+              'input[placeholder="Enter public address (0x) or domain name"]',
+              '0x2f318C334780961FB129D2a6c30D0763d9a5C970',
+            );
+
+            await driver.fill('input[placeholder="0"]', '1');
+
+            await driver.clickElement({ css: 'button', text: 'Continue' });
+
+            // Check that the gas estimation is what we expect
+            await driver.findElement({
+              css: '[data-testid="confirm-gas-display"]',
+              text: '0.00043983',
+            });
+          },
+        );
+      });
     });
 
-    it('show expected gas defaults when the network is not supported', async function () {
-      await withFixtures(
-        {
-          fixtures: new FixtureBuilder().build(),
-          ganacheOptions: postLondonGanacheOptions,
-          testSpecificMock: (mockServer) => {
-            mockServer
-              .forGet(`${GAS_API_BASE_URL}/networks/1337/suggestedGasFees`)
-              .thenCallback(() => {
-                return {
-                  statusCode: 422,
-                };
-              });
-          },
-          title: this.test.fullTitle(),
-        },
-        async ({ driver, ganacheServer }) => {
-          await logInWithBalanceValidation(driver, ganacheServer);
-
-          await tempToggleSettingRedesignedTransactionConfirmations(driver);
-
-          await openActionMenuAndStartSendFlow(driver);
-
-          await driver.fill(
-            'input[placeholder="Enter public address (0x) or domain name"]',
-            '0x2f318C334780961FB129D2a6c30D0763d9a5C970',
-          );
-
-          await driver.fill('input[placeholder="0"]', '1');
-
-          await driver.clickElement({ css: 'button', text: 'Continue' });
-
-          // Check that the gas estimation is what we expect
-          await driver.findElement({
-            cass: '[data-testid="confirm-gas-display"]',
-            text: '0.00043983',
-          });
-        },
-      );
+    describe('Send on a network that is not EIP-1559 compatible', function () {
+      it('show expected gas defaults on a network supported by legacy gas API', async function () {
+        await withFixtures(
+          {
+            fixtures: new FixtureBuilder().build(),
+            ganacheOptions: {
+              ...preLondonGanacheOptions,
+              chainId: parseInt(CHAIN_IDS.BSC, 16),
+            },
+            title: this.test.fullTitle(),
+          },
+          async ({ driver, ganacheServer }) => {
+            await logInWithBalanceValidation(driver, ganacheServer);
+
+            await tempToggleSettingRedesignedTransactionConfirmations(driver);
+
+            await openActionMenuAndStartSendFlow(driver);
+            await driver.fill(
+              'input[placeholder="Enter public address (0x) or domain name"]',
+              '0x2f318C334780961FB129D2a6c30D0763d9a5C970',
+            );
+
+            await driver.fill('input[placeholder="0"]', '1');
+
+            await driver.clickElement({ css: 'button', text: 'Continue' });
+
+            // Check that the gas estimation is what we expect
+            await driver.findElement({
+              css: '[data-testid="confirm-gas-display"]',
+              text: '0.000042',
+            });
+          },
+        );
+      });
+
+      it('show expected gas defaults on a network supported by legacy gas API when that API is down', async function () {
+        await withFixtures(
+          {
+            fixtures: new FixtureBuilder().build(),
+            ganacheOptions: {
+              ...preLondonGanacheOptions,
+              chainId: parseInt(CHAIN_IDS.BSC, 16),
+            },
+            testSpecificMock: (mockServer) => {
+              mockServer
+                .forGet(
+                  `${GAS_API_BASE_URL}/networks/${parseInt(
+                    CHAIN_IDS.BSC,
+                    16,
+                  )}/gasPrices`,
+                )
+                .thenCallback(() => {
+                  return {
+                    statusCode: 422,
+                  };
+                });
+            },
+            title: this.test.fullTitle(),
+          },
+          async ({ driver, ganacheServer }) => {
+            await logInWithBalanceValidation(driver, ganacheServer);
+
+            await tempToggleSettingRedesignedTransactionConfirmations(driver);
+
+            await openActionMenuAndStartSendFlow(driver);
+            await driver.fill(
+              'input[placeholder="Enter public address (0x) or domain name"]',
+              '0x2f318C334780961FB129D2a6c30D0763d9a5C970',
+            );
+
+            await driver.fill('input[placeholder="0"]', '1');
+
+            await driver.clickElement({ css: 'button', text: 'Continue' });
+
+            // Check that the gas estimation is what we expect
+            await driver.findElement({
+              css: '[data-testid="confirm-gas-display"]',
+              text: '0.000042',
+            });
+          },
+        );
+      });
+
+      it('show expected gas defaults on a network not supported by legacy gas API', async function () {
+        await withFixtures(
+          {
+            fixtures: new FixtureBuilder().build(),
+            ganacheOptions: preLondonGanacheOptions,
+            title: this.test.fullTitle(),
+          },
+          async ({ driver, ganacheServer }) => {
+            await logInWithBalanceValidation(driver, ganacheServer);
+
+            await tempToggleSettingRedesignedTransactionConfirmations(driver);
+
+            await openActionMenuAndStartSendFlow(driver);
+            await driver.fill(
+              'input[placeholder="Enter public address (0x) or domain name"]',
+              '0x2f318C334780961FB129D2a6c30D0763d9a5C970',
+            );
+
+            await driver.fill('input[placeholder="0"]', '1');
+
+            await driver.clickElement({ css: 'button', text: 'Continue' });
+
+            // Check that the gas estimation is what we expect
+            await driver.findElement({
+              css: '[data-testid="confirm-gas-display"]',
+              text: '0.000042',
+            });
+          },
+        );
+      });
     });
   });
 
-  describe('Send on a network that is not EIP-1559 compatible', function () {
-    it('show expected gas defaults on a network supported by legacy gas API', async function () {
-      await withFixtures(
-        {
-          fixtures: new FixtureBuilder().build(),
-          ganacheOptions: {
-            ...preLondonGanacheOptions,
-            chainId: parseInt(CHAIN_IDS.BSC, 16),
-          },
-          title: this.test.fullTitle(),
-        },
-        async ({ driver, ganacheServer }) => {
-          await logInWithBalanceValidation(driver, ganacheServer);
-
-          await tempToggleSettingRedesignedTransactionConfirmations(driver);
-
-          await openActionMenuAndStartSendFlow(driver);
-          await driver.fill(
-            'input[placeholder="Enter public address (0x) or domain name"]',
-            '0x2f318C334780961FB129D2a6c30D0763d9a5C970',
-          );
-
-          await driver.fill('input[placeholder="0"]', '1');
-
-          await driver.clickElement({ css: 'button', text: 'Continue' });
-
-          // Check that the gas estimation is what we expect
-          await driver.findElement({
-            cass: '[data-testid="confirm-gas-display"]',
-            text: '0.000042',
-          });
-        },
-      );
-    });
+  describe('Redesigned confirmation screens', function () {
+    describe('Send on a network that is EIP-1559 compatible', function () {
+      it('show expected gas defaults', async function () {
+        await withFixtures(
+          {
+            fixtures: new FixtureBuilder().build(),
+            ganacheOptions: postLondonGanacheOptions,
+            title: this.test.fullTitle(),
+          },
+          async ({ driver, ganacheServer }) => {
+            await logInWithBalanceValidation(driver, ganacheServer);
+
+            await openActionMenuAndStartSendFlow(driver);
+
+            await driver.fill(
+              'input[placeholder="Enter public address (0x) or domain name"]',
+              '0x2f318C334780961FB129D2a6c30D0763d9a5C970',
+            );
+
+            await driver.fill('input[placeholder="0"]', '1');
+
+            await driver.clickElement({ css: 'button', text: 'Continue' });
+
+            // Check that the gas estimation is what we expect
+            await driver.findElement({
+              css: '[data-testid="first-gas-field"]',
+              text: '0.0004 ETH',
+            });
+
+            await driver.waitForSelector({
+              css: '[data-testid="native-currency"]',
+              text: '$0.75',
+            });
+          },
+        );
+      });
+
+      it('show expected gas defaults when API is down', async function () {
+        await withFixtures(
+          {
+            fixtures: new FixtureBuilder().build(),
+            ganacheOptions: postLondonGanacheOptions,
+            testSpecificMock: (mockServer) => {
+              mockServer
+                .forGet(`${GAS_API_BASE_URL}/networks/1337/suggestedGasFees`)
+                .thenCallback(() => {
+                  return {
+                    json: {
+                      error: 'cannot get gas prices for chain id 1337',
+                    },
+                    statusCode: 503,
+                  };
+                });
+            },
+            title: this.test.fullTitle(),
+          },
+          async ({ driver, ganacheServer }) => {
+            await logInWithBalanceValidation(driver, ganacheServer);
 
-    it('show expected gas defaults on a network supported by legacy gas API when that API is down', async function () {
-      await withFixtures(
-        {
-          fixtures: new FixtureBuilder().build(),
-          ganacheOptions: {
-            ...preLondonGanacheOptions,
-            chainId: parseInt(CHAIN_IDS.BSC, 16),
-          },
-          testSpecificMock: (mockServer) => {
-            mockServer
-              .forGet(
-                `${GAS_API_BASE_URL}/networks/${parseInt(
-                  CHAIN_IDS.BSC,
-                  16,
-                )}/gasPrices`,
-              )
-              .thenCallback(() => {
-                return {
-                  statusCode: 422,
-                };
-              });
-          },
-          title: this.test.fullTitle(),
-        },
-        async ({ driver, ganacheServer }) => {
-          await logInWithBalanceValidation(driver, ganacheServer);
-
-          await tempToggleSettingRedesignedTransactionConfirmations(driver);
-
-          await openActionMenuAndStartSendFlow(driver);
-          await driver.fill(
-            'input[placeholder="Enter public address (0x) or domain name"]',
-            '0x2f318C334780961FB129D2a6c30D0763d9a5C970',
-          );
-
-          await driver.fill('input[placeholder="0"]', '1');
-
-          await driver.clickElement({ css: 'button', text: 'Continue' });
-
-          // Check that the gas estimation is what we expect
-          await driver.findElement({
-            cass: '[data-testid="confirm-gas-display"]',
-            text: '0.000042',
-          });
-        },
-      );
+            await openActionMenuAndStartSendFlow(driver);
+
+            await driver.fill(
+              'input[placeholder="Enter public address (0x) or domain name"]',
+              '0x2f318C334780961FB129D2a6c30D0763d9a5C970',
+            );
+
+            await driver.fill('input[placeholder="0"]', '1');
+
+            await driver.clickElement({ css: 'button', text: 'Continue' });
+
+            // Check that the gas estimation is what we expect
+            await driver.findElement({
+              css: '[data-testid="first-gas-field"]',
+              text: '0 ETH',
+            });
+            await driver.waitForSelector({
+              css: '[data-testid="native-currency"]',
+              text: '$0.07',
+            });
+          },
+        );
+      });
+
+      it('show expected gas defaults when the network is not supported', async function () {
+        await withFixtures(
+          {
+            fixtures: new FixtureBuilder().build(),
+            ganacheOptions: postLondonGanacheOptions,
+            testSpecificMock: (mockServer) => {
+              mockServer
+                .forGet(`${GAS_API_BASE_URL}/networks/1337/suggestedGasFees`)
+                .thenCallback(() => {
+                  return {
+                    statusCode: 422,
+                  };
+                });
+            },
+            title: this.test.fullTitle(),
+          },
+          async ({ driver, ganacheServer }) => {
+            await logInWithBalanceValidation(driver, ganacheServer);
+
+            await openActionMenuAndStartSendFlow(driver);
+
+            await driver.fill(
+              'input[placeholder="Enter public address (0x) or domain name"]',
+              '0x2f318C334780961FB129D2a6c30D0763d9a5C970',
+            );
+
+            await driver.fill('input[placeholder="0"]', '1');
+
+            await driver.clickElement({ css: 'button', text: 'Continue' });
+
+            // Check that the gas estimation is what we expect
+            await driver.findElement({
+              css: '[data-testid="first-gas-field"]',
+              text: '0 ETH',
+            });
+            await driver.waitForSelector({
+              css: '[data-testid="native-currency"]',
+              text: '$0.07',
+            });
+          },
+        );
+      });
     });
 
-    it('show expected gas defaults on a network not supported by legacy gas API', async function () {
-      await withFixtures(
-        {
-          fixtures: new FixtureBuilder().build(),
-          ganacheOptions: preLondonGanacheOptions,
-          title: this.test.fullTitle(),
-        },
-        async ({ driver, ganacheServer }) => {
-          await logInWithBalanceValidation(driver, ganacheServer);
-
-          await tempToggleSettingRedesignedTransactionConfirmations(driver);
-
-          await openActionMenuAndStartSendFlow(driver);
-          await driver.fill(
-            'input[placeholder="Enter public address (0x) or domain name"]',
-            '0x2f318C334780961FB129D2a6c30D0763d9a5C970',
-          );
-
-          await driver.fill('input[placeholder="0"]', '1');
-
-          await driver.clickElement({ css: 'button', text: 'Continue' });
-
-          // Check that the gas estimation is what we expect
-          await driver.findElement({
-            cass: '[data-testid="confirm-gas-display"]',
-            text: '0.000042',
-          });
-        },
-      );
+    describe('Send on a network that is not EIP-1559 compatible', function () {
+      it('show expected gas defaults on a network supported by legacy gas API', async function () {
+        await withFixtures(
+          {
+            fixtures: new FixtureBuilder().build(),
+            ganacheOptions: {
+              ...preLondonGanacheOptions,
+              chainId: parseInt(CHAIN_IDS.BSC, 16),
+            },
+            title: this.test.fullTitle(),
+          },
+          async ({ driver, ganacheServer }) => {
+            await logInWithBalanceValidation(driver, ganacheServer);
+
+            await openActionMenuAndStartSendFlow(driver);
+            await driver.fill(
+              'input[placeholder="Enter public address (0x) or domain name"]',
+              '0x2f318C334780961FB129D2a6c30D0763d9a5C970',
+            );
+
+            await driver.fill('input[placeholder="0"]', '1');
+
+            await driver.clickElement({ css: 'button', text: 'Continue' });
+
+            // Check that the gas estimation is what we expect
+            await driver.findElement({
+              css: '[data-testid="first-gas-field"]',
+              text: '0 ETH',
+            });
+            await driver.waitForSelector({
+              css: '[data-testid="native-currency"]',
+              text: '$0.07',
+            });
+          },
+        );
+      });
+
+      it('show expected gas defaults on a network supported by legacy gas API when that API is down', async function () {
+        await withFixtures(
+          {
+            fixtures: new FixtureBuilder().build(),
+            ganacheOptions: {
+              ...preLondonGanacheOptions,
+              chainId: parseInt(CHAIN_IDS.BSC, 16),
+            },
+            testSpecificMock: (mockServer) => {
+              mockServer
+                .forGet(
+                  `${GAS_API_BASE_URL}/networks/${parseInt(
+                    CHAIN_IDS.BSC,
+                    16,
+                  )}/gasPrices`,
+                )
+                .thenCallback(() => {
+                  return {
+                    statusCode: 422,
+                  };
+                });
+            },
+            title: this.test.fullTitle(),
+          },
+          async ({ driver, ganacheServer }) => {
+            await logInWithBalanceValidation(driver, ganacheServer);
+
+            await openActionMenuAndStartSendFlow(driver);
+            await driver.fill(
+              'input[placeholder="Enter public address (0x) or domain name"]',
+              '0x2f318C334780961FB129D2a6c30D0763d9a5C970',
+            );
+
+            await driver.fill('input[placeholder="0"]', '1');
+
+            await driver.clickElement({ css: 'button', text: 'Continue' });
+
+            // Check that the gas estimation is what we expect
+            await driver.findElement({
+              css: '[data-testid="first-gas-field"]',
+              text: '0 ETH',
+            });
+            await driver.waitForSelector({
+              css: '[data-testid="native-currency"]',
+              text: '$0.07',
+            });
+          },
+        );
+      });
+
+      it('show expected gas defaults on a network not supported by legacy gas API', async function () {
+        await withFixtures(
+          {
+            fixtures: new FixtureBuilder().build(),
+            ganacheOptions: preLondonGanacheOptions,
+            title: this.test.fullTitle(),
+          },
+          async ({ driver, ganacheServer }) => {
+            await logInWithBalanceValidation(driver, ganacheServer);
+
+            await openActionMenuAndStartSendFlow(driver);
+            await driver.fill(
+              'input[placeholder="Enter public address (0x) or domain name"]',
+              '0x2f318C334780961FB129D2a6c30D0763d9a5C970',
+            );
+
+            await driver.fill('input[placeholder="0"]', '1');
+
+            await driver.clickElement({ css: 'button', text: 'Continue' });
+
+            // Check that the gas estimation is what we expect
+            await driver.findElement({
+              css: '[data-testid="first-gas-field"]',
+              text: '0 ETH',
+            });
+            await driver.waitForSelector({
+              css: '[data-testid="native-currency"]',
+              text: '$0.07',
+            });
+          },
+        );
+      });
     });
   });
 });
diff --git a/test/e2e/tests/transaction/multiple-transactions.spec.js b/test/e2e/tests/transaction/multiple-transactions.spec.js
index b7ad05b3a93d..b85937f5b6bd 100644
--- a/test/e2e/tests/transaction/multiple-transactions.spec.js
+++ b/test/e2e/tests/transaction/multiple-transactions.spec.js
@@ -11,127 +11,252 @@ const {
 const FixtureBuilder = require('../../fixture-builder');
 
 describe('Multiple transactions', function () {
-  it('creates multiple queued transactions, then confirms', async function () {
-    await withFixtures(
-      {
-        dapp: true,
-        fixtures: new FixtureBuilder()
-          .withPermissionControllerConnectedToTestDapp()
-          .build(),
-        ganacheOptions: generateGanacheOptions({ hardfork: 'london' }),
-        title: this.test.fullTitle(),
-      },
-      async ({ driver }) => {
-        await unlockWallet(driver);
-
-        await tempToggleSettingRedesignedTransactionConfirmations(driver);
-
-        // initiates a transaction from the dapp
-        await openDapp(driver);
-        // creates first transaction
-        await createDappTransaction(driver);
-        await driver.waitUntilXWindowHandles(3);
-
-        await driver.switchToWindowWithTitle(WINDOW_TITLES.TestDApp);
-
-        // creates second transaction
-        await createDappTransaction(driver);
-        await driver.switchToWindowWithTitle(WINDOW_TITLES.Dialog);
-
-        // confirms second transaction
-        await driver.waitForSelector({
-          text: 'Reject 2 transactions',
-          tag: 'a',
-        });
-        await driver.clickElement({ text: 'Confirm', tag: 'button' });
-        await driver.switchToWindowWithTitle(WINDOW_TITLES.Dialog);
-
-        // wait for the "Reject 2 transactions" to disappear
-        await driver.assertElementNotPresent(
-          '.page-container__footer-secondary a',
-        );
-
-        // confirms first transaction
-        await driver.clickElement({ text: 'Confirm', tag: 'button' });
-
-        await driver.waitUntilXWindowHandles(2);
-        await driver.switchToWindowWithTitle(
-          WINDOW_TITLES.ExtensionInFullScreenView,
-        );
-        await driver.delay(regularDelayMs);
-        await driver.clickElement(
-          '[data-testid="account-overview__activity-tab"]',
-        );
-        await driver.waitForSelector(
-          '.transaction-list__completed-transactions .activity-list-item:nth-of-type(2)',
-        );
-
-        const confirmedTxes = await driver.findElements(
-          '.transaction-list__completed-transactions .activity-list-item',
-        );
-
-        assert.equal(confirmedTxes.length, 2);
-      },
-    );
+  describe('Old confirmation screens', function () {
+    it('creates multiple queued transactions, then confirms', async function () {
+      await withFixtures(
+        {
+          dapp: true,
+          fixtures: new FixtureBuilder()
+            .withPermissionControllerConnectedToTestDapp()
+            .build(),
+          ganacheOptions: generateGanacheOptions({ hardfork: 'london' }),
+          title: this.test.fullTitle(),
+        },
+        async ({ driver }) => {
+          await unlockWallet(driver);
+
+          await tempToggleSettingRedesignedTransactionConfirmations(driver);
+
+          // initiates a transaction from the dapp
+          await openDapp(driver);
+          // creates first transaction
+          await createDappTransaction(driver);
+          await driver.waitUntilXWindowHandles(3);
+
+          await driver.switchToWindowWithTitle(WINDOW_TITLES.TestDApp);
+
+          // creates second transaction
+          await createDappTransaction(driver);
+          await driver.switchToWindowWithTitle(WINDOW_TITLES.Dialog);
+
+          // confirms second transaction
+          await driver.waitForSelector({
+            text: 'Reject 2 transactions',
+            tag: 'a',
+          });
+          await driver.clickElement({ text: 'Confirm', tag: 'button' });
+          await driver.switchToWindowWithTitle(WINDOW_TITLES.Dialog);
+
+          // wait for the "Reject 2 transactions" to disappear
+          await driver.assertElementNotPresent(
+            '.page-container__footer-secondary a',
+          );
+
+          // confirms first transaction
+          await driver.clickElement({ text: 'Confirm', tag: 'button' });
+
+          await driver.waitUntilXWindowHandles(2);
+          await driver.switchToWindowWithTitle(
+            WINDOW_TITLES.ExtensionInFullScreenView,
+          );
+          await driver.delay(regularDelayMs);
+          await driver.clickElement(
+            '[data-testid="account-overview__activity-tab"]',
+          );
+          await driver.waitForSelector(
+            '.transaction-list__completed-transactions .activity-list-item:nth-of-type(2)',
+          );
+
+          const confirmedTxes = await driver.findElements(
+            '.transaction-list__completed-transactions .activity-list-item',
+          );
+
+          assert.equal(confirmedTxes.length, 2);
+        },
+      );
+    });
+
+    it('creates multiple queued transactions, then rejects', async function () {
+      await withFixtures(
+        {
+          dapp: true,
+          fixtures: new FixtureBuilder()
+            .withPermissionControllerConnectedToTestDapp()
+            .build(),
+          ganacheOptions: generateGanacheOptions({ hardfork: 'london' }),
+          title: this.test.fullTitle(),
+        },
+        async ({ driver }) => {
+          await unlockWallet(driver);
+
+          await tempToggleSettingRedesignedTransactionConfirmations(driver);
+
+          // initiates a transaction from the dapp
+          await openDapp(driver);
+          // creates first transaction
+          await createDappTransaction(driver);
+          await driver.waitUntilXWindowHandles(3);
+
+          await driver.switchToWindowWithTitle(WINDOW_TITLES.TestDApp);
+
+          // creates second transaction
+          await createDappTransaction(driver);
+          await driver.switchToWindowWithTitle(WINDOW_TITLES.Dialog);
+
+          // rejects second transaction
+          await driver.waitForSelector({
+            text: 'Reject 2 transactions',
+            tag: 'a',
+          });
+          await driver.clickElement({ text: 'Reject', tag: 'button' });
+          await driver.assertElementNotPresent('.loading-overlay__spinner');
+          // rejects first transaction
+          await driver.clickElement({ text: 'Reject', tag: 'button' });
+
+          await driver.waitUntilXWindowHandles(2);
+          await driver.switchToWindowWithTitle(
+            WINDOW_TITLES.ExtensionInFullScreenView,
+          );
+          await driver.delay(regularDelayMs);
+          await driver.clickElement(
+            '[data-testid="account-overview__activity-tab"]',
+          );
+
+          const isTransactionListEmpty =
+            await driver.isElementPresentAndVisible(
+              '.transaction-list__empty-text',
+            );
+          assert.equal(isTransactionListEmpty, true);
+
+          // The previous isTransactionListEmpty wait already serves as the guard here for the assertElementNotPresent
+          await driver.assertElementNotPresent(
+            '.transaction-list__completed-transactions .activity-list-item',
+          );
+        },
+      );
+    });
   });
 
-  it('creates multiple queued transactions, then rejects', async function () {
-    await withFixtures(
-      {
-        dapp: true,
-        fixtures: new FixtureBuilder()
-          .withPermissionControllerConnectedToTestDapp()
-          .build(),
-        ganacheOptions: generateGanacheOptions({ hardfork: 'london' }),
-        title: this.test.fullTitle(),
-      },
-      async ({ driver }) => {
-        await unlockWallet(driver);
-
-        await tempToggleSettingRedesignedTransactionConfirmations(driver);
-
-        // initiates a transaction from the dapp
-        await openDapp(driver);
-        // creates first transaction
-        await createDappTransaction(driver);
-        await driver.waitUntilXWindowHandles(3);
-
-        await driver.switchToWindowWithTitle(WINDOW_TITLES.TestDApp);
-
-        // creates second transaction
-        await createDappTransaction(driver);
-        await driver.switchToWindowWithTitle(WINDOW_TITLES.Dialog);
-
-        // rejects second transaction
-        await driver.waitForSelector({
-          text: 'Reject 2 transactions',
-          tag: 'a',
-        });
-        await driver.clickElement({ text: 'Reject', tag: 'button' });
-        await driver.assertElementNotPresent('.loading-overlay__spinner');
-        // rejects first transaction
-        await driver.clickElement({ text: 'Reject', tag: 'button' });
-
-        await driver.waitUntilXWindowHandles(2);
-        await driver.switchToWindowWithTitle(
-          WINDOW_TITLES.ExtensionInFullScreenView,
-        );
-        await driver.delay(regularDelayMs);
-        await driver.clickElement(
-          '[data-testid="account-overview__activity-tab"]',
-        );
-
-        const isTransactionListEmpty = await driver.isElementPresentAndVisible(
-          '.transaction-list__empty-text',
-        );
-        assert.equal(isTransactionListEmpty, true);
-
-        // The previous isTransactionListEmpty wait already serves as the guard here for the assertElementNotPresent
-        await driver.assertElementNotPresent(
-          '.transaction-list__completed-transactions .activity-list-item',
-        );
-      },
-    );
+  describe('Redesigned confirmation screens', function () {
+    it('creates multiple queued transactions, then confirms', async function () {
+      await withFixtures(
+        {
+          dapp: true,
+          fixtures: new FixtureBuilder()
+            .withPermissionControllerConnectedToTestDapp()
+            .build(),
+          ganacheOptions: generateGanacheOptions({ hardfork: 'london' }),
+          title: this.test.fullTitle(),
+        },
+        async ({ driver }) => {
+          await unlockWallet(driver);
+
+          // initiates a transaction from the dapp
+          await openDapp(driver);
+          // creates first transaction
+          await createDappTransaction(driver);
+          await driver.waitUntilXWindowHandles(3);
+
+          await driver.switchToWindowWithTitle(WINDOW_TITLES.TestDApp);
+
+          // creates second transaction
+          await createDappTransaction(driver);
+          await driver.switchToWindowWithTitle(WINDOW_TITLES.Dialog);
+
+          // confirms second transaction
+          await driver.waitForSelector({
+            text: 'Reject all',
+            tag: 'button',
+          });
+          await driver.clickElement({ text: 'Confirm', tag: 'button' });
+          await driver.switchToWindowWithTitle(WINDOW_TITLES.Dialog);
+
+          // wait for the "Reject 2 transactions" to disappear
+          await driver.assertElementNotPresent(
+            '.page-container__footer-secondary a',
+          );
+
+          // confirms first transaction
+          await driver.clickElement({ text: 'Confirm', tag: 'button' });
+
+          await driver.waitUntilXWindowHandles(2);
+          await driver.switchToWindowWithTitle(
+            WINDOW_TITLES.ExtensionInFullScreenView,
+          );
+          await driver.delay(regularDelayMs);
+          await driver.clickElement(
+            '[data-testid="account-overview__activity-tab"]',
+          );
+          await driver.waitForSelector(
+            '.transaction-list__completed-transactions .activity-list-item:nth-of-type(2)',
+          );
+
+          const confirmedTxes = await driver.findElements(
+            '.transaction-list__completed-transactions .activity-list-item',
+          );
+
+          assert.equal(confirmedTxes.length, 2);
+        },
+      );
+    });
+
+    it('creates multiple queued transactions, then rejects', async function () {
+      await withFixtures(
+        {
+          dapp: true,
+          fixtures: new FixtureBuilder()
+            .withPermissionControllerConnectedToTestDapp()
+            .build(),
+          ganacheOptions: generateGanacheOptions({ hardfork: 'london' }),
+          title: this.test.fullTitle(),
+        },
+        async ({ driver }) => {
+          await unlockWallet(driver);
+
+          // initiates a transaction from the dapp
+          await openDapp(driver);
+          // creates first transaction
+          await createDappTransaction(driver);
+          await driver.waitUntilXWindowHandles(3);
+
+          await driver.switchToWindowWithTitle(WINDOW_TITLES.TestDApp);
+
+          // creates second transaction
+          await createDappTransaction(driver);
+          await driver.switchToWindowWithTitle(WINDOW_TITLES.Dialog);
+
+          // rejects second transaction
+          await driver.waitForSelector({
+            text: 'Reject all',
+            tag: 'button',
+          });
+          await driver.clickElement({ text: 'Cancel', tag: 'button' });
+          await driver.assertElementNotPresent('.loading-overlay__spinner');
+          // rejects first transaction
+          await driver.clickElement({ text: 'Cancel', tag: 'button' });
+
+          await driver.waitUntilXWindowHandles(2);
+          await driver.switchToWindowWithTitle(
+            WINDOW_TITLES.ExtensionInFullScreenView,
+          );
+          await driver.delay(regularDelayMs);
+          await driver.clickElement(
+            '[data-testid="account-overview__activity-tab"]',
+          );
+
+          const isTransactionListEmpty =
+            await driver.isElementPresentAndVisible(
+              '.transaction-list__empty-text',
+            );
+          assert.equal(isTransactionListEmpty, true);
+
+          // The previous isTransactionListEmpty wait already serves as the guard here for the assertElementNotPresent
+          await driver.assertElementNotPresent(
+            '.transaction-list__completed-transactions .activity-list-item',
+          );
+        },
+      );
+    });
   });
 });
 
diff --git a/test/e2e/tests/transaction/navigate-transactions.spec.js b/test/e2e/tests/transaction/navigate-transactions.spec.js
index 16e8f9374cb5..eb8465fb47a7 100644
--- a/test/e2e/tests/transaction/navigate-transactions.spec.js
+++ b/test/e2e/tests/transaction/navigate-transactions.spec.js
@@ -1,3 +1,6 @@
+const {
+  default: Confirmation,
+} = require('../../page-objects/pages/confirmations/redesign/confirmation');
 const {
   createDappTransaction,
 } = require('../../page-objects/flows/transaction');
@@ -19,169 +22,324 @@ const FixtureBuilder = require('../../fixture-builder');
 const TRANSACTION_COUNT = 4;
 
 describe('Navigate transactions', function () {
-  it('should navigate the unapproved transactions', async function () {
-    await withFixtures(
-      {
-        fixtures: new FixtureBuilder()
-          .withPreferencesControllerTxSimulationsDisabled()
-          .withPermissionControllerConnectedToTestDapp()
-          .build(),
-        ganacheOptions: generateGanacheOptions({ hardfork: 'london' }),
-        title: this.test.fullTitle(),
-        dapp: true,
-      },
-      async ({ driver }) => {
-        await unlockWallet(driver);
-
-        await tempToggleSettingRedesignedTransactionConfirmations(driver);
-
-        await createMultipleTransactions(driver, TRANSACTION_COUNT);
-
-        const navigation = new ConfirmationNavigation(driver);
-
-        await navigation.clickNextPage();
-        await navigation.check_pageNumbers(2, 4);
-
-        await navigation.clickNextPage();
-        await navigation.check_pageNumbers(3, 4);
-
-        await navigation.clickNextPage();
-        await navigation.check_pageNumbers(4, 4);
-
-        await navigation.clickFirstPage();
-        await navigation.check_pageNumbers(1, 4);
-
-        await navigation.clickLastPage();
-        await navigation.check_pageNumbers(4, 4);
-
-        await navigation.clickPreviousPage();
-        await navigation.check_pageNumbers(3, 4);
-
-        await navigation.clickPreviousPage();
-        await navigation.check_pageNumbers(2, 4);
-      },
-    );
-  });
-
-  it('should add a transaction while the confirm page is in focus', async function () {
-    await withFixtures(
-      {
-        dapp: true,
-        fixtures: new FixtureBuilder()
-          .withPermissionControllerConnectedToTestDapp()
-          .withPreferencesControllerTxSimulationsDisabled()
-          .build(),
-        ganacheOptions: generateGanacheOptions({ hardfork: 'london' }),
-        title: this.test.fullTitle(),
-      },
-      async ({ driver }) => {
-        await unlockWallet(driver);
-
-        await tempToggleSettingRedesignedTransactionConfirmations(driver);
-
-        await createMultipleTransactions(driver, TRANSACTION_COUNT);
-
-        const navigation = new ConfirmationNavigation(driver);
-
-        await navigation.clickNextPage();
-        await navigation.check_pageNumbers(2, 4);
-
-        await driver.switchToWindowWithTitle(
-          WINDOW_TITLES.ExtensionInFullScreenView,
-        );
-
-        // add transaction
-        await openDapp(driver);
-        await driver.clickElement({ text: 'Send', tag: 'button' });
-        await driver.switchToWindowWithTitle(WINDOW_TITLES.Dialog);
-
-        await navigation.check_pageNumbers(2, 5);
-      },
-    );
-  });
-
-  it('should reject and remove an unapproved transaction', async function () {
-    await withFixtures(
-      {
-        fixtures: new FixtureBuilder()
-          .withPreferencesControllerTxSimulationsDisabled()
-          .withPermissionControllerConnectedToTestDapp()
-          .build(),
-        ganacheOptions: generateGanacheOptions({ hardfork: 'london' }),
-        title: this.test.fullTitle(),
-        dapp: true,
-      },
-      async ({ driver }) => {
-        await unlockWallet(driver);
-
-        await tempToggleSettingRedesignedTransactionConfirmations(driver);
-
-        await createMultipleTransactions(driver, TRANSACTION_COUNT);
-
-        // reject transaction
-        await driver.clickElement({ text: 'Reject', tag: 'button' });
-
-        const navigation = new ConfirmationNavigation(driver);
-        await navigation.check_pageNumbers(1, 3);
-      },
-    );
-  });
-
-  it('should confirm and remove an unapproved transaction', async function () {
-    await withFixtures(
-      {
-        fixtures: new FixtureBuilder()
-          .withPreferencesControllerTxSimulationsDisabled()
-          .withPermissionControllerConnectedToTestDapp()
-          .build(),
-        ganacheOptions: generateGanacheOptions({ hardfork: 'london' }),
-        title: this.test.fullTitle(),
-        dapp: true,
-      },
-      async ({ driver }) => {
-        await unlockWallet(driver);
-
-        await tempToggleSettingRedesignedTransactionConfirmations(driver);
-
-        await createMultipleTransactions(driver, TRANSACTION_COUNT);
-
-        // confirm transaction
-        await driver.clickElement({ text: 'Confirm', tag: 'button' });
-
-        const navigation = new ConfirmationNavigation(driver);
-        await navigation.check_pageNumbers(1, 3);
-      },
-    );
+  describe('Old confirmation screens', function () {
+    it('should navigate the unapproved transactions', async function () {
+      await withFixtures(
+        {
+          fixtures: new FixtureBuilder()
+            .withPreferencesControllerTxSimulationsDisabled()
+            .withPermissionControllerConnectedToTestDapp()
+            .build(),
+          ganacheOptions: generateGanacheOptions({ hardfork: 'london' }),
+          title: this.test.fullTitle(),
+          dapp: true,
+        },
+        async ({ driver }) => {
+          await unlockWallet(driver);
+
+          await tempToggleSettingRedesignedTransactionConfirmations(driver);
+
+          await createMultipleTransactions(driver, TRANSACTION_COUNT);
+
+          const navigation = new ConfirmationNavigation(driver);
+
+          await navigation.clickNextPage();
+          await navigation.check_pageNumbers(2, 4);
+
+          await navigation.clickNextPage();
+          await navigation.check_pageNumbers(3, 4);
+
+          await navigation.clickNextPage();
+          await navigation.check_pageNumbers(4, 4);
+
+          await navigation.clickFirstPage();
+          await navigation.check_pageNumbers(1, 4);
+
+          await navigation.clickLastPage();
+          await navigation.check_pageNumbers(4, 4);
+
+          await navigation.clickPreviousPage();
+          await navigation.check_pageNumbers(3, 4);
+
+          await navigation.clickPreviousPage();
+          await navigation.check_pageNumbers(2, 4);
+        },
+      );
+    });
+
+    it('should add a transaction while the confirm page is in focus', async function () {
+      await withFixtures(
+        {
+          dapp: true,
+          fixtures: new FixtureBuilder()
+            .withPermissionControllerConnectedToTestDapp()
+            .withPreferencesControllerTxSimulationsDisabled()
+            .build(),
+          ganacheOptions: generateGanacheOptions({ hardfork: 'london' }),
+          title: this.test.fullTitle(),
+        },
+        async ({ driver }) => {
+          await unlockWallet(driver);
+
+          await tempToggleSettingRedesignedTransactionConfirmations(driver);
+
+          await createMultipleTransactions(driver, TRANSACTION_COUNT);
+
+          const navigation = new ConfirmationNavigation(driver);
+
+          await navigation.clickNextPage();
+          await navigation.check_pageNumbers(2, 4);
+
+          await driver.switchToWindowWithTitle(
+            WINDOW_TITLES.ExtensionInFullScreenView,
+          );
+
+          // add transaction
+          await openDapp(driver);
+          await driver.clickElement({ text: 'Send', tag: 'button' });
+          await driver.switchToWindowWithTitle(WINDOW_TITLES.Dialog);
+
+          await navigation.check_pageNumbers(2, 5);
+        },
+      );
+    });
+
+    it('should reject and remove an unapproved transaction', async function () {
+      await withFixtures(
+        {
+          fixtures: new FixtureBuilder()
+            .withPreferencesControllerTxSimulationsDisabled()
+            .withPermissionControllerConnectedToTestDapp()
+            .build(),
+          ganacheOptions: generateGanacheOptions({ hardfork: 'london' }),
+          title: this.test.fullTitle(),
+          dapp: true,
+        },
+        async ({ driver }) => {
+          await unlockWallet(driver);
+
+          await tempToggleSettingRedesignedTransactionConfirmations(driver);
+
+          await createMultipleTransactions(driver, TRANSACTION_COUNT);
+
+          // reject transaction
+          await driver.clickElement({ text: 'Reject', tag: 'button' });
+
+          const navigation = new ConfirmationNavigation(driver);
+          await navigation.check_pageNumbers(1, 3);
+        },
+      );
+    });
+
+    it('should confirm and remove an unapproved transaction', async function () {
+      await withFixtures(
+        {
+          fixtures: new FixtureBuilder()
+            .withPreferencesControllerTxSimulationsDisabled()
+            .withPermissionControllerConnectedToTestDapp()
+            .build(),
+          ganacheOptions: generateGanacheOptions({ hardfork: 'london' }),
+          title: this.test.fullTitle(),
+          dapp: true,
+        },
+        async ({ driver }) => {
+          await unlockWallet(driver);
+
+          await tempToggleSettingRedesignedTransactionConfirmations(driver);
+
+          await createMultipleTransactions(driver, TRANSACTION_COUNT);
+
+          // confirm transaction
+          await driver.clickElement({ text: 'Confirm', tag: 'button' });
+
+          const navigation = new ConfirmationNavigation(driver);
+          await navigation.check_pageNumbers(1, 3);
+        },
+      );
+    });
+
+    it('should reject and remove all unapproved transactions', async function () {
+      await withFixtures(
+        {
+          fixtures: new FixtureBuilder()
+            .withPreferencesControllerTxSimulationsDisabled()
+            .withPermissionControllerConnectedToTestDapp()
+            .build(),
+          ganacheOptions: generateGanacheOptions({ hardfork: 'london' }),
+          title: this.test.fullTitle(),
+          dapp: true,
+        },
+        async ({ driver, ganacheServer }) => {
+          await unlockWallet(driver);
+
+          await tempToggleSettingRedesignedTransactionConfirmations(driver);
+
+          await createMultipleTransactions(driver, TRANSACTION_COUNT);
+
+          // reject transactions
+          await driver.clickElement({ text: 'Reject 4', tag: 'a' });
+          await driver.clickElement({ text: 'Reject all', tag: 'button' });
+
+          await driver.switchToWindowWithTitle(
+            WINDOW_TITLES.ExtensionInFullScreenView,
+          );
+          await locateAccountBalanceDOM(driver, ganacheServer);
+        },
+      );
+    });
   });
 
-  it('should reject and remove all unapproved transactions', async function () {
-    await withFixtures(
-      {
-        fixtures: new FixtureBuilder()
-          .withPreferencesControllerTxSimulationsDisabled()
-          .withPermissionControllerConnectedToTestDapp()
-          .build(),
-        ganacheOptions: generateGanacheOptions({ hardfork: 'london' }),
-        title: this.test.fullTitle(),
-        dapp: true,
-      },
-      async ({ driver, ganacheServer }) => {
-        await unlockWallet(driver);
-
-        await tempToggleSettingRedesignedTransactionConfirmations(driver);
-
-        await createMultipleTransactions(driver, TRANSACTION_COUNT);
-
-        // reject transactions
-        await driver.clickElement({ text: 'Reject 4', tag: 'a' });
-        await driver.clickElement({ text: 'Reject all', tag: 'button' });
-
-        await driver.switchToWindowWithTitle(
-          WINDOW_TITLES.ExtensionInFullScreenView,
-        );
-        await locateAccountBalanceDOM(driver, ganacheServer);
-      },
-    );
+  describe('Redesigned confirmation screens', function () {
+    it('should navigate the unapproved transactions', async function () {
+      await withFixtures(
+        {
+          fixtures: new FixtureBuilder()
+            .withPreferencesControllerTxSimulationsDisabled()
+            .withPermissionControllerConnectedToTestDapp()
+            .build(),
+          ganacheOptions: generateGanacheOptions({ hardfork: 'london' }),
+          title: this.test.fullTitle(),
+          dapp: true,
+        },
+        async ({ driver }) => {
+          await unlockWallet(driver);
+
+          await createRedesignedMultipleTransactions(driver, TRANSACTION_COUNT);
+
+          const navigation = new Confirmation(driver);
+
+          await navigation.clickNextPage();
+          await navigation.check_pageNumbers(2, 4);
+
+          await navigation.clickNextPage();
+          await navigation.check_pageNumbers(3, 4);
+
+          await navigation.clickNextPage();
+          await navigation.check_pageNumbers(4, 4);
+
+          await navigation.clickPreviousPage();
+          await navigation.check_pageNumbers(3, 4);
+
+          await navigation.clickPreviousPage();
+          await navigation.check_pageNumbers(2, 4);
+
+          await navigation.clickPreviousPage();
+          await navigation.check_pageNumbers(1, 4);
+        },
+      );
+    });
+
+    it('should add a transaction while the confirm page is in focus', async function () {
+      await withFixtures(
+        {
+          dapp: true,
+          fixtures: new FixtureBuilder()
+            .withPermissionControllerConnectedToTestDapp()
+            .withPreferencesControllerTxSimulationsDisabled()
+            .build(),
+          ganacheOptions: generateGanacheOptions({ hardfork: 'london' }),
+          title: this.test.fullTitle(),
+        },
+        async ({ driver }) => {
+          await unlockWallet(driver);
+
+          await createRedesignedMultipleTransactions(driver, TRANSACTION_COUNT);
+
+          const navigation = new Confirmation(driver);
+
+          await navigation.clickNextPage();
+          await navigation.check_pageNumbers(2, 4);
+
+          await driver.switchToWindowWithTitle(
+            WINDOW_TITLES.ExtensionInFullScreenView,
+          );
+
+          // add transaction
+          await openDapp(driver);
+          await driver.clickElement({ text: 'Send', tag: 'button' });
+          await driver.switchToWindowWithTitle(WINDOW_TITLES.Dialog);
+
+          await navigation.check_pageNumbers(2, 5);
+        },
+      );
+    });
+
+    it('should reject and remove an unapproved transaction', async function () {
+      await withFixtures(
+        {
+          fixtures: new FixtureBuilder()
+            .withPreferencesControllerTxSimulationsDisabled()
+            .withPermissionControllerConnectedToTestDapp()
+            .build(),
+          ganacheOptions: generateGanacheOptions({ hardfork: 'london' }),
+          title: this.test.fullTitle(),
+          dapp: true,
+        },
+        async ({ driver }) => {
+          await unlockWallet(driver);
+
+          await createRedesignedMultipleTransactions(driver, TRANSACTION_COUNT);
+
+          // reject transaction
+          await driver.clickElement({ text: 'Cancel', tag: 'button' });
+
+          const navigation = new Confirmation(driver);
+          await navigation.check_pageNumbers(1, 3);
+        },
+      );
+    });
+
+    it('should confirm and remove an unapproved transaction', async function () {
+      await withFixtures(
+        {
+          fixtures: new FixtureBuilder()
+            .withPreferencesControllerTxSimulationsDisabled()
+            .withPermissionControllerConnectedToTestDapp()
+            .build(),
+          ganacheOptions: generateGanacheOptions({ hardfork: 'london' }),
+          title: this.test.fullTitle(),
+          dapp: true,
+        },
+        async ({ driver }) => {
+          await unlockWallet(driver);
+
+          await createRedesignedMultipleTransactions(driver, TRANSACTION_COUNT);
+
+          // confirm transaction
+          await driver.clickElement({ text: 'Confirm', tag: 'button' });
+
+          const navigation = new Confirmation(driver);
+          await navigation.check_pageNumbers(1, 3);
+        },
+      );
+    });
+
+    it('should reject and remove all unapproved transactions', async function () {
+      await withFixtures(
+        {
+          fixtures: new FixtureBuilder()
+            .withPreferencesControllerTxSimulationsDisabled()
+            .withPermissionControllerConnectedToTestDapp()
+            .build(),
+          ganacheOptions: generateGanacheOptions({ hardfork: 'london' }),
+          title: this.test.fullTitle(),
+          dapp: true,
+        },
+        async ({ driver, ganacheServer }) => {
+          await unlockWallet(driver);
+
+          await createRedesignedMultipleTransactions(driver, TRANSACTION_COUNT);
+
+          // reject transactions
+          await driver.clickElement({ text: 'Reject all', tag: 'button' });
+
+          await driver.switchToWindowWithTitle(
+            WINDOW_TITLES.ExtensionInFullScreenView,
+          );
+          await locateAccountBalanceDOM(driver, ganacheServer);
+        },
+      );
+    });
   });
 });
 
@@ -198,3 +356,17 @@ async function createMultipleTransactions(driver, count) {
     text: '0.001',
   });
 }
+
+async function createRedesignedMultipleTransactions(driver, count) {
+  for (let i = 0; i < count; i++) {
+    await createDappTransaction(driver);
+  }
+
+  await driver.switchToWindowWithTitle(WINDOW_TITLES.Dialog);
+
+  // Wait until total amount is loaded to mitigate flakiness on reject
+  await driver.findElement({
+    tag: 'h2',
+    text: '0.001 ETH',
+  });
+}
diff --git a/test/e2e/tests/transaction/send-edit.spec.js b/test/e2e/tests/transaction/send-edit.spec.js
index 8d19d6d071b1..2180d65b3ec4 100644
--- a/test/e2e/tests/transaction/send-edit.spec.js
+++ b/test/e2e/tests/transaction/send-edit.spec.js
@@ -13,168 +13,357 @@ const {
 const FixtureBuilder = require('../../fixture-builder');
 
 describe('Editing Confirm Transaction', function () {
-  it('goes back from confirm page to edit eth value, gas price and gas limit', async function () {
-    await withFixtures(
-      {
-        fixtures: new FixtureBuilder().withConversionRateDisabled().build(),
-        ganacheOptions: defaultGanacheOptions,
-        title: this.test.fullTitle(),
-      },
-      async ({ driver }) => {
-        await unlockWallet(driver);
-        await tempToggleSettingRedesignedTransactionConfirmations(driver);
-        await createInternalTransaction(driver);
-
-        await driver.findElement({
-          css: '.currency-display-component__text',
-          text: '1',
-        });
-
-        await driver.findElement({
-          css: '.currency-display-component__text',
-          text: '1.000042',
-        });
-
-        await driver.clickElement(
-          '.confirm-page-container-header__back-button',
-        );
-
-        const inputAmount = await driver.findElement('input[placeholder="0"]');
-
-        await inputAmount.press(driver.Key.BACK_SPACE);
-        await inputAmount.press('2');
-        await inputAmount.press('.');
-        await inputAmount.press('2');
-
-        await driver.clickElement({ text: 'Continue', tag: 'button' });
-
-        await driver.clickElement({ text: 'Edit', tag: 'button' });
-
-        const [gasLimitInput, gasPriceInput] = await driver.findElements(
-          'input[type="number"]',
-        );
-        await gasPriceInput.fill('8');
-        await gasLimitInput.fill('100000');
-        await driver.clickElement({ text: 'Save', tag: 'button' });
-
-        // has correct updated value on the confirm screen the transaction
-        await driver.waitForSelector({
-          css: '.currency-display-component__text',
-          text: '0.0008',
-        });
-        await driver.waitForSelector({
-          css: '.currency-display-component__suffix',
-          text: 'ETH',
-        });
-
-        // confirms the transaction
-        await driver.clickElement({ text: 'Confirm', tag: 'button' });
-
-        await driver.clickElement(
-          '[data-testid="account-overview__activity-tab"]',
-        );
-        await driver.wait(async () => {
-          const confirmedTxes = await driver.findElements(
-            '.transaction-list__completed-transactions .activity-list-item',
-          );
-          return confirmedTxes.length === 1;
-        }, 10000);
-
-        const txValues = await driver.findElements(
-          '[data-testid="transaction-list-item-primary-currency"]',
-        );
-        assert.equal(txValues.length, 1);
-        assert.ok(/-2.2\s*ETH/u.test(await txValues[0].getText()));
-      },
-    );
+  describe('Old confirmation screens', function () {
+    it('goes back from confirm page to edit eth value, gas price and gas limit', async function () {
+      await withFixtures(
+        {
+          fixtures: new FixtureBuilder().withConversionRateDisabled().build(),
+          ganacheOptions: defaultGanacheOptions,
+          title: this.test.fullTitle(),
+        },
+        async ({ driver }) => {
+          await unlockWallet(driver);
+          await tempToggleSettingRedesignedTransactionConfirmations(driver);
+          await createInternalTransaction(driver);
+
+          await driver.findElement({
+            css: '.currency-display-component__text',
+            text: '1',
+          });
+
+          await driver.findElement({
+            css: '.currency-display-component__text',
+            text: '1.000042',
+          });
+
+          await driver.clickElement(
+            '.confirm-page-container-header__back-button',
+          );
+
+          const inputAmount = await driver.findElement(
+            'input[placeholder="0"]',
+          );
+
+          await inputAmount.press(driver.Key.BACK_SPACE);
+          await inputAmount.press('2');
+          await inputAmount.press('.');
+          await inputAmount.press('2');
+
+          await driver.clickElement({ text: 'Continue', tag: 'button' });
+
+          await driver.clickElement({ text: 'Edit', tag: 'button' });
+
+          const [gasLimitInput, gasPriceInput] = await driver.findElements(
+            'input[type="number"]',
+          );
+          await gasPriceInput.fill('8');
+          await gasLimitInput.fill('100000');
+          await driver.clickElement({ text: 'Save', tag: 'button' });
+
+          // has correct updated value on the confirm screen the transaction
+          await driver.waitForSelector({
+            css: '.currency-display-component__text',
+            text: '0.0008',
+          });
+          await driver.waitForSelector({
+            css: '.currency-display-component__suffix',
+            text: 'ETH',
+          });
+
+          // confirms the transaction
+          await driver.clickElement({ text: 'Confirm', tag: 'button' });
+
+          await driver.clickElement(
+            '[data-testid="account-overview__activity-tab"]',
+          );
+          await driver.wait(async () => {
+            const confirmedTxes = await driver.findElements(
+              '.transaction-list__completed-transactions .activity-list-item',
+            );
+            return confirmedTxes.length === 1;
+          }, 10000);
+
+          const txValues = await driver.findElements(
+            '[data-testid="transaction-list-item-primary-currency"]',
+          );
+          assert.equal(txValues.length, 1);
+          assert.ok(/-2.2\s*ETH/u.test(await txValues[0].getText()));
+        },
+      );
+    });
+
+    it('goes back from confirm page to edit eth value, baseFee, priorityFee and gas limit - 1559 V2', async function () {
+      await withFixtures(
+        {
+          fixtures: new FixtureBuilder().withConversionRateDisabled().build(),
+          ganacheOptions: generateGanacheOptions({ hardfork: 'london' }),
+          title: this.test.fullTitle(),
+        },
+        async ({ driver }) => {
+          await unlockWallet(driver);
+          await tempToggleSettingRedesignedTransactionConfirmations(driver);
+
+          await createInternalTransaction(driver);
+
+          await driver.findElement({
+            css: '.currency-display-component__text',
+            text: '1',
+          });
+
+          await driver.findElement({
+            css: '.currency-display-component__text',
+            text: '1.00043983',
+          });
+
+          await driver.clickElement(
+            '.confirm-page-container-header__back-button',
+          );
+
+          const inputAmount = await driver.findElement(
+            'input[placeholder="0"]',
+          );
+
+          await inputAmount.press(driver.Key.BACK_SPACE);
+          await inputAmount.press('2');
+          await inputAmount.press('.');
+          await inputAmount.press('2');
+
+          await driver.clickElement({ text: 'Continue', tag: 'button' });
+
+          // open gas fee popover
+          await driver.clickElement('[data-testid="edit-gas-fee-icon"]');
+
+          await driver.clickElement('[data-testid="edit-gas-fee-item-custom"]');
+
+          // enter max fee
+          await driver.fill('[data-testid="base-fee-input"]', '8');
+
+          // enter priority fee
+          await driver.fill('[data-testid="priority-fee-input"]', '8');
+
+          // edit gas limit
+          await driver.clickElement('[data-testid="advanced-gas-fee-edit"]');
+          await driver.fill('[data-testid="gas-limit-input"]', '100000');
+
+          // save default values
+          await driver.clickElement('input[type="checkbox"]');
+
+          // Submit gas fee changes
+          await driver.clickElement({ text: 'Save', tag: 'button' });
+
+          // has correct updated value on the confirm screen the transaction
+          await driver.waitForSelector({
+            css: '.currency-display-component__text',
+            text: '0.0008',
+          });
+          await driver.waitForSelector({
+            css: '.currency-display-component__suffix',
+            text: 'ETH',
+          });
+
+          // confirms the transaction
+          await driver.clickElement({ text: 'Confirm', tag: 'button' });
+
+          await driver.clickElement(
+            '[data-testid="account-overview__activity-tab"]',
+          );
+          await driver.wait(async () => {
+            const confirmedTxes = await driver.findElements(
+              '.transaction-list__completed-transactions .activity-list-item',
+            );
+            return confirmedTxes.length === 1;
+          }, 10000);
+
+          const txValues = await driver.findElements(
+            '[data-testid="transaction-list-item-primary-currency"]',
+          );
+          assert.equal(txValues.length, 1);
+          assert.ok(/-2.2\s*ETH/u.test(await txValues[0].getText()));
+        },
+      );
+    });
   });
 
-  it('goes back from confirm page to edit eth value, baseFee, priorityFee and gas limit - 1559 V2', async function () {
-    await withFixtures(
-      {
-        fixtures: new FixtureBuilder().withConversionRateDisabled().build(),
-        ganacheOptions: generateGanacheOptions({ hardfork: 'london' }),
-        title: this.test.fullTitle(),
-      },
-      async ({ driver }) => {
-        await unlockWallet(driver);
-        await tempToggleSettingRedesignedTransactionConfirmations(driver);
-
-        await createInternalTransaction(driver);
-
-        await driver.findElement({
-          css: '.currency-display-component__text',
-          text: '1',
-        });
-
-        await driver.findElement({
-          css: '.currency-display-component__text',
-          text: '1.00043983',
-        });
-
-        await driver.clickElement(
-          '.confirm-page-container-header__back-button',
-        );
-
-        const inputAmount = await driver.findElement('input[placeholder="0"]');
-
-        await inputAmount.press(driver.Key.BACK_SPACE);
-        await inputAmount.press('2');
-        await inputAmount.press('.');
-        await inputAmount.press('2');
-
-        await driver.clickElement({ text: 'Continue', tag: 'button' });
-
-        // open gas fee popover
-        await driver.clickElement('[data-testid="edit-gas-fee-icon"]');
-
-        await driver.clickElement('[data-testid="edit-gas-fee-item-custom"]');
-
-        // enter max fee
-        await driver.fill('[data-testid="base-fee-input"]', '8');
-
-        // enter priority fee
-        await driver.fill('[data-testid="priority-fee-input"]', '8');
-
-        // edit gas limit
-        await driver.clickElement('[data-testid="advanced-gas-fee-edit"]');
-        await driver.fill('[data-testid="gas-limit-input"]', '100000');
-
-        // save default values
-        await driver.clickElement('input[type="checkbox"]');
-
-        // Submit gas fee changes
-        await driver.clickElement({ text: 'Save', tag: 'button' });
-
-        // has correct updated value on the confirm screen the transaction
-        await driver.waitForSelector({
-          css: '.currency-display-component__text',
-          text: '0.0008',
-        });
-        await driver.waitForSelector({
-          css: '.currency-display-component__suffix',
-          text: 'ETH',
-        });
-
-        // confirms the transaction
-        await driver.clickElement({ text: 'Confirm', tag: 'button' });
-
-        await driver.clickElement(
-          '[data-testid="account-overview__activity-tab"]',
-        );
-        await driver.wait(async () => {
-          const confirmedTxes = await driver.findElements(
-            '.transaction-list__completed-transactions .activity-list-item',
-          );
-          return confirmedTxes.length === 1;
-        }, 10000);
-
-        const txValues = await driver.findElements(
-          '[data-testid="transaction-list-item-primary-currency"]',
-        );
-        assert.equal(txValues.length, 1);
-        assert.ok(/-2.2\s*ETH/u.test(await txValues[0].getText()));
-      },
-    );
+  describe('Redesigned confirmation screens', function () {
+    it('goes back from confirm page to edit eth value, gas price and gas limit', async function () {
+      await withFixtures(
+        {
+          fixtures: new FixtureBuilder().withConversionRateDisabled().build(),
+          ganacheOptions: defaultGanacheOptions,
+          title: this.test.fullTitle(),
+        },
+        async ({ driver }) => {
+          await unlockWallet(driver);
+
+          await createInternalTransaction(driver);
+
+          await driver.findElement({
+            css: 'h2',
+            text: '1 ETH',
+          });
+
+          await driver.findElement({
+            css: '[data-testid="first-gas-field"]',
+            text: '0 ETH',
+          });
+
+          await driver.findElement({
+            css: '[data-testid="native-currency"]',
+            text: '$0.07',
+          });
+
+          await driver.clickElement(
+            '[data-testid="wallet-initiated-header-back-button"]',
+          );
+
+          const inputAmount = await driver.findElement(
+            'input[placeholder="0"]',
+          );
+
+          await inputAmount.press(driver.Key.BACK_SPACE);
+          await inputAmount.press('2');
+          await inputAmount.press('.');
+          await inputAmount.press('2');
+
+          await driver.clickElement({ text: 'Continue', tag: 'button' });
+
+          await driver.clickElement('[data-testid="edit-gas-fee-icon"]');
+
+          const [gasLimitInput, gasPriceInput] = await driver.findElements(
+            'input[type="number"]',
+          );
+          await gasPriceInput.fill('8');
+          await gasLimitInput.fill('100000');
+          await driver.clickElement({ text: 'Save', tag: 'button' });
+
+          // has correct updated value on the confirm screen the transaction
+          await driver.findElement({
+            css: '[data-testid="first-gas-field"]',
+            text: '0.0008 ETH',
+          });
+
+          await driver.findElement({
+            css: '[data-testid="native-currency"]',
+            text: '$1.36',
+          });
+
+          // confirms the transaction
+          await driver.clickElement({ text: 'Confirm', tag: 'button' });
+
+          await driver.clickElement(
+            '[data-testid="account-overview__activity-tab"]',
+          );
+          await driver.wait(async () => {
+            const confirmedTxes = await driver.findElements(
+              '.transaction-list__completed-transactions .activity-list-item',
+            );
+            return confirmedTxes.length === 1;
+          }, 10000);
+
+          const txValues = await driver.findElements(
+            '[data-testid="transaction-list-item-primary-currency"]',
+          );
+          assert.equal(txValues.length, 1);
+          assert.ok(/-2.2\s*ETH/u.test(await txValues[0].getText()));
+        },
+      );
+    });
+
+    it('goes back from confirm page to edit eth value, baseFee, priorityFee and gas limit - 1559 V2', async function () {
+      await withFixtures(
+        {
+          fixtures: new FixtureBuilder().withConversionRateDisabled().build(),
+          ganacheOptions: generateGanacheOptions({ hardfork: 'london' }),
+          title: this.test.fullTitle(),
+        },
+        async ({ driver }) => {
+          await unlockWallet(driver);
+          // await tempToggleSettingRedesignedTransactionConfirmations(driver);
+
+          await createInternalTransaction(driver);
+
+          await driver.findElement({
+            css: 'h2',
+            text: '1 ETH',
+          });
+
+          await driver.findElement({
+            css: '[data-testid="first-gas-field"]',
+            text: '0.0004 ETH',
+          });
+
+          await driver.findElement({
+            css: '[data-testid="native-currency"]',
+            text: '$0.75',
+          });
+
+          await driver.clickElement(
+            '[data-testid="wallet-initiated-header-back-button"]',
+          );
+
+          const inputAmount = await driver.findElement(
+            'input[placeholder="0"]',
+          );
+
+          await inputAmount.press(driver.Key.BACK_SPACE);
+          await inputAmount.press('2');
+          await inputAmount.press('.');
+          await inputAmount.press('2');
+
+          await driver.clickElement({ text: 'Continue', tag: 'button' });
+
+          // open gas fee popover
+          await driver.clickElement('[data-testid="edit-gas-fee-icon"]');
+
+          await driver.clickElement('[data-testid="edit-gas-fee-item-custom"]');
+
+          // enter max fee
+          await driver.fill('[data-testid="base-fee-input"]', '8');
+
+          // enter priority fee
+          await driver.fill('[data-testid="priority-fee-input"]', '8');
+
+          // edit gas limit
+          await driver.clickElement('[data-testid="advanced-gas-fee-edit"]');
+          await driver.fill('[data-testid="gas-limit-input"]', '100000');
+
+          // save default values
+          await driver.clickElement('input[type="checkbox"]');
+
+          // Submit gas fee changes
+          await driver.clickElement({ text: 'Save', tag: 'button' });
+
+          // has correct updated value on the confirm screen the transaction
+          await driver.findElement({
+            css: '[data-testid="first-gas-field"]',
+            text: '0.0008 ETH',
+          });
+
+          await driver.findElement({
+            css: '[data-testid="native-currency"]',
+            text: '$1.36',
+          });
+
+          // confirms the transaction
+          await driver.clickElement({ text: 'Confirm', tag: 'button' });
+
+          await driver.clickElement(
+            '[data-testid="account-overview__activity-tab"]',
+          );
+          await driver.wait(async () => {
+            const confirmedTxes = await driver.findElements(
+              '.transaction-list__completed-transactions .activity-list-item',
+            );
+            return confirmedTxes.length === 1;
+          }, 10000);
+
+          const txValues = await driver.findElements(
+            '[data-testid="transaction-list-item-primary-currency"]',
+          );
+          assert.equal(txValues.length, 1);
+          assert.ok(/-2.2\s*ETH/u.test(await txValues[0].getText()));
+        },
+      );
+    });
   });
 });
diff --git a/test/e2e/tests/transaction/send-eth.spec.js b/test/e2e/tests/transaction/send-eth.spec.js
index 9ee1b58dc170..7bffb3f1cde1 100644
--- a/test/e2e/tests/transaction/send-eth.spec.js
+++ b/test/e2e/tests/transaction/send-eth.spec.js
@@ -14,244 +14,398 @@ const {
 const FixtureBuilder = require('../../fixture-builder');
 
 describe('Send ETH', function () {
-  describe('from inside MetaMask', function () {
-    it('finds the transaction in the transactions list using default gas', async function () {
-      await withFixtures(
-        {
-          fixtures: new FixtureBuilder().build(),
-          ganacheOptions: defaultGanacheOptions,
-          title: this.test.fullTitle(),
-        },
-        async ({ driver, ganacheServer }) => {
-          await logInWithBalanceValidation(driver, ganacheServer);
-
-          await openActionMenuAndStartSendFlow(driver);
-
-          await driver.fill(
-            'input[placeholder="Enter public address (0x) or domain name"]',
-            '0x2f318C334780961FB129D2a6c30D0763d9a5C970',
-          );
+  describe('Old confirmation screens', function () {
+    describe('from inside MetaMask', function () {
+      /* eslint-disable-next-line mocha/max-top-level-suites */
+      it('finds the transaction in the transactions list using advanced gas modal', async function () {
+        await withFixtures(
+          {
+            fixtures: new FixtureBuilder().build(),
+            ganacheOptions: defaultGanacheOptions,
+            defaultGanacheOptions,
+            title: this.test.fullTitle(),
+          },
+          async ({ driver }) => {
+            await unlockWallet(driver);
 
-          const inputAmount = await driver.findElement(
-            'input[placeholder="0"]',
-          );
+            await tempToggleSettingRedesignedTransactionConfirmations(driver);
 
-          await inputAmount.press('1');
-          await inputAmount.press('0');
-          await inputAmount.press('0');
-          await inputAmount.press('0');
+            await driver.delay(1000);
 
-          await driver.findElement({
-            css: '[data-testid="send-page-amount-error"]',
-            text: '. Insufficient funds.',
-          });
+            await openActionMenuAndStartSendFlow(driver);
+            await driver.fill(
+              'input[placeholder="Enter public address (0x) or domain name"]',
+              '0x2f318C334780961FB129D2a6c30D0763d9a5C970',
+            );
 
-          await inputAmount.press(driver.Key.BACK_SPACE);
-          await inputAmount.press(driver.Key.BACK_SPACE);
-          await inputAmount.press(driver.Key.BACK_SPACE);
+            const inputAmount = await driver.findElement(
+              'input[placeholder="0"]',
+            );
+            await inputAmount.press('1');
 
-          await driver.assertElementNotPresent('.send-v2__error-amount', {
-            waitAtLeastGuard: 100, // A waitAtLeastGuard of 100ms is the best choice here
-          });
+            const inputValue = await inputAmount.getProperty('value');
+            assert.equal(inputValue, '1');
 
-          const amountMax = await driver.findClickableElement(
-            '[data-testid="max-clear-button"]',
-          );
-          await amountMax.click();
+            // Continue to next screen
+            await driver.clickElement({ text: 'Continue', tag: 'button' });
 
-          let inputValue = await inputAmount.getProperty('value');
+            await driver.delay(1000);
+            const transactionAmounts = await driver.findElements(
+              '.currency-display-component__text',
+            );
+            const transactionAmount = transactionAmounts[0];
+            assert.equal(await transactionAmount.getText(), '1');
 
-          assert(Number(inputValue) > 24);
+            await driver.clickElement({ text: 'Confirm', tag: 'button' });
 
-          await amountMax.click();
+            await driver.wait(async () => {
+              const confirmedTxes = await driver.findElements(
+                '.transaction-list__completed-transactions .activity-list-item',
+              );
+              return confirmedTxes.length === 1;
+            }, 10000);
 
-          assert.equal(await inputAmount.isEnabled(), true);
+            await driver.waitForSelector({
+              css: '[data-testid="transaction-list-item-primary-currency"]',
+              text: '-1 ETH',
+            });
+          },
+        );
+      });
 
-          await inputAmount.fill('1');
+      describe('from dapp using advanced gas controls', function () {
+        it('should display the correct gas price on the legacy transaction', async function () {
+          await withFixtures(
+            {
+              dapp: true,
+              fixtures: new FixtureBuilder()
+                .withPermissionControllerConnectedToTestDapp()
+                .build(),
+              ganacheOptions: defaultGanacheOptions,
+              defaultGanacheOptions,
+              title: this.test.fullTitle(),
+            },
+            async ({ driver }) => {
+              await unlockWallet(driver);
+
+              await tempToggleSettingRedesignedTransactionConfirmations(driver);
+
+              // initiates a send from the dapp
+              await openDapp(driver);
+              await driver.clickElement({ text: 'Send', tag: 'button' });
+              const windowHandles = await driver.waitUntilXWindowHandles(3);
+              const extension = windowHandles[0];
+              await driver.switchToWindowWithTitle(
+                WINDOW_TITLES.Dialog,
+                windowHandles,
+              );
+
+              await driver.assertElementNotPresent(
+                { text: 'Data', tag: 'li' },
+                { findElementGuard: { text: 'Estimated gas fee', tag: 'h6' } }, // make sure the Dialog has loaded
+              );
+
+              await driver.clickElement({ text: 'Edit', tag: 'button' });
+              await driver.waitForSelector({
+                text: '0.00021 ETH',
+              });
+              await driver.clickElement({
+                text: 'Edit suggested gas fee',
+                tag: 'button',
+              });
+              await driver.waitForSelector({
+                text: 'Edit priority',
+                tag: 'header',
+              });
+              await editGasFeeForm(driver, '21000', '100');
+              await driver.waitForSelector({
+                css: '.transaction-detail-item:nth-of-type(1) h6:nth-of-type(2)',
+                text: '0.0021 ETH',
+              });
+              await driver.clickElement({ text: 'Confirm', tag: 'button' });
+              await driver.waitUntilXWindowHandles(2);
+              await driver.switchToWindow(extension);
+
+              // finds the transaction in the transactions list
+              await driver.clickElement(
+                '[data-testid="account-overview__activity-tab"]',
+              );
+              await driver.waitForSelector(
+                '.transaction-list__completed-transactions .activity-list-item:nth-of-type(1)',
+              );
+              await driver.waitForSelector({
+                css: '[data-testid="transaction-list-item-primary-currency"]',
+                text: '-0 ETH',
+              });
+
+              // the transaction has the expected gas price
+              await driver.clickElement(
+                '[data-testid="transaction-list-item-primary-currency"]',
+              );
+              await driver.waitForSelector({
+                css: '[data-testid="transaction-breakdown__gas-price"]',
+                text: '100',
+              });
+            },
+          );
+        });
+
+        it('should display correct gas values for EIP-1559 transaction', async function () {
+          await withFixtures(
+            {
+              dapp: true,
+              fixtures: new FixtureBuilder()
+                .withPermissionControllerConnectedToTestDapp()
+                .build(),
+              ganacheOptions: {
+                ...defaultGanacheOptions,
+                hardfork: 'london',
+              },
+              title: this.test.fullTitle(),
+            },
+            async ({ driver }) => {
+              await unlockWallet(driver);
+
+              await tempToggleSettingRedesignedTransactionConfirmations(driver);
+
+              // initiates a transaction from the dapp
+              await openDapp(driver);
+              await driver.clickElement({
+                text: 'Create Token',
+                tag: 'button',
+              });
+              const windowHandles = await driver.waitUntilXWindowHandles(3);
+
+              const extension = windowHandles[0];
+              await driver.switchToWindowWithTitle(
+                WINDOW_TITLES.Dialog,
+                windowHandles,
+              );
+
+              await driver.assertElementNotPresent(
+                { text: 'Data', tag: 'li' },
+                { findElementGuard: { text: 'Estimated fee' } }, // make sure the Dialog has loaded
+              );
+
+              await driver.clickElement('[data-testid="edit-gas-fee-icon"]');
+              await driver.clickElement(
+                '[data-testid="edit-gas-fee-item-custom"]',
+              );
+
+              const baseFeeInput = await driver.findElement(
+                '[data-testid="base-fee-input"]',
+              );
+              await baseFeeInput.fill('25');
+              const priorityFeeInput = await driver.findElement(
+                '[data-testid="priority-fee-input"]',
+              );
+              await priorityFeeInput.fill('1');
+
+              await driver.clickElement({ text: 'Save', tag: 'button' });
+
+              await driver.waitForSelector({
+                css: '.currency-display-component__text',
+                text: '0.0550741',
+              });
+
+              await driver.clickElement({ text: 'Confirm', tag: 'button' });
+              await driver.waitUntilXWindowHandles(2);
+              await driver.switchToWindow(extension);
+
+              // Identify the transaction in the transactions list
+              await driver.waitForSelector(
+                '[data-testid="eth-overview__primary-currency"]',
+              );
+
+              await driver.clickElement(
+                '[data-testid="account-overview__activity-tab"]',
+              );
+              await driver.waitForSelector(
+                '.transaction-list__completed-transactions .activity-list-item:nth-of-type(1)',
+              );
+              await driver.waitForSelector({
+                css: '[data-testid="transaction-list-item-primary-currency"]',
+                text: '-0 ETH',
+              });
+
+              // the transaction has the expected gas value
+              await driver.clickElement(
+                '[data-testid="transaction-list-item-primary-currency"]',
+              );
+
+              await driver.waitForSelector({
+                xpath: "//div[contains(text(), 'Base fee')]",
+              });
+
+              const allFeeValues = await driver.findElements(
+                '.currency-display-component__text',
+              );
+
+              /**
+               * Below lines check that fee values are numeric.
+               * Because these values change for every e2e run,
+               * It's better to just check that the values are there and are numeric
+               */
+              assert.equal(allFeeValues.length > 0, true);
+
+              allFeeValues.forEach(async (feeValue) => {
+                assert.equal(/\d+\.?\d*/u.test(await feeValue.getText()), true);
+              });
+            },
+          );
+        });
+      });
 
-          inputValue = await inputAmount.getProperty('value');
-          assert.equal(inputValue, '1');
+      describe('to non-contract address with data that matches ERC20 transfer data signature', function () {
+        it('renders the correct recipient on the confirmation screen', async function () {
+          await withFixtures(
+            {
+              fixtures: new FixtureBuilder()
+                .withPreferencesController({
+                  featureFlags: {
+                    sendHexData: true,
+                  },
+                })
+                .withPreferencesControllerPetnamesDisabled()
+                .build(),
+              ganacheOptions: defaultGanacheOptions,
+              title: this.test.fullTitle(),
+            },
+            async ({ driver }) => {
+              await unlockWallet(driver);
+
+              await tempToggleSettingRedesignedTransactionConfirmations(driver);
+
+              await driver.assertElementNotPresent('.loading-overlay__spinner');
+              const balance = await driver.findElement(
+                '[data-testid="eth-overview__primary-currency"]',
+              );
+              assert.ok(/^[\d.]+\sETH$/u.test(await balance.getText()));
+
+              await openActionMenuAndStartSendFlow(driver);
+
+              await driver.fill(
+                'input[placeholder="Enter public address (0x) or domain name"]',
+                '0xc427D562164062a23a5cFf596A4a3208e72Acd28',
+              );
+
+              await driver.fill(
+                'textarea[placeholder="Optional',
+                '0xa9059cbb0000000000000000000000002f318C334780961FB129D2a6c30D0763d9a5C970000000000000000000000000000000000000000000000000000000000000000a',
+              );
+
+              await driver.findClickableElement({
+                text: 'Continue',
+                tag: 'button',
+              });
+              await driver.clickElement({ text: 'Continue', tag: 'button' });
+
+              await driver.findClickableElement(
+                '[data-testid="sender-to-recipient__name"]',
+              );
+              await driver.clickElement(
+                '[data-testid="sender-to-recipient__name"]',
+              );
+
+              const recipientAddress = await driver.findElements({
+                text: '0xc427D562164062a23a5cFf596A4a3208e72Acd28',
+              });
+
+              assert.equal(recipientAddress.length, 1);
+            },
+          );
+        });
+      });
+    });
+  });
 
-          // Continue to next screen
-          await driver.clickElement({ text: 'Continue', tag: 'button' });
+  describe('Redesigned confirmation screens', function () {
+    describe('from inside MetaMask', function () {
+      it('finds the transaction in the transactions list using default gas', async function () {
+        await withFixtures(
+          {
+            fixtures: new FixtureBuilder().build(),
+            ganacheOptions: defaultGanacheOptions,
+            title: this.test.fullTitle(),
+          },
+          async ({ driver, ganacheServer }) => {
+            await logInWithBalanceValidation(driver, ganacheServer);
 
-          await driver.clickElement({ text: 'Confirm', tag: 'button' });
+            await openActionMenuAndStartSendFlow(driver);
 
-          await driver.clickElement(
-            '[data-testid="account-overview__activity-tab"]',
-          );
-          await driver.wait(async () => {
-            const confirmedTxes = await driver.findElements(
-              '.transaction-list__completed-transactions .activity-list-item',
+            await driver.fill(
+              'input[placeholder="Enter public address (0x) or domain name"]',
+              '0x2f318C334780961FB129D2a6c30D0763d9a5C970',
             );
-            return confirmedTxes.length === 1;
-          }, 10000);
-
-          await driver.waitForSelector({
-            css: '[data-testid="transaction-list-item-primary-currency"]',
-            text: '-1 ETH',
-          });
-        },
-      );
-    });
-
-    /* eslint-disable-next-line mocha/max-top-level-suites */
-    it('finds the transaction in the transactions list using advanced gas modal', async function () {
-      await withFixtures(
-        {
-          fixtures: new FixtureBuilder().build(),
-          ganacheOptions: defaultGanacheOptions,
-          defaultGanacheOptions,
-          title: this.test.fullTitle(),
-        },
-        async ({ driver }) => {
-          await unlockWallet(driver);
-
-          await tempToggleSettingRedesignedTransactionConfirmations(driver);
-
-          await driver.delay(1000);
-
-          await openActionMenuAndStartSendFlow(driver);
-          await driver.fill(
-            'input[placeholder="Enter public address (0x) or domain name"]',
-            '0x2f318C334780961FB129D2a6c30D0763d9a5C970',
-          );
 
-          const inputAmount = await driver.findElement(
-            'input[placeholder="0"]',
-          );
-          await inputAmount.press('1');
+            const inputAmount = await driver.findElement(
+              'input[placeholder="0"]',
+            );
 
-          const inputValue = await inputAmount.getProperty('value');
-          assert.equal(inputValue, '1');
+            await inputAmount.press('1');
+            await inputAmount.press('0');
+            await inputAmount.press('0');
+            await inputAmount.press('0');
 
-          // Continue to next screen
-          await driver.clickElement({ text: 'Continue', tag: 'button' });
+            await driver.findElement({
+              css: '[data-testid="send-page-amount-error"]',
+              text: '. Insufficient funds.',
+            });
 
-          await driver.delay(1000);
-          const transactionAmounts = await driver.findElements(
-            '.currency-display-component__text',
-          );
-          const transactionAmount = transactionAmounts[0];
-          assert.equal(await transactionAmount.getText(), '1');
+            await inputAmount.press(driver.Key.BACK_SPACE);
+            await inputAmount.press(driver.Key.BACK_SPACE);
+            await inputAmount.press(driver.Key.BACK_SPACE);
 
-          await driver.clickElement({ text: 'Confirm', tag: 'button' });
+            await driver.assertElementNotPresent('.send-v2__error-amount', {
+              waitAtLeastGuard: 100, // A waitAtLeastGuard of 100ms is the best choice here
+            });
 
-          await driver.wait(async () => {
-            const confirmedTxes = await driver.findElements(
-              '.transaction-list__completed-transactions .activity-list-item',
+            const amountMax = await driver.findClickableElement(
+              '[data-testid="max-clear-button"]',
             );
-            return confirmedTxes.length === 1;
-          }, 10000);
-
-          await driver.waitForSelector({
-            css: '[data-testid="transaction-list-item-primary-currency"]',
-            text: '-1 ETH',
-          });
-        },
-      );
-    });
+            await amountMax.click();
 
-    it('finds the transaction in the transactions list when sending to a Multisig Address', async function () {
-      const smartContract = SMART_CONTRACTS.MULTISIG;
-      await withFixtures(
-        {
-          fixtures: new FixtureBuilder().build(),
-          ganacheOptions: {
-            ...defaultGanacheOptions,
-            hardfork: 'london',
-          },
-          smartContract,
-          title: this.test.fullTitle(),
-        },
-        async ({ driver, contractRegistry, ganacheServer }) => {
-          const contractAddress = await contractRegistry.getContractAddress(
-            smartContract,
-          );
-          await logInWithBalanceValidation(driver, ganacheServer);
+            let inputValue = await inputAmount.getProperty('value');
 
-          // Wait for balance to load
-          await driver.delay(500);
+            assert(Number(inputValue) > 24);
 
-          await driver.clickElement('[data-testid="eth-overview-send"]');
-          await driver.fill(
-            'input[placeholder="Enter public address (0x) or domain name"]',
-            contractAddress,
-          );
+            await amountMax.click();
 
-          const inputAmount = await driver.findElement(
-            'input[placeholder="0"]',
-          );
-          await inputAmount.press('1');
-
-          // Continue to next screen
-          await driver.clickElement({ text: 'Continue', tag: 'button' });
-          await driver.clickElement({ text: 'Confirm', tag: 'button' });
+            assert.equal(await inputAmount.isEnabled(), true);
 
-          // Go back to home screen to check txn
-          const balance = await driver.findElement(
-            '[data-testid="eth-overview__primary-currency"]',
-          );
+            await inputAmount.fill('1');
 
-          assert.ok(/^[\d.]+\sETH$/u.test(await balance.getText()));
+            inputValue = await inputAmount.getProperty('value');
+            assert.equal(inputValue, '1');
 
-          await driver.clickElement(
-            '[data-testid="account-overview__activity-tab"]',
-          );
+            // Continue to next screen
+            await driver.clickElement({ text: 'Continue', tag: 'button' });
 
-          await driver.findElement(
-            '.transaction-list__completed-transactions .activity-list-item',
-          );
+            await driver.clickElement({ text: 'Confirm', tag: 'button' });
 
-          // The previous findElement already serves as the guard here for the assertElementNotPresent
-          await driver.assertElementNotPresent(
-            '.transaction-status-label--failed',
-          );
-        },
-      );
-    });
+            await driver.clickElement(
+              '[data-testid="account-overview__activity-tab"]',
+            );
+            await driver.wait(async () => {
+              const confirmedTxes = await driver.findElements(
+                '.transaction-list__completed-transactions .activity-list-item',
+              );
+              return confirmedTxes.length === 1;
+            }, 10000);
 
-    it('shows no error when cancel transaction when sending via QR code', async function () {
-      await withFixtures(
-        {
-          fixtures: new FixtureBuilder().build(),
-          ganacheOptions: defaultGanacheOptions,
-          title: this.test.fullTitle(),
-        },
-        async ({ driver }) => {
-          await unlockWallet(driver);
-
-          await driver.assertElementNotPresent('.loading-overlay__spinner');
-          const balance = await driver.findElement(
-            '[data-testid="eth-overview__primary-currency"]',
-          );
-          assert.ok(/^[\d.]+\sETH$/u.test(await balance.getText()));
-
-          await openActionMenuAndStartSendFlow(driver);
-          // choose to scan via QR code
-          await driver.clickElement('[data-testid="ens-qr-scan-button"]');
-          await driver.findVisibleElement('[data-testid="qr-scanner-modal"]');
-          // cancel action will close the dialog and shut down camera initialization
-          await driver.waitForSelector({
-            css: '.qr-scanner__error',
-            text: "We couldn't access your camera. Please give it another try.",
-          });
-          await driver.clickElement({ text: 'Cancel', tag: 'button' });
-          await driver.assertElementNotPresent(
-            '[data-testid="qr-scanner-modal"]',
-          );
-        },
-      );
-    });
+            await driver.waitForSelector({
+              css: '[data-testid="transaction-list-item-primary-currency"]',
+              text: '-1 ETH',
+            });
+          },
+        );
+      });
 
-    describe('from dapp using advanced gas controls', function () {
-      it('should display the correct gas price on the legacy transaction', async function () {
+      /* eslint-disable-next-line mocha/max-top-level-suites */
+      it('finds the transaction in the transactions list using advanced gas modal', async function () {
         await withFixtures(
           {
-            dapp: true,
-            fixtures: new FixtureBuilder()
-              .withPermissionControllerConnectedToTestDapp()
-              .build(),
+            fixtures: new FixtureBuilder().build(),
             ganacheOptions: defaultGanacheOptions,
             defaultGanacheOptions,
             title: this.test.fullTitle(),
@@ -259,191 +413,119 @@ describe('Send ETH', function () {
           async ({ driver }) => {
             await unlockWallet(driver);
 
-            await tempToggleSettingRedesignedTransactionConfirmations(driver);
+            await driver.delay(1000);
 
-            // initiates a send from the dapp
-            await openDapp(driver);
-            await driver.clickElement({ text: 'Send', tag: 'button' });
-            const windowHandles = await driver.waitUntilXWindowHandles(3);
-            const extension = windowHandles[0];
-            await driver.switchToWindowWithTitle(
-              WINDOW_TITLES.Dialog,
-              windowHandles,
+            await openActionMenuAndStartSendFlow(driver);
+            await driver.fill(
+              'input[placeholder="Enter public address (0x) or domain name"]',
+              '0x2f318C334780961FB129D2a6c30D0763d9a5C970',
             );
 
-            await driver.assertElementNotPresent(
-              { text: 'Data', tag: 'li' },
-              { findElementGuard: { text: 'Estimated gas fee', tag: 'h6' } }, // make sure the Dialog has loaded
+            const inputAmount = await driver.findElement(
+              'input[placeholder="0"]',
             );
+            await inputAmount.press('1');
 
-            await driver.clickElement({ text: 'Edit', tag: 'button' });
-            await driver.waitForSelector({
-              text: '0.00021 ETH',
-            });
-            await driver.clickElement({
-              text: 'Edit suggested gas fee',
-              tag: 'button',
-            });
-            await driver.waitForSelector({
-              text: 'Edit priority',
-              tag: 'header',
-            });
-            await editGasFeeForm(driver, '21000', '100');
-            await driver.waitForSelector({
-              css: '.transaction-detail-item:nth-of-type(1) h6:nth-of-type(2)',
-              text: '0.0021 ETH',
+            const inputValue = await inputAmount.getProperty('value');
+            assert.equal(inputValue, '1');
+
+            // Continue to next screen
+            await driver.clickElement({ text: 'Continue', tag: 'button' });
+
+            await driver.delay(1000);
+
+            // Transaction Amount
+            await driver.findElement({
+              css: 'h2',
+              text: '1 ETH',
             });
+
             await driver.clickElement({ text: 'Confirm', tag: 'button' });
-            await driver.waitUntilXWindowHandles(2);
-            await driver.switchToWindow(extension);
 
-            // finds the transaction in the transactions list
-            await driver.clickElement(
-              '[data-testid="account-overview__activity-tab"]',
-            );
-            await driver.waitForSelector(
-              '.transaction-list__completed-transactions .activity-list-item:nth-of-type(1)',
-            );
-            await driver.waitForSelector({
-              css: '[data-testid="transaction-list-item-primary-currency"]',
-              text: '-0 ETH',
-            });
+            await driver.wait(async () => {
+              const confirmedTxes = await driver.findElements(
+                '.transaction-list__completed-transactions .activity-list-item',
+              );
+              return confirmedTxes.length === 1;
+            }, 10000);
 
-            // the transaction has the expected gas price
-            await driver.clickElement(
-              '[data-testid="transaction-list-item-primary-currency"]',
-            );
             await driver.waitForSelector({
-              css: '[data-testid="transaction-breakdown__gas-price"]',
-              text: '100',
+              css: '[data-testid="transaction-list-item-primary-currency"]',
+              text: '-1 ETH',
             });
           },
         );
       });
 
-      it('should display correct gas values for EIP-1559 transaction', async function () {
+      it('finds the transaction in the transactions list when sending to a Multisig Address', async function () {
+        const smartContract = SMART_CONTRACTS.MULTISIG;
         await withFixtures(
           {
-            dapp: true,
-            fixtures: new FixtureBuilder()
-              .withPermissionControllerConnectedToTestDapp()
-              .build(),
+            fixtures: new FixtureBuilder().build(),
             ganacheOptions: {
               ...defaultGanacheOptions,
               hardfork: 'london',
             },
+            smartContract,
             title: this.test.fullTitle(),
           },
-          async ({ driver }) => {
-            await unlockWallet(driver);
-
-            await tempToggleSettingRedesignedTransactionConfirmations(driver);
-
-            // initiates a transaction from the dapp
-            await openDapp(driver);
-            await driver.clickElement({ text: 'Create Token', tag: 'button' });
-            const windowHandles = await driver.waitUntilXWindowHandles(3);
-
-            const extension = windowHandles[0];
-            await driver.switchToWindowWithTitle(
-              WINDOW_TITLES.Dialog,
-              windowHandles,
+          async ({ driver, contractRegistry, ganacheServer }) => {
+            const contractAddress = await contractRegistry.getContractAddress(
+              smartContract,
             );
+            await logInWithBalanceValidation(driver, ganacheServer);
 
-            await driver.assertElementNotPresent(
-              { text: 'Data', tag: 'li' },
-              { findElementGuard: { text: 'Estimated fee' } }, // make sure the Dialog has loaded
-            );
+            // Wait for balance to load
+            await driver.delay(500);
 
-            await driver.clickElement('[data-testid="edit-gas-fee-icon"]');
-            await driver.clickElement(
-              '[data-testid="edit-gas-fee-item-custom"]',
+            await driver.clickElement('[data-testid="eth-overview-send"]');
+            await driver.fill(
+              'input[placeholder="Enter public address (0x) or domain name"]',
+              contractAddress,
             );
 
-            const baseFeeInput = await driver.findElement(
-              '[data-testid="base-fee-input"]',
-            );
-            await baseFeeInput.fill('25');
-            const priorityFeeInput = await driver.findElement(
-              '[data-testid="priority-fee-input"]',
+            const inputAmount = await driver.findElement(
+              'input[placeholder="0"]',
             );
-            await priorityFeeInput.fill('1');
-
-            await driver.clickElement({ text: 'Save', tag: 'button' });
-
-            await driver.waitForSelector({
-              css: '.currency-display-component__text',
-              text: '0.0550741',
-            });
+            await inputAmount.press('1');
 
+            // Continue to next screen
+            await driver.clickElement({ text: 'Continue', tag: 'button' });
             await driver.clickElement({ text: 'Confirm', tag: 'button' });
-            await driver.waitUntilXWindowHandles(2);
-            await driver.switchToWindow(extension);
 
-            // Identify the transaction in the transactions list
-            await driver.waitForSelector(
+            // Go back to home screen to check txn
+            const balance = await driver.findElement(
               '[data-testid="eth-overview__primary-currency"]',
             );
 
+            assert.ok(/^[\d.]+\sETH$/u.test(await balance.getText()));
+
             await driver.clickElement(
               '[data-testid="account-overview__activity-tab"]',
             );
-            await driver.waitForSelector(
-              '.transaction-list__completed-transactions .activity-list-item:nth-of-type(1)',
-            );
-            await driver.waitForSelector({
-              css: '[data-testid="transaction-list-item-primary-currency"]',
-              text: '-0 ETH',
-            });
 
-            // the transaction has the expected gas value
-            await driver.clickElement(
-              '[data-testid="transaction-list-item-primary-currency"]',
+            await driver.findElement(
+              '.transaction-list__completed-transactions .activity-list-item',
             );
 
-            await driver.waitForSelector({
-              xpath: "//div[contains(text(), 'Base fee')]",
-            });
-
-            const allFeeValues = await driver.findElements(
-              '.currency-display-component__text',
+            // The previous findElement already serves as the guard here for the assertElementNotPresent
+            await driver.assertElementNotPresent(
+              '.transaction-status-label--failed',
             );
-
-            /**
-             * Below lines check that fee values are numeric.
-             * Because these values change for every e2e run,
-             * It's better to just check that the values are there and are numeric
-             */
-            assert.equal(allFeeValues.length > 0, true);
-
-            allFeeValues.forEach(async (feeValue) => {
-              assert.equal(/\d+\.?\d*/u.test(await feeValue.getText()), true);
-            });
           },
         );
       });
-    });
 
-    describe('to non-contract address with data that matches ERC20 transfer data signature', function () {
-      it('renders the correct recipient on the confirmation screen', async function () {
+      it('shows no error when cancel transaction when sending via QR code', async function () {
         await withFixtures(
           {
-            fixtures: new FixtureBuilder()
-              .withPreferencesController({
-                featureFlags: {
-                  sendHexData: true,
-                },
-              })
-              .withPreferencesControllerPetnamesDisabled()
-              .build(),
+            fixtures: new FixtureBuilder().build(),
             ganacheOptions: defaultGanacheOptions,
             title: this.test.fullTitle(),
           },
           async ({ driver }) => {
             await unlockWallet(driver);
 
-            await tempToggleSettingRedesignedTransactionConfirmations(driver);
-
             await driver.assertElementNotPresent('.loading-overlay__spinner');
             const balance = await driver.findElement(
               '[data-testid="eth-overview__primary-currency"]',
@@ -451,37 +533,254 @@ describe('Send ETH', function () {
             assert.ok(/^[\d.]+\sETH$/u.test(await balance.getText()));
 
             await openActionMenuAndStartSendFlow(driver);
-
-            await driver.fill(
-              'input[placeholder="Enter public address (0x) or domain name"]',
-              '0xc427D562164062a23a5cFf596A4a3208e72Acd28',
+            // choose to scan via QR code
+            await driver.clickElement('[data-testid="ens-qr-scan-button"]');
+            await driver.findVisibleElement('[data-testid="qr-scanner-modal"]');
+            // cancel action will close the dialog and shut down camera initialization
+            await driver.waitForSelector({
+              css: '.qr-scanner__error',
+              text: "We couldn't access your camera. Please give it another try.",
+            });
+            await driver.clickElement({ text: 'Cancel', tag: 'button' });
+            await driver.assertElementNotPresent(
+              '[data-testid="qr-scanner-modal"]',
             );
+          },
+        );
+      });
 
-            await driver.fill(
-              'textarea[placeholder="Optional',
-              '0xa9059cbb0000000000000000000000002f318C334780961FB129D2a6c30D0763d9a5C970000000000000000000000000000000000000000000000000000000000000000a',
-            );
+      describe('from dapp using advanced gas controls', function () {
+        it('should display the correct gas price on the legacy transaction', async function () {
+          await withFixtures(
+            {
+              dapp: true,
+              fixtures: new FixtureBuilder()
+                .withPermissionControllerConnectedToTestDapp()
+                .build(),
+              ganacheOptions: defaultGanacheOptions,
+              defaultGanacheOptions,
+              title: this.test.fullTitle(),
+            },
+            async ({ driver }) => {
+              await unlockWallet(driver);
+
+              // initiates a send from the dapp
+              await openDapp(driver);
+              await driver.clickElement({ text: 'Send', tag: 'button' });
+              const windowHandles = await driver.waitUntilXWindowHandles(3);
+              const extension = windowHandles[0];
+              await driver.switchToWindowWithTitle(
+                WINDOW_TITLES.Dialog,
+                windowHandles,
+              );
+
+              await driver.clickElement('[data-testid="edit-gas-fee-icon"]');
+              await driver.waitForSelector({
+                text: '0.00021 ETH',
+              });
+              await driver.clickElement({
+                text: 'Edit suggested gas fee',
+                tag: 'button',
+              });
+              await driver.waitForSelector({
+                text: 'Edit priority',
+                tag: 'header',
+              });
+              await editGasFeeForm(driver, '21000', '100');
+              await driver.findElement({
+                css: '[data-testid="first-gas-field"]',
+                text: '0.0021 ETH',
+              });
+
+              await driver.findElement({
+                css: '[data-testid="native-currency"]',
+                text: '$3.57',
+              });
+
+              await driver.clickElement({ text: 'Confirm', tag: 'button' });
+              await driver.waitUntilXWindowHandles(2);
+              await driver.switchToWindow(extension);
+
+              // finds the transaction in the transactions list
+              await driver.clickElement(
+                '[data-testid="account-overview__activity-tab"]',
+              );
+              await driver.waitForSelector(
+                '.transaction-list__completed-transactions .activity-list-item:nth-of-type(1)',
+              );
+              await driver.waitForSelector({
+                css: '[data-testid="transaction-list-item-primary-currency"]',
+                text: '-0 ETH',
+              });
+
+              // the transaction has the expected gas price
+              await driver.clickElement(
+                '[data-testid="transaction-list-item-primary-currency"]',
+              );
+              await driver.waitForSelector({
+                css: '[data-testid="transaction-breakdown__gas-price"]',
+                text: '100',
+              });
+            },
+          );
+        });
+
+        it('should display correct gas values for EIP-1559 transaction', async function () {
+          await withFixtures(
+            {
+              dapp: true,
+              fixtures: new FixtureBuilder()
+                .withPermissionControllerConnectedToTestDapp()
+                .build(),
+              ganacheOptions: {
+                ...defaultGanacheOptions,
+                hardfork: 'london',
+              },
+              title: this.test.fullTitle(),
+            },
+            async ({ driver }) => {
+              await unlockWallet(driver);
+
+              // initiates a transaction from the dapp
+              await openDapp(driver);
+              await driver.clickElement({
+                text: 'Create Token',
+                tag: 'button',
+              });
+              const windowHandles = await driver.waitUntilXWindowHandles(3);
+
+              const extension = windowHandles[0];
+              await driver.switchToWindowWithTitle(
+                WINDOW_TITLES.Dialog,
+                windowHandles,
+              );
+
+              await driver.clickElement('[data-testid="edit-gas-fee-icon"]');
+              await driver.clickElement(
+                '[data-testid="edit-gas-fee-item-custom"]',
+              );
+
+              const baseFeeInput = await driver.findElement(
+                '[data-testid="base-fee-input"]',
+              );
+              await baseFeeInput.fill('25');
+              const priorityFeeInput = await driver.findElement(
+                '[data-testid="priority-fee-input"]',
+              );
+              await priorityFeeInput.fill('1');
+
+              await driver.clickElement({ text: 'Save', tag: 'button' });
+
+              await driver.findElement({
+                css: '[data-testid="first-gas-field"]',
+                text: '0.045 ETH',
+              });
+
+              await driver.findElement({
+                css: '[data-testid="native-currency"]',
+                text: '$76.57',
+              });
+
+              await driver.clickElement({ text: 'Confirm', tag: 'button' });
+              await driver.waitUntilXWindowHandles(2);
+              await driver.switchToWindow(extension);
+
+              // Identify the transaction in the transactions list
+              await driver.waitForSelector(
+                '[data-testid="eth-overview__primary-currency"]',
+              );
+
+              await driver.clickElement(
+                '[data-testid="account-overview__activity-tab"]',
+              );
+              await driver.waitForSelector(
+                '.transaction-list__completed-transactions .activity-list-item:nth-of-type(1)',
+              );
+              await driver.waitForSelector({
+                css: '[data-testid="transaction-list-item-primary-currency"]',
+                text: '-0 ETH',
+              });
+
+              // the transaction has the expected gas value
+              await driver.clickElement(
+                '[data-testid="transaction-list-item-primary-currency"]',
+              );
+
+              await driver.waitForSelector({
+                xpath: "//div[contains(text(), 'Base fee')]",
+              });
+
+              const allFeeValues = await driver.findElements(
+                '.currency-display-component__text',
+              );
+
+              /**
+               * Below lines check that fee values are numeric.
+               * Because these values change for every e2e run,
+               * It's better to just check that the values are there and are numeric
+               */
+              assert.equal(allFeeValues.length > 0, true);
+
+              allFeeValues.forEach(async (feeValue) => {
+                assert.equal(/\d+\.?\d*/u.test(await feeValue.getText()), true);
+              });
+            },
+          );
+        });
+      });
 
-            await driver.findClickableElement({
-              text: 'Continue',
-              tag: 'button',
-            });
-            await driver.clickElement({ text: 'Continue', tag: 'button' });
+      describe('to non-contract address with data that matches ERC20 transfer data signature', function () {
+        it('renders the correct recipient on the confirmation screen', async function () {
+          await withFixtures(
+            {
+              fixtures: new FixtureBuilder()
+                .withPreferencesController({
+                  featureFlags: {
+                    sendHexData: true,
+                  },
+                })
+                .withPreferencesControllerPetnamesDisabled()
+                .build(),
+              ganacheOptions: defaultGanacheOptions,
+              title: this.test.fullTitle(),
+            },
+            async ({ driver }) => {
+              await unlockWallet(driver);
 
-            await driver.findClickableElement(
-              '[data-testid="sender-to-recipient__name"]',
-            );
-            await driver.clickElement(
-              '[data-testid="sender-to-recipient__name"]',
-            );
+              await driver.assertElementNotPresent('.loading-overlay__spinner');
+              const balance = await driver.findElement(
+                '[data-testid="eth-overview__primary-currency"]',
+              );
+              assert.ok(/^[\d.]+\sETH$/u.test(await balance.getText()));
 
-            const recipientAddress = await driver.findElements({
-              text: '0xc427D562164062a23a5cFf596A4a3208e72Acd28',
-            });
+              await openActionMenuAndStartSendFlow(driver);
 
-            assert.equal(recipientAddress.length, 1);
-          },
-        );
+              await driver.fill(
+                'input[placeholder="Enter public address (0x) or domain name"]',
+                '0xc427D562164062a23a5cFf596A4a3208e72Acd28',
+              );
+
+              await driver.fill(
+                'textarea[placeholder="Optional',
+                '0xa9059cbb0000000000000000000000002f318C334780961FB129D2a6c30D0763d9a5C970000000000000000000000000000000000000000000000000000000000000000a',
+              );
+
+              await driver.findClickableElement({
+                text: 'Continue',
+                tag: 'button',
+              });
+              await driver.clickElement({ text: 'Continue', tag: 'button' });
+
+              await driver.clickElement('[data-testid="recipient-address"]');
+
+              const recipientAddress = await driver.findElements({
+                text: '0xc427D562164062a23a5cFf596A4a3208e72Acd28',
+              });
+
+              assert.equal(recipientAddress.length, 1);
+            },
+          );
+        });
       });
     });
   });
diff --git a/test/e2e/tests/transaction/send-hex-address.spec.js b/test/e2e/tests/transaction/send-hex-address.spec.js
index b6ad969c6735..64522c706f6b 100644
--- a/test/e2e/tests/transaction/send-hex-address.spec.js
+++ b/test/e2e/tests/transaction/send-hex-address.spec.js
@@ -11,228 +11,377 @@ const FixtureBuilder = require('../../fixture-builder');
 const hexPrefixedAddress = '0x2f318C334780961FB129D2a6c30D0763d9a5C970';
 const nonHexPrefixedAddress = hexPrefixedAddress.substring(2);
 
-describe('Send ETH to a 40 character hexadecimal address', function () {
-  it('should ensure the address is prefixed with 0x when pasted and should send ETH to a valid hexadecimal address', async function () {
-    await withFixtures(
-      {
-        fixtures: new FixtureBuilder()
-          .withPreferencesControllerPetnamesDisabled()
-          .build(),
-        ganacheOptions: defaultGanacheOptions,
-        title: this.test.fullTitle(),
-      },
-      async ({ driver, ganacheServer }) => {
-        await logInWithBalanceValidation(driver, ganacheServer);
-
-        // Send ETH
-        await openActionMenuAndStartSendFlow(driver);
-        // Paste address without hex prefix
-        await driver.pasteIntoField(
-          'input[placeholder="Enter public address (0x) or domain name"]',
-          nonHexPrefixedAddress,
-        );
-        await driver.findElement({
-          css: '.ens-input__selected-input__title',
-          text: '0x2f318...5C970',
-        });
-        await driver.clickElement({ text: 'Continue', tag: 'button' });
-
-        // Confirm transaction
-        await driver.clickElement({ text: 'Confirm', tag: 'button' });
-        await driver.clickElement(
-          '[data-testid="account-overview__activity-tab"]',
-        );
-        const sendTransactionListItem = await driver.findElement(
-          '.transaction-list__completed-transactions .activity-list-item',
-        );
-        await sendTransactionListItem.click();
-        await driver.clickElement({ text: 'Activity log', tag: 'summary' });
-        await driver.clickElement('[data-testid="sender-to-recipient__name"]');
-
-        // Verify address in activity log
-        await driver.findElement({
-          css: '.nickname-popover__public-address',
-          text: hexPrefixedAddress,
-        });
-      },
-    );
-  });
-  it('should ensure the address is prefixed with 0x when typed and should send ETH to a valid hexadecimal address', async function () {
-    await withFixtures(
-      {
-        fixtures: new FixtureBuilder()
-          .withPreferencesControllerPetnamesDisabled()
-          .build(),
-        ganacheOptions: defaultGanacheOptions,
-        title: this.test.fullTitle(),
-      },
-      async ({ driver, ganacheServer }) => {
-        await logInWithBalanceValidation(driver, ganacheServer);
-
-        // Send ETH
-        await openActionMenuAndStartSendFlow(driver);
-        // Type address without hex prefix
-        await driver.fill(
-          'input[placeholder="Enter public address (0x) or domain name"]',
-          nonHexPrefixedAddress,
-        );
-        await driver.findElement({
-          css: '.ens-input__selected-input__title',
-          text: '0x2f318...5C970',
-        });
-        await driver.clickElement({ text: 'Continue', tag: 'button' });
-
-        // Confirm transaction
-        await driver.clickElement({ text: 'Confirm', tag: 'button' });
-        await driver.clickElement(
-          '[data-testid="account-overview__activity-tab"]',
-        );
-        await driver.clickElement(
-          '.transaction-list__completed-transactions .activity-list-item',
-        );
-        await driver.clickElement({ text: 'Activity log', tag: 'summary' });
-        await driver.clickElement('[data-testid="sender-to-recipient__name"]');
-
-        // Verify address in activity log
-        await driver.findElement({
-          css: '.nickname-popover__public-address',
-          text: hexPrefixedAddress,
-        });
-      },
-    );
+describe('Old confirmation screens', function () {
+  describe('Send ERC20 to a 40 character hexadecimal address', function () {
+    const smartContract = SMART_CONTRACTS.HST;
+
+    it('should ensure the address is prefixed with 0x when pasted and should send TST to a valid hexadecimal address', async function () {
+      await withFixtures(
+        {
+          dapp: true,
+          fixtures: new FixtureBuilder()
+            .withPreferencesControllerPetnamesDisabled()
+            .withTokensControllerERC20()
+            .build(),
+          ganacheOptions: defaultGanacheOptions,
+          smartContract,
+          title: this.test.fullTitle(),
+        },
+        async ({ driver, ganacheServer }) => {
+          await logInWithBalanceValidation(driver, ganacheServer);
+
+          await tempToggleSettingRedesignedTransactionConfirmations(driver);
+
+          // Send TST
+          await driver.clickElement(
+            '[data-testid="account-overview__asset-tab"]',
+          );
+          await driver.clickElement(
+            '[data-testid="multichain-token-list-button"]',
+          );
+          await driver.clickElement('[data-testid="coin-overview-send"]');
+          // Paste address without hex prefix
+          await driver.pasteIntoField(
+            'input[placeholder="Enter public address (0x) or domain name"]',
+            nonHexPrefixedAddress,
+          );
+          await driver.findElement({
+            css: '.ens-input__selected-input__title',
+            text: '0x2f318...5C970',
+          });
+
+          await driver.clickElement({ text: 'Continue', tag: 'button' });
+
+          // Confirm transaction
+          await driver.findElement({
+            css: '.confirm-page-container-summary__title',
+            text: '0',
+          });
+          await driver.clickElement({ text: 'Confirm', tag: 'button' });
+          await driver.clickElement(
+            '[data-testid="account-overview__activity-tab"]',
+          );
+          await driver.findElement(
+            '.transaction-list__completed-transactions .activity-list-item:nth-of-type(1)',
+          );
+          const sendTransactionListItem = await driver.findElement(
+            '.transaction-list__completed-transactions .activity-list-item:nth-of-type(1)',
+          );
+          await sendTransactionListItem.click();
+          await driver.clickElement({ text: 'Activity log', tag: 'summary' });
+          await driver.clickElement(
+            '[data-testid="sender-to-recipient__name"]',
+          );
+
+          // Verify address in activity log
+          await driver.findElement({
+            css: '.nickname-popover__public-address',
+            text: hexPrefixedAddress,
+          });
+        },
+      );
+    });
+
+    it('should ensure the address is prefixed with 0x when typed and should send TST to a valid hexadecimal address', async function () {
+      await withFixtures(
+        {
+          dapp: true,
+          fixtures: new FixtureBuilder()
+            .withPreferencesControllerPetnamesDisabled()
+            .withTokensControllerERC20()
+            .build(),
+          ganacheOptions: defaultGanacheOptions,
+          smartContract,
+          title: this.test.fullTitle(),
+        },
+        async ({ driver, ganacheServer }) => {
+          await logInWithBalanceValidation(driver, ganacheServer);
+
+          await tempToggleSettingRedesignedTransactionConfirmations(driver);
+
+          // Send TST
+          await driver.clickElement(
+            '[data-testid="account-overview__asset-tab"]',
+          );
+          await driver.clickElement(
+            '[data-testid="multichain-token-list-button"]',
+          );
+          await driver.clickElement('[data-testid="coin-overview-send"]');
+
+          // Type address without hex prefix
+          await driver.fill(
+            'input[placeholder="Enter public address (0x) or domain name"]',
+            nonHexPrefixedAddress,
+          );
+          await driver.findElement({
+            css: '.ens-input__selected-input__title',
+            text: '0x2f318...5C970',
+          });
+
+          await driver.clickElement({ text: 'Continue', tag: 'button' });
+
+          // Confirm transaction
+          await driver.findElement({
+            css: '.confirm-page-container-summary__title',
+            text: '0',
+          });
+          await driver.clickElement({ text: 'Confirm', tag: 'button' });
+          await driver.clickElement(
+            '[data-testid="account-overview__activity-tab"]',
+          );
+          await driver.findElement(
+            '.transaction-list__completed-transactions .activity-list-item:nth-of-type(1)',
+          );
+          const sendTransactionListItem = await driver.findElement(
+            '.transaction-list__completed-transactions .activity-list-item:nth-of-type(1)',
+          );
+          await sendTransactionListItem.click();
+          await driver.clickElement({ text: 'Activity log', tag: 'summary' });
+          await driver.clickElement(
+            '[data-testid="sender-to-recipient__name"]',
+          );
+
+          // Verify address in activity log
+          await driver.findElement({
+            css: '.nickname-popover__public-address',
+            text: hexPrefixedAddress,
+          });
+        },
+      );
+    });
   });
 });
 
-describe('Send ERC20 to a 40 character hexadecimal address', function () {
-  const smartContract = SMART_CONTRACTS.HST;
-
-  it('should ensure the address is prefixed with 0x when pasted and should send TST to a valid hexadecimal address', async function () {
-    await withFixtures(
-      {
-        dapp: true,
-        fixtures: new FixtureBuilder()
-          .withPreferencesControllerPetnamesDisabled()
-          .withTokensControllerERC20()
-          .build(),
-        ganacheOptions: defaultGanacheOptions,
-        smartContract,
-        title: this.test.fullTitle(),
-      },
-      async ({ driver, ganacheServer }) => {
-        await logInWithBalanceValidation(driver, ganacheServer);
-
-        await tempToggleSettingRedesignedTransactionConfirmations(driver);
-
-        // Send TST
-        await driver.clickElement(
-          '[data-testid="account-overview__asset-tab"]',
-        );
-        await driver.clickElement(
-          '[data-testid="multichain-token-list-button"]',
-        );
-        await driver.clickElement('[data-testid="coin-overview-send"]');
-        // Paste address without hex prefix
-        await driver.pasteIntoField(
-          'input[placeholder="Enter public address (0x) or domain name"]',
-          nonHexPrefixedAddress,
-        );
-        await driver.findElement({
-          css: '.ens-input__selected-input__title',
-          text: '0x2f318...5C970',
-        });
-
-        await driver.clickElement({ text: 'Continue', tag: 'button' });
-
-        // Confirm transaction
-        await driver.findElement({
-          css: '.confirm-page-container-summary__title',
-          text: '0',
-        });
-        await driver.clickElement({ text: 'Confirm', tag: 'button' });
-        await driver.clickElement(
-          '[data-testid="account-overview__activity-tab"]',
-        );
-        await driver.findElement(
-          '.transaction-list__completed-transactions .activity-list-item:nth-of-type(1)',
-        );
-        const sendTransactionListItem = await driver.findElement(
-          '.transaction-list__completed-transactions .activity-list-item:nth-of-type(1)',
-        );
-        await sendTransactionListItem.click();
-        await driver.clickElement({ text: 'Activity log', tag: 'summary' });
-        await driver.clickElement('[data-testid="sender-to-recipient__name"]');
-
-        // Verify address in activity log
-        await driver.findElement({
-          css: '.nickname-popover__public-address',
-          text: hexPrefixedAddress,
-        });
-      },
-    );
+describe('Redesigned confirmation screens', function () {
+  describe('Send ETH to a 40 character hexadecimal address', function () {
+    it('should ensure the address is prefixed with 0x when pasted and should send ETH to a valid hexadecimal address', async function () {
+      await withFixtures(
+        {
+          fixtures: new FixtureBuilder()
+            .withPreferencesControllerPetnamesDisabled()
+            .build(),
+          ganacheOptions: defaultGanacheOptions,
+          title: this.test.fullTitle(),
+        },
+        async ({ driver, ganacheServer }) => {
+          await logInWithBalanceValidation(driver, ganacheServer);
+
+          // Send ETH
+          await openActionMenuAndStartSendFlow(driver);
+          // Paste address without hex prefix
+          await driver.pasteIntoField(
+            'input[placeholder="Enter public address (0x) or domain name"]',
+            nonHexPrefixedAddress,
+          );
+          await driver.findElement({
+            css: '.ens-input__selected-input__title',
+            text: '0x2f318...5C970',
+          });
+          await driver.clickElement({ text: 'Continue', tag: 'button' });
+
+          // Confirm transaction
+          await driver.clickElement({ text: 'Confirm', tag: 'button' });
+          await driver.clickElement(
+            '[data-testid="account-overview__activity-tab"]',
+          );
+          const sendTransactionListItem = await driver.findElement(
+            '.transaction-list__completed-transactions .activity-list-item',
+          );
+          await sendTransactionListItem.click();
+          await driver.clickElement({ text: 'Activity log', tag: 'summary' });
+          await driver.clickElement(
+            '[data-testid="sender-to-recipient__name"]',
+          );
+
+          // Verify address in activity log
+          await driver.findElement({
+            css: '.nickname-popover__public-address',
+            text: hexPrefixedAddress,
+          });
+        },
+      );
+    });
+
+    it('should ensure the address is prefixed with 0x when typed and should send ETH to a valid hexadecimal address', async function () {
+      await withFixtures(
+        {
+          fixtures: new FixtureBuilder()
+            .withPreferencesControllerPetnamesDisabled()
+            .build(),
+          ganacheOptions: defaultGanacheOptions,
+          title: this.test.fullTitle(),
+        },
+        async ({ driver, ganacheServer }) => {
+          await logInWithBalanceValidation(driver, ganacheServer);
+
+          // Send ETH
+          await openActionMenuAndStartSendFlow(driver);
+          // Type address without hex prefix
+          await driver.fill(
+            'input[placeholder="Enter public address (0x) or domain name"]',
+            nonHexPrefixedAddress,
+          );
+          await driver.findElement({
+            css: '.ens-input__selected-input__title',
+            text: '0x2f318...5C970',
+          });
+          await driver.clickElement({ text: 'Continue', tag: 'button' });
+
+          // Confirm transaction
+          await driver.clickElement({ text: 'Confirm', tag: 'button' });
+          await driver.clickElement(
+            '[data-testid="account-overview__activity-tab"]',
+          );
+          await driver.clickElement(
+            '.transaction-list__completed-transactions .activity-list-item',
+          );
+          await driver.clickElement({ text: 'Activity log', tag: 'summary' });
+          await driver.clickElement(
+            '[data-testid="sender-to-recipient__name"]',
+          );
+
+          // Verify address in activity log
+          await driver.findElement({
+            css: '.nickname-popover__public-address',
+            text: hexPrefixedAddress,
+          });
+        },
+      );
+    });
   });
-  it('should ensure the address is prefixed with 0x when typed and should send TST to a valid hexadecimal address', async function () {
-    await withFixtures(
-      {
-        dapp: true,
-        fixtures: new FixtureBuilder()
-          .withPreferencesControllerPetnamesDisabled()
-          .withTokensControllerERC20()
-          .build(),
-        ganacheOptions: defaultGanacheOptions,
-        smartContract,
-        title: this.test.fullTitle(),
-      },
-      async ({ driver, ganacheServer }) => {
-        await logInWithBalanceValidation(driver, ganacheServer);
-
-        await tempToggleSettingRedesignedTransactionConfirmations(driver);
-
-        // Send TST
-        await driver.clickElement(
-          '[data-testid="account-overview__asset-tab"]',
-        );
-        await driver.clickElement(
-          '[data-testid="multichain-token-list-button"]',
-        );
-        await driver.clickElement('[data-testid="coin-overview-send"]');
-
-        // Type address without hex prefix
-        await driver.fill(
-          'input[placeholder="Enter public address (0x) or domain name"]',
-          nonHexPrefixedAddress,
-        );
-        await driver.findElement({
-          css: '.ens-input__selected-input__title',
-          text: '0x2f318...5C970',
-        });
-
-        await driver.clickElement({ text: 'Continue', tag: 'button' });
-
-        // Confirm transaction
-        await driver.findElement({
-          css: '.confirm-page-container-summary__title',
-          text: '0',
-        });
-        await driver.clickElement({ text: 'Confirm', tag: 'button' });
-        await driver.clickElement(
-          '[data-testid="account-overview__activity-tab"]',
-        );
-        await driver.findElement(
-          '.transaction-list__completed-transactions .activity-list-item:nth-of-type(1)',
-        );
-        const sendTransactionListItem = await driver.findElement(
-          '.transaction-list__completed-transactions .activity-list-item:nth-of-type(1)',
-        );
-        await sendTransactionListItem.click();
-        await driver.clickElement({ text: 'Activity log', tag: 'summary' });
-        await driver.clickElement('[data-testid="sender-to-recipient__name"]');
-
-        // Verify address in activity log
-        await driver.findElement({
-          css: '.nickname-popover__public-address',
-          text: hexPrefixedAddress,
-        });
-      },
-    );
+
+  describe('Send ERC20 to a 40 character hexadecimal address', function () {
+    const smartContract = SMART_CONTRACTS.HST;
+
+    it('should ensure the address is prefixed with 0x when pasted and should send TST to a valid hexadecimal address', async function () {
+      await withFixtures(
+        {
+          dapp: true,
+          fixtures: new FixtureBuilder()
+            .withPreferencesControllerPetnamesDisabled()
+            .withTokensControllerERC20()
+            .build(),
+          ganacheOptions: defaultGanacheOptions,
+          smartContract,
+          title: this.test.fullTitle(),
+        },
+        async ({ driver, ganacheServer }) => {
+          await logInWithBalanceValidation(driver, ganacheServer);
+
+          // Send TST
+          await driver.clickElement(
+            '[data-testid="account-overview__asset-tab"]',
+          );
+          await driver.clickElement(
+            '[data-testid="multichain-token-list-button"]',
+          );
+          await driver.clickElement('[data-testid="coin-overview-send"]');
+          // Paste address without hex prefix
+          await driver.pasteIntoField(
+            'input[placeholder="Enter public address (0x) or domain name"]',
+            nonHexPrefixedAddress,
+          );
+          await driver.findElement({
+            css: '.ens-input__selected-input__title',
+            text: '0x2f318...5C970',
+          });
+
+          await driver.clickElement({ text: 'Continue', tag: 'button' });
+
+          // Confirm transaction
+          await driver.findElement({
+            css: 'h2',
+            text: '0 ETH',
+          });
+          await driver.clickElement({ text: 'Confirm', tag: 'button' });
+          await driver.clickElement(
+            '[data-testid="account-overview__activity-tab"]',
+          );
+          await driver.findElement(
+            '.transaction-list__completed-transactions .activity-list-item:nth-of-type(1)',
+          );
+          const sendTransactionListItem = await driver.findElement(
+            '.transaction-list__completed-transactions .activity-list-item:nth-of-type(1)',
+          );
+          await sendTransactionListItem.click();
+          await driver.clickElement({ text: 'Activity log', tag: 'summary' });
+          await driver.clickElement(
+            '[data-testid="sender-to-recipient__name"]',
+          );
+
+          // Verify address in activity log
+          await driver.findElement({
+            css: '.nickname-popover__public-address',
+            text: hexPrefixedAddress,
+          });
+        },
+      );
+    });
+
+    it('should ensure the address is prefixed with 0x when typed and should send TST to a valid hexadecimal address', async function () {
+      await withFixtures(
+        {
+          dapp: true,
+          fixtures: new FixtureBuilder()
+            .withPreferencesControllerPetnamesDisabled()
+            .withTokensControllerERC20()
+            .build(),
+          ganacheOptions: defaultGanacheOptions,
+          smartContract,
+          title: this.test.fullTitle(),
+        },
+        async ({ driver, ganacheServer }) => {
+          await logInWithBalanceValidation(driver, ganacheServer);
+
+          // Send TST
+          await driver.clickElement(
+            '[data-testid="account-overview__asset-tab"]',
+          );
+          await driver.clickElement(
+            '[data-testid="multichain-token-list-button"]',
+          );
+          await driver.clickElement('[data-testid="coin-overview-send"]');
+
+          // Type address without hex prefix
+          await driver.fill(
+            'input[placeholder="Enter public address (0x) or domain name"]',
+            nonHexPrefixedAddress,
+          );
+          await driver.findElement({
+            css: '.ens-input__selected-input__title',
+            text: '0x2f318...5C970',
+          });
+
+          await driver.clickElement({ text: 'Continue', tag: 'button' });
+
+          // Confirm transaction
+          await driver.findElement({
+            css: 'h2',
+            text: '0 ETH',
+          });
+          await driver.clickElement({ text: 'Confirm', tag: 'button' });
+          await driver.clickElement(
+            '[data-testid="account-overview__activity-tab"]',
+          );
+          await driver.findElement(
+            '.transaction-list__completed-transactions .activity-list-item:nth-of-type(1)',
+          );
+          const sendTransactionListItem = await driver.findElement(
+            '.transaction-list__completed-transactions .activity-list-item:nth-of-type(1)',
+          );
+          await sendTransactionListItem.click();
+          await driver.clickElement({ text: 'Activity log', tag: 'summary' });
+          await driver.clickElement(
+            '[data-testid="sender-to-recipient__name"]',
+          );
+
+          // Verify address in activity log
+          await driver.findElement({
+            css: '.nickname-popover__public-address',
+            text: hexPrefixedAddress,
+          });
+        },
+      );
+    });
   });
 });
diff --git a/ui/pages/confirmations/components/confirm/info/hooks/use-token-values.ts b/ui/pages/confirmations/components/confirm/info/hooks/use-token-values.ts
index a8dc62e5719c..53987ffd06e6 100644
--- a/ui/pages/confirmations/components/confirm/info/hooks/use-token-values.ts
+++ b/ui/pages/confirmations/components/confirm/info/hooks/use-token-values.ts
@@ -61,7 +61,6 @@ export const useTokenValues = (transactionMeta: TransactionMeta) => {
         ).toFixed(),
         isDecodedTransferValuePending: false,
       };
-      // };
     }, [value, decimals]);
 
   const [exchangeRate, setExchangeRate] = useState<Numeric | undefined>();
diff --git a/ui/pages/confirmations/components/confirm/info/token-transfer/__snapshots__/transaction-flow-section.test.tsx.snap b/ui/pages/confirmations/components/confirm/info/token-transfer/__snapshots__/transaction-flow-section.test.tsx.snap
index b42f23b15d4b..89750227da0f 100644
--- a/ui/pages/confirmations/components/confirm/info/token-transfer/__snapshots__/transaction-flow-section.test.tsx.snap
+++ b/ui/pages/confirmations/components/confirm/info/token-transfer/__snapshots__/transaction-flow-section.test.tsx.snap
@@ -28,6 +28,7 @@ exports[`<TransactionFlowSection /> renders correctly 1`] = `
         </div>
         <div
           class="mm-box mm-box--margin-top-1"
+          data-testid="sender-address"
         >
           <div
             class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center"
@@ -112,6 +113,7 @@ exports[`<TransactionFlowSection /> renders correctly 1`] = `
         </div>
         <div
           class="mm-box mm-box--margin-top-1"
+          data-testid="recipient-address"
         >
           <div
             class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center"
diff --git a/ui/pages/confirmations/components/confirm/info/token-transfer/transaction-flow-section.tsx b/ui/pages/confirmations/components/confirm/info/token-transfer/transaction-flow-section.tsx
index bfa299436cc4..b874999d3956 100644
--- a/ui/pages/confirmations/components/confirm/info/token-transfer/transaction-flow-section.tsx
+++ b/ui/pages/confirmations/components/confirm/info/token-transfer/transaction-flow-section.tsx
@@ -62,7 +62,7 @@ export const TransactionFlowSection = () => {
             flexDirection: FlexDirection.Column,
           }}
         >
-          <Box marginTop={1}>
+          <Box marginTop={1} data-testid="sender-address">
             <ConfirmInfoRowAddress
               address={transactionMeta.txParams.from}
               chainId={chainId}
@@ -84,7 +84,7 @@ export const TransactionFlowSection = () => {
               flexDirection: FlexDirection.Column,
             }}
           >
-            <Box marginTop={1}>
+            <Box marginTop={1} data-testid="recipient-address">
               <ConfirmInfoRowAddress
                 address={recipientAddress}
                 chainId={chainId}
diff --git a/ui/pages/confirmations/components/confirm/nav/__snapshots__/nav.test.tsx.snap b/ui/pages/confirmations/components/confirm/nav/__snapshots__/nav.test.tsx.snap
index 7ecf37df9d88..7f01578bf041 100644
--- a/ui/pages/confirmations/components/confirm/nav/__snapshots__/nav.test.tsx.snap
+++ b/ui/pages/confirmations/components/confirm/nav/__snapshots__/nav.test.tsx.snap
@@ -22,6 +22,7 @@ exports[`ConfirmNav should match snapshot 1`] = `
       </button>
       <p
         class="mm-box mm-text mm-text--body-sm mm-box--margin-inline-2 mm-box--color-text-alternative"
+        data-testid="confirm-page-nav-position"
       >
         1
          of 
diff --git a/ui/pages/confirmations/components/confirm/nav/nav.tsx b/ui/pages/confirmations/components/confirm/nav/nav.tsx
index 4a58e1c364dd..2d962fb5b6ab 100644
--- a/ui/pages/confirmations/components/confirm/nav/nav.tsx
+++ b/ui/pages/confirmations/components/confirm/nav/nav.tsx
@@ -120,6 +120,7 @@ const Nav = () => {
           color={TextColor.textAlternative}
           marginInline={2}
           variant={TextVariant.bodySm}
+          data-testid="confirm-page-nav-position"
         >
           {currentConfirmationPosition + 1} of {pendingConfirmations.length}
         </Text>

From 1db72cab8b2929672cc62d0b5387835244002e8d Mon Sep 17 00:00:00 2001
From: George Weiler <georgejweiler@gmail.com>
Date: Thu, 5 Dec 2024 08:07:43 -0700
Subject: [PATCH 039/175] fix: sanitizes the token marketplace URL (#28898)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## **Description**

Fixes #28865 . The token marketplace URL included a double slash `//`.
This PR sanitizes the URL so the buy page on portfolio can be correctly
linked.

[![Open in GitHub
Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/28898?quickstart=1)

## **Related issues**
https://github.com/MetaMask/metamask-extension/issues/28865

Fixes:

## **Manual testing steps**

1. Click "Buy & Sell"
2. Verify that https://portfolio.metamask.io/buy is opened

## **Screenshots/Recordings**

<!-- If applicable, add screenshots and/or recordings to visualize the
before and after of your change. -->

### **Before**

<!-- [screenshots/recordings] -->

### **After**

<!-- [screenshots/recordings] -->

## **Pre-merge author checklist**

- [x] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension Coding
Standards](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/CODING_GUIDELINES.md).
- [x] I've completed the PR template to the best of my ability
- [x] I’ve included tests if applicable
- [x] I’ve documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [x] I’ve applied the right labels on the PR (see [labeling
guidelines](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.

## **Pre-merge reviewer checklist**

- [x] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed).
- [x] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.

---------

Co-authored-by: Dan J Miller <danjm.com@gmail.com>
---
 ui/hooks/ramps/useRamps/useRamps.test.tsx | 14 +++++++++++
 ui/hooks/ramps/useRamps/useRamps.ts       | 30 ++++++++++++++---------
 2 files changed, 32 insertions(+), 12 deletions(-)

diff --git a/ui/hooks/ramps/useRamps/useRamps.test.tsx b/ui/hooks/ramps/useRamps/useRamps.test.tsx
index 0b0b8124666b..a1c4101bcbcd 100644
--- a/ui/hooks/ramps/useRamps/useRamps.test.tsx
+++ b/ui/hooks/ramps/useRamps/useRamps.test.tsx
@@ -103,4 +103,18 @@ describe('useRamps', () => {
       });
     },
   );
+  it('should return the default URL when an invalid URL is provided', () => {
+    jest.resetModules();
+
+    const originalPortfolioUrl = process.env.PORTFOLIO_URL;
+    process.env = { PORTFOLIO_URL: 'invalid-url' };
+
+    const { result } = renderHook(() => useRamps(), { wrapper });
+
+    const buyURI = result.current.getBuyURI('0x1');
+    expect(buyURI).toBe('https://portfolio.metamask.io/buy');
+
+    process.env.PORTFOLIO_URL = originalPortfolioUrl;
+    jest.resetModules();
+  });
 });
diff --git a/ui/hooks/ramps/useRamps/useRamps.ts b/ui/hooks/ramps/useRamps/useRamps.ts
index 3dd230eaf6ea..b4c457809be6 100644
--- a/ui/hooks/ramps/useRamps/useRamps.ts
+++ b/ui/hooks/ramps/useRamps/useRamps.ts
@@ -22,7 +22,6 @@ export enum RampsMetaMaskEntry {
   BtcBanner = 'ext_buy_banner_btc',
 }
 
-const portfolioUrl = process.env.PORTFOLIO_URL;
 const useRamps = (
   metamaskEntry: RampsMetaMaskEntry = RampsMetaMaskEntry.BuySellButton,
 ): IUseRamps => {
@@ -33,18 +32,25 @@ const useRamps = (
 
   const getBuyURI = useCallback(
     (_chainId: Hex | CaipChainId) => {
-      const params = new URLSearchParams();
-      params.set('metamaskEntry', metamaskEntry);
-      params.set('chainId', _chainId);
-      if (metaMetricsId) {
-        params.set('metametricsId', metaMetricsId);
-      }
-      params.set('metricsEnabled', String(isMetaMetricsEnabled));
-      if (isMarketingEnabled) {
-        params.set('marketingEnabled', String(isMarketingEnabled));
-      }
+      try {
+        const params = new URLSearchParams();
+        params.set('metamaskEntry', metamaskEntry);
+        params.set('chainId', _chainId);
+        if (metaMetricsId) {
+          params.set('metametricsId', metaMetricsId);
+        }
+        params.set('metricsEnabled', String(isMetaMetricsEnabled));
+        if (isMarketingEnabled) {
+          params.set('marketingEnabled', String(isMarketingEnabled));
+        }
 
-      return `${portfolioUrl}/buy?${params.toString()}`;
+        const url = new URL(process.env.PORTFOLIO_URL || '');
+        url.pathname = 'buy';
+        url.search = params.toString();
+        return url.toString();
+      } catch {
+        return 'https://portfolio.metamask.io/buy';
+      }
     },
     [metaMetricsId],
   );

From 47c89ecbcc1fb1966515b48ac76cefa94cd29a9f Mon Sep 17 00:00:00 2001
From: Mark Stacey <markjstacey@gmail.com>
Date: Thu, 5 Dec 2024 12:24:43 -0330
Subject: [PATCH 040/175] chore: Update CODEOWNERS to remove ownership from
 most (#28941)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## **Description**

The CODEOWNERS file has been updated to remove ownership from most
files, to give us more time to plan which files the platform should own,
and to give teams more time to consolidate their features.

Also, ownership of the CODEOWNERS file itself was moved to the extension
security team (it was accidentally set to privacy reviewers).

[![Open in GitHub
Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/28941?quickstart=1)

## **Related issues**

This is an adjustment to recent changes made in #28851

## **Manual testing steps**

N/A

## **Screenshots/Recordings**

N/A

## **Pre-merge author checklist**

- [x] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension Coding
Standards](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/CODING_GUIDELINES.md).
- [x] I've completed the PR template to the best of my ability
- [x] I’ve included tests if applicable
- [x] I’ve documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [x] I’ve applied the right labels on the PR (see [labeling
guidelines](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.

## **Pre-merge reviewer checklist**

- [ ] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed).
- [ ] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.
---
 .github/CODEOWNERS | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 48ad55708f52..334f177db259 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1,4 +1,6 @@
 # Lines starting with '#' are comments.
+
+# GUIDELINES:
 # Each line is a file pattern followed by one or more owners.
 # Owners bear a responsibility to the organization and the users of this
 # application. Repository administrators have the ability to merge pull
@@ -7,9 +9,11 @@
 # follows all policies or without full understanding of the impact of
 # those changes on build, release and publishing outcomes.
 
-*                                    @MetaMask/extension-platform
-development/                         @MetaMask/extension-platform
-lavamoat/                            @MetaMask/extension-platform @MetaMask/supply-chain
+# LavaMoat policy changes can highlight security risks. Teams are encouraged to
+# audit these changes on their own, and leave their analysis in a comment.
+# These codeowners will review this analysis, and review the policy changes in
+# further detail if warranted.
+lavamoat/                            @MetaMask/extension-devs @MetaMask/supply-chain
 
 # The offscreen.ts script file that is included in the offscreen document html
 # file is responsible, at present, for loading the snaps execution environment
@@ -45,7 +49,7 @@ privacy-snapshot.json                @MetaMask/extension-privacy-reviewers
 # of contributors. Modifications to this file result in a modification of
 # that agreement and can only be approved by those with the knowledge
 # and responsibility to publish libraries under the MetaMask name.
-.github/CODEOWNERS                   @MetaMask/extension-privacy-reviewers
+.github/CODEOWNERS                   @MetaMask/extension-security-team
 
 # For now, restricting approvals inside the .devcontainer folder to devs
 # who were involved with the Codespaces project.

From 58f727fac012417156a5efb6840379609a20d037 Mon Sep 17 00:00:00 2001
From: infiniteflower <139582705+infiniteflower@users.noreply.github.com>
Date: Thu, 5 Dec 2024 11:28:54 -0500
Subject: [PATCH 041/175] feat: cross chain swap STX (#28460)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<!--
Please submit this PR as a draft initially.
Do not mark it as "Ready for review" until the template has been
completely filled out, and PR status checks have passed at least once.
-->

## **Description**

<!--
Write a short description of the changes included in this pull request,
also include relevant motivation and context. Have in mind the following
questions:
1. What is the reason for the change?
2. What is the improvement/solution?
-->

This PR improves support for Smart Transactions (STX). It will not show
the STX status page if the tx is a Bridge tx. Instead users will be
immediately sent to the Activity list. If the user opens the Bridge tx
detaills, they should be able to see the proper info.

The main change is that in `BridgeStatusController` the `txHistory` is
now keyed by `txMeta.id` rather than `txMeta.hash`. This is because for
an STX we might not have the hash immediately, but we still want to look
things up.

We also add a way to call `addTransaction` from the UI side. Previously
we used `addTransactionAndWaitForPublish`. However for STX, this will
cause the app to wait until a `txHash` is available before returning a
`txMeta`, which means we can't even use the `txMeta.id` to key a
`BridgeHistoryItem`. If we use `addTransaction` this will allow us to
receive a `txMeta` object back immediately and use `txMeta.id`.

[![Open in GitHub
Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/28460?quickstart=1)

## **Related issues**

Depends on https://github.com/MetaMask/core/pull/4918

## **Manual testing steps**

1. Add `BRIDGE_USE_DEV_APIS=1` to `.metamaskrc`
1. Go to Settings > Advanced, make sure Smart Transactions is on
2. Switch network to Ethereum
3. Go to Bridge
4. Selection source network, source token, dest network, dest token
5. Request a quote
6. Execute a bridge
7. Go to Activity
8. Click on the Bridge tx

## **Screenshots/Recordings**

<!-- If applicable, add screenshots and/or recordings to visualize the
before and after of your change. -->

### **Before**

<!-- [screenshots/recordings] -->

### **After**

<!-- [screenshots/recordings] -->


https://github.com/user-attachments/assets/364b93ec-3b54-4ce6-acd5-5001236c128c



## **Pre-merge author checklist**

- [ ] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension Coding
Standards](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/CODING_GUIDELINES.md).
- [ ] I've completed the PR template to the best of my ability
- [ ] I’ve included tests if applicable
- [ ] I’ve documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [ ] I’ve applied the right labels on the PR (see [labeling
guidelines](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.

## **Pre-merge reviewer checklist**

- [ ] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed).
- [ ] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.
---
 .gitignore                                    |   3 +
 app/_locales/en/messages.json                 |   2 +-
 .../bridge-status-controller.test.ts.snap     |  14 +-
 .../bridge-status-controller.test.ts          | 287 ++-------------
 .../bridge-status/bridge-status-controller.ts | 197 ++++++-----
 .../controllers/bridge-status/mocks.ts        | 327 ++++++++++++++++++
 .../controllers/bridge-status/types.ts        |  11 +-
 .../controllers/bridge-status/utils.ts        |  24 +-
 .../transaction/smart-transactions-mocks.ts   |  35 ++
 .../lib/transaction/smart-transactions.ts     |  40 ++-
 app/scripts/metamask-controller.js            |   1 +
 shared/types/bridge-status.ts                 |  50 ++-
 .../transaction-list-item.component.js        |  23 +-
 .../transaction-list-item.component.test.js   |  14 +
 ui/helpers/utils/token-util.js                |   3 +-
 ui/hooks/bridge/useBridgeChainInfo.ts         |  47 ++-
 ui/hooks/bridge/useBridgeTxHistoryData.ts     |  50 ++-
 ui/hooks/useTransactionDisplayData.js         |  18 +-
 ui/pages/bridge/hooks/useHandleApprovalTx.ts  |  15 +-
 ui/pages/bridge/hooks/useHandleBridgeTx.ts    |  34 +-
 ui/pages/bridge/hooks/useHandleTx.ts          |  20 +-
 .../hooks/useSubmitBridgeTransaction.test.tsx |  68 +---
 .../hooks/useSubmitBridgeTransaction.ts       |  53 +--
 ui/pages/bridge/prepare/bridge-cta-button.tsx |   5 +-
 .../bridge-activity-item-tx-segments.tsx      |  19 +-
 .../bridge-explorer-links.tsx                 |   8 +-
 .../bridge-step-description.tsx               |  18 +-
 .../transaction-details/bridge-step-list.tsx  |  11 +-
 .../step-progress-bar-item.tsx                |   2 +-
 .../transaction-details.tsx                   |  71 ++--
 ui/pages/routes/routes.component.js           |   2 +-
 ui/store/actions.ts                           |  38 ++
 32 files changed, 925 insertions(+), 585 deletions(-)
 create mode 100644 app/scripts/controllers/bridge-status/mocks.ts
 create mode 100644 app/scripts/lib/transaction/smart-transactions-mocks.ts

diff --git a/.gitignore b/.gitignore
index 074f4076a7cc..6ee150dd8653 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,6 @@
+.yalc
+yalc.lock
+
 npm-debug.log
 yarn-error.log
 node_modules
diff --git a/app/_locales/en/messages.json b/app/_locales/en/messages.json
index f125126e878c..07dc59d6c895 100644
--- a/app/_locales/en/messages.json
+++ b/app/_locales/en/messages.json
@@ -917,7 +917,7 @@
     "message": "Bridge to"
   },
   "bridgeToChain": {
-    "message": " to $1"
+    "message": "Bridge to $1"
   },
   "bridgeTotalFeesTooltipText": {
     "message": "This includes gas fees (paid to crypto miners) and relayer fees (paid to power complex services like bridging).\nFees are based on network traffic and transaction complexity. MetaMask does not profit from either fee."
diff --git a/app/scripts/controllers/bridge-status/__snapshots__/bridge-status-controller.test.ts.snap b/app/scripts/controllers/bridge-status/__snapshots__/bridge-status-controller.test.ts.snap
index ebd3a938822e..8bbeab6356d9 100644
--- a/app/scripts/controllers/bridge-status/__snapshots__/bridge-status-controller.test.ts.snap
+++ b/app/scripts/controllers/bridge-status/__snapshots__/bridge-status-controller.test.ts.snap
@@ -2,11 +2,13 @@
 
 exports[`BridgeStatusController constructor rehydrates the tx history state 1`] = `
 {
-  "0xsrcTxHash1": {
+  "bridgeTxMetaId1": {
     "account": "0xaccount1",
     "estimatedProcessingTimeInSeconds": 15,
     "initialDestAssetBalance": undefined,
-    "pricingData": undefined,
+    "pricingData": {
+      "amountSent": "1.234",
+    },
     "quote": {
       "bridgeId": "lifi",
       "bridges": [
@@ -102,17 +104,20 @@ exports[`BridgeStatusController constructor rehydrates the tx history state 1`]
       "status": "PENDING",
     },
     "targetContractAddress": "0x23981fC34e69eeDFE2BD9a0a9fCb0719Fe09DbFC",
+    "txMetaId": "bridgeTxMetaId1",
   },
 }
 `;
 
 exports[`BridgeStatusController startPollingForBridgeTxStatus sets the inital tx history state 1`] = `
 {
-  "0xsrcTxHash1": {
+  "bridgeTxMetaId1": {
     "account": "0xaccount1",
     "estimatedProcessingTimeInSeconds": 15,
     "initialDestAssetBalance": undefined,
-    "pricingData": undefined,
+    "pricingData": {
+      "amountSent": "1.234",
+    },
     "quote": {
       "bridgeId": "lifi",
       "bridges": [
@@ -208,6 +213,7 @@ exports[`BridgeStatusController startPollingForBridgeTxStatus sets the inital tx
       "status": "PENDING",
     },
     "targetContractAddress": "0x23981fC34e69eeDFE2BD9a0a9fCb0719Fe09DbFC",
+    "txMetaId": "bridgeTxMetaId1",
   },
 }
 `;
diff --git a/app/scripts/controllers/bridge-status/bridge-status-controller.test.ts b/app/scripts/controllers/bridge-status/bridge-status-controller.test.ts
index 7d82d32284f4..0a8e331b2767 100644
--- a/app/scripts/controllers/bridge-status/bridge-status-controller.test.ts
+++ b/app/scripts/controllers/bridge-status/bridge-status-controller.test.ts
@@ -1,271 +1,19 @@
 import { flushPromises } from '../../../../test/lib/timer-helpers';
 import { Numeric } from '../../../../shared/modules/Numeric';
-import {
-  StatusTypes,
-  ActionTypes,
-  BridgeId,
-} from '../../../../shared/types/bridge-status';
 import BridgeStatusController from './bridge-status-controller';
 import { BridgeStatusControllerMessenger } from './types';
 import { DEFAULT_BRIDGE_STATUS_CONTROLLER_STATE } from './constants';
 import * as bridgeStatusUtils from './utils';
+import {
+  MockStatusResponse,
+  MockTxHistory,
+  getMockStartPollingForBridgeTxStatusArgs,
+} from './mocks';
 
 const EMPTY_INIT_STATE = {
   bridgeStatusState: DEFAULT_BRIDGE_STATUS_CONTROLLER_STATE,
 };
 
-const getMockQuote = ({ srcChainId = 42161, destChainId = 10 } = {}) => ({
-  requestId: '197c402f-cb96-4096-9f8c-54aed84ca776',
-  srcChainId,
-  srcTokenAmount: '991250000000000',
-  srcAsset: {
-    address: '0x0000000000000000000000000000000000000000',
-    chainId: srcChainId,
-    symbol: 'ETH',
-    decimals: 18,
-    name: 'ETH',
-    coinKey: 'ETH',
-    logoURI:
-      'https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/ethereum/assets/0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2/logo.png',
-    priceUSD: '2478.7',
-    icon: 'https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/ethereum/assets/0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2/logo.png',
-  },
-  destChainId,
-  destTokenAmount: '990654755978612',
-  destAsset: {
-    address: '0x0000000000000000000000000000000000000000',
-    chainId: destChainId,
-    symbol: 'ETH',
-    decimals: 18,
-    name: 'ETH',
-    coinKey: 'ETH',
-    logoURI:
-      'https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/ethereum/assets/0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2/logo.png',
-    priceUSD: '2478.63',
-    icon: 'https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/ethereum/assets/0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2/logo.png',
-  },
-  feeData: {
-    metabridge: {
-      amount: '8750000000000',
-      asset: {
-        address: '0x0000000000000000000000000000000000000000',
-        chainId: srcChainId,
-        symbol: 'ETH',
-        decimals: 18,
-        name: 'ETH',
-        coinKey: 'ETH',
-        logoURI:
-          'https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/ethereum/assets/0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2/logo.png',
-        priceUSD: '2478.7',
-        icon: 'https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/ethereum/assets/0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2/logo.png',
-      },
-    },
-  },
-  bridgeId: 'lifi',
-  bridges: ['across'],
-  steps: [
-    {
-      action: 'bridge' as ActionTypes,
-      srcChainId,
-      destChainId,
-      protocol: {
-        name: 'across',
-        displayName: 'Across',
-        icon: 'https://raw.githubusercontent.com/lifinance/types/main/src/assets/icons/bridges/acrossv2.png',
-      },
-      srcAsset: {
-        address: '0x0000000000000000000000000000000000000000',
-        chainId: srcChainId,
-        symbol: 'ETH',
-        decimals: 18,
-        name: 'ETH',
-        coinKey: 'ETH',
-        logoURI:
-          'https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/ethereum/assets/0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2/logo.png',
-        priceUSD: '2478.7',
-        icon: 'https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/ethereum/assets/0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2/logo.png',
-      },
-      destAsset: {
-        address: '0x0000000000000000000000000000000000000000',
-        chainId: destChainId,
-        symbol: 'ETH',
-        decimals: 18,
-        name: 'ETH',
-        coinKey: 'ETH',
-        logoURI:
-          'https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/ethereum/assets/0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2/logo.png',
-        priceUSD: '2478.63',
-        icon: 'https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/ethereum/assets/0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2/logo.png',
-      },
-      srcAmount: '991250000000000',
-      destAmount: '990654755978612',
-    },
-  ],
-});
-
-const getMockStartPollingForBridgeTxStatusArgs = ({
-  srcTxHash = '0xsrcTxHash1',
-  account = '0xaccount1',
-  srcChainId = 42161,
-  destChainId = 10,
-} = {}) => ({
-  statusRequest: {
-    bridgeId: 'lifi',
-    srcTxHash,
-    bridge: 'across',
-    srcChainId,
-    destChainId,
-    quote: getMockQuote({ srcChainId, destChainId }),
-    refuel: false,
-  },
-  quoteResponse: {
-    quote: getMockQuote({ srcChainId, destChainId }),
-    trade: {
-      chainId: srcChainId,
-      to: '0x23981fC34e69eeDFE2BD9a0a9fCb0719Fe09DbFC',
-      from: account,
-      value: '0x038d7ea4c68000',
-      data: '0x3ce33bff0000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000038d7ea4c6800000000000000000000000000000000000000000000000000000000000000000c0000000000000000000000000000000000000000000000000000000000000000d6c6966694164617074657256320000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001c0000000000000000000000000e397c4883ec89ed4fc9d258f00c689708b2799c9000000000000000000000000e397c4883ec89ed4fc9d258f00c689708b2799c9000000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000038589602234000000000000000000000000000000000000000000000000000000000000000140000000000000000000000000000000000000000000000000000007f544a44c0000000000000000000000000056ca675c3633cc16bd6849e2b431d4e8de5e23bf000000000000000000000000000000000000000000000000000000000000006c5a39b10a4f4f0747826140d2c5fe6ef47965741f6f7a4734bf784bf3ae3f24520000000a000222266cc2dca0671d2a17ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffd00dfeeddeadbeef8932eb23bad9bddb5cf81426f78279a53c6c3b7100000000000000000000000000000000000000009ce3c510b3f58edc8d53ae708056e30926f62d0b42d5c9b61c391bb4e8a2c1917f8ed995169ffad0d79af2590303e83c57e15a9e0b248679849556c2e03a1c811b',
-      gasLimit: 282915,
-    },
-    approval: null,
-    estimatedProcessingTimeInSeconds: 15,
-  },
-  startTime: 1729964825189,
-  slippagePercentage: 0,
-  pricingData: undefined,
-  initialDestAssetBalance: undefined,
-  targetContractAddress: '0x23981fC34e69eeDFE2BD9a0a9fCb0719Fe09DbFC',
-});
-
-const MockStatusResponse = {
-  getPending: ({
-    srcTxHash = '0xsrcTxHash1',
-    srcChainId = 42161,
-    destChainId = 10,
-  } = {}) => ({
-    status: 'PENDING' as StatusTypes,
-    srcChain: {
-      chainId: srcChainId,
-      txHash: srcTxHash,
-      amount: '991250000000000',
-      token: {
-        address: '0x0000000000000000000000000000000000000000',
-        chainId: srcChainId,
-        symbol: 'ETH',
-        decimals: 18,
-        name: 'ETH',
-        coinKey: 'ETH',
-        logoURI:
-          'https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/ethereum/assets/0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2/logo.png',
-        priceUSD: '2518.47',
-        icon: 'https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/ethereum/assets/0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2/logo.png',
-      },
-    },
-    destChain: {
-      chainId: destChainId,
-      token: {},
-    },
-  }),
-  getComplete: ({
-    srcTxHash = '0xsrcTxHash1',
-    destTxHash = '0xdestTxHash1',
-    srcChainId = 42161,
-    destChainId = 10,
-  } = {}) => ({
-    status: 'COMPLETE' as StatusTypes,
-    isExpectedToken: true,
-    bridge: 'across' as BridgeId,
-    srcChain: {
-      chainId: srcChainId,
-      txHash: srcTxHash,
-      amount: '991250000000000',
-      token: {
-        address: '0x0000000000000000000000000000000000000000',
-        chainId: srcChainId,
-        symbol: 'ETH',
-        decimals: 18,
-        name: 'ETH',
-        coinKey: 'ETH',
-        logoURI:
-          'https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/ethereum/assets/0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2/logo.png',
-        priceUSD: '2478.7',
-        icon: 'https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/ethereum/assets/0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2/logo.png',
-      },
-    },
-    destChain: {
-      chainId: destChainId,
-      txHash: destTxHash,
-      amount: '990654755978611',
-      token: {
-        address: '0x0000000000000000000000000000000000000000',
-        chainId: destChainId,
-        symbol: 'ETH',
-        decimals: 18,
-        name: 'ETH',
-        coinKey: 'ETH',
-        logoURI:
-          'https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/ethereum/assets/0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2/logo.png',
-        priceUSD: '2478.63',
-        icon: 'https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/ethereum/assets/0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2/logo.png',
-      },
-    },
-  }),
-};
-
-const MockTxHistory = {
-  getInit: ({
-    srcTxHash = '0xsrcTxHash1',
-    account = '0xaccount1',
-    srcChainId = 42161,
-    destChainId = 10,
-  } = {}) => ({
-    [srcTxHash]: {
-      quote: getMockQuote({ srcChainId, destChainId }),
-      startTime: 1729964825189,
-      estimatedProcessingTimeInSeconds: 15,
-      slippagePercentage: 0,
-      account,
-      targetContractAddress: '0x23981fC34e69eeDFE2BD9a0a9fCb0719Fe09DbFC',
-    },
-  }),
-  getPending: ({
-    srcTxHash = '0xsrcTxHash1',
-    account = '0xaccount1',
-    srcChainId = 42161,
-    destChainId = 10,
-  } = {}) => ({
-    [srcTxHash]: {
-      quote: getMockQuote({ srcChainId, destChainId }),
-      startTime: 1729964825189,
-      estimatedProcessingTimeInSeconds: 15,
-      slippagePercentage: 0,
-      account,
-      status: MockStatusResponse.getPending({
-        srcTxHash,
-        srcChainId,
-      }),
-      targetContractAddress: '0x23981fC34e69eeDFE2BD9a0a9fCb0719Fe09DbFC',
-    },
-  }),
-  getComplete: ({
-    srcTxHash = '0xsrcTxHash1',
-    account = '0xaccount1',
-    srcChainId = 42161,
-    destChainId = 10,
-  } = {}) => ({
-    [srcTxHash]: {
-      quote: getMockQuote({ srcChainId, destChainId }),
-      startTime: 1729964825189,
-      estimatedProcessingTimeInSeconds: 15,
-      slippagePercentage: 0,
-      account,
-      status: MockStatusResponse.getComplete({ srcTxHash }),
-      targetContractAddress: '0x23981fC34e69eeDFE2BD9a0a9fCb0719Fe09DbFC',
-    },
-  }),
-};
-
 const getMessengerMock = ({
   account = '0xaccount1',
   srcChainId = 42161,
@@ -513,6 +261,7 @@ describe('BridgeStatusController', () => {
       // Start polling for 0xaccount2
       bridgeStatusController.startPollingForBridgeTxStatus(
         getMockStartPollingForBridgeTxStatusArgs({
+          txMetaId: 'bridgeTxMetaId2',
           srcTxHash: '0xsrcTxHash2',
           account: '0xaccount2',
         }),
@@ -523,10 +272,10 @@ describe('BridgeStatusController', () => {
       // Check that both accounts have a tx history entry
       expect(
         bridgeStatusController.state.bridgeStatusState.txHistory,
-      ).toHaveProperty('0xsrcTxHash1');
+      ).toHaveProperty('bridgeTxMetaId1');
       expect(
         bridgeStatusController.state.bridgeStatusState.txHistory,
-      ).toHaveProperty('0xsrcTxHash2');
+      ).toHaveProperty('bridgeTxMetaId2');
 
       // Wipe the status for 1 account only
       bridgeStatusController.wipeBridgeStatus({
@@ -586,6 +335,7 @@ describe('BridgeStatusController', () => {
         getMockStartPollingForBridgeTxStatusArgs({
           account: '0xaccount1',
           srcTxHash: '0xsrcTxHash1',
+          txMetaId: 'bridgeTxMetaId1',
           srcChainId: 42161,
           destChainId: 1,
         }),
@@ -598,6 +348,7 @@ describe('BridgeStatusController', () => {
         getMockStartPollingForBridgeTxStatusArgs({
           account: '0xaccount1',
           srcTxHash: '0xsrcTxHash2',
+          txMetaId: 'bridgeTxMetaId2',
           srcChainId: 10,
           destChainId: 123,
         }),
@@ -607,20 +358,20 @@ describe('BridgeStatusController', () => {
 
       // Check we have a tx history entry for each chainId
       expect(
-        bridgeStatusController.state.bridgeStatusState.txHistory['0xsrcTxHash1']
+        bridgeStatusController.state.bridgeStatusState.txHistory.bridgeTxMetaId1
           .quote.srcChainId,
       ).toEqual(42161);
       expect(
-        bridgeStatusController.state.bridgeStatusState.txHistory['0xsrcTxHash1']
+        bridgeStatusController.state.bridgeStatusState.txHistory.bridgeTxMetaId1
           .quote.destChainId,
       ).toEqual(1);
 
       expect(
-        bridgeStatusController.state.bridgeStatusState.txHistory['0xsrcTxHash2']
+        bridgeStatusController.state.bridgeStatusState.txHistory.bridgeTxMetaId2
           .quote.srcChainId,
       ).toEqual(10);
       expect(
-        bridgeStatusController.state.bridgeStatusState.txHistory['0xsrcTxHash2']
+        bridgeStatusController.state.bridgeStatusState.txHistory.bridgeTxMetaId2
           .quote.destChainId,
       ).toEqual(123);
 
@@ -681,6 +432,7 @@ describe('BridgeStatusController', () => {
         getMockStartPollingForBridgeTxStatusArgs({
           account: '0xaccount1',
           srcTxHash: '0xsrcTxHash1',
+          txMetaId: 'bridgeTxMetaId1',
           srcChainId: 42161,
           destChainId: 1,
         }),
@@ -693,6 +445,7 @@ describe('BridgeStatusController', () => {
         getMockStartPollingForBridgeTxStatusArgs({
           account: '0xaccount1',
           srcTxHash: '0xsrcTxHash2',
+          txMetaId: 'bridgeTxMetaId2',
           srcChainId: 10,
           destChainId: 123,
         }),
@@ -702,20 +455,20 @@ describe('BridgeStatusController', () => {
 
       // Check we have a tx history entry for each chainId
       expect(
-        bridgeStatusController.state.bridgeStatusState.txHistory['0xsrcTxHash1']
+        bridgeStatusController.state.bridgeStatusState.txHistory.bridgeTxMetaId1
           .quote.srcChainId,
       ).toEqual(42161);
       expect(
-        bridgeStatusController.state.bridgeStatusState.txHistory['0xsrcTxHash1']
+        bridgeStatusController.state.bridgeStatusState.txHistory.bridgeTxMetaId1
           .quote.destChainId,
       ).toEqual(1);
 
       expect(
-        bridgeStatusController.state.bridgeStatusState.txHistory['0xsrcTxHash2']
+        bridgeStatusController.state.bridgeStatusState.txHistory.bridgeTxMetaId2
           .quote.srcChainId,
       ).toEqual(10);
       expect(
-        bridgeStatusController.state.bridgeStatusState.txHistory['0xsrcTxHash2']
+        bridgeStatusController.state.bridgeStatusState.txHistory.bridgeTxMetaId2
           .quote.destChainId,
       ).toEqual(123);
 
diff --git a/app/scripts/controllers/bridge-status/bridge-status-controller.ts b/app/scripts/controllers/bridge-status/bridge-status-controller.ts
index 86e87d9d0622..1763e47feb77 100644
--- a/app/scripts/controllers/bridge-status/bridge-status-controller.ts
+++ b/app/scripts/controllers/bridge-status/bridge-status-controller.ts
@@ -1,13 +1,11 @@
 import { StateMetadata } from '@metamask/base-controller';
-import type { NetworkClientId } from '@metamask/network-controller';
 import { StaticIntervalPollingController } from '@metamask/polling-controller';
 import { Hex } from '@metamask/utils';
 // eslint-disable-next-line import/no-restricted-paths
 import {
-  StartPollingForBridgeTxStatusArgs,
-  StatusRequest,
   StatusTypes,
   BridgeStatusControllerState,
+  StartPollingForBridgeTxStatusArgsSerialized,
 } from '../../../../shared/types/bridge-status';
 import { decimalToPrefixedHex } from '../../../../shared/modules/conversion.utils';
 import {
@@ -16,7 +14,7 @@ import {
   REFRESH_INTERVAL_MS,
 } from './constants';
 import { BridgeStatusControllerMessenger } from './types';
-import { fetchBridgeTxStatus } from './utils';
+import { fetchBridgeTxStatus, getStatusRequestWithSrcTxHash } from './utils';
 
 const metadata: StateMetadata<{
   bridgeStatusState: BridgeStatusControllerState;
@@ -30,21 +28,18 @@ const metadata: StateMetadata<{
 };
 
 /** The input to start polling for the {@link BridgeStatusController} */
-type BridgeStatusPollingInput = {
-  networkClientId: NetworkClientId;
-  statusRequest: StatusRequest;
-};
+type BridgeStatusPollingInput = FetchBridgeTxStatusArgs;
 
-type SrcTxHash = string;
+type SrcTxMetaId = string;
 export type FetchBridgeTxStatusArgs = {
-  statusRequest: StatusRequest;
+  bridgeTxMetaId: string;
 };
 export default class BridgeStatusController extends StaticIntervalPollingController<BridgeStatusPollingInput>()<
   typeof BRIDGE_STATUS_CONTROLLER_NAME,
   { bridgeStatusState: BridgeStatusControllerState },
   BridgeStatusControllerMessenger
 > {
-  #pollingTokensBySrcTxHash: Record<SrcTxHash, string> = {};
+  #pollingTokensByTxMetaId: Record<SrcTxMetaId, string> = {};
 
   constructor({
     messenger,
@@ -130,94 +125,82 @@ export default class BridgeStatusController extends StaticIntervalPollingControl
     const historyItems = Object.values(bridgeStatusState.txHistory);
     const incompleteHistoryItems = historyItems
       .filter(
-        (historyItem) => historyItem.status.status !== StatusTypes.COMPLETE,
+        (historyItem) =>
+          historyItem.status.status === StatusTypes.PENDING ||
+          historyItem.status.status === StatusTypes.UNKNOWN,
       )
       .filter((historyItem) => {
         // Check if we are already polling this tx, if so, skip restarting polling for that
-        const srcTxHash = historyItem.status.srcChain.txHash;
-        const pollingToken = this.#pollingTokensBySrcTxHash[srcTxHash];
+        const srcTxMetaId = historyItem.txMetaId;
+        const pollingToken = this.#pollingTokensByTxMetaId[srcTxMetaId];
         return !pollingToken;
       });
 
     incompleteHistoryItems.forEach((historyItem) => {
-      const statusRequest = {
-        bridgeId: historyItem.quote.bridgeId,
-        srcTxHash: historyItem.status.srcChain.txHash,
-        bridge: historyItem.quote.bridges[0],
-        srcChainId: historyItem.quote.srcChainId,
-        destChainId: historyItem.quote.destChainId,
-        quote: historyItem.quote,
-        refuel: Boolean(historyItem.quote.refuel),
-      };
-
-      const hexSourceChainId = decimalToPrefixedHex(statusRequest.srcChainId);
-      const networkClientId = this.messagingSystem.call(
-        'NetworkController:findNetworkClientIdByChainId',
-        hexSourceChainId,
-      );
+      const bridgeTxMetaId = historyItem.txMetaId;
 
       // We manually call startPolling() here rather than go through startPollingForBridgeTxStatus()
       // because we don't want to overwrite the existing historyItem in state
-      this.#pollingTokensBySrcTxHash[statusRequest.srcTxHash] =
-        this.startPolling({ networkClientId, statusRequest });
+      this.#pollingTokensByTxMetaId[bridgeTxMetaId] = this.startPolling({
+        bridgeTxMetaId,
+      });
     });
   };
 
   startPollingForBridgeTxStatus = (
-    startPollingForBridgeTxStatusArgs: StartPollingForBridgeTxStatusArgs,
+    startPollingForBridgeTxStatusArgs: StartPollingForBridgeTxStatusArgsSerialized,
   ) => {
     const {
+      bridgeTxMeta,
       statusRequest,
       quoteResponse,
       startTime,
       slippagePercentage,
-      pricingData,
       initialDestAssetBalance,
       targetContractAddress,
     } = startPollingForBridgeTxStatusArgs;
-    const hexSourceChainId = decimalToPrefixedHex(statusRequest.srcChainId);
-
     const { bridgeStatusState } = this.state;
     const { address: account } = this.#getSelectedAccount();
 
     // Write all non-status fields to state so we can reference the quote in Activity list without the Bridge API
     // We know it's in progress but not the exact status yet
+    const txHistoryItem = {
+      txMetaId: bridgeTxMeta.id,
+      quote: quoteResponse.quote,
+      startTime,
+      estimatedProcessingTimeInSeconds:
+        quoteResponse.estimatedProcessingTimeInSeconds,
+      slippagePercentage,
+      pricingData: {
+        amountSent: quoteResponse.sentAmount.amount,
+      },
+      initialDestAssetBalance,
+      targetContractAddress,
+      account,
+      status: {
+        // We always have a PENDING status when we start polling for a tx, don't need the Bridge API for that
+        // Also we know the bare minimum fields for status at this point in time
+        status: StatusTypes.PENDING,
+        srcChain: {
+          chainId: statusRequest.srcChainId,
+          txHash: statusRequest.srcTxHash,
+        },
+      },
+    };
     this.update((_state) => {
       _state.bridgeStatusState = {
         ...bridgeStatusState,
         txHistory: {
           ...bridgeStatusState.txHistory,
-          [statusRequest.srcTxHash]: {
-            quote: quoteResponse.quote,
-            startTime,
-            estimatedProcessingTimeInSeconds:
-              quoteResponse.estimatedProcessingTimeInSeconds,
-            slippagePercentage,
-            pricingData,
-            initialDestAssetBalance,
-            targetContractAddress,
-            account,
-            status: {
-              // We always have a PENDING status when we start polling for a tx, don't need the Bridge API for that
-              // Also we know the bare minimum fields for status at this point in time
-              status: StatusTypes.PENDING,
-              srcChain: {
-                chainId: statusRequest.srcChainId,
-                txHash: statusRequest.srcTxHash,
-              },
-            },
-          },
+          // Use the txMeta.id as the key so we can reference the txMeta in TransactionController
+          [bridgeTxMeta.id]: txHistoryItem,
         },
       };
     });
 
-    const networkClientId = this.messagingSystem.call(
-      'NetworkController:findNetworkClientIdByChainId',
-      hexSourceChainId,
-    );
-    this.#pollingTokensBySrcTxHash[statusRequest.srcTxHash] = this.startPolling(
-      { networkClientId, statusRequest },
-    );
+    this.#pollingTokensByTxMetaId[bridgeTxMeta.id] = this.startPolling({
+      bridgeTxMetaId: bridgeTxMeta.id,
+    });
   };
 
   // This will be called after you call this.startPolling()
@@ -231,14 +214,26 @@ export default class BridgeStatusController extends StaticIntervalPollingControl
   }
 
   #fetchBridgeTxStatus = async ({
-    networkClientId: _networkClientId,
-    statusRequest,
-  }: BridgeStatusPollingInput) => {
+    bridgeTxMetaId,
+  }: FetchBridgeTxStatusArgs) => {
     const { bridgeStatusState } = this.state;
 
     try {
       // We try here because we receive 500 errors from Bridge API if we try to fetch immediately after submitting the source tx
       // Oddly mostly happens on Optimism, never on Arbitrum. By the 2nd fetch, the Bridge API responds properly.
+      // Also srcTxHash may not be available immediately for STX, so we don't want to fetch in those cases
+      const historyItem = bridgeStatusState.txHistory[bridgeTxMetaId];
+      const srcTxHash = this.#getSrcTxHash(bridgeTxMetaId);
+      if (!srcTxHash) {
+        return;
+      }
+
+      this.#updateSrcTxHash(bridgeTxMetaId, srcTxHash);
+
+      const statusRequest = getStatusRequestWithSrcTxHash(
+        historyItem.quote,
+        srcTxHash,
+      );
       const status = await fetchBridgeTxStatus(statusRequest);
 
       // No need to purge these on network change or account change, TransactionController does not purge either.
@@ -247,13 +242,13 @@ export default class BridgeStatusController extends StaticIntervalPollingControl
       // First stab at this will not stop polling when you are on a different account
       this.update((_state) => {
         const bridgeHistoryItem =
-          _state.bridgeStatusState.txHistory[statusRequest.srcTxHash];
+          _state.bridgeStatusState.txHistory[bridgeTxMetaId];
 
         _state.bridgeStatusState = {
           ...bridgeStatusState,
           txHistory: {
             ...bridgeStatusState.txHistory,
-            [statusRequest.srcTxHash]: {
+            [bridgeTxMetaId]: {
               ...bridgeHistoryItem,
               status,
             },
@@ -261,8 +256,7 @@ export default class BridgeStatusController extends StaticIntervalPollingControl
         };
       });
 
-      const pollingToken =
-        this.#pollingTokensBySrcTxHash[statusRequest.srcTxHash];
+      const pollingToken = this.#pollingTokensByTxMetaId[bridgeTxMetaId];
       if (status.status === StatusTypes.COMPLETE && pollingToken) {
         this.stopPollingByPollingToken(pollingToken);
       }
@@ -271,14 +265,61 @@ export default class BridgeStatusController extends StaticIntervalPollingControl
     }
   };
 
+  #getSrcTxHash = (bridgeTxMetaId: string): string | undefined => {
+    const { bridgeStatusState } = this.state;
+    // Prefer the srcTxHash from bridgeStatusState so we don't have to l ook up in TransactionController
+    // But it is possible to have bridgeHistoryItem in state without the srcTxHash yet when it is an STX
+    const srcTxHash =
+      bridgeStatusState.txHistory[bridgeTxMetaId].status.srcChain.txHash;
+
+    if (srcTxHash) {
+      return srcTxHash;
+    }
+
+    // Look up in TransactionController if txMeta has been updated with the srcTxHash
+    const txControllerState = this.messagingSystem.call(
+      'TransactionController:getState',
+    );
+    const txMeta = txControllerState.transactions.find(
+      (tx) => tx.id === bridgeTxMetaId,
+    );
+    return txMeta?.hash;
+  };
+
+  #updateSrcTxHash = (bridgeTxMetaId: string, srcTxHash: string) => {
+    const { bridgeStatusState } = this.state;
+    if (bridgeStatusState.txHistory[bridgeTxMetaId].status.srcChain.txHash) {
+      return;
+    }
+
+    this.update((_state) => {
+      _state.bridgeStatusState = {
+        ...bridgeStatusState,
+        txHistory: {
+          ...bridgeStatusState.txHistory,
+          [bridgeTxMetaId]: {
+            ...bridgeStatusState.txHistory[bridgeTxMetaId],
+            status: {
+              ...bridgeStatusState.txHistory[bridgeTxMetaId].status,
+              srcChain: {
+                ...bridgeStatusState.txHistory[bridgeTxMetaId].status.srcChain,
+                txHash: srcTxHash,
+              },
+            },
+          },
+        },
+      };
+    });
+  };
+
   // Wipes the bridge status for the given address and chainId
   // Will match either source or destination chainId to the selectedChainId
   #wipeBridgeStatusByChainId = (address: string, selectedChainId: Hex) => {
-    const sourceTxHashesToDelete = Object.keys(
+    const sourceTxMetaIdsToDelete = Object.keys(
       this.state.bridgeStatusState.txHistory,
-    ).filter((sourceTxHash) => {
+    ).filter((txMetaId) => {
       const bridgeHistoryItem =
-        this.state.bridgeStatusState.txHistory[sourceTxHash];
+        this.state.bridgeStatusState.txHistory[txMetaId];
 
       const hexSourceChainId = decimalToPrefixedHex(
         bridgeHistoryItem.quote.srcChainId,
@@ -294,20 +335,20 @@ export default class BridgeStatusController extends StaticIntervalPollingControl
       );
     });
 
-    sourceTxHashesToDelete.forEach((sourceTxHash) => {
-      const pollingToken = this.#pollingTokensBySrcTxHash[sourceTxHash];
+    sourceTxMetaIdsToDelete.forEach((sourceTxMetaId) => {
+      const pollingToken = this.#pollingTokensByTxMetaId[sourceTxMetaId];
 
       if (pollingToken) {
         this.stopPollingByPollingToken(
-          this.#pollingTokensBySrcTxHash[sourceTxHash],
+          this.#pollingTokensByTxMetaId[sourceTxMetaId],
         );
       }
     });
 
     this.update((_state) => {
-      _state.bridgeStatusState.txHistory = sourceTxHashesToDelete.reduce(
-        (acc, sourceTxHash) => {
-          delete acc[sourceTxHash];
+      _state.bridgeStatusState.txHistory = sourceTxMetaIdsToDelete.reduce(
+        (acc, sourceTxMetaId) => {
+          delete acc[sourceTxMetaId];
           return acc;
         },
         _state.bridgeStatusState.txHistory,
diff --git a/app/scripts/controllers/bridge-status/mocks.ts b/app/scripts/controllers/bridge-status/mocks.ts
new file mode 100644
index 000000000000..1507af5830ec
--- /dev/null
+++ b/app/scripts/controllers/bridge-status/mocks.ts
@@ -0,0 +1,327 @@
+import { TransactionMeta } from '@metamask/transaction-controller';
+import {
+  BridgeId,
+  StatusResponse,
+  StatusTypes,
+  ActionTypes,
+  StartPollingForBridgeTxStatusArgsSerialized,
+} from '../../../../shared/types/bridge-status';
+
+export const MockStatusResponse = {
+  getPending: ({
+    srcTxHash = '0xsrcTxHash1',
+    srcChainId = 42161,
+    destChainId = 10,
+  } = {}) => ({
+    status: 'PENDING' as StatusTypes,
+    srcChain: {
+      chainId: srcChainId,
+      txHash: srcTxHash,
+      amount: '991250000000000',
+      token: {
+        address: '0x0000000000000000000000000000000000000000',
+        chainId: srcChainId,
+        symbol: 'ETH',
+        decimals: 18,
+        name: 'ETH',
+        coinKey: 'ETH',
+        logoURI:
+          'https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/ethereum/assets/0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2/logo.png',
+        priceUSD: '2518.47',
+        icon: 'https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/ethereum/assets/0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2/logo.png',
+      },
+    },
+    destChain: {
+      chainId: destChainId,
+      token: {},
+    },
+  }),
+  getComplete: ({
+    srcTxHash = '0xsrcTxHash1',
+    destTxHash = '0xdestTxHash1',
+    srcChainId = 42161,
+    destChainId = 10,
+  } = {}) => ({
+    status: 'COMPLETE' as StatusTypes,
+    isExpectedToken: true,
+    bridge: 'across' as BridgeId,
+    srcChain: {
+      chainId: srcChainId,
+      txHash: srcTxHash,
+      amount: '991250000000000',
+      token: {
+        address: '0x0000000000000000000000000000000000000000',
+        chainId: srcChainId,
+        symbol: 'ETH',
+        decimals: 18,
+        name: 'ETH',
+        coinKey: 'ETH',
+        logoURI:
+          'https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/ethereum/assets/0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2/logo.png',
+        priceUSD: '2478.7',
+        icon: 'https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/ethereum/assets/0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2/logo.png',
+      },
+    },
+    destChain: {
+      chainId: destChainId,
+      txHash: destTxHash,
+      amount: '990654755978611',
+      token: {
+        address: '0x0000000000000000000000000000000000000000',
+        chainId: destChainId,
+        symbol: 'ETH',
+        decimals: 18,
+        name: 'ETH',
+        coinKey: 'ETH',
+        logoURI:
+          'https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/ethereum/assets/0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2/logo.png',
+        priceUSD: '2478.63',
+        icon: 'https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/ethereum/assets/0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2/logo.png',
+      },
+    },
+  }),
+};
+
+let mockFetchBridgeTxStatusCount = 0;
+export const mockFetchBridgeTxStatus: () => Promise<StatusResponse> = () => {
+  return new Promise((resolve) => {
+    console.log('HELLO mockFetchBridgeTxStatus', mockFetchBridgeTxStatusCount);
+    setTimeout(() => {
+      if (mockFetchBridgeTxStatusCount === 0) {
+        resolve(
+          MockStatusResponse.getPending({
+            srcTxHash:
+              '0xe3e223b9725765a7de557effdb2b507ace3534bcff2c1fe3a857e0791e56a518',
+            srcChainId: 1,
+            destChainId: 42161,
+          }),
+        );
+      } else {
+        resolve(
+          MockStatusResponse.getComplete({
+            srcTxHash:
+              '0xe3e223b9725765a7de557effdb2b507ace3534bcff2c1fe3a857e0791e56a518',
+            destTxHash:
+              '0x010e1bffe8288956012e6b6132d7eb3eaf9d0bbf066bd13aae13b973c678508f',
+            srcChainId: 1,
+            destChainId: 42161,
+          }),
+        );
+      }
+      mockFetchBridgeTxStatusCount += 1;
+    }, 2000);
+  });
+};
+
+export const getMockQuote = ({
+  srcChainId = 42161,
+  destChainId = 10,
+} = {}) => ({
+  requestId: '197c402f-cb96-4096-9f8c-54aed84ca776',
+  srcChainId,
+  srcTokenAmount: '991250000000000',
+  srcAsset: {
+    address: '0x0000000000000000000000000000000000000000',
+    chainId: srcChainId,
+    symbol: 'ETH',
+    decimals: 18,
+    name: 'ETH',
+    coinKey: 'ETH',
+    logoURI:
+      'https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/ethereum/assets/0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2/logo.png',
+    priceUSD: '2478.7',
+    icon: 'https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/ethereum/assets/0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2/logo.png',
+  },
+  destChainId,
+  destTokenAmount: '990654755978612',
+  destAsset: {
+    address: '0x0000000000000000000000000000000000000000',
+    chainId: destChainId,
+    symbol: 'ETH',
+    decimals: 18,
+    name: 'ETH',
+    coinKey: 'ETH',
+    logoURI:
+      'https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/ethereum/assets/0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2/logo.png',
+    priceUSD: '2478.63',
+    icon: 'https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/ethereum/assets/0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2/logo.png',
+  },
+  feeData: {
+    metabridge: {
+      amount: '8750000000000',
+      asset: {
+        address: '0x0000000000000000000000000000000000000000',
+        chainId: srcChainId,
+        symbol: 'ETH',
+        decimals: 18,
+        name: 'ETH',
+        coinKey: 'ETH',
+        logoURI:
+          'https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/ethereum/assets/0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2/logo.png',
+        priceUSD: '2478.7',
+        icon: 'https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/ethereum/assets/0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2/logo.png',
+      },
+    },
+  },
+  bridgeId: 'lifi',
+  bridges: ['across'],
+  steps: [
+    {
+      action: 'bridge' as ActionTypes,
+      srcChainId,
+      destChainId,
+      protocol: {
+        name: 'across',
+        displayName: 'Across',
+        icon: 'https://raw.githubusercontent.com/lifinance/types/main/src/assets/icons/bridges/acrossv2.png',
+      },
+      srcAsset: {
+        address: '0x0000000000000000000000000000000000000000',
+        chainId: srcChainId,
+        symbol: 'ETH',
+        decimals: 18,
+        name: 'ETH',
+        coinKey: 'ETH',
+        logoURI:
+          'https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/ethereum/assets/0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2/logo.png',
+        priceUSD: '2478.7',
+        icon: 'https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/ethereum/assets/0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2/logo.png',
+      },
+      destAsset: {
+        address: '0x0000000000000000000000000000000000000000',
+        chainId: destChainId,
+        symbol: 'ETH',
+        decimals: 18,
+        name: 'ETH',
+        coinKey: 'ETH',
+        logoURI:
+          'https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/ethereum/assets/0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2/logo.png',
+        priceUSD: '2478.63',
+        icon: 'https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/ethereum/assets/0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2/logo.png',
+      },
+      srcAmount: '991250000000000',
+      destAmount: '990654755978612',
+    },
+  ],
+});
+
+export const getMockStartPollingForBridgeTxStatusArgs = ({
+  txMetaId = 'bridgeTxMetaId1',
+  srcTxHash = '0xsrcTxHash1',
+  account = '0xaccount1',
+  srcChainId = 42161,
+  destChainId = 10,
+} = {}): StartPollingForBridgeTxStatusArgsSerialized => ({
+  bridgeTxMeta: {
+    id: txMetaId,
+  } as TransactionMeta,
+  statusRequest: {
+    bridgeId: 'lifi',
+    srcTxHash,
+    bridge: 'across',
+    srcChainId,
+    destChainId,
+    quote: getMockQuote({ srcChainId, destChainId }),
+    refuel: false,
+  },
+  quoteResponse: {
+    quote: getMockQuote({ srcChainId, destChainId }),
+    trade: {
+      chainId: srcChainId,
+      to: '0x23981fC34e69eeDFE2BD9a0a9fCb0719Fe09DbFC',
+      from: account,
+      value: '0x038d7ea4c68000',
+      data: '0x3ce33bff0000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000038d7ea4c6800000000000000000000000000000000000000000000000000000000000000000c0000000000000000000000000000000000000000000000000000000000000000d6c6966694164617074657256320000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001c0000000000000000000000000e397c4883ec89ed4fc9d258f00c689708b2799c9000000000000000000000000e397c4883ec89ed4fc9d258f00c689708b2799c9000000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000038589602234000000000000000000000000000000000000000000000000000000000000000140000000000000000000000000000000000000000000000000000007f544a44c0000000000000000000000000056ca675c3633cc16bd6849e2b431d4e8de5e23bf000000000000000000000000000000000000000000000000000000000000006c5a39b10a4f4f0747826140d2c5fe6ef47965741f6f7a4734bf784bf3ae3f24520000000a000222266cc2dca0671d2a17ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffd00dfeeddeadbeef8932eb23bad9bddb5cf81426f78279a53c6c3b7100000000000000000000000000000000000000009ce3c510b3f58edc8d53ae708056e30926f62d0b42d5c9b61c391bb4e8a2c1917f8ed995169ffad0d79af2590303e83c57e15a9e0b248679849556c2e03a1c811b',
+      gasLimit: 282915,
+    },
+    approval: null,
+    estimatedProcessingTimeInSeconds: 15,
+    sentAmount: { amount: '1.234', fiat: null },
+  },
+  startTime: 1729964825189,
+  slippagePercentage: 0,
+  initialDestAssetBalance: undefined,
+  targetContractAddress: '0x23981fC34e69eeDFE2BD9a0a9fCb0719Fe09DbFC',
+});
+
+export const MockTxHistory = {
+  getInitNoSrcTxHash: ({
+    txMetaId = 'bridgeTxMetaId1',
+    account = '0xaccount1',
+    srcChainId = 42161,
+    destChainId = 10,
+  } = {}) => ({
+    [txMetaId]: {
+      txMetaId,
+      quote: getMockQuote({ srcChainId, destChainId }),
+      startTime: 1729964825189,
+      estimatedProcessingTimeInSeconds: 15,
+      slippagePercentage: 0,
+      account,
+      targetContractAddress: '0x23981fC34e69eeDFE2BD9a0a9fCb0719Fe09DbFC',
+      initialDestAssetBalance: undefined,
+      pricingData: { amountSent: '1.234' },
+    },
+  }),
+  getInit: ({
+    txMetaId = 'bridgeTxMetaId1',
+    account = '0xaccount1',
+    srcChainId = 42161,
+    destChainId = 10,
+  } = {}) => ({
+    [txMetaId]: {
+      txMetaId,
+      quote: getMockQuote({ srcChainId, destChainId }),
+      startTime: 1729964825189,
+      estimatedProcessingTimeInSeconds: 15,
+      slippagePercentage: 0,
+      account,
+      targetContractAddress: '0x23981fC34e69eeDFE2BD9a0a9fCb0719Fe09DbFC',
+      initialDestAssetBalance: undefined,
+      pricingData: { amountSent: '1.234' },
+    },
+  }),
+  getPending: ({
+    txMetaId = 'bridgeTxMetaId1',
+    srcTxHash = '0xsrcTxHash1',
+    account = '0xaccount1',
+    srcChainId = 42161,
+    destChainId = 10,
+  } = {}) => ({
+    [txMetaId]: {
+      txMetaId,
+      quote: getMockQuote({ srcChainId, destChainId }),
+      startTime: 1729964825189,
+      estimatedProcessingTimeInSeconds: 15,
+      slippagePercentage: 0,
+      account,
+      status: MockStatusResponse.getPending({
+        srcTxHash,
+        srcChainId,
+      }),
+      targetContractAddress: '0x23981fC34e69eeDFE2BD9a0a9fCb0719Fe09DbFC',
+      initialDestAssetBalance: undefined,
+      pricingData: { amountSent: '1.234' },
+    },
+  }),
+  getComplete: ({
+    txMetaId = 'bridgeTxMetaId1',
+    srcTxHash = '0xsrcTxHash1',
+    account = '0xaccount1',
+    srcChainId = 42161,
+    destChainId = 10,
+  } = {}) => ({
+    [txMetaId]: {
+      txMetaId,
+      quote: getMockQuote({ srcChainId, destChainId }),
+      startTime: 1729964825189,
+      estimatedProcessingTimeInSeconds: 15,
+      slippagePercentage: 0,
+      account,
+      status: MockStatusResponse.getComplete({ srcTxHash }),
+      targetContractAddress: '0x23981fC34e69eeDFE2BD9a0a9fCb0719Fe09DbFC',
+      initialDestAssetBalance: undefined,
+      pricingData: { amountSent: '1.234' },
+    },
+  }),
+};
diff --git a/app/scripts/controllers/bridge-status/types.ts b/app/scripts/controllers/bridge-status/types.ts
index 040cd1e0c9bd..d06c3c40b3d8 100644
--- a/app/scripts/controllers/bridge-status/types.ts
+++ b/app/scripts/controllers/bridge-status/types.ts
@@ -9,6 +9,7 @@ import {
   NetworkControllerGetStateAction,
 } from '@metamask/network-controller';
 import { AccountsControllerGetSelectedAccountAction } from '@metamask/accounts-controller';
+import { TransactionControllerGetStateAction } from '@metamask/transaction-controller';
 import {
   BridgeStatusAction,
   BridgeStatusControllerState,
@@ -37,11 +38,19 @@ type BridgeStatusControllerEvents = ControllerStateChangeEvent<
   BridgeStatusControllerState
 >;
 
+/**
+ * The external actions available to the BridgeStatusController.
+ */
 type AllowedActions =
   | NetworkControllerFindNetworkClientIdByChainIdAction
   | NetworkControllerGetStateAction
   | NetworkControllerGetNetworkClientByIdAction
-  | AccountsControllerGetSelectedAccountAction;
+  | AccountsControllerGetSelectedAccountAction
+  | TransactionControllerGetStateAction;
+
+/**
+ * The external events available to the BridgeStatusController.
+ */
 type AllowedEvents = never;
 
 /**
diff --git a/app/scripts/controllers/bridge-status/utils.ts b/app/scripts/controllers/bridge-status/utils.ts
index 323e7e2faeab..33af3c09cb03 100644
--- a/app/scripts/controllers/bridge-status/utils.ts
+++ b/app/scripts/controllers/bridge-status/utils.ts
@@ -5,15 +5,20 @@ import {
 import fetchWithCache from '../../../../shared/lib/fetch-with-cache';
 import {
   StatusResponse,
-  StatusRequest,
+  StatusRequestWithSrcTxHash,
 } from '../../../../shared/types/bridge-status';
+// TODO fix this
+// eslint-disable-next-line import/no-restricted-paths
+import { Quote } from '../../../../ui/pages/bridge/types';
 import { validateResponse, validators } from './validators';
 
 const CLIENT_ID_HEADER = { 'X-Client-Id': BRIDGE_CLIENT_ID };
 
 export const BRIDGE_STATUS_BASE_URL = `${BRIDGE_API_BASE_URL}/getTxStatus`;
 
-export const fetchBridgeTxStatus = async (statusRequest: StatusRequest) => {
+export const fetchBridgeTxStatus = async (
+  statusRequest: StatusRequestWithSrcTxHash,
+) => {
   // Assemble params
   const { quote, ...statusRequestNoQuote } = statusRequest;
   const statusRequestNoQuoteFormatted = Object.fromEntries(
@@ -47,3 +52,18 @@ export const fetchBridgeTxStatus = async (statusRequest: StatusRequest) => {
   // Return
   return rawTxStatus;
 };
+
+export const getStatusRequestWithSrcTxHash = (
+  quote: Quote,
+  srcTxHash: string,
+): StatusRequestWithSrcTxHash => {
+  return {
+    bridgeId: quote.bridgeId,
+    srcTxHash,
+    bridge: quote.bridges[0],
+    srcChainId: quote.srcChainId,
+    destChainId: quote.destChainId,
+    quote,
+    refuel: Boolean(quote.refuel),
+  };
+};
diff --git a/app/scripts/lib/transaction/smart-transactions-mocks.ts b/app/scripts/lib/transaction/smart-transactions-mocks.ts
new file mode 100644
index 000000000000..4d819aa1b7c5
--- /dev/null
+++ b/app/scripts/lib/transaction/smart-transactions-mocks.ts
@@ -0,0 +1,35 @@
+/**
+ * Mock for waitForTransactionHash. Simply replace the waitForTransactionHash
+ * with this mock so that we can debug locally without spending gas on mainnet.
+ *
+ * @returns Promise<string>
+ */
+export const mockWaitForTransactionHash: () => Promise<string> = () => {
+  return new Promise((resolve) => {
+    setTimeout(() => {
+      // Need a real tx hash to pass some downstream validation
+      resolve(
+        '0xe3e223b9725765a7de557effdb2b507ace3534bcff2c1fe3a857e0791e56a518',
+      );
+    }, 20_000_000);
+  });
+};
+
+/**
+ * Mock for signAndSubmitTransactions. Simply replace the signAndSubmitTransactions
+ * with this mock so that we can debug locally without spending gas on mainnet.
+ *
+ * @returns Promise<{ uuid: string; txHash?: string }>
+ */
+export const mockSignAndSubmitTransactions: () => Promise<{
+  uuid: string;
+  txHash?: string;
+}> = () => {
+  return new Promise((resolve) => {
+    setTimeout(() => {
+      resolve({
+        uuid: 'uuid123456789',
+      });
+    }, 100);
+  });
+};
diff --git a/app/scripts/lib/transaction/smart-transactions.ts b/app/scripts/lib/transaction/smart-transactions.ts
index c80cd8373d2a..6f9acac1ce74 100644
--- a/app/scripts/lib/transaction/smart-transactions.ts
+++ b/app/scripts/lib/transaction/smart-transactions.ts
@@ -101,6 +101,8 @@ class SmartTransactionHook {
 
   #txParams: TransactionParams;
 
+  #shouldShowStatusPage: boolean;
+
   constructor(request: SubmitSmartTransactionRequest) {
     const {
       transactionMeta,
@@ -123,14 +125,18 @@ class SmartTransactionHook {
     this.#isDapp = transactionMeta.origin !== ORIGIN_METAMASK;
     this.#chainId = transactionMeta.chainId;
     this.#txParams = transactionMeta.txParams;
+    this.#shouldShowStatusPage =
+      transactionMeta.type !== TransactionType.bridge;
   }
 
   async submit() {
     const isUnsupportedTransactionTypeForSmartTransaction = this
       .#transactionMeta?.type
-      ? [TransactionType.swapAndSend, TransactionType.swapApproval].includes(
-          this.#transactionMeta.type,
-        )
+      ? [
+          TransactionType.swapAndSend,
+          TransactionType.swapApproval,
+          TransactionType.bridgeApproval,
+        ].includes(this.#transactionMeta.type)
       : false;
 
     // Will cause TransactionController to publish to the RPC provider as normal.
@@ -141,10 +147,13 @@ class SmartTransactionHook {
     ) {
       return useRegularTransactionSubmit;
     }
-    const { id: approvalFlowId } = await this.#controllerMessenger.call(
-      'ApprovalController:startFlow',
-    );
-    this.#approvalFlowId = approvalFlowId;
+
+    if (this.#shouldShowStatusPage) {
+      const { id: approvalFlowId } = await this.#controllerMessenger.call(
+        'ApprovalController:startFlow',
+      );
+      this.#approvalFlowId = approvalFlowId;
+    }
     let getFeesResponse;
     try {
       getFeesResponse = await this.#smartTransactionsController.getFees(
@@ -169,12 +178,15 @@ class SmartTransactionHook {
       }
       const extensionReturnTxHashAsap =
         this.#featureFlags?.smartTransactions?.extensionReturnTxHashAsap;
-      this.#addApprovalRequest({
-        uuid,
-      });
-      this.#addListenerToUpdateStatusPage({
-        uuid,
-      });
+
+      if (this.#shouldShowStatusPage) {
+        this.#addApprovalRequest({
+          uuid,
+        });
+        this.#addListenerToUpdateStatusPage({
+          uuid,
+        });
+      }
       let transactionHash: string | undefined | null;
       if (extensionReturnTxHashAsap && submitTransactionResponse?.txHash) {
         transactionHash = submitTransactionResponse.txHash;
@@ -197,7 +209,7 @@ class SmartTransactionHook {
   }
 
   #onApproveOrReject() {
-    if (this.#approvalFlowEnded) {
+    if (!this.#shouldShowStatusPage || this.#approvalFlowEnded) {
       return;
     }
     this.#approvalFlowEnded = true;
diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
index e089bd0d07b4..9ba377614910 100644
--- a/app/scripts/metamask-controller.js
+++ b/app/scripts/metamask-controller.js
@@ -2212,6 +2212,7 @@ export default class MetamaskController extends EventEmitter {
           'NetworkController:getNetworkClientById',
           'NetworkController:findNetworkClientIdByChainId',
           'NetworkController:getState',
+          'TransactionController:getState',
         ],
         allowedEvents: [],
       });
diff --git a/shared/types/bridge-status.ts b/shared/types/bridge-status.ts
index f4c5c82d26eb..845a3c7cec65 100644
--- a/shared/types/bridge-status.ts
+++ b/shared/types/bridge-status.ts
@@ -1,5 +1,12 @@
-// eslint-disable-next-line import/no-restricted-paths
-import { ChainId, Quote, QuoteResponse } from '../../ui/pages/bridge/types';
+import { TransactionMeta } from '@metamask/transaction-controller';
+// TODO fix this
+import {
+  ChainId,
+  Quote,
+  QuoteMetadata,
+  QuoteResponse,
+  // eslint-disable-next-line import/no-restricted-paths
+} from '../../ui/pages/bridge/types';
 
 // All fields need to be types not interfaces, same with their children fields
 // o/w you get a type error
@@ -13,7 +20,7 @@ export enum StatusTypes {
 
 export type StatusRequest = {
   bridgeId: string; // lifi, socket, squid
-  srcTxHash: string; // lifi, socket, squid
+  srcTxHash?: string; // lifi, socket, squid, might be undefined for STX
   bridge: string; // lifi, socket, squid
   srcChainId: ChainId; // lifi, socket, squid
   destChainId: ChainId; // lifi, socket, squid
@@ -21,6 +28,10 @@ export type StatusRequest = {
   refuel?: boolean; // lifi
 };
 
+export type StatusRequestWithSrcTxHash = StatusRequest & {
+  srcTxHash: string;
+};
+
 export type Asset = {
   chainId: ChainId;
   address: string;
@@ -32,7 +43,7 @@ export type Asset = {
 
 export type SrcChainStatus = {
   chainId: ChainId;
-  txHash: string;
+  txHash?: string; // might be undefined if this is a smart transaction (STX)
   amount?: string;
   token?: Asset;
 };
@@ -105,6 +116,7 @@ export type RefuelStatusResponse = object & StatusResponse;
 export type RefuelData = object & Step;
 
 export type BridgeHistoryItem = {
+  txMetaId: string; // Need this to handle STX that might not have a txHash immediately
   quote: Quote;
   status: StatusResponse;
   startTime?: number;
@@ -112,13 +124,15 @@ export type BridgeHistoryItem = {
   slippagePercentage: number;
   completionTime?: number;
   pricingData?: {
-    quotedGasInUsd: number;
-    quotedReturnInUsd: number;
-    amountSentInUsd: number;
-    quotedRefuelSrcAmountInUsd?: number;
-    quotedRefuelDestAmountInUsd?: number;
+    amountSent: string; // This is from QuoteMetadata.sentAmount.amount, accounts for the MM fees
+
+    quotedGasInUsd?: string;
+    quotedReturnInUsd?: string;
+    amountSentInUsd?: string;
+    quotedRefuelSrcAmountInUsd?: string;
+    quotedRefuelDestAmountInUsd?: string;
   };
-  initialDestAssetBalance?: number;
+  initialDestAssetBalance?: string;
   targetContractAddress?: string;
   account: string;
 };
@@ -129,16 +143,28 @@ export enum BridgeStatusAction {
   GET_STATE = 'getState',
 }
 
+// The BigNumber values are serialized to strings
+export type QuoteMetadataSerialized = {
+  sentAmount: { amount: string; fiat: string | null };
+};
+
 export type StartPollingForBridgeTxStatusArgs = {
+  bridgeTxMeta: TransactionMeta;
   statusRequest: StatusRequest;
-  quoteResponse: QuoteResponse;
+  quoteResponse: QuoteResponse & QuoteMetadata;
   startTime?: BridgeHistoryItem['startTime'];
   slippagePercentage: BridgeHistoryItem['slippagePercentage'];
-  pricingData?: BridgeHistoryItem['pricingData'];
   initialDestAssetBalance?: BridgeHistoryItem['initialDestAssetBalance'];
   targetContractAddress?: BridgeHistoryItem['targetContractAddress'];
 };
 
+export type StartPollingForBridgeTxStatusArgsSerialized = Omit<
+  StartPollingForBridgeTxStatusArgs,
+  'quoteResponse'
+> & {
+  quoteResponse: QuoteResponse & QuoteMetadataSerialized;
+};
+
 export type SourceChainTxMetaId = string;
 
 export type BridgeStatusControllerState = {
diff --git a/ui/components/app/transaction-list-item/transaction-list-item.component.js b/ui/components/app/transaction-list-item/transaction-list-item.component.js
index 060bc8158e92..5ffcb1405deb 100644
--- a/ui/components/app/transaction-list-item/transaction-list-item.component.js
+++ b/ui/components/app/transaction-list-item/transaction-list-item.component.js
@@ -69,7 +69,10 @@ import { MetaMetricsContext } from '../../../contexts/metametrics';
 import { ActivityListItem } from '../../multichain';
 import { abortTransactionSigning } from '../../../store/actions';
 import { getIsSmartTransaction } from '../../../../shared/modules/selectors';
-import useBridgeTxHistoryData from '../../../hooks/bridge/useBridgeTxHistoryData';
+import {
+  useBridgeTxHistoryData,
+  FINAL_NON_CONFIRMED_STATUSES,
+} from '../../../hooks/bridge/useBridgeTxHistoryData';
 import BridgeActivityItemTxSegments from '../../../pages/bridge/transaction-details/bridge-activity-item-tx-segments';
 
 function TransactionListItemInner({
@@ -93,14 +96,10 @@ function TransactionListItemInner({
   // Bridge transactions
   const isBridgeTx =
     transactionGroup.initialTransaction.type === TransactionType.bridge;
-  const {
-    bridgeTitleSuffix,
-    bridgeTxHistoryItem,
-    isBridgeComplete,
-    showBridgeTxDetails,
-  } = useBridgeTxHistoryData({
-    transactionGroup,
-  });
+  const { bridgeTxHistoryItem, isBridgeComplete, showBridgeTxDetails } =
+    useBridgeTxHistoryData({
+      transactionGroup,
+    });
 
   const {
     initialTransaction: { id },
@@ -309,7 +308,7 @@ function TransactionListItemInner({
             : toggleShowDetails
         }
         className={className}
-        title={`${title}${bridgeTitleSuffix}`}
+        title={title}
         icon={
           ///: BEGIN:ONLY_INCLUDE_IF(build-mmi)
           isCustodian ? (
@@ -355,7 +354,9 @@ function TransactionListItemInner({
           ///: END:ONLY_INCLUDE_IF
         }
         subtitle={
-          isBridgeTx && isBridgeComplete === false ? (
+          !FINAL_NON_CONFIRMED_STATUSES.includes(status) &&
+          isBridgeTx &&
+          !isBridgeComplete ? (
             <BridgeActivityItemTxSegments
               bridgeTxHistoryItem={bridgeTxHistoryItem}
               transactionGroup={transactionGroup}
diff --git a/ui/components/app/transaction-list-item/transaction-list-item.component.test.js b/ui/components/app/transaction-list-item/transaction-list-item.component.test.js
index e305040bf969..cc6e9ff63c70 100644
--- a/ui/components/app/transaction-list-item/transaction-list-item.component.test.js
+++ b/ui/components/app/transaction-list-item/transaction-list-item.component.test.js
@@ -24,6 +24,7 @@ import {
 } from '../../../../shared/constants/metametrics';
 import { MetaMetricsContext } from '../../../contexts/metametrics';
 import { abortTransactionSigning } from '../../../store/actions';
+import { selectBridgeHistoryForAccount } from '../../../ducks/bridge-status/selectors';
 import TransactionListItem from '.';
 
 const FEE_MARKET_ESTIMATE_RETURN_VALUE = {
@@ -62,6 +63,17 @@ jest.mock('react-redux', () => {
   };
 });
 
+jest.mock('../../../hooks/bridge/useBridgeTxHistoryData', () => {
+  return {
+    ...jest.requireActual('../../../hooks/bridge/useBridgeTxHistoryData'),
+    useBridgeTxHistoryData: jest.fn(() => ({
+      bridgeTxHistoryItem: undefined,
+      isBridgeComplete: false,
+      showBridgeTxDetails: false,
+    })),
+  };
+});
+
 jest.mock('../../../hooks/useGasFeeEstimates', () => ({
   useGasFeeEstimates: jest.fn(),
 }));
@@ -110,6 +122,8 @@ const generateUseSelectorRouter = (opts) => (selector) => {
     return opts.shouldShowFiat ?? false;
   } else if (selector === getTokens) {
     return opts.tokens ?? [];
+  } else if (selector === selectBridgeHistoryForAccount) {
+    return opts.bridgeHistory ?? {};
   }
   return undefined;
 };
diff --git a/ui/helpers/utils/token-util.js b/ui/helpers/utils/token-util.js
index f64f74f62fa6..10beae68b39e 100644
--- a/ui/helpers/utils/token-util.js
+++ b/ui/helpers/utils/token-util.js
@@ -217,7 +217,8 @@ export function getTokenFiatAmount(
   if (
     conversionRate <= 0 ||
     !contractExchangeRate ||
-    tokenAmount === undefined
+    tokenAmount === undefined ||
+    tokenAmount === false
   ) {
     return undefined;
   }
diff --git a/ui/hooks/bridge/useBridgeChainInfo.ts b/ui/hooks/bridge/useBridgeChainInfo.ts
index f5229391ff44..b2027af8eb71 100644
--- a/ui/hooks/bridge/useBridgeChainInfo.ts
+++ b/ui/hooks/bridge/useBridgeChainInfo.ts
@@ -1,4 +1,8 @@
 import { useSelector } from 'react-redux';
+import {
+  TransactionMeta,
+  TransactionType,
+} from '@metamask/transaction-controller';
 import { Hex } from '@metamask/utils';
 import { NetworkConfiguration } from '@metamask/network-controller';
 import { Numeric } from '../../../shared/modules/Numeric';
@@ -10,28 +14,53 @@ import {
 } from '../../../shared/constants/network';
 import { CHAINID_DEFAULT_BLOCK_EXPLORER_URL_MAP } from '../../../shared/constants/common';
 
+const getSourceAndDestChainIds = ({
+  bridgeHistoryItem,
+}: UseBridgeChainInfoProps) => {
+  const hexSrcChainId = bridgeHistoryItem
+    ? (new Numeric(
+        bridgeHistoryItem.quote.srcChainId,
+        10,
+      ).toPrefixedHexString() as Hex)
+    : undefined;
+  const hexDestChainId = bridgeHistoryItem
+    ? (new Numeric(
+        bridgeHistoryItem.quote.destChainId,
+        10,
+      ).toPrefixedHexString() as Hex)
+    : undefined;
+
+  return {
+    hexSrcChainId,
+    hexDestChainId,
+  };
+};
+
 export type UseBridgeChainInfoProps = {
   bridgeHistoryItem?: BridgeHistoryItem;
+  srcTxMeta?: TransactionMeta;
 };
 
 export default function useBridgeChainInfo({
   bridgeHistoryItem,
+  srcTxMeta,
 }: UseBridgeChainInfoProps) {
   const networkConfigurationsByChainId = useSelector(
     getNetworkConfigurationsByChainId,
   );
 
-  const decSrcChainId = bridgeHistoryItem?.quote.srcChainId;
-  const hexSrcChainId = decSrcChainId
-    ? (new Numeric(decSrcChainId, 10).toPrefixedHexString() as Hex)
-    : undefined;
+  if (srcTxMeta?.type !== TransactionType.bridge) {
+    return {
+      srcNetwork: undefined,
+      destNetwork: undefined,
+    };
+  }
 
-  const decDestChainId = bridgeHistoryItem?.quote.destChainId;
-  const hexDestChainId = decDestChainId
-    ? (new Numeric(decDestChainId, 10).toPrefixedHexString() as Hex)
-    : undefined;
+  const { hexSrcChainId, hexDestChainId } = getSourceAndDestChainIds({
+    bridgeHistoryItem,
+  });
 
-  if (!bridgeHistoryItem || !hexSrcChainId || !hexDestChainId) {
+  if (!hexSrcChainId || !hexDestChainId) {
     return {
       srcNetwork: undefined,
       destNetwork: undefined,
diff --git a/ui/hooks/bridge/useBridgeTxHistoryData.ts b/ui/hooks/bridge/useBridgeTxHistoryData.ts
index 97cc7f5675a3..6de4f7ef75b5 100644
--- a/ui/hooks/bridge/useBridgeTxHistoryData.ts
+++ b/ui/hooks/bridge/useBridgeTxHistoryData.ts
@@ -1,13 +1,20 @@
 import { useSelector } from 'react-redux';
 import { Hex } from '@metamask/utils';
-import { TransactionMeta } from '@metamask/transaction-controller';
+import {
+  TransactionMeta,
+  TransactionStatus,
+} from '@metamask/transaction-controller';
 import { useHistory } from 'react-router-dom';
 import { selectBridgeHistoryForAccount } from '../../ducks/bridge-status/selectors';
 import { CROSS_CHAIN_SWAP_TX_DETAILS_ROUTE } from '../../helpers/constants/routes';
-import { useI18nContext } from '../useI18nContext';
-import useBridgeChainInfo from './useBridgeChainInfo';
 
-export type UseBridgeDataProps = {
+export const FINAL_NON_CONFIRMED_STATUSES = [
+  TransactionStatus.failed,
+  TransactionStatus.dropped,
+  TransactionStatus.rejected,
+];
+
+export type UseBridgeTxHistoryDataProps = {
   transactionGroup: {
     hasCancelled: boolean;
     hasRetried: boolean;
@@ -18,26 +25,14 @@ export type UseBridgeDataProps = {
   };
 };
 
-export default function useBridgeTxHistoryData({
+export function useBridgeTxHistoryData({
   transactionGroup,
-}: UseBridgeDataProps) {
-  const t = useI18nContext();
+}: UseBridgeTxHistoryDataProps) {
   const history = useHistory();
   const bridgeHistory = useSelector(selectBridgeHistoryForAccount);
-
-  const srcTxHash = transactionGroup.initialTransaction.hash;
-
-  // If this tx is a bridge tx, it will have a bridgeHistoryItem
-  const bridgeHistoryItem = srcTxHash ? bridgeHistory[srcTxHash] : undefined;
-
-  const { destNetwork } = useBridgeChainInfo({
-    bridgeHistoryItem,
-  });
-
-  const destChainName = destNetwork?.name;
-  const bridgeTitleSuffix = destChainName
-    ? t('bridgeToChain', [destChainName])
-    : '';
+  const txMeta = transactionGroup.initialTransaction;
+  const srcTxMetaId = txMeta.id;
+  const bridgeHistoryItem = bridgeHistory[srcTxMetaId];
 
   // By complete, this means BOTH source and dest tx are confirmed
   const isBridgeComplete = bridgeHistoryItem
@@ -47,14 +42,15 @@ export default function useBridgeTxHistoryData({
       )
     : null;
 
-  const showBridgeTxDetails = srcTxHash
-    ? () => {
-        history.push(`${CROSS_CHAIN_SWAP_TX_DETAILS_ROUTE}/${srcTxHash}`);
-      }
-    : null;
+  const showBridgeTxDetails = FINAL_NON_CONFIRMED_STATUSES.includes(
+    txMeta.status,
+  )
+    ? undefined
+    : () => {
+        history.push(`${CROSS_CHAIN_SWAP_TX_DETAILS_ROUTE}/${srcTxMetaId}`);
+      };
 
   return {
-    bridgeTitleSuffix,
     bridgeTxHistoryItem: bridgeHistoryItem,
     isBridgeComplete,
     showBridgeTxDetails,
diff --git a/ui/hooks/useTransactionDisplayData.js b/ui/hooks/useTransactionDisplayData.js
index 2adcdd03e760..66b9102d5c29 100644
--- a/ui/hooks/useTransactionDisplayData.js
+++ b/ui/hooks/useTransactionDisplayData.js
@@ -35,6 +35,7 @@ import { TransactionGroupCategory } from '../../shared/constants/transaction';
 import { captureSingleException } from '../store/actions';
 import { isEqualCaseInsensitive } from '../../shared/modules/string-utils';
 import { getTokenValueParam } from '../../shared/lib/metamask-controller-utils';
+import { selectBridgeHistoryForAccount } from '../ducks/bridge-status/selectors';
 import { useI18nContext } from './useI18nContext';
 import { useTokenFiatAmount } from './useTokenFiatAmount';
 import { useUserPreferencedCurrency } from './useUserPreferencedCurrency';
@@ -43,6 +44,7 @@ import { useTokenDisplayValue } from './useTokenDisplayValue';
 import { useTokenData } from './useTokenData';
 import { useSwappedTokenValue } from './useSwappedTokenValue';
 import { useCurrentAsset } from './useCurrentAsset';
+import useBridgeChainInfo from './bridge/useBridgeChainInfo';
 
 /**
  *  There are seven types of transaction entries that are currently differentiated in the design:
@@ -107,6 +109,16 @@ export function useTransactionDisplayData(transactionGroup) {
   const tokenList = useSelector(getTokenList);
   const t = useI18nContext();
 
+  // Bridge data
+  const bridgeHistory = useSelector(selectBridgeHistoryForAccount);
+  const srcTxMetaId = transactionGroup.initialTransaction.id;
+  const bridgeHistoryItem = bridgeHistory[srcTxMetaId];
+  const { destNetwork } = useBridgeChainInfo({
+    bridgeHistoryItem,
+    srcTxMeta: transactionGroup.initialTransaction,
+  });
+  const destChainName = destNetwork?.name;
+
   const { initialTransaction, primaryTransaction } = transactionGroup;
   // initialTransaction contains the data we need to derive the primary purpose of this transaction group
   const { type } = initialTransaction;
@@ -367,10 +379,12 @@ export function useTransactionDisplayData(transactionGroup) {
     title = t('bridgeApproval', [primaryTransaction.sourceTokenSymbol]);
     subtitle = origin;
     subtitleContainsOrigin = true;
-    primarySuffix = primaryTransaction.sourceTokenSymbol; // TODO this will be undefined right now
+    primarySuffix = primaryTransaction.sourceTokenSymbol;
   } else if (type === TransactionType.bridge) {
-    title = t('bridge');
+    title = t('bridgeToChain', [destChainName || '']);
     category = TransactionGroupCategory.bridge;
+    // TODO add primaryDisplayValue,primarySuffix
+    // also secondaryDisplayValue, secondarySuffix
   } else {
     dispatch(
       captureSingleException(
diff --git a/ui/pages/bridge/hooks/useHandleApprovalTx.ts b/ui/pages/bridge/hooks/useHandleApprovalTx.ts
index c0fb7812cce0..23f4b19cf2b8 100644
--- a/ui/pages/bridge/hooks/useHandleApprovalTx.ts
+++ b/ui/pages/bridge/hooks/useHandleApprovalTx.ts
@@ -42,11 +42,8 @@ export default function useHandleApprovalTx() {
       await handleTx({
         txType: TransactionType.bridgeApproval,
         txParams,
-        swapsOptions: {
-          hasApproveTx: true,
-          meta: {
-            type: TransactionType.bridgeApproval,
-          },
+        fieldsToAddToTxMeta: {
+          sourceTokenSymbol: quoteResponse.quote.srcAsset.symbol,
         },
       });
     }
@@ -74,12 +71,8 @@ export default function useHandleApprovalTx() {
     const txMeta = await handleTx({
       txType: TransactionType.bridgeApproval,
       txParams: approval,
-      swapsOptions: {
-        hasApproveTx: true,
-        meta: {
-          type: TransactionType.bridgeApproval,
-          sourceTokenSymbol: quoteResponse.quote.srcAsset.symbol,
-        },
+      fieldsToAddToTxMeta: {
+        sourceTokenSymbol: quoteResponse.quote.srcAsset.symbol,
       },
     });
 
diff --git a/ui/pages/bridge/hooks/useHandleBridgeTx.ts b/ui/pages/bridge/hooks/useHandleBridgeTx.ts
index f8135a1bbc08..6d35cc931b77 100644
--- a/ui/pages/bridge/hooks/useHandleBridgeTx.ts
+++ b/ui/pages/bridge/hooks/useHandleBridgeTx.ts
@@ -24,20 +24,26 @@ export default function useHandleBridgeTx() {
     const txMeta = await handleTx({
       txType: TransactionType.bridge,
       txParams: quoteResponse.trade,
-      swapsOptions: {
-        hasApproveTx: Boolean(quoteResponse?.approval),
-        meta: {
-          // estimatedBaseFee: decEstimatedBaseFee,
-          // swapMetaData,
-          type: TransactionType.bridge,
-          sourceTokenSymbol: quoteResponse.quote.srcAsset.symbol,
-          destinationTokenSymbol: quoteResponse.quote.destAsset.symbol,
-          destinationTokenDecimals: quoteResponse.quote.destAsset.decimals,
-          destinationTokenAddress: quoteResponse.quote.destAsset.address,
-          approvalTxId,
-          // this is the decimal (non atomic) amount (not USD value) of source token to swap
-          swapTokenValue: sentAmountDec,
-        },
+      fieldsToAddToTxMeta: {
+        // @ts-expect-error TODO get this added to TxMeta type
+        destinationChainId: new Numeric(quoteResponse.quote.destChainId, 10)
+          .toPrefixedHexString()
+          .toLowerCase() as `0x${string}`,
+        // estimatedBaseFee: decEstimatedBaseFee,
+
+        sourceTokenAmount: quoteResponse.quote.srcTokenAmount,
+        sourceTokenSymbol: quoteResponse.quote.srcAsset.symbol,
+        sourceTokenDecimals: quoteResponse.quote.srcAsset.decimals,
+        sourceTokenAddress: quoteResponse.quote.srcAsset.address,
+
+        destinationTokenAmount: quoteResponse.quote.destTokenAmount,
+        destinationTokenSymbol: quoteResponse.quote.destAsset.symbol,
+        destinationTokenDecimals: quoteResponse.quote.destAsset.decimals,
+        destinationTokenAddress: quoteResponse.quote.destAsset.address,
+
+        approvalTxId,
+        // this is the decimal (non atomic) amount (not USD value) of source token to swap
+        swapTokenValue: sentAmountDec,
       },
     });
 
diff --git a/ui/pages/bridge/hooks/useHandleTx.ts b/ui/pages/bridge/hooks/useHandleTx.ts
index ffd378449bc7..70deb084c87c 100644
--- a/ui/pages/bridge/hooks/useHandleTx.ts
+++ b/ui/pages/bridge/hooks/useHandleTx.ts
@@ -5,7 +5,8 @@ import {
 import { useDispatch, useSelector } from 'react-redux';
 import {
   forceUpdateMetamaskState,
-  addTransactionAndWaitForPublish,
+  addTransaction,
+  updateTransaction,
 } from '../../../store/actions';
 import {
   getHexMaxGasLimit,
@@ -26,7 +27,7 @@ export default function useHandleTx() {
   const handleTx = async ({
     txType,
     txParams,
-    swapsOptions,
+    fieldsToAddToTxMeta,
   }: {
     txType: TransactionType.bridgeApproval | TransactionType.bridge;
     txParams: {
@@ -37,10 +38,7 @@ export default function useHandleTx() {
       data: string;
       gasLimit: number | null;
     };
-    swapsOptions: {
-      hasApproveTx: boolean;
-      meta: Partial<TransactionMeta>;
-    };
+    fieldsToAddToTxMeta: Omit<Partial<TransactionMeta>, 'status'>; // We don't add status, so omit it to fix the type error
   }) => {
     const hexChainId = decimalToPrefixedHex(txParams.chainId);
 
@@ -61,12 +59,18 @@ export default function useHandleTx() {
       maxPriorityFeePerGas,
     };
 
-    const txMeta = await addTransactionAndWaitForPublish(finalTxParams, {
+    // Need access to the txMeta.id right away so we can track it in BridgeStatusController,
+    // so we call addTransaction instead of addTransactionAndWaitForPublish
+    // if it's an STX, addTransactionAndWaitForPublish blocks until there is a txHash
+    const txMeta = await addTransaction(finalTxParams, {
       requireApproval: false,
       type: txType,
-      swaps: swapsOptions,
     });
 
+    // Note that updateTransaction doesn't actually error if you add fields that don't conform the to the txMeta type
+    // they will be there at runtime, but you just don't get any type safety checks on them
+    dispatch(updateTransaction({ ...txMeta, ...fieldsToAddToTxMeta }, true));
+
     await forceUpdateMetamaskState(dispatch);
 
     return txMeta;
diff --git a/ui/pages/bridge/hooks/useSubmitBridgeTransaction.test.tsx b/ui/pages/bridge/hooks/useSubmitBridgeTransaction.test.tsx
index 55c19821777b..a84dc7aae443 100644
--- a/ui/pages/bridge/hooks/useSubmitBridgeTransaction.test.tsx
+++ b/ui/pages/bridge/hooks/useSubmitBridgeTransaction.test.tsx
@@ -35,7 +35,7 @@ jest.mock('../../../store/actions', () => {
   const original = jest.requireActual('../../../store/actions');
   return {
     ...original,
-    addTransactionAndWaitForPublish: jest.fn(),
+    addTransaction: jest.fn(),
     addToken: jest.fn().mockImplementation(original.addToken),
     addNetwork: jest.fn().mockImplementation(original.addNetwork),
   };
@@ -132,15 +132,15 @@ describe('ui/pages/bridge/hooks/useSubmitBridgeTransaction', () => {
 
     it('executes bridge transaction', async () => {
       // Setup
-      const mockAddTransactionAndWaitForPublish = jest.fn(() => {
+      const mockAddTransaction = jest.fn(() => {
         return {
           id: 'txMetaId-01',
         };
       });
 
       // For some reason, setBackgroundConnection does not work, gets hung up on the promise, so mock this way instead
-      (actions.addTransactionAndWaitForPublish as jest.Mock).mockImplementation(
-        mockAddTransactionAndWaitForPublish,
+      (actions.addTransaction as jest.Mock).mockImplementation(
+        mockAddTransaction,
       );
       const store = makeMockStore();
       const { result } = renderHook(() => useSubmitBridgeTransaction(), {
@@ -153,7 +153,7 @@ describe('ui/pages/bridge/hooks/useSubmitBridgeTransaction', () => {
       );
 
       // Assert
-      expect(mockAddTransactionAndWaitForPublish).toHaveBeenLastCalledWith(
+      expect(mockAddTransaction).toHaveBeenLastCalledWith(
         {
           chainId: '0x1',
           data: '0x3ce33bff0000000000000000000000000000000000000000000000000000000000000080000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb480000000000000000000000000000000000000000000000000000000000a7d8c000000000000000000000000000000000000000000000000000000000000000c0000000000000000000000000000000000000000000000000000000000000000d6c6966694164617074657256320000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001e0000000000000000000000000e397c4883ec89ed4fc9d258f00c689708b2799c9000000000000000000000000e397c4883ec89ed4fc9d258f00c689708b2799c9000000000000000000000000000000000000000000000000000000000000a4b1000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb48000000000000000000000000af88d065e77c8cc2239327c5edb3a432268e58310000000000000000000000000000000000000000000000000000000000a660c6000000000000000000000000000000000000000000000000000000000000014000000000000000000000000000000000000000000000000000000000000177fa000000000000000000000000e6b738da243e8fa2a0ed5915645789add5de515200000000000000000000000000000000000000000000000000000000000000902340ab8fc3119af1d016a0eec5fe6ef47965741f6f7a4734bf784bf3ae3f2452a0b86991c6218b36c1d19d4a2e9eb0ce3606eb4800000000000000000000000000a660c60000a4b10008df3abdeb853d66fefedfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffd00dfeeddeadbeef8932eb23bad9bddb5cf81426f78279a53c6c3b7100000000000000000000000000000000740cfc1bc02079862368cb4eea1332bd9f2dfa925fc757fd51e40919859b87ca031a2a12d67e4ca4ba67d52b59114b3e18c1e8c839ae015112af82e92251db701b',
@@ -167,34 +167,21 @@ describe('ui/pages/bridge/hooks/useSubmitBridgeTransaction', () => {
         },
         {
           requireApproval: false,
-          swaps: {
-            hasApproveTx: true,
-            meta: {
-              approvalTxId: 'txMetaId-01',
-              destinationTokenAddress:
-                '0xaf88d065e77c8cC2239327C5EDb3A432268e5831',
-              destinationTokenDecimals: 6,
-              destinationTokenSymbol: 'USDC',
-              sourceTokenSymbol: 'USDC',
-              swapTokenValue: '11',
-              type: 'bridge',
-            },
-          },
           type: 'bridge',
         },
       );
     });
     it('executes approval transaction if it exists', async () => {
       // Setup
-      const mockAddTransactionAndWaitForPublish = jest.fn(() => {
+      const mockAddTransaction = jest.fn(() => {
         return {
           id: 'txMetaId-01',
         };
       });
 
       // For some reason, setBackgroundConnection does not work, gets hung up on the promise, so mock this way instead
-      (actions.addTransactionAndWaitForPublish as jest.Mock).mockImplementation(
-        mockAddTransactionAndWaitForPublish,
+      (actions.addTransaction as jest.Mock).mockImplementation(
+        mockAddTransaction,
       );
       const store = makeMockStore();
       const { result } = renderHook(() => useSubmitBridgeTransaction(), {
@@ -207,7 +194,7 @@ describe('ui/pages/bridge/hooks/useSubmitBridgeTransaction', () => {
       );
 
       // Assert
-      expect(mockAddTransactionAndWaitForPublish).toHaveBeenNthCalledWith(
+      expect(mockAddTransaction).toHaveBeenNthCalledWith(
         1,
         {
           chainId: '0x1',
@@ -222,14 +209,10 @@ describe('ui/pages/bridge/hooks/useSubmitBridgeTransaction', () => {
         },
         {
           requireApproval: false,
-          swaps: {
-            hasApproveTx: true,
-            meta: { sourceTokenSymbol: 'USDC', type: 'bridgeApproval' },
-          },
           type: 'bridgeApproval',
         },
       );
-      expect(mockAddTransactionAndWaitForPublish).toHaveBeenNthCalledWith(
+      expect(mockAddTransaction).toHaveBeenNthCalledWith(
         2,
         {
           chainId: '0x1',
@@ -244,19 +227,6 @@ describe('ui/pages/bridge/hooks/useSubmitBridgeTransaction', () => {
         },
         {
           requireApproval: false,
-          swaps: {
-            hasApproveTx: true,
-            meta: {
-              approvalTxId: 'txMetaId-01',
-              destinationTokenAddress:
-                '0xaf88d065e77c8cC2239327C5EDb3A432268e5831',
-              destinationTokenDecimals: 6,
-              destinationTokenSymbol: 'USDC',
-              sourceTokenSymbol: 'USDC',
-              swapTokenValue: '11',
-              type: 'bridge',
-            },
-          },
           type: 'bridge',
         },
       );
@@ -300,14 +270,14 @@ describe('ui/pages/bridge/hooks/useSubmitBridgeTransaction', () => {
         wrapper: makeWrapper(store),
       });
 
-      const mockAddTransactionAndWaitForPublish = jest.fn(() => {
+      const mockAddTransaction = jest.fn(() => {
         return {
           id: 'txMetaId-01',
         };
       });
       // For some reason, setBackgroundConnection does not work, gets hung up on the promise, so mock this way instead
-      (actions.addTransactionAndWaitForPublish as jest.Mock).mockImplementation(
-        mockAddTransactionAndWaitForPublish,
+      (actions.addTransaction as jest.Mock).mockImplementation(
+        mockAddTransaction,
       );
       (actions.addToken as jest.Mock).mockImplementation(
         () => async () => ({}),
@@ -366,14 +336,14 @@ describe('ui/pages/bridge/hooks/useSubmitBridgeTransaction', () => {
         wrapper: makeWrapper(store),
       });
 
-      const mockAddTransactionAndWaitForPublish = jest.fn(() => {
+      const mockAddTransaction = jest.fn(() => {
         return {
           id: 'txMetaId-01',
         };
       });
       // For some reason, setBackgroundConnection does not work, gets hung up on the promise, so mock this way instead
-      (actions.addTransactionAndWaitForPublish as jest.Mock).mockImplementation(
-        mockAddTransactionAndWaitForPublish,
+      (actions.addTransaction as jest.Mock).mockImplementation(
+        mockAddTransaction,
       );
       (actions.addToken as jest.Mock).mockImplementation(
         () => async () => ({}),
@@ -397,14 +367,14 @@ describe('ui/pages/bridge/hooks/useSubmitBridgeTransaction', () => {
       // Setup
       const store = makeMockStore();
 
-      const mockAddTransactionAndWaitForPublish = jest.fn(() => {
+      const mockAddTransaction = jest.fn(() => {
         return {
           id: 'txMetaId-01',
         };
       });
       // For some reason, setBackgroundConnection does not work, gets hung up on the promise, so mock this way instead
-      (actions.addTransactionAndWaitForPublish as jest.Mock).mockImplementation(
-        mockAddTransactionAndWaitForPublish,
+      (actions.addTransaction as jest.Mock).mockImplementation(
+        mockAddTransaction,
       );
       const mockedGetNetworkConfigurationsByChainId =
         // @ts-expect-error this is a jest mock
diff --git a/ui/pages/bridge/hooks/useSubmitBridgeTransaction.ts b/ui/pages/bridge/hooks/useSubmitBridgeTransaction.ts
index fcdf8569bdd0..9985757d7fa3 100644
--- a/ui/pages/bridge/hooks/useSubmitBridgeTransaction.ts
+++ b/ui/pages/bridge/hooks/useSubmitBridgeTransaction.ts
@@ -2,7 +2,7 @@ import { useDispatch } from 'react-redux';
 import { zeroAddress } from 'ethereumjs-util';
 import { useHistory } from 'react-router-dom';
 import { TransactionMeta } from '@metamask/transaction-controller';
-import { QuoteResponse } from '../types';
+import { QuoteMetadata, QuoteResponse } from '../types';
 import { DEFAULT_ROUTE } from '../../../helpers/constants/routes';
 import { setDefaultHomeActiveTabName } from '../../../store/actions';
 import { startPollingForBridgeTxStatus } from '../../../ducks/bridge-status/actions';
@@ -17,41 +17,48 @@ export default function useSubmitBridgeTransaction() {
   const { handleApprovalTx } = useHandleApprovalTx();
   const { handleBridgeTx } = useHandleBridgeTx();
 
-  const submitBridgeTransaction = async (quoteResponse: QuoteResponse) => {
+  const submitBridgeTransaction = async (
+    quoteResponse: QuoteResponse & QuoteMetadata,
+  ) => {
     // Execute transaction(s)
     let approvalTxMeta: TransactionMeta | undefined;
     if (quoteResponse?.approval) {
+      // This will never be an STX
       approvalTxMeta = await handleApprovalTx({
         approval: quoteResponse.approval,
         quoteResponse,
       });
     }
 
+    // Route user to activity tab on Home page
+    // Do it ahead of time because otherwise STX waits for a txHash on TransactionType.bridge and that can take a while
+    await dispatch(setDefaultHomeActiveTabName('activity'));
+    history.push(DEFAULT_ROUTE);
+
     const bridgeTxMeta = await handleBridgeTx({
       quoteResponse,
       approvalTxId: approvalTxMeta?.id,
     });
 
     // Get bridge tx status
-    if (bridgeTxMeta.hash) {
-      const statusRequest = {
-        bridgeId: quoteResponse.quote.bridgeId,
-        srcTxHash: bridgeTxMeta.hash,
-        bridge: quoteResponse.quote.bridges[0],
-        srcChainId: quoteResponse.quote.srcChainId,
-        destChainId: quoteResponse.quote.destChainId,
-        quote: quoteResponse.quote,
-        refuel: Boolean(quoteResponse.quote.refuel),
-      };
-      dispatch(
-        startPollingForBridgeTxStatus({
-          statusRequest,
-          quoteResponse,
-          slippagePercentage: 0, // TODO pull this from redux/bridgecontroller once it's implemented. currently hardcoded in quoteRequest.slippage right now
-          startTime: bridgeTxMeta.time,
-        }),
-      );
-    }
+    const statusRequest = {
+      bridgeId: quoteResponse.quote.bridgeId,
+      srcTxHash: bridgeTxMeta.hash, // This might be undefined for STX
+      bridge: quoteResponse.quote.bridges[0],
+      srcChainId: quoteResponse.quote.srcChainId,
+      destChainId: quoteResponse.quote.destChainId,
+      quote: quoteResponse.quote,
+      refuel: Boolean(quoteResponse.quote.refuel),
+    };
+    dispatch(
+      startPollingForBridgeTxStatus({
+        bridgeTxMeta,
+        statusRequest,
+        quoteResponse,
+        slippagePercentage: 0, // TODO pull this from redux/bridgecontroller once it's implemented. currently hardcoded in quoteRequest.slippage right now
+        startTime: bridgeTxMeta.time,
+      }),
+    );
 
     // Add tokens if not the native gas token
     if (quoteResponse.quote.srcAsset.address !== zeroAddress()) {
@@ -60,10 +67,6 @@ export default function useSubmitBridgeTransaction() {
     if (quoteResponse.quote.destAsset.address !== zeroAddress()) {
       await addDestToken(quoteResponse);
     }
-
-    // Route user to activity tab on Home page
-    await dispatch(setDefaultHomeActiveTabName('activity'));
-    history.push(DEFAULT_ROUTE);
   };
 
   return {
diff --git a/ui/pages/bridge/prepare/bridge-cta-button.tsx b/ui/pages/bridge/prepare/bridge-cta-button.tsx
index 7355e6579dfa..b148b71c67f0 100644
--- a/ui/pages/bridge/prepare/bridge-cta-button.tsx
+++ b/ui/pages/bridge/prepare/bridge-cta-button.tsx
@@ -1,5 +1,5 @@
 import React, { useMemo } from 'react';
-import { useDispatch, useSelector } from 'react-redux';
+import { useSelector } from 'react-redux';
 import { Button } from '../../../components/component-library';
 import {
   getFromAmount,
@@ -13,7 +13,6 @@ import { useI18nContext } from '../../../hooks/useI18nContext';
 import useSubmitBridgeTransaction from '../hooks/useSubmitBridgeTransaction';
 
 export const BridgeCTAButton = () => {
-  const dispatch = useDispatch();
   const t = useI18nContext();
 
   const fromToken = useSelector(getFromToken);
@@ -55,7 +54,7 @@ export const BridgeCTAButton = () => {
       data-testid="bridge-cta-button"
       onClick={() => {
         if (isTxSubmittable) {
-          dispatch(submitBridgeTransaction(activeQuote));
+          submitBridgeTransaction(activeQuote);
         }
       }}
       disabled={!isTxSubmittable}
diff --git a/ui/pages/bridge/transaction-details/bridge-activity-item-tx-segments.tsx b/ui/pages/bridge/transaction-details/bridge-activity-item-tx-segments.tsx
index f19025e9b83b..a757eddffb79 100644
--- a/ui/pages/bridge/transaction-details/bridge-activity-item-tx-segments.tsx
+++ b/ui/pages/bridge/transaction-details/bridge-activity-item-tx-segments.tsx
@@ -14,7 +14,7 @@ import {
   FlexDirection,
   TextColor,
 } from '../../../helpers/constants/design-system';
-import { UseBridgeDataProps } from '../../../hooks/bridge/useBridgeTxHistoryData';
+import { UseBridgeTxHistoryDataProps } from '../../../hooks/bridge/useBridgeTxHistoryData';
 import Segment from './segment';
 
 const getTxIndex = (srcTxStatus: StatusTypes) => {
@@ -35,10 +35,13 @@ const getSrcTxStatus = (initialTransaction: TransactionMeta) => {
     : StatusTypes.PENDING;
 };
 
-const getDestTxStatus = (
-  bridgeTxHistoryItem: BridgeHistoryItem,
-  srcTxStatus: StatusTypes,
-) => {
+const getDestTxStatus = ({
+  bridgeTxHistoryItem,
+  srcTxStatus,
+}: {
+  bridgeTxHistoryItem?: BridgeHistoryItem;
+  srcTxStatus: StatusTypes;
+}) => {
   if (srcTxStatus !== StatusTypes.COMPLETE) {
     return null;
   }
@@ -60,12 +63,12 @@ export default function BridgeActivityItemTxSegments({
   bridgeTxHistoryItem,
   transactionGroup,
 }: {
-  bridgeTxHistoryItem: BridgeHistoryItem;
-  transactionGroup: UseBridgeDataProps['transactionGroup'];
+  bridgeTxHistoryItem?: BridgeHistoryItem;
+  transactionGroup: UseBridgeTxHistoryDataProps['transactionGroup'];
 }) {
   const { initialTransaction } = transactionGroup;
   const srcTxStatus = getSrcTxStatus(initialTransaction);
-  const destTxStatus = getDestTxStatus(bridgeTxHistoryItem, srcTxStatus);
+  const destTxStatus = getDestTxStatus({ bridgeTxHistoryItem, srcTxStatus });
   const txIndex = getTxIndex(srcTxStatus);
 
   return (
diff --git a/ui/pages/bridge/transaction-details/bridge-explorer-links.tsx b/ui/pages/bridge/transaction-details/bridge-explorer-links.tsx
index 570680f416d2..6c7c06338567 100644
--- a/ui/pages/bridge/transaction-details/bridge-explorer-links.tsx
+++ b/ui/pages/bridge/transaction-details/bridge-explorer-links.tsx
@@ -73,9 +73,11 @@ export default function BridgeExplorerLinks({
   const srcButtonText = t('bridgeExplorerLinkViewOn', [
     getBlockExplorerName(srcChainId, srcBlockExplorerUrl),
   ]);
-  const destButtonText = t('bridgeExplorerLinkViewOn', [
-    getBlockExplorerName(destChainId, destBlockExplorerUrl),
-  ]);
+  const destButtonText = destBlockExplorerUrl
+    ? t('bridgeExplorerLinkViewOn', [
+        getBlockExplorerName(destChainId, destBlockExplorerUrl),
+      ])
+    : undefined;
 
   return (
     <Box display={Display.Flex} flexDirection={FlexDirection.Column} gap={4}>
diff --git a/ui/pages/bridge/transaction-details/bridge-step-description.tsx b/ui/pages/bridge/transaction-details/bridge-step-description.tsx
index ef69ea4ed116..03abb77a32e2 100644
--- a/ui/pages/bridge/transaction-details/bridge-step-description.tsx
+++ b/ui/pages/bridge/transaction-details/bridge-step-description.tsx
@@ -117,11 +117,19 @@ const getSwapActionText = (
       ]);
 };
 
-export const getStepStatus = (
-  bridgeHistoryItem: BridgeHistoryItem,
-  step: Step,
-  srcChainTxMeta?: TransactionMeta,
-) => {
+export const getStepStatus = ({
+  bridgeHistoryItem,
+  step,
+  srcChainTxMeta,
+}: {
+  bridgeHistoryItem?: BridgeHistoryItem;
+  step: Step;
+  srcChainTxMeta?: TransactionMeta;
+}) => {
+  if (!bridgeHistoryItem) {
+    return StatusTypes.UNKNOWN;
+  }
+
   if (step.action === ActionTypes.SWAP) {
     return getSwapActionStatus(bridgeHistoryItem, step, srcChainTxMeta);
   } else if (step.action === ActionTypes.BRIDGE) {
diff --git a/ui/pages/bridge/transaction-details/bridge-step-list.tsx b/ui/pages/bridge/transaction-details/bridge-step-list.tsx
index b715c29e1f0e..5c2dcc4453f4 100644
--- a/ui/pages/bridge/transaction-details/bridge-step-list.tsx
+++ b/ui/pages/bridge/transaction-details/bridge-step-list.tsx
@@ -6,6 +6,7 @@ import { Box } from '../../../components/component-library';
 import {
   BridgeHistoryItem,
   StatusTypes,
+  Step,
 } from '../../../../shared/types/bridge-status';
 import { formatDate } from '../../../helpers/utils/util';
 import BridgeStepDescription, {
@@ -29,7 +30,7 @@ const getTime = (
 };
 
 type BridgeStepsProps = {
-  bridgeHistoryItem: BridgeHistoryItem;
+  bridgeHistoryItem?: BridgeHistoryItem;
   srcChainTxMeta?: TransactionMeta;
   networkConfigurationsByChainId: Record<Hex, NetworkConfiguration>;
 };
@@ -39,9 +40,9 @@ export default function BridgeStepList({
   srcChainTxMeta,
   networkConfigurationsByChainId,
 }: BridgeStepsProps) {
-  const { steps } = bridgeHistoryItem.quote;
+  const steps = bridgeHistoryItem?.quote.steps || [];
   const stepStatuses = steps.map((step) =>
-    getStepStatus(bridgeHistoryItem, step, srcChainTxMeta),
+    getStepStatus({ bridgeHistoryItem, step: step as Step, srcChainTxMeta }),
   );
 
   return (
@@ -71,8 +72,8 @@ export default function BridgeStepList({
           getTime(
             i,
             i === steps.length - 1,
-            bridgeHistoryItem.startTime,
-            bridgeHistoryItem.estimatedProcessingTimeInSeconds,
+            bridgeHistoryItem?.startTime || srcChainTxMeta?.time,
+            bridgeHistoryItem?.estimatedProcessingTimeInSeconds || 0,
           ),
           'hh:mm a',
         );
diff --git a/ui/pages/bridge/transaction-details/step-progress-bar-item.tsx b/ui/pages/bridge/transaction-details/step-progress-bar-item.tsx
index 504b2400b7be..95e0b52fcf78 100644
--- a/ui/pages/bridge/transaction-details/step-progress-bar-item.tsx
+++ b/ui/pages/bridge/transaction-details/step-progress-bar-item.tsx
@@ -49,7 +49,7 @@ export default function StepProgressBarItem({
   return (
     <>
       {/* Indicator dots */}
-      {stepStatus === null && (
+      {(stepStatus === null || stepStatus === StatusTypes.UNKNOWN) && (
         <HollowCircle size={ICON_SIZE} color={IconColor.iconMuted} />
       )}
       {stepStatus === StatusTypes.PENDING && (
diff --git a/ui/pages/bridge/transaction-details/transaction-details.tsx b/ui/pages/bridge/transaction-details/transaction-details.tsx
index 780186a671e0..20ee8fb48754 100644
--- a/ui/pages/bridge/transaction-details/transaction-details.tsx
+++ b/ui/pages/bridge/transaction-details/transaction-details.tsx
@@ -23,7 +23,10 @@ import UserPreferencedCurrencyDisplay from '../../../components/app/user-prefere
 import { EtherDenomination } from '../../../../shared/constants/common';
 import { PRIMARY } from '../../../helpers/constants/common';
 import CurrencyDisplay from '../../../components/ui/currency-display/currency-display.component';
-import { StatusTypes } from '../../../../shared/types/bridge-status';
+import {
+  BridgeHistoryItem,
+  StatusTypes,
+} from '../../../../shared/types/bridge-status';
 import {
   AlignItems,
   Display,
@@ -33,7 +36,6 @@ import {
 } from '../../../helpers/constants/design-system';
 import { formatDate } from '../../../helpers/utils/util';
 import { ConfirmInfoRowDivider as Divider } from '../../../components/app/confirm/info/row';
-import { calcTokenAmount } from '../../../../shared/lib/transactions-controller-utils';
 import { useI18nContext } from '../../../hooks/useI18nContext';
 import { CHAIN_ID_TO_NETWORK_IMAGE_URL_MAP } from '../../../../shared/constants/network';
 import { selectedAddressTxListSelector } from '../../../selectors';
@@ -60,6 +62,23 @@ const getBlockExplorerUrl = (
   return `${rootUrl}/tx/${txHash}`;
 };
 
+/**
+ * @param options0
+ * @param options0.bridgeHistoryItem
+ * @returns A string representing the bridge amount in decimal form
+ */
+const getBridgeAmount = ({
+  bridgeHistoryItem,
+}: {
+  bridgeHistoryItem?: BridgeHistoryItem;
+}) => {
+  if (bridgeHistoryItem) {
+    return bridgeHistoryItem.pricingData?.amountSent;
+  }
+
+  return undefined;
+};
+
 const StatusToColorMap: Record<StatusTypes, TextColor> = {
   [StatusTypes.PENDING]: TextColor.warningDefault,
   [StatusTypes.COMPLETE]: TextColor.successDefault,
@@ -71,29 +90,38 @@ const CrossChainSwapTxDetails = () => {
   const t = useI18nContext();
   const rootState = useSelector((state) => state);
   const history = useHistory();
-  const { srcTxHash } = useParams<{ srcTxHash: string }>();
+  const { srcTxMetaId } = useParams<{ srcTxMetaId: string }>();
   const bridgeHistory = useSelector(selectBridgeHistoryForAccount);
   const selectedAddressTxList = useSelector(
     selectedAddressTxListSelector,
   ) as TransactionMeta[];
-  const bridgeHistoryItem = srcTxHash ? bridgeHistory[srcTxHash] : undefined;
+
   const networkConfigurationsByChainId = useSelector(
     getNetworkConfigurationsByChainId,
   );
+
+  const srcChainTxMeta = selectedAddressTxList.find(
+    (tx) => tx.id === srcTxMetaId,
+  );
+  // Even if user is still on /tx-details/txMetaId, we want to be able to show the bridge history item
+  const bridgeHistoryItem = srcTxMetaId
+    ? bridgeHistory[srcTxMetaId]
+    : undefined;
+
   const { srcNetwork, destNetwork } = useBridgeChainInfo({
     bridgeHistoryItem,
+    srcTxMeta: srcChainTxMeta,
   });
 
+  const srcTxHash = srcChainTxMeta?.hash;
   const srcBlockExplorerUrl = getBlockExplorerUrl(srcNetwork, srcTxHash);
 
   const destTxHash = bridgeHistoryItem?.status.destChain?.txHash;
   const destBlockExplorerUrl = getBlockExplorerUrl(destNetwork, destTxHash);
 
-  const srcChainTxMeta = selectedAddressTxList.find(
-    (tx) => tx.hash === srcTxHash,
-  );
-
-  const status = bridgeHistoryItem?.status.status;
+  const status = bridgeHistoryItem
+    ? bridgeHistoryItem?.status.status
+    : StatusTypes.PENDING;
 
   const destChainIconUrl = destNetwork
     ? CHAIN_ID_TO_NETWORK_IMAGE_URL_MAP[
@@ -112,12 +140,7 @@ const CrossChainSwapTxDetails = () => {
       })
     : undefined;
 
-  const bridgeAmount = bridgeHistoryItem
-    ? `${calcTokenAmount(
-        bridgeHistoryItem.quote.srcTokenAmount,
-        bridgeHistoryItem.quote.srcAsset.decimals,
-      ).toFixed()} ${bridgeHistoryItem.quote.srcAsset.symbol}`
-    : undefined;
+  const bridgeAmount = getBridgeAmount({ bridgeHistoryItem });
 
   return (
     <div className="bridge">
@@ -141,13 +164,16 @@ const CrossChainSwapTxDetails = () => {
             flexDirection={FlexDirection.Column}
             gap={4}
           >
-            {status !== StatusTypes.COMPLETE && bridgeHistoryItem && (
-              <BridgeStepList
-                bridgeHistoryItem={bridgeHistoryItem}
-                srcChainTxMeta={srcChainTxMeta}
-                networkConfigurationsByChainId={networkConfigurationsByChainId}
-              />
-            )}
+            {status !== StatusTypes.COMPLETE &&
+              (bridgeHistoryItem || srcChainTxMeta) && (
+                <BridgeStepList
+                  bridgeHistoryItem={bridgeHistoryItem}
+                  srcChainTxMeta={srcChainTxMeta}
+                  networkConfigurationsByChainId={
+                    networkConfigurationsByChainId
+                  }
+                />
+              )}
 
             {/* Links to block explorers */}
             <BridgeExplorerLinks
@@ -156,7 +182,6 @@ const CrossChainSwapTxDetails = () => {
               srcBlockExplorerUrl={srcBlockExplorerUrl}
               destBlockExplorerUrl={destBlockExplorerUrl}
             />
-
             <Divider />
 
             {/* General tx details */}
diff --git a/ui/pages/routes/routes.component.js b/ui/pages/routes/routes.component.js
index c70a808e4478..6212ed4258f3 100644
--- a/ui/pages/routes/routes.component.js
+++ b/ui/pages/routes/routes.component.js
@@ -320,7 +320,7 @@ export default class Routes extends Component {
           <Authenticated path={SEND_ROUTE} component={SendPage} exact />
           <Authenticated path={SWAPS_ROUTE} component={Swaps} />
           <Authenticated
-            path={`${CROSS_CHAIN_SWAP_TX_DETAILS_ROUTE}/:srcTxHash`}
+            path={`${CROSS_CHAIN_SWAP_TX_DETAILS_ROUTE}/:srcTxMetaId`}
             component={CrossChainSwapTxDetails}
             exact
           />
diff --git a/ui/store/actions.ts b/ui/store/actions.ts
index 01b8b9e458d9..5ed6fe7ddf62 100644
--- a/ui/store/actions.ts
+++ b/ui/store/actions.ts
@@ -1066,6 +1066,44 @@ export async function addTransactionAndWaitForPublish(
   );
 }
 
+/**
+ * Wrapper around the promisifedBackground to create a new unapproved
+ * transaction in the background and return the newly created txMeta.
+ * This method does not show errors or route to a confirmation page
+ *
+ * @param txParams - the transaction parameters
+ * @param options - Additional options for the transaction.
+ * @param options.method
+ * @param options.requireApproval - Whether the transaction requires approval.
+ * @param options.swaps - Options specific to swaps transactions.
+ * @param options.swaps.hasApproveTx - Whether the swap required an approval transaction.
+ * @param options.swaps.meta - Additional transaction metadata required by swaps.
+ * @param options.type
+ * @returns
+ */
+export async function addTransaction(
+  txParams: TransactionParams,
+  options: {
+    method?: string;
+    requireApproval?: boolean;
+    swaps?: { hasApproveTx?: boolean; meta?: Record<string, unknown> };
+    type?: TransactionType;
+  },
+): Promise<TransactionMeta> {
+  log.debug('background.addTransaction');
+
+  const actionId = generateActionId();
+
+  return await submitRequestToBackground<TransactionMeta>('addTransaction', [
+    txParams,
+    {
+      ...options,
+      origin: ORIGIN_METAMASK,
+      actionId,
+    },
+  ]);
+}
+
 export function updateAndApproveTx(
   txMeta: TransactionMeta,
   dontShowLoadingIndicator: boolean,

From ceeb5b6e6f46c2c1dae99c5bb1d4a57a0db2ffce Mon Sep 17 00:00:00 2001
From: cryptodev-2s <109512101+cryptodev-2s@users.noreply.github.com>
Date: Thu, 5 Dec 2024 18:05:15 +0100
Subject: [PATCH 042/175] chore: bump `@metamask/preferences-controller` to
 `15.0.1` (#28960)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<!--
Please submit this PR as a draft initially.
Do not mark it as "Ready for review" until the template has been
completely filled out, and PR status checks have passed at least once.
-->

## **Description**

<!--
Write a short description of the changes included in this pull request,
also include relevant motivation and context. Have in mind the following
questions:
1. What is the reason for the change?
2. What is the improvement/solution?
-->

This PR bumps `@metamask/preferences-controller` to `15.0.1`

[![Open in GitHub
Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/28960?quickstart=1)

## **Related issues**

Fixes: https://github.com/MetaMask/metamask-extension/issues/28630

## **Manual testing steps**

## **Screenshots/Recordings**

<!-- If applicable, add screenshots and/or recordings to visualize the
before and after of your change. -->

### **Before**

<!-- [screenshots/recordings] -->

### **After**

<!-- [screenshots/recordings] -->

## **Pre-merge author checklist**

- [x] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension Coding
Standards](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/CODING_GUIDELINES.md).
- [x] I've completed the PR template to the best of my ability
- [x] I’ve included tests if applicable
- [x] I’ve documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [x] I’ve applied the right labels on the PR (see [labeling
guidelines](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.

## **Pre-merge reviewer checklist**

- [ ] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed).
- [ ] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.
---
 package.json |  2 +-
 yarn.lock    | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/package.json b/package.json
index d5d55fc295e5..0512697b65a1 100644
--- a/package.json
+++ b/package.json
@@ -469,7 +469,7 @@
     "@metamask/eth-json-rpc-provider": "^4.1.6",
     "@metamask/forwarder": "^1.1.0",
     "@metamask/phishing-warning": "^4.1.0",
-    "@metamask/preferences-controller": "^14.0.0",
+    "@metamask/preferences-controller": "^15.0.1",
     "@metamask/test-bundler": "^1.0.0",
     "@metamask/test-dapp": "8.13.0",
     "@octokit/core": "^3.6.0",
diff --git a/yarn.lock b/yarn.lock
index 4433f04769b4..65487c091cab 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5954,15 +5954,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/preferences-controller@npm:^14.0.0":
-  version: 14.0.0
-  resolution: "@metamask/preferences-controller@npm:14.0.0"
+"@metamask/preferences-controller@npm:^15.0.1":
+  version: 15.0.1
+  resolution: "@metamask/preferences-controller@npm:15.0.1"
   dependencies:
     "@metamask/base-controller": "npm:^7.0.2"
-    "@metamask/controller-utils": "npm:^11.4.3"
+    "@metamask/controller-utils": "npm:^11.4.4"
   peerDependencies:
-    "@metamask/keyring-controller": ^18.0.0
-  checksum: 10/cc1fdfe4dc6f4c058c518b59f13b7badd0de92e04e143aec6787be3a8807364d545dcb26172dd005e0d6865b06614b963385f0863a3e2a04d234bd6d33474942
+    "@metamask/keyring-controller": ^19.0.0
+  checksum: 10/d31d998e3778f108787115cec73a8ad2a455b50c0f80b386f39287e9799e36ec49554e0071aca505039ab982df42ce7db0af50b8e26bcb34926beab9ba54578d
   languageName: node
   linkType: hard
 
@@ -26467,7 +26467,7 @@ __metadata:
     "@metamask/polling-controller": "npm:^12.0.1"
     "@metamask/post-message-stream": "npm:^8.0.0"
     "@metamask/ppom-validator": "npm:0.35.1"
-    "@metamask/preferences-controller": "npm:^14.0.0"
+    "@metamask/preferences-controller": "npm:^15.0.1"
     "@metamask/preinstalled-example-snap": "npm:^0.2.0"
     "@metamask/profile-sync-controller": "npm:^2.0.0"
     "@metamask/providers": "npm:^18.2.0"

From 3833c747edc319896703790caaa9a45b1e86096b Mon Sep 17 00:00:00 2001
From: David Murdoch <187813+davidmurdoch@users.noreply.github.com>
Date: Thu, 5 Dec 2024 12:46:43 -0500
Subject: [PATCH 043/175] fix: remove extension from webpack config import
 (#28111)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<!--
Please submit this PR as a draft initially.
Do not mark it as "Ready for review" until the template has been
completely filled out, and PR status checks have passed at least once.


## **Description**

<!--
Write a short description of the changes included in this pull request,
also include relevant motivation and context. Have in mind the following
questions:
1. What is the reason for the change?
2. What is the improvement/solution?


[![Open in GitHub
Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/28111?quickstart=1)

## **Related issues**

Fixes:

## **Manual testing steps**

1. Go to this page...
2.
3.

## **Screenshots/Recordings**

### **Before**


### **After**


## **Pre-merge author checklist**

- [ ] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension Coding
Standards](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/CODING_GUIDELINES.md).
- [ ] I've completed the PR template to the best of my ability
- [ ] I’ve included tests if applicable
- [ ] I’ve documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [ ] I’ve applied the right labels on the PR (see [labeling
guidelines](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.

## **Pre-merge reviewer checklist**

- [ ] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed).
- [ ] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.
-->
---
 development/webpack/build.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/development/webpack/build.ts b/development/webpack/build.ts
index 12ce2c95e693..4c102512ed0b 100644
--- a/development/webpack/build.ts
+++ b/development/webpack/build.ts
@@ -1,7 +1,7 @@
 import { webpack } from 'webpack';
 import type WebpackDevServerType from 'webpack-dev-server';
 import { noop, logStats, __HMR_READY__ } from './utils/helpers';
-import config from './webpack.config.js';
+import config from './webpack.config';
 
 // disable browserslist stats as it needlessly traverses the filesystem multiple
 // times looking for a stats file that doesn't exist.

From 5cc3f2d180b0acebb934b5bacecabc97898c2ca5 Mon Sep 17 00:00:00 2001
From: cryptodev-2s <109512101+cryptodev-2s@users.noreply.github.com>
Date: Thu, 5 Dec 2024 19:32:05 +0100
Subject: [PATCH 044/175] chore: bump `@metamask/ppom-validator` to `0.36.0`
 (#28958)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<!--
Please submit this PR as a draft initially.
Do not mark it as "Ready for review" until the template has been
completely filled out, and PR status checks have passed at least once.
-->

## **Description**

This PR updates `@metamask/ppom-validator` to version `0.36.0`, which
now uses `@metamask/network-controller` version 22.0.0 as a peer
dependency.

<!--
Write a short description of the changes included in this pull request,
also include relevant motivation and context. Have in mind the following
questions:
1. What is the reason for the change?
2. What is the improvement/solution?
-->

[![Open in GitHub
Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/28958?quickstart=1)

## **Related issues**

Fixes:

## **Screenshots/Recordings**

<!-- If applicable, add screenshots and/or recordings to visualize the
before and after of your change. -->

### **Before**

<!-- [screenshots/recordings] -->

### **After**

<!-- [screenshots/recordings] -->

## **Pre-merge author checklist**

- [x] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension Coding
Standards](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/CODING_GUIDELINES.md).
- [x] I've completed the PR template to the best of my ability
- [x] I’ve included tests if applicable
- [x] I’ve documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [x] I’ve applied the right labels on the PR (see [labeling
guidelines](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.

## **Pre-merge reviewer checklist**

- [ ] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed).
- [ ] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.
---
 ...ask-ppom-validator-npm-0.32.0-f677deea54.patch | 15 ---------------
 package.json                                      |  3 +--
 yarn.lock                                         | 12 ++++++------
 3 files changed, 7 insertions(+), 23 deletions(-)
 delete mode 100644 .yarn/patches/@metamask-ppom-validator-npm-0.32.0-f677deea54.patch

diff --git a/.yarn/patches/@metamask-ppom-validator-npm-0.32.0-f677deea54.patch b/.yarn/patches/@metamask-ppom-validator-npm-0.32.0-f677deea54.patch
deleted file mode 100644
index d996c0bdd022..000000000000
--- a/.yarn/patches/@metamask-ppom-validator-npm-0.32.0-f677deea54.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/dist/ppom-controller.js b/dist/ppom-controller.js
-index 9cf1502efabec00b25ad381bf2001200ccc9f34f..bfe55b6e68989f794deab069e8b80fc8d719ec25 100644
---- a/dist/ppom-controller.js
-+++ b/dist/ppom-controller.js
-@@ -203,7 +203,9 @@ async function _PPOMController_initialisePPOM() {
-         console.error(`Error in deleting files: ${error.message}`);
-     });
- }, _PPOMController_onNetworkChange = function _PPOMController_onNetworkChange(networkControllerState) {
--    const id = (0, util_1.addHexPrefix)(networkControllerState.providerConfig.chainId);
-+    const selectedNetworkClient = this.messagingSystem.call('NetworkController:getNetworkClientById', networkControllerState.selectedNetworkClientId);
-+    const { chainId } = selectedNetworkClient.configuration;
-+    const id = (0, util_1.addHexPrefix)(chainId);
-     if (id === __classPrivateFieldGet(this, _PPOMController_chainId, "f")) {
-         return;
-     }
diff --git a/package.json b/package.json
index 0512697b65a1..ee7f4828808c 100644
--- a/package.json
+++ b/package.json
@@ -242,7 +242,6 @@
     "@expo/config-plugins/glob": "^10.3.10",
     "@solana/web3.js/rpc-websockets": "^8.0.1",
     "@metamask/nonce-tracker@npm:^5.0.0": "patch:@metamask/nonce-tracker@npm%3A5.0.0#~/.yarn/patches/@metamask-nonce-tracker-npm-5.0.0-d81478218e.patch",
-    "@metamask/network-controller@npm:^21.0.0": "patch:@metamask/network-controller@npm%3A22.0.2#~/.yarn/patches/@metamask-network-controller-npm-22.0.2-6fc65c500a.patch",
     "@metamask/network-controller@npm:^22.0.0": "patch:@metamask/network-controller@npm%3A22.1.0#~/.yarn/patches/@metamask-network-controller-npm-22.1.0-621c281f70.patch",
     "path-to-regexp": "1.9.0",
     "@ledgerhq/cryptoassets-evm-signatures/axios": "^0.28.0",
@@ -330,7 +329,7 @@
     "@metamask/phishing-controller": "^12.3.0",
     "@metamask/polling-controller": "^12.0.1",
     "@metamask/post-message-stream": "^8.0.0",
-    "@metamask/ppom-validator": "0.35.1",
+    "@metamask/ppom-validator": "0.36.0",
     "@metamask/preinstalled-example-snap": "^0.2.0",
     "@metamask/profile-sync-controller": "^2.0.0",
     "@metamask/providers": "^18.2.0",
diff --git a/yarn.lock b/yarn.lock
index 65487c091cab..f751769212e7 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5936,9 +5936,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/ppom-validator@npm:0.35.1":
-  version: 0.35.1
-  resolution: "@metamask/ppom-validator@npm:0.35.1"
+"@metamask/ppom-validator@npm:0.36.0":
+  version: 0.36.0
+  resolution: "@metamask/ppom-validator@npm:0.36.0"
   dependencies:
     "@metamask/base-controller": "npm:^7.0.1"
     "@metamask/controller-utils": "npm:^11.3.0"
@@ -5949,8 +5949,8 @@ __metadata:
     eslint-plugin-n: "npm:^16.6.2"
     json-rpc-random-id: "npm:^1.0.1"
   peerDependencies:
-    "@metamask/network-controller": ^21.0.0
-  checksum: 10/3dd37ced473a78e4b7847c61b6c6fb1e2ae4865dee67de9574462fd618dc5ea7be46874f12ff18383702c46c9c07c32dbac00be2e6ad26cb45a3dcc4ffa09ab7
+    "@metamask/network-controller": ^22.0.0
+  checksum: 10/6819ed45e9fadaa2078db37fc9c50bcedfd8564cd955a97c4dbcde6516210380e3a215c2740ebb8b24b24d9bd92e52e036b80037443a96b7f2f12b4932af34cc
   languageName: node
   linkType: hard
 
@@ -26466,7 +26466,7 @@ __metadata:
     "@metamask/phishing-warning": "npm:^4.1.0"
     "@metamask/polling-controller": "npm:^12.0.1"
     "@metamask/post-message-stream": "npm:^8.0.0"
-    "@metamask/ppom-validator": "npm:0.35.1"
+    "@metamask/ppom-validator": "npm:0.36.0"
     "@metamask/preferences-controller": "npm:^15.0.1"
     "@metamask/preinstalled-example-snap": "npm:^0.2.0"
     "@metamask/profile-sync-controller": "npm:^2.0.0"

From 27f3c21f4887fe0528acd9b7bf1b47de22d86cc7 Mon Sep 17 00:00:00 2001
From: Charly Chevalier <charly.chevalier@consensys.net>
Date: Thu, 5 Dec 2024 21:00:48 +0100
Subject: [PATCH 045/175] chore: bump `@metamask/account-watcher` to `^4.2.2`
 (#28915)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## **Description**

This new version now uses `devDependencies` rather than `dependencies`,
which avoid pulling unnecessary deps into the main tree (check the
`yarn.lock`).

[![Open in GitHub
Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/28915?quickstart=1)

## **Related issues**

N/A

## **Manual testing steps**

N/A

## **Screenshots/Recordings**

### **Before**

### **After**

## **Pre-merge author checklist**

- [x] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension Coding
Standards](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/CODING_GUIDELINES.md).
- [x] I've completed the PR template to the best of my ability
- [x] I’ve included tests if applicable
- [x] I’ve documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [x] I’ve applied the right labels on the PR (see [labeling
guidelines](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.

## **Pre-merge reviewer checklist**

- [ ] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed).
- [ ] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.
---
 package.json |  2 +-
 yarn.lock    | 40 ++++++++--------------------------------
 2 files changed, 9 insertions(+), 33 deletions(-)

diff --git a/package.json b/package.json
index ee7f4828808c..70bf454023eb 100644
--- a/package.json
+++ b/package.json
@@ -282,7 +282,7 @@
     "@metamask-institutional/transaction-update": "^0.2.6",
     "@metamask-institutional/types": "^1.2.0",
     "@metamask/abi-utils": "^2.0.2",
-    "@metamask/account-watcher": "^4.1.1",
+    "@metamask/account-watcher": "^4.1.2",
     "@metamask/accounts-controller": "^20.0.0",
     "@metamask/address-book-controller": "^6.0.0",
     "@metamask/announcement-controller": "^7.0.0",
diff --git a/yarn.lock b/yarn.lock
index f751769212e7..13341ff90db7 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2365,7 +2365,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@ethereumjs/tx@npm:^5.1.0, @ethereumjs/tx@npm:^5.2.1, @ethereumjs/tx@npm:^5.3.0":
+"@ethereumjs/tx@npm:^5.2.1, @ethereumjs/tx@npm:^5.3.0":
   version: 5.4.0
   resolution: "@ethereumjs/tx@npm:5.4.0"
   dependencies:
@@ -2388,7 +2388,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@ethereumjs/util@npm:^9.0.1, @ethereumjs/util@npm:^9.0.2, @ethereumjs/util@npm:^9.0.3, @ethereumjs/util@npm:^9.1.0":
+"@ethereumjs/util@npm:^9.0.2, @ethereumjs/util@npm:^9.0.3, @ethereumjs/util@npm:^9.1.0":
   version: 9.1.0
   resolution: "@ethereumjs/util@npm:9.1.0"
   dependencies:
@@ -4835,18 +4835,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/account-watcher@npm:^4.1.1":
-  version: 4.1.1
-  resolution: "@metamask/account-watcher@npm:4.1.1"
-  dependencies:
-    "@ethereumjs/tx": "npm:^5.1.0"
-    "@ethereumjs/util": "npm:^9.0.1"
-    "@metamask/keyring-api": "npm:^8.1.3"
-    "@metamask/snaps-sdk": "npm:^6.2.1"
-    "@metamask/utils": "npm:^8.3.0"
-    ethers: "npm:^5.7.2"
-    uuid: "npm:^9.0.0"
-  checksum: 10/a1b53cdcd3a5844c1edd2e91bf6d2e5a1f3914f795c928f9611c56bc4133c8338e4ae491cb2fda7273e59830a1d613ce17997a0639bb82ec5c71c2f0b260d88e
+"@metamask/account-watcher@npm:^4.1.2":
+  version: 4.1.2
+  resolution: "@metamask/account-watcher@npm:4.1.2"
+  checksum: 10/366e69b6d8fd0f68eb77cfe4c9c5dd1fb74107978a6609f7c0dcd0a1f21a2bf44fae6442165d993f700ef75120808c91e3ae84baeb78b7292458586311cb8c2f
   languageName: node
   linkType: hard
 
@@ -5613,22 +5605,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/keyring-api@npm:^8.1.3":
-  version: 8.1.3
-  resolution: "@metamask/keyring-api@npm:8.1.3"
-  dependencies:
-    "@metamask/snaps-sdk": "npm:^6.5.1"
-    "@metamask/superstruct": "npm:^3.1.0"
-    "@metamask/utils": "npm:^9.2.1"
-    "@types/uuid": "npm:^9.0.8"
-    bech32: "npm:^2.0.0"
-    uuid: "npm:^9.0.1"
-  peerDependencies:
-    "@metamask/providers": ^17.2.0
-  checksum: 10/9857b6286760d22b1b7102ea8bdf03ebf56c71e9f0adee19a2230def6b7a9230561c1a3bfcb308735b79ab9a5afa9afd07a1617c1d165f63d193cd6a6b6e7a15
-  languageName: node
-  linkType: hard
-
 "@metamask/keyring-api@npm:^9.0.0":
   version: 9.0.0
   resolution: "@metamask/keyring-api@npm:9.0.0"
@@ -18776,7 +18752,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"ethers@npm:5.7.2, ethers@npm:^5.7.0, ethers@npm:^5.7.2":
+"ethers@npm:5.7.2, ethers@npm:^5.7.0":
   version: 5.7.2
   resolution: "ethers@npm:5.7.2"
   dependencies:
@@ -26407,7 +26383,7 @@ __metadata:
     "@metamask-institutional/transaction-update": "npm:^0.2.6"
     "@metamask-institutional/types": "npm:^1.2.0"
     "@metamask/abi-utils": "npm:^2.0.2"
-    "@metamask/account-watcher": "npm:^4.1.1"
+    "@metamask/account-watcher": "npm:^4.1.2"
     "@metamask/accounts-controller": "npm:^20.0.0"
     "@metamask/address-book-controller": "npm:^6.0.0"
     "@metamask/announcement-controller": "npm:^7.0.0"

From 456e63f4dc26f0603ff0d4fb3a11de254b642622 Mon Sep 17 00:00:00 2001
From: Priya <priya.narayanaswamy@consensys.net>
Date: Fri, 6 Dec 2024 04:06:59 +0800
Subject: [PATCH 046/175] test: fix flaky erc20 send token e2e (#28775)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<!--
Please submit this PR as a draft initially.
Do not mark it as "Ready for review" until the template has been
completely filled out, and PR status checks have passed at least once.
-->

## **Description**

The issue is that sometimes when clicking on the watchAssets button from
the test dapp the metamask dialog does not open. The test dapp button is
present and enabled but for some reason clicking on it does nothing.
However if you wait for a second and then click this seems to solve the
issue.

Also tried to wait until the page is loaded, element is present, visible
and enabled, however, the flakiness persists. Hence added a hardcoded
wait.

[![Open in GitHub
Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/28775?quickstart=1)

## **Related issues**

Fixes:
[#28700](https://github.com/MetaMask/metamask-extension/issues/28700)

## **Manual testing steps**

1. Go to this page...
2.
3.

## **Screenshots/Recordings**

<!-- If applicable, add screenshots and/or recordings to visualize the
before and after of your change. -->

### **Before**

<!-- [screenshots/recordings] -->

### **After**

<!-- [screenshots/recordings] -->

## **Pre-merge author checklist**

- [ ] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension Coding
Standards](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/CODING_GUIDELINES.md).
- [ ] I've completed the PR template to the best of my ability
- [ ] I’ve included tests if applicable
- [ ] I’ve documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [ ] I’ve applied the right labels on the PR (see [labeling
guidelines](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.

## **Pre-merge reviewer checklist**

- [ ] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed).
- [ ] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.

Co-authored-by: Harika <153644847+hjetpoluru@users.noreply.github.com>
---
 .../transactions/erc20-token-send-redesign.spec.ts              | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/test/e2e/tests/confirmations/transactions/erc20-token-send-redesign.spec.ts b/test/e2e/tests/confirmations/transactions/erc20-token-send-redesign.spec.ts
index 036a8287882c..317d97abef6e 100644
--- a/test/e2e/tests/confirmations/transactions/erc20-token-send-redesign.spec.ts
+++ b/test/e2e/tests/confirmations/transactions/erc20-token-send-redesign.spec.ts
@@ -127,6 +127,7 @@ async function createWalletInitiatedTransactionAndAssertDetails(
 
   await testDapp.openTestDappPage({ contractAddress, url: DAPP_URL });
 
+  await driver.delay(1000);
   await testDapp.clickERC20WatchAssetButton();
 
   await driver.switchToWindowWithTitle(WINDOW_TITLES.Dialog);
@@ -172,6 +173,7 @@ async function createDAppInitiatedTransactionAndAssertDetails(
 
   await testDapp.openTestDappPage({ contractAddress, url: DAPP_URL });
 
+  await driver.delay(1000);
   await testDapp.clickERC20WatchAssetButton();
 
   await driver.delay(veryLargeDelayMs);

From 4fc45f0bf49ce0a79683b53013b0297a1501d4d7 Mon Sep 17 00:00:00 2001
From: Salim TOUBAL <salim.toubal@outlook.com>
Date: Fri, 6 Dec 2024 00:48:36 +0100
Subject: [PATCH 047/175] feat: migrate base mainnet rpc to infura (#28974)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<!--
Please submit this PR as a draft initially.
Do not mark it as "Ready for review" until the template has been
completely filled out, and PR status checks have passed at least once.
-->

## **Description**
This PR introduces a migration to replace the Base network RPC URL
(`https://mainnet.base.org`) with the new Infura RPC URL
(`https://base-mainnet.infura.io/v3/{infuraProjectId}`) in the MetaMask
state.

<!--
Write a short description of the changes included in this pull request,
also include relevant motivation and context. Have in mind the following
questions:
1. What is the reason for the change?
2. What is the improvement/solution?
-->

[![Open in GitHub
Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/28895?quickstart=1)

## **Related issues**

Fixes:

## **Manual testing steps**

1. build the app on main branch and put the file on tmp-chrome folder
2. Add base network
3. build the app on the current branch
4. replace the main build with the new one
5. base url should be updated

## **Screenshots/Recordings**

<!-- If applicable, add screenshots and/or recordings to visualize the
before and after of your change. -->

### **Before**

<!-- [screenshots/recordings] -->
<img width="354" alt="before"
src="https://github.com/user-attachments/assets/d83b8341-1f10-4357-a9cf-e93fa2be8c9c">


### **After**

<!-- [screenshots/recordings] -->

<img width="356" alt="Screenshot 2024-12-05 at 20 12 53"
src="https://github.com/user-attachments/assets/475ea767-b4c2-4b92-bd75-0948b379ac8b">





## **Pre-merge author checklist**

- [x] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension Coding
Standards](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/CODING_GUIDELINES.md).
- [x] I've completed the PR template to the best of my ability
- [x] I’ve included tests if applicable
- [x] I’ve documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [x] I’ve applied the right labels on the PR (see [labeling
guidelines](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.

## **Pre-merge reviewer checklist**

- [ ] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed).
- [ ] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.
---
 app/scripts/migrations/135.test.ts | 254 +++++++++++++++++++++++++++++
 app/scripts/migrations/135.ts      | 128 +++++++++++++++
 app/scripts/migrations/index.js    |   1 +
 shared/constants/network.test.ts   |   4 +-
 shared/constants/network.ts        |  64 +++++++-
 5 files changed, 448 insertions(+), 3 deletions(-)
 create mode 100644 app/scripts/migrations/135.test.ts
 create mode 100644 app/scripts/migrations/135.ts

diff --git a/app/scripts/migrations/135.test.ts b/app/scripts/migrations/135.test.ts
new file mode 100644
index 000000000000..d016c10b7edc
--- /dev/null
+++ b/app/scripts/migrations/135.test.ts
@@ -0,0 +1,254 @@
+import { cloneDeep } from 'lodash';
+import { NetworkState } from '@metamask/network-controller';
+import { infuraProjectId } from '../../../shared/constants/network';
+import { migrate, version } from './135';
+
+const oldVersion = 134;
+const BASE_CHAIN_ID = '0x2105';
+
+describe('migration #135', () => {
+  it('updates the version metadata', async () => {
+    const oldStorage = {
+      meta: { version: oldVersion },
+      data: {},
+    };
+
+    const newStorage = await migrate(cloneDeep(oldStorage));
+
+    expect(newStorage.meta).toStrictEqual({ version });
+  });
+
+  describe('Base Network Migration', () => {
+    it('does nothing if networkConfigurationsByChainId is not in state', async () => {
+      const oldState = {
+        OtherController: {},
+      };
+
+      const transformedState = await migrate({
+        meta: { version: oldVersion },
+        data: cloneDeep(oldState),
+      });
+
+      expect(transformedState.data).toEqual(oldState);
+    });
+
+    it('does nothing if no Infura RPC endpoints are used', async () => {
+      const oldState = {
+        NetworkController: {
+          networkConfigurationsByChainId: {
+            '0x1': {
+              rpcEndpoints: [
+                {
+                  url: 'https://custom.rpc',
+                  type: 'custom',
+                },
+              ],
+              defaultRpcEndpointIndex: 0,
+            },
+          },
+        },
+      };
+
+      const transformedState = await migrate({
+        meta: { version: oldVersion },
+        data: cloneDeep(oldState),
+      });
+
+      expect(transformedState.data).toEqual(oldState);
+    });
+
+    it('does nothing if Base network configuration is missing', async () => {
+      const oldState = {
+        NetworkController: {
+          networkConfigurationsByChainId: {
+            '0x1': {
+              rpcEndpoints: [
+                {
+                  url: `https://mainnet.infura.io/v3/${infuraProjectId}`,
+                  type: 'infura',
+                },
+              ],
+              defaultRpcEndpointIndex: 0,
+            },
+          },
+        },
+      };
+
+      const transformedState = await migrate({
+        meta: { version: oldVersion },
+        data: cloneDeep(oldState),
+      });
+
+      expect(transformedState.data).toEqual(oldState);
+    });
+
+    it('replaces "https://mainnet.base.org" if the default RPC endpoint is Infura', async () => {
+      const oldState = {
+        NetworkController: {
+          networkConfigurationsByChainId: {
+            [BASE_CHAIN_ID]: {
+              rpcEndpoints: [
+                {
+                  url: 'https://mainnet.base.org',
+                  type: 'custom',
+                },
+              ],
+              defaultRpcEndpointIndex: 0,
+            },
+            '0x1': {
+              rpcEndpoints: [
+                {
+                  url: `https://mainnet.infura.io/v3/${infuraProjectId}`,
+                  type: 'infura',
+                },
+              ],
+              defaultRpcEndpointIndex: 0,
+            },
+          },
+        },
+      };
+
+      const transformedState = await migrate({
+        meta: { version: oldVersion },
+        data: cloneDeep(oldState),
+      });
+
+      const updatedNetworkController = transformedState.data
+        .NetworkController as NetworkState;
+
+      expect(
+        updatedNetworkController.networkConfigurationsByChainId[BASE_CHAIN_ID]
+          .rpcEndpoints[0].url,
+      ).toEqual(`https://base-mainnet.infura.io/v3/${infuraProjectId}`);
+    });
+
+    it('does not modify RPC endpoints if the default RPC endpoint is not Infura', async () => {
+      const oldState = {
+        NetworkController: {
+          networkConfigurationsByChainId: {
+            [BASE_CHAIN_ID]: {
+              rpcEndpoints: [
+                {
+                  url: 'https://other.rpc',
+                  type: 'custom',
+                },
+              ],
+              defaultRpcEndpointIndex: 0,
+            },
+            '0x1': {
+              rpcEndpoints: [
+                {
+                  url: 'https://custom.rpc',
+                  type: 'custom',
+                },
+              ],
+              defaultRpcEndpointIndex: 0,
+            },
+          },
+        },
+      };
+
+      const transformedState = await migrate({
+        meta: { version: oldVersion },
+        data: cloneDeep(oldState),
+      });
+
+      const updatedNetworkController = transformedState.data
+        .NetworkController as NetworkState;
+
+      expect(
+        updatedNetworkController.networkConfigurationsByChainId[BASE_CHAIN_ID]
+          .rpcEndpoints[0].url,
+      ).toEqual('https://other.rpc');
+    });
+
+    it('keeps defaultRpcEndpointIndex unchanged when replacing "https://mainnet.base.org"', async () => {
+      const oldState = {
+        NetworkController: {
+          networkConfigurationsByChainId: {
+            [BASE_CHAIN_ID]: {
+              rpcEndpoints: [
+                {
+                  url: 'https://mainnet.base.org',
+                  type: 'custom',
+                },
+              ],
+              defaultRpcEndpointIndex: 0,
+            },
+            '0x1': {
+              rpcEndpoints: [
+                {
+                  url: `https://mainnet.infura.io/v3/${infuraProjectId}`,
+                  type: 'infura',
+                },
+              ],
+              defaultRpcEndpointIndex: 0,
+            },
+          },
+        },
+      };
+
+      const transformedState = await migrate({
+        meta: { version: oldVersion },
+        data: cloneDeep(oldState),
+      });
+
+      const updatedNetworkController = transformedState.data
+        .NetworkController as NetworkState;
+
+      expect(
+        updatedNetworkController.networkConfigurationsByChainId[BASE_CHAIN_ID]
+          .defaultRpcEndpointIndex,
+      ).toEqual(0);
+    });
+
+    it('does nothing if Linea mainnet is excluded', async () => {
+      const oldState = {
+        NetworkController: {
+          networkConfigurationsByChainId: {
+            [BASE_CHAIN_ID]: {
+              rpcEndpoints: [
+                {
+                  url: 'https://mainnet.base.org',
+                  type: 'custom',
+                },
+              ],
+              defaultRpcEndpointIndex: 0,
+            },
+            '0x1': {
+              rpcEndpoints: [
+                {
+                  url: `https://mainnet.infura.io/v3/${infuraProjectId}`,
+                  type: 'infura',
+                },
+              ],
+              defaultRpcEndpointIndex: 0,
+            },
+            '0x13881': {
+              rpcEndpoints: [
+                {
+                  url: 'https://rpc.goerli.linea.io',
+                  type: 'custom',
+                },
+              ],
+              defaultRpcEndpointIndex: 0,
+            },
+          },
+        },
+      };
+
+      const transformedState = await migrate({
+        meta: { version: oldVersion },
+        data: cloneDeep(oldState),
+      });
+
+      const updatedNetworkController = transformedState.data
+        .NetworkController as NetworkState;
+
+      expect(
+        updatedNetworkController.networkConfigurationsByChainId['0x13881']
+          .rpcEndpoints[0].url,
+      ).toEqual('https://rpc.goerli.linea.io');
+    });
+  });
+});
diff --git a/app/scripts/migrations/135.ts b/app/scripts/migrations/135.ts
new file mode 100644
index 000000000000..3120b7caff21
--- /dev/null
+++ b/app/scripts/migrations/135.ts
@@ -0,0 +1,128 @@
+import { hasProperty, isObject } from '@metamask/utils';
+import { RpcEndpointType } from '@metamask/network-controller';
+import { cloneDeep } from 'lodash';
+import {
+  allowedInfuraHosts,
+  CHAIN_IDS,
+  infuraChainIdsTestNets,
+  infuraProjectId,
+} from '../../../shared/constants/network';
+
+export const version = 135;
+const BASE_CHAIN_ID = '0x2105';
+
+/**
+ * Replace all occurrences of "https://mainnet.base.org" with
+ * "https://base-mainnet.infura.io/v3/${infuraProjectId}" in the Base network configuration,
+ * if the user already relies on at least one Infura RPC endpoint.
+ *
+ * @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 async function migrate(originalVersionedData: {
+  meta: { version: number };
+  data: Record<string, unknown>;
+}) {
+  const versionedData = cloneDeep(originalVersionedData);
+  versionedData.meta.version = version;
+  versionedData.data = transformState(versionedData.data);
+  return versionedData;
+}
+
+function transformState(state: Record<string, unknown>) {
+  if (
+    hasProperty(state, 'NetworkController') &&
+    isObject(state.NetworkController) &&
+    hasProperty(state.NetworkController, 'networkConfigurationsByChainId') &&
+    isObject(state.NetworkController.networkConfigurationsByChainId)
+  ) {
+    const { networkConfigurationsByChainId } = state.NetworkController;
+
+    // Check if at least one network uses an Infura RPC endpoint, excluding testnets
+    const usesInfura = Object.entries(networkConfigurationsByChainId)
+      .filter(
+        ([chainId]) =>
+          ![...infuraChainIdsTestNets, CHAIN_IDS.LINEA_MAINNET].includes(
+            chainId,
+          ),
+      )
+      .some(([, networkConfig]) => {
+        if (
+          !isObject(networkConfig) ||
+          !Array.isArray(networkConfig.rpcEndpoints) ||
+          typeof networkConfig.defaultRpcEndpointIndex !== 'number'
+        ) {
+          return false;
+        }
+
+        // Get the default RPC endpoint used by the network
+        const defaultRpcEndpoint =
+          networkConfig?.rpcEndpoints?.[networkConfig?.defaultRpcEndpointIndex];
+
+        if (
+          !isObject(defaultRpcEndpoint) ||
+          typeof defaultRpcEndpoint.url !== 'string'
+        ) {
+          return false;
+        }
+
+        try {
+          const urlHost = new URL(defaultRpcEndpoint.url).host;
+          return (
+            defaultRpcEndpoint.type === RpcEndpointType.Infura ||
+            allowedInfuraHosts.includes(urlHost)
+          );
+        } catch {
+          return false;
+        }
+      });
+
+    if (!usesInfura) {
+      // If no Infura endpoints are used, return the state unchanged
+      return state;
+    }
+
+    // Check for Base network configuration (chainId 8453 / 0x2105)
+    const baseNetworkConfig = networkConfigurationsByChainId[BASE_CHAIN_ID];
+    if (isObject(baseNetworkConfig)) {
+      const { rpcEndpoints } = baseNetworkConfig;
+
+      if (Array.isArray(rpcEndpoints)) {
+        // Find the first occurrence of "https://mainnet.base.org"
+        const index = rpcEndpoints.findIndex(
+          (endpoint) =>
+            isObject(endpoint) && endpoint.url === 'https://mainnet.base.org',
+        );
+
+        if (index !== -1) {
+          // Replace the URL with the new Infura URL
+          rpcEndpoints[index] = {
+            ...rpcEndpoints[index],
+            url: `https://base-mainnet.infura.io/v3/${infuraProjectId}`,
+          };
+
+          // Update the configuration
+          networkConfigurationsByChainId[BASE_CHAIN_ID] = {
+            ...baseNetworkConfig,
+            rpcEndpoints,
+          };
+
+          return {
+            ...state,
+            NetworkController: {
+              ...state.NetworkController,
+              networkConfigurationsByChainId,
+            },
+          };
+        }
+      }
+    }
+  }
+
+  return state;
+}
diff --git a/app/scripts/migrations/index.js b/app/scripts/migrations/index.js
index 887732ad9dbc..459578ba3eda 100644
--- a/app/scripts/migrations/index.js
+++ b/app/scripts/migrations/index.js
@@ -155,6 +155,7 @@ const migrations = [
   require('./132'),
   require('./133'),
   require('./134'),
+  require('./135'),
 ];
 
 export default migrations;
diff --git a/shared/constants/network.test.ts b/shared/constants/network.test.ts
index 9d9ca72b46cd..1fe489488f8f 100644
--- a/shared/constants/network.test.ts
+++ b/shared/constants/network.test.ts
@@ -87,11 +87,11 @@ describe('NetworkConstants', () => {
       expect(zksyncEraRpc.rpcEndpoints[0].url).not.toContain('infura.io');
     });
 
-    it('base entry should not use Infura', () => {
+    it('base entry should use Infura', () => {
       const [baseRpc] = FEATURED_RPCS.filter(
         (rpc) => rpc.chainId === CHAIN_IDS.BASE,
       );
-      expect(baseRpc.rpcEndpoints[0].url).not.toContain('infura.io');
+      expect(baseRpc.rpcEndpoints[0].url).toContain('infura.io');
     });
   });
 });
diff --git a/shared/constants/network.ts b/shared/constants/network.ts
index 41f1d9fd0d95..78b70b0a6a6c 100644
--- a/shared/constants/network.ts
+++ b/shared/constants/network.ts
@@ -127,8 +127,18 @@ export const CHAIN_IDS = {
   HARMONY: '0x63564c40',
   PALM: '0x2a15c308d',
   SEPOLIA: '0xaa36a7',
+  HOLESKY: '0x4268',
   LINEA_GOERLI: '0xe704',
   LINEA_SEPOLIA: '0xe705',
+  AMOY: '0x13882',
+  BASE_SEPOLIA: '0x14a34',
+  BLAST_SEPOLIA: '0xa0c71fd',
+  OPTIMISM_SEPOLIA: '0xaa37dc',
+  PALM_TESTNET: '0x2a15c3083',
+  CELO_TESTNET: '0xaef3',
+  ZK_SYNC_ERA_TESTNET: '0x12c',
+  MANTA_SEPOLIA: '0x138b',
+  UNICHAIN_SEPOLIA: '0x515',
   LINEA_MAINNET: '0xe708',
   AURORA: '0x4e454152',
   MOONBEAM: '0x504',
@@ -1067,7 +1077,7 @@ export const FEATURED_RPCS: AddNetworkFields[] = [
     nativeCurrency: CURRENCY_SYMBOLS.ETH,
     rpcEndpoints: [
       {
-        url: `https://mainnet.base.org`,
+        url: `https://base-mainnet.infura.io/v3/${infuraProjectId}`,
         type: RpcEndpointType.Custom,
       },
     ],
@@ -1077,6 +1087,58 @@ export const FEATURED_RPCS: AddNetworkFields[] = [
   },
 ];
 
+export const infuraChainIdsTestNets: string[] = [
+  CHAIN_IDS.SEPOLIA,
+  CHAIN_IDS.HOLESKY,
+  CHAIN_IDS.LINEA_SEPOLIA,
+  CHAIN_IDS.AMOY,
+  CHAIN_IDS.BASE_SEPOLIA,
+  CHAIN_IDS.OPTIMISM_SEPOLIA,
+  CHAIN_IDS.ARBITRUM_SEPOLIA,
+  CHAIN_IDS.PALM_TESTNET,
+  CHAIN_IDS.AVALANCHE_TESTNET,
+  CHAIN_IDS.CELO_TESTNET,
+  CHAIN_IDS.ZK_SYNC_ERA_TESTNET,
+  CHAIN_IDS.BSC_TESTNET,
+  CHAIN_IDS.MANTA_SEPOLIA,
+  CHAIN_IDS.OPBNB_TESTNET,
+  CHAIN_IDS.SCROLL_SEPOLIA,
+  CHAIN_IDS.UNICHAIN_SEPOLIA,
+];
+
+export const allowedInfuraHosts = [
+  // Ethereum
+  'mainnet.infura.io',
+  // Linea
+  'linea-mainnet.infura.io',
+  // Polygon
+  'polygon-mainnet.infura.io',
+  // Base
+  'base-mainnet.infura.io',
+  // Blast
+  'blast-mainnet.infura.io',
+  // Optimism
+  'optimism-mainnet.infura.io',
+  // Arbitrum
+  'arbitrum-mainnet.infura.io',
+  // Palm
+  'palm-mainnet.infura.io',
+  // Avalanche
+  'avalanche-mainnet.infura.io',
+  // Celo
+  'celo-mainnet.infura.io',
+  // ZKSync
+  'zksync-mainnet.infura.io',
+  // BSC
+  'bsc-mainnet.infura.io',
+  // Mantle
+  'mantle-mainnet.infura.io',
+  // OPBNB
+  'opbnb-mainnet.infura.io',
+  // Scroll
+  'scroll-mainnet.infura.io',
+];
+
 /**
  * Represents the availability state of the currently selected network.
  */

From aa2823f9059dccfb3bb97a5c05d9e30d9393abf5 Mon Sep 17 00:00:00 2001
From: Mark Stacey <markjstacey@gmail.com>
Date: Thu, 5 Dec 2024 20:56:51 -0330
Subject: [PATCH 048/175] fix: Fix create metric fragment (#28970)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<!--
Please submit this PR as a draft initially.
Do not mark it as "Ready for review" until the template has been
completely filled out, and PR status checks have passed at least once.
-->

## **Description**

The function `createEventFragment` of the `MetaMetricsController` was
broken recently in the migration to BaseControllerV2 (#28113). We ended
up trying to mutate a piece of Immer state, resulting in an error.

The affected line was updated to use `cloneDeep` prior to mutating, so
that we're no longer attempting to mutate a frozen object.

[![Open in GitHub
Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/28970?quickstart=1)

## **Related issues**

Fixes #28599

## **Manual testing steps**

I'm not sure exactly how to reproduce the error using a real build. But
the problem is easy to demonstrate in the "should update existing
fragment state with new fragment props" unit test. The problem is that
we didn't catch this before because Lodash doesn't have strict mode
enabled, so in unit tests the attempt to mutate a frozen object will
silently fail. In a production build, [strict mode is enabled by
LavaMoat](https://github.com/LavaMoat/LavaMoat/blob/7a3896a08b45f667649c46a56f27fe7bf20f4207/packages/lavapack/src/pack.js#L333).

You can reproduce the problem by adding `"use strict"` to the top of the
file `node_modules/lodash/lodash.js` and running the test with the `{},
` removed. Then you can test that adding back `{}` as the initial
parameter fixes the problem.

## **Screenshots/Recordings**

N/A

## **Pre-merge author checklist**

- [x] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension Coding
Standards](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/CODING_GUIDELINES.md).
- [x] I've completed the PR template to the best of my ability
- [x] I’ve included tests if applicable
- [x] I’ve documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [x] I’ve applied the right labels on the PR (see [labeling
guidelines](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.

## **Pre-merge reviewer checklist**

- [ ] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed).
- [ ] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.
---
 app/scripts/controllers/metametrics-controller.test.ts | 1 +
 app/scripts/controllers/metametrics-controller.ts      | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/scripts/controllers/metametrics-controller.test.ts b/app/scripts/controllers/metametrics-controller.test.ts
index 99ed4d2e2e48..57c49547c28b 100644
--- a/app/scripts/controllers/metametrics-controller.test.ts
+++ b/app/scripts/controllers/metametrics-controller.test.ts
@@ -309,6 +309,7 @@ describe('MetaMetricsController', function () {
           });
 
           const expectedFragment = merge(
+            {},
             SAMPLE_TX_SUBMITTED_PARTIAL_FRAGMENT,
             SAMPLE_PERSISTED_EVENT_NO_ID,
             {
diff --git a/app/scripts/controllers/metametrics-controller.ts b/app/scripts/controllers/metametrics-controller.ts
index e286a3a47d02..b2030080e3db 100644
--- a/app/scripts/controllers/metametrics-controller.ts
+++ b/app/scripts/controllers/metametrics-controller.ts
@@ -584,7 +584,7 @@ export default class MetaMetricsController extends BaseController<
       : {};
 
     this.update((state) => {
-      state.fragments[id] = merge(additionalFragmentProps, fragment);
+      state.fragments[id] = merge({}, additionalFragmentProps, fragment);
     });
 
     if (fragment.initialEvent) {

From 4112ff3a8b9ea6be7cfdd0739bfa49c429fea5e1 Mon Sep 17 00:00:00 2001
From: Sean Geng <seangeng94@gmail.com>
Date: Thu, 5 Dec 2024 20:56:58 -0500
Subject: [PATCH 049/175] feat: add B3 logo svg (#27778)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<!--
Please submit this PR as a draft initially.
Do not mark it as "Ready for review" until the template has been
completely filled out, and PR status checks have passed at least once.
-->

## **Description**

Adding logo for the B3 network

[![Open in GitHub
Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/27778?quickstart=1)

## **Related issues**

Fixes:

## **Manual testing steps**

Go to add network
1. Add B3 network (https://docs.b3.fun)
2. B3 network should have a logo
3. B3 token should have a logo

## **Screenshots/Recordings**

<!-- If applicable, add screenshots and/or recordings to visualize the
before and after of your change. -->

### **Before**

<!-- [screenshots/recordings] -->

### **After**

<!-- [screenshots/recordings] -->

## **Pre-merge author checklist**

- [ ] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension Coding
Standards](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/CODING_GUIDELINES.md).
- [ ] I've completed the PR template to the best of my ability
- [ ] I’ve included tests if applicable
- [ ] I’ve documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [ ] I’ve applied the right labels on the PR (see [labeling
guidelines](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.

## **Pre-merge reviewer checklist**

- [ ] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed).
- [ ] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.
---
 app/images/b3.svg           | 1 +
 shared/constants/network.ts | 9 +++++++++
 2 files changed, 10 insertions(+)
 create mode 100644 app/images/b3.svg

diff --git a/app/images/b3.svg b/app/images/b3.svg
new file mode 100644
index 000000000000..eb2c4dcfd9d2
--- /dev/null
+++ b/app/images/b3.svg
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><svg id="uuid-51dde6c7-3093-4050-a3a9-b6336c7b3162" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1000 1000"><circle cx="500" cy="500" r="500" style="fill:#fff;"/><path d="M171.68,297.42h313c5.66,0,10.25,4.48,10.25,10.01v143.23c0,8.94-5.33,17.06-13.65,20.78l-39.42,17.67c-1.92.87-3.17,2.74-3.17,4.82s1.2,3.9,3.1,4.78l39.78,18.47c8.16,3.79,13.36,11.82,13.36,20.66v154.71c0,5.53-4.59,10.01-10.25,10.01H171.68c-16.12,0-29.18-12.75-29.18-28.5v-348.16c0-15.74,13.06-28.49,29.18-28.49ZM341.44,567.52c7.98,0,13.67-1.05,17.06-3.14,3.68-2.11,5.53-6,5.53-11.7v-.91c0-6-1.99-10.21-5.99-12.61-3.68-2.4-9.99-3.6-18.9-3.6h-58.35v31.96h60.66ZM338.69,458.12c14.14,0,21.21-4.96,21.21-14.86v-2.25c0-5.7-1.84-9.61-5.53-11.7-3.38-2.4-9.06-3.6-17.06-3.6h-56.51v32.41h57.9-.01ZM521.45,534.21h128.99c0,10.21,1.84,17.26,5.53,21.17,4,3.9,9.67,5.85,17.06,5.85,12.6,0,18.9-7.05,18.9-21.16,0-6.9-2.16-11.85-6.46-14.86-4-3-10.14-4.5-18.44-4.5h-70.99v-52.22l109.24-26.56h-183.83c-5.13,0-9.29-4.07-9.29-9.08v-127.84c0-4.18,3.48-7.58,7.77-7.58h302.4c16.12,0,29.18,12.75,29.18,28.49v102.17c0,11.54-8.12,21.58-19.61,24.26l-119.69,27.85,5.53.91h114.23c14.1,0,25.53,11.17,25.53,24.93v168.05c0,15.74-13.06,28.5-29.18,28.5h-308.4c-4.29,0-7.77-3.4-7.77-7.58v-151.71c0-5.01,4.16-9.08,9.29-9.08Z" style="fill:#3368ef;"/></svg>
\ No newline at end of file
diff --git a/shared/constants/network.ts b/shared/constants/network.ts
index 78b70b0a6a6c..60522a3cd03e 100644
--- a/shared/constants/network.ts
+++ b/shared/constants/network.ts
@@ -165,6 +165,8 @@ export const CHAIN_IDS = {
   ARBITRUM_SEPOLIA: '0x66eee',
   NEAR: '0x18d',
   NEAR_TESTNET: '0x18e',
+  B3: '0x208d',
+  B3_TESTNET: '0x7c9',
   GRAVITY_ALPHA_MAINNET: '0x659',
   GRAVITY_ALPHA_TESTNET_SEPOLIA: '0x34c1',
 } as const;
@@ -222,6 +224,8 @@ export const CHAINLIST_CHAIN_IDS_MAP = {
   ZORA_MAINNET: '0x76adf1',
   FILECOIN: '0x13a',
   NUMBERS: '0x290b',
+  B3: '0x208d',
+  B3_TESTNET: '0x7c9',
   APE: '0x8173',
   GRAVITY_ALPHA_MAINNET: '0x659',
   GRAVITY_ALPHA_TESTNET_SEPOLIA: '0x34c1',
@@ -475,6 +479,7 @@ export const NUMBERS_MAINNET_IMAGE_URL = './images/numbers-mainnet.svg';
 export const NUMBERS_TOKEN_IMAGE_URL = './images/numbers-token.png';
 export const SEI_IMAGE_URL = './images/sei.svg';
 export const NEAR_IMAGE_URL = './images/near.svg';
+export const B3_IMAGE_URL = './images/b3.svg';
 export const APE_IMAGE_URL = './images/ape.svg';
 export const GRAVITY_ALPHA_MAINNET_IMAGE_URL = './images/gravity.svg';
 export const GRAVITY_ALPHA_TESTNET_SEPOLIA_IMAGE_URL = './images/gravity.svg';
@@ -816,6 +821,8 @@ export const CHAIN_ID_TO_NETWORK_IMAGE_URL_MAP = {
   [CHAINLIST_CHAIN_IDS_MAP.BASE]: BASE_TOKEN_IMAGE_URL,
   [CHAINLIST_CHAIN_IDS_MAP.NUMBERS]: NUMBERS_MAINNET_IMAGE_URL,
   [CHAINLIST_CHAIN_IDS_MAP.SEI]: SEI_IMAGE_URL,
+  [CHAINLIST_CHAIN_IDS_MAP.B3]: B3_IMAGE_URL,
+  [CHAINLIST_CHAIN_IDS_MAP.B3_TESTNET]: B3_IMAGE_URL,
   [CHAINLIST_CHAIN_IDS_MAP.GRAVITY_ALPHA_MAINNET]:
     GRAVITY_ALPHA_MAINNET_IMAGE_URL,
   [CHAINLIST_CHAIN_IDS_MAP.GRAVITY_ALPHA_TESTNET_SEPOLIA]:
@@ -854,6 +861,8 @@ export const CHAIN_ID_TOKEN_IMAGE_MAP = {
   [CHAIN_IDS.MOONRIVER]: MOONRIVER_TOKEN_IMAGE_URL,
   [CHAIN_IDS.MOONBEAM]: MOONBEAM_TOKEN_IMAGE_URL,
   [CHAINLIST_CHAIN_IDS_MAP.IOTEX_MAINNET]: IOTEX_TOKEN_IMAGE_URL,
+  [CHAIN_IDS.B3]: B3_IMAGE_URL,
+  [CHAIN_IDS.B3_TESTNET]: B3_IMAGE_URL,
   [CHAINLIST_CHAIN_IDS_MAP.APE_MAINNET]: APE_TOKEN_IMAGE_URL,
   [CHAIN_IDS.GRAVITY_ALPHA_MAINNET]: GRAVITY_ALPHA_MAINNET_IMAGE_URL,
   [CHAIN_IDS.GRAVITY_ALPHA_TESTNET_SEPOLIA]:

From 90695c5e112aa5d9815248f0c9f284b6d4eecdc7 Mon Sep 17 00:00:00 2001
From: Dan J Miller <danjm.com@gmail.com>
Date: Fri, 6 Dec 2024 00:11:25 -0330
Subject: [PATCH 050/175] chore: Renumber migration 135 to 131.1 (#28979)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<!--
Please submit this PR as a draft initially.
Do not mark it as "Ready for review" until the template has been
completely filled out, and PR status checks have passed at least once.
-->

## **Description**

This PR updates the number on migration 135 to 131.1, so that we can
smoothly release it in a v12.8.1 hotfix

Migration 135 was just added here
https://github.com/MetaMask/metamask-extension/pull/28974

[![Open in GitHub
Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/28979?quickstart=1)

## **Related issues**

Fixes:

## **Manual testing steps**

1. Go to this page...
2.
3.

## **Screenshots/Recordings**

<!-- If applicable, add screenshots and/or recordings to visualize the
before and after of your change. -->

### **Before**

<!-- [screenshots/recordings] -->

### **After**

<!-- [screenshots/recordings] -->

## **Pre-merge author checklist**

- [ ] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension Coding
Standards](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/CODING_GUIDELINES.md).
- [ ] I've completed the PR template to the best of my ability
- [ ] I’ve included tests if applicable
- [ ] I’ve documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [ ] I’ve applied the right labels on the PR (see [labeling
guidelines](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.

## **Pre-merge reviewer checklist**

- [ ] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed).
- [ ] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.
---
 app/scripts/migrations/{135.test.ts => 131.1.test.ts} | 6 +++---
 app/scripts/migrations/{135.ts => 131.1.ts}           | 2 +-
 app/scripts/migrations/index.js                       | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)
 rename app/scripts/migrations/{135.test.ts => 131.1.test.ts} (98%)
 rename app/scripts/migrations/{135.ts => 131.1.ts} (99%)

diff --git a/app/scripts/migrations/135.test.ts b/app/scripts/migrations/131.1.test.ts
similarity index 98%
rename from app/scripts/migrations/135.test.ts
rename to app/scripts/migrations/131.1.test.ts
index d016c10b7edc..3d1d8446a983 100644
--- a/app/scripts/migrations/135.test.ts
+++ b/app/scripts/migrations/131.1.test.ts
@@ -1,12 +1,12 @@
 import { cloneDeep } from 'lodash';
 import { NetworkState } from '@metamask/network-controller';
 import { infuraProjectId } from '../../../shared/constants/network';
-import { migrate, version } from './135';
+import { migrate, version } from './131.1';
 
-const oldVersion = 134;
+const oldVersion = 131;
 const BASE_CHAIN_ID = '0x2105';
 
-describe('migration #135', () => {
+describe('migration #131.1', () => {
   it('updates the version metadata', async () => {
     const oldStorage = {
       meta: { version: oldVersion },
diff --git a/app/scripts/migrations/135.ts b/app/scripts/migrations/131.1.ts
similarity index 99%
rename from app/scripts/migrations/135.ts
rename to app/scripts/migrations/131.1.ts
index 3120b7caff21..4b9478afd2ab 100644
--- a/app/scripts/migrations/135.ts
+++ b/app/scripts/migrations/131.1.ts
@@ -8,7 +8,7 @@ import {
   infuraProjectId,
 } from '../../../shared/constants/network';
 
-export const version = 135;
+export const version = 131.1;
 const BASE_CHAIN_ID = '0x2105';
 
 /**
diff --git a/app/scripts/migrations/index.js b/app/scripts/migrations/index.js
index 459578ba3eda..5efa3807c68f 100644
--- a/app/scripts/migrations/index.js
+++ b/app/scripts/migrations/index.js
@@ -152,10 +152,10 @@ const migrations = [
   require('./129'),
   require('./130'),
   require('./131'),
+  require('./131.1'),
   require('./132'),
   require('./133'),
   require('./134'),
-  require('./135'),
 ];
 
 export default migrations;

From 8de03c0c08af54b89f370a1d8f82db10c44f664c Mon Sep 17 00:00:00 2001
From: Pedro Figueiredo <pedro.figueiredo@consensys.net>
Date: Fri, 6 Dec 2024 11:34:31 +0000
Subject: [PATCH 051/175] fix: Add origin row to transfer confirmations
 (#28936)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<!--
Please submit this PR as a draft initially.
Do not mark it as "Ready for review" until the template has been
completely filled out, and PR status checks have passed at least once.
-->

## **Description**

This PR adds an origin row as well as a content divider as per the
latest designs (see screenshot below).

Additionally, ConfirmInfoSection has been moved to inside the
SimulationDetails component, to fix a visual bug that showed additional
margin on the UI, even when the SimulationDetails component was not
being rendered.



<!--
Write a short description of the changes included in this pull request,
also include relevant motivation and context. Have in mind the following
questions:
1. What is the reason for the change?
2. What is the improvement/solution?
-->
<img width="371" alt="Screenshot 2024-12-04 at 17 34 20"
src="https://github.com/user-attachments/assets/7bd18e70-7992-454a-b92c-bcbdecb293f6">

[![Open in GitHub
Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/28936?quickstart=1)

## **Related issues**

Fixes: https://github.com/MetaMask/metamask-extension/issues/28928

## **Manual testing steps**

1. Go to this page...
2.
3.

## **Screenshots/Recordings**

<!-- If applicable, add screenshots and/or recordings to visualize the
before and after of your change. -->

### **Before**

<!-- [screenshots/recordings] -->

### **After**

<!-- [screenshots/recordings] -->

## **Pre-merge author checklist**

- [ ] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension Coding
Standards](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/CODING_GUIDELINES.md).
- [ ] I've completed the PR template to the best of my ability
- [ ] I’ve included tests if applicable
- [ ] I’ve documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [ ] I’ve applied the right labels on the PR (see [labeling
guidelines](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.

## **Pre-merge reviewer checklist**

- [ ] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed).
- [ ] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.
---
 .../base-transaction-info.tsx                 | 14 ++--
 .../native-transfer.test.tsx.snap             | 53 +++++++++++-
 .../info/native-transfer/native-transfer.tsx  | 17 ++--
 .../nft-token-transfer.test.tsx.snap          | 53 +++++++++++-
 .../nft-token-transfer/nft-token-transfer.tsx | 17 ++--
 .../token-details-section.test.tsx.snap       | 51 +++++++++++-
 .../token-transfer.test.tsx.snap              | 53 +++++++++++-
 .../token-transfer/token-details-section.tsx  | 38 +++++----
 .../info/token-transfer/token-transfer.tsx    | 17 ++--
 .../simulation-details/simulation-details.tsx | 80 +++++++++++++------
 10 files changed, 300 insertions(+), 93 deletions(-)

diff --git a/ui/pages/confirmations/components/confirm/info/base-transaction-info/base-transaction-info.tsx b/ui/pages/confirmations/components/confirm/info/base-transaction-info/base-transaction-info.tsx
index 23629ee5096c..2b986aa42f3f 100644
--- a/ui/pages/confirmations/components/confirm/info/base-transaction-info/base-transaction-info.tsx
+++ b/ui/pages/confirmations/components/confirm/info/base-transaction-info/base-transaction-info.tsx
@@ -1,7 +1,5 @@
 import { TransactionMeta } from '@metamask/transaction-controller';
 import React from 'react';
-
-import { ConfirmInfoSection } from '../../../../../../components/app/confirm/info/row/section';
 import { useConfirmContext } from '../../../../context/confirm';
 import { SimulationDetails } from '../../../simulation-details';
 import { AdvancedDetails } from '../shared/advanced-details/advanced-details';
@@ -18,13 +16,11 @@ const BaseTransactionInfo = () => {
 
   return (
     <>
-      <ConfirmInfoSection noPadding>
-        <SimulationDetails
-          transaction={transactionMeta}
-          isTransactionsRedesign
-          enableMetrics
-        />
-      </ConfirmInfoSection>
+      <SimulationDetails
+        transaction={transactionMeta}
+        isTransactionsRedesign
+        enableMetrics
+      />
       <TransactionDetails />
       <GasFeesSection />
       <AdvancedDetails />
diff --git a/ui/pages/confirmations/components/confirm/info/native-transfer/__snapshots__/native-transfer.test.tsx.snap b/ui/pages/confirmations/components/confirm/info/native-transfer/__snapshots__/native-transfer.test.tsx.snap
index 2cf799486baf..3074f81a0241 100644
--- a/ui/pages/confirmations/components/confirm/info/native-transfer/__snapshots__/native-transfer.test.tsx.snap
+++ b/ui/pages/confirmations/components/confirm/info/native-transfer/__snapshots__/native-transfer.test.tsx.snap
@@ -107,7 +107,7 @@ exports[`NativeTransferInfo renders correctly 1`] = `
   </div>
   <div
     class="mm-box mm-box--margin-bottom-4 mm-box--padding-2 mm-box--background-color-background-default mm-box--rounded-md"
-    data-testid="confirmation__transaction-flow"
+    data-testid="confirmation__token-details-section"
   >
     <div
       class="mm-box confirm-info-row mm-box--margin-top-2 mm-box--margin-bottom-2 mm-box--padding-right-2 mm-box--padding-left-2 mm-box--display-flex mm-box--flex-direction-row mm-box--flex-wrap-wrap mm-box--justify-content-space-between mm-box--align-items-flex-start mm-box--color-text-default mm-box--rounded-lg"
@@ -141,6 +141,53 @@ exports[`NativeTransferInfo renders correctly 1`] = `
         </p>
       </div>
     </div>
+    <div
+      style="height: 1px; margin-left: -8px; margin-right: -8px;"
+    />
+    <div
+      class="mm-box confirm-info-row mm-box--margin-top-2 mm-box--margin-bottom-2 mm-box--padding-right-2 mm-box--padding-left-2 mm-box--display-flex mm-box--flex-direction-row mm-box--flex-wrap-wrap mm-box--justify-content-space-between mm-box--align-items-flex-start mm-box--color-text-default mm-box--rounded-lg"
+      data-testid="transaction-details-origin-row"
+      style="overflow-wrap: anywhere; min-height: 24px; position: relative; background: transparent;"
+    >
+      <div
+        class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-flex-start mm-box--color-text-default"
+      >
+        <div
+          class="mm-box mm-box--display-flex mm-box--align-items-center"
+        >
+          <p
+            class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
+          >
+            Request from
+          </p>
+          <div>
+            <div
+              aria-describedby="tippy-tooltip-2"
+              class=""
+              data-original-title="This is the site asking for your confirmation."
+              data-tooltipped=""
+              style="display: flex;"
+              tabindex="0"
+            >
+              <span
+                class="mm-box mm-icon mm-icon--size-sm mm-box--margin-left-1 mm-box--display-inline-block mm-box--color-icon-muted"
+                data-testid="transaction-details-origin-row-tooltip"
+                style="mask-image: url('./images/icons/question.svg');"
+              />
+            </div>
+          </div>
+        </div>
+      </div>
+      <div
+        class="mm-box mm-box--display-flex mm-box--gap-2 mm-box--flex-wrap-wrap mm-box--align-items-center"
+      >
+        <p
+          class="mm-box mm-text mm-text--body-md mm-box--color-inherit"
+        >
+          metamask.github.io
+        </p>
+      </div>
+    </div>
     <div
       class="mm-box confirm-info-row mm-box--margin-top-2 mm-box--margin-bottom-2 mm-box--padding-right-2 mm-box--padding-left-2 mm-box--display-flex mm-box--flex-direction-row mm-box--flex-wrap-wrap mm-box--justify-content-space-between mm-box--align-items-flex-start mm-box--color-text-default mm-box--rounded-lg"
       style="overflow-wrap: anywhere; min-height: 24px; position: relative;"
@@ -158,7 +205,7 @@ exports[`NativeTransferInfo renders correctly 1`] = `
           </p>
           <div>
             <div
-              aria-describedby="tippy-tooltip-2"
+              aria-describedby="tippy-tooltip-3"
               class=""
               data-original-title="This is the contract you're interacting with. Protect yourself from scammers by verifying the details."
               data-tooltipped=""
@@ -255,7 +302,7 @@ exports[`NativeTransferInfo renders correctly 1`] = `
           </p>
           <div>
             <div
-              aria-describedby="tippy-tooltip-3"
+              aria-describedby="tippy-tooltip-4"
               class=""
               data-original-title="Amount paid to process the transaction on network."
               data-tooltipped=""
diff --git a/ui/pages/confirmations/components/confirm/info/native-transfer/native-transfer.tsx b/ui/pages/confirmations/components/confirm/info/native-transfer/native-transfer.tsx
index f3433511fd01..cf321336be0c 100644
--- a/ui/pages/confirmations/components/confirm/info/native-transfer/native-transfer.tsx
+++ b/ui/pages/confirmations/components/confirm/info/native-transfer/native-transfer.tsx
@@ -1,6 +1,5 @@
 import { TransactionMeta } from '@metamask/transaction-controller';
 import React from 'react';
-import { ConfirmInfoSection } from '../../../../../../components/app/confirm/info/row/section';
 import { useConfirmContext } from '../../../../context/confirm';
 import { SimulationDetails } from '../../../simulation-details';
 import { AdvancedDetails } from '../shared/advanced-details/advanced-details';
@@ -19,16 +18,12 @@ const NativeTransferInfo = () => {
     <>
       <NativeSendHeading />
       <TransactionFlowSection />
-      {
-        <ConfirmInfoSection noPadding>
-          <SimulationDetails
-            transaction={transactionMeta}
-            isTransactionsRedesign
-            enableMetrics
-            metricsOnly={isWalletInitiated}
-          />
-        </ConfirmInfoSection>
-      }
+      <SimulationDetails
+        transaction={transactionMeta}
+        isTransactionsRedesign
+        enableMetrics
+        metricsOnly={isWalletInitiated}
+      />
       <TokenDetailsSection />
       <GasFeesSection />
       <AdvancedDetails />
diff --git a/ui/pages/confirmations/components/confirm/info/nft-token-transfer/__snapshots__/nft-token-transfer.test.tsx.snap b/ui/pages/confirmations/components/confirm/info/nft-token-transfer/__snapshots__/nft-token-transfer.test.tsx.snap
index e165e34d6642..6e55d4c44f1e 100644
--- a/ui/pages/confirmations/components/confirm/info/nft-token-transfer/__snapshots__/nft-token-transfer.test.tsx.snap
+++ b/ui/pages/confirmations/components/confirm/info/nft-token-transfer/__snapshots__/nft-token-transfer.test.tsx.snap
@@ -135,7 +135,7 @@ exports[`NFTTokenTransferInfo renders correctly 1`] = `
   </div>
   <div
     class="mm-box mm-box--margin-bottom-4 mm-box--padding-2 mm-box--background-color-background-default mm-box--rounded-md"
-    data-testid="confirmation__transaction-flow"
+    data-testid="confirmation__token-details-section"
   >
     <div
       class="mm-box confirm-info-row mm-box--margin-top-2 mm-box--margin-bottom-2 mm-box--padding-right-2 mm-box--padding-left-2 mm-box--display-flex mm-box--flex-direction-row mm-box--flex-wrap-wrap mm-box--justify-content-space-between mm-box--align-items-flex-start mm-box--color-text-default mm-box--rounded-lg"
@@ -169,6 +169,53 @@ exports[`NFTTokenTransferInfo renders correctly 1`] = `
         </p>
       </div>
     </div>
+    <div
+      style="height: 1px; margin-left: -8px; margin-right: -8px;"
+    />
+    <div
+      class="mm-box confirm-info-row mm-box--margin-top-2 mm-box--margin-bottom-2 mm-box--padding-right-2 mm-box--padding-left-2 mm-box--display-flex mm-box--flex-direction-row mm-box--flex-wrap-wrap mm-box--justify-content-space-between mm-box--align-items-flex-start mm-box--color-text-default mm-box--rounded-lg"
+      data-testid="transaction-details-origin-row"
+      style="overflow-wrap: anywhere; min-height: 24px; position: relative; background: transparent;"
+    >
+      <div
+        class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-flex-start mm-box--color-text-default"
+      >
+        <div
+          class="mm-box mm-box--display-flex mm-box--align-items-center"
+        >
+          <p
+            class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
+          >
+            Request from
+          </p>
+          <div>
+            <div
+              aria-describedby="tippy-tooltip-2"
+              class=""
+              data-original-title="This is the site asking for your confirmation."
+              data-tooltipped=""
+              style="display: flex;"
+              tabindex="0"
+            >
+              <span
+                class="mm-box mm-icon mm-icon--size-sm mm-box--margin-left-1 mm-box--display-inline-block mm-box--color-icon-muted"
+                data-testid="transaction-details-origin-row-tooltip"
+                style="mask-image: url('./images/icons/question.svg');"
+              />
+            </div>
+          </div>
+        </div>
+      </div>
+      <div
+        class="mm-box mm-box--display-flex mm-box--gap-2 mm-box--flex-wrap-wrap mm-box--align-items-center"
+      >
+        <p
+          class="mm-box mm-text mm-text--body-md mm-box--color-inherit"
+        >
+          metamask.github.io
+        </p>
+      </div>
+    </div>
     <div
       class="mm-box confirm-info-row mm-box--margin-top-2 mm-box--margin-bottom-2 mm-box--padding-right-2 mm-box--padding-left-2 mm-box--display-flex mm-box--flex-direction-row mm-box--flex-wrap-wrap mm-box--justify-content-space-between mm-box--align-items-flex-start mm-box--color-text-default mm-box--rounded-lg"
       style="overflow-wrap: anywhere; min-height: 24px; position: relative;"
@@ -186,7 +233,7 @@ exports[`NFTTokenTransferInfo renders correctly 1`] = `
           </p>
           <div>
             <div
-              aria-describedby="tippy-tooltip-2"
+              aria-describedby="tippy-tooltip-3"
               class=""
               data-original-title="This is the contract you're interacting with. Protect yourself from scammers by verifying the details."
               data-tooltipped=""
@@ -283,7 +330,7 @@ exports[`NFTTokenTransferInfo renders correctly 1`] = `
           </p>
           <div>
             <div
-              aria-describedby="tippy-tooltip-3"
+              aria-describedby="tippy-tooltip-4"
               class=""
               data-original-title="Amount paid to process the transaction on network."
               data-tooltipped=""
diff --git a/ui/pages/confirmations/components/confirm/info/nft-token-transfer/nft-token-transfer.tsx b/ui/pages/confirmations/components/confirm/info/nft-token-transfer/nft-token-transfer.tsx
index 2911e32f7696..efb5ed4572f3 100644
--- a/ui/pages/confirmations/components/confirm/info/nft-token-transfer/nft-token-transfer.tsx
+++ b/ui/pages/confirmations/components/confirm/info/nft-token-transfer/nft-token-transfer.tsx
@@ -1,6 +1,5 @@
 import { TransactionMeta } from '@metamask/transaction-controller';
 import React from 'react';
-import { ConfirmInfoSection } from '../../../../../../components/app/confirm/info/row/section';
 import { useConfirmContext } from '../../../../context/confirm';
 import { SimulationDetails } from '../../../simulation-details';
 import { AdvancedDetails } from '../shared/advanced-details/advanced-details';
@@ -19,16 +18,12 @@ const NFTTokenTransferInfo = () => {
     <>
       <NFTSendHeading />
       <TransactionFlowSection />
-      {
-        <ConfirmInfoSection noPadding>
-          <SimulationDetails
-            transaction={transactionMeta}
-            isTransactionsRedesign
-            enableMetrics
-            metricsOnly={isWalletInitiated}
-          />
-        </ConfirmInfoSection>
-      }
+      <SimulationDetails
+        transaction={transactionMeta}
+        isTransactionsRedesign
+        enableMetrics
+        metricsOnly={isWalletInitiated}
+      />
       <TokenDetailsSection />
       <GasFeesSection />
       <AdvancedDetails />
diff --git a/ui/pages/confirmations/components/confirm/info/token-transfer/__snapshots__/token-details-section.test.tsx.snap b/ui/pages/confirmations/components/confirm/info/token-transfer/__snapshots__/token-details-section.test.tsx.snap
index 882ac4bef4ca..863510e1780b 100644
--- a/ui/pages/confirmations/components/confirm/info/token-transfer/__snapshots__/token-details-section.test.tsx.snap
+++ b/ui/pages/confirmations/components/confirm/info/token-transfer/__snapshots__/token-details-section.test.tsx.snap
@@ -4,7 +4,7 @@ exports[`TokenDetailsSection renders correctly 1`] = `
 <div>
   <div
     class="mm-box mm-box--margin-bottom-4 mm-box--padding-2 mm-box--background-color-background-default mm-box--rounded-md"
-    data-testid="confirmation__transaction-flow"
+    data-testid="confirmation__token-details-section"
   >
     <div
       class="mm-box confirm-info-row mm-box--margin-top-2 mm-box--margin-bottom-2 mm-box--padding-right-2 mm-box--padding-left-2 mm-box--display-flex mm-box--flex-direction-row mm-box--flex-wrap-wrap mm-box--justify-content-space-between mm-box--align-items-flex-start mm-box--color-text-default mm-box--rounded-lg"
@@ -38,6 +38,53 @@ exports[`TokenDetailsSection renders correctly 1`] = `
         </p>
       </div>
     </div>
+    <div
+      style="height: 1px; margin-left: -8px; margin-right: -8px;"
+    />
+    <div
+      class="mm-box confirm-info-row mm-box--margin-top-2 mm-box--margin-bottom-2 mm-box--padding-right-2 mm-box--padding-left-2 mm-box--display-flex mm-box--flex-direction-row mm-box--flex-wrap-wrap mm-box--justify-content-space-between mm-box--align-items-flex-start mm-box--color-text-default mm-box--rounded-lg"
+      data-testid="transaction-details-origin-row"
+      style="overflow-wrap: anywhere; min-height: 24px; position: relative; background: transparent;"
+    >
+      <div
+        class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-flex-start mm-box--color-text-default"
+      >
+        <div
+          class="mm-box mm-box--display-flex mm-box--align-items-center"
+        >
+          <p
+            class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
+          >
+            Request from
+          </p>
+          <div>
+            <div
+              aria-describedby="tippy-tooltip-1"
+              class=""
+              data-original-title="This is the site asking for your confirmation."
+              data-tooltipped=""
+              style="display: flex;"
+              tabindex="0"
+            >
+              <span
+                class="mm-box mm-icon mm-icon--size-sm mm-box--margin-left-1 mm-box--display-inline-block mm-box--color-icon-muted"
+                data-testid="transaction-details-origin-row-tooltip"
+                style="mask-image: url('./images/icons/question.svg');"
+              />
+            </div>
+          </div>
+        </div>
+      </div>
+      <div
+        class="mm-box mm-box--display-flex mm-box--gap-2 mm-box--flex-wrap-wrap mm-box--align-items-center"
+      >
+        <p
+          class="mm-box mm-text mm-text--body-md mm-box--color-inherit"
+        >
+          metamask.github.io
+        </p>
+      </div>
+    </div>
     <div
       class="mm-box confirm-info-row mm-box--margin-top-2 mm-box--margin-bottom-2 mm-box--padding-right-2 mm-box--padding-left-2 mm-box--display-flex mm-box--flex-direction-row mm-box--flex-wrap-wrap mm-box--justify-content-space-between mm-box--align-items-flex-start mm-box--color-text-default mm-box--rounded-lg"
       style="overflow-wrap: anywhere; min-height: 24px; position: relative;"
@@ -55,7 +102,7 @@ exports[`TokenDetailsSection renders correctly 1`] = `
           </p>
           <div>
             <div
-              aria-describedby="tippy-tooltip-1"
+              aria-describedby="tippy-tooltip-2"
               class=""
               data-original-title="This is the contract you're interacting with. Protect yourself from scammers by verifying the details."
               data-tooltipped=""
diff --git a/ui/pages/confirmations/components/confirm/info/token-transfer/__snapshots__/token-transfer.test.tsx.snap b/ui/pages/confirmations/components/confirm/info/token-transfer/__snapshots__/token-transfer.test.tsx.snap
index a02b77fcac18..4578e639f25c 100644
--- a/ui/pages/confirmations/components/confirm/info/token-transfer/__snapshots__/token-transfer.test.tsx.snap
+++ b/ui/pages/confirmations/components/confirm/info/token-transfer/__snapshots__/token-transfer.test.tsx.snap
@@ -136,7 +136,7 @@ exports[`TokenTransferInfo renders correctly 1`] = `
   </div>
   <div
     class="mm-box mm-box--margin-bottom-4 mm-box--padding-2 mm-box--background-color-background-default mm-box--rounded-md"
-    data-testid="confirmation__transaction-flow"
+    data-testid="confirmation__token-details-section"
   >
     <div
       class="mm-box confirm-info-row mm-box--margin-top-2 mm-box--margin-bottom-2 mm-box--padding-right-2 mm-box--padding-left-2 mm-box--display-flex mm-box--flex-direction-row mm-box--flex-wrap-wrap mm-box--justify-content-space-between mm-box--align-items-flex-start mm-box--color-text-default mm-box--rounded-lg"
@@ -170,6 +170,53 @@ exports[`TokenTransferInfo renders correctly 1`] = `
         </p>
       </div>
     </div>
+    <div
+      style="height: 1px; margin-left: -8px; margin-right: -8px;"
+    />
+    <div
+      class="mm-box confirm-info-row mm-box--margin-top-2 mm-box--margin-bottom-2 mm-box--padding-right-2 mm-box--padding-left-2 mm-box--display-flex mm-box--flex-direction-row mm-box--flex-wrap-wrap mm-box--justify-content-space-between mm-box--align-items-flex-start mm-box--color-text-default mm-box--rounded-lg"
+      data-testid="transaction-details-origin-row"
+      style="overflow-wrap: anywhere; min-height: 24px; position: relative; background: transparent;"
+    >
+      <div
+        class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-flex-start mm-box--color-text-default"
+      >
+        <div
+          class="mm-box mm-box--display-flex mm-box--align-items-center"
+        >
+          <p
+            class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
+          >
+            Request from
+          </p>
+          <div>
+            <div
+              aria-describedby="tippy-tooltip-2"
+              class=""
+              data-original-title="This is the site asking for your confirmation."
+              data-tooltipped=""
+              style="display: flex;"
+              tabindex="0"
+            >
+              <span
+                class="mm-box mm-icon mm-icon--size-sm mm-box--margin-left-1 mm-box--display-inline-block mm-box--color-icon-muted"
+                data-testid="transaction-details-origin-row-tooltip"
+                style="mask-image: url('./images/icons/question.svg');"
+              />
+            </div>
+          </div>
+        </div>
+      </div>
+      <div
+        class="mm-box mm-box--display-flex mm-box--gap-2 mm-box--flex-wrap-wrap mm-box--align-items-center"
+      >
+        <p
+          class="mm-box mm-text mm-text--body-md mm-box--color-inherit"
+        >
+          metamask.github.io
+        </p>
+      </div>
+    </div>
     <div
       class="mm-box confirm-info-row mm-box--margin-top-2 mm-box--margin-bottom-2 mm-box--padding-right-2 mm-box--padding-left-2 mm-box--display-flex mm-box--flex-direction-row mm-box--flex-wrap-wrap mm-box--justify-content-space-between mm-box--align-items-flex-start mm-box--color-text-default mm-box--rounded-lg"
       style="overflow-wrap: anywhere; min-height: 24px; position: relative;"
@@ -187,7 +234,7 @@ exports[`TokenTransferInfo renders correctly 1`] = `
           </p>
           <div>
             <div
-              aria-describedby="tippy-tooltip-2"
+              aria-describedby="tippy-tooltip-3"
               class=""
               data-original-title="This is the contract you're interacting with. Protect yourself from scammers by verifying the details."
               data-tooltipped=""
@@ -284,7 +331,7 @@ exports[`TokenTransferInfo renders correctly 1`] = `
           </p>
           <div>
             <div
-              aria-describedby="tippy-tooltip-3"
+              aria-describedby="tippy-tooltip-4"
               class=""
               data-original-title="Amount paid to process the transaction on network."
               data-tooltipped=""
diff --git a/ui/pages/confirmations/components/confirm/info/token-transfer/token-details-section.tsx b/ui/pages/confirmations/components/confirm/info/token-transfer/token-details-section.tsx
index dc394fb1442b..043fc5f1e30a 100644
--- a/ui/pages/confirmations/components/confirm/info/token-transfer/token-details-section.tsx
+++ b/ui/pages/confirmations/components/confirm/info/token-transfer/token-details-section.tsx
@@ -4,10 +4,13 @@ import {
 } from '@metamask/transaction-controller';
 import React from 'react';
 import { useSelector } from 'react-redux';
+import { ORIGIN_METAMASK } from '../../../../../../../shared/constants/app';
 import { CHAIN_ID_TO_NETWORK_IMAGE_URL_MAP } from '../../../../../../../shared/constants/network';
+import { getNetworkConfigurationsByChainId } from '../../../../../../../shared/modules/selectors/networks';
 import {
   ConfirmInfoRow,
   ConfirmInfoRowAddress,
+  ConfirmInfoRowDivider,
 } from '../../../../../../components/app/confirm/info/row';
 import { ConfirmInfoSection } from '../../../../../../components/app/confirm/info/row/section';
 import {
@@ -26,10 +29,10 @@ import {
   TextVariant,
 } from '../../../../../../helpers/constants/design-system';
 import { useI18nContext } from '../../../../../../hooks/useI18nContext';
-import { getNetworkConfigurationsByChainId } from '../../../../../../../shared/modules/selectors/networks';
 import { useConfirmContext } from '../../../../context/confirm';
 import { selectConfirmationAdvancedDetailsOpen } from '../../../../selectors/preferences';
 import { useBalanceChanges } from '../../../simulation-details/useBalanceChanges';
+import { OriginRow } from '../shared/transaction-details/transaction-details';
 
 export const TokenDetailsSection = () => {
   const t = useI18nContext();
@@ -80,22 +83,29 @@ export const TokenDetailsSection = () => {
     </ConfirmInfoRow>
   );
 
-  const tokenRow = transactionMeta.type !== TransactionType.simpleSend &&
-    (showAdvancedDetails || isSimulationEmpty || isSimulationError) && (
-      <ConfirmInfoRow
-        label={t('interactingWith')}
-        tooltip={t('interactingWithTransactionDescription')}
-      >
-        <ConfirmInfoRowAddress
-          address={transactionMeta.txParams.to as string}
-          chainId={chainId}
-        />
-      </ConfirmInfoRow>
-    );
+  const shouldShowTokenRow =
+    transactionMeta.type !== TransactionType.simpleSend &&
+    (showAdvancedDetails || isSimulationEmpty || isSimulationError);
+
+  const tokenRow = shouldShowTokenRow && (
+    <ConfirmInfoRow
+      label={t('interactingWith')}
+      tooltip={t('interactingWithTransactionDescription')}
+    >
+      <ConfirmInfoRowAddress
+        address={transactionMeta.txParams.to as string}
+        chainId={chainId}
+      />
+    </ConfirmInfoRow>
+  );
+
+  const shouldShowOriginRow = transactionMeta?.origin !== ORIGIN_METAMASK;
 
   return (
-    <ConfirmInfoSection data-testid="confirmation__transaction-flow">
+    <ConfirmInfoSection data-testid="confirmation__token-details-section">
       {networkRow}
+      {(shouldShowOriginRow || shouldShowTokenRow) && <ConfirmInfoRowDivider />}
+      {shouldShowOriginRow && <OriginRow />}
       {tokenRow}
     </ConfirmInfoSection>
   );
diff --git a/ui/pages/confirmations/components/confirm/info/token-transfer/token-transfer.tsx b/ui/pages/confirmations/components/confirm/info/token-transfer/token-transfer.tsx
index dd95e841c2c0..6a51534705e5 100644
--- a/ui/pages/confirmations/components/confirm/info/token-transfer/token-transfer.tsx
+++ b/ui/pages/confirmations/components/confirm/info/token-transfer/token-transfer.tsx
@@ -1,6 +1,5 @@
 import { TransactionMeta } from '@metamask/transaction-controller';
 import React from 'react';
-import { ConfirmInfoSection } from '../../../../../../components/app/confirm/info/row/section';
 import { useConfirmContext } from '../../../../context/confirm';
 import { SimulationDetails } from '../../../simulation-details';
 import { AdvancedDetails } from '../shared/advanced-details/advanced-details';
@@ -19,16 +18,12 @@ const TokenTransferInfo = () => {
     <>
       <SendHeading />
       <TransactionFlowSection />
-      {
-        <ConfirmInfoSection noPadding>
-          <SimulationDetails
-            transaction={transactionMeta}
-            isTransactionsRedesign
-            enableMetrics
-            metricsOnly={isWalletInitiated}
-          />
-        </ConfirmInfoSection>
-      }
+      <SimulationDetails
+        transaction={transactionMeta}
+        isTransactionsRedesign
+        enableMetrics
+        metricsOnly={isWalletInitiated}
+      />
       <TokenDetailsSection />
       <GasFeesSection />
       <AdvancedDetails />
diff --git a/ui/pages/confirmations/components/simulation-details/simulation-details.tsx b/ui/pages/confirmations/components/simulation-details/simulation-details.tsx
index 412467b4ff8a..9fbc8309251b 100644
--- a/ui/pages/confirmations/components/simulation-details/simulation-details.tsx
+++ b/ui/pages/confirmations/components/simulation-details/simulation-details.tsx
@@ -4,6 +4,9 @@ import {
   TransactionMeta,
 } from '@metamask/transaction-controller';
 import React from 'react';
+import { ConfirmInfoAlertRow } from '../../../../components/app/confirm/info/row/alert-row/alert-row';
+import { RowAlertKey } from '../../../../components/app/confirm/info/row/constants';
+import { ConfirmInfoSection } from '../../../../components/app/confirm/info/row/section';
 import {
   Box,
   Icon,
@@ -25,8 +28,6 @@ import {
   TextVariant,
 } from '../../../../helpers/constants/design-system';
 import { useI18nContext } from '../../../../hooks/useI18nContext';
-import { ConfirmInfoAlertRow } from '../../../../components/app/confirm/info/row/alert-row/alert-row';
-import { RowAlertKey } from '../../../../components/app/confirm/info/row/constants';
 import { BalanceChangeList } from './balance-change-list';
 import { useBalanceChanges } from './useBalanceChanges';
 import { useSimulationMetrics } from './useSimulationMetrics';
@@ -189,31 +190,58 @@ const SimulationDetailsLayout: React.FC<{
   inHeader?: React.ReactNode;
   isTransactionsRedesign: boolean;
   transactionId: string;
-}> = ({ inHeader, isTransactionsRedesign, transactionId, children }) => (
-  <Box
-    data-testid="simulation-details-layout"
-    className="simulation-details-layout"
-    display={Display.Flex}
-    flexDirection={FlexDirection.Column}
-    borderRadius={BorderRadius.LG}
-    borderColor={
-      isTransactionsRedesign
-        ? BorderColor.transparent
-        : BorderColor.borderDefault
-    }
-    padding={3}
-    margin={isTransactionsRedesign ? null : 4}
-    gap={3}
-  >
-    <HeaderLayout
-      isTransactionsRedesign={isTransactionsRedesign}
-      transactionId={transactionId}
+}> = ({ inHeader, isTransactionsRedesign, transactionId, children }) =>
+  isTransactionsRedesign ? (
+    <ConfirmInfoSection noPadding>
+      <Box
+        data-testid="simulation-details-layout"
+        className="simulation-details-layout"
+        display={Display.Flex}
+        flexDirection={FlexDirection.Column}
+        borderRadius={BorderRadius.LG}
+        borderColor={
+          isTransactionsRedesign
+            ? BorderColor.transparent
+            : BorderColor.borderDefault
+        }
+        padding={3}
+        margin={isTransactionsRedesign ? null : 4}
+        gap={3}
+      >
+        <HeaderLayout
+          isTransactionsRedesign={isTransactionsRedesign}
+          transactionId={transactionId}
+        >
+          {inHeader}
+        </HeaderLayout>
+        {children}
+      </Box>
+    </ConfirmInfoSection>
+  ) : (
+    <Box
+      data-testid="simulation-details-layout"
+      className="simulation-details-layout"
+      display={Display.Flex}
+      flexDirection={FlexDirection.Column}
+      borderRadius={BorderRadius.LG}
+      borderColor={
+        isTransactionsRedesign
+          ? BorderColor.transparent
+          : BorderColor.borderDefault
+      }
+      padding={3}
+      margin={isTransactionsRedesign ? null : 4}
+      gap={3}
     >
-      {inHeader}
-    </HeaderLayout>
-    {children}
-  </Box>
-);
+      <HeaderLayout
+        isTransactionsRedesign={isTransactionsRedesign}
+        transactionId={transactionId}
+      >
+        {inHeader}
+      </HeaderLayout>
+      {children}
+    </Box>
+  );
 
 /**
  * Preview of a transaction's effects using simulation data.

From 9e70c7372ff47e5fbca228641c4904b956f3d9c1 Mon Sep 17 00:00:00 2001
From: Jyoti Puri <jyotipuri@gmail.com>
Date: Fri, 6 Dec 2024 19:28:48 +0530
Subject: [PATCH 052/175] chore: Update signature controller (#28988)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## **Description**

Update signature controller to fix signature decoding issues.
1. https://github.com/MetaMask/core/pull/5028
2. https://github.com/MetaMask/core/pull/5033


## **Related issues**

* Related to: https://github.com/MetaMask/MetaMask-planning/issues/3756
* Related to: https://github.com/MetaMask/MetaMask-planning/issues/3757

## **Manual testing steps**
NA

## **Screenshots/Recordings**
NA

## **Pre-merge author checklist**

- [X] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension Coding
Standards](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/CODING_GUIDELINES.md).
- [X] I've completed the PR template to the best of my ability
- [X] I’ve included tests if applicable
- [X] I’ve documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [X] I’ve applied the right labels on the PR (see [labeling
guidelines](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.

## **Pre-merge reviewer checklist**

- [ ] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed).
- [ ] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.
---
 package.json |  2 +-
 yarn.lock    | 22 +++++++++++-----------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/package.json b/package.json
index 70bf454023eb..1eb22a06f21c 100644
--- a/package.json
+++ b/package.json
@@ -340,7 +340,7 @@
     "@metamask/safe-event-emitter": "^3.1.1",
     "@metamask/scure-bip39": "^2.0.3",
     "@metamask/selected-network-controller": "^19.0.0",
-    "@metamask/signature-controller": "^23.0.0",
+    "@metamask/signature-controller": "^23.1.0",
     "@metamask/smart-transactions-controller": "^15.0.0",
     "@metamask/snaps-controllers": "^9.15.0",
     "@metamask/snaps-execution-environments": "^6.10.0",
diff --git a/yarn.lock b/yarn.lock
index 13341ff90db7..261e85ce9ab6 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6087,15 +6087,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/signature-controller@npm:^23.0.0":
-  version: 23.0.0
-  resolution: "@metamask/signature-controller@npm:23.0.0"
+"@metamask/signature-controller@npm:^23.1.0":
+  version: 23.1.0
+  resolution: "@metamask/signature-controller@npm:23.1.0"
   dependencies:
     "@metamask/base-controller": "npm:^7.0.2"
-    "@metamask/controller-utils": "npm:^11.4.3"
+    "@metamask/controller-utils": "npm:^11.4.4"
     "@metamask/eth-sig-util": "npm:^8.0.0"
     "@metamask/utils": "npm:^10.0.0"
-    jsonschema: "npm:^1.2.4"
+    jsonschema: "npm:^1.4.1"
     lodash: "npm:^4.17.21"
     uuid: "npm:^8.3.2"
   peerDependencies:
@@ -6103,7 +6103,7 @@ __metadata:
     "@metamask/keyring-controller": ^19.0.0
     "@metamask/logging-controller": ^6.0.0
     "@metamask/network-controller": ^22.0.0
-  checksum: 10/5e2fda2d89dd3433f00028da0fa7743a6934b72f33fc0e4803dafa98702b9bdd9d093a326060d5480e6eb065c6b4cc1dc3e39382c00702f28b5a6061e8f105bf
+  checksum: 10/2f97e6412bc3a3a13aa2106dfd679500680881918a6e3e2621d4e225e6380df7a01218f7ce26747575b09c85d8ac8be2f5029240339b28fc6d849fad480c5b72
   languageName: node
   linkType: hard
 
@@ -24639,10 +24639,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"jsonschema@npm:^1.2.4":
-  version: 1.2.4
-  resolution: "jsonschema@npm:1.2.4"
-  checksum: 10/7b959737416a5716f2df3142e30c8685bc5449974d56d1cd5acbbd61c0f71041af38fa315327c8577fcdbe30907fd9b633c4d3484baf2cc8563609afac5b4e14
+"jsonschema@npm:^1.2.4, jsonschema@npm:^1.4.1":
+  version: 1.4.1
+  resolution: "jsonschema@npm:1.4.1"
+  checksum: 10/d7a188da7a3100a2caa362b80e98666d46607b7a7153aac405b8e758132961911c6df02d444d4700691330874e21a62639f550e856b21ddd28423690751ca9c6
   languageName: node
   linkType: hard
 
@@ -26454,7 +26454,7 @@ __metadata:
     "@metamask/safe-event-emitter": "npm:^3.1.1"
     "@metamask/scure-bip39": "npm:^2.0.3"
     "@metamask/selected-network-controller": "npm:^19.0.0"
-    "@metamask/signature-controller": "npm:^23.0.0"
+    "@metamask/signature-controller": "npm:^23.1.0"
     "@metamask/smart-transactions-controller": "npm:^15.0.0"
     "@metamask/snaps-controllers": "npm:^9.15.0"
     "@metamask/snaps-execution-environments": "npm:^6.10.0"

From 8d7f003f0bf4e4476d1f31aa279bee630b62aa18 Mon Sep 17 00:00:00 2001
From: Hassan Malik <41640681+hmalik88@users.noreply.github.com>
Date: Fri, 6 Dec 2024 09:37:25 -0500
Subject: [PATCH 053/175] feat: Integrate JSX into snap notifications (#27407)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## **Description**

Adds an expanded view for snaps notifications, using JSX content
returned from the snap to populate the expanded view.


Write a short description of the changes included in this pull request,
also include relevant motivation and context. Have in mind the following
questions:
1. What is the reason for the change? Allow for richer snaps
notifications
2. What is the improvement/solution? Add expanded view for snaps,
allowing a snap to return jsx content in the expanded view.

## **Screenshots/Recordings**


### **After**




https://github.com/user-attachments/assets/74c89bb7-7510-4d1c-acb6-a585978ecec8

## **Manual testing steps**
1. Pull down https://github.com/hmalik88/swiss-knife-snap and run `yarn
start` to serve the snap and site.
2. Build this branch using `yarn start:flask`
3. Install the snap from the local host site.
4. Trigger a notification with the "trigger a JSX notification" button
and observe the results.

## **Pre-merge author checklist**

- [x] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension Coding
Standards](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/CODING_GUIDELINES.md).
- [x] I've completed the PR template to the best of my ability
- [x] I’ve included tests if applicable
- [x] I’ve documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [x] I’ve applied the right labels on the PR (see [labeling
guidelines](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.

## **Pre-merge reviewer checklist**

- [x] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed).
- [x] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.

---------

Co-authored-by: Maarten Zuidhoorn <maarten@zuidhoorn.com>
Co-authored-by: Guillaume Roux <guillaumeroux123@gmail.com>
Co-authored-by: Frederik Bolding <frederik.bolding@gmail.com>
---
 app/scripts/metamask-controller.js            |  25 +-
 .../permission-cell/permission-cell-status.js |   2 +-
 .../snap-ui-markdown/snap-ui-markdown.js      |  65 +++--
 .../account-list-item-menu.js                 |   2 +-
 .../account-list-item/account-list-item.js    |   3 +-
 .../account-list-menu/account-list-menu.tsx   |  11 +-
 .../account-list-menu/hidden-account-list.js  |   6 +-
 .../create-eth-account/create-eth-account.js  |   2 +-
 ...tion-detail-block-explorer-button.test.tsx |  10 +
 .../notification-detail-button.test.tsx       |  10 +
 .../notification-detail-button.tsx            |  69 ++++--
 .../metamask-notifications.tsx                |   4 +-
 .../useNotifications.ts                       |   7 +-
 .../SnapAccountSuccessMessage.tsx             |   2 +-
 .../notification-details-body.tsx             |  16 +-
 .../notification-details-footer.tsx           |  20 +-
 .../notification-details.tsx                  |  16 +-
 .../erc1155-sent-received.tsx                 |   9 +-
 .../erc20-sent-received.tsx                   |   9 +-
 .../erc721-sent-received.tsx                  |   9 +-
 .../eth-sent-received/eth-sent-received.tsx   |   9 +-
 .../feature-announcement.tsx                  |   9 +-
 .../notification-components/index.ts          |   7 +-
 .../lido-stake-ready-to-be-withdrawn.tsx      |   9 +-
 .../lido-withdrawal-requested.tsx             |   9 +-
 .../notification-components/node-guard.ts     |   4 +-
 .../notification-components/snap/snap.tsx     | 231 +++++++++++-------
 .../notification-components/stake/stake.tsx   |   9 +-
 .../swap-completed/swap-completed.tsx         |   9 +-
 .../types/notifications/notifications.ts      |  39 ++-
 .../notifications-list-item.stories.tsx       |   7 +-
 .../notifications/notifications-list-item.tsx |  18 +-
 ui/pages/notifications/notifications-list.tsx |   8 -
 .../remove-snap-account/snap-account-card.tsx |   2 +-
 34 files changed, 451 insertions(+), 216 deletions(-)

diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
index 9ba377614910..0e46a598faf8 100644
--- a/app/scripts/metamask-controller.js
+++ b/app/scripts/metamask-controller.js
@@ -1481,12 +1481,19 @@ export default class MetamaskController extends EventEmitter {
         },
         showInAppNotification: {
           method: (origin, args) => {
-            const { message } = args;
+            const { message, title, footerLink, interfaceId } = args;
+
+            const detailedView = {
+              title,
+              ...(footerLink ? { footerLink } : {}),
+              interfaceId,
+            };
 
             const notification = {
               data: {
                 message,
                 origin,
+                ...(interfaceId ? { detailedView } : {}),
               },
               type: TRIGGER_TYPES.SNAP,
               readDate: null,
@@ -2923,14 +2930,22 @@ export default class MetamaskController extends EventEmitter {
               origin,
               args.message,
             ),
-          showInAppNotification: (origin, args) =>
-            this.controllerMessenger.call(
+          showInAppNotification: (origin, args) => {
+            const { message, title, footerLink } = args;
+            const notificationArgs = {
+              interfaceId: args.content,
+              message,
+              title,
+              footerLink,
+            };
+            return this.controllerMessenger.call(
               'RateLimitController:call',
               origin,
               'showInAppNotification',
               origin,
-              args,
-            ),
+              notificationArgs,
+            );
+          },
           updateSnapState: this.controllerMessenger.call.bind(
             this.controllerMessenger,
             'SnapController:updateSnapState',
diff --git a/ui/components/app/permission-cell/permission-cell-status.js b/ui/components/app/permission-cell/permission-cell-status.js
index 7dcf32a3b2ee..a103c58e37be 100644
--- a/ui/components/app/permission-cell/permission-cell-status.js
+++ b/ui/components/app/permission-cell/permission-cell-status.js
@@ -21,7 +21,7 @@ import {
   TextVariant,
 } from '../../../helpers/constants/design-system';
 import Tooltip from '../../ui/tooltip';
-import { AvatarGroup } from '../../multichain';
+import { AvatarGroup } from '../../multichain/avatar-group';
 import { AvatarType } from '../../multichain/avatar-group/avatar-group.types';
 import { useI18nContext } from '../../../hooks/useI18nContext';
 import { formatDate } from '../../../helpers/utils/util';
diff --git a/ui/components/app/snaps/snap-ui-markdown/snap-ui-markdown.js b/ui/components/app/snaps/snap-ui-markdown/snap-ui-markdown.js
index 41c3a61425b0..235ea458786c 100644
--- a/ui/components/app/snaps/snap-ui-markdown/snap-ui-markdown.js
+++ b/ui/components/app/snaps/snap-ui-markdown/snap-ui-markdown.js
@@ -16,6 +16,7 @@ import {
   Text,
 } from '../../../component-library';
 import SnapLinkWarning from '../snap-link-warning';
+import useSnapNavigation from '../../../../hooks/snaps/useSnapNavigation';
 
 const Paragraph = (props) => (
   <Text
@@ -27,28 +28,42 @@ const Paragraph = (props) => (
   />
 );
 
-const Link = ({ onClick, children, ...rest }) => (
-  <ButtonLink
-    {...rest}
-    as="a"
-    onClick={onClick}
-    externalLink
-    size={ButtonLinkSize.Inherit}
-    display={Display.Inline}
-    className="snap-ui-markdown__link"
-  >
-    {children}
-    <Icon name={IconName.Export} size={IconSize.Inherit} marginLeft={1} />
-  </ButtonLink>
-);
+const Link = ({ onClick, children, isMetaMaskUrl, ...rest }) => {
+  return (
+    <ButtonLink
+      {...rest}
+      as="a"
+      onClick={onClick}
+      externalLink={!isMetaMaskUrl}
+      size={ButtonLinkSize.Inherit}
+      display={Display.Inline}
+      className="snap-ui-markdown__link"
+    >
+      {children}
+      {!isMetaMaskUrl && (
+        <Icon name={IconName.Export} size={IconSize.Inherit} marginLeft={1} />
+      )}
+    </ButtonLink>
+  );
+};
+
+const isMetaMaskUrl = (href) => href.startsWith('metamask:');
 
 export const SnapUIMarkdown = ({ children, markdown }) => {
   const [redirectUrl, setRedirectUrl] = useState(undefined);
+  const { navigate } = useSnapNavigation();
 
   if (markdown === false) {
     return <Paragraph>{children}</Paragraph>;
   }
 
+  const linkTransformer = (href) => {
+    if (isMetaMaskUrl(href)) {
+      return href;
+    }
+    return ReactMarkdown.uriTransformer(href);
+  };
+
   const handleLinkClick = (url) => {
     setRedirectUrl(url);
   };
@@ -66,11 +81,26 @@ export const SnapUIMarkdown = ({ children, markdown }) => {
       />
       <ReactMarkdown
         allowedElements={['p', 'strong', 'em', 'a']}
+        transformLinkUri={linkTransformer}
         components={{
           p: Paragraph,
-          a: ({ children: value, href }) => (
-            <Link onClick={() => handleLinkClick(href)}>{value ?? href}</Link>
-          ),
+          a: ({ children: value, href }) => {
+            return (
+              <Link
+                onClick={(e) => {
+                  e.stopPropagation();
+                  if (isMetaMaskUrl(href)) {
+                    navigate(href);
+                  } else {
+                    handleLinkClick(href);
+                  }
+                }}
+                isMetaMaskUrl={isMetaMaskUrl(href)}
+              >
+                {value ?? href}
+              </Link>
+            );
+          },
         }}
       >
         {children}
@@ -87,4 +117,5 @@ SnapUIMarkdown.propTypes = {
 Link.propTypes = {
   onClick: PropTypes.func,
   children: PropTypes.node,
+  isMetaMaskUrl: PropTypes.bool,
 };
diff --git a/ui/components/multichain/account-list-item-menu/account-list-item-menu.js b/ui/components/multichain/account-list-item-menu/account-list-item-menu.js
index f81752d928fe..d60c630a688d 100644
--- a/ui/components/multichain/account-list-item-menu/account-list-item-menu.js
+++ b/ui/components/multichain/account-list-item-menu/account-list-item-menu.js
@@ -39,7 +39,7 @@ import {
 } from '../../../store/actions';
 import { TextVariant } from '../../../helpers/constants/design-system';
 import { formatAccountType } from '../../../helpers/utils/metrics';
-import { AccountDetailsMenuItem, ViewExplorerMenuItem } from '..';
+import { AccountDetailsMenuItem, ViewExplorerMenuItem } from '../menu-items';
 
 const METRICS_LOCATION = 'Account Options';
 
diff --git a/ui/components/multichain/account-list-item/account-list-item.js b/ui/components/multichain/account-list-item/account-list-item.js
index 207b8fa0fe58..365d09de8ecf 100644
--- a/ui/components/multichain/account-list-item/account-list-item.js
+++ b/ui/components/multichain/account-list-item/account-list-item.js
@@ -6,7 +6,8 @@ import { useSelector } from 'react-redux';
 import { useI18nContext } from '../../../hooks/useI18nContext';
 import { shortenAddress } from '../../../helpers/utils/util';
 
-import { AccountListItemMenu, AvatarGroup } from '..';
+import { AccountListItemMenu } from '../account-list-item-menu';
+import { AvatarGroup } from '../avatar-group';
 import { ConnectedAccountsMenu } from '../connected-accounts-menu';
 import {
   AvatarAccount,
diff --git a/ui/components/multichain/account-list-menu/account-list-menu.tsx b/ui/components/multichain/account-list-menu/account-list-menu.tsx
index 030b57ebe242..d278b5745423 100644
--- a/ui/components/multichain/account-list-menu/account-list-menu.tsx
+++ b/ui/components/multichain/account-list-menu/account-list-menu.tsx
@@ -43,12 +43,9 @@ import {
 import { ModalContent } from '../../component-library/modal-content/deprecated';
 import { ModalHeader } from '../../component-library/modal-header';
 import { TextFieldSearch } from '../../component-library/text-field-search/deprecated';
-import {
-  AccountListItem,
-  AccountListItemMenuTypes,
-  CreateEthAccount,
-  ImportAccount,
-} from '..';
+import { AccountListItem } from '../account-list-item';
+import { AccountListItemMenuTypes } from '../account-list-item/account-list-item.types';
+
 import {
   AlignItems,
   BlockSize,
@@ -130,6 +127,8 @@ import {
   ACCOUNT_OVERVIEW_TAB_KEY_TO_TRACE_NAME_MAP,
   AccountOverviewTabKey,
 } from '../../../../shared/constants/app-state';
+import { CreateEthAccount } from '../create-eth-account';
+import { ImportAccount } from '../import-account';
 ///: BEGIN:ONLY_INCLUDE_IF(solana)
 import {
   SOLANA_WALLET_NAME,
diff --git a/ui/components/multichain/account-list-menu/hidden-account-list.js b/ui/components/multichain/account-list-menu/hidden-account-list.js
index b31c0f865276..6ae3a32da20b 100644
--- a/ui/components/multichain/account-list-menu/hidden-account-list.js
+++ b/ui/components/multichain/account-list-menu/hidden-account-list.js
@@ -34,8 +34,10 @@ import {
   IconSize,
   Text,
 } from '../../component-library';
-import { AccountListItem } from '../account-list-item';
-import { AccountListItemMenuTypes } from '..';
+import {
+  AccountListItem,
+  AccountListItemMenuTypes,
+} from '../account-list-item';
 import { mergeAccounts } from './account-list-menu';
 
 export const HiddenAccountList = ({ onClose }) => {
diff --git a/ui/components/multichain/create-eth-account/create-eth-account.js b/ui/components/multichain/create-eth-account/create-eth-account.js
index 67ddf638f8b9..3dc5aa517810 100644
--- a/ui/components/multichain/create-eth-account/create-eth-account.js
+++ b/ui/components/multichain/create-eth-account/create-eth-account.js
@@ -7,7 +7,7 @@ import {
   setAccountLabel,
   getNextAvailableAccountName as getNextAvailableAccountNameFromController,
 } from '../../../store/actions';
-import { CreateAccount } from '..';
+import { CreateAccount } from '../create-account';
 
 export const CreateEthAccount = ({ onActionComplete }) => {
   const dispatch = useDispatch();
diff --git a/ui/components/multichain/notification-detail-block-explorer-button/notification-detail-block-explorer-button.test.tsx b/ui/components/multichain/notification-detail-block-explorer-button/notification-detail-block-explorer-button.test.tsx
index 7b9ff70969be..3171c2db758e 100644
--- a/ui/components/multichain/notification-detail-block-explorer-button/notification-detail-block-explorer-button.test.tsx
+++ b/ui/components/multichain/notification-detail-block-explorer-button/notification-detail-block-explorer-button.test.tsx
@@ -46,6 +46,16 @@ const mockNotification = {
   type: 'ERC20_RECEIVED',
 };
 
+jest.mock('react-router-dom', () => {
+  const original = jest.requireActual('react-router-dom');
+  return {
+    ...original,
+    useHistory: () => ({
+      push: jest.fn(),
+    }),
+  };
+});
+
 describe('NotificationDetailBlockExplorerButton', () => {
   it('renders correctly with a valid block explorer URL', () => {
     render(
diff --git a/ui/components/multichain/notification-detail-button/notification-detail-button.test.tsx b/ui/components/multichain/notification-detail-button/notification-detail-button.test.tsx
index 46b80df1213e..c7a54e5a69d9 100644
--- a/ui/components/multichain/notification-detail-button/notification-detail-button.test.tsx
+++ b/ui/components/multichain/notification-detail-button/notification-detail-button.test.tsx
@@ -8,6 +8,16 @@ const { TRIGGER_TYPES } = NotificationServicesController.Constants;
 
 type Notification = NotificationServicesController.Types.INotification;
 
+jest.mock('react-router-dom', () => {
+  const original = jest.requireActual('react-router-dom');
+  return {
+    ...original,
+    useHistory: () => ({
+      push: jest.fn(),
+    }),
+  };
+});
+
 describe('NotificationDetailButton', () => {
   const defaultProps = {
     variant: ButtonVariant.Primary,
diff --git a/ui/components/multichain/notification-detail-button/notification-detail-button.tsx b/ui/components/multichain/notification-detail-button/notification-detail-button.tsx
index b63990bd7c76..065faf0e50af 100644
--- a/ui/components/multichain/notification-detail-button/notification-detail-button.tsx
+++ b/ui/components/multichain/notification-detail-button/notification-detail-button.tsx
@@ -1,5 +1,4 @@
-import React, { useContext } from 'react';
-import { NotificationServicesController } from '@metamask/notification-services-controller';
+import React, { useContext, useState } from 'react';
 import { MetaMetricsContext } from '../../../contexts/metametrics';
 import {
   MetaMetricsEventCategory,
@@ -12,8 +11,10 @@ import {
   IconName,
 } from '../../component-library';
 import { BlockSize } from '../../../helpers/constants/design-system';
-
-type Notification = NotificationServicesController.Types.INotification;
+import { TRIGGER_TYPES } from '../../../pages/notifications/notification-components';
+import useSnapNavigation from '../../../hooks/snaps/useSnapNavigation';
+import { type Notification } from '../../../pages/notifications/notification-components/types/notifications/notifications';
+import SnapLinkWarning from '../../app/snaps/snap-link-warning';
 
 type NotificationDetailButtonProps = {
   notification: Notification;
@@ -35,6 +36,23 @@ export const NotificationDetailButton = ({
   endIconName = true,
 }: NotificationDetailButtonProps) => {
   const trackEvent = useContext(MetaMetricsContext);
+  const { navigate } = useSnapNavigation();
+  const isMetaMaskUrl = href.startsWith('metamask:');
+  const [isOpen, setIsOpen] = useState(false);
+
+  const isSnapNotification = notification.type === TRIGGER_TYPES.SNAP;
+
+  const handleModalClose = () => {
+    setIsOpen(false);
+  };
+
+  // this logic can be expanded once this detail button is used outside of the current use cases
+  const getClickedItem = () => {
+    if (notification.type === TRIGGER_TYPES.FEATURES_ANNOUNCEMENT) {
+      return 'block_explorer';
+    }
+    return isExternal ? 'external_link' : 'internal_link';
+  };
 
   const onClick = () => {
     trackEvent({
@@ -46,23 +64,40 @@ export const NotificationDetailButton = ({
         ...('chain_id' in notification && {
           chain_id: notification.chain_id,
         }),
-        clicked_item: 'block_explorer',
+        clicked_item: getClickedItem(),
       },
     });
+
+    if (isSnapNotification) {
+      if (isMetaMaskUrl) {
+        navigate(href);
+      } else {
+        setIsOpen(true);
+      }
+    }
   };
 
   return (
-    <Button
-      key={id}
-      href={href}
-      variant={variant}
-      externalLink={isExternal}
-      size={ButtonSize.Lg}
-      width={BlockSize.Full}
-      endIconName={endIconName ? IconName.Arrow2UpRight : undefined}
-      onClick={onClick}
-    >
-      {text}
-    </Button>
+    <>
+      {isSnapNotification && (
+        <SnapLinkWarning
+          isOpen={isOpen}
+          onClose={handleModalClose}
+          url={href}
+        />
+      )}
+      <Button
+        key={id}
+        href={!isSnapNotification && href ? href : undefined}
+        variant={variant}
+        externalLink={isExternal || !isMetaMaskUrl}
+        size={ButtonSize.Lg}
+        width={BlockSize.Full}
+        endIconName={endIconName ? IconName.Arrow2UpRight : undefined}
+        onClick={onClick}
+      >
+        {text}
+      </Button>
+    </>
   );
 };
diff --git a/ui/contexts/metamask-notifications/metamask-notifications.tsx b/ui/contexts/metamask-notifications/metamask-notifications.tsx
index 12a193a202c3..2019e85a1391 100644
--- a/ui/contexts/metamask-notifications/metamask-notifications.tsx
+++ b/ui/contexts/metamask-notifications/metamask-notifications.tsx
@@ -1,14 +1,12 @@
 import React, { createContext, useContext, useEffect, useMemo } from 'react';
 import { useSelector } from 'react-redux';
-import type { NotificationServicesController } from '@metamask/notification-services-controller';
 import { useListNotifications } from '../../hooks/metamask-notifications/useNotifications';
 import { useAccountSyncingEffect } from '../../hooks/identity/useProfileSyncing';
 import { selectIsProfileSyncingEnabled } from '../../selectors/identity/profile-syncing';
 import { selectIsMetamaskNotificationsEnabled } from '../../selectors/metamask-notifications/metamask-notifications';
 import { getUseExternalServices } from '../../selectors';
 import { getIsUnlocked } from '../../ducks/metamask/metamask';
-
-type Notification = NotificationServicesController.Types.INotification;
+import { type Notification } from '../../pages/notifications/notification-components/types/notifications/notifications';
 
 type MetamaskNotificationsContextType = {
   listNotifications: () => void;
diff --git a/ui/hooks/metamask-notifications/useNotifications.ts b/ui/hooks/metamask-notifications/useNotifications.ts
index 9724253a8671..60eb154bc75e 100644
--- a/ui/hooks/metamask-notifications/useNotifications.ts
+++ b/ui/hooks/metamask-notifications/useNotifications.ts
@@ -1,9 +1,9 @@
 import { useState, useCallback } from 'react';
 import { useDispatch } from 'react-redux';
 import type { InternalAccount } from '@metamask/keyring-api';
-import type { NotificationServicesController } from '@metamask/notification-services-controller';
 import log from 'loglevel';
 
+import { type MarkAsReadNotificationsParam } from '@metamask/notification-services-controller/notification-services';
 import {
   createOnChainTriggers,
   fetchAndUpdateMetamaskNotifications,
@@ -11,10 +11,7 @@ import {
   enableMetamaskNotifications,
   disableMetamaskNotifications,
 } from '../../store/actions';
-
-type Notification = NotificationServicesController.Types.INotification;
-type MarkAsReadNotificationsParam =
-  NotificationServicesController.Types.MarkAsReadNotificationsParam;
+import { type Notification } from '../../pages/notifications/notification-components/types/notifications/notifications';
 
 // Define KeyringType interface
 type KeyringType = {
diff --git a/ui/pages/confirmations/components/snap-account-success-message/SnapAccountSuccessMessage.tsx b/ui/pages/confirmations/components/snap-account-success-message/SnapAccountSuccessMessage.tsx
index 9bcc003f4b76..b2661bcf25f4 100644
--- a/ui/pages/confirmations/components/snap-account-success-message/SnapAccountSuccessMessage.tsx
+++ b/ui/pages/confirmations/components/snap-account-success-message/SnapAccountSuccessMessage.tsx
@@ -2,7 +2,7 @@ import React from 'react';
 
 import { Text } from '../../../../components/component-library';
 import { useI18nContext } from '../../../../hooks/useI18nContext';
-import { SnapAccountCard } from '../../../remove-snap-account';
+import { SnapAccountCard } from '../../../remove-snap-account/snap-account-card';
 
 const SnapAccountSuccessMessage = ({
   message,
diff --git a/ui/pages/notification-details/notification-details-body/notification-details-body.tsx b/ui/pages/notification-details/notification-details-body/notification-details-body.tsx
index 3a128e1fb560..3c481df7f65f 100644
--- a/ui/pages/notification-details/notification-details-body/notification-details-body.tsx
+++ b/ui/pages/notification-details/notification-details-body/notification-details-body.tsx
@@ -1,13 +1,14 @@
 import React from 'react';
-import type { NotificationServicesController } from '@metamask/notification-services-controller';
 import { Box } from '../../../components/component-library';
 import {
   Display,
   FlexDirection,
 } from '../../../helpers/constants/design-system';
-import type { NotificationComponent } from '../../notifications/notification-components/types/notifications/notifications';
-
-type Notification = NotificationServicesController.Types.INotification;
+import {
+  Notification,
+  NotificationComponentType,
+  type NotificationComponent,
+} from '../../notifications/notification-components/types/notifications/notifications';
 
 type NotificationDetailsBodyProps = {
   body: NotificationComponent['details']['body'];
@@ -24,13 +25,13 @@ export const NotificationDetailsBody = ({
       flexDirection={FlexDirection.Column}
       padding={0}
     >
-      {body.type === 'body_feature_announcement' && (
+      {body.type === NotificationComponentType.AnnouncementBody && (
         <>
           <body.Image notification={notification} />
           <body.Description notification={notification} />
         </>
       )}
-      {body.type === 'body_onchain_notification' && (
+      {body.type === NotificationComponentType.OnChainBody && (
         <>
           {body.Image && <body.Image notification={notification} />}
           {body.From && <body.From notification={notification} />}
@@ -47,6 +48,9 @@ export const NotificationDetailsBody = ({
           {body.NetworkFee && <body.NetworkFee notification={notification} />}
         </>
       )}
+      {body.type === NotificationComponentType.SnapBody && (
+        <body.Content notification={notification} />
+      )}
     </Box>
   );
 };
diff --git a/ui/pages/notification-details/notification-details-footer/notification-details-footer.tsx b/ui/pages/notification-details/notification-details-footer/notification-details-footer.tsx
index 7a1f9a1c8890..49b5f5d9a7b5 100644
--- a/ui/pages/notification-details/notification-details-footer/notification-details-footer.tsx
+++ b/ui/pages/notification-details/notification-details-footer/notification-details-footer.tsx
@@ -1,5 +1,4 @@
 import React from 'react';
-import type { NotificationServicesController } from '@metamask/notification-services-controller';
 import { Box } from '../../../components/component-library';
 import {
   BlockSize,
@@ -7,9 +6,11 @@ import {
   FlexDirection,
   JustifyContent,
 } from '../../../helpers/constants/design-system';
-import type { NotificationComponent } from '../../notifications/notification-components/types/notifications/notifications';
-
-type Notification = NotificationServicesController.Types.INotification;
+import {
+  Notification,
+  NotificationComponentType,
+  type NotificationComponent,
+} from '../../notifications/notification-components/types/notifications/notifications';
 
 type NotificationDetailsFooterProps = {
   footer: NotificationComponent['footer'];
@@ -29,12 +30,10 @@ export const NotificationDetailsFooter = ({
       padding={4}
       gap={4}
     >
-      {footer.type === 'footer_onchain_notification' && (
-        <>
-          <footer.ScanLink notification={notification} />
-        </>
+      {footer.type === NotificationComponentType.OnChainFooter && (
+        <footer.ScanLink notification={notification} />
       )}
-      {footer.type === 'footer_feature_announcement' && (
+      {footer.type === NotificationComponentType.AnnouncementFooter && (
         <Box
           display={Display.Flex}
           gap={4}
@@ -45,6 +44,9 @@ export const NotificationDetailsFooter = ({
           <footer.ExtensionLink notification={notification} />
         </Box>
       )}
+      {footer.type === NotificationComponentType.SnapFooter && (
+        <footer.Link notification={notification} />
+      )}
     </Box>
   );
 };
diff --git a/ui/pages/notification-details/notification-details.tsx b/ui/pages/notification-details/notification-details.tsx
index ffdbe7bc7a16..d177d75e7c94 100644
--- a/ui/pages/notification-details/notification-details.tsx
+++ b/ui/pages/notification-details/notification-details.tsx
@@ -1,7 +1,7 @@
 import React, { useCallback, useEffect } from 'react';
 import { useSelector } from 'react-redux';
 import { useHistory, useLocation } from 'react-router-dom';
-import type { NotificationServicesController } from '@metamask/notification-services-controller';
+import { TRIGGER_TYPES } from '@metamask/notification-services-controller/notification-services';
 import { Box } from '../../components/component-library';
 import {
   BlockSize,
@@ -18,13 +18,13 @@ import {
   NotificationComponents,
   hasNotificationComponents,
 } from '../notifications/notification-components';
+import { type Notification } from '../notifications/notification-components/types/notifications/notifications';
+import { useSnapNotificationTimeouts } from '../../hooks/useNotificationTimeouts';
 import { getExtractIdentifier } from './utils/utils';
 import { NotificationDetailsHeader } from './notification-details-header/notification-details-header';
 import { NotificationDetailsBody } from './notification-details-body/notification-details-body';
 import { NotificationDetailsFooter } from './notification-details-footer/notification-details-footer';
 
-type Notification = NotificationServicesController.Types.INotification;
-
 function useModalNavigation() {
   const history = useHistory();
 
@@ -49,6 +49,8 @@ function useNotificationByPath() {
 
 function useEffectOnNotificationView(notificationData?: Notification) {
   const { markNotificationAsRead } = useMarkNotificationAsRead();
+  const { setNotificationTimeout } = useSnapNotificationTimeouts();
+
   useEffect(() => {
     if (notificationData) {
       markNotificationAsRead([
@@ -59,7 +61,13 @@ function useEffectOnNotificationView(notificationData?: Notification) {
         },
       ]);
     }
-  }, [markNotificationAsRead, notificationData]);
+
+    return () => {
+      if (notificationData?.type === TRIGGER_TYPES.SNAP) {
+        setNotificationTimeout(notificationData.id);
+      }
+    };
+  }, []);
 }
 
 export default function NotificationDetails() {
diff --git a/ui/pages/notifications/notification-components/erc1155-sent-received/erc1155-sent-received.tsx b/ui/pages/notifications/notification-components/erc1155-sent-received/erc1155-sent-received.tsx
index 4c2e3075b2e3..c2b3b1e9e5c8 100644
--- a/ui/pages/notifications/notification-components/erc1155-sent-received/erc1155-sent-received.tsx
+++ b/ui/pages/notifications/notification-components/erc1155-sent-received/erc1155-sent-received.tsx
@@ -6,7 +6,10 @@ import { CHAIN_IDS } from '../../../../../shared/constants/network';
 import { t } from '../../../../../app/scripts/translate';
 
 import { type ExtractedNotification, isOfTypeNodeGuard } from '../node-guard';
-import type { NotificationComponent } from '../types/notifications/notifications';
+import {
+  NotificationComponentType,
+  type NotificationComponent,
+} from '../types/notifications/notifications';
 
 import { shortenAddress } from '../../../../helpers/utils/util';
 import { decimalToHex } from '../../../../../shared/modules/conversion.utils';
@@ -110,7 +113,7 @@ export const components: NotificationComponent<ERC1155Notification> = {
       );
     },
     body: {
-      type: 'body_onchain_notification',
+      type: NotificationComponentType.OnChainBody,
       Image: ({ notification }) => {
         const chainId = decimalToHex(notification.chain_id);
         const { nativeCurrencyLogo, nativeCurrencyName } =
@@ -189,7 +192,7 @@ export const components: NotificationComponent<ERC1155Notification> = {
     },
   },
   footer: {
-    type: 'footer_onchain_notification',
+    type: NotificationComponentType.OnChainFooter,
     ScanLink: ({ notification }) => {
       return (
         <NotificationDetailBlockExplorerButton
diff --git a/ui/pages/notifications/notification-components/erc20-sent-received/erc20-sent-received.tsx b/ui/pages/notifications/notification-components/erc20-sent-received/erc20-sent-received.tsx
index 8bed89216575..a3eccc1b5690 100644
--- a/ui/pages/notifications/notification-components/erc20-sent-received/erc20-sent-received.tsx
+++ b/ui/pages/notifications/notification-components/erc20-sent-received/erc20-sent-received.tsx
@@ -5,7 +5,10 @@ import { NotificationServicesController } from '@metamask/notification-services-
 import { t } from '../../../../../app/scripts/translate';
 import { CHAIN_IDS } from '../../../../../shared/constants/network';
 import { type ExtractedNotification, isOfTypeNodeGuard } from '../node-guard';
-import type { NotificationComponent } from '../types/notifications/notifications';
+import {
+  NotificationComponentType,
+  type NotificationComponent,
+} from '../types/notifications/notifications';
 import { NotificationListItemIconType } from '../../../../components/multichain/notification-list-item-icon/notification-list-item-icon';
 
 import { shortenAddress } from '../../../../helpers/utils/util';
@@ -107,7 +110,7 @@ export const components: NotificationComponent<ERC20Notification> = {
       />
     ),
     body: {
-      type: 'body_onchain_notification',
+      type: NotificationComponentType.OnChainBody,
       From: ({ notification }) => (
         <NotificationDetailAddress
           side={`${t('notificationItemFrom')}${
@@ -194,7 +197,7 @@ export const components: NotificationComponent<ERC20Notification> = {
     },
   },
   footer: {
-    type: 'footer_onchain_notification',
+    type: NotificationComponentType.OnChainFooter,
     ScanLink: ({ notification }) => {
       return (
         <NotificationDetailBlockExplorerButton
diff --git a/ui/pages/notifications/notification-components/erc721-sent-received/erc721-sent-received.tsx b/ui/pages/notifications/notification-components/erc721-sent-received/erc721-sent-received.tsx
index 7626691d2027..698fa7e965fa 100644
--- a/ui/pages/notifications/notification-components/erc721-sent-received/erc721-sent-received.tsx
+++ b/ui/pages/notifications/notification-components/erc721-sent-received/erc721-sent-received.tsx
@@ -6,7 +6,10 @@ import { CHAIN_IDS } from '../../../../../shared/constants/network';
 import { t } from '../../../../../app/scripts/translate';
 
 import { type ExtractedNotification, isOfTypeNodeGuard } from '../node-guard';
-import type { NotificationComponent } from '../types/notifications/notifications';
+import {
+  NotificationComponentType,
+  type NotificationComponent,
+} from '../types/notifications/notifications';
 
 import { shortenAddress } from '../../../../helpers/utils/util';
 import { decimalToHex } from '../../../../../shared/modules/conversion.utils';
@@ -109,7 +112,7 @@ export const components: NotificationComponent<ERC721Notification> = {
       );
     },
     body: {
-      type: 'body_onchain_notification',
+      type: NotificationComponentType.OnChainBody,
       Image: ({ notification }) => {
         const chainId = decimalToHex(notification.chain_id);
         const { nativeCurrencyLogo, nativeCurrencyName } =
@@ -188,7 +191,7 @@ export const components: NotificationComponent<ERC721Notification> = {
     },
   },
   footer: {
-    type: 'footer_onchain_notification',
+    type: NotificationComponentType.OnChainFooter,
     ScanLink: ({ notification }) => {
       return (
         <NotificationDetailBlockExplorerButton
diff --git a/ui/pages/notifications/notification-components/eth-sent-received/eth-sent-received.tsx b/ui/pages/notifications/notification-components/eth-sent-received/eth-sent-received.tsx
index 6971a0cadaf0..9330fa033d81 100644
--- a/ui/pages/notifications/notification-components/eth-sent-received/eth-sent-received.tsx
+++ b/ui/pages/notifications/notification-components/eth-sent-received/eth-sent-received.tsx
@@ -5,7 +5,10 @@ import { NotificationServicesController } from '@metamask/notification-services-
 import { t } from '../../../../../app/scripts/translate';
 import { CHAIN_IDS } from '../../../../../shared/constants/network';
 import { type ExtractedNotification, isOfTypeNodeGuard } from '../node-guard';
-import type { NotificationComponent } from '../types/notifications/notifications';
+import {
+  NotificationComponentType,
+  type NotificationComponent,
+} from '../types/notifications/notifications';
 
 import { decimalToHex } from '../../../../../shared/modules/conversion.utils';
 import { shortenAddress } from '../../../../helpers/utils/util';
@@ -120,7 +123,7 @@ export const components: NotificationComponent<ETHNotification> = {
       );
     },
     body: {
-      type: 'body_onchain_notification',
+      type: NotificationComponentType.OnChainBody,
       From: ({ notification }) => (
         <NotificationDetailAddress
           side={`${t('notificationItemFrom')}${
@@ -203,7 +206,7 @@ export const components: NotificationComponent<ETHNotification> = {
     },
   },
   footer: {
-    type: 'footer_onchain_notification',
+    type: NotificationComponentType.OnChainFooter,
     ScanLink: ({ notification }) => {
       return (
         <NotificationDetailBlockExplorerButton
diff --git a/ui/pages/notifications/notification-components/feature-announcement/feature-announcement.tsx b/ui/pages/notifications/notification-components/feature-announcement/feature-announcement.tsx
index fca591b2d053..0c8a7b2cb230 100644
--- a/ui/pages/notifications/notification-components/feature-announcement/feature-announcement.tsx
+++ b/ui/pages/notifications/notification-components/feature-announcement/feature-announcement.tsx
@@ -1,7 +1,10 @@
 import React from 'react';
 import { NotificationServicesController } from '@metamask/notification-services-controller';
 import { type ExtractedNotification, isOfTypeNodeGuard } from '../node-guard';
-import type { NotificationComponent } from '../types/notifications/notifications';
+import {
+  NotificationComponentType,
+  type NotificationComponent,
+} from '../types/notifications/notifications';
 import { NotificationListItemIconType } from '../../../../components/multichain/notification-list-item-icon/notification-list-item-icon';
 
 import {
@@ -70,7 +73,7 @@ export const components: NotificationComponent<FeatureAnnouncementNotification>
         />
       ),
       body: {
-        type: 'body_feature_announcement',
+        type: NotificationComponentType.AnnouncementBody,
         Image: ({ notification }) => (
           <Box
             display={Display.Block}
@@ -105,7 +108,7 @@ export const components: NotificationComponent<FeatureAnnouncementNotification>
       },
     },
     footer: {
-      type: 'footer_feature_announcement',
+      type: NotificationComponentType.AnnouncementFooter,
       ExtensionLink: ({ notification }) =>
         notification.data.extensionLink ? (
           <NotificationDetailButton
diff --git a/ui/pages/notifications/notification-components/index.ts b/ui/pages/notifications/notification-components/index.ts
index a0c11148659a..b8a1ababa9e5 100644
--- a/ui/pages/notifications/notification-components/index.ts
+++ b/ui/pages/notifications/notification-components/index.ts
@@ -9,9 +9,9 @@ import { components as StakeComponents } from './stake/stake';
 import { components as SwapCompletedComponents } from './swap-completed/swap-completed';
 import { components as LidoWithdrawalRequestedComponents } from './lido-withdrawal-requested/lido-withdrawal-requested';
 import { components as LidoStakeReadyToBeWithdrawnComponents } from './lido-stake-ready-to-be-withdrawn/lido-stake-ready-to-be-withdrawn';
+import { components as SnapNotificationComponents } from './snap/snap';
 
-const { TRIGGER_TYPES } = NotificationServicesController.Constants;
-type TRIGGER_TYPES = NotificationServicesController.Constants.TRIGGER_TYPES;
+export const { TRIGGER_TYPES } = NotificationServicesController.Constants;
 
 /**
  * Each notification component has a specific shape it follows.
@@ -66,8 +66,9 @@ export const NotificationComponents = {
   [TRIGGER_TYPES.LIDO_STAKE_READY_TO_BE_WITHDRAWN]: expandComponentsType(
     LidoStakeReadyToBeWithdrawnComponents,
   ),
+  [TRIGGER_TYPES.SNAP]: expandComponentsType(SnapNotificationComponents),
 };
 
 export const hasNotificationComponents = (
-  t: TRIGGER_TYPES,
+  t: NotificationServicesController.Constants.TRIGGER_TYPES,
 ): t is keyof typeof NotificationComponents => t in NotificationComponents;
diff --git a/ui/pages/notifications/notification-components/lido-stake-ready-to-be-withdrawn/lido-stake-ready-to-be-withdrawn.tsx b/ui/pages/notifications/notification-components/lido-stake-ready-to-be-withdrawn/lido-stake-ready-to-be-withdrawn.tsx
index f8cdbdf3216c..2fb9c30b14b9 100644
--- a/ui/pages/notifications/notification-components/lido-stake-ready-to-be-withdrawn/lido-stake-ready-to-be-withdrawn.tsx
+++ b/ui/pages/notifications/notification-components/lido-stake-ready-to-be-withdrawn/lido-stake-ready-to-be-withdrawn.tsx
@@ -2,7 +2,10 @@ import React from 'react';
 import { NotificationServicesController } from '@metamask/notification-services-controller';
 import { CHAIN_IDS } from '../../../../../shared/constants/network';
 import { type ExtractedNotification, isOfTypeNodeGuard } from '../node-guard';
-import type { NotificationComponent } from '../types/notifications/notifications';
+import {
+  NotificationComponentType,
+  type NotificationComponent,
+} from '../types/notifications/notifications';
 import {
   NotificationListItem,
   NotificationDetailInfo,
@@ -93,7 +96,7 @@ export const components: NotificationComponent<LidoReadyWithDrawnNotification> =
         />
       ),
       body: {
-        type: 'body_onchain_notification',
+        type: NotificationComponentType.OnChainBody,
         Account: ({ notification }) => {
           if (!notification.address) {
             return null;
@@ -165,7 +168,7 @@ export const components: NotificationComponent<LidoReadyWithDrawnNotification> =
       },
     },
     footer: {
-      type: 'footer_onchain_notification',
+      type: NotificationComponentType.OnChainFooter,
       ScanLink: ({ notification }) => {
         return (
           <NotificationDetailBlockExplorerButton
diff --git a/ui/pages/notifications/notification-components/lido-withdrawal-requested/lido-withdrawal-requested.tsx b/ui/pages/notifications/notification-components/lido-withdrawal-requested/lido-withdrawal-requested.tsx
index 47063c97e5ac..4c6b61a821eb 100644
--- a/ui/pages/notifications/notification-components/lido-withdrawal-requested/lido-withdrawal-requested.tsx
+++ b/ui/pages/notifications/notification-components/lido-withdrawal-requested/lido-withdrawal-requested.tsx
@@ -1,7 +1,10 @@
 import React from 'react';
 import { NotificationServicesController } from '@metamask/notification-services-controller';
 import { type ExtractedNotification, isOfTypeNodeGuard } from '../node-guard';
-import type { NotificationComponent } from '../types/notifications/notifications';
+import {
+  NotificationComponentType,
+  type NotificationComponent,
+} from '../types/notifications/notifications';
 import { NotificationListItemIconType } from '../../../../components/multichain/notification-list-item-icon/notification-list-item-icon';
 
 import {
@@ -104,7 +107,7 @@ export const components: NotificationComponent<LidoWithdrawalRequestedNotificati
         );
       },
       body: {
-        type: 'body_onchain_notification',
+        type: NotificationComponentType.OnChainBody,
         Account: ({ notification }) => {
           if (!notification.address) {
             return null;
@@ -185,7 +188,7 @@ export const components: NotificationComponent<LidoWithdrawalRequestedNotificati
       },
     },
     footer: {
-      type: 'footer_onchain_notification',
+      type: NotificationComponentType.OnChainFooter,
       ScanLink: ({ notification }) => {
         return (
           <NotificationDetailBlockExplorerButton
diff --git a/ui/pages/notifications/notification-components/node-guard.ts b/ui/pages/notifications/notification-components/node-guard.ts
index 3be54517fafb..7e8a54346f1e 100644
--- a/ui/pages/notifications/notification-components/node-guard.ts
+++ b/ui/pages/notifications/notification-components/node-guard.ts
@@ -1,6 +1,4 @@
-import type { NotificationServicesController } from '@metamask/notification-services-controller';
-
-type Notification = NotificationServicesController.Types.INotification;
+import { type Notification } from './types/notifications/notifications';
 
 export type ExtractedNotification<NodeType> = Extract<
   Notification,
diff --git a/ui/pages/notifications/notification-components/snap/snap.tsx b/ui/pages/notifications/notification-components/snap/snap.tsx
index 7ce1168e7de2..bfd071ae8328 100644
--- a/ui/pages/notifications/notification-components/snap/snap.tsx
+++ b/ui/pages/notifications/notification-components/snap/snap.tsx
@@ -1,98 +1,161 @@
-import React, { useContext } from 'react';
+import React from 'react';
 import { useSelector } from 'react-redux';
 import { useHistory } from 'react-router-dom';
-import { NotificationServicesController } from '@metamask/notification-services-controller';
-import { TRIGGER_TYPES } from '@metamask/notification-services-controller/notification-services';
 import {
-  MetaMetricsEventCategory,
-  MetaMetricsEventName,
-} from '../../../../../shared/constants/metametrics';
-import { MetaMetricsContext } from '../../../../contexts/metametrics';
-import { NotificationListItemSnap } from '../../../../components/multichain';
+  TRIGGER_TYPES,
+  type ExpandedView,
+} from '@metamask/notification-services-controller/notification-services';
+import {
+  NotificationDetailButton,
+  NotificationDetailTitle,
+  NotificationListItemSnap,
+} from '../../../../components/multichain';
 import { getSnapsMetadata } from '../../../../selectors';
 import { getSnapRoute, getSnapName } from '../../../../helpers/utils/util';
+import {
+  NotificationComponent,
+  NotificationComponentType,
+} from '../types/notifications/notifications';
+import { formatIsoDateString } from '../../../../helpers/utils/notification.util';
+import { SnapUIRenderer } from '../../../../components/app/snaps/snap-ui-renderer';
+import {
+  AlignItems,
+  BackgroundColor,
+  Display,
+  FlexDirection,
+  FontWeight,
+} from '../../../../helpers/constants/design-system';
+import {
+  Box,
+  ButtonVariant,
+  IconSize,
+  Text,
+} from '../../../../components/component-library';
+import { isOfTypeNodeGuard, type ExtractedNotification } from '../node-guard';
+import { SnapIcon } from '../../../../components/app/snaps/snap-icon';
 import { useMarkNotificationAsRead } from '../../../../hooks/metamask-notifications/useNotifications';
-import { useSnapNotificationTimeouts } from '../../../../hooks/useNotificationTimeouts';
-
-export type SnapNotification = Extract<
-  NotificationServicesController.Types.INotification,
-  { type: TRIGGER_TYPES.SNAP }
->;
-
-type SnapComponentProps = {
-  snapNotification: SnapNotification;
-};
-
-export const SnapComponent = ({ snapNotification }: SnapComponentProps) => {
-  const history = useHistory();
-  const trackEvent = useContext(MetaMetricsContext);
-  const { markNotificationAsRead } = useMarkNotificationAsRead();
-  const { setNotificationTimeout } = useSnapNotificationTimeouts();
+import { SnapUIMarkdown } from '../../../../components/app/snaps/snap-ui-markdown';
 
-  const snapsMetadata = useSelector(getSnapsMetadata);
+type SnapNotification = ExtractedNotification<TRIGGER_TYPES.SNAP>;
 
-  const snapsNameGetter = getSnapName(snapsMetadata);
+type DetailedViewData = Extract<
+  SnapNotification['data'],
+  { origin: string; message: string; detailedView: ExpandedView }
+>;
 
-  const handleUnreadNotification = () => {
-    markNotificationAsRead([
-      {
-        id: snapNotification.id,
-        type: snapNotification.type,
-        isRead: snapNotification.isRead,
-      },
-    ]);
+export const components: NotificationComponent<SnapNotification> = {
+  guardFn: isOfTypeNodeGuard([TRIGGER_TYPES.SNAP]),
+  item: ({ notification, onClick }) => {
+    const history = useHistory();
+    const snapsMetadata = useSelector(getSnapsMetadata);
+    const snapsNameGetter = getSnapName(snapsMetadata);
+    const { markNotificationAsRead } = useMarkNotificationAsRead();
 
-    setNotificationTimeout(snapNotification.id);
-  };
+    const handleSnapButton = () => {
+      if (!notification.isRead) {
+        markNotificationAsRead([
+          {
+            id: notification.id,
+            type: notification.type,
+            isRead: notification.isRead,
+          },
+        ]);
+      }
 
-  const handleSnapClick = () => {
-    if (!snapNotification.isRead) {
-      handleUnreadNotification();
-    }
+      history.push(getSnapRoute(notification.data.origin));
+    };
 
-    trackEvent({
-      category: MetaMetricsEventCategory.NotificationInteraction,
-      event: MetaMetricsEventName.NotificationClicked,
-      properties: {
-        notification_id: snapNotification.id,
-        notification_type: snapNotification.type,
-        previously_read: snapNotification.isRead,
+    return (
+      <NotificationListItemSnap
+        id={notification.id}
+        snapId={notification.data.origin}
+        isRead={notification.isRead}
+        createdAt={new Date(notification.createdAt)}
+        title={{
+          items: [
+            {
+              text: snapsNameGetter(notification.data.origin),
+            },
+          ],
+        }}
+        snapMessage={notification.data.message}
+        handleSnapClick={onClick}
+        handleSnapButton={handleSnapButton}
+      />
+    );
+  },
+  details: {
+    title: ({ notification }) => (
+      <NotificationDetailTitle
+        title={
+          (notification.data as DetailedViewData).detailedView.title as string
+        }
+        date={formatIsoDateString(notification.createdAt)}
+      />
+    ),
+    body: {
+      type: NotificationComponentType.SnapBody,
+      Content: ({ notification }) => {
+        const snapsMetadata = useSelector(getSnapsMetadata);
+        const snapsNameGetter = getSnapName(snapsMetadata);
+        const snapId = notification.data.origin;
+        return (
+          <>
+            <Box
+              display={Display.Flex}
+              style={{
+                borderBottom: '1px solid var(--color-border-muted)',
+              }}
+              flexDirection={FlexDirection.Column}
+              padding={[4, 2, 4, 4]}
+            >
+              <Box
+                display={Display.Flex}
+                alignItems={AlignItems.center}
+                paddingBottom={2}
+              >
+                <SnapIcon snapId={snapId} avatarSize={IconSize.Xl} />
+                <Text paddingLeft={4} fontWeight={FontWeight.Medium}>
+                  {snapsNameGetter(snapId)}
+                </Text>
+              </Box>
+              <SnapUIMarkdown markdown>
+                {notification.data.message}
+              </SnapUIMarkdown>
+            </Box>
+            <Box paddingLeft={1} paddingRight={1}>
+              <SnapUIRenderer
+                snapId={notification.data.origin}
+                interfaceId={
+                  (notification.data as DetailedViewData).detailedView
+                    .interfaceId as string
+                }
+                useDelineator={false}
+                contentBackgroundColor={BackgroundColor.backgroundDefault}
+              />
+            </Box>
+          </>
+        );
       },
-    });
-  };
-
-  const handleSnapButton = () => {
-    if (!snapNotification.isRead) {
-      handleUnreadNotification();
-    }
-    trackEvent({
-      category: MetaMetricsEventCategory.NotificationInteraction,
-      event: MetaMetricsEventName.NotificationClicked,
-      properties: {
-        notification_id: snapNotification.id,
-        notification_type: snapNotification.type,
-        previously_read: snapNotification.isRead,
-      },
-    });
-    history.push(getSnapRoute(snapNotification.data.origin));
-  };
-
-  return (
-    <NotificationListItemSnap
-      id={snapNotification.id}
-      snapId={snapNotification.data.origin}
-      isRead={snapNotification.isRead}
-      createdAt={new Date(snapNotification.createdAt)}
-      title={{
-        items: [
-          {
-            text: snapsNameGetter(snapNotification.data.origin) || 'Snap',
-          },
-        ],
-      }}
-      snapMessage={snapNotification.data.message}
-      handleSnapClick={handleSnapClick}
-      handleSnapButton={handleSnapButton}
-    />
-  );
+    },
+  },
+  footer: {
+    type: NotificationComponentType.SnapFooter,
+    Link: ({ notification }) =>
+      (notification.data as DetailedViewData).detailedView.footerLink ? (
+        <NotificationDetailButton
+          notification={notification}
+          text={
+            (notification.data as DetailedViewData).detailedView.footerLink
+              ?.text as string
+          }
+          href={
+            (notification.data as DetailedViewData).detailedView.footerLink
+              ?.href as string
+          }
+          id={notification.id}
+          variant={ButtonVariant.Secondary}
+        />
+      ) : null,
+  },
 };
diff --git a/ui/pages/notifications/notification-components/stake/stake.tsx b/ui/pages/notifications/notification-components/stake/stake.tsx
index 06b215655edb..de76f5f503ab 100644
--- a/ui/pages/notifications/notification-components/stake/stake.tsx
+++ b/ui/pages/notifications/notification-components/stake/stake.tsx
@@ -5,7 +5,10 @@ import { NotificationServicesController } from '@metamask/notification-services-
 import { t } from '../../../../../app/scripts/translate';
 import { CHAIN_IDS } from '../../../../../shared/constants/network';
 import { type ExtractedNotification, isOfTypeNodeGuard } from '../node-guard';
-import type { NotificationComponent } from '../types/notifications/notifications';
+import {
+  NotificationComponentType,
+  type NotificationComponent,
+} from '../types/notifications/notifications';
 
 import {
   NotificationListItem,
@@ -148,7 +151,7 @@ export const components: NotificationComponent<StakeNotification> = {
       );
     },
     body: {
-      type: 'body_onchain_notification',
+      type: NotificationComponentType.OnChainBody,
       Account: ({ notification }) => {
         if (!notification.address) {
           return null;
@@ -267,7 +270,7 @@ export const components: NotificationComponent<StakeNotification> = {
     },
   },
   footer: {
-    type: 'footer_onchain_notification',
+    type: NotificationComponentType.OnChainFooter,
     ScanLink: ({ notification }) => {
       return (
         <NotificationDetailBlockExplorerButton
diff --git a/ui/pages/notifications/notification-components/swap-completed/swap-completed.tsx b/ui/pages/notifications/notification-components/swap-completed/swap-completed.tsx
index 322900a10238..41636e9cb172 100644
--- a/ui/pages/notifications/notification-components/swap-completed/swap-completed.tsx
+++ b/ui/pages/notifications/notification-components/swap-completed/swap-completed.tsx
@@ -1,7 +1,10 @@
 import React from 'react';
 import { NotificationServicesController } from '@metamask/notification-services-controller';
 import { type ExtractedNotification, isOfTypeNodeGuard } from '../node-guard';
-import type { NotificationComponent } from '../types/notifications/notifications';
+import {
+  NotificationComponentType,
+  type NotificationComponent,
+} from '../types/notifications/notifications';
 import { CHAIN_IDS } from '../../../../../shared/constants/network';
 // TODO: Remove restricted import
 // eslint-disable-next-line import/no-restricted-paths
@@ -101,7 +104,7 @@ export const components: NotificationComponent<SwapCompletedNotification> = {
       />
     ),
     body: {
-      type: 'body_onchain_notification',
+      type: NotificationComponentType.OnChainBody,
       Account: ({ notification }) => {
         if (!notification.address) {
           return null;
@@ -224,7 +227,7 @@ export const components: NotificationComponent<SwapCompletedNotification> = {
     },
   },
   footer: {
-    type: 'footer_onchain_notification',
+    type: NotificationComponentType.OnChainFooter,
     ScanLink: ({ notification }) => {
       return (
         <NotificationDetailBlockExplorerButton
diff --git a/ui/pages/notifications/notification-components/types/notifications/notifications.ts b/ui/pages/notifications/notification-components/types/notifications/notifications.ts
index 15831627bf9c..f4529de0d38d 100644
--- a/ui/pages/notifications/notification-components/types/notifications/notifications.ts
+++ b/ui/pages/notifications/notification-components/types/notifications/notifications.ts
@@ -1,7 +1,7 @@
 import type { FC } from 'react';
 import type { NotificationServicesController } from '@metamask/notification-services-controller';
 
-type Notification = NotificationServicesController.Types.INotification;
+export type Notification = NotificationServicesController.Types.INotification;
 
 /**
  * NotificationFC is the shared component interface for all notification components
@@ -11,8 +11,17 @@ type NotificationFC<N = Notification> = FC<{
   onClick?: () => void;
 }>;
 
+export enum NotificationComponentType {
+  AnnouncementBody = 'body_feature_announcement',
+  AnnouncementFooter = 'footer_feature_announcement',
+  OnChainBody = 'body_onchain_notification',
+  OnChainFooter = 'footer_onchain_notification',
+  SnapBody = 'body_snap_notification',
+  SnapFooter = 'footer_snap_notification',
+}
+
 type BodyOnChainNotification<N = Notification> = {
-  type: 'body_onchain_notification';
+  type: NotificationComponentType.OnChainBody;
   Image?: NotificationFC<N>;
   From?: NotificationFC<N>;
   To?: NotificationFC<N>;
@@ -27,22 +36,32 @@ type BodyOnChainNotification<N = Notification> = {
 };
 
 type BodyFeatureAnnouncement<N = Notification> = {
-  type: 'body_feature_announcement';
+  type: NotificationComponentType.AnnouncementBody;
   Image: NotificationFC<N>;
   Description: NotificationFC<N>;
 };
 
+type BodySnapNotification<N = Notification> = {
+  type: NotificationComponentType.SnapBody;
+  Content: NotificationFC<N>;
+};
+
 type FooterOnChainNotification<N = Notification> = {
-  type: 'footer_onchain_notification';
+  type: NotificationComponentType.OnChainFooter;
   ScanLink: NotificationFC<N>;
 };
 
 type FooterFeatureAnnouncement<N = Notification> = {
-  type: 'footer_feature_announcement';
+  type: NotificationComponentType.AnnouncementFooter;
   ExtensionLink: NotificationFC<N>;
   ExternalLink: NotificationFC<N>;
 };
 
+type FooterSnapNotification<N = Notification> = {
+  type: NotificationComponentType.SnapFooter;
+  Link: NotificationFC<N>;
+};
+
 /**
  * This is the object shape that contains all the components of the particular notification.
  * the `guardFn` can be used to narrow a wide notification into the specific notification required.
@@ -52,7 +71,13 @@ export type NotificationComponent<N extends Notification = Notification> = {
   item: NotificationFC<N>;
   details: {
     title: NotificationFC<N>;
-    body: BodyFeatureAnnouncement<N> | BodyOnChainNotification<N>;
+    body:
+      | BodyFeatureAnnouncement<N>
+      | BodyOnChainNotification<N>
+      | BodySnapNotification<N>;
   };
-  footer: FooterFeatureAnnouncement<N> | FooterOnChainNotification<N>;
+  footer:
+    | FooterFeatureAnnouncement<N>
+    | FooterOnChainNotification<N>
+    | FooterSnapNotification<N>;
 };
diff --git a/ui/pages/notifications/notifications-list-item.stories.tsx b/ui/pages/notifications/notifications-list-item.stories.tsx
index 52d633502658..748ecaf318b8 100644
--- a/ui/pages/notifications/notifications-list-item.stories.tsx
+++ b/ui/pages/notifications/notifications-list-item.stories.tsx
@@ -44,7 +44,12 @@ const notificationMocks = {
   RocketPoolStakeCompleted: createMockNotificationRocketPoolStakeCompleted,
   RocketPoolUnStakeCompleted: createMockNotificationRocketPoolUnStakeCompleted,
   FeatureAnnouncement: createMockFeatureAnnouncementRaw,
-  Snap: createMockSnapNotification,
+  Snap: () => {
+    const mock = createMockSnapNotification();
+    // TODO(hmalik88): the mock's origin should be fixed upstream
+    mock.data.origin = 'npm:@metamask/example-snap'
+    return mock;
+  },
 } as const;
 
 const notifications: Notification[] = Object.values(notificationMocks).map(
diff --git a/ui/pages/notifications/notifications-list-item.tsx b/ui/pages/notifications/notifications-list-item.tsx
index d4fba23ffd7b..6628429a0fe6 100644
--- a/ui/pages/notifications/notifications-list-item.tsx
+++ b/ui/pages/notifications/notifications-list-item.tsx
@@ -1,6 +1,6 @@
 import React, { useContext, useCallback } from 'react';
 import { useHistory } from 'react-router-dom';
-import { NotificationServicesController } from '@metamask/notification-services-controller';
+import { hasProperty } from '@metamask/utils';
 import { MetaMetricsContext } from '../../contexts/metametrics';
 import {
   MetaMetricsEventCategory,
@@ -14,12 +14,13 @@ import {
 } from '../../helpers/constants/design-system';
 import { NOTIFICATIONS_ROUTE } from '../../helpers/constants/routes';
 import { useMarkNotificationAsRead } from '../../hooks/metamask-notifications/useNotifications';
+import { useSnapNotificationTimeouts } from '../../hooks/useNotificationTimeouts';
 import {
   NotificationComponents,
+  TRIGGER_TYPES,
   hasNotificationComponents,
 } from './notification-components';
-
-type Notification = NotificationServicesController.Types.INotification;
+import { type Notification } from './notification-components/types/notifications/notifications';
 
 export function NotificationsListItem({
   notification,
@@ -28,6 +29,7 @@ export function NotificationsListItem({
 }) {
   const history = useHistory();
   const trackEvent = useContext(MetaMetricsContext);
+  const { setNotificationTimeout } = useSnapNotificationTimeouts();
 
   const { markNotificationAsRead } = useMarkNotificationAsRead();
 
@@ -44,6 +46,7 @@ export function NotificationsListItem({
         previously_read: notification.isRead,
       },
     });
+
     markNotificationAsRead([
       {
         id: notification.id,
@@ -51,6 +54,15 @@ export function NotificationsListItem({
         isRead: notification.isRead,
       },
     ]);
+
+    if (
+      notification.type === TRIGGER_TYPES.SNAP &&
+      !hasProperty(notification.data, 'detailedView')
+    ) {
+      setNotificationTimeout(notification.id);
+      return;
+    }
+
     history.push(`${NOTIFICATIONS_ROUTE}/${notification.id}`);
   }, [notification, markNotificationAsRead, history]);
 
diff --git a/ui/pages/notifications/notifications-list.tsx b/ui/pages/notifications/notifications-list.tsx
index 62debf383811..e2ac8a7476d2 100644
--- a/ui/pages/notifications/notifications-list.tsx
+++ b/ui/pages/notifications/notifications-list.tsx
@@ -1,6 +1,5 @@
 import React from 'react';
 import { useSelector } from 'react-redux';
-import { NotificationServicesController } from '@metamask/notification-services-controller';
 import { Box } from '../../components/component-library';
 import {
   BlockSize,
@@ -12,15 +11,12 @@ import {
 import Preloader from '../../components/ui/icon/preloader/preloader-icon.component';
 import { selectIsMetamaskNotificationsEnabled } from '../../selectors/metamask-notifications/metamask-notifications';
 import { useI18nContext } from '../../hooks/useI18nContext';
-import { SnapComponent } from './notification-components/snap/snap';
 import { NotificationsPlaceholder } from './notifications-list-placeholder';
 import { NotificationsListTurnOnNotifications } from './notifications-list-turn-on-notifications';
 import { NotificationsListItem } from './notifications-list-item';
 import { type Notification, TAB_KEYS } from './notifications';
 import { NotificationsListReadAllButton } from './notifications-list-read-all-button';
 
-const { TRIGGER_TYPES } = NotificationServicesController.Constants;
-
 export type NotificationsListProps = {
   activeTab: TAB_KEYS;
   notifications: Notification[];
@@ -67,10 +63,6 @@ function ErrorContent() {
 
 function NotificationItem(props: { notification: Notification }) {
   const { notification } = props;
-  if (notification.type === TRIGGER_TYPES.SNAP) {
-    return <SnapComponent snapNotification={notification} />;
-  }
-
   return <NotificationsListItem notification={notification} />;
 }
 
diff --git a/ui/pages/remove-snap-account/snap-account-card.tsx b/ui/pages/remove-snap-account/snap-account-card.tsx
index 510d721b87c8..50d555574ecf 100644
--- a/ui/pages/remove-snap-account/snap-account-card.tsx
+++ b/ui/pages/remove-snap-account/snap-account-card.tsx
@@ -6,7 +6,7 @@ import {
 } from '../../selectors';
 import { BlockSize, BorderRadius } from '../../helpers/constants/design-system';
 import { Box } from '../../components/component-library';
-import { AccountListItem } from '../../components/multichain';
+import { AccountListItem } from '../../components/multichain/account-list-item';
 import { mergeAccounts } from '../../components/multichain/account-list-menu/account-list-menu';
 import { MergedInternalAccount } from '../../selectors/selectors.types';
 

From 7abff9c7b2bf8e826ab1f2169642e6789bef2280 Mon Sep 17 00:00:00 2001
From: Matthew Walsh <matthew.walsh@consensys.net>
Date: Fri, 6 Dec 2024 15:34:27 +0000
Subject: [PATCH 054/175] fix: hide first time interaction alert if internal
 account (#28990)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## **Description**

Hide the first time interaction alert if the transaction `to` is an
internal account.

[![Open in GitHub
Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/28990?quickstart=1)

## **Related issues**

Fixes: #28942

## **Manual testing steps**

See issue.

## **Screenshots/Recordings**

### **Before**

### **After**

## **Pre-merge author checklist**

- [x] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension Coding
Standards](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/CODING_GUIDELINES.md).
- [x] I've completed the PR template to the best of my ability
- [x] I’ve included tests if applicable
- [x] I’ve documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [x] I’ve applied the right labels on the PR (see [labeling
guidelines](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.

## **Pre-merge reviewer checklist**

- [ ] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed).
- [ ] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.
---
 .../useFirstTimeInteractionAlert.test.ts      | 84 ++++++++++++-------
 .../useFirstTimeInteractionAlert.ts           | 16 +++-
 2 files changed, 68 insertions(+), 32 deletions(-)

diff --git a/ui/pages/confirmations/hooks/alerts/transactions/useFirstTimeInteractionAlert.test.ts b/ui/pages/confirmations/hooks/alerts/transactions/useFirstTimeInteractionAlert.test.ts
index 6689d6610248..93da09a9674e 100644
--- a/ui/pages/confirmations/hooks/alerts/transactions/useFirstTimeInteractionAlert.test.ts
+++ b/ui/pages/confirmations/hooks/alerts/transactions/useFirstTimeInteractionAlert.test.ts
@@ -9,52 +9,53 @@ import { getMockConfirmState } from '../../../../../../test/data/confirmations/h
 import { renderHookWithConfirmContextProvider } from '../../../../../../test/lib/confirmations/render-helpers';
 import { Severity } from '../../../../../helpers/constants/design-system';
 import { RowAlertKey } from '../../../../../components/app/confirm/info/row/constants';
-import { genUnapprovedContractInteractionConfirmation } from '../../../../../../test/data/confirmations/contract-interaction';
 import { useFirstTimeInteractionAlert } from './useFirstTimeInteractionAlert';
 
 const ACCOUNT_ADDRESS = '0x0dcd5d886577d5081b0c52e242ef29e70be3e7bc';
 const TRANSACTION_ID_MOCK = '123-456';
 
-const CONFIRMATION_MOCK = genUnapprovedContractInteractionConfirmation({
-  chainId: '0x5',
-}) as TransactionMeta;
-
 const TRANSACTION_META_MOCK = {
   id: TRANSACTION_ID_MOCK,
   chainId: '0x5',
   networkClientId: 'testNetworkClientId',
-  status: TransactionStatus.submitted,
+  status: TransactionStatus.unapproved,
   type: TransactionType.contractInteraction,
   txParams: {
     from: ACCOUNT_ADDRESS,
   },
   time: new Date().getTime() - 10000,
-  firstTimeInteraction: true,
 } as TransactionMeta;
 
 function runHook({
   currentConfirmation,
-  transactions = [],
+  internalAccountAddresses,
 }: {
   currentConfirmation?: TransactionMeta;
-  transactions?: TransactionMeta[];
+  internalAccountAddresses?: string[];
 } = {}) {
-  let pendingApprovals = {};
-  if (currentConfirmation) {
-    pendingApprovals = {
-      [currentConfirmation.id as string]: {
-        id: currentConfirmation.id,
-        type: ApprovalType.Transaction,
-      },
-    };
-    transactions.push(currentConfirmation);
-  }
+  const pendingApprovals = currentConfirmation
+    ? {
+        [currentConfirmation.id as string]: {
+          id: currentConfirmation.id,
+          type: ApprovalType.Transaction,
+        },
+      }
+    : {};
+
+  const transactions = currentConfirmation ? [currentConfirmation] : [];
+
+  const internalAccounts = {
+    accounts: internalAccountAddresses?.map((address) => ({ address })) ?? [],
+  };
+
   const state = getMockConfirmState({
     metamask: {
+      internalAccounts,
       pendingApprovals,
       transactions,
     },
   });
+
   const response = renderHookWithConfirmContextProvider(
     useFirstTimeInteractionAlert,
     state,
@@ -72,19 +73,22 @@ describe('useFirstTimeInteractionAlert', () => {
     expect(runHook()).toEqual([]);
   });
 
-  it('returns no alerts if no transactions', () => {
+  it('returns no alerts if firstTimeInteraction is false', () => {
+    const notFirstTimeConfirmation = {
+      ...TRANSACTION_META_MOCK,
+      isFirstTimeInteraction: false,
+    };
     expect(
       runHook({
-        currentConfirmation: CONFIRMATION_MOCK,
-        transactions: [],
+        currentConfirmation: notFirstTimeConfirmation,
       }),
     ).toEqual([]);
   });
 
-  it('returns no alerts if firstTimeInteraction is false', () => {
+  it('returns no alerts if firstTimeInteraction is undefined', () => {
     const notFirstTimeConfirmation = {
       ...TRANSACTION_META_MOCK,
-      firstTimeInteraction: false,
+      isFirstTimeInteraction: undefined,
     };
     expect(
       runHook({
@@ -93,21 +97,43 @@ describe('useFirstTimeInteractionAlert', () => {
     ).toEqual([]);
   });
 
-  it('returns no alerts if firstTimeInteraction is undefined', () => {
-    const notFirstTimeConfirmation = {
+  it('returns no alerts if transaction destination is internal account', () => {
+    const firstTimeConfirmation = {
       ...TRANSACTION_META_MOCK,
-      firstTimeInteraction: undefined,
+      isFirstTimeInteraction: true,
+      txParams: {
+        ...TRANSACTION_META_MOCK.txParams,
+        to: ACCOUNT_ADDRESS,
+      },
     };
     expect(
       runHook({
-        currentConfirmation: notFirstTimeConfirmation,
+        currentConfirmation: firstTimeConfirmation,
+        internalAccountAddresses: [ACCOUNT_ADDRESS],
+      }),
+    ).toEqual([]);
+  });
+
+  it('returns no alerts if transaction destination is internal account with different case', () => {
+    const firstTimeConfirmation = {
+      ...TRANSACTION_META_MOCK,
+      isFirstTimeInteraction: true,
+      txParams: {
+        ...TRANSACTION_META_MOCK.txParams,
+        to: ACCOUNT_ADDRESS.toLowerCase(),
+      },
+    };
+    expect(
+      runHook({
+        currentConfirmation: firstTimeConfirmation,
+        internalAccountAddresses: [ACCOUNT_ADDRESS.toUpperCase()],
       }),
     ).toEqual([]);
   });
 
   it('returns alert if isFirstTimeInteraction is true', () => {
     const firstTimeConfirmation = {
-      ...CONFIRMATION_MOCK,
+      ...TRANSACTION_META_MOCK,
       isFirstTimeInteraction: true,
     };
     const alerts = runHook({
diff --git a/ui/pages/confirmations/hooks/alerts/transactions/useFirstTimeInteractionAlert.ts b/ui/pages/confirmations/hooks/alerts/transactions/useFirstTimeInteractionAlert.ts
index 7e4a86c3802f..c74552575667 100644
--- a/ui/pages/confirmations/hooks/alerts/transactions/useFirstTimeInteractionAlert.ts
+++ b/ui/pages/confirmations/hooks/alerts/transactions/useFirstTimeInteractionAlert.ts
@@ -1,22 +1,32 @@
 import { useMemo } from 'react';
 import { TransactionMeta } from '@metamask/transaction-controller';
 
+import { useSelector } from 'react-redux';
 import { Alert } from '../../../../../ducks/confirm-alerts/confirm-alerts';
 import { useI18nContext } from '../../../../../hooks/useI18nContext';
 import { Severity } from '../../../../../helpers/constants/design-system';
 import { RowAlertKey } from '../../../../../components/app/confirm/info/row/constants';
 import { useConfirmContext } from '../../../context/confirm';
+import { getInternalAccounts } from '../../../../../selectors';
 
 export function useFirstTimeInteractionAlert(): Alert[] {
   const t = useI18nContext();
   const { currentConfirmation } = useConfirmContext<TransactionMeta>();
+  const internalAccounts = useSelector(getInternalAccounts);
 
-  const { isFirstTimeInteraction } = currentConfirmation ?? {};
+  const { txParams, isFirstTimeInteraction } = currentConfirmation ?? {};
+  const { to } = txParams ?? {};
+
+  const isInternalAccount = internalAccounts.some(
+    (account) => account.address?.toLowerCase() === to?.toLowerCase(),
+  );
+
+  const showAlert = !isInternalAccount && isFirstTimeInteraction;
 
   return useMemo(() => {
     // If isFirstTimeInteraction is undefined that means it's either disabled or error in accounts API
     // If it's false that means account relationship found
-    if (!isFirstTimeInteraction) {
+    if (!showAlert) {
       return [];
     }
 
@@ -31,5 +41,5 @@ export function useFirstTimeInteractionAlert(): Alert[] {
         severity: Severity.Warning,
       },
     ];
-  }, [isFirstTimeInteraction, t]);
+  }, [showAlert, t]);
 }

From 44696fd01060952f10f1190df373e103c243f40c Mon Sep 17 00:00:00 2001
From: Pedro Figueiredo <pedro.figueiredo@consensys.net>
Date: Mon, 9 Dec 2024 10:43:30 +0000
Subject: [PATCH 055/175] fix: Support decimal point on advanced gas modal on
 mac (#28869)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## **Description**

The main bug this PR fixes only happens on mac, not linux. It is the
following: when a user pressed `.` on the advanced gas modal and a
number after it, a zero would appear instead the `.` and any numbers
before it. This is because in the `onChange` in `NumericInput`, when the
user presses `.`, `e.target.value` is `""`, and the code was defaulting
the value that got passed to the on change handler to `0`. To fix the
bug, this PR removes that default, and necessarily the `parseInt` that
wrapped it.

The PR also adds the `0` default to a few places where the newly
possible `""` value would otherwise break execution.

This PR also prevents the user from setting decimal custom nonce values.

Finally, it prevents `,` to be registered when `allowDecimals` is set on
`<FormField />`, most notably for the gas limit input.

[![Open in GitHub
Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/28869?quickstart=1)

## **Related issues**

Fixes: https://github.com/MetaMask/metamask-extension/issues/28843

## **Manual testing steps**

1. Go to this page...
2.
3.

## **Screenshots/Recordings**

<!-- If applicable, add screenshots and/or recordings to visualize the
before and after of your change. -->

### **Before**

<!-- [screenshots/recordings] -->

### **After**

<!-- [screenshots/recordings] -->

## **Pre-merge author checklist**

- [ ] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension Coding
Standards](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/CODING_GUIDELINES.md).
- [ ] I've completed the PR template to the best of my ability
- [ ] I’ve included tests if applicable
- [ ] I’ve documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [ ] I’ve applied the right labels on the PR (see [labeling
guidelines](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.

## **Pre-merge reviewer checklist**

- [ ] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed).
- [ ] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.
---
 .../app/modals/customize-nonce/customize-nonce.component.js   | 4 +++-
 ui/components/ui/numeric-input/numeric-input.component.js     | 4 ++--
 .../advanced-gas-fee-gas-limit/advanced-gas-fee-gas-limit.js  | 2 +-
 .../components/edit-gas-display/edit-gas-display.component.js | 2 +-
 ui/pages/confirmations/hooks/useGasFeeErrors.js               | 2 +-
 5 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/ui/components/app/modals/customize-nonce/customize-nonce.component.js b/ui/components/app/modals/customize-nonce/customize-nonce.component.js
index b6b2f82a096e..71bd40618189 100644
--- a/ui/components/app/modals/customize-nonce/customize-nonce.component.js
+++ b/ui/components/app/modals/customize-nonce/customize-nonce.component.js
@@ -111,7 +111,9 @@ const CustomizeNonce = ({
               min="0"
               placeholder={defaultNonce}
               onChange={(e) => {
-                setCustomNonce(e.target.value);
+                // Prevent decimal nonce values
+                const sanitizedValue = e.target.value.replace(/[.,]/gu, '');
+                setCustomNonce(sanitizedValue);
               }}
               fullWidth
               margin="dense"
diff --git a/ui/components/ui/numeric-input/numeric-input.component.js b/ui/components/ui/numeric-input/numeric-input.component.js
index 8eba851be209..5eb2fcef1242 100644
--- a/ui/components/ui/numeric-input/numeric-input.component.js
+++ b/ui/components/ui/numeric-input/numeric-input.component.js
@@ -30,7 +30,7 @@ export default function NumericInput({
         type="number"
         value={value}
         onKeyDown={(e) => {
-          if (!allowDecimals && e.key === '.') {
+          if (!allowDecimals && (e.key === '.' || e.key === ',')) {
             e.preventDefault();
           }
         }}
@@ -40,7 +40,7 @@ export default function NumericInput({
           if (match?.[1]?.length >= 15) {
             return;
           }
-          onChange?.(parseFloat(newValue || 0, 10));
+          onChange?.(newValue);
         }}
         min="0"
         autoFocus={autoFocus}
diff --git a/ui/pages/confirmations/components/advanced-gas-fee-popover/advanced-gas-fee-gas-limit/advanced-gas-fee-gas-limit.js b/ui/pages/confirmations/components/advanced-gas-fee-popover/advanced-gas-fee-gas-limit/advanced-gas-fee-gas-limit.js
index 848cdf381075..29d43f6973b5 100644
--- a/ui/pages/confirmations/components/advanced-gas-fee-popover/advanced-gas-fee-gas-limit/advanced-gas-fee-gas-limit.js
+++ b/ui/pages/confirmations/components/advanced-gas-fee-popover/advanced-gas-fee-gas-limit/advanced-gas-fee-gas-limit.js
@@ -39,7 +39,7 @@ const AdvancedGasFeeGasLimit = () => {
   const [gasLimitError, setGasLimitError] = useState();
 
   const updateGasLimit = (value) => {
-    setGasLimit(value);
+    setGasLimit(value || 0);
   };
 
   useEffect(() => {
diff --git a/ui/pages/confirmations/components/edit-gas-display/edit-gas-display.component.js b/ui/pages/confirmations/components/edit-gas-display/edit-gas-display.component.js
index 560843290ceb..75e5e4b6b216 100644
--- a/ui/pages/confirmations/components/edit-gas-display/edit-gas-display.component.js
+++ b/ui/pages/confirmations/components/edit-gas-display/edit-gas-display.component.js
@@ -54,7 +54,7 @@ export default function EditGasDisplay({
   if (
     gasLimit !== undefined &&
     properGasLimit !== undefined &&
-    new BigNumber(gasLimit).lessThan(new BigNumber(properGasLimit))
+    new BigNumber(gasLimit || 0).lessThan(new BigNumber(properGasLimit))
   ) {
     warningMessage = t('gasLimitRecommended', [properGasLimit]);
   }
diff --git a/ui/pages/confirmations/hooks/useGasFeeErrors.js b/ui/pages/confirmations/hooks/useGasFeeErrors.js
index 8050071f8e40..e3119a43c5f9 100644
--- a/ui/pages/confirmations/hooks/useGasFeeErrors.js
+++ b/ui/pages/confirmations/hooks/useGasFeeErrors.js
@@ -61,7 +61,7 @@ const validateGasPrice = (
   }
   if (
     (!supportsEIP1559 || transaction?.txParams?.gasPrice) &&
-    bnLessThan(gasPrice, 0)
+    bnLessThan(gasPrice || 0, 0)
   ) {
     return GAS_FORM_ERRORS.GAS_PRICE_TOO_LOW;
   }

From 0eab55daa63c0a494c838891618c259f20835b1e Mon Sep 17 00:00:00 2001
From: Prithpal Sooriya <prithpal.sooriya@gmail.com>
Date: Mon, 9 Dec 2024 12:25:38 +0000
Subject: [PATCH 056/175] feat: bump @metamask/message-signing-snap to ^0.6.0
 (#28877)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## **Description**

Bumps message signing snap to `^0.6.0`

[![Open in GitHub
Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/28877?quickstart=1)

## **Related issues**

Fixes:

## **Manual testing steps**

Ensure application still works as intended
1. Complete onboarding
2. Try to enable notifications (as this uses the snap)

Try using the preinstalled snap on sites. [See snap docs for
testing](https://github.com/MetaMask/message-signing-snap/blob/main/docs/testing.md)
- can be tested in the browser.
1. Get eip6963 provider
2. Call connect
3. Call get public key
4. Call sign message

## **Screenshots/Recordings**

<!-- If applicable, add screenshots and/or recordings to visualize the
before and after of your change. -->

### **Before**

<!-- [screenshots/recordings] -->

### **After**

<!-- [screenshots/recordings] -->

## **Pre-merge author checklist**

- [x] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension Coding
Standards](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/CODING_GUIDELINES.md).
- [x] I've completed the PR template to the best of my ability
- [x] I’ve included tests if applicable
- [x] I’ve documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [x] I’ve applied the right labels on the PR (see [labeling
guidelines](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.

## **Pre-merge reviewer checklist**

- [ ] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed).
- [ ] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.
---
 lavamoat/browserify/beta/policy.json  | 54 +++++++++++++--------------
 lavamoat/browserify/flask/policy.json | 54 +++++++++++++--------------
 lavamoat/browserify/main/policy.json  | 54 +++++++++++++--------------
 lavamoat/browserify/mmi/policy.json   | 54 +++++++++++++--------------
 package.json                          |  2 +-
 yarn.lock                             | 29 ++++----------
 6 files changed, 116 insertions(+), 131 deletions(-)

diff --git a/lavamoat/browserify/beta/policy.json b/lavamoat/browserify/beta/policy.json
index d29b923eebe4..9d441c704ed0 100644
--- a/lavamoat/browserify/beta/policy.json
+++ b/lavamoat/browserify/beta/policy.json
@@ -187,9 +187,23 @@
         "crypto": true
       },
       "packages": {
+        "@ethereumjs/tx>ethereum-cryptography>@noble/curves": true,
         "@ethereumjs/tx>ethereum-cryptography>@noble/hashes": true,
-        "@ethereumjs/tx>ethereum-cryptography>@scure/bip32": true,
-        "@metamask/message-signing-snap>@noble/curves": true
+        "@ethereumjs/tx>ethereum-cryptography>@scure/bip32": true
+      }
+    },
+    "@ethereumjs/tx>ethereum-cryptography>@noble/curves": {
+      "globals": {
+        "TextEncoder": true
+      },
+      "packages": {
+        "@ethereumjs/tx>ethereum-cryptography>@noble/curves>@noble/hashes": true
+      }
+    },
+    "@ethereumjs/tx>ethereum-cryptography>@noble/curves>@noble/hashes": {
+      "globals": {
+        "TextEncoder": true,
+        "crypto": true
       }
     },
     "@ethereumjs/tx>ethereum-cryptography>@noble/hashes": {
@@ -200,8 +214,8 @@
     },
     "@ethereumjs/tx>ethereum-cryptography>@scure/bip32": {
       "packages": {
+        "@ethereumjs/tx>ethereum-cryptography>@noble/curves": true,
         "@ethereumjs/tx>ethereum-cryptography>@scure/bip32>@noble/hashes": true,
-        "@metamask/message-signing-snap>@noble/curves": true,
         "@metamask/utils>@scure/base": true
       }
     },
@@ -1637,27 +1651,6 @@
         "browserify>url": true
       }
     },
-    "@metamask/message-signing-snap>@noble/ciphers": {
-      "globals": {
-        "TextDecoder": true,
-        "TextEncoder": true,
-        "crypto": true
-      }
-    },
-    "@metamask/message-signing-snap>@noble/curves": {
-      "globals": {
-        "TextEncoder": true
-      },
-      "packages": {
-        "@metamask/message-signing-snap>@noble/curves>@noble/hashes": true
-      }
-    },
-    "@metamask/message-signing-snap>@noble/curves>@noble/hashes": {
-      "globals": {
-        "TextEncoder": true,
-        "crypto": true
-      }
-    },
     "@metamask/name-controller": {
       "globals": {
         "fetch": true
@@ -2135,13 +2128,20 @@
         "@metamask/base-controller": true,
         "@metamask/keyring-api": true,
         "@metamask/keyring-controller": true,
-        "@metamask/message-signing-snap>@noble/ciphers": true,
+        "@metamask/profile-sync-controller>@noble/ciphers": true,
         "@metamask/profile-sync-controller>siwe": true,
         "@noble/hashes": true,
         "browserify>buffer": true,
         "loglevel": true
       }
     },
+    "@metamask/profile-sync-controller>@noble/ciphers": {
+      "globals": {
+        "TextDecoder": true,
+        "TextEncoder": true,
+        "crypto": true
+      }
+    },
     "@metamask/profile-sync-controller>siwe": {
       "globals": {
         "console.error": true,
@@ -2512,7 +2512,7 @@
         "crypto.subtle": true
       },
       "packages": {
-        "@metamask/message-signing-snap>@noble/curves": true,
+        "@ethereumjs/tx>ethereum-cryptography>@noble/curves": true,
         "@metamask/scure-bip39": true,
         "@metamask/utils": true,
         "@metamask/utils>@scure/base": true,
@@ -2556,7 +2556,7 @@
     },
     "@metamask/snaps-utils>@metamask/snaps-registry": {
       "packages": {
-        "@metamask/message-signing-snap>@noble/curves": true,
+        "@ethereumjs/tx>ethereum-cryptography>@noble/curves": true,
         "@metamask/utils": true,
         "@metamask/utils>@metamask/superstruct": true,
         "@noble/hashes": true
diff --git a/lavamoat/browserify/flask/policy.json b/lavamoat/browserify/flask/policy.json
index d29b923eebe4..9d441c704ed0 100644
--- a/lavamoat/browserify/flask/policy.json
+++ b/lavamoat/browserify/flask/policy.json
@@ -187,9 +187,23 @@
         "crypto": true
       },
       "packages": {
+        "@ethereumjs/tx>ethereum-cryptography>@noble/curves": true,
         "@ethereumjs/tx>ethereum-cryptography>@noble/hashes": true,
-        "@ethereumjs/tx>ethereum-cryptography>@scure/bip32": true,
-        "@metamask/message-signing-snap>@noble/curves": true
+        "@ethereumjs/tx>ethereum-cryptography>@scure/bip32": true
+      }
+    },
+    "@ethereumjs/tx>ethereum-cryptography>@noble/curves": {
+      "globals": {
+        "TextEncoder": true
+      },
+      "packages": {
+        "@ethereumjs/tx>ethereum-cryptography>@noble/curves>@noble/hashes": true
+      }
+    },
+    "@ethereumjs/tx>ethereum-cryptography>@noble/curves>@noble/hashes": {
+      "globals": {
+        "TextEncoder": true,
+        "crypto": true
       }
     },
     "@ethereumjs/tx>ethereum-cryptography>@noble/hashes": {
@@ -200,8 +214,8 @@
     },
     "@ethereumjs/tx>ethereum-cryptography>@scure/bip32": {
       "packages": {
+        "@ethereumjs/tx>ethereum-cryptography>@noble/curves": true,
         "@ethereumjs/tx>ethereum-cryptography>@scure/bip32>@noble/hashes": true,
-        "@metamask/message-signing-snap>@noble/curves": true,
         "@metamask/utils>@scure/base": true
       }
     },
@@ -1637,27 +1651,6 @@
         "browserify>url": true
       }
     },
-    "@metamask/message-signing-snap>@noble/ciphers": {
-      "globals": {
-        "TextDecoder": true,
-        "TextEncoder": true,
-        "crypto": true
-      }
-    },
-    "@metamask/message-signing-snap>@noble/curves": {
-      "globals": {
-        "TextEncoder": true
-      },
-      "packages": {
-        "@metamask/message-signing-snap>@noble/curves>@noble/hashes": true
-      }
-    },
-    "@metamask/message-signing-snap>@noble/curves>@noble/hashes": {
-      "globals": {
-        "TextEncoder": true,
-        "crypto": true
-      }
-    },
     "@metamask/name-controller": {
       "globals": {
         "fetch": true
@@ -2135,13 +2128,20 @@
         "@metamask/base-controller": true,
         "@metamask/keyring-api": true,
         "@metamask/keyring-controller": true,
-        "@metamask/message-signing-snap>@noble/ciphers": true,
+        "@metamask/profile-sync-controller>@noble/ciphers": true,
         "@metamask/profile-sync-controller>siwe": true,
         "@noble/hashes": true,
         "browserify>buffer": true,
         "loglevel": true
       }
     },
+    "@metamask/profile-sync-controller>@noble/ciphers": {
+      "globals": {
+        "TextDecoder": true,
+        "TextEncoder": true,
+        "crypto": true
+      }
+    },
     "@metamask/profile-sync-controller>siwe": {
       "globals": {
         "console.error": true,
@@ -2512,7 +2512,7 @@
         "crypto.subtle": true
       },
       "packages": {
-        "@metamask/message-signing-snap>@noble/curves": true,
+        "@ethereumjs/tx>ethereum-cryptography>@noble/curves": true,
         "@metamask/scure-bip39": true,
         "@metamask/utils": true,
         "@metamask/utils>@scure/base": true,
@@ -2556,7 +2556,7 @@
     },
     "@metamask/snaps-utils>@metamask/snaps-registry": {
       "packages": {
-        "@metamask/message-signing-snap>@noble/curves": true,
+        "@ethereumjs/tx>ethereum-cryptography>@noble/curves": true,
         "@metamask/utils": true,
         "@metamask/utils>@metamask/superstruct": true,
         "@noble/hashes": true
diff --git a/lavamoat/browserify/main/policy.json b/lavamoat/browserify/main/policy.json
index d29b923eebe4..9d441c704ed0 100644
--- a/lavamoat/browserify/main/policy.json
+++ b/lavamoat/browserify/main/policy.json
@@ -187,9 +187,23 @@
         "crypto": true
       },
       "packages": {
+        "@ethereumjs/tx>ethereum-cryptography>@noble/curves": true,
         "@ethereumjs/tx>ethereum-cryptography>@noble/hashes": true,
-        "@ethereumjs/tx>ethereum-cryptography>@scure/bip32": true,
-        "@metamask/message-signing-snap>@noble/curves": true
+        "@ethereumjs/tx>ethereum-cryptography>@scure/bip32": true
+      }
+    },
+    "@ethereumjs/tx>ethereum-cryptography>@noble/curves": {
+      "globals": {
+        "TextEncoder": true
+      },
+      "packages": {
+        "@ethereumjs/tx>ethereum-cryptography>@noble/curves>@noble/hashes": true
+      }
+    },
+    "@ethereumjs/tx>ethereum-cryptography>@noble/curves>@noble/hashes": {
+      "globals": {
+        "TextEncoder": true,
+        "crypto": true
       }
     },
     "@ethereumjs/tx>ethereum-cryptography>@noble/hashes": {
@@ -200,8 +214,8 @@
     },
     "@ethereumjs/tx>ethereum-cryptography>@scure/bip32": {
       "packages": {
+        "@ethereumjs/tx>ethereum-cryptography>@noble/curves": true,
         "@ethereumjs/tx>ethereum-cryptography>@scure/bip32>@noble/hashes": true,
-        "@metamask/message-signing-snap>@noble/curves": true,
         "@metamask/utils>@scure/base": true
       }
     },
@@ -1637,27 +1651,6 @@
         "browserify>url": true
       }
     },
-    "@metamask/message-signing-snap>@noble/ciphers": {
-      "globals": {
-        "TextDecoder": true,
-        "TextEncoder": true,
-        "crypto": true
-      }
-    },
-    "@metamask/message-signing-snap>@noble/curves": {
-      "globals": {
-        "TextEncoder": true
-      },
-      "packages": {
-        "@metamask/message-signing-snap>@noble/curves>@noble/hashes": true
-      }
-    },
-    "@metamask/message-signing-snap>@noble/curves>@noble/hashes": {
-      "globals": {
-        "TextEncoder": true,
-        "crypto": true
-      }
-    },
     "@metamask/name-controller": {
       "globals": {
         "fetch": true
@@ -2135,13 +2128,20 @@
         "@metamask/base-controller": true,
         "@metamask/keyring-api": true,
         "@metamask/keyring-controller": true,
-        "@metamask/message-signing-snap>@noble/ciphers": true,
+        "@metamask/profile-sync-controller>@noble/ciphers": true,
         "@metamask/profile-sync-controller>siwe": true,
         "@noble/hashes": true,
         "browserify>buffer": true,
         "loglevel": true
       }
     },
+    "@metamask/profile-sync-controller>@noble/ciphers": {
+      "globals": {
+        "TextDecoder": true,
+        "TextEncoder": true,
+        "crypto": true
+      }
+    },
     "@metamask/profile-sync-controller>siwe": {
       "globals": {
         "console.error": true,
@@ -2512,7 +2512,7 @@
         "crypto.subtle": true
       },
       "packages": {
-        "@metamask/message-signing-snap>@noble/curves": true,
+        "@ethereumjs/tx>ethereum-cryptography>@noble/curves": true,
         "@metamask/scure-bip39": true,
         "@metamask/utils": true,
         "@metamask/utils>@scure/base": true,
@@ -2556,7 +2556,7 @@
     },
     "@metamask/snaps-utils>@metamask/snaps-registry": {
       "packages": {
-        "@metamask/message-signing-snap>@noble/curves": true,
+        "@ethereumjs/tx>ethereum-cryptography>@noble/curves": true,
         "@metamask/utils": true,
         "@metamask/utils>@metamask/superstruct": true,
         "@noble/hashes": true
diff --git a/lavamoat/browserify/mmi/policy.json b/lavamoat/browserify/mmi/policy.json
index 718e8229680f..88f77a11d112 100644
--- a/lavamoat/browserify/mmi/policy.json
+++ b/lavamoat/browserify/mmi/policy.json
@@ -187,9 +187,23 @@
         "crypto": true
       },
       "packages": {
+        "@ethereumjs/tx>ethereum-cryptography>@noble/curves": true,
         "@ethereumjs/tx>ethereum-cryptography>@noble/hashes": true,
-        "@ethereumjs/tx>ethereum-cryptography>@scure/bip32": true,
-        "@metamask/message-signing-snap>@noble/curves": true
+        "@ethereumjs/tx>ethereum-cryptography>@scure/bip32": true
+      }
+    },
+    "@ethereumjs/tx>ethereum-cryptography>@noble/curves": {
+      "globals": {
+        "TextEncoder": true
+      },
+      "packages": {
+        "@ethereumjs/tx>ethereum-cryptography>@noble/curves>@noble/hashes": true
+      }
+    },
+    "@ethereumjs/tx>ethereum-cryptography>@noble/curves>@noble/hashes": {
+      "globals": {
+        "TextEncoder": true,
+        "crypto": true
       }
     },
     "@ethereumjs/tx>ethereum-cryptography>@noble/hashes": {
@@ -200,8 +214,8 @@
     },
     "@ethereumjs/tx>ethereum-cryptography>@scure/bip32": {
       "packages": {
+        "@ethereumjs/tx>ethereum-cryptography>@noble/curves": true,
         "@ethereumjs/tx>ethereum-cryptography>@scure/bip32>@noble/hashes": true,
-        "@metamask/message-signing-snap>@noble/curves": true,
         "@metamask/utils>@scure/base": true
       }
     },
@@ -1729,27 +1743,6 @@
         "browserify>url": true
       }
     },
-    "@metamask/message-signing-snap>@noble/ciphers": {
-      "globals": {
-        "TextDecoder": true,
-        "TextEncoder": true,
-        "crypto": true
-      }
-    },
-    "@metamask/message-signing-snap>@noble/curves": {
-      "globals": {
-        "TextEncoder": true
-      },
-      "packages": {
-        "@metamask/message-signing-snap>@noble/curves>@noble/hashes": true
-      }
-    },
-    "@metamask/message-signing-snap>@noble/curves>@noble/hashes": {
-      "globals": {
-        "TextEncoder": true,
-        "crypto": true
-      }
-    },
     "@metamask/name-controller": {
       "globals": {
         "fetch": true
@@ -2227,13 +2220,20 @@
         "@metamask/base-controller": true,
         "@metamask/keyring-api": true,
         "@metamask/keyring-controller": true,
-        "@metamask/message-signing-snap>@noble/ciphers": true,
+        "@metamask/profile-sync-controller>@noble/ciphers": true,
         "@metamask/profile-sync-controller>siwe": true,
         "@noble/hashes": true,
         "browserify>buffer": true,
         "loglevel": true
       }
     },
+    "@metamask/profile-sync-controller>@noble/ciphers": {
+      "globals": {
+        "TextDecoder": true,
+        "TextEncoder": true,
+        "crypto": true
+      }
+    },
     "@metamask/profile-sync-controller>siwe": {
       "globals": {
         "console.error": true,
@@ -2604,7 +2604,7 @@
         "crypto.subtle": true
       },
       "packages": {
-        "@metamask/message-signing-snap>@noble/curves": true,
+        "@ethereumjs/tx>ethereum-cryptography>@noble/curves": true,
         "@metamask/scure-bip39": true,
         "@metamask/utils": true,
         "@metamask/utils>@scure/base": true,
@@ -2648,7 +2648,7 @@
     },
     "@metamask/snaps-utils>@metamask/snaps-registry": {
       "packages": {
-        "@metamask/message-signing-snap>@noble/curves": true,
+        "@ethereumjs/tx>ethereum-cryptography>@noble/curves": true,
         "@metamask/utils": true,
         "@metamask/utils>@metamask/superstruct": true,
         "@noble/hashes": true
diff --git a/package.json b/package.json
index 1eb22a06f21c..559c67f58896 100644
--- a/package.json
+++ b/package.json
@@ -317,7 +317,7 @@
     "@metamask/logging-controller": "^6.0.0",
     "@metamask/logo": "^3.1.2",
     "@metamask/message-manager": "^11.0.0",
-    "@metamask/message-signing-snap": "^0.4.0",
+    "@metamask/message-signing-snap": "^0.6.0",
     "@metamask/metamask-eth-abis": "^3.1.1",
     "@metamask/name-controller": "^8.0.0",
     "@metamask/network-controller": "patch:@metamask/network-controller@npm%3A22.1.0#~/.yarn/patches/@metamask-network-controller-npm-22.1.0-621c281f70.patch",
diff --git a/yarn.lock b/yarn.lock
index 261e85ce9ab6..2a680a50da13 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5679,18 +5679,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/message-signing-snap@npm:^0.4.0":
-  version: 0.4.0
-  resolution: "@metamask/message-signing-snap@npm:0.4.0"
-  dependencies:
-    "@metamask/rpc-errors": "npm:^6.3.0"
-    "@metamask/snaps-sdk": "npm:^6.0.0"
-    "@metamask/utils": "npm:^9.0.0"
-    "@noble/ciphers": "npm:^0.5.3"
-    "@noble/curves": "npm:^1.4.2"
-    "@noble/hashes": "npm:^1.4.0"
-    zod: "npm:^3.23.8"
-  checksum: 10/fb61da8f2999305f99ad5a1d6be2def224c88c1059fcdc8e70d06641d695eef82d9b8463c6b57d797a519aa70dc741b7cb59596f503faf2eff68a1647248b4de
+"@metamask/message-signing-snap@npm:^0.6.0":
+  version: 0.6.0
+  resolution: "@metamask/message-signing-snap@npm:0.6.0"
+  checksum: 10/c74b3d897ffdadb2c2772e715578d037430955e962ff25fc3e56edfc60f0b08e55dd1e04dcda104d02a4424af09fedf8e2bd0dab24a34d91c1b8c685849b510a
   languageName: node
   linkType: hard
 
@@ -6035,7 +6027,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/rpc-errors@npm:^6.2.1, @metamask/rpc-errors@npm:^6.3.0, @metamask/rpc-errors@npm:^6.3.1":
+"@metamask/rpc-errors@npm:^6.2.1, @metamask/rpc-errors@npm:^6.3.1":
   version: 6.4.0
   resolution: "@metamask/rpc-errors@npm:6.4.0"
   dependencies:
@@ -6486,7 +6478,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@noble/ciphers@npm:^0.5.2, @noble/ciphers@npm:^0.5.3":
+"@noble/ciphers@npm:^0.5.2":
   version: 0.5.3
   resolution: "@noble/ciphers@npm:0.5.3"
   checksum: 10/af0ad96b5807feace93e63549e05de6f5e305b36e2e95f02d90532893fbc3af3f19b9621b6de4caa98303659e5df2e7aa082064e5d4a82e6f38c728d48dfae5d
@@ -26429,7 +26421,7 @@ __metadata:
     "@metamask/logging-controller": "npm:^6.0.0"
     "@metamask/logo": "npm:^3.1.2"
     "@metamask/message-manager": "npm:^11.0.0"
-    "@metamask/message-signing-snap": "npm:^0.4.0"
+    "@metamask/message-signing-snap": "npm:^0.6.0"
     "@metamask/metamask-eth-abis": "npm:^3.1.1"
     "@metamask/name-controller": "npm:^8.0.0"
     "@metamask/network-controller": "patch:@metamask/network-controller@npm%3A22.1.0#~/.yarn/patches/@metamask-network-controller-npm-22.1.0-621c281f70.patch"
@@ -38090,13 +38082,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"zod@npm:^3.23.8":
-  version: 3.23.8
-  resolution: "zod@npm:3.23.8"
-  checksum: 10/846fd73e1af0def79c19d510ea9e4a795544a67d5b34b7e1c4d0425bf6bfd1c719446d94cdfa1721c1987d891321d61f779e8236fde517dc0e524aa851a6eff1
-  languageName: node
-  linkType: hard
-
 "zstd-codec@npm:^0.1.4":
   version: 0.1.4
   resolution: "zstd-codec@npm:0.1.4"

From b078721197f5d392333fcd60bf4f4cbf875fa410 Mon Sep 17 00:00:00 2001
From: Vinicius Stevam <45455812+vinistevam@users.noreply.github.com>
Date: Mon, 9 Dec 2024 13:04:49 +0000
Subject: [PATCH 057/175] fix: add source when local PPOM fails (#28726)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<!--
Please submit this PR as a draft initially.
Do not mark it as "Ready for review" until the template has been
completely filled out, and PR status checks have passed at least once.
-->

## **Description**
This PR fixes an issue where the source property was not being set
correctly when an error occurred during local PPOM validation.
Previously, if the local PPOM failed, the error handling mechanism would
add an error message but omit the source property, making it unclear
whether the error originated from the API or the local PPOM.

**Changes introduced:**
- Modified error handling for the local PPOM validation to ensure that
the source property is correctly set to "local" when an error occurs
during local validation.
- Ensured that the source property is properly set to "api" in case of
an API failure.


<!--
Write a short description of the changes included in this pull request,
also include relevant motivation and context. Have in mind the following
questions:
1. What is the reason for the change?
2. What is the improvement/solution?
-->

[![Open in GitHub
Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/28726?quickstart=1)

## **Related issues**

Fixes: https://github.com/MetaMask/MetaMask-planning/issues/3693

## **Manual testing steps**

1. Go to the live test dapp
2. Trigger a send transaction with suggested gas values (ie Send Legacy
or send EIP1559)
3. Check Segment

Obs: we need to block the network calls for
`https://security-alerts.api.cx.metamask.io/` and
`https://static.cx.metamask.io/api/v1/confirmations/ppom/ppom_version.json`
in chrome dev tools > network tab.

## **Screenshots/Recordings**


[error-set-local.webm](https://github.com/user-attachments/assets/7a632a0d-826a-4c40-ab6e-7ce4451abdeb)

<!-- If applicable, add screenshots and/or recordings to visualize the
before and after of your change. -->

### **Before**

<!-- [screenshots/recordings] -->

### **After**

<!-- [screenshots/recordings] -->

## **Pre-merge author checklist**

- [x] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension Coding
Standards](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/CODING_GUIDELINES.md).
- [x] I've completed the PR template to the best of my ability
- [x] I’ve included tests if applicable
- [x] I’ve documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [x] I’ve applied the right labels on the PR (see [labeling
guidelines](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.

## **Pre-merge reviewer checklist**

- [ ] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed).
- [ ] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.
---
 app/scripts/lib/ppom/ppom-util.test.ts |  2 ++
 app/scripts/lib/ppom/ppom-util.ts      | 26 ++++++++++++++++++--------
 2 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/app/scripts/lib/ppom/ppom-util.test.ts b/app/scripts/lib/ppom/ppom-util.test.ts
index 8acb6dd9788c..d3ff3015ca41 100644
--- a/app/scripts/lib/ppom/ppom-util.test.ts
+++ b/app/scripts/lib/ppom/ppom-util.test.ts
@@ -198,6 +198,7 @@ describe('PPOM Utils', () => {
           result_type: BlockaidResultType.Errored,
           reason: BlockaidReason.errored,
           description: 'Test Error: Test error message',
+          source: SecurityAlertSource.Local,
         },
       );
     });
@@ -219,6 +220,7 @@ describe('PPOM Utils', () => {
           result_type: BlockaidResultType.Errored,
           reason: BlockaidReason.errored,
           description: 'Test Error: Test error message',
+          source: SecurityAlertSource.Local,
         },
       );
     });
diff --git a/app/scripts/lib/ppom/ppom-util.ts b/app/scripts/lib/ppom/ppom-util.ts
index d27ec6c8e505..7dbf8c92ec5f 100644
--- a/app/scripts/lib/ppom/ppom-util.ts
+++ b/app/scripts/lib/ppom/ppom-util.ts
@@ -132,6 +132,7 @@ export async function updateSecurityAlertResponse({
 export function handlePPOMError(
   error: unknown,
   logMessage: string,
+  source: SecurityAlertSource = SecurityAlertSource.API,
 ): SecurityAlertResponse {
   const errorData = getErrorData(error);
   const description = getErrorMessage(error);
@@ -142,6 +143,7 @@ export function handlePPOMError(
   return {
     ...SECURITY_ALERT_RESPONSE_ERROR,
     description,
+    source,
   };
 }
 
@@ -236,15 +238,23 @@ async function validateWithController(
   request: SecurityAlertsAPIRequest | JsonRpcRequest,
   chainId: string,
 ): Promise<SecurityAlertResponse> {
-  const response = (await ppomController.usePPOM(
-    (ppom: PPOM) => ppom.validateJsonRpc(request),
-    chainId,
-  )) as SecurityAlertResponse;
+  try {
+    const response = (await ppomController.usePPOM(
+      (ppom: PPOM) => ppom.validateJsonRpc(request),
+      chainId,
+    )) as SecurityAlertResponse;
 
-  return {
-    ...response,
-    source: SecurityAlertSource.Local,
-  };
+    return {
+      ...response,
+      source: SecurityAlertSource.Local,
+    };
+  } catch (error: unknown) {
+    return handlePPOMError(
+      error,
+      `Error validating request with PPOM controller`,
+      SecurityAlertSource.Local,
+    );
+  }
 }
 
 async function validateWithAPI(

From 84e448ef6d3f122e0cf078bc576903811f3ccfa2 Mon Sep 17 00:00:00 2001
From: Vinicius Stevam <45455812+vinistevam@users.noreply.github.com>
Date: Mon, 9 Dec 2024 13:56:36 +0000
Subject: [PATCH 058/175] fix: only display `Signing in with` for SIWE (#28984)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<!--
Please submit this PR as a draft initially.
Do not mark it as "Ready for review" until the template has been
completely filled out, and PR status checks have passed at least once.
-->

## **Description**

This PR updates the SigningInWith component to enhance the display logic
and labelling for signature requests.

**Changes:**
- For SIWE (Sign-In With Ethereum) requests, the label will now display
"Signing in with".
- For all other signature requests:
  - The label will display "Signing with".
- The label will only be visible when this field has a corresponding
alert.

<!--
Write a short description of the changes included in this pull request,
also include relevant motivation and context. Have in mind the following
questions:
1. What is the reason for the change?
2. What is the improvement/solution?
-->

[![Open in GitHub
Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/28984?quickstart=1)

## **Related issues**

Fixes: https://github.com/MetaMask/metamask-extension/issues/28978

## **Manual testing steps**

1. Go to test dapp
2. Click on any signature request
3. See "Signing in with" row show up

## **Screenshots/Recordings**


[setapproveforall.webm](https://github.com/user-attachments/assets/f3124ac4-2a03-448a-9b68-d4016021f39a)

<!-- If applicable, add screenshots and/or recordings to visualize the
before and after of your change. -->

### **Before**

<!-- [screenshots/recordings] -->

### **After**

<!-- [screenshots/recordings] -->

## **Pre-merge author checklist**

- [x] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension Coding
Standards](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/CODING_GUIDELINES.md).
- [x] I've completed the PR template to the best of my ability
- [x] I’ve included tests if applicable
- [x] I’ve documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [x] I’ve applied the right labels on the PR (see [labeling
guidelines](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.

## **Pre-merge reviewer checklist**

- [ ] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed).
- [ ] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.
---
 app/_locales/en/messages.json                 |   3 +
 .../info/row/alert-row/alert-row.test.tsx     |  18 +
 .../confirm/info/row/alert-row/alert-row.tsx  |   7 +
 .../info/__snapshots__/info.test.tsx.snap     | 380 ---------------
 .../__snapshots__/approve.test.tsx.snap       |  76 ---
 .../base-transaction-info.test.tsx.snap       |  76 ---
 .../__snapshots__/personal-sign.test.tsx.snap | 152 ------
 .../set-approval-for-all-info.test.tsx.snap   |  76 ---
 .../sign-in-with-row.test.tsx                 |  23 +-
 .../sign-in-with-row/sign-in-with-row.tsx     |   5 +-
 .../transaction-details.test.tsx.snap         |  76 ---
 .../__snapshots__/typed-sign-v1.test.tsx.snap |  76 ---
 .../__snapshots__/typed-sign.test.tsx.snap    | 380 ---------------
 .../__snapshots__/confirm.test.tsx.snap       | 456 ------------------
 14 files changed, 54 insertions(+), 1750 deletions(-)

diff --git a/app/_locales/en/messages.json b/app/_locales/en/messages.json
index 07dc59d6c895..39d6919f08a3 100644
--- a/app/_locales/en/messages.json
+++ b/app/_locales/en/messages.json
@@ -5125,6 +5125,9 @@
   "signingInWith": {
     "message": "Signing in with"
   },
+  "signingWith": {
+    "message": "Signing with"
+  },
   "simulationApproveHeading": {
     "message": "Withdraw"
   },
diff --git a/ui/components/app/confirm/info/row/alert-row/alert-row.test.tsx b/ui/components/app/confirm/info/row/alert-row/alert-row.test.tsx
index df7f8827b67f..070bd97d0a6b 100644
--- a/ui/components/app/confirm/info/row/alert-row/alert-row.test.tsx
+++ b/ui/components/app/confirm/info/row/alert-row/alert-row.test.tsx
@@ -91,6 +91,24 @@ describe('AlertRow', () => {
       expect(queryByTestId('inline-alert')).toBeNull();
     });
 
+    describe('display row only when there is an alert', () => {
+      it('does not render when isShownWithAlertsOnly is true and there is no alert', () => {
+        const { queryByTestId } = renderAlertRow({
+          isShownWithAlertsOnly: true,
+        });
+        expect(queryByTestId('inline-alert')).toBeNull();
+      });
+
+      it('renders when isShownWithAlertsOnly is false and there is an alert', () => {
+        const { getByTestId } = renderAlertRow({
+          alertKey: KEY_ALERT_KEY_MOCK,
+          ownerId: OWNER_ID_MOCK,
+          isShownWithAlertsOnly: false,
+        });
+        expect(getByTestId('inline-alert')).toBeDefined();
+      });
+    });
+
     describe('Modal visibility', () => {
       it('show when clicked in the inline alert', () => {
         const { getByTestId } = renderAlertRow({
diff --git a/ui/components/app/confirm/info/row/alert-row/alert-row.tsx b/ui/components/app/confirm/info/row/alert-row/alert-row.tsx
index 3956cc3095eb..094a5b72acc7 100644
--- a/ui/components/app/confirm/info/row/alert-row/alert-row.tsx
+++ b/ui/components/app/confirm/info/row/alert-row/alert-row.tsx
@@ -17,6 +17,8 @@ import { useAlertMetrics } from '../../../../alert-system/contexts/alertMetricsC
 export type ConfirmInfoAlertRowProps = ConfirmInfoRowProps & {
   alertKey: string;
   ownerId: string;
+  /** Determines whether to display the row only when an alert is present. */
+  isShownWithAlertsOnly?: boolean;
 };
 
 function getAlertTextColors(
@@ -41,6 +43,7 @@ export const ConfirmInfoAlertRow = ({
   alertKey,
   ownerId,
   variant,
+  isShownWithAlertsOnly = false,
   ...rowProperties
 }: ConfirmInfoAlertRowProps) => {
   const { trackInlineAlertClicked } = useAlertMetrics();
@@ -68,6 +71,10 @@ export const ConfirmInfoAlertRow = ({
     variant,
   };
 
+  if (isShownWithAlertsOnly && !hasFieldAlert) {
+    return null;
+  }
+
   const inlineAlert = hasFieldAlert ? (
     <Box marginLeft={1}>
       <InlineAlert
diff --git a/ui/pages/confirmations/components/confirm/info/__snapshots__/info.test.tsx.snap b/ui/pages/confirmations/components/confirm/info/__snapshots__/info.test.tsx.snap
index ce3731be6fb1..a3f98126b093 100644
--- a/ui/pages/confirmations/components/confirm/info/__snapshots__/info.test.tsx.snap
+++ b/ui/pages/confirmations/components/confirm/info/__snapshots__/info.test.tsx.snap
@@ -50,82 +50,6 @@ exports[`Info renders info section for approve request 1`] = `
         </p>
       </div>
     </div>
-    <div
-      class="mm-box confirm-info-row mm-box--margin-top-2 mm-box--margin-bottom-2 mm-box--padding-right-2 mm-box--padding-left-2 mm-box--display-flex mm-box--flex-direction-row mm-box--flex-wrap-wrap mm-box--justify-content-space-between mm-box--align-items-flex-start mm-box--color-text-default mm-box--rounded-lg"
-      style="overflow-wrap: anywhere; min-height: 24px; position: relative; background: transparent;"
-    >
-      <div
-        class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-flex-start mm-box--color-text-default"
-      >
-        <div
-          class="mm-box mm-box--display-flex mm-box--align-items-center"
-        >
-          <p
-            class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
-          >
-            Signing in with
-          </p>
-        </div>
-      </div>
-      <div
-        class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center"
-      >
-        <div
-          class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center"
-        >
-          <div
-            class=""
-          >
-            <div
-              class="identicon"
-              style="height: 16px; width: 16px; border-radius: 8px;"
-            >
-              <div
-                style="border-radius: 50px; overflow: hidden; padding: 0px; margin: 0px; width: 16px; height: 16px; display: inline-block; background: rgb(24, 100, 242);"
-              >
-                <svg
-                  height="16"
-                  width="16"
-                  x="0"
-                  y="0"
-                >
-                  <rect
-                    fill="#C81420"
-                    height="16"
-                    transform="translate(-2.752618452452339 -2.6325616818687707) rotate(385.9 8 8)"
-                    width="16"
-                    x="0"
-                    y="0"
-                  />
-                  <rect
-                    fill="#E9F500"
-                    height="16"
-                    transform="translate(5.337234703363199 6.214964079596694) rotate(184.5 8 8)"
-                    width="16"
-                    x="0"
-                    y="0"
-                  />
-                  <rect
-                    fill="#FAB300"
-                    height="16"
-                    transform="translate(0.9077275996181156 -13.015140953188144) rotate(431.3 8 8)"
-                    width="16"
-                    x="0"
-                    y="0"
-                  />
-                </svg>
-              </div>
-            </div>
-          </div>
-          <p
-            class="mm-box mm-text mm-text--body-md mm-box--margin-left-2 mm-box--color-inherit"
-            data-testid="confirm-info-row-display-name"
-          >
-            0x2e0D7...5d09B
-          </p>
-        </div>
-      </div>
-    </div>
   </div>
   <div
     class="mm-box mm-box--margin-bottom-4 mm-box--padding-2 mm-box--background-color-background-default mm-box--rounded-md"
@@ -473,82 +397,6 @@ exports[`Info renders info section for contract interaction request 1`] = `
         </div>
       </div>
     </div>
-    <div
-      class="mm-box confirm-info-row mm-box--margin-top-2 mm-box--margin-bottom-2 mm-box--padding-right-2 mm-box--padding-left-2 mm-box--display-flex mm-box--flex-direction-row mm-box--flex-wrap-wrap mm-box--justify-content-space-between mm-box--align-items-flex-start mm-box--color-text-default mm-box--rounded-lg"
-      style="overflow-wrap: anywhere; min-height: 24px; position: relative; background: transparent;"
-    >
-      <div
-        class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-flex-start mm-box--color-text-default"
-      >
-        <div
-          class="mm-box mm-box--display-flex mm-box--align-items-center"
-        >
-          <p
-            class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
-          >
-            Signing in with
-          </p>
-        </div>
-      </div>
-      <div
-        class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center"
-      >
-        <div
-          class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center"
-        >
-          <div
-            class=""
-          >
-            <div
-              class="identicon"
-              style="height: 16px; width: 16px; border-radius: 8px;"
-            >
-              <div
-                style="border-radius: 50px; overflow: hidden; padding: 0px; margin: 0px; width: 16px; height: 16px; display: inline-block; background: rgb(24, 100, 242);"
-              >
-                <svg
-                  height="16"
-                  width="16"
-                  x="0"
-                  y="0"
-                >
-                  <rect
-                    fill="#C81420"
-                    height="16"
-                    transform="translate(-2.752618452452339 -2.6325616818687707) rotate(385.9 8 8)"
-                    width="16"
-                    x="0"
-                    y="0"
-                  />
-                  <rect
-                    fill="#E9F500"
-                    height="16"
-                    transform="translate(5.337234703363199 6.214964079596694) rotate(184.5 8 8)"
-                    width="16"
-                    x="0"
-                    y="0"
-                  />
-                  <rect
-                    fill="#FAB300"
-                    height="16"
-                    transform="translate(0.9077275996181156 -13.015140953188144) rotate(431.3 8 8)"
-                    width="16"
-                    x="0"
-                    y="0"
-                  />
-                </svg>
-              </div>
-            </div>
-          </div>
-          <p
-            class="mm-box mm-text mm-text--body-md mm-box--margin-left-2 mm-box--color-inherit"
-            data-testid="confirm-info-row-display-name"
-          >
-            0x2e0D7...5d09B
-          </p>
-        </div>
-      </div>
-    </div>
   </div>
   <div
     class="mm-box mm-box--margin-bottom-4 mm-box--padding-2 mm-box--background-color-background-default mm-box--rounded-md"
@@ -711,82 +559,6 @@ exports[`Info renders info section for personal sign request 1`] = `
         </p>
       </div>
     </div>
-    <div
-      class="mm-box confirm-info-row mm-box--margin-top-2 mm-box--margin-bottom-2 mm-box--padding-right-2 mm-box--padding-left-2 mm-box--display-flex mm-box--flex-direction-row mm-box--flex-wrap-wrap mm-box--justify-content-space-between mm-box--align-items-flex-start mm-box--color-text-default mm-box--rounded-lg"
-      style="overflow-wrap: anywhere; min-height: 24px; position: relative; background: transparent;"
-    >
-      <div
-        class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-flex-start mm-box--color-text-default"
-      >
-        <div
-          class="mm-box mm-box--display-flex mm-box--align-items-center"
-        >
-          <p
-            class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
-          >
-            Signing in with
-          </p>
-        </div>
-      </div>
-      <div
-        class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center"
-      >
-        <div
-          class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center"
-        >
-          <div
-            class=""
-          >
-            <div
-              class="identicon"
-              style="height: 16px; width: 16px; border-radius: 8px;"
-            >
-              <div
-                style="border-radius: 50px; overflow: hidden; padding: 0px; margin: 0px; width: 16px; height: 16px; display: inline-block; background: rgb(250, 58, 0);"
-              >
-                <svg
-                  height="16"
-                  width="16"
-                  x="0"
-                  y="0"
-                >
-                  <rect
-                    fill="#18CDF2"
-                    height="16"
-                    transform="translate(-0.52419675189697 -1.6521420347302493) rotate(328.9 8 8)"
-                    width="16"
-                    x="0"
-                    y="0"
-                  />
-                  <rect
-                    fill="#035E56"
-                    height="16"
-                    transform="translate(-9.149230854416022 5.2962309358743) rotate(176.2 8 8)"
-                    width="16"
-                    x="0"
-                    y="0"
-                  />
-                  <rect
-                    fill="#F26602"
-                    height="16"
-                    transform="translate(8.333921009111961 -7.102569861498541) rotate(468.9 8 8)"
-                    width="16"
-                    x="0"
-                    y="0"
-                  />
-                </svg>
-              </div>
-            </div>
-          </div>
-          <p
-            class="mm-box mm-text mm-text--body-md mm-box--margin-left-2 mm-box--color-inherit"
-            data-testid="confirm-info-row-display-name"
-          >
-            Test Account
-          </p>
-        </div>
-      </div>
-    </div>
   </div>
   <div
     class="mm-box mm-box--margin-bottom-4 mm-box--padding-2 mm-box--background-color-background-default mm-box--rounded-md"
@@ -996,82 +768,6 @@ exports[`Info renders info section for setApprovalForAll request 1`] = `
         </p>
       </div>
     </div>
-    <div
-      class="mm-box confirm-info-row mm-box--margin-top-2 mm-box--margin-bottom-2 mm-box--padding-right-2 mm-box--padding-left-2 mm-box--display-flex mm-box--flex-direction-row mm-box--flex-wrap-wrap mm-box--justify-content-space-between mm-box--align-items-flex-start mm-box--color-text-default mm-box--rounded-lg"
-      style="overflow-wrap: anywhere; min-height: 24px; position: relative; background: transparent;"
-    >
-      <div
-        class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-flex-start mm-box--color-text-default"
-      >
-        <div
-          class="mm-box mm-box--display-flex mm-box--align-items-center"
-        >
-          <p
-            class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
-          >
-            Signing in with
-          </p>
-        </div>
-      </div>
-      <div
-        class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center"
-      >
-        <div
-          class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center"
-        >
-          <div
-            class=""
-          >
-            <div
-              class="identicon"
-              style="height: 16px; width: 16px; border-radius: 8px;"
-            >
-              <div
-                style="border-radius: 50px; overflow: hidden; padding: 0px; margin: 0px; width: 16px; height: 16px; display: inline-block; background: rgb(24, 100, 242);"
-              >
-                <svg
-                  height="16"
-                  width="16"
-                  x="0"
-                  y="0"
-                >
-                  <rect
-                    fill="#C81420"
-                    height="16"
-                    transform="translate(-2.752618452452339 -2.6325616818687707) rotate(385.9 8 8)"
-                    width="16"
-                    x="0"
-                    y="0"
-                  />
-                  <rect
-                    fill="#E9F500"
-                    height="16"
-                    transform="translate(5.337234703363199 6.214964079596694) rotate(184.5 8 8)"
-                    width="16"
-                    x="0"
-                    y="0"
-                  />
-                  <rect
-                    fill="#FAB300"
-                    height="16"
-                    transform="translate(0.9077275996181156 -13.015140953188144) rotate(431.3 8 8)"
-                    width="16"
-                    x="0"
-                    y="0"
-                  />
-                </svg>
-              </div>
-            </div>
-          </div>
-          <p
-            class="mm-box mm-text mm-text--body-md mm-box--margin-left-2 mm-box--color-inherit"
-            data-testid="confirm-info-row-display-name"
-          >
-            0x2e0D7...5d09B
-          </p>
-        </div>
-      </div>
-    </div>
   </div>
   <div
     class="mm-box mm-box--margin-bottom-4 mm-box--padding-2 mm-box--background-color-background-default mm-box--rounded-md"
@@ -1311,82 +1007,6 @@ exports[`Info renders info section for typed sign request 1`] = `
         </div>
       </div>
     </div>
-    <div
-      class="mm-box confirm-info-row mm-box--margin-top-2 mm-box--margin-bottom-2 mm-box--padding-right-2 mm-box--padding-left-2 mm-box--display-flex mm-box--flex-direction-row mm-box--flex-wrap-wrap mm-box--justify-content-space-between mm-box--align-items-flex-start mm-box--color-text-default mm-box--rounded-lg"
-      style="overflow-wrap: anywhere; min-height: 24px; position: relative; background: transparent;"
-    >
-      <div
-        class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-flex-start mm-box--color-text-default"
-      >
-        <div
-          class="mm-box mm-box--display-flex mm-box--align-items-center"
-        >
-          <p
-            class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
-          >
-            Signing in with
-          </p>
-        </div>
-      </div>
-      <div
-        class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center"
-      >
-        <div
-          class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center"
-        >
-          <div
-            class=""
-          >
-            <div
-              class="identicon"
-              style="height: 16px; width: 16px; border-radius: 8px;"
-            >
-              <div
-                style="border-radius: 50px; overflow: hidden; padding: 0px; margin: 0px; width: 16px; height: 16px; display: inline-block; background: rgb(250, 58, 0);"
-              >
-                <svg
-                  height="16"
-                  width="16"
-                  x="0"
-                  y="0"
-                >
-                  <rect
-                    fill="#18CDF2"
-                    height="16"
-                    transform="translate(-0.52419675189697 -1.6521420347302493) rotate(328.9 8 8)"
-                    width="16"
-                    x="0"
-                    y="0"
-                  />
-                  <rect
-                    fill="#035E56"
-                    height="16"
-                    transform="translate(-9.149230854416022 5.2962309358743) rotate(176.2 8 8)"
-                    width="16"
-                    x="0"
-                    y="0"
-                  />
-                  <rect
-                    fill="#F26602"
-                    height="16"
-                    transform="translate(8.333921009111961 -7.102569861498541) rotate(468.9 8 8)"
-                    width="16"
-                    x="0"
-                    y="0"
-                  />
-                </svg>
-              </div>
-            </div>
-          </div>
-          <p
-            class="mm-box mm-text mm-text--body-md mm-box--margin-left-2 mm-box--color-inherit"
-            data-testid="confirm-info-row-display-name"
-          >
-            Test Account
-          </p>
-        </div>
-      </div>
-    </div>
   </div>
   <div
     class="mm-box mm-box--margin-bottom-4 mm-box--padding-2 mm-box--background-color-background-default mm-box--rounded-md"
diff --git a/ui/pages/confirmations/components/confirm/info/approve/__snapshots__/approve.test.tsx.snap b/ui/pages/confirmations/components/confirm/info/approve/__snapshots__/approve.test.tsx.snap
index 037cb264226d..c2c404726c61 100644
--- a/ui/pages/confirmations/components/confirm/info/approve/__snapshots__/approve.test.tsx.snap
+++ b/ui/pages/confirmations/components/confirm/info/approve/__snapshots__/approve.test.tsx.snap
@@ -248,82 +248,6 @@ exports[`<ApproveInfo /> renders component for approve request 1`] = `
         </p>
       </div>
     </div>
-    <div
-      class="mm-box confirm-info-row mm-box--margin-top-2 mm-box--margin-bottom-2 mm-box--padding-right-2 mm-box--padding-left-2 mm-box--display-flex mm-box--flex-direction-row mm-box--flex-wrap-wrap mm-box--justify-content-space-between mm-box--align-items-flex-start mm-box--color-text-default mm-box--rounded-lg"
-      style="overflow-wrap: anywhere; min-height: 24px; position: relative; background: transparent;"
-    >
-      <div
-        class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-flex-start mm-box--color-text-default"
-      >
-        <div
-          class="mm-box mm-box--display-flex mm-box--align-items-center"
-        >
-          <p
-            class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
-          >
-            Signing in with
-          </p>
-        </div>
-      </div>
-      <div
-        class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center"
-      >
-        <div
-          class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center"
-        >
-          <div
-            class=""
-          >
-            <div
-              class="identicon"
-              style="height: 16px; width: 16px; border-radius: 8px;"
-            >
-              <div
-                style="border-radius: 50px; overflow: hidden; padding: 0px; margin: 0px; width: 16px; height: 16px; display: inline-block; background: rgb(24, 100, 242);"
-              >
-                <svg
-                  height="16"
-                  width="16"
-                  x="0"
-                  y="0"
-                >
-                  <rect
-                    fill="#C81420"
-                    height="16"
-                    transform="translate(-2.752618452452339 -2.6325616818687707) rotate(385.9 8 8)"
-                    width="16"
-                    x="0"
-                    y="0"
-                  />
-                  <rect
-                    fill="#E9F500"
-                    height="16"
-                    transform="translate(5.337234703363199 6.214964079596694) rotate(184.5 8 8)"
-                    width="16"
-                    x="0"
-                    y="0"
-                  />
-                  <rect
-                    fill="#FAB300"
-                    height="16"
-                    transform="translate(0.9077275996181156 -13.015140953188144) rotate(431.3 8 8)"
-                    width="16"
-                    x="0"
-                    y="0"
-                  />
-                </svg>
-              </div>
-            </div>
-          </div>
-          <p
-            class="mm-box mm-text mm-text--body-md mm-box--margin-left-2 mm-box--color-inherit"
-            data-testid="confirm-info-row-display-name"
-          >
-            0x2e0D7...5d09B
-          </p>
-        </div>
-      </div>
-    </div>
     <div
       class="mm-box confirm-info-row mm-box--margin-top-2 mm-box--margin-bottom-2 mm-box--padding-right-2 mm-box--padding-left-2 mm-box--display-flex mm-box--flex-direction-row mm-box--flex-wrap-wrap mm-box--justify-content-space-between mm-box--align-items-flex-start mm-box--color-text-default mm-box--rounded-lg"
       data-testid="transaction-details-recipient-row"
diff --git a/ui/pages/confirmations/components/confirm/info/base-transaction-info/__snapshots__/base-transaction-info.test.tsx.snap b/ui/pages/confirmations/components/confirm/info/base-transaction-info/__snapshots__/base-transaction-info.test.tsx.snap
index 953e88287788..ee15d22e6363 100644
--- a/ui/pages/confirmations/components/confirm/info/base-transaction-info/__snapshots__/base-transaction-info.test.tsx.snap
+++ b/ui/pages/confirmations/components/confirm/info/base-transaction-info/__snapshots__/base-transaction-info.test.tsx.snap
@@ -234,82 +234,6 @@ exports[`<BaseTransactionInfo /> renders component for contract interaction requ
         </div>
       </div>
     </div>
-    <div
-      class="mm-box confirm-info-row mm-box--margin-top-2 mm-box--margin-bottom-2 mm-box--padding-right-2 mm-box--padding-left-2 mm-box--display-flex mm-box--flex-direction-row mm-box--flex-wrap-wrap mm-box--justify-content-space-between mm-box--align-items-flex-start mm-box--color-text-default mm-box--rounded-lg"
-      style="overflow-wrap: anywhere; min-height: 24px; position: relative; background: transparent;"
-    >
-      <div
-        class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-flex-start mm-box--color-text-default"
-      >
-        <div
-          class="mm-box mm-box--display-flex mm-box--align-items-center"
-        >
-          <p
-            class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
-          >
-            Signing in with
-          </p>
-        </div>
-      </div>
-      <div
-        class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center"
-      >
-        <div
-          class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center"
-        >
-          <div
-            class=""
-          >
-            <div
-              class="identicon"
-              style="height: 16px; width: 16px; border-radius: 8px;"
-            >
-              <div
-                style="border-radius: 50px; overflow: hidden; padding: 0px; margin: 0px; width: 16px; height: 16px; display: inline-block; background: rgb(24, 100, 242);"
-              >
-                <svg
-                  height="16"
-                  width="16"
-                  x="0"
-                  y="0"
-                >
-                  <rect
-                    fill="#C81420"
-                    height="16"
-                    transform="translate(-2.752618452452339 -2.6325616818687707) rotate(385.9 8 8)"
-                    width="16"
-                    x="0"
-                    y="0"
-                  />
-                  <rect
-                    fill="#E9F500"
-                    height="16"
-                    transform="translate(5.337234703363199 6.214964079596694) rotate(184.5 8 8)"
-                    width="16"
-                    x="0"
-                    y="0"
-                  />
-                  <rect
-                    fill="#FAB300"
-                    height="16"
-                    transform="translate(0.9077275996181156 -13.015140953188144) rotate(431.3 8 8)"
-                    width="16"
-                    x="0"
-                    y="0"
-                  />
-                </svg>
-              </div>
-            </div>
-          </div>
-          <p
-            class="mm-box mm-text mm-text--body-md mm-box--margin-left-2 mm-box--color-inherit"
-            data-testid="confirm-info-row-display-name"
-          >
-            0x2e0D7...5d09B
-          </p>
-        </div>
-      </div>
-    </div>
   </div>
   <div
     class="mm-box mm-box--margin-bottom-4 mm-box--padding-2 mm-box--background-color-background-default mm-box--rounded-md"
diff --git a/ui/pages/confirmations/components/confirm/info/personal-sign/__snapshots__/personal-sign.test.tsx.snap b/ui/pages/confirmations/components/confirm/info/personal-sign/__snapshots__/personal-sign.test.tsx.snap
index ef22ce3b8aa7..8932bc3bb41d 100644
--- a/ui/pages/confirmations/components/confirm/info/personal-sign/__snapshots__/personal-sign.test.tsx.snap
+++ b/ui/pages/confirmations/components/confirm/info/personal-sign/__snapshots__/personal-sign.test.tsx.snap
@@ -47,82 +47,6 @@ exports[`PersonalSignInfo handle reverse string properly 1`] = `
         </p>
       </div>
     </div>
-    <div
-      class="mm-box confirm-info-row mm-box--margin-top-2 mm-box--margin-bottom-2 mm-box--padding-right-2 mm-box--padding-left-2 mm-box--display-flex mm-box--flex-direction-row mm-box--flex-wrap-wrap mm-box--justify-content-space-between mm-box--align-items-flex-start mm-box--color-text-default mm-box--rounded-lg"
-      style="overflow-wrap: anywhere; min-height: 24px; position: relative; background: transparent;"
-    >
-      <div
-        class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-flex-start mm-box--color-text-default"
-      >
-        <div
-          class="mm-box mm-box--display-flex mm-box--align-items-center"
-        >
-          <p
-            class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
-          >
-            Signing in with
-          </p>
-        </div>
-      </div>
-      <div
-        class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center"
-      >
-        <div
-          class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center"
-        >
-          <div
-            class=""
-          >
-            <div
-              class="identicon"
-              style="height: 16px; width: 16px; border-radius: 8px;"
-            >
-              <div
-                style="border-radius: 50px; overflow: hidden; padding: 0px; margin: 0px; width: 16px; height: 16px; display: inline-block; background: rgb(250, 58, 0);"
-              >
-                <svg
-                  height="16"
-                  width="16"
-                  x="0"
-                  y="0"
-                >
-                  <rect
-                    fill="#18CDF2"
-                    height="16"
-                    transform="translate(-0.52419675189697 -1.6521420347302493) rotate(328.9 8 8)"
-                    width="16"
-                    x="0"
-                    y="0"
-                  />
-                  <rect
-                    fill="#035E56"
-                    height="16"
-                    transform="translate(-9.149230854416022 5.2962309358743) rotate(176.2 8 8)"
-                    width="16"
-                    x="0"
-                    y="0"
-                  />
-                  <rect
-                    fill="#F26602"
-                    height="16"
-                    transform="translate(8.333921009111961 -7.102569861498541) rotate(468.9 8 8)"
-                    width="16"
-                    x="0"
-                    y="0"
-                  />
-                </svg>
-              </div>
-            </div>
-          </div>
-          <p
-            class="mm-box mm-text mm-text--body-md mm-box--margin-left-2 mm-box--color-inherit"
-            data-testid="confirm-info-row-display-name"
-          >
-            Test Account
-          </p>
-        </div>
-      </div>
-    </div>
   </div>
   <div
     class="mm-box mm-box--margin-bottom-4 mm-box--padding-2 mm-box--background-color-background-default mm-box--rounded-md"
@@ -227,82 +151,6 @@ exports[`PersonalSignInfo renders correctly for personal sign request 1`] = `
         </p>
       </div>
     </div>
-    <div
-      class="mm-box confirm-info-row mm-box--margin-top-2 mm-box--margin-bottom-2 mm-box--padding-right-2 mm-box--padding-left-2 mm-box--display-flex mm-box--flex-direction-row mm-box--flex-wrap-wrap mm-box--justify-content-space-between mm-box--align-items-flex-start mm-box--color-text-default mm-box--rounded-lg"
-      style="overflow-wrap: anywhere; min-height: 24px; position: relative; background: transparent;"
-    >
-      <div
-        class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-flex-start mm-box--color-text-default"
-      >
-        <div
-          class="mm-box mm-box--display-flex mm-box--align-items-center"
-        >
-          <p
-            class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
-          >
-            Signing in with
-          </p>
-        </div>
-      </div>
-      <div
-        class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center"
-      >
-        <div
-          class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center"
-        >
-          <div
-            class=""
-          >
-            <div
-              class="identicon"
-              style="height: 16px; width: 16px; border-radius: 8px;"
-            >
-              <div
-                style="border-radius: 50px; overflow: hidden; padding: 0px; margin: 0px; width: 16px; height: 16px; display: inline-block; background: rgb(250, 58, 0);"
-              >
-                <svg
-                  height="16"
-                  width="16"
-                  x="0"
-                  y="0"
-                >
-                  <rect
-                    fill="#18CDF2"
-                    height="16"
-                    transform="translate(-0.52419675189697 -1.6521420347302493) rotate(328.9 8 8)"
-                    width="16"
-                    x="0"
-                    y="0"
-                  />
-                  <rect
-                    fill="#035E56"
-                    height="16"
-                    transform="translate(-9.149230854416022 5.2962309358743) rotate(176.2 8 8)"
-                    width="16"
-                    x="0"
-                    y="0"
-                  />
-                  <rect
-                    fill="#F26602"
-                    height="16"
-                    transform="translate(8.333921009111961 -7.102569861498541) rotate(468.9 8 8)"
-                    width="16"
-                    x="0"
-                    y="0"
-                  />
-                </svg>
-              </div>
-            </div>
-          </div>
-          <p
-            class="mm-box mm-text mm-text--body-md mm-box--margin-left-2 mm-box--color-inherit"
-            data-testid="confirm-info-row-display-name"
-          >
-            Test Account
-          </p>
-        </div>
-      </div>
-    </div>
   </div>
   <div
     class="mm-box mm-box--margin-bottom-4 mm-box--padding-2 mm-box--background-color-background-default mm-box--rounded-md"
diff --git a/ui/pages/confirmations/components/confirm/info/set-approval-for-all-info/__snapshots__/set-approval-for-all-info.test.tsx.snap b/ui/pages/confirmations/components/confirm/info/set-approval-for-all-info/__snapshots__/set-approval-for-all-info.test.tsx.snap
index a2e8d0b30c6e..42efa15a2a5b 100644
--- a/ui/pages/confirmations/components/confirm/info/set-approval-for-all-info/__snapshots__/set-approval-for-all-info.test.tsx.snap
+++ b/ui/pages/confirmations/components/confirm/info/set-approval-for-all-info/__snapshots__/set-approval-for-all-info.test.tsx.snap
@@ -154,82 +154,6 @@ exports[`<SetApprovalForAllInfo /> renders component for approve request 1`] = `
         </p>
       </div>
     </div>
-    <div
-      class="mm-box confirm-info-row mm-box--margin-top-2 mm-box--margin-bottom-2 mm-box--padding-right-2 mm-box--padding-left-2 mm-box--display-flex mm-box--flex-direction-row mm-box--flex-wrap-wrap mm-box--justify-content-space-between mm-box--align-items-flex-start mm-box--color-text-default mm-box--rounded-lg"
-      style="overflow-wrap: anywhere; min-height: 24px; position: relative; background: transparent;"
-    >
-      <div
-        class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-flex-start mm-box--color-text-default"
-      >
-        <div
-          class="mm-box mm-box--display-flex mm-box--align-items-center"
-        >
-          <p
-            class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
-          >
-            Signing in with
-          </p>
-        </div>
-      </div>
-      <div
-        class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center"
-      >
-        <div
-          class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center"
-        >
-          <div
-            class=""
-          >
-            <div
-              class="identicon"
-              style="height: 16px; width: 16px; border-radius: 8px;"
-            >
-              <div
-                style="border-radius: 50px; overflow: hidden; padding: 0px; margin: 0px; width: 16px; height: 16px; display: inline-block; background: rgb(24, 100, 242);"
-              >
-                <svg
-                  height="16"
-                  width="16"
-                  x="0"
-                  y="0"
-                >
-                  <rect
-                    fill="#C81420"
-                    height="16"
-                    transform="translate(-2.752618452452339 -2.6325616818687707) rotate(385.9 8 8)"
-                    width="16"
-                    x="0"
-                    y="0"
-                  />
-                  <rect
-                    fill="#E9F500"
-                    height="16"
-                    transform="translate(5.337234703363199 6.214964079596694) rotate(184.5 8 8)"
-                    width="16"
-                    x="0"
-                    y="0"
-                  />
-                  <rect
-                    fill="#FAB300"
-                    height="16"
-                    transform="translate(0.9077275996181156 -13.015140953188144) rotate(431.3 8 8)"
-                    width="16"
-                    x="0"
-                    y="0"
-                  />
-                </svg>
-              </div>
-            </div>
-          </div>
-          <p
-            class="mm-box mm-text mm-text--body-md mm-box--margin-left-2 mm-box--color-inherit"
-            data-testid="confirm-info-row-display-name"
-          >
-            0x2e0D7...5d09B
-          </p>
-        </div>
-      </div>
-    </div>
   </div>
   <div
     class="mm-box mm-box--margin-bottom-4 mm-box--padding-2 mm-box--background-color-background-default mm-box--rounded-md"
diff --git a/ui/pages/confirmations/components/confirm/info/shared/sign-in-with-row/sign-in-with-row.test.tsx b/ui/pages/confirmations/components/confirm/info/shared/sign-in-with-row/sign-in-with-row.test.tsx
index 2ee3383160cb..a9410ace2a02 100644
--- a/ui/pages/confirmations/components/confirm/info/shared/sign-in-with-row/sign-in-with-row.test.tsx
+++ b/ui/pages/confirmations/components/confirm/info/shared/sign-in-with-row/sign-in-with-row.test.tsx
@@ -3,6 +3,7 @@ import configureMockStore from 'redux-mock-store';
 import thunk from 'redux-thunk';
 import { getMockContractInteractionConfirmState } from '../../../../../../../../test/data/confirmations/helper';
 import { renderWithConfirmContextProvider } from '../../../../../../../../test/lib/confirmations/render-helpers';
+import * as utils from '../../../../../utils';
 import { SigningInWithRow } from './sign-in-with-row';
 
 jest.mock(
@@ -14,10 +15,30 @@ jest.mock(
   }),
 );
 
+jest.mock('../../../../../utils', () => {
+  const originalUtils = jest.requireActual('../../../../../utils');
+  return {
+    ...originalUtils,
+    isSIWESignatureRequest: jest.fn().mockReturnValue(false),
+  };
+});
+
 describe('<TransactionDetails />', () => {
   const middleware = [thunk];
 
-  it('renders component for transaction details', () => {
+  it('does not display the row for non SIWE requests', () => {
+    const state = getMockContractInteractionConfirmState();
+    const mockStore = configureMockStore(middleware)(state);
+    const { container } = renderWithConfirmContextProvider(
+      <SigningInWithRow />,
+      mockStore,
+    );
+    expect(container).toBeEmptyDOMElement();
+  });
+
+  it('renders component for SIWE transaction details', () => {
+    (utils.isSIWESignatureRequest as jest.Mock).mockReturnValue(true);
+
     const state = getMockContractInteractionConfirmState();
     const mockStore = configureMockStore(middleware)(state);
     const { getByText } = renderWithConfirmContextProvider(
diff --git a/ui/pages/confirmations/components/confirm/info/shared/sign-in-with-row/sign-in-with-row.tsx b/ui/pages/confirmations/components/confirm/info/shared/sign-in-with-row/sign-in-with-row.tsx
index 7b20cbc08062..5ef84e0bb9a1 100644
--- a/ui/pages/confirmations/components/confirm/info/shared/sign-in-with-row/sign-in-with-row.tsx
+++ b/ui/pages/confirmations/components/confirm/info/shared/sign-in-with-row/sign-in-with-row.tsx
@@ -7,11 +7,13 @@ import { RowAlertKey } from '../../../../../../../components/app/confirm/info/ro
 import { useI18nContext } from '../../../../../../../hooks/useI18nContext';
 import { useConfirmContext } from '../../../../../context/confirm';
 import { SignatureRequestType } from '../../../../../types/confirm';
+import { isSIWESignatureRequest } from '../../../../../utils';
 
 export const SigningInWithRow = () => {
   const t = useI18nContext();
 
   const { currentConfirmation } = useConfirmContext();
+  const isSIWE = isSIWESignatureRequest(currentConfirmation);
 
   const chainId = currentConfirmation?.chainId as string;
   const from =
@@ -25,8 +27,9 @@ export const SigningInWithRow = () => {
   return (
     <ConfirmInfoAlertRow
       alertKey={RowAlertKey.SigningInWith}
-      label={t('signingInWith')}
+      label={isSIWE ? t('signingInWith') : t('signingWith')}
       ownerId={currentConfirmation.id}
+      isShownWithAlertsOnly={!isSIWE}
     >
       <ConfirmInfoRowAddress address={from} chainId={chainId} />
     </ConfirmInfoAlertRow>
diff --git a/ui/pages/confirmations/components/confirm/info/shared/transaction-details/__snapshots__/transaction-details.test.tsx.snap b/ui/pages/confirmations/components/confirm/info/shared/transaction-details/__snapshots__/transaction-details.test.tsx.snap
index 7ab32dda1be8..f22a1404c45c 100644
--- a/ui/pages/confirmations/components/confirm/info/shared/transaction-details/__snapshots__/transaction-details.test.tsx.snap
+++ b/ui/pages/confirmations/components/confirm/info/shared/transaction-details/__snapshots__/transaction-details.test.tsx.snap
@@ -152,82 +152,6 @@ exports[`<TransactionDetails /> renders component for transaction details 1`] =
         </div>
       </div>
     </div>
-    <div
-      class="mm-box confirm-info-row mm-box--margin-top-2 mm-box--margin-bottom-2 mm-box--padding-right-2 mm-box--padding-left-2 mm-box--display-flex mm-box--flex-direction-row mm-box--flex-wrap-wrap mm-box--justify-content-space-between mm-box--align-items-flex-start mm-box--color-text-default mm-box--rounded-lg"
-      style="overflow-wrap: anywhere; min-height: 24px; position: relative; background: transparent;"
-    >
-      <div
-        class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-flex-start mm-box--color-text-default"
-      >
-        <div
-          class="mm-box mm-box--display-flex mm-box--align-items-center"
-        >
-          <p
-            class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
-          >
-            Signing in with
-          </p>
-        </div>
-      </div>
-      <div
-        class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center"
-      >
-        <div
-          class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center"
-        >
-          <div
-            class=""
-          >
-            <div
-              class="identicon"
-              style="height: 16px; width: 16px; border-radius: 8px;"
-            >
-              <div
-                style="border-radius: 50px; overflow: hidden; padding: 0px; margin: 0px; width: 16px; height: 16px; display: inline-block; background: rgb(24, 100, 242);"
-              >
-                <svg
-                  height="16"
-                  width="16"
-                  x="0"
-                  y="0"
-                >
-                  <rect
-                    fill="#C81420"
-                    height="16"
-                    transform="translate(-2.752618452452339 -2.6325616818687707) rotate(385.9 8 8)"
-                    width="16"
-                    x="0"
-                    y="0"
-                  />
-                  <rect
-                    fill="#E9F500"
-                    height="16"
-                    transform="translate(5.337234703363199 6.214964079596694) rotate(184.5 8 8)"
-                    width="16"
-                    x="0"
-                    y="0"
-                  />
-                  <rect
-                    fill="#FAB300"
-                    height="16"
-                    transform="translate(0.9077275996181156 -13.015140953188144) rotate(431.3 8 8)"
-                    width="16"
-                    x="0"
-                    y="0"
-                  />
-                </svg>
-              </div>
-            </div>
-          </div>
-          <p
-            class="mm-box mm-text mm-text--body-md mm-box--margin-left-2 mm-box--color-inherit"
-            data-testid="confirm-info-row-display-name"
-          >
-            0x2e0D7...5d09B
-          </p>
-        </div>
-      </div>
-    </div>
   </div>
 </div>
 `;
diff --git a/ui/pages/confirmations/components/confirm/info/typed-sign-v1/__snapshots__/typed-sign-v1.test.tsx.snap b/ui/pages/confirmations/components/confirm/info/typed-sign-v1/__snapshots__/typed-sign-v1.test.tsx.snap
index b49b0f345265..441b05c888f0 100644
--- a/ui/pages/confirmations/components/confirm/info/typed-sign-v1/__snapshots__/typed-sign-v1.test.tsx.snap
+++ b/ui/pages/confirmations/components/confirm/info/typed-sign-v1/__snapshots__/typed-sign-v1.test.tsx.snap
@@ -47,82 +47,6 @@ exports[`TypedSignInfo correctly renders typed sign data request 1`] = `
         </p>
       </div>
     </div>
-    <div
-      class="mm-box confirm-info-row mm-box--margin-top-2 mm-box--margin-bottom-2 mm-box--padding-right-2 mm-box--padding-left-2 mm-box--display-flex mm-box--flex-direction-row mm-box--flex-wrap-wrap mm-box--justify-content-space-between mm-box--align-items-flex-start mm-box--color-text-default mm-box--rounded-lg"
-      style="overflow-wrap: anywhere; min-height: 24px; position: relative; background: transparent;"
-    >
-      <div
-        class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-flex-start mm-box--color-text-default"
-      >
-        <div
-          class="mm-box mm-box--display-flex mm-box--align-items-center"
-        >
-          <p
-            class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
-          >
-            Signing in with
-          </p>
-        </div>
-      </div>
-      <div
-        class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center"
-      >
-        <div
-          class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center"
-        >
-          <div
-            class=""
-          >
-            <div
-              class="identicon"
-              style="height: 16px; width: 16px; border-radius: 8px;"
-            >
-              <div
-                style="border-radius: 50px; overflow: hidden; padding: 0px; margin: 0px; width: 16px; height: 16px; display: inline-block; background: rgb(200, 20, 59);"
-              >
-                <svg
-                  height="16"
-                  width="16"
-                  x="0"
-                  y="0"
-                >
-                  <rect
-                    fill="#017B8E"
-                    height="16"
-                    transform="translate(0.39972303467835485 -0.4108005578484912) rotate(317.9 8 8)"
-                    width="16"
-                    x="0"
-                    y="0"
-                  />
-                  <rect
-                    fill="#F2B602"
-                    height="16"
-                    transform="translate(-3.7466980184561267 5.704967714142398) rotate(134.1 8 8)"
-                    width="16"
-                    x="0"
-                    y="0"
-                  />
-                  <rect
-                    fill="#FA8E00"
-                    height="16"
-                    transform="translate(-12.856136345377399 -5.7794405216344416) rotate(364.0 8 8)"
-                    width="16"
-                    x="0"
-                    y="0"
-                  />
-                </svg>
-              </div>
-            </div>
-          </div>
-          <p
-            class="mm-box mm-text mm-text--body-md mm-box--margin-left-2 mm-box--color-inherit"
-            data-testid="confirm-info-row-display-name"
-          >
-            0x935E7...05477
-          </p>
-        </div>
-      </div>
-    </div>
   </div>
   <div
     class="mm-box mm-box--margin-bottom-4 mm-box--padding-2 mm-box--background-color-background-default mm-box--rounded-md"
diff --git a/ui/pages/confirmations/components/confirm/info/typed-sign/__snapshots__/typed-sign.test.tsx.snap b/ui/pages/confirmations/components/confirm/info/typed-sign/__snapshots__/typed-sign.test.tsx.snap
index f8c3bfe2e55b..7ee5cbe5b4c4 100644
--- a/ui/pages/confirmations/components/confirm/info/typed-sign/__snapshots__/typed-sign.test.tsx.snap
+++ b/ui/pages/confirmations/components/confirm/info/typed-sign/__snapshots__/typed-sign.test.tsx.snap
@@ -327,82 +327,6 @@ exports[`TypedSignInfo correctly renders permit sign type 1`] = `
         </div>
       </div>
     </div>
-    <div
-      class="mm-box confirm-info-row mm-box--margin-top-2 mm-box--margin-bottom-2 mm-box--padding-right-2 mm-box--padding-left-2 mm-box--display-flex mm-box--flex-direction-row mm-box--flex-wrap-wrap mm-box--justify-content-space-between mm-box--align-items-flex-start mm-box--color-text-default mm-box--rounded-lg"
-      style="overflow-wrap: anywhere; min-height: 24px; position: relative; background: transparent;"
-    >
-      <div
-        class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-flex-start mm-box--color-text-default"
-      >
-        <div
-          class="mm-box mm-box--display-flex mm-box--align-items-center"
-        >
-          <p
-            class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
-          >
-            Signing in with
-          </p>
-        </div>
-      </div>
-      <div
-        class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center"
-      >
-        <div
-          class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center"
-        >
-          <div
-            class=""
-          >
-            <div
-              class="identicon"
-              style="height: 16px; width: 16px; border-radius: 8px;"
-            >
-              <div
-                style="border-radius: 50px; overflow: hidden; padding: 0px; margin: 0px; width: 16px; height: 16px; display: inline-block; background: rgb(200, 20, 59);"
-              >
-                <svg
-                  height="16"
-                  width="16"
-                  x="0"
-                  y="0"
-                >
-                  <rect
-                    fill="#017B8E"
-                    height="16"
-                    transform="translate(0.39972303467835485 -0.4108005578484912) rotate(317.9 8 8)"
-                    width="16"
-                    x="0"
-                    y="0"
-                  />
-                  <rect
-                    fill="#F2B602"
-                    height="16"
-                    transform="translate(-3.7466980184561267 5.704967714142398) rotate(134.1 8 8)"
-                    width="16"
-                    x="0"
-                    y="0"
-                  />
-                  <rect
-                    fill="#FA8E00"
-                    height="16"
-                    transform="translate(-12.856136345377399 -5.7794405216344416) rotate(364.0 8 8)"
-                    width="16"
-                    x="0"
-                    y="0"
-                  />
-                </svg>
-              </div>
-            </div>
-          </div>
-          <p
-            class="mm-box mm-text mm-text--body-md mm-box--margin-left-2 mm-box--color-inherit"
-            data-testid="confirm-info-row-display-name"
-          >
-            0x935E7...05477
-          </p>
-        </div>
-      </div>
-    </div>
   </div>
   <div
     class="mm-box mm-box--margin-bottom-4 mm-box--padding-2 mm-box--background-color-background-default mm-box--rounded-md"
@@ -778,82 +702,6 @@ exports[`TypedSignInfo correctly renders permit sign type with no deadline 1`] =
         </div>
       </div>
     </div>
-    <div
-      class="mm-box confirm-info-row mm-box--margin-top-2 mm-box--margin-bottom-2 mm-box--padding-right-2 mm-box--padding-left-2 mm-box--display-flex mm-box--flex-direction-row mm-box--flex-wrap-wrap mm-box--justify-content-space-between mm-box--align-items-flex-start mm-box--color-text-default mm-box--rounded-lg"
-      style="overflow-wrap: anywhere; min-height: 24px; position: relative; background: transparent;"
-    >
-      <div
-        class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-flex-start mm-box--color-text-default"
-      >
-        <div
-          class="mm-box mm-box--display-flex mm-box--align-items-center"
-        >
-          <p
-            class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
-          >
-            Signing in with
-          </p>
-        </div>
-      </div>
-      <div
-        class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center"
-      >
-        <div
-          class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center"
-        >
-          <div
-            class=""
-          >
-            <div
-              class="identicon"
-              style="height: 16px; width: 16px; border-radius: 8px;"
-            >
-              <div
-                style="border-radius: 50px; overflow: hidden; padding: 0px; margin: 0px; width: 16px; height: 16px; display: inline-block; background: rgb(200, 20, 59);"
-              >
-                <svg
-                  height="16"
-                  width="16"
-                  x="0"
-                  y="0"
-                >
-                  <rect
-                    fill="#017B8E"
-                    height="16"
-                    transform="translate(0.39972303467835485 -0.4108005578484912) rotate(317.9 8 8)"
-                    width="16"
-                    x="0"
-                    y="0"
-                  />
-                  <rect
-                    fill="#F2B602"
-                    height="16"
-                    transform="translate(-3.7466980184561267 5.704967714142398) rotate(134.1 8 8)"
-                    width="16"
-                    x="0"
-                    y="0"
-                  />
-                  <rect
-                    fill="#FA8E00"
-                    height="16"
-                    transform="translate(-12.856136345377399 -5.7794405216344416) rotate(364.0 8 8)"
-                    width="16"
-                    x="0"
-                    y="0"
-                  />
-                </svg>
-              </div>
-            </div>
-          </div>
-          <p
-            class="mm-box mm-text mm-text--body-md mm-box--margin-left-2 mm-box--color-inherit"
-            data-testid="confirm-info-row-display-name"
-          >
-            0x935E7...05477
-          </p>
-        </div>
-      </div>
-    </div>
   </div>
   <div
     class="mm-box mm-box--margin-bottom-4 mm-box--padding-2 mm-box--background-color-background-default mm-box--rounded-md"
@@ -1028,82 +876,6 @@ exports[`TypedSignInfo renders origin for typed sign data request 1`] = `
         </div>
       </div>
     </div>
-    <div
-      class="mm-box confirm-info-row mm-box--margin-top-2 mm-box--margin-bottom-2 mm-box--padding-right-2 mm-box--padding-left-2 mm-box--display-flex mm-box--flex-direction-row mm-box--flex-wrap-wrap mm-box--justify-content-space-between mm-box--align-items-flex-start mm-box--color-text-default mm-box--rounded-lg"
-      style="overflow-wrap: anywhere; min-height: 24px; position: relative; background: transparent;"
-    >
-      <div
-        class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-flex-start mm-box--color-text-default"
-      >
-        <div
-          class="mm-box mm-box--display-flex mm-box--align-items-center"
-        >
-          <p
-            class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
-          >
-            Signing in with
-          </p>
-        </div>
-      </div>
-      <div
-        class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center"
-      >
-        <div
-          class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center"
-        >
-          <div
-            class=""
-          >
-            <div
-              class="identicon"
-              style="height: 16px; width: 16px; border-radius: 8px;"
-            >
-              <div
-                style="border-radius: 50px; overflow: hidden; padding: 0px; margin: 0px; width: 16px; height: 16px; display: inline-block; background: rgb(250, 58, 0);"
-              >
-                <svg
-                  height="16"
-                  width="16"
-                  x="0"
-                  y="0"
-                >
-                  <rect
-                    fill="#18CDF2"
-                    height="16"
-                    transform="translate(-0.52419675189697 -1.6521420347302493) rotate(328.9 8 8)"
-                    width="16"
-                    x="0"
-                    y="0"
-                  />
-                  <rect
-                    fill="#035E56"
-                    height="16"
-                    transform="translate(-9.149230854416022 5.2962309358743) rotate(176.2 8 8)"
-                    width="16"
-                    x="0"
-                    y="0"
-                  />
-                  <rect
-                    fill="#F26602"
-                    height="16"
-                    transform="translate(8.333921009111961 -7.102569861498541) rotate(468.9 8 8)"
-                    width="16"
-                    x="0"
-                    y="0"
-                  />
-                </svg>
-              </div>
-            </div>
-          </div>
-          <p
-            class="mm-box mm-text mm-text--body-md mm-box--margin-left-2 mm-box--color-inherit"
-            data-testid="confirm-info-row-display-name"
-          >
-            Test Account
-          </p>
-        </div>
-      </div>
-    </div>
   </div>
   <div
     class="mm-box mm-box--margin-bottom-4 mm-box--padding-2 mm-box--background-color-background-default mm-box--rounded-md"
@@ -1970,82 +1742,6 @@ exports[`TypedSignInfo should render message for typed sign v3 request 1`] = `
         </div>
       </div>
     </div>
-    <div
-      class="mm-box confirm-info-row mm-box--margin-top-2 mm-box--margin-bottom-2 mm-box--padding-right-2 mm-box--padding-left-2 mm-box--display-flex mm-box--flex-direction-row mm-box--flex-wrap-wrap mm-box--justify-content-space-between mm-box--align-items-flex-start mm-box--color-text-default mm-box--rounded-lg"
-      style="overflow-wrap: anywhere; min-height: 24px; position: relative; background: transparent;"
-    >
-      <div
-        class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-flex-start mm-box--color-text-default"
-      >
-        <div
-          class="mm-box mm-box--display-flex mm-box--align-items-center"
-        >
-          <p
-            class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
-          >
-            Signing in with
-          </p>
-        </div>
-      </div>
-      <div
-        class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center"
-      >
-        <div
-          class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center"
-        >
-          <div
-            class=""
-          >
-            <div
-              class="identicon"
-              style="height: 16px; width: 16px; border-radius: 8px;"
-            >
-              <div
-                style="border-radius: 50px; overflow: hidden; padding: 0px; margin: 0px; width: 16px; height: 16px; display: inline-block; background: rgb(200, 20, 59);"
-              >
-                <svg
-                  height="16"
-                  width="16"
-                  x="0"
-                  y="0"
-                >
-                  <rect
-                    fill="#017B8E"
-                    height="16"
-                    transform="translate(0.39972303467835485 -0.4108005578484912) rotate(317.9 8 8)"
-                    width="16"
-                    x="0"
-                    y="0"
-                  />
-                  <rect
-                    fill="#F2B602"
-                    height="16"
-                    transform="translate(-3.7466980184561267 5.704967714142398) rotate(134.1 8 8)"
-                    width="16"
-                    x="0"
-                    y="0"
-                  />
-                  <rect
-                    fill="#FA8E00"
-                    height="16"
-                    transform="translate(-12.856136345377399 -5.7794405216344416) rotate(364.0 8 8)"
-                    width="16"
-                    x="0"
-                    y="0"
-                  />
-                </svg>
-              </div>
-            </div>
-          </div>
-          <p
-            class="mm-box mm-text mm-text--body-md mm-box--margin-left-2 mm-box--color-inherit"
-            data-testid="confirm-info-row-display-name"
-          >
-            0x935E7...05477
-          </p>
-        </div>
-      </div>
-    </div>
   </div>
   <div
     class="mm-box mm-box--margin-bottom-4 mm-box--padding-2 mm-box--background-color-background-default mm-box--rounded-md"
@@ -2535,82 +2231,6 @@ exports[`TypedSignInfo should render message for typed sign v4 request 1`] = `
         </div>
       </div>
     </div>
-    <div
-      class="mm-box confirm-info-row mm-box--margin-top-2 mm-box--margin-bottom-2 mm-box--padding-right-2 mm-box--padding-left-2 mm-box--display-flex mm-box--flex-direction-row mm-box--flex-wrap-wrap mm-box--justify-content-space-between mm-box--align-items-flex-start mm-box--color-text-default mm-box--rounded-lg"
-      style="overflow-wrap: anywhere; min-height: 24px; position: relative; background: transparent;"
-    >
-      <div
-        class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-flex-start mm-box--color-text-default"
-      >
-        <div
-          class="mm-box mm-box--display-flex mm-box--align-items-center"
-        >
-          <p
-            class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
-          >
-            Signing in with
-          </p>
-        </div>
-      </div>
-      <div
-        class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center"
-      >
-        <div
-          class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center"
-        >
-          <div
-            class=""
-          >
-            <div
-              class="identicon"
-              style="height: 16px; width: 16px; border-radius: 8px;"
-            >
-              <div
-                style="border-radius: 50px; overflow: hidden; padding: 0px; margin: 0px; width: 16px; height: 16px; display: inline-block; background: rgb(250, 58, 0);"
-              >
-                <svg
-                  height="16"
-                  width="16"
-                  x="0"
-                  y="0"
-                >
-                  <rect
-                    fill="#18CDF2"
-                    height="16"
-                    transform="translate(-0.52419675189697 -1.6521420347302493) rotate(328.9 8 8)"
-                    width="16"
-                    x="0"
-                    y="0"
-                  />
-                  <rect
-                    fill="#035E56"
-                    height="16"
-                    transform="translate(-9.149230854416022 5.2962309358743) rotate(176.2 8 8)"
-                    width="16"
-                    x="0"
-                    y="0"
-                  />
-                  <rect
-                    fill="#F26602"
-                    height="16"
-                    transform="translate(8.333921009111961 -7.102569861498541) rotate(468.9 8 8)"
-                    width="16"
-                    x="0"
-                    y="0"
-                  />
-                </svg>
-              </div>
-            </div>
-          </div>
-          <p
-            class="mm-box mm-text mm-text--body-md mm-box--margin-left-2 mm-box--color-inherit"
-            data-testid="confirm-info-row-display-name"
-          >
-            Test Account
-          </p>
-        </div>
-      </div>
-    </div>
   </div>
   <div
     class="mm-box mm-box--margin-bottom-4 mm-box--padding-2 mm-box--background-color-background-default mm-box--rounded-md"
diff --git a/ui/pages/confirmations/confirm/__snapshots__/confirm.test.tsx.snap b/ui/pages/confirmations/confirm/__snapshots__/confirm.test.tsx.snap
index 422be322dc06..178c3647f91f 100644
--- a/ui/pages/confirmations/confirm/__snapshots__/confirm.test.tsx.snap
+++ b/ui/pages/confirmations/confirm/__snapshots__/confirm.test.tsx.snap
@@ -179,82 +179,6 @@ exports[`Confirm matches snapshot for signature - personal sign type 1`] = `
                 </p>
               </div>
             </div>
-            <div
-              class="mm-box confirm-info-row mm-box--margin-top-2 mm-box--margin-bottom-2 mm-box--padding-right-2 mm-box--padding-left-2 mm-box--display-flex mm-box--flex-direction-row mm-box--flex-wrap-wrap mm-box--justify-content-space-between mm-box--align-items-flex-start mm-box--color-text-default mm-box--rounded-lg"
-              style="overflow-wrap: anywhere; min-height: 24px; position: relative; background: transparent;"
-            >
-              <div
-                class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-flex-start mm-box--color-text-default"
-              >
-                <div
-                  class="mm-box mm-box--display-flex mm-box--align-items-center"
-                >
-                  <p
-                    class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
-                  >
-                    Signing in with
-                  </p>
-                </div>
-              </div>
-              <div
-                class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center"
-              >
-                <div
-                  class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center"
-                >
-                  <div
-                    class=""
-                  >
-                    <div
-                      class="identicon"
-                      style="height: 16px; width: 16px; border-radius: 8px;"
-                    >
-                      <div
-                        style="border-radius: 50px; overflow: hidden; padding: 0px; margin: 0px; width: 16px; height: 16px; display: inline-block; background: rgb(250, 58, 0);"
-                      >
-                        <svg
-                          height="16"
-                          width="16"
-                          x="0"
-                          y="0"
-                        >
-                          <rect
-                            fill="#18CDF2"
-                            height="16"
-                            transform="translate(-0.52419675189697 -1.6521420347302493) rotate(328.9 8 8)"
-                            width="16"
-                            x="0"
-                            y="0"
-                          />
-                          <rect
-                            fill="#035E56"
-                            height="16"
-                            transform="translate(-9.149230854416022 5.2962309358743) rotate(176.2 8 8)"
-                            width="16"
-                            x="0"
-                            y="0"
-                          />
-                          <rect
-                            fill="#F26602"
-                            height="16"
-                            transform="translate(8.333921009111961 -7.102569861498541) rotate(468.9 8 8)"
-                            width="16"
-                            x="0"
-                            y="0"
-                          />
-                        </svg>
-                      </div>
-                    </div>
-                  </div>
-                  <p
-                    class="mm-box mm-text mm-text--body-md mm-box--margin-left-2 mm-box--color-inherit"
-                    data-testid="confirm-info-row-display-name"
-                  >
-                    Test Account
-                  </p>
-                </div>
-              </div>
-            </div>
           </div>
           <div
             class="mm-box mm-box--margin-bottom-4 mm-box--padding-2 mm-box--background-color-background-default mm-box--rounded-md"
@@ -847,82 +771,6 @@ exports[`Confirm should match snapshot for signature - typed sign - V4 - PermitB
                 </div>
               </div>
             </div>
-            <div
-              class="mm-box confirm-info-row mm-box--margin-top-2 mm-box--margin-bottom-2 mm-box--padding-right-2 mm-box--padding-left-2 mm-box--display-flex mm-box--flex-direction-row mm-box--flex-wrap-wrap mm-box--justify-content-space-between mm-box--align-items-flex-start mm-box--color-text-default mm-box--rounded-lg"
-              style="overflow-wrap: anywhere; min-height: 24px; position: relative; background: transparent;"
-            >
-              <div
-                class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-flex-start mm-box--color-text-default"
-              >
-                <div
-                  class="mm-box mm-box--display-flex mm-box--align-items-center"
-                >
-                  <p
-                    class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
-                  >
-                    Signing in with
-                  </p>
-                </div>
-              </div>
-              <div
-                class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center"
-              >
-                <div
-                  class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center"
-                >
-                  <div
-                    class=""
-                  >
-                    <div
-                      class="identicon"
-                      style="height: 16px; width: 16px; border-radius: 8px;"
-                    >
-                      <div
-                        style="border-radius: 50px; overflow: hidden; padding: 0px; margin: 0px; width: 16px; height: 16px; display: inline-block; background: rgb(200, 20, 59);"
-                      >
-                        <svg
-                          height="16"
-                          width="16"
-                          x="0"
-                          y="0"
-                        >
-                          <rect
-                            fill="#017B8E"
-                            height="16"
-                            transform="translate(0.39972303467835485 -0.4108005578484912) rotate(317.9 8 8)"
-                            width="16"
-                            x="0"
-                            y="0"
-                          />
-                          <rect
-                            fill="#F2B602"
-                            height="16"
-                            transform="translate(-3.7466980184561267 5.704967714142398) rotate(134.1 8 8)"
-                            width="16"
-                            x="0"
-                            y="0"
-                          />
-                          <rect
-                            fill="#FA8E00"
-                            height="16"
-                            transform="translate(-12.856136345377399 -5.7794405216344416) rotate(364.0 8 8)"
-                            width="16"
-                            x="0"
-                            y="0"
-                          />
-                        </svg>
-                      </div>
-                    </div>
-                  </div>
-                  <p
-                    class="mm-box mm-text mm-text--body-md mm-box--margin-left-2 mm-box--color-inherit"
-                    data-testid="confirm-info-row-display-name"
-                  >
-                    0x935E7...05477
-                  </p>
-                </div>
-              </div>
-            </div>
           </div>
           <div
             class="mm-box mm-box--margin-bottom-4 mm-box--padding-2 mm-box--background-color-background-default mm-box--rounded-md"
@@ -1453,82 +1301,6 @@ exports[`Confirm should match snapshot for signature - typed sign - V4 - PermitS
                 </div>
               </div>
             </div>
-            <div
-              class="mm-box confirm-info-row mm-box--margin-top-2 mm-box--margin-bottom-2 mm-box--padding-right-2 mm-box--padding-left-2 mm-box--display-flex mm-box--flex-direction-row mm-box--flex-wrap-wrap mm-box--justify-content-space-between mm-box--align-items-flex-start mm-box--color-text-default mm-box--rounded-lg"
-              style="overflow-wrap: anywhere; min-height: 24px; position: relative; background: transparent;"
-            >
-              <div
-                class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-flex-start mm-box--color-text-default"
-              >
-                <div
-                  class="mm-box mm-box--display-flex mm-box--align-items-center"
-                >
-                  <p
-                    class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
-                  >
-                    Signing in with
-                  </p>
-                </div>
-              </div>
-              <div
-                class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center"
-              >
-                <div
-                  class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center"
-                >
-                  <div
-                    class=""
-                  >
-                    <div
-                      class="identicon"
-                      style="height: 16px; width: 16px; border-radius: 8px;"
-                    >
-                      <div
-                        style="border-radius: 50px; overflow: hidden; padding: 0px; margin: 0px; width: 16px; height: 16px; display: inline-block; background: rgb(200, 20, 59);"
-                      >
-                        <svg
-                          height="16"
-                          width="16"
-                          x="0"
-                          y="0"
-                        >
-                          <rect
-                            fill="#017B8E"
-                            height="16"
-                            transform="translate(0.39972303467835485 -0.4108005578484912) rotate(317.9 8 8)"
-                            width="16"
-                            x="0"
-                            y="0"
-                          />
-                          <rect
-                            fill="#F2B602"
-                            height="16"
-                            transform="translate(-3.7466980184561267 5.704967714142398) rotate(134.1 8 8)"
-                            width="16"
-                            x="0"
-                            y="0"
-                          />
-                          <rect
-                            fill="#FA8E00"
-                            height="16"
-                            transform="translate(-12.856136345377399 -5.7794405216344416) rotate(364.0 8 8)"
-                            width="16"
-                            x="0"
-                            y="0"
-                          />
-                        </svg>
-                      </div>
-                    </div>
-                  </div>
-                  <p
-                    class="mm-box mm-text mm-text--body-md mm-box--margin-left-2 mm-box--color-inherit"
-                    data-testid="confirm-info-row-display-name"
-                  >
-                    0x935E7...05477
-                  </p>
-                </div>
-              </div>
-            </div>
           </div>
           <div
             class="mm-box mm-box--margin-bottom-4 mm-box--padding-2 mm-box--background-color-background-default mm-box--rounded-md"
@@ -1854,82 +1626,6 @@ exports[`Confirm should match snapshot for signature - typed sign - V4 1`] = `
                 </div>
               </div>
             </div>
-            <div
-              class="mm-box confirm-info-row mm-box--margin-top-2 mm-box--margin-bottom-2 mm-box--padding-right-2 mm-box--padding-left-2 mm-box--display-flex mm-box--flex-direction-row mm-box--flex-wrap-wrap mm-box--justify-content-space-between mm-box--align-items-flex-start mm-box--color-text-default mm-box--rounded-lg"
-              style="overflow-wrap: anywhere; min-height: 24px; position: relative; background: transparent;"
-            >
-              <div
-                class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-flex-start mm-box--color-text-default"
-              >
-                <div
-                  class="mm-box mm-box--display-flex mm-box--align-items-center"
-                >
-                  <p
-                    class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
-                  >
-                    Signing in with
-                  </p>
-                </div>
-              </div>
-              <div
-                class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center"
-              >
-                <div
-                  class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center"
-                >
-                  <div
-                    class=""
-                  >
-                    <div
-                      class="identicon"
-                      style="height: 16px; width: 16px; border-radius: 8px;"
-                    >
-                      <div
-                        style="border-radius: 50px; overflow: hidden; padding: 0px; margin: 0px; width: 16px; height: 16px; display: inline-block; background: rgb(250, 58, 0);"
-                      >
-                        <svg
-                          height="16"
-                          width="16"
-                          x="0"
-                          y="0"
-                        >
-                          <rect
-                            fill="#18CDF2"
-                            height="16"
-                            transform="translate(-0.52419675189697 -1.6521420347302493) rotate(328.9 8 8)"
-                            width="16"
-                            x="0"
-                            y="0"
-                          />
-                          <rect
-                            fill="#035E56"
-                            height="16"
-                            transform="translate(-9.149230854416022 5.2962309358743) rotate(176.2 8 8)"
-                            width="16"
-                            x="0"
-                            y="0"
-                          />
-                          <rect
-                            fill="#F26602"
-                            height="16"
-                            transform="translate(8.333921009111961 -7.102569861498541) rotate(468.9 8 8)"
-                            width="16"
-                            x="0"
-                            y="0"
-                          />
-                        </svg>
-                      </div>
-                    </div>
-                  </div>
-                  <p
-                    class="mm-box mm-text mm-text--body-md mm-box--margin-left-2 mm-box--color-inherit"
-                    data-testid="confirm-info-row-display-name"
-                  >
-                    Test Account
-                  </p>
-                </div>
-              </div>
-            </div>
           </div>
           <div
             class="mm-box mm-box--margin-bottom-4 mm-box--padding-2 mm-box--background-color-background-default mm-box--rounded-md"
@@ -3150,82 +2846,6 @@ exports[`Confirm should match snapshot for signature - typed sign - permit 1`] =
                 </div>
               </div>
             </div>
-            <div
-              class="mm-box confirm-info-row mm-box--margin-top-2 mm-box--margin-bottom-2 mm-box--padding-right-2 mm-box--padding-left-2 mm-box--display-flex mm-box--flex-direction-row mm-box--flex-wrap-wrap mm-box--justify-content-space-between mm-box--align-items-flex-start mm-box--color-text-default mm-box--rounded-lg"
-              style="overflow-wrap: anywhere; min-height: 24px; position: relative; background: transparent;"
-            >
-              <div
-                class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-flex-start mm-box--color-text-default"
-              >
-                <div
-                  class="mm-box mm-box--display-flex mm-box--align-items-center"
-                >
-                  <p
-                    class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
-                  >
-                    Signing in with
-                  </p>
-                </div>
-              </div>
-              <div
-                class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center"
-              >
-                <div
-                  class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center"
-                >
-                  <div
-                    class=""
-                  >
-                    <div
-                      class="identicon"
-                      style="height: 16px; width: 16px; border-radius: 8px;"
-                    >
-                      <div
-                        style="border-radius: 50px; overflow: hidden; padding: 0px; margin: 0px; width: 16px; height: 16px; display: inline-block; background: rgb(200, 20, 59);"
-                      >
-                        <svg
-                          height="16"
-                          width="16"
-                          x="0"
-                          y="0"
-                        >
-                          <rect
-                            fill="#017B8E"
-                            height="16"
-                            transform="translate(0.39972303467835485 -0.4108005578484912) rotate(317.9 8 8)"
-                            width="16"
-                            x="0"
-                            y="0"
-                          />
-                          <rect
-                            fill="#F2B602"
-                            height="16"
-                            transform="translate(-3.7466980184561267 5.704967714142398) rotate(134.1 8 8)"
-                            width="16"
-                            x="0"
-                            y="0"
-                          />
-                          <rect
-                            fill="#FA8E00"
-                            height="16"
-                            transform="translate(-12.856136345377399 -5.7794405216344416) rotate(364.0 8 8)"
-                            width="16"
-                            x="0"
-                            y="0"
-                          />
-                        </svg>
-                      </div>
-                    </div>
-                  </div>
-                  <p
-                    class="mm-box mm-text mm-text--body-md mm-box--margin-left-2 mm-box--color-inherit"
-                    data-testid="confirm-info-row-display-name"
-                  >
-                    0x935E7...05477
-                  </p>
-                </div>
-              </div>
-            </div>
           </div>
           <div
             class="mm-box mm-box--margin-bottom-4 mm-box--padding-2 mm-box--background-color-background-default mm-box--rounded-md"
@@ -3549,82 +3169,6 @@ exports[`Confirm should match snapshot signature - typed sign - order 1`] = `
                 </div>
               </div>
             </div>
-            <div
-              class="mm-box confirm-info-row mm-box--margin-top-2 mm-box--margin-bottom-2 mm-box--padding-right-2 mm-box--padding-left-2 mm-box--display-flex mm-box--flex-direction-row mm-box--flex-wrap-wrap mm-box--justify-content-space-between mm-box--align-items-flex-start mm-box--color-text-default mm-box--rounded-lg"
-              style="overflow-wrap: anywhere; min-height: 24px; position: relative; background: transparent;"
-            >
-              <div
-                class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-flex-start mm-box--color-text-default"
-              >
-                <div
-                  class="mm-box mm-box--display-flex mm-box--align-items-center"
-                >
-                  <p
-                    class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
-                  >
-                    Signing in with
-                  </p>
-                </div>
-              </div>
-              <div
-                class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center"
-              >
-                <div
-                  class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center"
-                >
-                  <div
-                    class=""
-                  >
-                    <div
-                      class="identicon"
-                      style="height: 16px; width: 16px; border-radius: 8px;"
-                    >
-                      <div
-                        style="border-radius: 50px; overflow: hidden; padding: 0px; margin: 0px; width: 16px; height: 16px; display: inline-block; background: rgb(200, 20, 59);"
-                      >
-                        <svg
-                          height="16"
-                          width="16"
-                          x="0"
-                          y="0"
-                        >
-                          <rect
-                            fill="#017B8E"
-                            height="16"
-                            transform="translate(0.39972303467835485 -0.4108005578484912) rotate(317.9 8 8)"
-                            width="16"
-                            x="0"
-                            y="0"
-                          />
-                          <rect
-                            fill="#F2B602"
-                            height="16"
-                            transform="translate(-3.7466980184561267 5.704967714142398) rotate(134.1 8 8)"
-                            width="16"
-                            x="0"
-                            y="0"
-                          />
-                          <rect
-                            fill="#FA8E00"
-                            height="16"
-                            transform="translate(-12.856136345377399 -5.7794405216344416) rotate(364.0 8 8)"
-                            width="16"
-                            x="0"
-                            y="0"
-                          />
-                        </svg>
-                      </div>
-                    </div>
-                  </div>
-                  <p
-                    class="mm-box mm-text mm-text--body-md mm-box--margin-left-2 mm-box--color-inherit"
-                    data-testid="confirm-info-row-display-name"
-                  >
-                    0x935E7...05477
-                  </p>
-                </div>
-              </div>
-            </div>
           </div>
           <div
             class="mm-box mm-box--margin-bottom-4 mm-box--padding-2 mm-box--background-color-background-default mm-box--rounded-md"

From b5dae6cc4ac9a0ae7be9d8d5e75f99f288fe6908 Mon Sep 17 00:00:00 2001
From: Desi McAdam <desi.mcadam@gmail.com>
Date: Mon, 9 Dec 2024 09:51:45 -0700
Subject: [PATCH 059/175] chore: Branch off of "New Crowdin translations by
 Github Action" (#29011)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## **Description**

This is a branch off of
https://github.com/MetaMask/metamask-extension/pull/26964, as of commit
https://github.com/MetaMask/metamask-extension/commit/243bf031364deb6450d43b2cd000f89633574c44
This will make it easier to merge the branch, which regularly has new
commits pushed to it

This adds new translations from crowdin

[![Open in GitHub
Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/29011?quickstart=1)

## **Related issues**

n/a

## **Manual testing steps**

1. Load extension build

## **Screenshots/Recordings**

<!-- If applicable, add screenshots and/or recordings to visualize the
before and after of your change. -->

### **Before**

<!-- [screenshots/recordings] -->

### **After**

<!-- [screenshots/recordings] -->

## **Pre-merge author checklist**

- [x] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension Coding
Standards](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/CODING_GUIDELINES.md).
- [x] I've completed the PR template to the best of my ability
- [x] I’ve included tests if applicable
- [x] I’ve documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [x] I’ve applied the right labels on the PR (see [labeling
guidelines](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.

## **Pre-merge reviewer checklist**

- [ ] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed).
- [ ] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.

Co-authored-by: metamaskbot <metamaskbot@users.noreply.github.com>
---
 app/_locales/de/messages.json    | 117 +++++++++++++++++++++++++++++++
 app/_locales/el/messages.json    | 117 +++++++++++++++++++++++++++++++
 app/_locales/es/messages.json    | 117 +++++++++++++++++++++++++++++++
 app/_locales/fr/messages.json    | 117 +++++++++++++++++++++++++++++++
 app/_locales/hi/messages.json    | 117 +++++++++++++++++++++++++++++++
 app/_locales/id/messages.json    | 117 +++++++++++++++++++++++++++++++
 app/_locales/ja/messages.json    | 117 +++++++++++++++++++++++++++++++
 app/_locales/ko/messages.json    | 117 +++++++++++++++++++++++++++++++
 app/_locales/pt/messages.json    | 117 +++++++++++++++++++++++++++++++
 app/_locales/ru/messages.json    | 117 +++++++++++++++++++++++++++++++
 app/_locales/tl/messages.json    | 117 +++++++++++++++++++++++++++++++
 app/_locales/tr/messages.json    | 117 +++++++++++++++++++++++++++++++
 app/_locales/vi/messages.json    | 117 +++++++++++++++++++++++++++++++
 app/_locales/zh_CN/messages.json | 117 +++++++++++++++++++++++++++++++
 14 files changed, 1638 insertions(+)

diff --git a/app/_locales/de/messages.json b/app/_locales/de/messages.json
index 0c8ba19030f2..19f6494e3b33 100644
--- a/app/_locales/de/messages.json
+++ b/app/_locales/de/messages.json
@@ -416,6 +416,9 @@
   "alertMessageAddressMismatchWarning": {
     "message": "Angreifer imitieren manchmal Websites, indem sie kleine Änderungen an der Adresse der Website vornehmen. Vergewissern Sie sich, dass Sie mit der beabsichtigten Website interagieren, bevor Sie fortfahren."
   },
+  "alertMessageChangeInSimulationResults": {
+    "message": "Die voraussichtlichen Änderungen für diese Transaktion wurden aktualisiert. Überprüfen Sie diese sorgfältig, bevor Sie fortfahren."
+  },
   "alertMessageGasEstimateFailed": {
     "message": "Wir sind nicht in der Lage, eine genaue Gebühr anzugeben, und diese Schätzung könnte zu hoch sein. Wir schlagen vor, dass Sie ein individuelles Gas-Limit eingeben, aber es besteht das Risiko, dass die Transaktion trotzdem fehlschlägt."
   },
@@ -455,6 +458,9 @@
   "alertModalReviewAllAlerts": {
     "message": "Alle Benachrichtigungen überprüfen"
   },
+  "alertReasonChangeInSimulationResults": {
+    "message": "Ergebnisse haben sich geändert"
+  },
   "alertReasonGasEstimateFailed": {
     "message": "Ungenaue Gebühr"
   },
@@ -837,18 +843,33 @@
   "bridge": {
     "message": "Bridge"
   },
+  "bridgeCalculatingAmount": {
+    "message": "Berechnen ..."
+  },
   "bridgeDontSend": {
     "message": "Bridge, nicht senden"
   },
+  "bridgeEnterAmount": {
+    "message": "Betrag eingeben"
+  },
   "bridgeFrom": {
     "message": "Bridge von"
   },
   "bridgeSelectNetwork": {
     "message": "Netzwerk wählen"
   },
+  "bridgeSelectTokenAndAmount": {
+    "message": "Token und Betrag auswählen"
+  },
+  "bridgeTimingTooltipText": {
+    "message": "Dies ist die voraussichtliche Dauer, bis das Bridging abgeschlossen ist."
+  },
   "bridgeTo": {
     "message": "Bridge nach"
   },
+  "bridgeTotalFeesTooltipText": {
+    "message": "Dazu gehören Gas-Gebühren (die an Krypto-Miner gezahlt werden) und Relayer-Gebühren (die für die Bereitstellung komplexer Dienste wie Bridging entrichtet werden).\nDie Gebühren richten sich nach dem Netzwerk-Traffic und der Komplexität der Transaktionen. MetaMask profitiert von keiner der Gebühren."
+  },
   "browserNotSupported": {
     "message": "Ihr Browser wird nicht unterstützt …"
   },
@@ -1160,6 +1181,14 @@
     "message": "Verbunden mit $1",
     "description": "$1 represents account name"
   },
+  "connectedWithNetwork": {
+    "message": "$1 Netzwerke verbunden",
+    "description": "$1 represents network length"
+  },
+  "connectedWithNetworkName": {
+    "message": "Verbunden mit $1",
+    "description": "$1 represents network name"
+  },
   "connecting": {
     "message": "Verbinden"
   },
@@ -1493,6 +1522,9 @@
   "dcent": {
     "message": "D'Cent"
   },
+  "debitCreditPurchaseOptions": {
+    "message": "Kaufoptionen per Debit- oder Kreditkarte"
+  },
   "decimal": {
     "message": "Token-Dezimale"
   },
@@ -1802,6 +1834,9 @@
   "editSpendingCapError": {
     "message": "Die Ausgabenobergrenze darf nicht mehr als $1 Dezimalstellen überschreiten. Entfernen Sie die Dezimalstellen, um fortzufahren."
   },
+  "editSpendingCapSpecialCharError": {
+    "message": "Nur Zahlen eingeben"
+  },
   "enableAutoDetect": {
     "message": " Automatische Erkennung aktivieren"
   },
@@ -1904,10 +1939,42 @@
     "message": "Code: $1",
     "description": "Displayed error name for debugging purposes. $1 is the error name"
   },
+  "errorPageContactSupport": {
+    "message": "Support kontaktieren",
+    "description": "Button for contact MM support"
+  },
+  "errorPageDescribeUsWhatHappened": {
+    "message": "Beschreiben Sie, was vorgefallen ist",
+    "description": "Button for submitting report to sentry"
+  },
+  "errorPageInfo": {
+    "message": "Ihre Daten können nicht angezeigt werden. Keine Sorge, Ihre Wallet und Ihr Geld sind sicher.",
+    "description": "Information banner shown in the error page"
+  },
+  "errorPageMessageTitle": {
+    "message": "Fehlermeldung",
+    "description": "Title for description, which is displayed for debugging purposes"
+  },
+  "errorPageSentryFormTitle": {
+    "message": "Beschreiben Sie, was vorgefallen ist",
+    "description": "In sentry feedback form, The title at the top of the feedback form."
+  },
+  "errorPageSentryMessagePlaceholder": {
+    "message": "Die Übermittlung von Details, z. B. wie wir den Fehler reproduzieren können, wird uns bei der Behebung des Problems helfen.",
+    "description": "In sentry feedback form, The placeholder for the feedback description input field."
+  },
+  "errorPageSentrySuccessMessageText": {
+    "message": "Vielen Dank! Wir werden uns bald damit befassen.",
+    "description": "In sentry feedback form, The message displayed after a successful feedback submission."
+  },
   "errorPageTitle": {
     "message": "MetaMask hat einen Fehler festgestellt.",
     "description": "Title of generic error page"
   },
+  "errorPageTryAgain": {
+    "message": "Erneut versuchen",
+    "description": "Button for try again"
+  },
   "errorStack": {
     "message": "Stapel:",
     "description": "Title for error stack, which is displayed for debugging purposes"
@@ -1925,6 +1992,9 @@
   "estimatedFeeTooltip": {
     "message": "Betrag, der für die Bearbeitung der Transaktion im Netzwerk gezahlt wurde."
   },
+  "estimatedTime": {
+    "message": "Geschätzte Dauer"
+  },
   "ethGasPriceFetchWarning": {
     "message": "Der Gas-Preis, der sich aus der Gas-Hauptschätzungsdienst ergibt, ist derzeit nicht verfügbar."
   },
@@ -2070,6 +2140,9 @@
   "functionType": {
     "message": "Funktionstyp"
   },
+  "fundingMethod": {
+    "message": "Methode der Mittelbereitstellung"
+  },
   "gas": {
     "message": "Gas"
   },
@@ -3724,6 +3797,12 @@
   "outdatedBrowserNotification": {
     "message": "Ihr Browser ist veraltet. Wenn Sie Ihren Browser nicht aktualisieren, können Sie keine Sicherheits-Patches und neue Funktionen von MetaMask erhalten."
   },
+  "overrideContentSecurityPolicyHeader": {
+    "message": "Content-Security-Policy-Header aufheben"
+  },
+  "overrideContentSecurityPolicyHeaderDescription": {
+    "message": "Diese Option dient als Behelfslösung für ein bekanntes Problem in Firefox, bei dem der Content-Security-Policy-Header einer dApp verhindern kann, dass die Erweiterung ordnungsgemäß geladen wird. Die Deaktivierung dieser Option wird nicht empfohlen, es sei denn, sie ist für die Kompatibilität bestimmter Webseiten erforderlich."
+  },
   "padlock": {
     "message": "Padlock"
   },
@@ -4395,6 +4474,9 @@
   "requestFromInfo": {
     "message": "Dies ist die Seite, auf der Sie um Ihre Unterschrift gebeten werden."
   },
+  "requestFromInfoSnap": {
+    "message": "Dies ist der Snap, der Sie zur Unterschrift auffordert."
+  },
   "requestFromTransactionDescription": {
     "message": "Dies ist die Website, die Sie um Ihre Bestätigung bittet."
   },
@@ -4417,6 +4499,10 @@
     "message": "Anfordern für $1",
     "description": "Name of Account"
   },
+  "requestingForNetwork": {
+    "message": "Anforderung von $1",
+    "description": "Name of Network"
+  },
   "requestsAwaitingAcknowledgement": {
     "message": "Anfragen warten auf Bestätigung"
   },
@@ -4895,6 +4981,9 @@
   "simulationDetailsIncomingHeading": {
     "message": "Sie erhalten"
   },
+  "simulationDetailsNoChanges": {
+    "message": "Keine Änderungen"
+  },
   "simulationDetailsOutgoingHeading": {
     "message": "Sie senden"
   },
@@ -4917,6 +5006,9 @@
   "simulationDetailsTransactionReverted": {
     "message": "Diese Transaktion wird wahrscheinlich scheitern"
   },
+  "simulationDetailsUnavailable": {
+    "message": "Nicht verfügbar"
+  },
   "simulationErrorMessageV2": {
     "message": "Wir konnten das Gas nicht schätzen. Es könnte einen Fehler im Contract geben und diese Transaktion könnte fehlschlagen."
   },
@@ -5143,6 +5235,15 @@
     "message": "Kontaktieren Sie die Ersteller von $1 für weitere Unterstützung.",
     "description": "This is shown when the insight snap throws an error. $1 is the snap name"
   },
+  "solanaSupportSectionTitle": {
+    "message": "Solana"
+  },
+  "solanaSupportToggleDescription": {
+    "message": "Bei Aktivierung dieser Funktion haben Sie die Möglichkeit, ein Solana-Konto zu Ihrer MetaMask-Erweiterung hinzuzufügen, das von Ihrer bestehenden geheimen Wiederherstellungsphrase abgeleitet ist. Hierbei handelt es sich um eine experimentelle Beta-Funktion, deren Nutzung also auf eigene Gefahr erfolgt."
+  },
+  "solanaSupportToggleTitle": {
+    "message": "Aktivierung der Funktion „Ein neues Solana-Konto hinzufügen (Beta)“"
+  },
   "somethingDoesntLookRight": {
     "message": "Scheint irgendetwas nicht in Ordnung zu sein? $1",
     "description": "A false positive message for users to contact support. $1 is a link to the support page."
@@ -5801,6 +5902,10 @@
   "swapTokenVerifiedOn1SourceTitle": {
     "message": "Möglicherweise unglaubwürdiges Token"
   },
+  "swapTokenVerifiedSources": {
+    "message": "Bestätigt durch $1 Quellen. Auf $2 verifiziert.",
+    "description": "$1 the number of sources that have verified the token, $2 points the user to a block explorer as a place they can verify information about the token."
+  },
   "swapTooManyDecimalsError": {
     "message": "$1 erlaubt bis zu $2 Dezimalstellen",
     "description": "$1 is a token symbol and $2 is the max. number of decimals allowed for the token"
@@ -5918,6 +6023,12 @@
   "tips": {
     "message": "Tipps"
   },
+  "tipsForUsingAWallet": {
+    "message": "Tipps zur Verwendung einer Wallet"
+  },
+  "tipsForUsingAWalletDescription": {
+    "message": "Das Hinzufügen von Tokens eröffnet weitere Möglichkeiten zur Nutzung von web3."
+  },
   "to": {
     "message": "An"
   },
@@ -5970,6 +6081,9 @@
   "tokenList": {
     "message": "Token-Listen"
   },
+  "tokenMarketplace": {
+    "message": "Token-Marktplatz"
+  },
   "tokenScamSecurityRisk": {
     "message": "Token-Betrügereien und Sicherheitsrisiken"
   },
@@ -6007,6 +6121,9 @@
   "total": {
     "message": "Gesamt"
   },
+  "totalFees": {
+    "message": "Gesamtgebühren"
+  },
   "totalVolume": {
     "message": "Gesamtvolumen"
   },
diff --git a/app/_locales/el/messages.json b/app/_locales/el/messages.json
index 31cd6809080b..cb3b257c3177 100644
--- a/app/_locales/el/messages.json
+++ b/app/_locales/el/messages.json
@@ -416,6 +416,9 @@
   "alertMessageAddressMismatchWarning": {
     "message": "Οι εισβολείς μερικές φορές αντιγράφουν ιστότοπους κάνοντας μικρές αλλαγές στη διεύθυνση του ιστότοπου. Βεβαιωθείτε ότι αλληλεπιδράτε με τον ιστότοπο που θέλετε πριν συνεχίσετε."
   },
+  "alertMessageChangeInSimulationResults": {
+    "message": "Οι εκτιμώμενες αλλαγές για αυτή τη συναλλαγή έχουν ενημερωθεί. Ελέγξτε τις προσεκτικά πριν προχωρήσετε."
+  },
   "alertMessageGasEstimateFailed": {
     "message": "Δεν μπορούμε να παράσχουμε τα τέλη με ακρίβεια και αυτή η εκτίμηση μπορεί να είναι υψηλή. Σας προτείνουμε να εισάγετε ένα προσαρμοσμένο όριο τελών συναλλαγών, αλλά υπάρχει κίνδυνος η συναλλαγή να αποτύχει και πάλι."
   },
@@ -455,6 +458,9 @@
   "alertModalReviewAllAlerts": {
     "message": "Έλεγχος όλων των ειδοποιήσεων"
   },
+  "alertReasonChangeInSimulationResults": {
+    "message": "Τα αποτελέσματα έχουν αλλάξει"
+  },
   "alertReasonGasEstimateFailed": {
     "message": "Ανακριβή τέλη"
   },
@@ -837,18 +843,33 @@
   "bridge": {
     "message": "Διασύνδεση"
   },
+  "bridgeCalculatingAmount": {
+    "message": "Υπολογισμός..."
+  },
   "bridgeDontSend": {
     "message": "Μην στείλετε χωρίς διασύνδεση"
   },
+  "bridgeEnterAmount": {
+    "message": "Πληκτρολογήστε το ποσό"
+  },
   "bridgeFrom": {
     "message": "Γέφυρα από"
   },
   "bridgeSelectNetwork": {
     "message": "Επιλέξτε δίκτυο"
   },
+  "bridgeSelectTokenAndAmount": {
+    "message": "Επιλέξτε token και ποσό"
+  },
+  "bridgeTimingTooltipText": {
+    "message": "Αυτός είναι ο εκτιμώμενος χρόνος που θα χρειαστεί για να ολοκληρωθεί η διασύνδεση."
+  },
   "bridgeTo": {
     "message": "Γέφυρα σε"
   },
+  "bridgeTotalFeesTooltipText": {
+    "message": "Αυτό περιλαμβάνει τα τέλη συναλλαγών (που καταβάλλονται στους αναλυτές κρυπτονομισμάτων) και τέλη αποδεκτών (που καταβάλλονται για την παροχή σύνθετων υπηρεσιών όπως η διασύνδεση).\nΤα τέλη βασίζονται στην κίνηση του δικτύου και την πολυπλοκότητα των συναλλαγών. Το MetaMask δεν επωφελείται από κανένα από τα δύο τέλη."
+  },
   "browserNotSupported": {
     "message": "Το Πρόγραμμα Περιήγησής σας δεν υποστηρίζεται..."
   },
@@ -1160,6 +1181,14 @@
     "message": "Συνδέεται με $1",
     "description": "$1 represents account name"
   },
+  "connectedWithNetwork": {
+    "message": "$1 δίκτυα συνδεδεμένα",
+    "description": "$1 represents network length"
+  },
+  "connectedWithNetworkName": {
+    "message": "Συνδέθηκε με το $1",
+    "description": "$1 represents network name"
+  },
   "connecting": {
     "message": "Σύνδεση"
   },
@@ -1493,6 +1522,9 @@
   "dcent": {
     "message": "D'Cent"
   },
+  "debitCreditPurchaseOptions": {
+    "message": "Επιλογές αγοράς με χρεωστική ή πιστωτική κάρτα"
+  },
   "decimal": {
     "message": "Δεκαδικά ψηφία του token"
   },
@@ -1802,6 +1834,9 @@
   "editSpendingCapError": {
     "message": "Το ανώτατο όριο δαπανών δεν μπορεί να υπερβαίνει τα $1 δεκαδικά ψηφία. Αφαιρέστε τα δεκαδικά ψηφία για να συνεχίσετε."
   },
+  "editSpendingCapSpecialCharError": {
+    "message": "Πληκτρολογήστε μόνο αριθμούς"
+  },
   "enableAutoDetect": {
     "message": " Ενεργοποίηση αυτόματου εντοπισμού"
   },
@@ -1904,10 +1939,42 @@
     "message": "Κωδικός: $1",
     "description": "Displayed error name for debugging purposes. $1 is the error name"
   },
+  "errorPageContactSupport": {
+    "message": "Επικοινωνήστε με την υποστήριξη",
+    "description": "Button for contact MM support"
+  },
+  "errorPageDescribeUsWhatHappened": {
+    "message": "Περιγράψτε τι έχει συμβεί",
+    "description": "Button for submitting report to sentry"
+  },
+  "errorPageInfo": {
+    "message": "Οι πληροφορίες σας δεν μπορούν να εμφανιστούν. Μην ανησυχείτε, το πορτοφόλι και τα κεφάλαιά σας είναι ασφαλή.",
+    "description": "Information banner shown in the error page"
+  },
+  "errorPageMessageTitle": {
+    "message": "Μήνυμα σφάλματος",
+    "description": "Title for description, which is displayed for debugging purposes"
+  },
+  "errorPageSentryFormTitle": {
+    "message": "Περιγράψτε τι έχει συμβεί",
+    "description": "In sentry feedback form, The title at the top of the feedback form."
+  },
+  "errorPageSentryMessagePlaceholder": {
+    "message": "Η παροχή λεπτομερειών, όπως ο τρόπος με τον οποίο μπορούμε να επαναλαμβάνουμε το σφάλμα, θα μας βοηθήσει να διορθώσουμε το πρόβλημα.",
+    "description": "In sentry feedback form, The placeholder for the feedback description input field."
+  },
+  "errorPageSentrySuccessMessageText": {
+    "message": "Ευχαριστούμε! Θα ρίξουμε μια ματιά σύντομα.",
+    "description": "In sentry feedback form, The message displayed after a successful feedback submission."
+  },
   "errorPageTitle": {
     "message": "Το MetaMask αντιμετώπισε ένα σφάλμα",
     "description": "Title of generic error page"
   },
+  "errorPageTryAgain": {
+    "message": "Προσπαθήστε ξανά",
+    "description": "Button for try again"
+  },
   "errorStack": {
     "message": "Στοίβα:",
     "description": "Title for error stack, which is displayed for debugging purposes"
@@ -1925,6 +1992,9 @@
   "estimatedFeeTooltip": {
     "message": "Ποσό που καταβλήθηκε για τη διεκπεραίωση της συναλλαγής στο δίκτυο."
   },
+  "estimatedTime": {
+    "message": "Εκτιμώμενος χρόνος"
+  },
   "ethGasPriceFetchWarning": {
     "message": "Η εφεδρική τιμή του τέλους συναλλαγής παρέχεται καθώς η κύρια υπηρεσία εκτίμησης τελών συναλλαγής, δεν είναι διαθέσιμη αυτή τη στιγμή."
   },
@@ -2070,6 +2140,9 @@
   "functionType": {
     "message": "Τύπος λειτουργίας"
   },
+  "fundingMethod": {
+    "message": "Μέθοδος χρηματοδότησης"
+  },
   "gas": {
     "message": "Τέλος συναλλαγής"
   },
@@ -3724,6 +3797,12 @@
   "outdatedBrowserNotification": {
     "message": "Το πρόγραμμα περιήγησής σας δεν είναι ενημερωμένο. Εάν δεν ενημερώσετε το πρόγραμμα περιήγησής σας, δεν θα μπορείτε να λαμβάνετε διορθώσεις ασφαλείας και νέες λειτουργίες από το MetaMask."
   },
+  "overrideContentSecurityPolicyHeader": {
+    "message": "Επικεφαλίδα Παράκαμψης Περιεχομένου-Ασφάλεια-Πολιτική"
+  },
+  "overrideContentSecurityPolicyHeaderDescription": {
+    "message": "Αυτή η επιλογή είναι μια λύση για ένα γνωστό πρόβλημα στον Firefox, όπου η επικεφαλίδα Παράκαμψης Περιεχομένου-Ασφάλεια-Πολιτική μιας αποκεντρωμένης εφαρμογής μπορεί να εμποδίσει τη σωστή λειτουργία μιας επέκτασης. Η απενεργοποίηση αυτής της επιλογής δεν συνιστάται, εκτός αν απαιτείται για συγκεκριμένη συμβατότητα ιστοσελίδας."
+  },
   "padlock": {
     "message": "Padlock"
   },
@@ -4395,6 +4474,9 @@
   "requestFromInfo": {
     "message": "Αυτός είναι ο ιστότοπος που ζητά την υπογραφή σας."
   },
+  "requestFromInfoSnap": {
+    "message": "Αυτό είναι το Snap που ζητάει την υπογραφή σας."
+  },
   "requestFromTransactionDescription": {
     "message": "Αυτός είναι ο ιστότοπος που ζητά την επιβεβαίωσή σας."
   },
@@ -4417,6 +4499,10 @@
     "message": "Ζητήθηκε για $1",
     "description": "Name of Account"
   },
+  "requestingForNetwork": {
+    "message": "Ζητάει για το $1",
+    "description": "Name of Network"
+  },
   "requestsAwaitingAcknowledgement": {
     "message": "αιτήματα που περιμένουν να επιβεβαιωθούν"
   },
@@ -4895,6 +4981,9 @@
   "simulationDetailsIncomingHeading": {
     "message": "Λαμβάνετε"
   },
+  "simulationDetailsNoChanges": {
+    "message": "Δεν υπάρχουν αλλαγές"
+  },
   "simulationDetailsOutgoingHeading": {
     "message": "Στέλνετε"
   },
@@ -4917,6 +5006,9 @@
   "simulationDetailsTransactionReverted": {
     "message": "Αυτή η συναλλαγή είναι πιθανό να αποτύχει"
   },
+  "simulationDetailsUnavailable": {
+    "message": "Μη διαθέσιμο"
+  },
   "simulationErrorMessageV2": {
     "message": "Δεν ήμασταν σε θέση να εκτιμήσουμε το τέλος συναλλαγής. Μπορεί να υπάρχει σφάλμα στο συμβόλαιο και η συναλλαγή αυτή να αποτύχει."
   },
@@ -5143,6 +5235,15 @@
     "message": "Επικοινωνήστε με τους διαχειριστές του $1 για περαιτέρω υποστήριξη.",
     "description": "This is shown when the insight snap throws an error. $1 is the snap name"
   },
+  "solanaSupportSectionTitle": {
+    "message": "Solana"
+  },
+  "solanaSupportToggleDescription": {
+    "message": "Η ενεργοποίηση αυτής της λειτουργίας θα σας δώσει τη δυνατότητα να προσθέσετε έναν λογαριασμό Solana στην επέκταση του MetaMask που προέρχεται από την υπάρχουσα Μυστική Φράση Ανάκτησης. Πρόκειται για μια πειραματική λειτουργία Beta, οπότε θα πρέπει να τη χρησιμοποιήσετε με δική σας ευθύνη."
+  },
+  "solanaSupportToggleTitle": {
+    "message": "Ενεργοποίηση της λειτουργίας \"Προσθήκη νέου λογαριασμού Solana (Beta)\""
+  },
   "somethingDoesntLookRight": {
     "message": "Κάτι δεν φαίνεται σωστό; $1",
     "description": "A false positive message for users to contact support. $1 is a link to the support page."
@@ -5801,6 +5902,10 @@
   "swapTokenVerifiedOn1SourceTitle": {
     "message": "Ενδεχομένως μη αυθεντικό token"
   },
+  "swapTokenVerifiedSources": {
+    "message": "Επιβεβαιώνεται από $1 πηγές. Επαληθεύστε στο $2.",
+    "description": "$1 the number of sources that have verified the token, $2 points the user to a block explorer as a place they can verify information about the token."
+  },
   "swapTooManyDecimalsError": {
     "message": "Το $1 επιτρέπει έως και $2 δεκαδικά ψηφία",
     "description": "$1 is a token symbol and $2 is the max. number of decimals allowed for the token"
@@ -5918,6 +6023,12 @@
   "tips": {
     "message": "Συμβουλές"
   },
+  "tipsForUsingAWallet": {
+    "message": "Συμβουλές για τη χρήση πορτοφολιού"
+  },
+  "tipsForUsingAWalletDescription": {
+    "message": "Η προσθήκη tokens ξεκλειδώνει περισσότερους τρόπους χρήσης του web3."
+  },
   "to": {
     "message": "Προς"
   },
@@ -5970,6 +6081,9 @@
   "tokenList": {
     "message": "Λίστες με tokens"
   },
+  "tokenMarketplace": {
+    "message": "Αγορά tokens"
+  },
   "tokenScamSecurityRisk": {
     "message": "απάτες με token και κίνδυνοι ασφάλειας"
   },
@@ -6007,6 +6121,9 @@
   "total": {
     "message": "Σύνολο"
   },
+  "totalFees": {
+    "message": "Συνολικά τέλη"
+  },
   "totalVolume": {
     "message": "Συνολικός όγκος"
   },
diff --git a/app/_locales/es/messages.json b/app/_locales/es/messages.json
index f2afe012534a..92cbd316b9fb 100644
--- a/app/_locales/es/messages.json
+++ b/app/_locales/es/messages.json
@@ -416,6 +416,9 @@
   "alertMessageAddressMismatchWarning": {
     "message": "A veces, los atacantes imitan sitios web haciendo pequeños cambios en la dirección del sitio. Asegúrese de estar interactuando con el sitio deseado antes de continuar."
   },
+  "alertMessageChangeInSimulationResults": {
+    "message": "Se actualizaron los cambios estimados para esta transacción. Revíselos detenidamente antes de proceder."
+  },
   "alertMessageGasEstimateFailed": {
     "message": "No podemos proporcionar una tarifa exacta y esta estimación podría ser alta. Le sugerimos que ingrese un límite de gas personalizado, pero existe el riesgo de que la transacción aún falle."
   },
@@ -455,6 +458,9 @@
   "alertModalReviewAllAlerts": {
     "message": "Revisar todas las alertas"
   },
+  "alertReasonChangeInSimulationResults": {
+    "message": "Los resultados cambiaron"
+  },
   "alertReasonGasEstimateFailed": {
     "message": "Tarifa inexacta"
   },
@@ -837,18 +843,33 @@
   "bridge": {
     "message": "Puente"
   },
+  "bridgeCalculatingAmount": {
+    "message": "Calculando..."
+  },
   "bridgeDontSend": {
     "message": "Puente, no enviar"
   },
+  "bridgeEnterAmount": {
+    "message": "Ingrese el monto"
+  },
   "bridgeFrom": {
     "message": "Puentear desde"
   },
   "bridgeSelectNetwork": {
     "message": "Seleccionar red"
   },
+  "bridgeSelectTokenAndAmount": {
+    "message": "Seleccione token y monto"
+  },
+  "bridgeTimingTooltipText": {
+    "message": "Este es el tiempo estimado que tardará en completarse el puenteo."
+  },
   "bridgeTo": {
     "message": "Puentear hacia"
   },
+  "bridgeTotalFeesTooltipText": {
+    "message": "Esto incluye las tarifas de gas (pagadas a los mineros de criptomonedas) y las tarifas de repetidores (pagadas para alimentar servicios complejos como el puenteo).\nLas tarifas se basan en el tráfico de la red y la complejidad de las transacciones. MetaMask no lucra con ninguna de las dos tarifas."
+  },
   "browserNotSupported": {
     "message": "Su explorador no es compatible..."
   },
@@ -1160,6 +1181,14 @@
     "message": "Conectado con $1",
     "description": "$1 represents account name"
   },
+  "connectedWithNetwork": {
+    "message": "$1 redes conectadas",
+    "description": "$1 represents network length"
+  },
+  "connectedWithNetworkName": {
+    "message": "Conectado con $1",
+    "description": "$1 represents network name"
+  },
   "connecting": {
     "message": "Conectando"
   },
@@ -1493,6 +1522,9 @@
   "dcent": {
     "message": "D'Cent"
   },
+  "debitCreditPurchaseOptions": {
+    "message": "Opciones de compra con tarjeta de débito o crédito"
+  },
   "decimal": {
     "message": "Decimales del token"
   },
@@ -1802,6 +1834,9 @@
   "editSpendingCapError": {
     "message": "El límite de gasto no puede superar $1 dígitos decimales. Elimine los dígitos decimales para continuar."
   },
+  "editSpendingCapSpecialCharError": {
+    "message": "Ingrese solo números"
+  },
   "enableAutoDetect": {
     "message": " Activar autodetección"
   },
@@ -1904,10 +1939,42 @@
     "message": "Código: $1",
     "description": "Displayed error name for debugging purposes. $1 is the error name"
   },
+  "errorPageContactSupport": {
+    "message": "Comuníquese con soporte",
+    "description": "Button for contact MM support"
+  },
+  "errorPageDescribeUsWhatHappened": {
+    "message": "Describa lo sucedido",
+    "description": "Button for submitting report to sentry"
+  },
+  "errorPageInfo": {
+    "message": "No se puede mostrar su información. No se preocupe, su monedero y sus fondos están a salvo.",
+    "description": "Information banner shown in the error page"
+  },
+  "errorPageMessageTitle": {
+    "message": "Mensaje de error",
+    "description": "Title for description, which is displayed for debugging purposes"
+  },
+  "errorPageSentryFormTitle": {
+    "message": "Describa lo sucedido",
+    "description": "In sentry feedback form, The title at the top of the feedback form."
+  },
+  "errorPageSentryMessagePlaceholder": {
+    "message": "Compartir detalles como la forma de reproducir el error nos ayudará a solucionar el problema.",
+    "description": "In sentry feedback form, The placeholder for the feedback description input field."
+  },
+  "errorPageSentrySuccessMessageText": {
+    "message": "¡Gracias! Lo revisaremos en breve.",
+    "description": "In sentry feedback form, The message displayed after a successful feedback submission."
+  },
   "errorPageTitle": {
     "message": "MetaMask encontró un error",
     "description": "Title of generic error page"
   },
+  "errorPageTryAgain": {
+    "message": "Vuelva a intentarlo",
+    "description": "Button for try again"
+  },
   "errorStack": {
     "message": "Pila:",
     "description": "Title for error stack, which is displayed for debugging purposes"
@@ -1925,6 +1992,9 @@
   "estimatedFeeTooltip": {
     "message": "Monto pagado para procesar la transacción en la red."
   },
+  "estimatedTime": {
+    "message": "Tiempo estimado"
+  },
   "ethGasPriceFetchWarning": {
     "message": "Se muestra el precio del gas de respaldo, ya que el servicio para calcular el precio del gas principal no se encuentra disponible en este momento."
   },
@@ -2070,6 +2140,9 @@
   "functionType": {
     "message": "Tipo de función"
   },
+  "fundingMethod": {
+    "message": "Método de financiación"
+  },
   "gas": {
     "message": "Gas"
   },
@@ -3724,6 +3797,12 @@
   "outdatedBrowserNotification": {
     "message": "Su navegador está desactualizado. Si no actualiza su navegador, no podrá obtener los parches de seguridad y las nuevas funciones de MetaMask."
   },
+  "overrideContentSecurityPolicyHeader": {
+    "message": "Sobreescribir el encabezado Content-Security-Policy"
+  },
+  "overrideContentSecurityPolicyHeaderDescription": {
+    "message": "Esta opción es una solución alternativa para un problema conocido en Firefox, donde el encabezado Content-Security-Policy de una dapp puede impedir que la extensión se cargue correctamente. No se recomienda desactivar esta opción a menos que sea necesario para la compatibilidad específica de la página web."
+  },
   "padlock": {
     "message": "Candado"
   },
@@ -4395,6 +4474,9 @@
   "requestFromInfo": {
     "message": "Este es el sitio que solicita su firma."
   },
+  "requestFromInfoSnap": {
+    "message": "Este es el Snap que solicita su firma."
+  },
   "requestFromTransactionDescription": {
     "message": "Este es el sitio que le pide su confirmación."
   },
@@ -4417,6 +4499,10 @@
     "message": "Solicitando para $1",
     "description": "Name of Account"
   },
+  "requestingForNetwork": {
+    "message": "Solicitando para $1",
+    "description": "Name of Network"
+  },
   "requestsAwaitingAcknowledgement": {
     "message": "solicitudes en espera de confirmación"
   },
@@ -4895,6 +4981,9 @@
   "simulationDetailsIncomingHeading": {
     "message": "Usted recibe"
   },
+  "simulationDetailsNoChanges": {
+    "message": "Sin cambios"
+  },
   "simulationDetailsOutgoingHeading": {
     "message": "Envía"
   },
@@ -4917,6 +5006,9 @@
   "simulationDetailsTransactionReverted": {
     "message": "Es probable que esta transacción falle"
   },
+  "simulationDetailsUnavailable": {
+    "message": "No disponible"
+  },
   "simulationErrorMessageV2": {
     "message": "No pudimos estimar el gas. Podría haber un error en el contrato y esta transacción podría fallar."
   },
@@ -5143,6 +5235,15 @@
     "message": "Póngase en contacto con los creadores de $1 para obtener más ayuda.",
     "description": "This is shown when the insight snap throws an error. $1 is the snap name"
   },
+  "solanaSupportSectionTitle": {
+    "message": "Solana"
+  },
+  "solanaSupportToggleDescription": {
+    "message": "Activar esta función le dará la opción de añadir una cuenta de Solana a su extensión MetaMask derivada de su frase secreta de recuperación existente. Esta es una característica Beta experimental, por lo que debe utilizarla bajo su propio riesgo."
+  },
+  "solanaSupportToggleTitle": {
+    "message": "Activar \"Añadir una nueva cuenta de Solana (Beta)\""
+  },
   "somethingDoesntLookRight": {
     "message": "Algo no se ve bien, ¿cierto? $1",
     "description": "A false positive message for users to contact support. $1 is a link to the support page."
@@ -5801,6 +5902,10 @@
   "swapTokenVerifiedOn1SourceTitle": {
     "message": "Token potencialmente falso"
   },
+  "swapTokenVerifiedSources": {
+    "message": "Confirmado por fuentes de $1. Verificar en $2.",
+    "description": "$1 the number of sources that have verified the token, $2 points the user to a block explorer as a place they can verify information about the token."
+  },
   "swapTooManyDecimalsError": {
     "message": "$1 permite hasta $2 decimales",
     "description": "$1 is a token symbol and $2 is the max. number of decimals allowed for the token"
@@ -5918,6 +6023,12 @@
   "tips": {
     "message": "Sugerencias"
   },
+  "tipsForUsingAWallet": {
+    "message": "Consejos para utilizar un monedero"
+  },
+  "tipsForUsingAWalletDescription": {
+    "message": "Al añadir tokens se desbloquean más formas de utilizar Web3."
+  },
   "to": {
     "message": "Para"
   },
@@ -5970,6 +6081,9 @@
   "tokenList": {
     "message": "Lista de tókenes"
   },
+  "tokenMarketplace": {
+    "message": "Mercado de tokens"
+  },
   "tokenScamSecurityRisk": {
     "message": "estafas de tokens y riesgos de seguridad"
   },
@@ -6007,6 +6121,9 @@
   "total": {
     "message": "Total"
   },
+  "totalFees": {
+    "message": "Tarifas totales"
+  },
   "totalVolume": {
     "message": "Volúmen total"
   },
diff --git a/app/_locales/fr/messages.json b/app/_locales/fr/messages.json
index 99c3a6da2333..6391c83412a2 100644
--- a/app/_locales/fr/messages.json
+++ b/app/_locales/fr/messages.json
@@ -416,6 +416,9 @@
   "alertMessageAddressMismatchWarning": {
     "message": "Les pirates informatiques imitent parfois les sites en modifiant légèrement l’adresse du site. Assurez-vous que vous interagissez avec le site voulu avant de continuer."
   },
+  "alertMessageChangeInSimulationResults": {
+    "message": "Les modifications estimées pour cette transaction ont été mises à jour. Examinez-les attentivement avant de poursuivre."
+  },
   "alertMessageGasEstimateFailed": {
     "message": "Nous ne sommes pas en mesure de déterminer le montant exact des frais et cette estimation peut être élevée. Nous vous suggérons d’entrer une limite de gaz personnalisée, mais la transaction pourrait quand même échouer."
   },
@@ -455,6 +458,9 @@
   "alertModalReviewAllAlerts": {
     "message": "Examiner toutes les alertes"
   },
+  "alertReasonChangeInSimulationResults": {
+    "message": "Les résultats ont changé"
+  },
   "alertReasonGasEstimateFailed": {
     "message": "Frais inexacts"
   },
@@ -837,18 +843,33 @@
   "bridge": {
     "message": "Pont"
   },
+  "bridgeCalculatingAmount": {
+    "message": "Calcul en cours…"
+  },
   "bridgeDontSend": {
     "message": "Passerelle, ne pas envoyer"
   },
+  "bridgeEnterAmount": {
+    "message": "Saisissez le montant"
+  },
   "bridgeFrom": {
     "message": "Passerelle depuis"
   },
   "bridgeSelectNetwork": {
     "message": "Sélectionner un réseau"
   },
+  "bridgeSelectTokenAndAmount": {
+    "message": "Sélectionnez le jeton et le montant"
+  },
+  "bridgeTimingTooltipText": {
+    "message": "Il s’agit d’une estimation du temps nécessaire pour que la passerelle soit établie."
+  },
   "bridgeTo": {
     "message": "Passerelle vers"
   },
+  "bridgeTotalFeesTooltipText": {
+    "message": "Cela comprend les frais de gaz (payés aux mineurs de crypto-monnaies) et les frais pour relayeurs (payés pour assurer des services complexes tels que l’établissement de passerelles).\nLes frais sont basés sur le trafic réseau et la complexité des transactions. MetaMask ne tire aucun profit de ces frais."
+  },
   "browserNotSupported": {
     "message": "Votre navigateur internet n’est pas compatible..."
   },
@@ -1160,6 +1181,14 @@
     "message": "Connecté avec $1",
     "description": "$1 represents account name"
   },
+  "connectedWithNetwork": {
+    "message": "$1 réseaux connectés",
+    "description": "$1 represents network length"
+  },
+  "connectedWithNetworkName": {
+    "message": "Connecté avec $1",
+    "description": "$1 represents network name"
+  },
   "connecting": {
     "message": "Connexion…"
   },
@@ -1493,6 +1522,9 @@
   "dcent": {
     "message": "D’Cent"
   },
+  "debitCreditPurchaseOptions": {
+    "message": "Options d’achat par carte de débit ou de crédit"
+  },
   "decimal": {
     "message": "Nombre de décimales du jeton"
   },
@@ -1802,6 +1834,9 @@
   "editSpendingCapError": {
     "message": "Le plafond des dépenses ne peut contenir plus de $1 chiffres décimaux. Supprimez les chiffres décimaux excédentaires pour continuer."
   },
+  "editSpendingCapSpecialCharError": {
+    "message": "Saisissez uniquement des chiffres"
+  },
   "enableAutoDetect": {
     "message": " Activer la détection automatique"
   },
@@ -1904,10 +1939,42 @@
     "message": "Code : $1",
     "description": "Displayed error name for debugging purposes. $1 is the error name"
   },
+  "errorPageContactSupport": {
+    "message": "Contacter l’assistance",
+    "description": "Button for contact MM support"
+  },
+  "errorPageDescribeUsWhatHappened": {
+    "message": "Décrivez ce qui s’est passé",
+    "description": "Button for submitting report to sentry"
+  },
+  "errorPageInfo": {
+    "message": "Vos informations ne peuvent pas être affichées. Ne vous inquiétez pas, votre portefeuille et vos fonds sont en sécurité.",
+    "description": "Information banner shown in the error page"
+  },
+  "errorPageMessageTitle": {
+    "message": "Message d’erreur",
+    "description": "Title for description, which is displayed for debugging purposes"
+  },
+  "errorPageSentryFormTitle": {
+    "message": "Décrivez ce qui s’est passé",
+    "description": "In sentry feedback form, The title at the top of the feedback form."
+  },
+  "errorPageSentryMessagePlaceholder": {
+    "message": "Le fait de partager des détails tels que la façon dont nous pouvons reproduire le bogue nous aidera à résoudre le problème.",
+    "description": "In sentry feedback form, The placeholder for the feedback description input field."
+  },
+  "errorPageSentrySuccessMessageText": {
+    "message": "Merci. Nous y jetterons un coup d’œil prochainement.",
+    "description": "In sentry feedback form, The message displayed after a successful feedback submission."
+  },
   "errorPageTitle": {
     "message": "MetaMask a rencontré une erreur",
     "description": "Title of generic error page"
   },
+  "errorPageTryAgain": {
+    "message": "Réessayez",
+    "description": "Button for try again"
+  },
   "errorStack": {
     "message": "Stack :",
     "description": "Title for error stack, which is displayed for debugging purposes"
@@ -1925,6 +1992,9 @@
   "estimatedFeeTooltip": {
     "message": "Montant payé pour traiter la transaction sur le réseau."
   },
+  "estimatedTime": {
+    "message": "Temps estimé"
+  },
   "ethGasPriceFetchWarning": {
     "message": "Le prix de carburant de sauvegarde est fourni, car le service principal d’estimation du carburant est momentanément indisponible."
   },
@@ -2070,6 +2140,9 @@
   "functionType": {
     "message": "Type de fonction"
   },
+  "fundingMethod": {
+    "message": "Mode de financement"
+  },
   "gas": {
     "message": "Carburant"
   },
@@ -3724,6 +3797,12 @@
   "outdatedBrowserNotification": {
     "message": "Votre navigateur n’est pas à jour. Si vous ne mettez pas à jour votre navigateur, vous ne pourrez pas obtenir les correctifs de sécurité et profiter des nouvelles fonctionnalités de MetaMask."
   },
+  "overrideContentSecurityPolicyHeader": {
+    "message": "Remplacer l’en-tête Content-Security-Policy"
+  },
+  "overrideContentSecurityPolicyHeaderDescription": {
+    "message": "Cette option est une solution de contournement pour un problème connu dans Firefox, où l’en-tête Content-Security-Policy d’une dapp peut empêcher l’extension de se charger correctement. La désactivation de cette option n’est pas recommandée, à moins qu’elle ne soit nécessaire pour assurer la compatibilité d’une page web spécifique."
+  },
   "padlock": {
     "message": "Cadenas"
   },
@@ -4395,6 +4474,9 @@
   "requestFromInfo": {
     "message": "C'est le site qui vous demande votre signature."
   },
+  "requestFromInfoSnap": {
+    "message": "Il s’agit du Snap qui demande votre signature."
+  },
   "requestFromTransactionDescription": {
     "message": "Il s’agit du site qui demande votre confirmation."
   },
@@ -4417,6 +4499,10 @@
     "message": "Demande de $1",
     "description": "Name of Account"
   },
+  "requestingForNetwork": {
+    "message": "Demande pour $1",
+    "description": "Name of Network"
+  },
   "requestsAwaitingAcknowledgement": {
     "message": "demandes en attente d’un accusé de réception"
   },
@@ -4895,6 +4981,9 @@
   "simulationDetailsIncomingHeading": {
     "message": "Vous recevez"
   },
+  "simulationDetailsNoChanges": {
+    "message": "Aucun changement"
+  },
   "simulationDetailsOutgoingHeading": {
     "message": "Vous envoyez"
   },
@@ -4917,6 +5006,9 @@
   "simulationDetailsTransactionReverted": {
     "message": "Cette transaction va probablement échouer"
   },
+  "simulationDetailsUnavailable": {
+    "message": "Non disponible"
+  },
   "simulationErrorMessageV2": {
     "message": "Nous n’avons pas pu estimer le prix de carburant. Par conséquent, il se peut qu’il y ait une erreur dans le contrat et que cette transaction échoue."
   },
@@ -5143,6 +5235,15 @@
     "message": "L’interface utilisateur (IU) spécifiée par le snap n’est pas valide.",
     "description": "This is shown when the insight snap throws an error. $1 is the snap name"
   },
+  "solanaSupportSectionTitle": {
+    "message": "Solana"
+  },
+  "solanaSupportToggleDescription": {
+    "message": "En activant cette fonctionnalité, vous aurez la possibilité d’ajouter un compte Solana à votre extension MetaMask dérivée de votre phrase secrète de récupération existante. Toute utilisation de cette fonctionnalité bêta expérimentale se fait à vos risques et périls."
+  },
+  "solanaSupportToggleTitle": {
+    "message": "Activer « Ajouter un nouveau compte Solana (Bêta) »"
+  },
   "somethingDoesntLookRight": {
     "message": "On dirait que quelque chose ne va pas ? $1",
     "description": "A false positive message for users to contact support. $1 is a link to the support page."
@@ -5801,6 +5902,10 @@
   "swapTokenVerifiedOn1SourceTitle": {
     "message": "Jeton potentiellement inauthentique"
   },
+  "swapTokenVerifiedSources": {
+    "message": "Confirmé par $1 sources. Vérifier sur $2.",
+    "description": "$1 the number of sources that have verified the token, $2 points the user to a block explorer as a place they can verify information about the token."
+  },
   "swapTooManyDecimalsError": {
     "message": "$1 accepte jusqu’à $2 décimales",
     "description": "$1 is a token symbol and $2 is the max. number of decimals allowed for the token"
@@ -5918,6 +6023,12 @@
   "tips": {
     "message": "Dons"
   },
+  "tipsForUsingAWallet": {
+    "message": "Conseils pour l’utilisation d’un portefeuille"
+  },
+  "tipsForUsingAWalletDescription": {
+    "message": "L’ajout de jetons permet de débloquer d’autres moyens d’utiliser le Web3."
+  },
   "to": {
     "message": "Destinataire"
   },
@@ -5970,6 +6081,9 @@
   "tokenList": {
     "message": "Listes de jetons"
   },
+  "tokenMarketplace": {
+    "message": "Marché des jetons"
+  },
   "tokenScamSecurityRisk": {
     "message": "les arnaques et les risques de piratage informatique"
   },
@@ -6007,6 +6121,9 @@
   "total": {
     "message": "Total"
   },
+  "totalFees": {
+    "message": "Frais totaux"
+  },
   "totalVolume": {
     "message": "Volume total"
   },
diff --git a/app/_locales/hi/messages.json b/app/_locales/hi/messages.json
index 92d8d0bc7fa8..63438fb22a4f 100644
--- a/app/_locales/hi/messages.json
+++ b/app/_locales/hi/messages.json
@@ -416,6 +416,9 @@
   "alertMessageAddressMismatchWarning": {
     "message": "हमला करने वाले कभी-कभी साइट के एड्रेस में छोटे-छोटे बदलाव करके साइटों की नकल करते हैं। जारी रखने से पहले सुनिश्चित करें कि आप इच्छित साइट के साथ इंटरैक्ट कर रहे हैं।"
   },
+  "alertMessageChangeInSimulationResults": {
+    "message": "इस ट्रांसेक्शन के लिए अनुमानित परिवर्तन अपडेट कर दिए गए हैं। आगे बढ़ने से पहले उनकी बारीकी से समीक्षा करें।"
+  },
   "alertMessageGasEstimateFailed": {
     "message": "हम सटीक शुल्क प्रदान करने में असमर्थ हैं और यह अनुमान अधिक हो सकता है। हम आपको एक कस्टम गैस लिमिट दर्ज करने का सुझाव देते हैं, लेकिन जोखिम है कि ट्रांसेक्शन अभी भी विफल हो जाएगा।"
   },
@@ -455,6 +458,9 @@
   "alertModalReviewAllAlerts": {
     "message": "सभी एलर्ट की समीक्षा करें"
   },
+  "alertReasonChangeInSimulationResults": {
+    "message": "परिणाम बदल गए हैं"
+  },
   "alertReasonGasEstimateFailed": {
     "message": "गलत शुल्क"
   },
@@ -837,18 +843,33 @@
   "bridge": {
     "message": "ब्रिज"
   },
+  "bridgeCalculatingAmount": {
+    "message": "कैलकुलेट किया जा रहा है..."
+  },
   "bridgeDontSend": {
     "message": "ब्रिज, न भेजें"
   },
+  "bridgeEnterAmount": {
+    "message": "रकम डालें"
+  },
   "bridgeFrom": {
     "message": "इससे ब्रिज करें"
   },
   "bridgeSelectNetwork": {
     "message": "नेटवर्क को चुनें"
   },
+  "bridgeSelectTokenAndAmount": {
+    "message": "टोकन और रकम का चयन करें"
+  },
+  "bridgeTimingTooltipText": {
+    "message": "ब्रिजिंग का काम पूरा होने में यह अनुमानित समय लगेगा।"
+  },
   "bridgeTo": {
     "message": "इसपर ब्रिज करें"
   },
+  "bridgeTotalFeesTooltipText": {
+    "message": "इसमें गैस शुल्क (क्रिप्टो माइनरों (miners) को भुगतान) और रीलेयर (relayer) शुल्क (ब्रिजिंग जैसी जटिल सेवाओं को मजबूत करने के लिए भुगतान) शामिल हैं।\nशुल्क नेटवर्क ट्रैफ़िक और ट्रांसेक्शन जटिलता पर आधारित हैं। MetaMask को किसी भी शुल्क से लाभ नहीं होता है।"
+  },
   "browserNotSupported": {
     "message": "आपका ब्राउज़र सपोर्टेड नहीं है..."
   },
@@ -1160,6 +1181,14 @@
     "message": "$1 से कनेक्ट किए गए",
     "description": "$1 represents account name"
   },
+  "connectedWithNetwork": {
+    "message": "$1 नेटवर्क कनेक्ट किए गए",
+    "description": "$1 represents network length"
+  },
+  "connectedWithNetworkName": {
+    "message": "$1 से कनेक्ट किए गए",
+    "description": "$1 represents network name"
+  },
   "connecting": {
     "message": "कनेक्ट किया जा रहा है"
   },
@@ -1493,6 +1522,9 @@
   "dcent": {
     "message": "D'Cent"
   },
+  "debitCreditPurchaseOptions": {
+    "message": "डेबिट या क्रेडिट कार्ड से खरीदारी के विकल्प"
+  },
   "decimal": {
     "message": "टोकन डेसीमल"
   },
@@ -1802,6 +1834,9 @@
   "editSpendingCapError": {
     "message": "खर्च करने की सीमा $1 दशमलव अंक से अधिक नहीं हो सकती। जारी रखने के लिए दशमलव अंक हटाएं।"
   },
+  "editSpendingCapSpecialCharError": {
+    "message": "केवल संख्या डालें"
+  },
   "enableAutoDetect": {
     "message": " ऑटो डिटेक्ट इनेबल करें"
   },
@@ -1904,10 +1939,42 @@
     "message": "कोड: $1",
     "description": "Displayed error name for debugging purposes. $1 is the error name"
   },
+  "errorPageContactSupport": {
+    "message": "सपोर्ट से कॉन्टेक्ट करें",
+    "description": "Button for contact MM support"
+  },
+  "errorPageDescribeUsWhatHappened": {
+    "message": "वर्णन करें कि क्या हुआ",
+    "description": "Button for submitting report to sentry"
+  },
+  "errorPageInfo": {
+    "message": "आपकी जानकारी नहीं दिखाई जा सकती। चिंता न करें, आपके वॉलेट और फंड सुरक्षित हैं।",
+    "description": "Information banner shown in the error page"
+  },
+  "errorPageMessageTitle": {
+    "message": "गड़बड़ी संबंधी संदेश",
+    "description": "Title for description, which is displayed for debugging purposes"
+  },
+  "errorPageSentryFormTitle": {
+    "message": "वर्णन करें कि क्या हुआ",
+    "description": "In sentry feedback form, The title at the top of the feedback form."
+  },
+  "errorPageSentryMessagePlaceholder": {
+    "message": "हम बग को कैसे फिर से उत्पन्न कर सकते हैं जैसे विवरण साझा करने से हमें समस्या को ठीक करने में मदद मिलेगी।",
+    "description": "In sentry feedback form, The placeholder for the feedback description input field."
+  },
+  "errorPageSentrySuccessMessageText": {
+    "message": "धन्यवाद! हम जल्द ही इस पर गौर करेंगे।",
+    "description": "In sentry feedback form, The message displayed after a successful feedback submission."
+  },
   "errorPageTitle": {
     "message": "MetaMask में कोई गड़बड़ी हुई",
     "description": "Title of generic error page"
   },
+  "errorPageTryAgain": {
+    "message": "फिर से कोशिश करें",
+    "description": "Button for try again"
+  },
   "errorStack": {
     "message": "स्टैक:",
     "description": "Title for error stack, which is displayed for debugging purposes"
@@ -1925,6 +1992,9 @@
   "estimatedFeeTooltip": {
     "message": "नेटवर्क पर ट्रांसेक्शन को प्रोसेस करने के लिए भुगतान की गई राशि।"
   },
+  "estimatedTime": {
+    "message": "अनुमानित समय"
+  },
   "ethGasPriceFetchWarning": {
     "message": "बैकअप गैस प्राइस दिया गया है क्योंकि मेन गैस एस्टीमेशन सर्विस अभी उपलब्ध नहीं है।"
   },
@@ -2070,6 +2140,9 @@
   "functionType": {
     "message": "फ़ंक्शन का प्रकार"
   },
+  "fundingMethod": {
+    "message": "फंड करने की विधि"
+  },
   "gas": {
     "message": "गैस"
   },
@@ -3724,6 +3797,12 @@
   "outdatedBrowserNotification": {
     "message": "आपका ब्राउज़़र पुराना हो चुका है। यदि आप अपने ब्राउज़़र को अपडेट नहीं करते हैं, तो आप MetaMask से सुरक्षा पैच और नई फीचर्स प्राप्त नहीं कर पाएंगे।"
   },
+  "overrideContentSecurityPolicyHeader": {
+    "message": "कंटेंट-सिक्योरिटी-पॉलिसी हेडर को ओवरराइड करें"
+  },
+  "overrideContentSecurityPolicyHeaderDescription": {
+    "message": "यह विकल्प Firefox में एक ज्ञात समस्या के लिए एक समाधान है, जहां एक dapp का कंटेंट-सिक्योरिटी-पॉलिसी हेडर एक्सटेंशन को ठीक से लोड होने से रोक सकता है। जब तक विशिष्ट वेब पेज अनुकूलता के लिए आवश्यक न हो, इस विकल्प को बंद करने की सलाह नहीं दी जाती है।"
+  },
   "padlock": {
     "message": "पैडलॉक"
   },
@@ -4395,6 +4474,9 @@
   "requestFromInfo": {
     "message": "यह वह साइट है जो आपका सिग्नेचर मांग रही है।"
   },
+  "requestFromInfoSnap": {
+    "message": "यह वह Snap है जो आपका सिग्नेचर मांग रहा है।"
+  },
   "requestFromTransactionDescription": {
     "message": "यह वही साइट है जो आपका कन्फर्मेशन मांग रही है।"
   },
@@ -4417,6 +4499,10 @@
     "message": "$1 के लिए अनुरोध कर रहे हैं",
     "description": "Name of Account"
   },
+  "requestingForNetwork": {
+    "message": "$1 के लिए अनुरोध कर रहे हैं",
+    "description": "Name of Network"
+  },
   "requestsAwaitingAcknowledgement": {
     "message": "रिक्वेस्ट्स के स्वीकार किए जाने की प्रतीक्षा की जा रही है"
   },
@@ -4895,6 +4981,9 @@
   "simulationDetailsIncomingHeading": {
     "message": "आप पाते हैं"
   },
+  "simulationDetailsNoChanges": {
+    "message": "कोई बदलाव नहीं"
+  },
   "simulationDetailsOutgoingHeading": {
     "message": "आप भेजते हैं"
   },
@@ -4917,6 +5006,9 @@
   "simulationDetailsTransactionReverted": {
     "message": "ये ट्रांसेक्शन विफल हो सकता है"
   },
+  "simulationDetailsUnavailable": {
+    "message": "अनुपलब्ध"
+  },
   "simulationErrorMessageV2": {
     "message": "हम गैस का अनुमान नहीं लगा पाए। कॉन्ट्रैक्ट में कोई गड़बड़ी हो सकती है और यह ट्रांसेक्शन विफल हो सकता है।"
   },
@@ -5143,6 +5235,15 @@
     "message": "अधिक सहायता के लिए $1 के निर्माताओं से कॉन्टेक्ट करें।",
     "description": "This is shown when the insight snap throws an error. $1 is the snap name"
   },
+  "solanaSupportSectionTitle": {
+    "message": "सोलाना"
+  },
+  "solanaSupportToggleDescription": {
+    "message": "इस फीचर को चालू करने से आपको अपने मौजूदा सीक्रेट रिकवरी फ्रेज़ से प्राप्त MetaMask एक्सटेंशन में एक सोलाना अकाउंट जोड़ने का विकल्प मिलेगा। यह एक प्रायोगिक बीटा फीचर है, इसलिए आपको इसका उपयोग अपने जोखिम पर करना होगा।"
+  },
+  "solanaSupportToggleTitle": {
+    "message": "\"एक नया सोलाना अकाउंट जोड़ें (बीटा)\" को चालू करें"
+  },
   "somethingDoesntLookRight": {
     "message": "कुछ तो गड़बड़ है? $1",
     "description": "A false positive message for users to contact support. $1 is a link to the support page."
@@ -5801,6 +5902,10 @@
   "swapTokenVerifiedOn1SourceTitle": {
     "message": "संभावित रूप से अप्रामाणिक टोकन"
   },
+  "swapTokenVerifiedSources": {
+    "message": "$1 स्रोतों द्वारा कन्फर्म की गई। $2 पर वेरीफ़ाई करें।",
+    "description": "$1 the number of sources that have verified the token, $2 points the user to a block explorer as a place they can verify information about the token."
+  },
   "swapTooManyDecimalsError": {
     "message": "$1अनुमति देता है डेसीमल $2 तक की",
     "description": "$1 is a token symbol and $2 is the max. number of decimals allowed for the token"
@@ -5918,6 +6023,12 @@
   "tips": {
     "message": "युक्तियां"
   },
+  "tipsForUsingAWallet": {
+    "message": "वॉलेट का उपयोग करने के लिए टिप्स"
+  },
+  "tipsForUsingAWalletDescription": {
+    "message": "टोकन जोड़ने से Web3 का उपयोग करने के और अधिक तरीके अनलॉक हो जाते हैं।"
+  },
   "to": {
     "message": "प्रति"
   },
@@ -5970,6 +6081,9 @@
   "tokenList": {
     "message": "टोकन की सूचियां"
   },
+  "tokenMarketplace": {
+    "message": "टोकन मार्केटप्लेस"
+  },
   "tokenScamSecurityRisk": {
     "message": "टोकन घोटाले और सुरक्षा जोखिम"
   },
@@ -6007,6 +6121,9 @@
   "total": {
     "message": "कुलयोग"
   },
+  "totalFees": {
+    "message": "कुल शुल्क"
+  },
   "totalVolume": {
     "message": "टोटल वॉल्यूम"
   },
diff --git a/app/_locales/id/messages.json b/app/_locales/id/messages.json
index a474fc1afa1a..e1fbf1398d39 100644
--- a/app/_locales/id/messages.json
+++ b/app/_locales/id/messages.json
@@ -416,6 +416,9 @@
   "alertMessageAddressMismatchWarning": {
     "message": "Penyerang terkadang meniru situs dengan membuat perubahan kecil pada alamat situs. Pastikan Anda berinteraksi dengan situs yang dituju sebelum melanjutkan."
   },
+  "alertMessageChangeInSimulationResults": {
+    "message": "Estimasi perubahan untuk transaksi ini telah diperbarui. Tinjau dengan saksama sebelum melanjutkan."
+  },
   "alertMessageGasEstimateFailed": {
     "message": "Kami tidak dapat memberikan biaya akurat dan estimasi ini mungkin tinggi. Kami menyarankan Anda untuk memasukkan batas gas kustom, tetapi ada risiko transaksi tetap gagal."
   },
@@ -455,6 +458,9 @@
   "alertModalReviewAllAlerts": {
     "message": "Tinjau semua peringatan"
   },
+  "alertReasonChangeInSimulationResults": {
+    "message": "Hasil telah berubah"
+  },
   "alertReasonGasEstimateFailed": {
     "message": "Biaya tidak akurat"
   },
@@ -837,18 +843,33 @@
   "bridge": {
     "message": "Bridge"
   },
+  "bridgeCalculatingAmount": {
+    "message": "Menghitung..."
+  },
   "bridgeDontSend": {
     "message": "Bridge, jangan kirim"
   },
+  "bridgeEnterAmount": {
+    "message": "Masukkan jumlah"
+  },
   "bridgeFrom": {
     "message": "Bridge dari"
   },
   "bridgeSelectNetwork": {
     "message": "Pilih jaringan"
   },
+  "bridgeSelectTokenAndAmount": {
+    "message": "Pilih token dan jumlah"
+  },
+  "bridgeTimingTooltipText": {
+    "message": "Ini merupakan estimasi waktu yang diperlukan untuk menyelesaikan bridge."
+  },
   "bridgeTo": {
     "message": "Bridge ke"
   },
+  "bridgeTotalFeesTooltipText": {
+    "message": "Ini termasuk biaya gas (dibayarkan kepada penambang kripto) dan biaya relayer (dibayarkan untuk menjalankan layanan kompleks seperti bridge).\nBiaya didasarkan pada lalu lintas jaringan dan kompleksitas transaksi. MetaMask tidak mendapat keuntungan dari kedua biaya tersebut."
+  },
   "browserNotSupported": {
     "message": "Browser Anda tidak didukung..."
   },
@@ -1160,6 +1181,14 @@
     "message": "Terhubung dengan $1",
     "description": "$1 represents account name"
   },
+  "connectedWithNetwork": {
+    "message": "$1 jaringan terhubung",
+    "description": "$1 represents network length"
+  },
+  "connectedWithNetworkName": {
+    "message": "Terhubung dengan $1",
+    "description": "$1 represents network name"
+  },
   "connecting": {
     "message": "Menghubungkan"
   },
@@ -1493,6 +1522,9 @@
   "dcent": {
     "message": "D'Cent"
   },
+  "debitCreditPurchaseOptions": {
+    "message": "Opsi pembelian kartu debit atau kredit"
+  },
   "decimal": {
     "message": "Desimal token"
   },
@@ -1802,6 +1834,9 @@
   "editSpendingCapError": {
     "message": "Batas penggunaan tidak boleh melebihi $1 digit desimal. Hapus digit desimal untuk melanjutkan."
   },
+  "editSpendingCapSpecialCharError": {
+    "message": "Masukkan angka saja"
+  },
   "enableAutoDetect": {
     "message": " Aktifkan deteksi otomatis"
   },
@@ -1904,10 +1939,42 @@
     "message": "Kode: $1",
     "description": "Displayed error name for debugging purposes. $1 is the error name"
   },
+  "errorPageContactSupport": {
+    "message": "Hubungi dukungan",
+    "description": "Button for contact MM support"
+  },
+  "errorPageDescribeUsWhatHappened": {
+    "message": "Jelaskan yang terjadi",
+    "description": "Button for submitting report to sentry"
+  },
+  "errorPageInfo": {
+    "message": "Informasi Anda tidak dapat ditampilkan. Jangan khawatir, dompet dan dana Anda aman.",
+    "description": "Information banner shown in the error page"
+  },
+  "errorPageMessageTitle": {
+    "message": "Pesan kesalahan",
+    "description": "Title for description, which is displayed for debugging purposes"
+  },
+  "errorPageSentryFormTitle": {
+    "message": "Jelaskan yang terjadi",
+    "description": "In sentry feedback form, The title at the top of the feedback form."
+  },
+  "errorPageSentryMessagePlaceholder": {
+    "message": "Berbagi detail seperti cara kami dapat mereproduksi bug akan membantu kami memperbaiki masalah tersebut.",
+    "description": "In sentry feedback form, The placeholder for the feedback description input field."
+  },
+  "errorPageSentrySuccessMessageText": {
+    "message": "Terima kasih! Kami akan segera memeriksanya.",
+    "description": "In sentry feedback form, The message displayed after a successful feedback submission."
+  },
   "errorPageTitle": {
     "message": "MetaMask mengalami kesalahan",
     "description": "Title of generic error page"
   },
+  "errorPageTryAgain": {
+    "message": "Coba lagi",
+    "description": "Button for try again"
+  },
   "errorStack": {
     "message": "Tumpukan:",
     "description": "Title for error stack, which is displayed for debugging purposes"
@@ -1925,6 +1992,9 @@
   "estimatedFeeTooltip": {
     "message": "Jumlah yang dibayarkan untuk memproses transaksi di jaringan."
   },
+  "estimatedTime": {
+    "message": "Estimasi waktu"
+  },
   "ethGasPriceFetchWarning": {
     "message": "Biaya gas cadangan diberikan karena layanan estimasi gas utama saat ini tidak tersedia."
   },
@@ -2070,6 +2140,9 @@
   "functionType": {
     "message": "Jenis fungsi"
   },
+  "fundingMethod": {
+    "message": "Metode pendanaan"
+  },
   "gas": {
     "message": "Gas"
   },
@@ -3724,6 +3797,12 @@
   "outdatedBrowserNotification": {
     "message": "Browser Anda sudah usang. Jika browser tidak diperbarui, Anda tidak akan bisa mendapatkan tambalan keamanan dan fitur baru dari MetaMask."
   },
+  "overrideContentSecurityPolicyHeader": {
+    "message": "Batalkan header Content-Security-Policy"
+  },
+  "overrideContentSecurityPolicyHeaderDescription": {
+    "message": "Opsi ini merupakan solusi sementara untuk masalah yang diketahui di Firefox, di mana header Content-Security-Policy dapp dapat mencegah ekstensi dimuat dengan benar. Menonaktifkan opsi ini tidak disarankan kecuali diperlukan untuk kompatibilitas halaman web tertentu."
+  },
   "padlock": {
     "message": "Gembok"
   },
@@ -4395,6 +4474,9 @@
   "requestFromInfo": {
     "message": "Ini merupakan situs yang meminta tanda tangan Anda."
   },
+  "requestFromInfoSnap": {
+    "message": "Ini merupakan Snap yang meminta tanda tangan Anda."
+  },
   "requestFromTransactionDescription": {
     "message": "Ini merupakan situs yang meminta konfirmasi Anda."
   },
@@ -4417,6 +4499,10 @@
     "message": "Meminta untuk $1",
     "description": "Name of Account"
   },
+  "requestingForNetwork": {
+    "message": "Meminta untuk $1",
+    "description": "Name of Network"
+  },
   "requestsAwaitingAcknowledgement": {
     "message": "permintaan menunggu untuk disetujui"
   },
@@ -4895,6 +4981,9 @@
   "simulationDetailsIncomingHeading": {
     "message": "Anda menerima"
   },
+  "simulationDetailsNoChanges": {
+    "message": "Tidak ada perubahan"
+  },
   "simulationDetailsOutgoingHeading": {
     "message": "Anda mengirim"
   },
@@ -4917,6 +5006,9 @@
   "simulationDetailsTransactionReverted": {
     "message": "Transaksi ini kemungkinan besar akan gagal"
   },
+  "simulationDetailsUnavailable": {
+    "message": "Tidak tersedia"
+  },
   "simulationErrorMessageV2": {
     "message": "Kami tidak dapat memperkirakan gas. Tampaknya ada kesalahan dalam kontrak dan transaksi ini berpotensi gagal."
   },
@@ -5143,6 +5235,15 @@
     "message": "Hubungi pembuat $1 untuk dukungan lebih lanjut.",
     "description": "This is shown when the insight snap throws an error. $1 is the snap name"
   },
+  "solanaSupportSectionTitle": {
+    "message": "Solana"
+  },
+  "solanaSupportToggleDescription": {
+    "message": "Mengaktifkan fitur ini akan memberi Anda opsi untuk menambahkan Akun Solana ke Ekstensi MetaMask yang berasal dari Frasa Pemulihan Rahasia yang sudah ada. Ini merupakan fitur Beta eksperimental, jadi Anda harus menggunakannya dengan risiko yang ditanggung sendiri."
+  },
+  "solanaSupportToggleTitle": {
+    "message": "Aktifkan \"Tambahkan akun Solana baru (Beta)\""
+  },
   "somethingDoesntLookRight": {
     "message": "Ada yang tidak beres? $1",
     "description": "A false positive message for users to contact support. $1 is a link to the support page."
@@ -5801,6 +5902,10 @@
   "swapTokenVerifiedOn1SourceTitle": {
     "message": "Token berpotensi tidak autentik"
   },
+  "swapTokenVerifiedSources": {
+    "message": "Dikonfirmasi oleh $1 sumber. Verifikasikan pada $2.",
+    "description": "$1 the number of sources that have verified the token, $2 points the user to a block explorer as a place they can verify information about the token."
+  },
   "swapTooManyDecimalsError": {
     "message": "$1 memungkinkan hingga $2 desimal",
     "description": "$1 is a token symbol and $2 is the max. number of decimals allowed for the token"
@@ -5918,6 +6023,12 @@
   "tips": {
     "message": "Kiat"
   },
+  "tipsForUsingAWallet": {
+    "message": "Tip menggunakan dompet"
+  },
+  "tipsForUsingAWalletDescription": {
+    "message": "Menambahkan token membuka lebih banyak cara untuk menggunakan web3."
+  },
   "to": {
     "message": "Untuk"
   },
@@ -5970,6 +6081,9 @@
   "tokenList": {
     "message": "Daftar token"
   },
+  "tokenMarketplace": {
+    "message": "Pasar token"
+  },
   "tokenScamSecurityRisk": {
     "message": "penipuan dan risiko keamanan token"
   },
@@ -6007,6 +6121,9 @@
   "total": {
     "message": "Total"
   },
+  "totalFees": {
+    "message": "Total biaya"
+  },
   "totalVolume": {
     "message": "Volume total"
   },
diff --git a/app/_locales/ja/messages.json b/app/_locales/ja/messages.json
index 80982f5b4144..7d247adcc07a 100644
--- a/app/_locales/ja/messages.json
+++ b/app/_locales/ja/messages.json
@@ -416,6 +416,9 @@
   "alertMessageAddressMismatchWarning": {
     "message": "攻撃者は、サイトのアドレスに若干の変更を加えてサイトを模倣することがあります。続行する前に、意図したサイトとやり取りしていることを確認してください。"
   },
+  "alertMessageChangeInSimulationResults": {
+    "message": "このトランザクションの推定増減額が更新されました。先に進む前によく確認してください。"
+  },
   "alertMessageGasEstimateFailed": {
     "message": "正確な手数料を提供できず、この見積もりは高い可能性があります。カスタムガスリミットの入力をお勧めしますが、それでもトランザクションが失敗するリスクがあります。"
   },
@@ -455,6 +458,9 @@
   "alertModalReviewAllAlerts": {
     "message": "すべてのアラートを確認する"
   },
+  "alertReasonChangeInSimulationResults": {
+    "message": "結果が変更されました"
+  },
   "alertReasonGasEstimateFailed": {
     "message": "不正確な手数料"
   },
@@ -837,18 +843,33 @@
   "bridge": {
     "message": "ブリッジ"
   },
+  "bridgeCalculatingAmount": {
+    "message": "計算中..."
+  },
   "bridgeDontSend": {
     "message": "ブリッジを使用してください"
   },
+  "bridgeEnterAmount": {
+    "message": "金額を入力"
+  },
   "bridgeFrom": {
     "message": "ブリッジ元:"
   },
   "bridgeSelectNetwork": {
     "message": "ネットワークを選択"
   },
+  "bridgeSelectTokenAndAmount": {
+    "message": "トークンと金額を選択"
+  },
+  "bridgeTimingTooltipText": {
+    "message": "これは、ブリッジが完了するまでの推定時間です。"
+  },
   "bridgeTo": {
     "message": "ブリッジ先:"
   },
+  "bridgeTotalFeesTooltipText": {
+    "message": "これには、(仮想通貨マイナーに支払われる) ガス代と (ブリッジなどの複雑なサービスを供給するために支払われる) リレイヤー手数料が含まれます。\n手数料はネットワークトラフィックとトランザクションの複雑性に基づいています。MetaMaskはどちらの手数料からも利益を得ることはありません。"
+  },
   "browserNotSupported": {
     "message": "ご使用のブラウザはサポートされていません..."
   },
@@ -1160,6 +1181,14 @@
     "message": "$1と接続されました",
     "description": "$1 represents account name"
   },
+  "connectedWithNetwork": {
+    "message": "$1個のネットワークを接続済み",
+    "description": "$1 represents network length"
+  },
+  "connectedWithNetworkName": {
+    "message": "$1と接続済み",
+    "description": "$1 represents network name"
+  },
   "connecting": {
     "message": "接続中..."
   },
@@ -1493,6 +1522,9 @@
   "dcent": {
     "message": "D'Cent"
   },
+  "debitCreditPurchaseOptions": {
+    "message": "デビットカードまたはクレジットカードの購入オプション"
+  },
   "decimal": {
     "message": "トークンの小数桁数"
   },
@@ -1802,6 +1834,9 @@
   "editSpendingCapError": {
     "message": "使用限度は小数点以下$1桁を超えることができません。続けるには、小数点以下の桁を削除してください。"
   },
+  "editSpendingCapSpecialCharError": {
+    "message": "数字のみで入力してください"
+  },
   "enableAutoDetect": {
     "message": " 自動検出を有効にする"
   },
@@ -1904,10 +1939,42 @@
     "message": "コード: $1",
     "description": "Displayed error name for debugging purposes. $1 is the error name"
   },
+  "errorPageContactSupport": {
+    "message": "サポートへのお問い合わせ",
+    "description": "Button for contact MM support"
+  },
+  "errorPageDescribeUsWhatHappened": {
+    "message": "発生した問題についてご説明ください",
+    "description": "Button for submitting report to sentry"
+  },
+  "errorPageInfo": {
+    "message": "情報は表示できませんが、ご心配なく。ウォレットと資金は安全です。",
+    "description": "Information banner shown in the error page"
+  },
+  "errorPageMessageTitle": {
+    "message": "エラーメッセージ",
+    "description": "Title for description, which is displayed for debugging purposes"
+  },
+  "errorPageSentryFormTitle": {
+    "message": "発生した問題についてご説明ください",
+    "description": "In sentry feedback form, The title at the top of the feedback form."
+  },
+  "errorPageSentryMessagePlaceholder": {
+    "message": "バグを再現する方法などの詳細をお知らせいただくと、問題の解決に役立ちます。",
+    "description": "In sentry feedback form, The placeholder for the feedback description input field."
+  },
+  "errorPageSentrySuccessMessageText": {
+    "message": "ありがとうございます。すぐに確認いたします。",
+    "description": "In sentry feedback form, The message displayed after a successful feedback submission."
+  },
   "errorPageTitle": {
     "message": "MetaMaskにエラーが発生しました",
     "description": "Title of generic error page"
   },
+  "errorPageTryAgain": {
+    "message": "再試行",
+    "description": "Button for try again"
+  },
   "errorStack": {
     "message": "スタック:",
     "description": "Title for error stack, which is displayed for debugging purposes"
@@ -1925,6 +1992,9 @@
   "estimatedFeeTooltip": {
     "message": "ネットワーク上のトランザクションの処理に支払われる金額"
   },
+  "estimatedTime": {
+    "message": "推定所要時間"
+  },
   "ethGasPriceFetchWarning": {
     "message": "現在メインのガスの見積もりサービスが利用できないため、バックアップのガス価格が提供されています。"
   },
@@ -2070,6 +2140,9 @@
   "functionType": {
     "message": "機能の種類"
   },
+  "fundingMethod": {
+    "message": "入金方法"
+  },
   "gas": {
     "message": "ガス"
   },
@@ -3724,6 +3797,12 @@
   "outdatedBrowserNotification": {
     "message": "古いブラウザを使用しています。ブラウザをアップデートしないと、MetaMaskからセキュリティパッチや新機能を入手できなくなります。"
   },
+  "overrideContentSecurityPolicyHeader": {
+    "message": "Content-Security-Policyヘッダーを上書き"
+  },
+  "overrideContentSecurityPolicyHeaderDescription": {
+    "message": "このオプションは、DAppのContent-Security-Policyヘッダーによって拡張機能が正しく読み込まれない場合があるという、Firefoxの既知の問題に対する回避策です。特定のWebページの互換性に必要な場合を除き、このオプションを無効にすることはお勧めしません。"
+  },
   "padlock": {
     "message": "南京錠"
   },
@@ -4395,6 +4474,9 @@
   "requestFromInfo": {
     "message": "これは署名を求めているサイトです。"
   },
+  "requestFromInfoSnap": {
+    "message": "これは署名を求めているSnapです。"
+  },
   "requestFromTransactionDescription": {
     "message": "これが承認を要求しているサイトです。"
   },
@@ -4417,6 +4499,10 @@
     "message": "$1の要求",
     "description": "Name of Account"
   },
+  "requestingForNetwork": {
+    "message": "$1の要求",
+    "description": "Name of Network"
+  },
   "requestsAwaitingAcknowledgement": {
     "message": "リクエストの承認待ち"
   },
@@ -4895,6 +4981,9 @@
   "simulationDetailsIncomingHeading": {
     "message": "受取額"
   },
+  "simulationDetailsNoChanges": {
+    "message": "変更なし"
+  },
   "simulationDetailsOutgoingHeading": {
     "message": "送金額"
   },
@@ -4917,6 +5006,9 @@
   "simulationDetailsTransactionReverted": {
     "message": "このトランザクションはおそらく失敗します"
   },
+  "simulationDetailsUnavailable": {
+    "message": "利用不可"
+  },
   "simulationErrorMessageV2": {
     "message": "ガス代を見積もることができませんでした。コントラクトにエラーがある可能性があり、このトランザクションは失敗するかもしれません。"
   },
@@ -5143,6 +5235,15 @@
     "message": "今後のサポートは、$1の作成者にお問い合わせください。",
     "description": "This is shown when the insight snap throws an error. $1 is the snap name"
   },
+  "solanaSupportSectionTitle": {
+    "message": "Solana"
+  },
+  "solanaSupportToggleDescription": {
+    "message": "この機能をオンにすると、既存のシークレットリカバリーフレーズで導出したSolanaアカウントをMetaMask Extensionに追加できるようになります。これは試験運用中のベータ機能であるため、自己責任でご使用ください。"
+  },
+  "solanaSupportToggleTitle": {
+    "message": "「新規Solanaアカウントの追加 (ベータ)」を有効にする"
+  },
   "somethingDoesntLookRight": {
     "message": "何か不審な点があれば、$1",
     "description": "A false positive message for users to contact support. $1 is a link to the support page."
@@ -5801,6 +5902,10 @@
   "swapTokenVerifiedOn1SourceTitle": {
     "message": "偽物のトークンの可能性"
   },
+  "swapTokenVerifiedSources": {
+    "message": "$1個のソースで確定済み。$2で確認。",
+    "description": "$1 the number of sources that have verified the token, $2 points the user to a block explorer as a place they can verify information about the token."
+  },
   "swapTooManyDecimalsError": {
     "message": "$1は小数点以下$2桁まで使用できます",
     "description": "$1 is a token symbol and $2 is the max. number of decimals allowed for the token"
@@ -5918,6 +6023,12 @@
   "tips": {
     "message": "ヒント"
   },
+  "tipsForUsingAWallet": {
+    "message": "ウォレット使用のヒント"
+  },
+  "tipsForUsingAWalletDescription": {
+    "message": "トークンを追加すると、Web3の使用方法が増えます。"
+  },
   "to": {
     "message": "移動先"
   },
@@ -5970,6 +6081,9 @@
   "tokenList": {
     "message": "トークンリスト:"
   },
+  "tokenMarketplace": {
+    "message": "トークンマーケットプレイス"
+  },
   "tokenScamSecurityRisk": {
     "message": "トークン関連の詐欺やセキュリティのリスク"
   },
@@ -6007,6 +6121,9 @@
   "total": {
     "message": "合計"
   },
+  "totalFees": {
+    "message": "合計手数料"
+  },
   "totalVolume": {
     "message": "合計量"
   },
diff --git a/app/_locales/ko/messages.json b/app/_locales/ko/messages.json
index 5fc7deb6a9ef..1d6c0b9199d8 100644
--- a/app/_locales/ko/messages.json
+++ b/app/_locales/ko/messages.json
@@ -416,6 +416,9 @@
   "alertMessageAddressMismatchWarning": {
     "message": "공격자는 사이트 주소를 약간 변경하여 유사 사이트를 만들기도 합니다. 계속하기 전에 정상적인 사이트와 상호 작용하고 있는지 확인하세요."
   },
+  "alertMessageChangeInSimulationResults": {
+    "message": "이 트랜잭션의 예상 변경 사항이 업데이트되었습니다. 계속하기 전에 자세히 검토하세요."
+  },
   "alertMessageGasEstimateFailed": {
     "message": "정확한 수수료를 제공할 수 없으며 예상 수수료가 높을 수 있습니다. 사용자 지정 가스 한도를 입력하는 것이 좋지만 트랜잭션이 여전히 실패할 위험이 있습니다."
   },
@@ -455,6 +458,9 @@
   "alertModalReviewAllAlerts": {
     "message": "모든 경고 검토하기"
   },
+  "alertReasonChangeInSimulationResults": {
+    "message": "결과가 변경되었습니다"
+  },
   "alertReasonGasEstimateFailed": {
     "message": "잘못된 수수료"
   },
@@ -837,18 +843,33 @@
   "bridge": {
     "message": "브리지"
   },
+  "bridgeCalculatingAmount": {
+    "message": "계산 중..."
+  },
   "bridgeDontSend": {
     "message": "전송하지 마세요, 브릿지 하세요"
   },
+  "bridgeEnterAmount": {
+    "message": "금액 입력"
+  },
   "bridgeFrom": {
     "message": "브릿지 출처"
   },
   "bridgeSelectNetwork": {
     "message": "네트워크 선택"
   },
+  "bridgeSelectTokenAndAmount": {
+    "message": "토큰 및 금액 선택"
+  },
+  "bridgeTimingTooltipText": {
+    "message": "브릿지가 완료되는 데 걸리는 예상 시간입니다."
+  },
   "bridgeTo": {
     "message": "브릿지 대상"
   },
+  "bridgeTotalFeesTooltipText": {
+    "message": "가스비(암호화폐 채굴자에게 지급)와 릴레이어 수수료(브릿지와 같은 복잡한 서비스 제공에 지급)가 포함됩니다.\n수수료는 네트워크 트래픽과 트랜잭션 복잡성에 따라 달라집니다. MetaMask는 어떤 수수료에서도 수익을 얻지 않습니다."
+  },
   "browserNotSupported": {
     "message": "지원되지 않는 브라우저입니다..."
   },
@@ -1160,6 +1181,14 @@
     "message": "$1 계정과 연결됨",
     "description": "$1 represents account name"
   },
+  "connectedWithNetwork": {
+    "message": "$1 네트워크 연결됨",
+    "description": "$1 represents network length"
+  },
+  "connectedWithNetworkName": {
+    "message": "$1(으)로 연결됨",
+    "description": "$1 represents network name"
+  },
   "connecting": {
     "message": "연결 중"
   },
@@ -1493,6 +1522,9 @@
   "dcent": {
     "message": "D'Cent"
   },
+  "debitCreditPurchaseOptions": {
+    "message": "직불카드 또는 신용카드 매수 옵션"
+  },
   "decimal": {
     "message": "토큰 소수점"
   },
@@ -1802,6 +1834,9 @@
   "editSpendingCapError": {
     "message": "지출 한도는 소수점 이하 $1 자리를 초과할 수 없습니다. 계속하려면 소수점 이하 숫자를 제거하세요."
   },
+  "editSpendingCapSpecialCharError": {
+    "message": "숫자만 입력"
+  },
   "enableAutoDetect": {
     "message": " 자동 감지 활성화"
   },
@@ -1904,10 +1939,42 @@
     "message": "코드: $1",
     "description": "Displayed error name for debugging purposes. $1 is the error name"
   },
+  "errorPageContactSupport": {
+    "message": "고객 지원 문의",
+    "description": "Button for contact MM support"
+  },
+  "errorPageDescribeUsWhatHappened": {
+    "message": "오류에 대해 설명해 주세요",
+    "description": "Button for submitting report to sentry"
+  },
+  "errorPageInfo": {
+    "message": "귀하의 정보를 표시할 수 없습니다. 걱정하지 마세요, 지갑과 자금은 안전합니다.",
+    "description": "Information banner shown in the error page"
+  },
+  "errorPageMessageTitle": {
+    "message": "오류 메시지",
+    "description": "Title for description, which is displayed for debugging purposes"
+  },
+  "errorPageSentryFormTitle": {
+    "message": "오류에 대해 설명해 주세요",
+    "description": "In sentry feedback form, The title at the top of the feedback form."
+  },
+  "errorPageSentryMessagePlaceholder": {
+    "message": "버그를 재현할 수 있는 방법 등 자세한 정보를 알려주시면 문제를 해결하는 데 도움이 됩니다.",
+    "description": "In sentry feedback form, The placeholder for the feedback description input field."
+  },
+  "errorPageSentrySuccessMessageText": {
+    "message": "감사합니다! 곧 확인하겠습니다.",
+    "description": "In sentry feedback form, The message displayed after a successful feedback submission."
+  },
   "errorPageTitle": {
     "message": "MetaMask 오류 발생",
     "description": "Title of generic error page"
   },
+  "errorPageTryAgain": {
+    "message": "다시 시도",
+    "description": "Button for try again"
+  },
   "errorStack": {
     "message": "스택:",
     "description": "Title for error stack, which is displayed for debugging purposes"
@@ -1925,6 +1992,9 @@
   "estimatedFeeTooltip": {
     "message": "네트워크에서 트랜잭션을 처리하기 위해 지불한 금액입니다."
   },
+  "estimatedTime": {
+    "message": "예상 시간"
+  },
   "ethGasPriceFetchWarning": {
     "message": "현재 주요 가스 견적 서비스를 사용할 수 없으므로 백업 가스 가격을 제공합니다."
   },
@@ -2070,6 +2140,9 @@
   "functionType": {
     "message": "기능 유형"
   },
+  "fundingMethod": {
+    "message": "자금 조달 방법"
+  },
   "gas": {
     "message": "가스"
   },
@@ -3724,6 +3797,12 @@
   "outdatedBrowserNotification": {
     "message": "현재 사용 중인 브라우저가 최신 버전이 아닙니다. 브라우저를 업데이트하지 않으면 보안 패치와 MetaMask의 새 기능을 이용할 수 없습니다."
   },
+  "overrideContentSecurityPolicyHeader": {
+    "message": "Content-Security-Policy 헤더 무시"
+  },
+  "overrideContentSecurityPolicyHeaderDescription": {
+    "message": "이 옵션은 디앱의 Content-Security-Policy 헤더로 인해 확장 프로그램이 제대로 로드되지 않는 Firefox의 알려진 문제를 해결하기 위한 것입니다. 특정 웹 페이지와의 호환성을 위해 필요한 경우가 아니라면 이 옵션을 비활성화하지 않는 것이 좋습니다."
+  },
   "padlock": {
     "message": "패드락"
   },
@@ -4395,6 +4474,9 @@
   "requestFromInfo": {
     "message": "서명이 필요한 사이트입니다."
   },
+  "requestFromInfoSnap": {
+    "message": "이는 서명을 요청하는 Snap입니다."
+  },
   "requestFromTransactionDescription": {
     "message": "컨펌이 필요한 사이트입니다."
   },
@@ -4417,6 +4499,10 @@
     "message": "$1 요청 중",
     "description": "Name of Account"
   },
+  "requestingForNetwork": {
+    "message": "$1 요청 중",
+    "description": "Name of Network"
+  },
   "requestsAwaitingAcknowledgement": {
     "message": "확인 대기 중인 요청"
   },
@@ -4895,6 +4981,9 @@
   "simulationDetailsIncomingHeading": {
     "message": "받음:"
   },
+  "simulationDetailsNoChanges": {
+    "message": "변경 사항 없음"
+  },
   "simulationDetailsOutgoingHeading": {
     "message": "보냄:"
   },
@@ -4917,6 +5006,9 @@
   "simulationDetailsTransactionReverted": {
     "message": "이 트랜잭션은 실패할 가능성이 높습니다"
   },
+  "simulationDetailsUnavailable": {
+    "message": "사용할 수 없음"
+  },
   "simulationErrorMessageV2": {
     "message": "가스를 추정할 수 없었습니다. 계약에 오류가 있을 수 있으며 이 트랜잭션이 실패할 수 있습니다."
   },
@@ -5143,6 +5235,15 @@
     "message": "$1 작성자에게 연락하여 향후 지원을 요청하세요.",
     "description": "This is shown when the insight snap throws an error. $1 is the snap name"
   },
+  "solanaSupportSectionTitle": {
+    "message": "솔라나"
+  },
+  "solanaSupportToggleDescription": {
+    "message": "이 기능을 켜면 기존 비밀복구구문에서 파생된 솔라나 계정을 MetaMask 확장 프로그램에 추가하는 옵션이 제공됩니다. 이는 실험적 베타 기능이므로 사용자의 책임하에 사용해야 합니다."
+  },
+  "solanaSupportToggleTitle": {
+    "message": "'새 솔라나 계정 추가(베타)' 활성화"
+  },
   "somethingDoesntLookRight": {
     "message": "무언가 잘못되었나요? $1",
     "description": "A false positive message for users to contact support. $1 is a link to the support page."
@@ -5801,6 +5902,10 @@
   "swapTokenVerifiedOn1SourceTitle": {
     "message": "잠재적 모조 토큰"
   },
+  "swapTokenVerifiedSources": {
+    "message": "$1 소스에서 컨펌함. $2에서 확인하세요.",
+    "description": "$1 the number of sources that have verified the token, $2 points the user to a block explorer as a place they can verify information about the token."
+  },
   "swapTooManyDecimalsError": {
     "message": "$1은(는) 소수점 이하 $2까지 허용됩니다.",
     "description": "$1 is a token symbol and $2 is the max. number of decimals allowed for the token"
@@ -5918,6 +6023,12 @@
   "tips": {
     "message": "팁"
   },
+  "tipsForUsingAWallet": {
+    "message": "지갑 사용 팁"
+  },
+  "tipsForUsingAWalletDescription": {
+    "message": "토큰을 추가하면 웹3를 더 다양한 방법으로 사용할 수 있습니다."
+  },
   "to": {
     "message": "수신"
   },
@@ -5970,6 +6081,9 @@
   "tokenList": {
     "message": "토큰 목록:"
   },
+  "tokenMarketplace": {
+    "message": "토큰 마켓플레이스"
+  },
   "tokenScamSecurityRisk": {
     "message": "토큰 사기 및 보안 위험"
   },
@@ -6007,6 +6121,9 @@
   "total": {
     "message": "합계"
   },
+  "totalFees": {
+    "message": "총 수수료"
+  },
   "totalVolume": {
     "message": "총 거래량"
   },
diff --git a/app/_locales/pt/messages.json b/app/_locales/pt/messages.json
index 18e1c97fb129..c7afcceb33e8 100644
--- a/app/_locales/pt/messages.json
+++ b/app/_locales/pt/messages.json
@@ -416,6 +416,9 @@
   "alertMessageAddressMismatchWarning": {
     "message": "Golpistas às vezes imitam os sites fazendo pequenas alterações em seus endereços. Certifique-se de estar interagindo com o site correto antes de continuar."
   },
+  "alertMessageChangeInSimulationResults": {
+    "message": "As mudanças estimadas para esta transação foram atualizadas. Revise-as com atenção antes de prosseguir."
+  },
   "alertMessageGasEstimateFailed": {
     "message": "Não conseguimos fornecer uma taxa precisa, e essa estimativa pode estar alta. Sugerimos que você informe um limite de gás personalizado, mas há o risco de a transação falhar mesmo assim."
   },
@@ -455,6 +458,9 @@
   "alertModalReviewAllAlerts": {
     "message": "Conferir todos os alertas"
   },
+  "alertReasonChangeInSimulationResults": {
+    "message": "Os resultados mudaram"
+  },
   "alertReasonGasEstimateFailed": {
     "message": "Taxa imprecisa"
   },
@@ -837,18 +843,33 @@
   "bridge": {
     "message": "Ponte"
   },
+  "bridgeCalculatingAmount": {
+    "message": "Calculando..."
+  },
   "bridgeDontSend": {
     "message": "Usar uma ponte, não enviar"
   },
+  "bridgeEnterAmount": {
+    "message": "Insira o valor"
+  },
   "bridgeFrom": {
     "message": "Ponte de"
   },
   "bridgeSelectNetwork": {
     "message": "Selecionar rede"
   },
+  "bridgeSelectTokenAndAmount": {
+    "message": "Selecionar token e valor"
+  },
+  "bridgeTimingTooltipText": {
+    "message": "Este é o tempo estimado para a conclusão da ponte."
+  },
   "bridgeTo": {
     "message": "Ponte para"
   },
+  "bridgeTotalFeesTooltipText": {
+    "message": "Isso inclui as taxas de gás (pagas aos mineradores de criptmoedas) e taxas de retransmissão (pagas para promover serviços complexos como pontes).\nAs taxas são baseadas no tráfego da rede e na complexidade da transação. A MetaMask não lucra com nenhuma dessas taxas."
+  },
   "browserNotSupported": {
     "message": "Seu navegador não é compatível..."
   },
@@ -1160,6 +1181,14 @@
     "message": "Conectado com $1",
     "description": "$1 represents account name"
   },
+  "connectedWithNetwork": {
+    "message": "$1 redes conectadas",
+    "description": "$1 represents network length"
+  },
+  "connectedWithNetworkName": {
+    "message": "Conectado com $1",
+    "description": "$1 represents network name"
+  },
   "connecting": {
     "message": "Conectando"
   },
@@ -1493,6 +1522,9 @@
   "dcent": {
     "message": "D'Cent"
   },
+  "debitCreditPurchaseOptions": {
+    "message": "Opções de compra com cartão de débito ou crédito"
+  },
   "decimal": {
     "message": "Decimal do token"
   },
@@ -1802,6 +1834,9 @@
   "editSpendingCapError": {
     "message": "O limite de gastos não pode exceder $1 dígitos decimais. Remova os dígitos decimais para continuar."
   },
+  "editSpendingCapSpecialCharError": {
+    "message": "Insira somente números"
+  },
   "enableAutoDetect": {
     "message": " Ativar detecção automática"
   },
@@ -1904,10 +1939,42 @@
     "message": "Código: $1",
     "description": "Displayed error name for debugging purposes. $1 is the error name"
   },
+  "errorPageContactSupport": {
+    "message": "Falar com o suporte",
+    "description": "Button for contact MM support"
+  },
+  "errorPageDescribeUsWhatHappened": {
+    "message": "Descreva o que aconteceu",
+    "description": "Button for submitting report to sentry"
+  },
+  "errorPageInfo": {
+    "message": "Suas informações não podem ser exibidas. Não se preocupe, sua carteira e fundos estão seguros.",
+    "description": "Information banner shown in the error page"
+  },
+  "errorPageMessageTitle": {
+    "message": "Mensagem de erro",
+    "description": "Title for description, which is displayed for debugging purposes"
+  },
+  "errorPageSentryFormTitle": {
+    "message": "Descreva o que aconteceu",
+    "description": "In sentry feedback form, The title at the top of the feedback form."
+  },
+  "errorPageSentryMessagePlaceholder": {
+    "message": "Compartilhar detalhes como a forma de reproduzir o erro nos ajudará a corrigir o problema.",
+    "description": "In sentry feedback form, The placeholder for the feedback description input field."
+  },
+  "errorPageSentrySuccessMessageText": {
+    "message": "Obrigado! Verificaremos em breve.",
+    "description": "In sentry feedback form, The message displayed after a successful feedback submission."
+  },
   "errorPageTitle": {
     "message": "A MetaMask encontrou um erro",
     "description": "Title of generic error page"
   },
+  "errorPageTryAgain": {
+    "message": "Tentar novamente",
+    "description": "Button for try again"
+  },
   "errorStack": {
     "message": "Lista:",
     "description": "Title for error stack, which is displayed for debugging purposes"
@@ -1925,6 +1992,9 @@
   "estimatedFeeTooltip": {
     "message": "Valor pago para processar a transação na rede."
   },
+  "estimatedTime": {
+    "message": "Tempo estimado"
+  },
   "ethGasPriceFetchWarning": {
     "message": "O preço de backup do gás é fornecido porque a estimativa de gás principal está indisponível no momento."
   },
@@ -2070,6 +2140,9 @@
   "functionType": {
     "message": "Tipo de função"
   },
+  "fundingMethod": {
+    "message": "Forma de financiamento"
+  },
   "gas": {
     "message": "Gás"
   },
@@ -3724,6 +3797,12 @@
   "outdatedBrowserNotification": {
     "message": "Seu navegador está desatualizado. Se não o atualizar, você não conseguirá baixar patches de segurança e obter novos recursos da MetaMask."
   },
+  "overrideContentSecurityPolicyHeader": {
+    "message": "Substituir o cabeçalho Content-Security-Policy"
+  },
+  "overrideContentSecurityPolicyHeaderDescription": {
+    "message": "Esta opção é uma solução alternativa a um problema conhecido no Firefox, onde o cabeçalho Content-Security-Policy de um dapp (aplicativo descentralizado) pode impedir que a extensão seja carregada corretamente. Não é recomendável desativar esta opção, a menos que necessário para compatibilidade com páginas web específicas."
+  },
   "padlock": {
     "message": "Cadeado"
   },
@@ -4395,6 +4474,9 @@
   "requestFromInfo": {
     "message": "Este é o site solicitando sua assinatura."
   },
+  "requestFromInfoSnap": {
+    "message": "Este é o Snap solicitando sua assinatura."
+  },
   "requestFromTransactionDescription": {
     "message": "Este é o site solicitando sua confirmação."
   },
@@ -4417,6 +4499,10 @@
     "message": "Solicitando para $1",
     "description": "Name of Account"
   },
+  "requestingForNetwork": {
+    "message": "Solicitando para $1",
+    "description": "Name of Network"
+  },
   "requestsAwaitingAcknowledgement": {
     "message": "solicitações aguardando confirmação"
   },
@@ -4895,6 +4981,9 @@
   "simulationDetailsIncomingHeading": {
     "message": "Você recebe"
   },
+  "simulationDetailsNoChanges": {
+    "message": "Nenhuma alteração"
+  },
   "simulationDetailsOutgoingHeading": {
     "message": "Você envia"
   },
@@ -4917,6 +5006,9 @@
   "simulationDetailsTransactionReverted": {
     "message": "Essa transação provavelmente falhará"
   },
+  "simulationDetailsUnavailable": {
+    "message": "Indisponível"
+  },
   "simulationErrorMessageV2": {
     "message": "Não conseguimos estimar o preço do gás. Pode haver um erro no contrato, e essa transação poderá falhar."
   },
@@ -5143,6 +5235,15 @@
     "message": "Contate os criadores de $1 para receber mais suporte.",
     "description": "This is shown when the insight snap throws an error. $1 is the snap name"
   },
+  "solanaSupportSectionTitle": {
+    "message": "Solana"
+  },
+  "solanaSupportToggleDescription": {
+    "message": "Ativar este recurso lhe dará a opção de adicionar uma conta Solana à sua extensão da MetaMask derivada de sua Frase de Recuperação Secreta existente. Este é um recurso beta experimental, portanto seu uso será por sua conta e risco."
+  },
+  "solanaSupportToggleTitle": {
+    "message": "Ative \"Adicionar uma nova conta Solana (Beta)\""
+  },
   "somethingDoesntLookRight": {
     "message": "Alguma coisa não parece certa? $1",
     "description": "A false positive message for users to contact support. $1 is a link to the support page."
@@ -5801,6 +5902,10 @@
   "swapTokenVerifiedOn1SourceTitle": {
     "message": "Token potencialmente inautêntico"
   },
+  "swapTokenVerifiedSources": {
+    "message": "Confirmado por $1 fontes. Verificar em $2.",
+    "description": "$1 the number of sources that have verified the token, $2 points the user to a block explorer as a place they can verify information about the token."
+  },
   "swapTooManyDecimalsError": {
     "message": "$1 permite até $2 decimais",
     "description": "$1 is a token symbol and $2 is the max. number of decimals allowed for the token"
@@ -5918,6 +6023,12 @@
   "tips": {
     "message": "Dicas"
   },
+  "tipsForUsingAWallet": {
+    "message": "Dicas para usar uma carteira"
+  },
+  "tipsForUsingAWalletDescription": {
+    "message": "Adicionar tokens libera mais formas de usar a web3."
+  },
   "to": {
     "message": "Para"
   },
@@ -5970,6 +6081,9 @@
   "tokenList": {
     "message": "Listas de tokens"
   },
+  "tokenMarketplace": {
+    "message": "Marketplace de tokens"
+  },
   "tokenScamSecurityRisk": {
     "message": "golpes e riscos de segurança envolvendo tokens"
   },
@@ -6007,6 +6121,9 @@
   "total": {
     "message": "Total"
   },
+  "totalFees": {
+    "message": "Taxas totais"
+  },
   "totalVolume": {
     "message": "Volume total"
   },
diff --git a/app/_locales/ru/messages.json b/app/_locales/ru/messages.json
index 43e617a0aecd..c9236e4396bd 100644
--- a/app/_locales/ru/messages.json
+++ b/app/_locales/ru/messages.json
@@ -416,6 +416,9 @@
   "alertMessageAddressMismatchWarning": {
     "message": "Злоумышленники иногда имитируют сайты, внося небольшие изменения в адрес сайта. Прежде чем продолжить, убедитесь, что вы взаимодействуете с нужным сайтом."
   },
+  "alertMessageChangeInSimulationResults": {
+    "message": "Предполагаемые изменения для этой транзакции обновлены. Прежде чем продолжить, внимательно просмотрите их."
+  },
   "alertMessageGasEstimateFailed": {
     "message": "Мы не можем указать точную сумму комиссии, и эта оценка может быть высокой. Мы предлагаем вам ввести индивидуальный лимит газа, но существует риск, что транзакция все равно не удастся."
   },
@@ -455,6 +458,9 @@
   "alertModalReviewAllAlerts": {
     "message": "Просмотреть все оповещения"
   },
+  "alertReasonChangeInSimulationResults": {
+    "message": "Результаты изменились"
+  },
   "alertReasonGasEstimateFailed": {
     "message": "Неточная комиссия"
   },
@@ -837,18 +843,33 @@
   "bridge": {
     "message": "Мост"
   },
+  "bridgeCalculatingAmount": {
+    "message": "Расчет..."
+  },
   "bridgeDontSend": {
     "message": "Мост, не отправлять"
   },
+  "bridgeEnterAmount": {
+    "message": "Введите сумму"
+  },
   "bridgeFrom": {
     "message": "Мост из"
   },
   "bridgeSelectNetwork": {
     "message": "Выбор сети"
   },
+  "bridgeSelectTokenAndAmount": {
+    "message": "Выберите токен и сумму"
+  },
+  "bridgeTimingTooltipText": {
+    "message": "Это примерное время, которое потребуется для создания моста."
+  },
   "bridgeTo": {
     "message": "Мост в"
   },
+  "bridgeTotalFeesTooltipText": {
+    "message": "Сюда входят плата за газ (выплачивается майнерам криптовалюты) и плата ретранслятору (выплачивается за услуги энергетического комплекса, такие как мостовое соединение).\nРазмер комиссии зависит от сетевого трафика и сложности транзакции. MetaMask не получает прибыли ни от одной комиссии."
+  },
   "browserNotSupported": {
     "message": "Ваш браузер не поддерживается..."
   },
@@ -1160,6 +1181,14 @@
     "message": "Подключен к $1",
     "description": "$1 represents account name"
   },
+  "connectedWithNetwork": {
+    "message": "Подключены $1 сети(-ей)",
+    "description": "$1 represents network length"
+  },
+  "connectedWithNetworkName": {
+    "message": "Подключено с помощью $1",
+    "description": "$1 represents network name"
+  },
   "connecting": {
     "message": "Подключение..."
   },
@@ -1493,6 +1522,9 @@
   "dcent": {
     "message": "D'Cent"
   },
+  "debitCreditPurchaseOptions": {
+    "message": "Варианты покупки с помощью дебетовой или кредитной карты"
+  },
   "decimal": {
     "message": "Число десятичных знаков токена"
   },
@@ -1802,6 +1834,9 @@
   "editSpendingCapError": {
     "message": "Лимит расходов не может иметь более $1 десятичных знаков. Удалите лишние десятичные знаки, чтобы продолжить."
   },
+  "editSpendingCapSpecialCharError": {
+    "message": "Введите только цифры"
+  },
   "enableAutoDetect": {
     "message": " Включить автоопределение"
   },
@@ -1904,10 +1939,42 @@
     "message": "Код: $1",
     "description": "Displayed error name for debugging purposes. $1 is the error name"
   },
+  "errorPageContactSupport": {
+    "message": "Связаться с поддержкой",
+    "description": "Button for contact MM support"
+  },
+  "errorPageDescribeUsWhatHappened": {
+    "message": "Опишите, что произошло",
+    "description": "Button for submitting report to sentry"
+  },
+  "errorPageInfo": {
+    "message": "Невозможно показать вашу информацию. Не волнуйтесь, ваш кошелек и средства в безопасности.",
+    "description": "Information banner shown in the error page"
+  },
+  "errorPageMessageTitle": {
+    "message": "Сообщение об ошибке",
+    "description": "Title for description, which is displayed for debugging purposes"
+  },
+  "errorPageSentryFormTitle": {
+    "message": "Опишите, что произошло",
+    "description": "In sentry feedback form, The title at the top of the feedback form."
+  },
+  "errorPageSentryMessagePlaceholder": {
+    "message": "Предоставление подробной информации, например, о том, как мы можем воспроизвести ошибку, поможет нам решить проблему.",
+    "description": "In sentry feedback form, The placeholder for the feedback description input field."
+  },
+  "errorPageSentrySuccessMessageText": {
+    "message": "Спасибо! Мы скоро рассмотрим это.",
+    "description": "In sentry feedback form, The message displayed after a successful feedback submission."
+  },
   "errorPageTitle": {
     "message": "MetaMask обнаружил ошибку",
     "description": "Title of generic error page"
   },
+  "errorPageTryAgain": {
+    "message": "Повторить попытку",
+    "description": "Button for try again"
+  },
   "errorStack": {
     "message": "Стек:",
     "description": "Title for error stack, which is displayed for debugging purposes"
@@ -1925,6 +1992,9 @@
   "estimatedFeeTooltip": {
     "message": "Сумма, уплаченная за обработку транзакции в сети."
   },
+  "estimatedTime": {
+    "message": "Примерное время"
+  },
   "ethGasPriceFetchWarning": {
     "message": "Указана резервная цена газа, поскольку основной сервис определения цены газа сейчас недоступен."
   },
@@ -2070,6 +2140,9 @@
   "functionType": {
     "message": "Тип функции"
   },
+  "fundingMethod": {
+    "message": "Способ пополнения"
+  },
   "gas": {
     "message": "Газ"
   },
@@ -3724,6 +3797,12 @@
   "outdatedBrowserNotification": {
     "message": "Ваш браузер устарел. Если вы не обновите его, то не сможете получать исправления безопасности и новые функции от MetaMask."
   },
+  "overrideContentSecurityPolicyHeader": {
+    "message": "Переопределить заголовок Content-Security-Policy"
+  },
+  "overrideContentSecurityPolicyHeaderDescription": {
+    "message": "Этот вариант является обходным решением известной проблемы в Firefox, когда заголовок Content-Security-Policy децентрализованного приложения может препятствовать правильной загрузке расширения. Отключать эту опцию не рекомендуется, если только это не требуется для совместимости конкретной веб-страницы."
+  },
   "padlock": {
     "message": "Замок"
   },
@@ -4395,6 +4474,9 @@
   "requestFromInfo": {
     "message": "Это сайт, который запрашивает вашу подпись."
   },
+  "requestFromInfoSnap": {
+    "message": "Это Snap, который запрашивает вашу подпись."
+  },
   "requestFromTransactionDescription": {
     "message": "Это сайт, запрашивающий ваше подтверждение."
   },
@@ -4417,6 +4499,10 @@
     "message": "Запрашивается для $1",
     "description": "Name of Account"
   },
+  "requestingForNetwork": {
+    "message": "Запрашивается для $1",
+    "description": "Name of Network"
+  },
   "requestsAwaitingAcknowledgement": {
     "message": "запросы, ожидающие подтверждения"
   },
@@ -4895,6 +4981,9 @@
   "simulationDetailsIncomingHeading": {
     "message": "Вы получаете"
   },
+  "simulationDetailsNoChanges": {
+    "message": "Изменений нет"
+  },
   "simulationDetailsOutgoingHeading": {
     "message": "Вы отправляете"
   },
@@ -4917,6 +5006,9 @@
   "simulationDetailsTransactionReverted": {
     "message": "Эта транзакция, скорее всего, не удастся"
   },
+  "simulationDetailsUnavailable": {
+    "message": "Недоступно"
+  },
   "simulationErrorMessageV2": {
     "message": "Мы не смогли оценить размер платы за газ. В контракте может быть ошибка, и эта транзакция может завершиться неудачно."
   },
@@ -5143,6 +5235,15 @@
     "message": "Свяжитесь с авторами $1 для получения дополнительной поддержки.",
     "description": "This is shown when the insight snap throws an error. $1 is the snap name"
   },
+  "solanaSupportSectionTitle": {
+    "message": "Solana"
+  },
+  "solanaSupportToggleDescription": {
+    "message": "Включение этой функции даст вам возможность добавить в ваше расширение MetaMask счет Solana, созданный на основе вашей существующей секретной фразы для восстановления. Это экспериментальная бета-функция, которая используется вами на ваш страх и риск."
+  },
+  "solanaSupportToggleTitle": {
+    "message": "Включить «Добавить новый счет Solana (бета-версия)»"
+  },
   "somethingDoesntLookRight": {
     "message": "Что-то не так? $1",
     "description": "A false positive message for users to contact support. $1 is a link to the support page."
@@ -5801,6 +5902,10 @@
   "swapTokenVerifiedOn1SourceTitle": {
     "message": "Потенциально неаутентичный токен"
   },
+  "swapTokenVerifiedSources": {
+    "message": "Подтверждено $1 источниками. Подтвердить на $2.",
+    "description": "$1 the number of sources that have verified the token, $2 points the user to a block explorer as a place they can verify information about the token."
+  },
   "swapTooManyDecimalsError": {
     "message": "$1 позволяет использовать до $2 десятичных знаков",
     "description": "$1 is a token symbol and $2 is the max. number of decimals allowed for the token"
@@ -5918,6 +6023,12 @@
   "tips": {
     "message": "Советы"
   },
+  "tipsForUsingAWallet": {
+    "message": "Советы по использованию кошелька"
+  },
+  "tipsForUsingAWalletDescription": {
+    "message": "Добавление токенов открывает больше способов использования web3."
+  },
   "to": {
     "message": "Адресат"
   },
@@ -5970,6 +6081,9 @@
   "tokenList": {
     "message": "Списки токенов:"
   },
+  "tokenMarketplace": {
+    "message": "Торговая площадка для токенов"
+  },
   "tokenScamSecurityRisk": {
     "message": "мошенничество с токенами и угрозы безопасности"
   },
@@ -6007,6 +6121,9 @@
   "total": {
     "message": "Итого"
   },
+  "totalFees": {
+    "message": "Итого комиссий"
+  },
   "totalVolume": {
     "message": "Общий объем"
   },
diff --git a/app/_locales/tl/messages.json b/app/_locales/tl/messages.json
index 5bc72667356e..30ee4b2096eb 100644
--- a/app/_locales/tl/messages.json
+++ b/app/_locales/tl/messages.json
@@ -416,6 +416,9 @@
   "alertMessageAddressMismatchWarning": {
     "message": "Minsan ginagaya ng mga umaatake ang mga site sa pamamagitan ng paggawa ng maliliit na pagbabago sa address ng site. Tiyaking nakikipag-ugnayan ka sa nilalayong site bago ka magpatuloy."
   },
+  "alertMessageChangeInSimulationResults": {
+    "message": "Na-update na ang mga tinatayang pagbabago para sa transaksyong ito. Suriin ang mga ito nang mabuti bago magpatuloy."
+  },
   "alertMessageGasEstimateFailed": {
     "message": "Hindi kami makapagbigay ng tumpak na bayad at ang pagtantiya na ito ay maaaring mataas. Iminumungkahi namin na maglagay ka ng naka-custom na gas limit, ngunit may panganib na mabigo pa rin ang transaksyon."
   },
@@ -455,6 +458,9 @@
   "alertModalReviewAllAlerts": {
     "message": "Suriin ang lahat ng alerto"
   },
+  "alertReasonChangeInSimulationResults": {
+    "message": "Nabago ang mga resulta"
+  },
   "alertReasonGasEstimateFailed": {
     "message": "Hindi tumpak na bayad"
   },
@@ -837,18 +843,33 @@
   "bridge": {
     "message": "Bridge"
   },
+  "bridgeCalculatingAmount": {
+    "message": "Nagkakalkula..."
+  },
   "bridgeDontSend": {
     "message": "Bridge, huwag ipadala"
   },
+  "bridgeEnterAmount": {
+    "message": "Ilagay ang halaga"
+  },
   "bridgeFrom": {
     "message": "I-bridge mula sa"
   },
   "bridgeSelectNetwork": {
     "message": "Pumili ng network"
   },
+  "bridgeSelectTokenAndAmount": {
+    "message": "Piliin ang token at halaga"
+  },
+  "bridgeTimingTooltipText": {
+    "message": "Ito ang tinatayang tagal para makumpleto ang pag-bridge."
+  },
   "bridgeTo": {
     "message": "I-bridge papunta sa"
   },
+  "bridgeTotalFeesTooltipText": {
+    "message": "Kasama rito ang mga bayad sa gas (binabayaran sa mga crypto miner) at mga bayad sa tagapaghatid (binabayaran sa mga serbisyo ng power complex gaya ng pag-bridge).\nNakabatay ang mga bayad sa trapiko sa network at kung paano kakumplikado ang transaksyon. Hindi kumikita ang MetaMask sa anumang bayad."
+  },
   "browserNotSupported": {
     "message": "Hindi sinusuportahan ang iyong browser..."
   },
@@ -1160,6 +1181,14 @@
     "message": "Nakakonekta sa $1",
     "description": "$1 represents account name"
   },
+  "connectedWithNetwork": {
+    "message": "$1 (na) network ang konektado",
+    "description": "$1 represents network length"
+  },
+  "connectedWithNetworkName": {
+    "message": "Konektado sa $1",
+    "description": "$1 represents network name"
+  },
   "connecting": {
     "message": "Kumokonekta"
   },
@@ -1493,6 +1522,9 @@
   "dcent": {
     "message": "D'Cent"
   },
+  "debitCreditPurchaseOptions": {
+    "message": "Mga opsyon sa pagbili gamit ang debit o credit card"
+  },
   "decimal": {
     "message": "Decimal na token"
   },
@@ -1802,6 +1834,9 @@
   "editSpendingCapError": {
     "message": "Ang cap sa paggastos ay hindi maaaring lumampas sa $1 (na) decimal digit. Alisin ang mga decimal digit para magpatuloy."
   },
+  "editSpendingCapSpecialCharError": {
+    "message": "Maglagay lang ng mga numero"
+  },
   "enableAutoDetect": {
     "message": " Paganahin ang autodetect"
   },
@@ -1904,10 +1939,42 @@
     "message": "Code: $1",
     "description": "Displayed error name for debugging purposes. $1 is the error name"
   },
+  "errorPageContactSupport": {
+    "message": "Makipag-ugnayan sa Suporta",
+    "description": "Button for contact MM support"
+  },
+  "errorPageDescribeUsWhatHappened": {
+    "message": "Ilarawan kung ano ang nangyari",
+    "description": "Button for submitting report to sentry"
+  },
+  "errorPageInfo": {
+    "message": "Hindi puwedeng ipakita ang impormasyon mo. Huwag mag-alala, ligtas ang wallet at mga pondo mo.",
+    "description": "Information banner shown in the error page"
+  },
+  "errorPageMessageTitle": {
+    "message": "Mensahe ng error",
+    "description": "Title for description, which is displayed for debugging purposes"
+  },
+  "errorPageSentryFormTitle": {
+    "message": "Ilarawan kung ano ang nangyari",
+    "description": "In sentry feedback form, The title at the top of the feedback form."
+  },
+  "errorPageSentryMessagePlaceholder": {
+    "message": "Matutulungan mo kaming ayusin ang problema kapag nagbahagi ka ng mga detalye gaya ng kung paano namin mare-reproduce ang bug.",
+    "description": "In sentry feedback form, The placeholder for the feedback description input field."
+  },
+  "errorPageSentrySuccessMessageText": {
+    "message": "Salamat! Susuriin namin ito sa lalong madaling panahon.",
+    "description": "In sentry feedback form, The message displayed after a successful feedback submission."
+  },
   "errorPageTitle": {
     "message": "Nagkaroon ng error sa MetaMask",
     "description": "Title of generic error page"
   },
+  "errorPageTryAgain": {
+    "message": "Subukan ulit",
+    "description": "Button for try again"
+  },
   "errorStack": {
     "message": "Stack:",
     "description": "Title for error stack, which is displayed for debugging purposes"
@@ -1925,6 +1992,9 @@
   "estimatedFeeTooltip": {
     "message": "Halaga na binayaran para iproseso ang transaksyon sa network."
   },
+  "estimatedTime": {
+    "message": "Tinatayang oras"
+  },
   "ethGasPriceFetchWarning": {
     "message": "Ang backup na presyo ng gas ay ibinigay dahil ang pangunahing serbisyo ng pagtantya ng gas ay hindi available sa ngayon."
   },
@@ -2070,6 +2140,9 @@
   "functionType": {
     "message": "Uri ng Function"
   },
+  "fundingMethod": {
+    "message": "Paraan ng pagpopondo"
+  },
   "gas": {
     "message": "Gas"
   },
@@ -3724,6 +3797,12 @@
   "outdatedBrowserNotification": {
     "message": "Hindi na updated ang iyong browser. Kapag hindi mo inupdate ang iyong browser, hindi ka makakakuha ng mga security patch at bagong feature mula sa MetaMask."
   },
+  "overrideContentSecurityPolicyHeader": {
+    "message": "Override Content-Security-Policy header"
+  },
+  "overrideContentSecurityPolicyHeaderDescription": {
+    "message": "Isang solusyon ang opsyon na ito para sa isang karaniwang isyu sa Firefox, kung saan pinipigilan ng Content-Security-Policy header ng isang dapp ang extension na mag-load nang tama. Hindi inirerekomenda ang hindi pagpapagana sa opsyon na ito maliban na lang kung kinakailangan para sa pagtutugma ng partikular na web page."
+  },
   "padlock": {
     "message": "Padlock"
   },
@@ -4395,6 +4474,9 @@
   "requestFromInfo": {
     "message": "Ito ang site na humihiling ng iyong pirma."
   },
+  "requestFromInfoSnap": {
+    "message": "Ito ang Snap na humihiling ng iyong pirma."
+  },
   "requestFromTransactionDescription": {
     "message": "Ito ang site na humihiling ng iyong kumpirmasyon."
   },
@@ -4417,6 +4499,10 @@
     "message": "Hinihiling para sa $1",
     "description": "Name of Account"
   },
+  "requestingForNetwork": {
+    "message": "Humihiling ng $1",
+    "description": "Name of Network"
+  },
   "requestsAwaitingAcknowledgement": {
     "message": "mga kahilingang hinihintay na tanggapin"
   },
@@ -4895,6 +4981,9 @@
   "simulationDetailsIncomingHeading": {
     "message": "Natanggap mo"
   },
+  "simulationDetailsNoChanges": {
+    "message": "Walang pagbabago"
+  },
   "simulationDetailsOutgoingHeading": {
     "message": "Nagpadala ka"
   },
@@ -4917,6 +5006,9 @@
   "simulationDetailsTransactionReverted": {
     "message": "Ang transaksyon na ito ay malamang na mabigo"
   },
+  "simulationDetailsUnavailable": {
+    "message": "Hindi available"
+  },
   "simulationErrorMessageV2": {
     "message": "Hindi namin nagawang tantyahin ang gas. Maaaring may error sa kontrata at maaaring mabigo ang transaksyong ito."
   },
@@ -5143,6 +5235,15 @@
     "message": "Makipag-ugnayan sa mga tagalikha ng $1 para sa karagdagang suporta.",
     "description": "This is shown when the insight snap throws an error. $1 is the snap name"
   },
+  "solanaSupportSectionTitle": {
+    "message": "Solana"
+  },
+  "solanaSupportToggleDescription": {
+    "message": "Kapag in-on ang feature na ito, magkakaroon ka ng opsyon na magdagdag ng Solana Account sa MetaMask extension mo mula sa dati mo nang Lihim na Parirala sa Pagbawi. Isa itong eksperimental na Beta feature kaya gamitin ito nang may pag-iingat."
+  },
+  "solanaSupportToggleTitle": {
+    "message": "Paganahin ang \"Magdagdag ng bagong Solana account (Beta)\""
+  },
   "somethingDoesntLookRight": {
     "message": "Mayroon bang hindi tama? $1",
     "description": "A false positive message for users to contact support. $1 is a link to the support page."
@@ -5801,6 +5902,10 @@
   "swapTokenVerifiedOn1SourceTitle": {
     "message": "Potensyal na hindi tunay na token"
   },
+  "swapTokenVerifiedSources": {
+    "message": "Kinumpirma ng $1 (na) pinagmulan. I-verify sa $2.",
+    "description": "$1 the number of sources that have verified the token, $2 points the user to a block explorer as a place they can verify information about the token."
+  },
   "swapTooManyDecimalsError": {
     "message": "Ang $1 ay nagpapahintulot sa hanggang $2 na decimal",
     "description": "$1 is a token symbol and $2 is the max. number of decimals allowed for the token"
@@ -5918,6 +6023,12 @@
   "tips": {
     "message": "Mga Tip"
   },
+  "tipsForUsingAWallet": {
+    "message": "Mga tip sa paggamit ng wallet"
+  },
+  "tipsForUsingAWalletDescription": {
+    "message": "Kapag nagdagdag ka ng mga token, magkakaroon ka ng mas maraming paraan para magamit ang web3."
+  },
   "to": {
     "message": "Para kay/sa"
   },
@@ -5970,6 +6081,9 @@
   "tokenList": {
     "message": "Mga listahan ng token"
   },
+  "tokenMarketplace": {
+    "message": "Marketplace ng token"
+  },
   "tokenScamSecurityRisk": {
     "message": "mga panloloko sa token at panganib sa seguridad"
   },
@@ -6007,6 +6121,9 @@
   "total": {
     "message": "Kabuuan"
   },
+  "totalFees": {
+    "message": "Kabuuang bayad"
+  },
   "totalVolume": {
     "message": "Kabuuang volume"
   },
diff --git a/app/_locales/tr/messages.json b/app/_locales/tr/messages.json
index a71a64576142..16f7c1eb8a85 100644
--- a/app/_locales/tr/messages.json
+++ b/app/_locales/tr/messages.json
@@ -416,6 +416,9 @@
   "alertMessageAddressMismatchWarning": {
     "message": "Saldırganlar bazen site adresinde küçük değişiklikler yaparak siteleri taklit edebilir. Devam etmeden önce planladığınız site ile etkileşim kurduğunuzdan emin olun."
   },
+  "alertMessageChangeInSimulationResults": {
+    "message": "Bu işlem için tahmin edilen değişiklikler güncellendi. Devam etmeden önce dikkatle inceleyin."
+  },
   "alertMessageGasEstimateFailed": {
     "message": "Kesin bir ücret sunamıyoruz ve bu tahmin yüksek olabilir. Özel bir gaz limiti girmenizi öneririz ancak işlemin yine de başarısız olma riski vardır."
   },
@@ -455,6 +458,9 @@
   "alertModalReviewAllAlerts": {
     "message": "Tüm uyarıları incele"
   },
+  "alertReasonChangeInSimulationResults": {
+    "message": "Sonuçlar değişti"
+  },
   "alertReasonGasEstimateFailed": {
     "message": "Ücret yanlış"
   },
@@ -837,18 +843,33 @@
   "bridge": {
     "message": "Köprü"
   },
+  "bridgeCalculatingAmount": {
+    "message": "Hesaplanıyor..."
+  },
   "bridgeDontSend": {
     "message": "Köprü yap, gönderme"
   },
+  "bridgeEnterAmount": {
+    "message": "Miktar girin"
+  },
   "bridgeFrom": {
     "message": "Şuradan köprü:"
   },
   "bridgeSelectNetwork": {
     "message": "Ağ seç"
   },
+  "bridgeSelectTokenAndAmount": {
+    "message": "Token ve miktar seçin"
+  },
+  "bridgeTimingTooltipText": {
+    "message": "Bu, köprü işleminin tamamlanacağı tahmini süredir."
+  },
   "bridgeTo": {
     "message": "Şuraya köprü:"
   },
+  "bridgeTotalFeesTooltipText": {
+    "message": "Buna, gaz ücretleri (kripto madencilerine ödenen) ve düzenleyici ücretleri (köprü gibi güç kompleksi hizmetlerine ödenen) dahildir. Ücretler ağ trafiğine ve işlemin karmaşıklığına dayanır. MetaMask iki ücretten de kazanç sağlamaz."
+  },
   "browserNotSupported": {
     "message": "Tarayıcınız desteklenmiyor..."
   },
@@ -1160,6 +1181,14 @@
     "message": "$1 ile bağlandı",
     "description": "$1 represents account name"
   },
+  "connectedWithNetwork": {
+    "message": "$1 ağ bağlandı",
+    "description": "$1 represents network length"
+  },
+  "connectedWithNetworkName": {
+    "message": "$1 ile bağlandı",
+    "description": "$1 represents network name"
+  },
   "connecting": {
     "message": "Bağlanıyor"
   },
@@ -1493,6 +1522,9 @@
   "dcent": {
     "message": "D'Cent"
   },
+  "debitCreditPurchaseOptions": {
+    "message": "Banka kartı veya kredi kartı ile satın alma seçenekleri"
+  },
   "decimal": {
     "message": "Token Ondalığı"
   },
@@ -1802,6 +1834,9 @@
   "editSpendingCapError": {
     "message": "Harcama üst limiti $1 ondalık haneyi geçemez. Devam etmek için ondalık haneleri kaldırın."
   },
+  "editSpendingCapSpecialCharError": {
+    "message": "Sadece rakam girin"
+  },
   "enableAutoDetect": {
     "message": " Otomatik algılamayı etkinleştir"
   },
@@ -1904,10 +1939,42 @@
     "message": "Kod: $1",
     "description": "Displayed error name for debugging purposes. $1 is the error name"
   },
+  "errorPageContactSupport": {
+    "message": "Destek bölümüne ulaşın",
+    "description": "Button for contact MM support"
+  },
+  "errorPageDescribeUsWhatHappened": {
+    "message": "Ne olduğunu açıklayın",
+    "description": "Button for submitting report to sentry"
+  },
+  "errorPageInfo": {
+    "message": "Bilgileriniz gösterilemiyor. Endişelenmeyin, cüzdanınız ve paranız güvende.",
+    "description": "Information banner shown in the error page"
+  },
+  "errorPageMessageTitle": {
+    "message": "Hata mesajı",
+    "description": "Title for description, which is displayed for debugging purposes"
+  },
+  "errorPageSentryFormTitle": {
+    "message": "Ne olduğunu açıklayın",
+    "description": "In sentry feedback form, The title at the top of the feedback form."
+  },
+  "errorPageSentryMessagePlaceholder": {
+    "message": "Hatayı nasıl tekrarlayabileceğimiz gibi ayrıntıların paylaşılması sorunu çözmemize yardımcı olacaktır.",
+    "description": "In sentry feedback form, The placeholder for the feedback description input field."
+  },
+  "errorPageSentrySuccessMessageText": {
+    "message": "Teşekkürler! En kısa sürede ele alacağız.",
+    "description": "In sentry feedback form, The message displayed after a successful feedback submission."
+  },
   "errorPageTitle": {
     "message": "MetaMask bir hata ile karşılaştı",
     "description": "Title of generic error page"
   },
+  "errorPageTryAgain": {
+    "message": "Tekrar deneyin",
+    "description": "Button for try again"
+  },
   "errorStack": {
     "message": "Yığın:",
     "description": "Title for error stack, which is displayed for debugging purposes"
@@ -1925,6 +1992,9 @@
   "estimatedFeeTooltip": {
     "message": "Ağda işlemi gerçekleştirmek için ödenen tutar."
   },
+  "estimatedTime": {
+    "message": "Tahmini süre"
+  },
   "ethGasPriceFetchWarning": {
     "message": "Ana gaz tahmini hizmeti olarak sunulan yedek gaz fiyatı şu anda kullanılamıyor."
   },
@@ -2070,6 +2140,9 @@
   "functionType": {
     "message": "İşlev türü"
   },
+  "fundingMethod": {
+    "message": "Para yatırma yöntemi"
+  },
   "gas": {
     "message": "Gaz"
   },
@@ -3724,6 +3797,12 @@
   "outdatedBrowserNotification": {
     "message": "Tarayıcınız güncel değil. Tarayıcınızı güncellemezseniz MetaMask'ten güvenlik yamalarını ve yeni özellikleri alamayacaksınız."
   },
+  "overrideContentSecurityPolicyHeader": {
+    "message": "İçerik-Güvenlik-Politika başlığını geçersiz kıl"
+  },
+  "overrideContentSecurityPolicyHeaderDescription": {
+    "message": "Bu seçenek, Firefox'ta merkeziyetsiz bir uygulamanın İçerik-Güvenlik-Politika başlığının uzantının düzgün bir şekilde yüklenmesini önleyebildiği bilinen bir sorunun anlık çözümüdür. Belirli web sayfası uyumluluğu için gerekli olmadığı sürece bu seçeneğin devre dışı bırakılması önerilmez."
+  },
   "padlock": {
     "message": "Asma Kilit"
   },
@@ -4395,6 +4474,9 @@
   "requestFromInfo": {
     "message": "İmzanızı isteyen site budur."
   },
+  "requestFromInfoSnap": {
+    "message": "İmzanızı isteyen Snap budur."
+  },
   "requestFromTransactionDescription": {
     "message": "Bu site tarafından onayınız isteniyor."
   },
@@ -4417,6 +4499,10 @@
     "message": "$1 için talep ediliyor",
     "description": "Name of Account"
   },
+  "requestingForNetwork": {
+    "message": "$1 için talep ediliyor",
+    "description": "Name of Network"
+  },
   "requestsAwaitingAcknowledgement": {
     "message": "onaylanmayı bekleyen talepler"
   },
@@ -4895,6 +4981,9 @@
   "simulationDetailsIncomingHeading": {
     "message": "Aldığınız"
   },
+  "simulationDetailsNoChanges": {
+    "message": "Değişiklik yok"
+  },
   "simulationDetailsOutgoingHeading": {
     "message": "Gönderdiğiniz"
   },
@@ -4917,6 +5006,9 @@
   "simulationDetailsTransactionReverted": {
     "message": "Bu işlemin başarısız olması muhtemel"
   },
+  "simulationDetailsUnavailable": {
+    "message": "Mevcut değil"
+  },
   "simulationErrorMessageV2": {
     "message": "Gaz tahmini yapamadık. Sözleşmede bir hata olabilir ve bu işlem başarısız olabilir."
   },
@@ -5143,6 +5235,15 @@
     "message": "Daha fazla destek için $1 oluşturucuları ile iletişime geçin.",
     "description": "This is shown when the insight snap throws an error. $1 is the snap name"
   },
+  "solanaSupportSectionTitle": {
+    "message": "Solana"
+  },
+  "solanaSupportToggleDescription": {
+    "message": "Bu özelliği açtığınızda mevcut Gizli Kurtarma İfadenizden türetilen MetaMask Uzantınıza bir Solana Hesabı ekleme seçeneğiniz olacaktır. Bu, deneysel bir Beta özelliğidir, bu yüzden riski kendinize ait olarak kullanmalısınız."
+  },
+  "solanaSupportToggleTitle": {
+    "message": "\"Yeni bir Solana hesabı ekle (Beta)\" seçeneğini etkinleştir"
+  },
   "somethingDoesntLookRight": {
     "message": "Doğru görünmeyen bir şeyler mi var? $1",
     "description": "A false positive message for users to contact support. $1 is a link to the support page."
@@ -5801,6 +5902,10 @@
   "swapTokenVerifiedOn1SourceTitle": {
     "message": "Sahte token olma potansiyeli var"
   },
+  "swapTokenVerifiedSources": {
+    "message": "$1 kaynakları tarafından onaylandı. $2 üzerinde doğrulayın.",
+    "description": "$1 the number of sources that have verified the token, $2 points the user to a block explorer as a place they can verify information about the token."
+  },
   "swapTooManyDecimalsError": {
     "message": "$1, en fazla $2 ondalık basamağına izin verir",
     "description": "$1 is a token symbol and $2 is the max. number of decimals allowed for the token"
@@ -5918,6 +6023,12 @@
   "tips": {
     "message": "İpuçları"
   },
+  "tipsForUsingAWallet": {
+    "message": "Cüzdan kullanma ipuçları"
+  },
+  "tipsForUsingAWalletDescription": {
+    "message": "Token eklemek web3'ü kullanmanın daha fazla yolunun kilidini açar."
+  },
   "to": {
     "message": "Kime"
   },
@@ -5970,6 +6081,9 @@
   "tokenList": {
     "message": "Token listeleri:"
   },
+  "tokenMarketplace": {
+    "message": "Token pazar yeri"
+  },
   "tokenScamSecurityRisk": {
     "message": "token dolandırıcılıkları ve güvenlik riskleri"
   },
@@ -6007,6 +6121,9 @@
   "total": {
     "message": "Toplam"
   },
+  "totalFees": {
+    "message": "Toplam ücretler"
+  },
   "totalVolume": {
     "message": "Toplam hacim"
   },
diff --git a/app/_locales/vi/messages.json b/app/_locales/vi/messages.json
index 5fb6ee43bfb9..39c62a701e4f 100644
--- a/app/_locales/vi/messages.json
+++ b/app/_locales/vi/messages.json
@@ -416,6 +416,9 @@
   "alertMessageAddressMismatchWarning": {
     "message": "Kẻ tấn công đôi khi bắt chước các trang web bằng cách thực hiện những thay đổi nhỏ trong địa chỉ trang web. Đảm bảo bạn đang tương tác với trang web dự định trước khi tiếp tục."
   },
+  "alertMessageChangeInSimulationResults": {
+    "message": "Các thay đổi ước tính cho giao dịch này đã được cập nhật. Hãy xem xét kỹ trước khi tiếp tục."
+  },
   "alertMessageGasEstimateFailed": {
     "message": "Chúng tôi không thể cung cấp phí chính xác và ước tính này có thể cao. Chúng tôi khuyên bạn nên nhập hạn mức phí gas tùy chỉnh, nhưng vẫn có rủi ro giao dịch sẽ thất bại."
   },
@@ -455,6 +458,9 @@
   "alertModalReviewAllAlerts": {
     "message": "Xem lại tất cả cảnh báo"
   },
+  "alertReasonChangeInSimulationResults": {
+    "message": "Kết quả đã thay đổi"
+  },
   "alertReasonGasEstimateFailed": {
     "message": "Phí không chính xác"
   },
@@ -837,18 +843,33 @@
   "bridge": {
     "message": "Cầu nối"
   },
+  "bridgeCalculatingAmount": {
+    "message": "Đang tính toán..."
+  },
   "bridgeDontSend": {
     "message": "Cầu nối, không gửi"
   },
+  "bridgeEnterAmount": {
+    "message": "Nhập số tiền"
+  },
   "bridgeFrom": {
     "message": "Cầu nối từ"
   },
   "bridgeSelectNetwork": {
     "message": "Chọn mạng"
   },
+  "bridgeSelectTokenAndAmount": {
+    "message": "Chọn token và số tiền"
+  },
+  "bridgeTimingTooltipText": {
+    "message": "Đây là thời gian ước tính để hoàn thành cầu nối."
+  },
   "bridgeTo": {
     "message": "Cầu nối đến"
   },
+  "bridgeTotalFeesTooltipText": {
+    "message": "Bao gồm phí gas (trả cho các thợ đào tiền mã hóa) và phí sàn chuyển tiếp (trả để cung cấp các dịch vụ phức tạp như cầu nối).\nPhí được tính dựa trên lưu lượng mạng và độ phức tạp của giao dịch. MetaMask không thu lợi từ bất kỳ khoản phí nào."
+  },
   "browserNotSupported": {
     "message": "Trình duyệt của bạn không được hỗ trợ..."
   },
@@ -1160,6 +1181,14 @@
     "message": "Đã kết nối với $1",
     "description": "$1 represents account name"
   },
+  "connectedWithNetwork": {
+    "message": "Đã kết nối $1 mạng",
+    "description": "$1 represents network length"
+  },
+  "connectedWithNetworkName": {
+    "message": "Đã kết nối với $1",
+    "description": "$1 represents network name"
+  },
   "connecting": {
     "message": "Đang kết nối"
   },
@@ -1493,6 +1522,9 @@
   "dcent": {
     "message": "D'Cent"
   },
+  "debitCreditPurchaseOptions": {
+    "message": "Tùy chọn mua bằng thẻ ghi nợ hoặc thẻ tín dụng"
+  },
   "decimal": {
     "message": "Số thập phân của token"
   },
@@ -1802,6 +1834,9 @@
   "editSpendingCapError": {
     "message": "Hạn mức chi tiêu không được vượt quá $1 chữ số thập phân. Xóa bớt chữ số thập phân để tiếp tục."
   },
+  "editSpendingCapSpecialCharError": {
+    "message": "Chỉ nhập số"
+  },
   "enableAutoDetect": {
     "message": " Bật tự động phát hiện"
   },
@@ -1904,10 +1939,42 @@
     "message": "Mã: $1",
     "description": "Displayed error name for debugging purposes. $1 is the error name"
   },
+  "errorPageContactSupport": {
+    "message": "Liên hệ bộ phận hỗ trợ",
+    "description": "Button for contact MM support"
+  },
+  "errorPageDescribeUsWhatHappened": {
+    "message": "Mô tả những gì đã xảy ra",
+    "description": "Button for submitting report to sentry"
+  },
+  "errorPageInfo": {
+    "message": "Không thể hiển thị thông tin của bạn. Đừng lo, ví và tiền của bạn vẫn an toàn.",
+    "description": "Information banner shown in the error page"
+  },
+  "errorPageMessageTitle": {
+    "message": "Thông báo lỗi",
+    "description": "Title for description, which is displayed for debugging purposes"
+  },
+  "errorPageSentryFormTitle": {
+    "message": "Mô tả những gì đã xảy ra",
+    "description": "In sentry feedback form, The title at the top of the feedback form."
+  },
+  "errorPageSentryMessagePlaceholder": {
+    "message": "Chia sẻ thông tin chi tiết như cách chúng tôi có thể tái hiện lỗi để giúp chúng tôi khắc phục vấn đề.",
+    "description": "In sentry feedback form, The placeholder for the feedback description input field."
+  },
+  "errorPageSentrySuccessMessageText": {
+    "message": "Cảm ơn! Chúng tôi sẽ sớm tiến hành xem xét.",
+    "description": "In sentry feedback form, The message displayed after a successful feedback submission."
+  },
   "errorPageTitle": {
     "message": "MetaMask đã gặp lỗi",
     "description": "Title of generic error page"
   },
+  "errorPageTryAgain": {
+    "message": "Thử lại",
+    "description": "Button for try again"
+  },
   "errorStack": {
     "message": "Cụm:",
     "description": "Title for error stack, which is displayed for debugging purposes"
@@ -1925,6 +1992,9 @@
   "estimatedFeeTooltip": {
     "message": "Số tiền được chi trả để xử lý giao dịch trên mạng."
   },
+  "estimatedTime": {
+    "message": "Thời gian ước tính"
+  },
   "ethGasPriceFetchWarning": {
     "message": "Giá gas dự phòng được cung cấp vì dịch vụ ước tính giá gas chính hiện không hoạt động."
   },
@@ -2070,6 +2140,9 @@
   "functionType": {
     "message": "Loại chức năng"
   },
+  "fundingMethod": {
+    "message": "Phương thức nạp tiền"
+  },
   "gas": {
     "message": "Gas"
   },
@@ -3724,6 +3797,12 @@
   "outdatedBrowserNotification": {
     "message": "Trình duyệt của bạn đã cũ. Nếu không cập nhật trình duyệt, bạn sẽ không thể nhận các bản vá bảo mật và tính năng mới từ MetaMask."
   },
+  "overrideContentSecurityPolicyHeader": {
+    "message": "Ghi đè tiêu đề Nội dung-Bảo mật-Riêng tư"
+  },
+  "overrideContentSecurityPolicyHeaderDescription": {
+    "message": "Tùy chọn này là giải pháp cho một vấn đề đã biết trên Firefox, nơi tiêu đề Nội dung-Bảo mật-Riêng tư của một dapp có thể ngăn tiện ích mở rộng tải đúng cách. Không nên tắt tùy chọn này trừ khi cần thiết để tương thích với trang web cụ thể."
+  },
   "padlock": {
     "message": "Ổ khóa"
   },
@@ -4395,6 +4474,9 @@
   "requestFromInfo": {
     "message": "Đây là trang web yêu cầu chữ ký của bạn."
   },
+  "requestFromInfoSnap": {
+    "message": "Đây là Snap yêu cầu chữ ký của bạn."
+  },
   "requestFromTransactionDescription": {
     "message": "Đây là trang web yêu cầu xác nhận của bạn."
   },
@@ -4417,6 +4499,10 @@
     "message": "Yêu cầu cho $1",
     "description": "Name of Account"
   },
+  "requestingForNetwork": {
+    "message": "Yêu cầu cho $1",
+    "description": "Name of Network"
+  },
   "requestsAwaitingAcknowledgement": {
     "message": "yêu cầu đang chờ xác nhận"
   },
@@ -4895,6 +4981,9 @@
   "simulationDetailsIncomingHeading": {
     "message": "Bạn nhận được"
   },
+  "simulationDetailsNoChanges": {
+    "message": "Không thay đổi"
+  },
   "simulationDetailsOutgoingHeading": {
     "message": "Bạn gửi"
   },
@@ -4917,6 +5006,9 @@
   "simulationDetailsTransactionReverted": {
     "message": "Giao dịch này có khả năng thất bại"
   },
+  "simulationDetailsUnavailable": {
+    "message": "Không khả dụng"
+  },
   "simulationErrorMessageV2": {
     "message": "Chúng tôi không thể ước tính gas. Có thể đã xảy ra lỗi trong hợp đồng và giao dịch này có thể thất bại."
   },
@@ -5143,6 +5235,15 @@
     "message": "Liên hệ với những người tạo ra $1 để được hỗ trợ thêm.",
     "description": "This is shown when the insight snap throws an error. $1 is the snap name"
   },
+  "solanaSupportSectionTitle": {
+    "message": "Solana"
+  },
+  "solanaSupportToggleDescription": {
+    "message": "Bật tính năng này sẽ cung cấp cho bạn tùy chọn thêm Tài khoản Solana vào Tiện ích mở rộng MetaMask bắt nguồn từ Cụm từ khôi phục bí mật hiện có của bạn. Đây là một tính năng Beta thử nghiệm, nên bạn phải tự chịu rủi ro khi sử dụng nó."
+  },
+  "solanaSupportToggleTitle": {
+    "message": "Bật \"Thêm tài khoản Solana mới (Beta)\""
+  },
   "somethingDoesntLookRight": {
     "message": "Có gì đó không ổn? $1",
     "description": "A false positive message for users to contact support. $1 is a link to the support page."
@@ -5801,6 +5902,10 @@
   "swapTokenVerifiedOn1SourceTitle": {
     "message": "Token có dấu hiệu giả"
   },
+  "swapTokenVerifiedSources": {
+    "message": "Được xác nhận bởi $1 nguồn. Xác minh trên $2.",
+    "description": "$1 the number of sources that have verified the token, $2 points the user to a block explorer as a place they can verify information about the token."
+  },
   "swapTooManyDecimalsError": {
     "message": "$1 cho phép tối đa $2 số thập phân",
     "description": "$1 is a token symbol and $2 is the max. number of decimals allowed for the token"
@@ -5918,6 +6023,12 @@
   "tips": {
     "message": "Mẹo"
   },
+  "tipsForUsingAWallet": {
+    "message": "Lời khuyên sử dụng ví"
+  },
+  "tipsForUsingAWalletDescription": {
+    "message": "Việc thêm token sẽ mở ra nhiều cách sử dụng web3 hơn."
+  },
   "to": {
     "message": "Đến"
   },
@@ -5970,6 +6081,9 @@
   "tokenList": {
     "message": "Danh sách token"
   },
+  "tokenMarketplace": {
+    "message": "Thị trường token"
+  },
   "tokenScamSecurityRisk": {
     "message": "rủi ro về bảo mật và lừa đảo token"
   },
@@ -6007,6 +6121,9 @@
   "total": {
     "message": "Tổng"
   },
+  "totalFees": {
+    "message": "Tổng phí"
+  },
   "totalVolume": {
     "message": "Tổng khối lượng giao dịch"
   },
diff --git a/app/_locales/zh_CN/messages.json b/app/_locales/zh_CN/messages.json
index ca1d0e3f7b48..9c5da6003052 100644
--- a/app/_locales/zh_CN/messages.json
+++ b/app/_locales/zh_CN/messages.json
@@ -416,6 +416,9 @@
   "alertMessageAddressMismatchWarning": {
     "message": "攻击者有时会通过对网站地址进行细微更改来模仿网站。在继续操作之前，请确保您是与目标网站进行交互。"
   },
+  "alertMessageChangeInSimulationResults": {
+    "message": "此交易的预计更改已更新。继续之前请仔细审查。"
+  },
   "alertMessageGasEstimateFailed": {
     "message": "我们无法提供准确的费用，估算可能较高。我们建议您输入自定义的燃料限制，但交易仍存在失败风险。"
   },
@@ -455,6 +458,9 @@
   "alertModalReviewAllAlerts": {
     "message": "查看所有提醒"
   },
+  "alertReasonChangeInSimulationResults": {
+    "message": "结果已发生变化"
+  },
   "alertReasonGasEstimateFailed": {
     "message": "费用不准确"
   },
@@ -837,18 +843,33 @@
   "bridge": {
     "message": "跨链桥"
   },
+  "bridgeCalculatingAmount": {
+    "message": "正在计算......"
+  },
   "bridgeDontSend": {
     "message": "跨链桥，不要发送"
   },
+  "bridgeEnterAmount": {
+    "message": "输入金额"
+  },
   "bridgeFrom": {
     "message": "桥接自"
   },
   "bridgeSelectNetwork": {
     "message": "选择网络"
   },
+  "bridgeSelectTokenAndAmount": {
+    "message": "选择代币和金额"
+  },
+  "bridgeTimingTooltipText": {
+    "message": "这是完成桥接所需的预估时间。"
+  },
   "bridgeTo": {
     "message": "桥接至"
   },
+  "bridgeTotalFeesTooltipText": {
+    "message": "这包括燃料费（支付给加密货币矿工）和中继器费用（用于为桥接等复杂服务提供动力）。\n费用根据网络流量和交易复杂性而定。MetaMask 不会从这两项费用中获利。"
+  },
   "browserNotSupported": {
     "message": "您的浏览器不受支持……"
   },
@@ -1160,6 +1181,14 @@
     "message": "与 $1 连接",
     "description": "$1 represents account name"
   },
+  "connectedWithNetwork": {
+    "message": "已连接 $1 网络",
+    "description": "$1 represents network length"
+  },
+  "connectedWithNetworkName": {
+    "message": "已与 $1 连接",
+    "description": "$1 represents network name"
+  },
   "connecting": {
     "message": "连接中……"
   },
@@ -1493,6 +1522,9 @@
   "dcent": {
     "message": "D'Cent"
   },
+  "debitCreditPurchaseOptions": {
+    "message": "借记卡或信用卡购买选项"
+  },
   "decimal": {
     "message": "代币小数"
   },
@@ -1802,6 +1834,9 @@
   "editSpendingCapError": {
     "message": "支出上限不能超过 $1 小数位数。删除小数位数以继续。"
   },
+  "editSpendingCapSpecialCharError": {
+    "message": "仅输入数字"
+  },
   "enableAutoDetect": {
     "message": " 启用自动检测"
   },
@@ -1904,10 +1939,42 @@
     "message": "代码：$1",
     "description": "Displayed error name for debugging purposes. $1 is the error name"
   },
+  "errorPageContactSupport": {
+    "message": "联系支持团队",
+    "description": "Button for contact MM support"
+  },
+  "errorPageDescribeUsWhatHappened": {
+    "message": "请描述所发生的问题",
+    "description": "Button for submitting report to sentry"
+  },
+  "errorPageInfo": {
+    "message": "您的信息不能显示。别担心，您的钱包和资金都很安全。",
+    "description": "Information banner shown in the error page"
+  },
+  "errorPageMessageTitle": {
+    "message": "错误消息",
+    "description": "Title for description, which is displayed for debugging purposes"
+  },
+  "errorPageSentryFormTitle": {
+    "message": "请描述所发生的问题",
+    "description": "In sentry feedback form, The title at the top of the feedback form."
+  },
+  "errorPageSentryMessagePlaceholder": {
+    "message": "分享如何重现错误等详细信息将有助于我们解决问题。",
+    "description": "In sentry feedback form, The placeholder for the feedback description input field."
+  },
+  "errorPageSentrySuccessMessageText": {
+    "message": "谢谢！我们将很快查看。",
+    "description": "In sentry feedback form, The message displayed after a successful feedback submission."
+  },
   "errorPageTitle": {
     "message": "MetaMask 遇到了一个错误",
     "description": "Title of generic error page"
   },
+  "errorPageTryAgain": {
+    "message": "重试",
+    "description": "Button for try again"
+  },
   "errorStack": {
     "message": "栈：",
     "description": "Title for error stack, which is displayed for debugging purposes"
@@ -1925,6 +1992,9 @@
   "estimatedFeeTooltip": {
     "message": "为在网络上处理交易而支付的金额。"
   },
+  "estimatedTime": {
+    "message": "预估时间"
+  },
   "ethGasPriceFetchWarning": {
     "message": "由于目前主要的燃料估算服务不可用，因此提供了备用燃料价格。"
   },
@@ -2070,6 +2140,9 @@
   "functionType": {
     "message": "功能类型"
   },
+  "fundingMethod": {
+    "message": "充值方法"
+  },
   "gas": {
     "message": "燃料"
   },
@@ -3724,6 +3797,12 @@
   "outdatedBrowserNotification": {
     "message": "您的浏览器已过期。如果不更新浏览器，您将无法获取MetaMask的安全补丁和新功能。"
   },
+  "overrideContentSecurityPolicyHeader": {
+    "message": "覆盖 Content-Security-Policy 标头"
+  },
+  "overrideContentSecurityPolicyHeaderDescription": {
+    "message": "此选项是 Firefox 中已知问题的解决方法，其中 dapp（去中心化应用）的 Content-Security-Policy 标头可能会阻止扩展程序正确加载。除非特定网页兼容性需要，否则不建议禁用此选项。"
+  },
   "padlock": {
     "message": "挂锁"
   },
@@ -4395,6 +4474,9 @@
   "requestFromInfo": {
     "message": "这是要求您签名的站点。"
   },
+  "requestFromInfoSnap": {
+    "message": "这是要求您签名的 Snap。"
+  },
   "requestFromTransactionDescription": {
     "message": "这是要求您确认的网站。"
   },
@@ -4417,6 +4499,10 @@
     "message": "请求 $1",
     "description": "Name of Account"
   },
+  "requestingForNetwork": {
+    "message": "请求 $1",
+    "description": "Name of Network"
+  },
   "requestsAwaitingAcknowledgement": {
     "message": "待确认的请求"
   },
@@ -4895,6 +4981,9 @@
   "simulationDetailsIncomingHeading": {
     "message": "您收到"
   },
+  "simulationDetailsNoChanges": {
+    "message": "无变化"
+  },
   "simulationDetailsOutgoingHeading": {
     "message": "您发送"
   },
@@ -4917,6 +5006,9 @@
   "simulationDetailsTransactionReverted": {
     "message": "这笔交易可能会失败"
   },
+  "simulationDetailsUnavailable": {
+    "message": "不可用"
+  },
   "simulationErrorMessageV2": {
     "message": "我们无法估算燃料。合约中可能存在错误，这笔交易可能会失败。"
   },
@@ -5143,6 +5235,15 @@
     "message": "联系 $1 的创建者以获得进一步支持。",
     "description": "This is shown when the insight snap throws an error. $1 is the snap name"
   },
+  "solanaSupportSectionTitle": {
+    "message": "Solana"
+  },
+  "solanaSupportToggleDescription": {
+    "message": "启用此功能后，您可以选择将 Solana 账户添加到衍生自现有私钥助记词的 MetaMask Extension 中。这是一个实验性的测试版功能，因此您应自行承担使用风险。"
+  },
+  "solanaSupportToggleTitle": {
+    "message": "启用“添加新的 Solana 账户（测试版）”"
+  },
   "somethingDoesntLookRight": {
     "message": "有什么不对劲吗？$1",
     "description": "A false positive message for users to contact support. $1 is a link to the support page."
@@ -5801,6 +5902,10 @@
   "swapTokenVerifiedOn1SourceTitle": {
     "message": "可能伪造的代币"
   },
+  "swapTokenVerifiedSources": {
+    "message": "已经过 $1 来源确认。在 $2 上验证。",
+    "description": "$1 the number of sources that have verified the token, $2 points the user to a block explorer as a place they can verify information about the token."
+  },
   "swapTooManyDecimalsError": {
     "message": "$1 允许最多 $2 个小数位",
     "description": "$1 is a token symbol and $2 is the max. number of decimals allowed for the token"
@@ -5918,6 +6023,12 @@
   "tips": {
     "message": "提示"
   },
+  "tipsForUsingAWallet": {
+    "message": "钱包使用提示"
+  },
+  "tipsForUsingAWalletDescription": {
+    "message": "添加代币可解锁使用 Web3 的更多方法。"
+  },
   "to": {
     "message": "至"
   },
@@ -5970,6 +6081,9 @@
   "tokenList": {
     "message": "代币列表："
   },
+  "tokenMarketplace": {
+    "message": "代币市场"
+  },
   "tokenScamSecurityRisk": {
     "message": "代币欺诈和安全风险。"
   },
@@ -6007,6 +6121,9 @@
   "total": {
     "message": "共计"
   },
+  "totalFees": {
+    "message": "总费用"
+  },
   "totalVolume": {
     "message": "总交易额"
   },

From 6ef73b3903f0554f63901c71f67fbc3771b3316d Mon Sep 17 00:00:00 2001
From: Mathieu Artu <mathieu.artu@consensys.net>
Date: Mon, 9 Dec 2024 18:01:21 +0100
Subject: [PATCH 060/175] feat: various profile syncing improvements (#29022)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## **Description**

This PR improves different things around profile syncing.

- It decouples syncing features from any notifications dependency.
- It adds a new `MetamaskIdentityProvider` which will be responsible for
dispatching syncing features
- It changes the implementation of `ProfileSyncDevSettings` so we'll be
able to add more settings easily
- It adds missing tests

[![Open in GitHub
Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/29022?quickstart=1)

## **Related issues**

Fixes:

## **Manual testing steps**

1. Onboard
2. Go to developer settings and click for the account syncing deletion
button
3. Go back to the home view
4. Reload the extension and open developer settings
5. Look for a successful network call to
`https://user-storage.api.cx.metamask.io/api/v1/userstorage/accounts_v2`

More generally, verify that account syncing works (but E2E tests covers
this).

## **Screenshots/Recordings**

<!-- If applicable, add screenshots and/or recordings to visualize the
before and after of your change. -->

### **Before**

<!-- [screenshots/recordings] -->

### **After**

<!-- [screenshots/recordings] -->

## **Pre-merge author checklist**

- [x] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension Coding
Standards](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/CODING_GUIDELINES.md).
- [x] I've completed the PR template to the best of my ability
- [x] I’ve included tests if applicable
- [x] I’ve documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [x] I’ve applied the right labels on the PR (see [labeling
guidelines](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.

## **Pre-merge reviewer checklist**

- [x] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed).
- [x] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.
---
 ui/contexts/identity/index.tsx                |  15 ++
 .../metamask-notifications.tsx                |   3 -
 ui/hooks/identity/useCreateSession.ts         |  10 +-
 .../useProfileSyncing/accountSyncing.test.tsx | 171 ++++++++++++++----
 .../useProfileSyncing/accountSyncing.ts       |  69 ++++---
 ui/hooks/identity/useProfileSyncing/index.ts  |   3 +-
 .../useProfileSyncing/profileSyncing.test.tsx |  95 +---------
 .../useProfileSyncing/profileSyncing.ts       |  45 +----
 .../useNotifications.test.tsx                 |   5 +-
 ui/pages/index.js                             |   9 +-
 .../profile-sync.test.tsx                     |  58 ++++++
 .../developer-options-tab/profile-sync.tsx    |  61 ++++---
 12 files changed, 319 insertions(+), 225 deletions(-)
 create mode 100644 ui/contexts/identity/index.tsx
 create mode 100644 ui/pages/settings/developer-options-tab/profile-sync.test.tsx

diff --git a/ui/contexts/identity/index.tsx b/ui/contexts/identity/index.tsx
new file mode 100644
index 000000000000..647e91c54d63
--- /dev/null
+++ b/ui/contexts/identity/index.tsx
@@ -0,0 +1,15 @@
+import React, { useEffect } from 'react';
+import { useAccountSyncing } from '../../hooks/identity/useProfileSyncing';
+
+export const MetamaskIdentityProvider: React.FC = ({ children }) => {
+  const { dispatchAccountSyncing, shouldDispatchAccountSyncing } =
+    useAccountSyncing();
+
+  useEffect(() => {
+    if (shouldDispatchAccountSyncing) {
+      dispatchAccountSyncing();
+    }
+  }, [shouldDispatchAccountSyncing, dispatchAccountSyncing]);
+
+  return <>{children}</>;
+};
diff --git a/ui/contexts/metamask-notifications/metamask-notifications.tsx b/ui/contexts/metamask-notifications/metamask-notifications.tsx
index 2019e85a1391..350d8114fe1c 100644
--- a/ui/contexts/metamask-notifications/metamask-notifications.tsx
+++ b/ui/contexts/metamask-notifications/metamask-notifications.tsx
@@ -1,7 +1,6 @@
 import React, { createContext, useContext, useEffect, useMemo } from 'react';
 import { useSelector } from 'react-redux';
 import { useListNotifications } from '../../hooks/metamask-notifications/useNotifications';
-import { useAccountSyncingEffect } from '../../hooks/identity/useProfileSyncing';
 import { selectIsProfileSyncingEnabled } from '../../selectors/identity/profile-syncing';
 import { selectIsMetamaskNotificationsEnabled } from '../../selectors/metamask-notifications/metamask-notifications';
 import { getUseExternalServices } from '../../selectors';
@@ -44,8 +43,6 @@ export const MetamaskNotificationsProvider: React.FC = ({ children }) => {
     [isProfileSyncingEnabled, isNotificationsEnabled],
   );
 
-  useAccountSyncingEffect();
-
   useEffect(() => {
     if (basicFunctionality && shouldFetchNotifications && isUnlocked) {
       listNotifications();
diff --git a/ui/hooks/identity/useCreateSession.ts b/ui/hooks/identity/useCreateSession.ts
index 5ccd8bad40e5..1ee6c92874c8 100644
--- a/ui/hooks/identity/useCreateSession.ts
+++ b/ui/hooks/identity/useCreateSession.ts
@@ -31,6 +31,14 @@ export function useCreateSession(): {
   );
 
   const createSession = useCallback(async () => {
+    const safeDispatchDisableProfileSync = async () => {
+      try {
+        await dispatch(disableProfileSyncing());
+      } catch {
+        // Do Nothing
+      }
+    };
+
     // If the user is already signed in, no need to create a new session
     if (isSignedIn) {
       return;
@@ -47,7 +55,7 @@ export function useCreateSession(): {
         await dispatch(performSignIn());
       } catch (e) {
         // If an error occurs during the sign-in process, disable profile syncing
-        await dispatch(disableProfileSyncing());
+        await safeDispatchDisableProfileSync();
         const errorMessage =
           e instanceof Error ? e.message : JSON.stringify(e ?? '');
         log.error(errorMessage);
diff --git a/ui/hooks/identity/useProfileSyncing/accountSyncing.test.tsx b/ui/hooks/identity/useProfileSyncing/accountSyncing.test.tsx
index 604466b3a75c..2423e3026b12 100644
--- a/ui/hooks/identity/useProfileSyncing/accountSyncing.test.tsx
+++ b/ui/hooks/identity/useProfileSyncing/accountSyncing.test.tsx
@@ -1,70 +1,179 @@
 import { waitFor } from '@testing-library/react';
-import { act } from '@testing-library/react-hooks';
 import { renderHookWithProviderTyped } from '../../../../test/lib/render-helpers';
 import * as actions from '../../../store/actions';
+import { MetamaskIdentityProvider } from '../../../contexts/identity';
 import {
-  useAccountSyncingEffect,
+  useAccountSyncing,
   useDeleteAccountSyncingDataFromUserStorage,
+  useShouldDispatchAccountSyncing,
 } from './accountSyncing';
-import * as ProfileSyncModule from './profileSyncing';
 
-describe('useDeleteAccountSyncingDataFromUserStorage()', () => {
-  it('should dispatch account sync data deletion', async () => {
-    const mockDeleteAccountSyncAction = jest.spyOn(
-      actions,
-      'deleteAccountSyncingDataFromUserStorage',
-    );
+type ArrangeMocksMetamaskStateOverrides = {
+  isSignedIn?: boolean;
+  isProfileSyncingEnabled?: boolean;
+  isUnlocked?: boolean;
+  useExternalServices?: boolean;
+  completedOnboarding?: boolean;
+  isAccountSyncingReadyToBeDispatched?: boolean;
+};
 
-    const { result } = renderHookWithProviderTyped(
-      () => useDeleteAccountSyncingDataFromUserStorage(),
-      {},
-    );
+const initialMetamaskState: ArrangeMocksMetamaskStateOverrides = {
+  isSignedIn: true,
+  isProfileSyncingEnabled: true,
+  isUnlocked: true,
+  useExternalServices: true,
+  completedOnboarding: true,
+  isAccountSyncingReadyToBeDispatched: true,
+};
+
+const arrangeMockState = (
+  metamaskStateOverrides?: ArrangeMocksMetamaskStateOverrides,
+) => {
+  const state = {
+    metamask: {
+      ...initialMetamaskState,
+      ...metamaskStateOverrides,
+    },
+  };
 
-    await act(async () => {
-      await result.current.dispatchDeleteAccountData();
+  return { state };
+};
+
+describe('useShouldDispatchAccountSyncing()', () => {
+  const testCases = (() => {
+    const properties = [
+      'isSignedIn',
+      'isProfileSyncingEnabled',
+      'isUnlocked',
+      'useExternalServices',
+      'completedOnboarding',
+      'isAccountSyncingReadyToBeDispatched',
+    ] as const;
+    const baseState = {
+      isSignedIn: true,
+      isProfileSyncingEnabled: true,
+      isUnlocked: true,
+      useExternalServices: true,
+      completedOnboarding: true,
+      isAccountSyncingReadyToBeDispatched: true,
+    };
+
+    const failureStateCases: {
+      state: ArrangeMocksMetamaskStateOverrides;
+      failingField: string;
+    }[] = [];
+
+    // Generate test cases by toggling each property
+    properties.forEach((property) => {
+      const state = { ...baseState, [property]: false };
+      failureStateCases.push({ state, failingField: property });
     });
 
-    expect(mockDeleteAccountSyncAction).toHaveBeenCalled();
+    const successTestCase = { state: baseState };
+
+    return { successTestCase, failureStateCases };
+  })();
+
+  it('should return true if all conditions are met', () => {
+    const { state } = arrangeMockState(testCases.successTestCase.state);
+    const hook = renderHookWithProviderTyped(
+      () => useShouldDispatchAccountSyncing(),
+      state,
+      undefined,
+      MetamaskIdentityProvider,
+    );
+    expect(hook.result.current).toBe(true);
   });
+
+  // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+  // @ts-ignore
+  it.each(testCases.failureStateCases)(
+    'should return false if not all conditions are met [%s = false]',
+    ({
+      state: failureState,
+    }: (typeof testCases)['failureStateCases'][number]) => {
+      const { state } = arrangeMockState(failureState);
+      const hook = renderHookWithProviderTyped(
+        () => useShouldDispatchAccountSyncing(),
+        state,
+        undefined,
+        MetamaskIdentityProvider,
+      );
+      expect(hook.result.current).toBe(false);
+    },
+  );
 });
 
-describe('useAccountSyncingEffect', () => {
+describe('useAccountSyncing', () => {
   const arrangeMocks = () => {
-    const mockUseShouldProfileSync = jest.spyOn(
-      ProfileSyncModule,
-      'useShouldDispatchProfileSyncing',
-    );
     const mockSyncAccountsAction = jest.spyOn(
       actions,
       'syncInternalAccountsWithUserStorage',
     );
     return {
-      mockUseShouldProfileSync,
       mockSyncAccountsAction,
     };
   };
 
-  const arrangeAndAct = (props: { profileSyncConditionsMet: boolean }) => {
+  const arrangeAndAct = (
+    stateOverrides: ArrangeMocksMetamaskStateOverrides = initialMetamaskState,
+  ) => {
     const mocks = arrangeMocks();
-    mocks.mockUseShouldProfileSync.mockReturnValue(
-      props.profileSyncConditionsMet,
+    const { state } = arrangeMockState(stateOverrides);
+
+    const { result } = renderHookWithProviderTyped(
+      () => useAccountSyncing(),
+      state,
+      undefined,
+      MetamaskIdentityProvider,
     );
+    const { dispatchAccountSyncing, shouldDispatchAccountSyncing } =
+      result.current;
 
-    renderHookWithProviderTyped(() => useAccountSyncingEffect(), {});
-    return mocks;
+    return { mocks, dispatchAccountSyncing, shouldDispatchAccountSyncing };
   };
 
-  it('should run effect if profile sync conditions are met', async () => {
-    const mocks = arrangeAndAct({ profileSyncConditionsMet: true });
+  it('should dispatch if conditions are met', async () => {
+    const { mocks, dispatchAccountSyncing, shouldDispatchAccountSyncing } =
+      arrangeAndAct();
+
+    await dispatchAccountSyncing();
+
     await waitFor(() => {
       expect(mocks.mockSyncAccountsAction).toHaveBeenCalled();
+      expect(shouldDispatchAccountSyncing).toBe(true);
     });
   });
 
-  it('should not run effect if profile sync conditions are not met', async () => {
-    const mocks = arrangeAndAct({ profileSyncConditionsMet: false });
+  it('should not dispatch conditions are not met', async () => {
+    const { mocks, dispatchAccountSyncing, shouldDispatchAccountSyncing } =
+      arrangeAndAct({ isAccountSyncingReadyToBeDispatched: false });
+
+    await dispatchAccountSyncing();
+
     await waitFor(() => {
       expect(mocks.mockSyncAccountsAction).not.toHaveBeenCalled();
+      expect(shouldDispatchAccountSyncing).toBe(false);
     });
   });
 });
+
+describe('useDeleteAccountSyncingDataFromUserStorage()', () => {
+  it('should dispatch account sync data deletion', async () => {
+    const mockDeleteAccountSyncAction = jest.spyOn(
+      actions,
+      'deleteAccountSyncingDataFromUserStorage',
+    );
+
+    const { result } = renderHookWithProviderTyped(
+      () => useDeleteAccountSyncingDataFromUserStorage(),
+      arrangeMockState().state,
+      undefined,
+      MetamaskIdentityProvider,
+    );
+
+    await result.current.dispatchDeleteAccountSyncingData();
+
+    expect(mockDeleteAccountSyncAction).toHaveBeenCalled();
+  });
+});
diff --git a/ui/hooks/identity/useProfileSyncing/accountSyncing.ts b/ui/hooks/identity/useProfileSyncing/accountSyncing.ts
index cef4dc80fa75..4fed63894d2f 100644
--- a/ui/hooks/identity/useProfileSyncing/accountSyncing.ts
+++ b/ui/hooks/identity/useProfileSyncing/accountSyncing.ts
@@ -1,11 +1,52 @@
 import log from 'loglevel';
-import { useCallback, useEffect } from 'react';
-import { useDispatch } from 'react-redux';
+import { useCallback } from 'react';
+import { useDispatch, useSelector } from 'react-redux';
 import {
   deleteAccountSyncingDataFromUserStorage,
   syncInternalAccountsWithUserStorage,
 } from '../../../store/actions';
-import { useShouldDispatchProfileSyncing } from './profileSyncing';
+import {
+  selectIsAccountSyncingReadyToBeDispatched,
+  selectIsProfileSyncingEnabled,
+} from '../../../selectors/identity/profile-syncing';
+import { getUseExternalServices } from '../../../selectors';
+import {
+  getCompletedOnboarding,
+  getIsUnlocked,
+} from '../../../ducks/metamask/metamask';
+import { selectIsSignedIn } from '../../../selectors/identity/authentication';
+
+/**
+ * A utility used internally to decide if account syncing should be dispatched
+ * Considers factors like basic functionality; unlocked; finished onboarding, is logged in, and more specific logic.
+ *
+ * @returns a boolean if internally we can perform account syncing or not.
+ */
+export const useShouldDispatchAccountSyncing = () => {
+  const isAccountSyncingReadyToBeDispatched = useSelector(
+    selectIsAccountSyncingReadyToBeDispatched,
+  );
+  const isProfileSyncingEnabled = useSelector(selectIsProfileSyncingEnabled);
+  const basicFunctionality: boolean | undefined = useSelector(
+    getUseExternalServices,
+  );
+  const isUnlocked: boolean | undefined = useSelector(getIsUnlocked);
+  const isSignedIn = useSelector(selectIsSignedIn);
+  const completedOnboarding: boolean | undefined = useSelector(
+    getCompletedOnboarding,
+  );
+
+  const shouldDispatchProfileSyncing: boolean = Boolean(
+    basicFunctionality &&
+      isProfileSyncingEnabled &&
+      isUnlocked &&
+      isSignedIn &&
+      completedOnboarding &&
+      isAccountSyncingReadyToBeDispatched,
+  );
+
+  return shouldDispatchProfileSyncing;
+};
 
 /**
  * Custom hook to dispatch account syncing.
@@ -13,10 +54,10 @@ import { useShouldDispatchProfileSyncing } from './profileSyncing';
  * @returns An object containing the `dispatchAccountSyncing` function, boolean `shouldDispatchAccountSyncing`,
  * and error state.
  */
-const useAccountSyncing = () => {
+export const useAccountSyncing = () => {
   const dispatch = useDispatch();
 
-  const shouldDispatchAccountSyncing = useShouldDispatchProfileSyncing();
+  const shouldDispatchAccountSyncing = useShouldDispatchAccountSyncing();
 
   const dispatchAccountSyncing = useCallback(() => {
     try {
@@ -35,26 +76,12 @@ const useAccountSyncing = () => {
   };
 };
 
-/**
- * Custom hook to apply account syncing effect.
- */
-export const useAccountSyncingEffect = () => {
-  const shouldSync = useShouldDispatchProfileSyncing();
-  const { dispatchAccountSyncing } = useAccountSyncing();
-
-  useEffect(() => {
-    if (shouldSync) {
-      dispatchAccountSyncing();
-    }
-  }, [shouldSync, dispatchAccountSyncing]);
-};
-
 /**
  * Custom hook to delete a user's account syncing data from user storage
  */
 export const useDeleteAccountSyncingDataFromUserStorage = () => {
   const dispatch = useDispatch();
-  const dispatchDeleteAccountData = useCallback(async () => {
+  const dispatchDeleteAccountSyncingData = useCallback(async () => {
     try {
       await dispatch(deleteAccountSyncingDataFromUserStorage());
     } catch {
@@ -62,5 +89,5 @@ export const useDeleteAccountSyncingDataFromUserStorage = () => {
     }
   }, []);
 
-  return { dispatchDeleteAccountData };
+  return { dispatchDeleteAccountSyncingData };
 };
diff --git a/ui/hooks/identity/useProfileSyncing/index.ts b/ui/hooks/identity/useProfileSyncing/index.ts
index 9a6cda8468fb..392d84c112b0 100644
--- a/ui/hooks/identity/useProfileSyncing/index.ts
+++ b/ui/hooks/identity/useProfileSyncing/index.ts
@@ -4,6 +4,7 @@ export {
   useSetIsProfileSyncingEnabled,
 } from './profileSyncing';
 export {
-  useAccountSyncingEffect,
+  useAccountSyncing,
+  useShouldDispatchAccountSyncing,
   useDeleteAccountSyncingDataFromUserStorage,
 } from './accountSyncing';
diff --git a/ui/hooks/identity/useProfileSyncing/profileSyncing.test.tsx b/ui/hooks/identity/useProfileSyncing/profileSyncing.test.tsx
index 42e902e29401..949d15445b7e 100644
--- a/ui/hooks/identity/useProfileSyncing/profileSyncing.test.tsx
+++ b/ui/hooks/identity/useProfileSyncing/profileSyncing.test.tsx
@@ -5,40 +5,8 @@ import * as actions from '../../../store/actions';
 import {
   useDisableProfileSyncing,
   useEnableProfileSyncing,
-  useShouldDispatchProfileSyncing,
 } from './profileSyncing';
 
-type ArrangeMocksMetamaskStateOverrides = {
-  isSignedIn?: boolean;
-  isProfileSyncingEnabled?: boolean;
-  isUnlocked?: boolean;
-  useExternalServices?: boolean;
-  completedOnboarding?: boolean;
-  isAccountSyncingReadyToBeDispatched?: boolean;
-};
-
-const initialMetamaskState: ArrangeMocksMetamaskStateOverrides = {
-  isSignedIn: false,
-  isProfileSyncingEnabled: false,
-  isUnlocked: true,
-  useExternalServices: true,
-  completedOnboarding: true,
-  isAccountSyncingReadyToBeDispatched: true,
-};
-
-const arrangeMockState = (
-  metamaskStateOverrides?: ArrangeMocksMetamaskStateOverrides,
-) => {
-  const state = {
-    metamask: {
-      ...initialMetamaskState,
-      ...metamaskStateOverrides,
-    },
-  };
-
-  return { state };
-};
-
 describe('useEnableProfileSyncing()', () => {
   it('should enable profile syncing', async () => {
     const mockEnableProfileSyncingAction = jest.spyOn(
@@ -46,10 +14,9 @@ describe('useEnableProfileSyncing()', () => {
       'enableProfileSyncing',
     );
 
-    const { state } = arrangeMockState();
     const { result } = renderHookWithProviderTyped(
       () => useEnableProfileSyncing(),
-      state,
+      {},
     );
     await act(async () => {
       await result.current.enableProfileSyncing();
@@ -66,11 +33,9 @@ describe('useDisableProfileSyncing()', () => {
       'disableProfileSyncing',
     );
 
-    const { state } = arrangeMockState();
-
     const { result } = renderHookWithProviderTyped(
       () => useDisableProfileSyncing(),
-      state,
+      {},
       undefined,
       MetamaskNotificationsProvider,
     );
@@ -82,59 +47,3 @@ describe('useDisableProfileSyncing()', () => {
     expect(mockDisableProfileSyncingAction).toHaveBeenCalled();
   });
 });
-
-describe('useShouldDispatchProfileSyncing()', () => {
-  const testCases = (() => {
-    const properties = [
-      'isSignedIn',
-      'isProfileSyncingEnabled',
-      'isUnlocked',
-      'useExternalServices',
-      'completedOnboarding',
-      'isAccountSyncingReadyToBeDispatched',
-    ] as const;
-    const baseState = {
-      isSignedIn: true,
-      isProfileSyncingEnabled: true,
-      isUnlocked: true,
-      useExternalServices: true,
-      completedOnboarding: true,
-      isAccountSyncingReadyToBeDispatched: true,
-    };
-
-    const failureStateCases: {
-      state: ArrangeMocksMetamaskStateOverrides;
-      failingField: string;
-    }[] = [];
-
-    // Generate test cases by toggling each property
-    properties.forEach((property) => {
-      const state = { ...baseState, [property]: false };
-      failureStateCases.push({ state, failingField: property });
-    });
-
-    const successTestCase = { state: baseState };
-
-    return { successTestCase, failureStateCases };
-  })();
-
-  it('should return true if all conditions are met', () => {
-    const { state } = arrangeMockState(testCases.successTestCase.state);
-    const hook = renderHookWithProviderTyped(
-      () => useShouldDispatchProfileSyncing(),
-      state,
-    );
-    expect(hook.result.current).toBe(true);
-  });
-
-  testCases.failureStateCases.forEach(({ state, failingField }) => {
-    it(`should return false if not all conditions are met [${failingField} = false]`, () => {
-      const { state: newState } = arrangeMockState(state);
-      const hook = renderHookWithProviderTyped(
-        () => useShouldDispatchProfileSyncing(),
-        newState,
-      );
-      expect(hook.result.current).toBe(false);
-    });
-  });
-});
diff --git a/ui/hooks/identity/useProfileSyncing/profileSyncing.ts b/ui/hooks/identity/useProfileSyncing/profileSyncing.ts
index dcac4c9cdd64..5e3581927c08 100644
--- a/ui/hooks/identity/useProfileSyncing/profileSyncing.ts
+++ b/ui/hooks/identity/useProfileSyncing/profileSyncing.ts
@@ -1,5 +1,5 @@
 import { useState, useCallback } from 'react';
-import { useDispatch, useSelector } from 'react-redux';
+import { useDispatch } from 'react-redux';
 import log from 'loglevel';
 import { useMetamaskNotificationsContext } from '../../../contexts/metamask-notifications/metamask-notifications';
 import {
@@ -9,17 +9,6 @@ import {
   hideLoadingIndication,
 } from '../../../store/actions';
 
-import { selectIsSignedIn } from '../../../selectors/identity/authentication';
-import {
-  selectIsAccountSyncingReadyToBeDispatched,
-  selectIsProfileSyncingEnabled,
-} from '../../../selectors/identity/profile-syncing';
-import { getUseExternalServices } from '../../../selectors';
-import {
-  getIsUnlocked,
-  getCompletedOnboarding,
-} from '../../../ducks/metamask/metamask';
-
 /**
  * Custom hook to enable profile syncing. This hook handles the process of signing in
  * and enabling profile syncing via dispatch actions.
@@ -115,35 +104,3 @@ export function useSetIsProfileSyncingEnabled(): {
 
   return { setIsProfileSyncingEnabled, error };
 }
-
-/**
- * A utility used internally to decide if syncing features should be dispatched
- * Considers factors like basic functionality; unlocked; finished onboarding, and is logged in
- *
- * @returns a boolean if internally we can perform syncing features or not.
- */
-export const useShouldDispatchProfileSyncing = () => {
-  const isAccountSyncingReadyToBeDispatched = useSelector(
-    selectIsAccountSyncingReadyToBeDispatched,
-  );
-  const isProfileSyncingEnabled = useSelector(selectIsProfileSyncingEnabled);
-  const basicFunctionality: boolean | undefined = useSelector(
-    getUseExternalServices,
-  );
-  const isUnlocked: boolean | undefined = useSelector(getIsUnlocked);
-  const isSignedIn = useSelector(selectIsSignedIn);
-  const completedOnboarding: boolean | undefined = useSelector(
-    getCompletedOnboarding,
-  );
-
-  const shouldDispatchProfileSyncing: boolean = Boolean(
-    basicFunctionality &&
-      isProfileSyncingEnabled &&
-      isUnlocked &&
-      isSignedIn &&
-      completedOnboarding &&
-      isAccountSyncingReadyToBeDispatched,
-  );
-
-  return shouldDispatchProfileSyncing;
-};
diff --git a/ui/hooks/metamask-notifications/useNotifications.test.tsx b/ui/hooks/metamask-notifications/useNotifications.test.tsx
index 52097f3c04b4..67cecbd9950a 100644
--- a/ui/hooks/metamask-notifications/useNotifications.test.tsx
+++ b/ui/hooks/metamask-notifications/useNotifications.test.tsx
@@ -29,7 +29,10 @@ jest.mock('../identity/useProfileSyncing', () => ({
   useEnableProfileSyncing: jest.fn(() => ({
     enableProfileSyncing: jest.fn(),
   })),
-  useAccountSyncingEffect: jest.fn(),
+  useAccountSyncing: jest.fn(() => ({
+    dispatchAccountSyncing: jest.fn(),
+    shouldDispatchAccountSyncing: true,
+  })),
 }));
 
 describe('useNotifications', () => {
diff --git a/ui/pages/index.js b/ui/pages/index.js
index 9b6147b6f421..8c06c0f7429a 100644
--- a/ui/pages/index.js
+++ b/ui/pages/index.js
@@ -11,6 +11,7 @@ import {
 } from '../contexts/metametrics';
 import { MetamaskNotificationsProvider } from '../contexts/metamask-notifications';
 import { AssetPollingProvider } from '../contexts/assetPolling';
+import { MetamaskIdentityProvider } from '../contexts/identity';
 import ErrorPage from './error-page/error-page.component';
 
 import Routes from './routes';
@@ -51,9 +52,11 @@ class Index extends PureComponent {
                 <I18nProvider>
                   <LegacyI18nProvider>
                     <AssetPollingProvider>
-                      <MetamaskNotificationsProvider>
-                        <Routes />
-                      </MetamaskNotificationsProvider>
+                      <MetamaskIdentityProvider>
+                        <MetamaskNotificationsProvider>
+                          <Routes />
+                        </MetamaskNotificationsProvider>
+                      </MetamaskIdentityProvider>
                     </AssetPollingProvider>
                   </LegacyI18nProvider>
                 </I18nProvider>
diff --git a/ui/pages/settings/developer-options-tab/profile-sync.test.tsx b/ui/pages/settings/developer-options-tab/profile-sync.test.tsx
new file mode 100644
index 000000000000..02844f45fc88
--- /dev/null
+++ b/ui/pages/settings/developer-options-tab/profile-sync.test.tsx
@@ -0,0 +1,58 @@
+import React from 'react';
+import { render, fireEvent, waitFor } from '@testing-library/react';
+import '@testing-library/jest-dom/extend-expect';
+import { useDeleteAccountSyncingDataFromUserStorage } from '../../../hooks/identity/useProfileSyncing';
+import { renderHookWithProviderTyped } from '../../../../test/lib/render-helpers';
+import {
+  ProfileSyncDevSettings,
+  useDeleteAccountSyncDataProps,
+} from './profile-sync';
+
+jest.mock('../../../hooks/identity/useProfileSyncing');
+
+describe('ProfileSyncDevSettings', () => {
+  const mockDispatchDeleteAccountSyncingData = jest.fn();
+
+  beforeEach(() => {
+    (useDeleteAccountSyncingDataFromUserStorage as jest.Mock).mockReturnValue({
+      dispatchDeleteAccountSyncingData: mockDispatchDeleteAccountSyncingData,
+    });
+  });
+
+  afterEach(() => {
+    jest.clearAllMocks();
+  });
+
+  it('renders the ProfileSyncDevSettings component', () => {
+    const { getByText } = render(<ProfileSyncDevSettings />);
+    expect(getByText('Profile Sync')).toBeInTheDocument();
+  });
+
+  it('calls onDelete and shows success icon when reset button is clicked', async () => {
+    const { getByRole } = render(<ProfileSyncDevSettings />);
+    const resetButton = getByRole('button', { name: 'Reset' });
+
+    fireEvent.click(resetButton);
+
+    await waitFor(() => {
+      expect(mockDispatchDeleteAccountSyncingData).toHaveBeenCalled();
+
+      const iconElement = document.querySelector(
+        '.settings-page-developer-options__icon-check',
+      );
+      expect(iconElement).toBeVisible();
+    });
+  });
+
+  it('displays the correct title and description', () => {
+    const { getByText } = render(<ProfileSyncDevSettings />);
+
+    const { title, description } = renderHookWithProviderTyped(
+      () => useDeleteAccountSyncDataProps(),
+      {},
+    ).result.current;
+
+    expect(getByText(title)).toBeInTheDocument();
+    expect(getByText(description)).toBeInTheDocument();
+  });
+});
diff --git a/ui/pages/settings/developer-options-tab/profile-sync.tsx b/ui/pages/settings/developer-options-tab/profile-sync.tsx
index 91ddb8db436d..e74f4ccd6905 100644
--- a/ui/pages/settings/developer-options-tab/profile-sync.tsx
+++ b/ui/pages/settings/developer-options-tab/profile-sync.tsx
@@ -1,5 +1,4 @@
 import React, { useCallback, useState } from 'react';
-
 import {
   Box,
   Button,
@@ -9,7 +8,6 @@ import {
   IconSize,
   Text,
 } from '../../../components/component-library';
-
 import {
   IconColor,
   Display,
@@ -19,19 +17,19 @@ import {
 } from '../../../helpers/constants/design-system';
 import { useDeleteAccountSyncingDataFromUserStorage } from '../../../hooks/identity/useProfileSyncing';
 
-const AccountSyncDeleteDataFromUserStorage = () => {
-  const [hasDeletedAccountSyncEntries, setHasDeletedAccountSyncEntries] =
-    useState(false);
-
-  const { dispatchDeleteAccountData } =
-    useDeleteAccountSyncingDataFromUserStorage();
-
-  const handleDeleteAccountSyncingDataFromUserStorage =
-    useCallback(async () => {
-      await dispatchDeleteAccountData();
-      setHasDeletedAccountSyncEntries(true);
-    }, [dispatchDeleteAccountData, setHasDeletedAccountSyncEntries]);
+type DeleteSyncedDataProps = {
+  onDelete: () => Promise<void>;
+  deleteSuccessful: boolean;
+  title: string;
+  description: string;
+};
 
+const DeleteSyncedData = ({
+  onDelete,
+  deleteSuccessful,
+  title,
+  description,
+}: DeleteSyncedDataProps) => {
   return (
     <div className="settings-page__content-padded">
       <Box
@@ -42,22 +40,14 @@ const AccountSyncDeleteDataFromUserStorage = () => {
         gap={4}
       >
         <div className="settings-page__content-item">
-          <span>Account syncing</span>
+          <span>{title}</span>
           <div className="settings-page__content-description">
-            Deletes all user storage entries for the current SRP. This can help
-            if you tested Account Syncing early on and have corrupted data. This
-            will not remove internal accounts already created and renamed. If
-            you want to start from scratch with only the first account and
-            restart syncing from this point on, you will need to reinstall the
-            extension after this action.
+            {description}
           </div>
         </div>
 
         <div className="settings-page__content-item-col">
-          <Button
-            variant={ButtonVariant.Primary}
-            onClick={handleDeleteAccountSyncingDataFromUserStorage}
-          >
+          <Button variant={ButtonVariant.Primary} onClick={onDelete}>
             Reset
           </Button>
         </div>
@@ -74,7 +64,7 @@ const AccountSyncDeleteDataFromUserStorage = () => {
               name={IconName.Check}
               color={IconColor.successDefault}
               size={IconSize.Lg}
-              hidden={!hasDeletedAccountSyncEntries}
+              hidden={!deleteSuccessful}
             />
           </Box>
         </div>
@@ -83,13 +73,30 @@ const AccountSyncDeleteDataFromUserStorage = () => {
   );
 };
 
+export const useDeleteAccountSyncDataProps = () => {
+  const [deleteSuccessful, setDeleteSuccessful] = useState(false);
+  const { dispatchDeleteAccountSyncingData } =
+    useDeleteAccountSyncingDataFromUserStorage();
+  const onDelete = useCallback(async () => {
+    await dispatchDeleteAccountSyncingData();
+    setDeleteSuccessful(true);
+  }, []);
+  return {
+    deleteSuccessful,
+    onDelete,
+    title: 'Account syncing',
+    description:
+      'Deletes all user storage entries for the current SRP. This can help if you tested Account Syncing early on and have corrupted data. This will not remove internal accounts already created and renamed. If you want to start from scratch with only the first account and restart syncing from this point on, you will need to reinstall the extension after this action.',
+  };
+};
+
 export const ProfileSyncDevSettings = () => {
   return (
     <>
       <Text className="settings-page__security-tab-sub-header__bold">
         Profile Sync
       </Text>
-      <AccountSyncDeleteDataFromUserStorage />
+      <DeleteSyncedData {...useDeleteAccountSyncDataProps()} />
     </>
   );
 };

From 1da7536e69c8bad121600b2bfbfd938dc35f6bab Mon Sep 17 00:00:00 2001
From: Howard Braham <howrad@gmail.com>
Date: Mon, 9 Dec 2024 23:10:44 +0530
Subject: [PATCH 061/175] chore: eliminate direct `cross-spawn` dependency
 (#28570)

## **Description**

We recently updated `cross-spawn` to solve a yarn audit, but actually we
can do one better. This eliminates the direct dependency on
`cross-spawn`. It runs on Windows by adding one `shell: true`.

We still have some indirect dependencies on `cross-spawn`, so we still
need that resolution.

@Gudahtt because he last updated `cross-spawn`
@davidmurdoch because he's also a Windows user

[![Open in GitHub
Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/28368?quickstart=1)

## **Related issues**

Followup to #28522

<!--## **Manual testing steps**
## **Screenshots/Recordings**
### **Before**
### **After**
## **Pre-merge author checklist**
## **Pre-merge reviewer checklist**-->
---
 attribution.txt                   | 27 -----------------
 development/build/task.js         |  3 +-
 development/lib/run-command.js    |  2 +-
 lavamoat/build-system/policy.json | 50 -------------------------------
 package.json                      |  3 +-
 yarn.lock                         |  3 +-
 6 files changed, 5 insertions(+), 83 deletions(-)

diff --git a/attribution.txt b/attribution.txt
index 364128f620f3..bcf9b961de51 100644
--- a/attribution.txt
+++ b/attribution.txt
@@ -5044,33 +5044,6 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 
 
-******************************
-
-cross-spawn
-7.0.3 <https://github.com/moxystudio/node-cross-spawn>
-The MIT License (MIT)
-
-Copyright (c) 2018 Made With MOXY Lda <hello@moxy.studio>
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-
-
 ******************************
 
 crypto
diff --git a/development/build/task.js b/development/build/task.js
index cbbc1ea22578..edb1b6761cd8 100644
--- a/development/build/task.js
+++ b/development/build/task.js
@@ -1,5 +1,5 @@
 const EventEmitter = require('events');
-const spawn = require('cross-spawn');
+const { spawn } = require('node:child_process');
 
 const tasks = {};
 const taskEvents = new EventEmitter();
@@ -84,6 +84,7 @@ function runInChildProcess(
       ],
       {
         env: process.env,
+        shell: true,
       },
     );
 
diff --git a/development/lib/run-command.js b/development/lib/run-command.js
index 62fe2284ea6d..12e917eb128b 100644
--- a/development/lib/run-command.js
+++ b/development/lib/run-command.js
@@ -1,5 +1,5 @@
 const fs = require('fs');
-const spawn = require('cross-spawn');
+const { spawn } = require('node:child_process');
 
 /**
  * Run a command to completion using the system shell.
diff --git a/lavamoat/build-system/policy.json b/lavamoat/build-system/policy.json
index 5338922720ef..9874c5915d8e 100644
--- a/lavamoat/build-system/policy.json
+++ b/lavamoat/build-system/policy.json
@@ -2110,56 +2110,6 @@
         "chokidar>anymatch>picomatch": true
       }
     },
-    "cross-spawn": {
-      "builtin": {
-        "child_process.spawn": true,
-        "child_process.spawnSync": true,
-        "fs.closeSync": true,
-        "fs.openSync": true,
-        "fs.readSync": true,
-        "path.delimiter": true,
-        "path.normalize": true,
-        "path.resolve": true
-      },
-      "globals": {
-        "Buffer.alloc": true,
-        "process.chdir": true,
-        "process.cwd": true,
-        "process.env": true,
-        "process.platform": true
-      },
-      "packages": {
-        "cross-spawn>path-key": true,
-        "cross-spawn>shebang-command": true,
-        "cross-spawn>which": true
-      }
-    },
-    "cross-spawn>path-key": {
-      "globals": {
-        "process.env": true,
-        "process.platform": true
-      }
-    },
-    "cross-spawn>shebang-command": {
-      "packages": {
-        "cross-spawn>shebang-command>shebang-regex": true
-      }
-    },
-    "cross-spawn>which": {
-      "builtin": {
-        "path.join": true
-      },
-      "globals": {
-        "process.cwd": true,
-        "process.env.OSTYPE": true,
-        "process.env.PATH": true,
-        "process.env.PATHEXT": true,
-        "process.platform": true
-      },
-      "packages": {
-        "@sentry/cli>which>isexe": true
-      }
-    },
     "debounce-stream>duplexer": {
       "builtin": {
         "stream": true
diff --git a/package.json b/package.json
index 559c67f58896..697a4477d20d 100644
--- a/package.json
+++ b/package.json
@@ -250,7 +250,7 @@
     "@ledgerhq/hw-app-eth/axios": "^0.28.0",
     "@ledgerhq/hw-app-eth@npm:^6.39.0": "patch:@ledgerhq/hw-app-eth@npm%3A6.39.0#~/.yarn/patches/@ledgerhq-hw-app-eth-npm-6.39.0-866309bbbe.patch",
     "@ledgerhq/evm-tools@npm:^1.2.3": "patch:@ledgerhq/evm-tools@npm%3A1.2.3#~/.yarn/patches/@ledgerhq-evm-tools-npm-1.2.3-414f44baa9.patch",
-    "cross-spawn@npm:^5.0.1": "^7.0.5",
+    "cross-spawn@npm:^5.0.1": "^7.0.6",
     "@solana/web3.js@npm:^1.95.0": "^1.95.8"
   },
   "dependencies": {
@@ -556,7 +556,6 @@
     "concurrently": "^8.2.2",
     "copy-webpack-plugin": "^12.0.2",
     "core-js-pure": "^3.38.0",
-    "cross-spawn": "^7.0.5",
     "crypto-browserify": "^3.12.0",
     "css-loader": "^6.10.0",
     "css-to-xpath": "^0.1.0",
diff --git a/yarn.lock b/yarn.lock
index 2a680a50da13..e56e610cd0ce 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -15822,7 +15822,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"cross-spawn@npm:^7.0.0, cross-spawn@npm:^7.0.2, cross-spawn@npm:^7.0.3, cross-spawn@npm:^7.0.5":
+"cross-spawn@npm:^7.0.0, cross-spawn@npm:^7.0.2, cross-spawn@npm:^7.0.3, cross-spawn@npm:^7.0.6":
   version: 7.0.6
   resolution: "cross-spawn@npm:7.0.6"
   dependencies:
@@ -26569,7 +26569,6 @@ __metadata:
     copy-to-clipboard: "npm:^3.3.3"
     copy-webpack-plugin: "npm:^12.0.2"
     core-js-pure: "npm:^3.38.0"
-    cross-spawn: "npm:^7.0.5"
     crypto-browserify: "npm:^3.12.0"
     css-loader: "npm:^6.10.0"
     css-to-xpath: "npm:^0.1.0"

From 51e67b4e83e162ab7d57ae27d98e1ce85537266a Mon Sep 17 00:00:00 2001
From: infiniteflower <139582705+infiniteflower@users.noreply.github.com>
Date: Mon, 9 Dec 2024 13:57:06 -0500
Subject: [PATCH 062/175] fix: wiping txHistory on both source and dest chains
 (#29000)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<!--
Please submit this PR as a draft initially.
Do not mark it as "Ready for review" until the template has been
completely filled out, and PR status checks have passed at least once.
-->

## **Description**

<!--
Write a short description of the changes included in this pull request,
also include relevant motivation and context. Have in mind the following
questions:
1. What is the reason for the change?
2. What is the improvement/solution?
-->

[![Open in GitHub
Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/29000?quickstart=1)

This PR fixes an issue for Bridge txs where both the source chain AND
destination chain txHistory get wiped when the user clears their
Activity tab data.

## **Related issues**

Fixes:

## **Manual testing steps**

1. Add `BRIDGE_USE_DEV_APIS=1` to `.metamaskrc`
1. Do a bridge from chain 1 to chain 2
2. Switch to chain 2
3. Do a bridge from chain 2 to another chain
4. Go into Settings > Advanced > Click Clear activity
5. Observe that chain 2's tx are gone
6. Switch to chain 1
7. Observe that chain 1's bridge tx has the proper values

## **Screenshots/Recordings**

<!-- If applicable, add screenshots and/or recordings to visualize the
before and after of your change. -->

### **Before**

<!-- [screenshots/recordings] -->



https://github.com/user-attachments/assets/247a061e-84ac-4757-bede-edeeecff7c4a



### **After**

<!-- [screenshots/recordings] -->



https://github.com/user-attachments/assets/ce872b63-e31c-47ea-8d78-d59555864a6b



## **Pre-merge author checklist**

- [x] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension Coding
Standards](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/CODING_GUIDELINES.md).
- [x] I've completed the PR template to the best of my ability
- [ ] I’ve included tests if applicable
- [ ] I’ve documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [x] I’ve applied the right labels on the PR (see [labeling
guidelines](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.

## **Pre-merge reviewer checklist**

- [ ] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed).
- [ ] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.
---
 .../controllers/bridge-status/bridge-status-controller.ts | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/app/scripts/controllers/bridge-status/bridge-status-controller.ts b/app/scripts/controllers/bridge-status/bridge-status-controller.ts
index 1763e47feb77..841bf9868787 100644
--- a/app/scripts/controllers/bridge-status/bridge-status-controller.ts
+++ b/app/scripts/controllers/bridge-status/bridge-status-controller.ts
@@ -313,7 +313,7 @@ export default class BridgeStatusController extends StaticIntervalPollingControl
   };
 
   // Wipes the bridge status for the given address and chainId
-  // Will match either source or destination chainId to the selectedChainId
+  // Will match only source chainId to the selectedChainId
   #wipeBridgeStatusByChainId = (address: string, selectedChainId: Hex) => {
     const sourceTxMetaIdsToDelete = Object.keys(
       this.state.bridgeStatusState.txHistory,
@@ -324,14 +324,10 @@ export default class BridgeStatusController extends StaticIntervalPollingControl
       const hexSourceChainId = decimalToPrefixedHex(
         bridgeHistoryItem.quote.srcChainId,
       );
-      const hexDestChainId = decimalToPrefixedHex(
-        bridgeHistoryItem.quote.destChainId,
-      );
 
       return (
         bridgeHistoryItem.account === address &&
-        (hexSourceChainId === selectedChainId ||
-          hexDestChainId === selectedChainId)
+        hexSourceChainId === selectedChainId
       );
     });
 

From 7d9ebf6d3b83bebc3a2c9c4546ecaa1ddfc11246 Mon Sep 17 00:00:00 2001
From: infiniteflower <139582705+infiniteflower@users.noreply.github.com>
Date: Mon, 9 Dec 2024 13:57:33 -0500
Subject: [PATCH 063/175] chore: hide cancel button if bridge tx (#28902)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<!--
Please submit this PR as a draft initially.
Do not mark it as "Ready for review" until the template has been
completely filled out, and PR status checks have passed at least once.
-->

## **Description**

<!--
Write a short description of the changes included in this pull request,
also include relevant motivation and context. Have in mind the following
questions:
1. What is the reason for the change?
2. What is the improvement/solution?
-->

[![Open in GitHub
Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/28902?quickstart=1)

This PR hides the Cancel button for Bridge transactions.

## **Related issues**

Fixes:

## **Manual testing steps**

1. Do a Bridge tx
2. Go to Activity list
3. Observe cancel button will never appear

## **Screenshots/Recordings**

<!-- If applicable, add screenshots and/or recordings to visualize the
before and after of your change. -->

### **Before**

<!-- [screenshots/recordings] -->



https://github.com/user-attachments/assets/9980d92f-b4c0-4dfd-beb0-5898ffda3209



### **After**

<!-- [screenshots/recordings] -->


https://github.com/user-attachments/assets/904fc5de-1480-428b-8081-2588a4b1d735


## **Pre-merge author checklist**

- [x] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension Coding
Standards](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/CODING_GUIDELINES.md).
- [x] I've completed the PR template to the best of my ability
- [ ] I’ve included tests if applicable
- [ ] I’ve documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [x] I’ve applied the right labels on the PR (see [labeling
guidelines](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.

## **Pre-merge reviewer checklist**

- [ ] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed).
- [ ] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.
---
 .../transaction-list-item.component.js        | 30 +++++++++++--------
 ui/components/app/transaction-list/index.scss |  4 ---
 2 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/ui/components/app/transaction-list-item/transaction-list-item.component.js b/ui/components/app/transaction-list-item/transaction-list-item.component.js
index 5ffcb1405deb..61c00fac6402 100644
--- a/ui/components/app/transaction-list-item/transaction-list-item.component.js
+++ b/ui/components/app/transaction-list-item/transaction-list-item.component.js
@@ -277,7 +277,7 @@ function TransactionListItemInner({
   ]);
   const currentChain = useSelector(getCurrentNetwork);
   let showCancelButton =
-    !hasCancelled && isPending && !isUnapproved && !isSubmitting;
+    !hasCancelled && isPending && !isUnapproved && !isSubmitting && !isBridgeTx;
 
   ///: BEGIN:ONLY_INCLUDE_IF(build-mmi)
   showCancelButton = showCancelButton && !isCustodian;
@@ -406,16 +406,21 @@ function TransactionListItemInner({
           )
         }
       >
-        <Box paddingTop={4} className="transaction-list-item__pending-actions">
-          {showCancelButton && (
-            <CancelButton
-              data-testid="cancel-button"
-              transaction={transactionGroup.primaryTransaction}
-              cancelTransaction={cancelTransaction}
-            />
-          )}
-          {speedUpButton}
-        </Box>
+        {Boolean(showCancelButton || speedUpButton) && (
+          <Box
+            paddingTop={4}
+            className="transaction-list-item__pending-actions"
+          >
+            {showCancelButton && (
+              <CancelButton
+                data-testid="cancel-button"
+                transaction={transactionGroup.primaryTransaction}
+                cancelTransaction={cancelTransaction}
+              />
+            )}
+            {speedUpButton}
+          </Box>
+        )}
         {
           ///: BEGIN:ONLY_INCLUDE_IF(build-mmi)
           <a {...debugTransactionMeta} className="test-transaction-meta" />
@@ -452,7 +457,8 @@ function TransactionListItemInner({
             !isCustodian &&
             ///: END:ONLY_INCLUDE_IF
             isPending &&
-            !hasCancelled
+            !hasCancelled &&
+            !isBridgeTx
           }
           transactionStatus={() => (
             <TransactionStatusLabel
diff --git a/ui/components/app/transaction-list/index.scss b/ui/components/app/transaction-list/index.scss
index 5c5e571f8bdf..38cae4f33a2e 100644
--- a/ui/components/app/transaction-list/index.scss
+++ b/ui/components/app/transaction-list/index.scss
@@ -28,10 +28,6 @@
     flex: 1;
   }
 
-  &__pending-transactions {
-    margin-bottom: 16px;
-  }
-
   &__empty {
     flex: 1;
     display: grid;

From 9b4f20b067fe77c21c964208f6bee93a371b80a5 Mon Sep 17 00:00:00 2001
From: infiniteflower <139582705+infiniteflower@users.noreply.github.com>
Date: Mon, 9 Dec 2024 13:57:44 -0500
Subject: [PATCH 064/175] feat: show banner for delayed bridge tx (#28849)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<!--
Please submit this PR as a draft initially.
Do not mark it as "Ready for review" until the template has been
completely filled out, and PR status checks have passed at least once.
-->

## **Description**

<!--
Write a short description of the changes included in this pull request,
also include relevant motivation and context. Have in mind the following
questions:
1. What is the reason for the change?
2. What is the improvement/solution?
-->

This PR adds a banner to tell users to reach out to Support if the
Bridge tx is delayed.

[![Open in GitHub
Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/28849?quickstart=1)

## **Related issues**


## **Manual testing steps**

1. Start a Bridge tx
2. Wait a bit
3. Banner should appear

## **Screenshots/Recordings**

<!-- If applicable, add screenshots and/or recordings to visualize the
before and after of your change. -->

### **Before**

<!-- [screenshots/recordings] -->

### **After**

<!-- [screenshots/recordings] -->



https://github.com/user-attachments/assets/51e288e8-aa98-484c-b851-34eb471471e9




## **Pre-merge author checklist**

- [x] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension Coding
Standards](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/CODING_GUIDELINES.md).
- [x] I've completed the PR template to the best of my ability
- [x] I’ve included tests if applicable
- [x] I’ve documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [x] I’ve applied the right labels on the PR (see [labeling
guidelines](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.

## **Pre-merge reviewer checklist**

- [ ] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed).
- [ ] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.
---
 app/_locales/en/messages.json                 |  9 +++
 shared/types/bridge-status.ts                 |  2 +-
 .../transaction-details.test.tsx              | 50 +++++++++++++
 .../transaction-details.tsx                   | 71 ++++++++++++++++++-
 4 files changed, 129 insertions(+), 3 deletions(-)
 create mode 100644 ui/pages/bridge/transaction-details/transaction-details.test.tsx

diff --git a/app/_locales/en/messages.json b/app/_locales/en/messages.json
index 39d6919f08a3..d1f05af0b283 100644
--- a/app/_locales/en/messages.json
+++ b/app/_locales/en/messages.json
@@ -931,6 +931,15 @@
   "bridgeTxDetailsBridgeType": {
     "message": "Bridge type"
   },
+  "bridgeTxDetailsDelayedDescription": {
+    "message": "Reach out to"
+  },
+  "bridgeTxDetailsDelayedDescriptionSupport": {
+    "message": "MetaMask Support"
+  },
+  "bridgeTxDetailsDelayedTitle": {
+    "message": "Has it been longer than 3 hours?"
+  },
   "bridgeTxDetailsGasLimit": {
     "message": "Gas limit (units)"
   },
diff --git a/shared/types/bridge-status.ts b/shared/types/bridge-status.ts
index 845a3c7cec65..568b0fe420c5 100644
--- a/shared/types/bridge-status.ts
+++ b/shared/types/bridge-status.ts
@@ -119,7 +119,7 @@ export type BridgeHistoryItem = {
   txMetaId: string; // Need this to handle STX that might not have a txHash immediately
   quote: Quote;
   status: StatusResponse;
-  startTime?: number;
+  startTime?: number; // timestamp in ms
   estimatedProcessingTimeInSeconds: number;
   slippagePercentage: number;
   completionTime?: number;
diff --git a/ui/pages/bridge/transaction-details/transaction-details.test.tsx b/ui/pages/bridge/transaction-details/transaction-details.test.tsx
new file mode 100644
index 000000000000..3807a05905cb
--- /dev/null
+++ b/ui/pages/bridge/transaction-details/transaction-details.test.tsx
@@ -0,0 +1,50 @@
+import {
+  BridgeHistoryItem,
+  StatusTypes,
+} from '../../../../shared/types/bridge-status';
+import { getIsDelayed } from './transaction-details';
+
+describe('transaction-details', () => {
+  describe('getIsDelayed', () => {
+    it('returns false when status is not PENDING', () => {
+      const result = getIsDelayed(StatusTypes.COMPLETE, {
+        startTime: Date.now(),
+        estimatedProcessingTimeInSeconds: 60,
+      } as BridgeHistoryItem);
+      expect(result).toBe(false);
+    });
+
+    it('returns false when bridgeHistoryItem is undefined', () => {
+      const result = getIsDelayed(StatusTypes.PENDING, undefined);
+      expect(result).toBe(false);
+    });
+
+    it('returns false when startTime is undefined', () => {
+      const result = getIsDelayed(StatusTypes.PENDING, {
+        startTime: undefined,
+        estimatedProcessingTimeInSeconds: 60,
+      } as BridgeHistoryItem);
+      expect(result).toBe(false);
+    });
+
+    it('returns false when current time is less than estimated completion time', () => {
+      const result = getIsDelayed(StatusTypes.PENDING, {
+        startTime: Date.now() - 1000,
+        estimatedProcessingTimeInSeconds: 60,
+      } as BridgeHistoryItem);
+
+      expect(result).toBe(false);
+    });
+
+    it('returns true when current time exceeds estimated completion time', () => {
+      const startTime = Date.now() - 61 * 1000;
+
+      const result = getIsDelayed(StatusTypes.PENDING, {
+        startTime,
+        estimatedProcessingTimeInSeconds: 60,
+      } as BridgeHistoryItem);
+
+      expect(result).toBe(true);
+    });
+  });
+});
diff --git a/ui/pages/bridge/transaction-details/transaction-details.tsx b/ui/pages/bridge/transaction-details/transaction-details.tsx
index 20ee8fb48754..fe81e8e3b3dd 100644
--- a/ui/pages/bridge/transaction-details/transaction-details.tsx
+++ b/ui/pages/bridge/transaction-details/transaction-details.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import React, { useContext } from 'react';
 import { useSelector } from 'react-redux';
 import { useHistory, useParams } from 'react-router-dom';
 import { NetworkConfiguration } from '@metamask/network-controller';
@@ -6,9 +6,12 @@ import { TransactionMeta } from '@metamask/transaction-controller';
 import {
   AvatarNetwork,
   AvatarNetworkSize,
+  BannerAlert,
+  BannerAlertSeverity,
   Box,
   ButtonIcon,
   ButtonIconSize,
+  ButtonLink,
   IconName,
   Text,
 } from '../../../components/component-library';
@@ -21,7 +24,10 @@ import { MetaMaskReduxState } from '../../../store/store';
 import { hexToDecimal } from '../../../../shared/modules/conversion.utils';
 import UserPreferencedCurrencyDisplay from '../../../components/app/user-preferenced-currency-display/user-preferenced-currency-display.component';
 import { EtherDenomination } from '../../../../shared/constants/common';
-import { PRIMARY } from '../../../helpers/constants/common';
+import {
+  PRIMARY,
+  SUPPORT_REQUEST_LINK,
+} from '../../../helpers/constants/common';
 import CurrencyDisplay from '../../../components/ui/currency-display/currency-display.component';
 import {
   BridgeHistoryItem,
@@ -39,6 +45,12 @@ import { ConfirmInfoRowDivider as Divider } from '../../../components/app/confir
 import { useI18nContext } from '../../../hooks/useI18nContext';
 import { CHAIN_ID_TO_NETWORK_IMAGE_URL_MAP } from '../../../../shared/constants/network';
 import { selectedAddressTxListSelector } from '../../../selectors';
+import {
+  MetaMetricsContextProp,
+  MetaMetricsEventCategory,
+  MetaMetricsEventName,
+} from '../../../../shared/constants/metametrics';
+import { MetaMetricsContext } from '../../../contexts/metametrics';
 import TransactionDetailRow from './transaction-detail-row';
 import BridgeExplorerLinks from './bridge-explorer-links';
 import BridgeStepList from './bridge-step-list';
@@ -79,6 +91,24 @@ const getBridgeAmount = ({
   return undefined;
 };
 
+/**
+ * @param status - The status of the bridge history item
+ * @param bridgeHistoryItem - The bridge history item
+ * @returns Whether the bridge history item is delayed
+ */
+export const getIsDelayed = (
+  status: StatusTypes,
+  bridgeHistoryItem?: BridgeHistoryItem,
+) => {
+  return Boolean(
+    status === StatusTypes.PENDING &&
+      bridgeHistoryItem?.startTime &&
+      Date.now() >
+        bridgeHistoryItem.startTime +
+          bridgeHistoryItem.estimatedProcessingTimeInSeconds * 1000,
+  );
+};
+
 const StatusToColorMap: Record<StatusTypes, TextColor> = {
   [StatusTypes.PENDING]: TextColor.warningDefault,
   [StatusTypes.COMPLETE]: TextColor.successDefault,
@@ -88,6 +118,7 @@ const StatusToColorMap: Record<StatusTypes, TextColor> = {
 
 const CrossChainSwapTxDetails = () => {
   const t = useI18nContext();
+  const trackEvent = useContext(MetaMetricsContext);
   const rootState = useSelector((state) => state);
   const history = useHistory();
   const { srcTxMetaId } = useParams<{ srcTxMetaId: string }>();
@@ -141,6 +172,7 @@ const CrossChainSwapTxDetails = () => {
     : undefined;
 
   const bridgeAmount = getBridgeAmount({ bridgeHistoryItem });
+  const isDelayed = getIsDelayed(status, bridgeHistoryItem);
 
   return (
     <div className="bridge">
@@ -164,6 +196,41 @@ const CrossChainSwapTxDetails = () => {
             flexDirection={FlexDirection.Column}
             gap={4}
           >
+            {isDelayed && (
+              <BannerAlert
+                title={t('bridgeTxDetailsDelayedTitle')}
+                severity={BannerAlertSeverity.Warning}
+              >
+                <Text display={Display.Flex} alignItems={AlignItems.center}>
+                  {t('bridgeTxDetailsDelayedDescription')}&nbsp;
+                  <ButtonLink
+                    externalLink
+                    href={SUPPORT_REQUEST_LINK}
+                    onClick={() => {
+                      trackEvent(
+                        {
+                          category: MetaMetricsEventCategory.Home,
+                          event: MetaMetricsEventName.SupportLinkClicked,
+                          properties: {
+                            url: SUPPORT_REQUEST_LINK,
+                            location: 'Bridge Tx Details',
+                          },
+                        },
+                        {
+                          contextPropsIntoEventProperties: [
+                            MetaMetricsContextProp.PageTitle,
+                          ],
+                        },
+                      );
+                    }}
+                  >
+                    {t('bridgeTxDetailsDelayedDescriptionSupport')}
+                  </ButtonLink>
+                  .
+                </Text>
+              </BannerAlert>
+            )}
+
             {status !== StatusTypes.COMPLETE &&
               (bridgeHistoryItem || srcChainTxMeta) && (
                 <BridgeStepList

From 5a04816fb01ba34acb034972a045728faf41c4bd Mon Sep 17 00:00:00 2001
From: OGPoyraz <omergoktugpoyraz@gmail.com>
Date: Tue, 10 Dec 2024 11:05:42 +0100
Subject: [PATCH 065/175] fix: Copy change on NFT approve confirmation title
 (#29017)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<!--
Please submit this PR as a draft initially.
Do not mark it as "Ready for review" until the template has been
completely filled out, and PR status checks have passed at least once.
-->

## **Description**

This PR update NFT approve to `Withdrawal request` for consistency
between NFT's approve and setApprovalForAll requests.

<!--
Write a short description of the changes included in this pull request,
also include relevant motivation and context. Have in mind the following
questions:
1. What is the reason for the change?
2. What is the improvement/solution?
-->

[![Open in GitHub
Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/29017?quickstart=1)

## **Related issues**

Fixes:

## **Manual testing steps**

1. Go to test dapp
2. Mint a NFT
3. Approve the NFT
4. See redesigned confirmation for the NFT approve

## **Screenshots/Recordings**

<!-- If applicable, add screenshots and/or recordings to visualize the
before and after of your change. -->

### **Before**

<img width="472" alt="Screenshot 2024-12-09 at 11 51 01"
src="https://github.com/user-attachments/assets/42e36ba0-e339-408a-9c63-7be9fb6ab1e1">


### **After**

<img width="428" alt="Screenshot 2024-12-09 at 11 51 35"
src="https://github.com/user-attachments/assets/de79861e-1b71-442c-9d97-d21225f3aa8b">


## **Pre-merge author checklist**

- [ ] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension Coding
Standards](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/CODING_GUIDELINES.md).
- [ ] I've completed the PR template to the best of my ability
- [ ] I’ve included tests if applicable
- [ ] I’ve documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [ ] I’ve applied the right labels on the PR (see [labeling
guidelines](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.

## **Pre-merge reviewer checklist**

- [ ] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed).
- [ ] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.
---
 app/_locales/de/messages.json                                 | 3 ---
 app/_locales/el/messages.json                                 | 3 ---
 app/_locales/en/messages.json                                 | 4 ++--
 app/_locales/es/messages.json                                 | 3 ---
 app/_locales/fr/messages.json                                 | 3 ---
 app/_locales/hi/messages.json                                 | 3 ---
 app/_locales/id/messages.json                                 | 3 ---
 app/_locales/ja/messages.json                                 | 3 ---
 app/_locales/ko/messages.json                                 | 3 ---
 app/_locales/pt/messages.json                                 | 3 ---
 app/_locales/ru/messages.json                                 | 3 ---
 app/_locales/tl/messages.json                                 | 3 ---
 app/_locales/tr/messages.json                                 | 3 ---
 app/_locales/vi/messages.json                                 | 3 ---
 app/_locales/zh_CN/messages.json                              | 3 ---
 .../transactions/erc721-approve-redesign.spec.ts              | 2 +-
 .../confirmations/transactions/erc721-approve.test.tsx        | 4 +++-
 .../confirmations/components/confirm/title/title.test.tsx     | 2 +-
 ui/pages/confirmations/components/confirm/title/title.tsx     | 2 +-
 19 files changed, 8 insertions(+), 48 deletions(-)

diff --git a/app/_locales/de/messages.json b/app/_locales/de/messages.json
index 19f6494e3b33..416fc2454fee 100644
--- a/app/_locales/de/messages.json
+++ b/app/_locales/de/messages.json
@@ -1033,9 +1033,6 @@
   "confirmRecoveryPhrase": {
     "message": "Geheime Wiederherstellungsphrase bestätigen"
   },
-  "confirmTitleApproveTransaction": {
-    "message": "Bewilligungsanfrage"
-  },
   "confirmTitleDeployContract": {
     "message": "Einen Kontrakt nutzen"
   },
diff --git a/app/_locales/el/messages.json b/app/_locales/el/messages.json
index cb3b257c3177..90209c25f6e9 100644
--- a/app/_locales/el/messages.json
+++ b/app/_locales/el/messages.json
@@ -1033,9 +1033,6 @@
   "confirmRecoveryPhrase": {
     "message": "Επιβεβαιώστε τη Μυστική Φράση Ανάκτησης"
   },
-  "confirmTitleApproveTransaction": {
-    "message": "Αίτημα χορήγησης άδειας"
-  },
   "confirmTitleDeployContract": {
     "message": "Ανάπτυξη συμβολαίου"
   },
diff --git a/app/_locales/en/messages.json b/app/_locales/en/messages.json
index d1f05af0b283..f6f03b616087 100644
--- a/app/_locales/en/messages.json
+++ b/app/_locales/en/messages.json
@@ -1137,8 +1137,8 @@
   "confirmRecoveryPhrase": {
     "message": "Confirm Secret Recovery Phrase"
   },
-  "confirmTitleApproveTransaction": {
-    "message": "Allowance request"
+  "confirmTitleApproveTransactionNFT": {
+    "message": "Withdrawal request"
   },
   "confirmTitleDeployContract": {
     "message": "Deploy a contract"
diff --git a/app/_locales/es/messages.json b/app/_locales/es/messages.json
index 92cbd316b9fb..066e4e40b841 100644
--- a/app/_locales/es/messages.json
+++ b/app/_locales/es/messages.json
@@ -1033,9 +1033,6 @@
   "confirmRecoveryPhrase": {
     "message": "Confirmar frase secreta de recuperación"
   },
-  "confirmTitleApproveTransaction": {
-    "message": "Solicitud de asignación"
-  },
   "confirmTitleDeployContract": {
     "message": "Implementar un contrato"
   },
diff --git a/app/_locales/fr/messages.json b/app/_locales/fr/messages.json
index 6391c83412a2..a3c20374639f 100644
--- a/app/_locales/fr/messages.json
+++ b/app/_locales/fr/messages.json
@@ -1033,9 +1033,6 @@
   "confirmRecoveryPhrase": {
     "message": "Confirmer la phrase secrète de récupération"
   },
-  "confirmTitleApproveTransaction": {
-    "message": "Demande de provision"
-  },
   "confirmTitleDeployContract": {
     "message": "Déployer un contrat"
   },
diff --git a/app/_locales/hi/messages.json b/app/_locales/hi/messages.json
index 63438fb22a4f..0e108a94e585 100644
--- a/app/_locales/hi/messages.json
+++ b/app/_locales/hi/messages.json
@@ -1033,9 +1033,6 @@
   "confirmRecoveryPhrase": {
     "message": "सीक्रेट रिकवरी फ्रेज कन्फर्म करें"
   },
-  "confirmTitleApproveTransaction": {
-    "message": "भत्ता का अनुरोध"
-  },
   "confirmTitleDeployContract": {
     "message": "एक कॉन्ट्रैक्ट करें"
   },
diff --git a/app/_locales/id/messages.json b/app/_locales/id/messages.json
index e1fbf1398d39..261d57c9ed10 100644
--- a/app/_locales/id/messages.json
+++ b/app/_locales/id/messages.json
@@ -1033,9 +1033,6 @@
   "confirmRecoveryPhrase": {
     "message": "Konfirmasikan Frasa Pemulihan Rahasia"
   },
-  "confirmTitleApproveTransaction": {
-    "message": "Permintaan izin"
-  },
   "confirmTitleDeployContract": {
     "message": "Terapkan kontrak"
   },
diff --git a/app/_locales/ja/messages.json b/app/_locales/ja/messages.json
index 7d247adcc07a..11b804eac0f9 100644
--- a/app/_locales/ja/messages.json
+++ b/app/_locales/ja/messages.json
@@ -1033,9 +1033,6 @@
   "confirmRecoveryPhrase": {
     "message": "シークレットリカバリーフレーズの確認"
   },
-  "confirmTitleApproveTransaction": {
-    "message": "許容額のリクエスト"
-  },
   "confirmTitleDeployContract": {
     "message": "コントラクトを展開"
   },
diff --git a/app/_locales/ko/messages.json b/app/_locales/ko/messages.json
index 1d6c0b9199d8..7a8fad19debb 100644
--- a/app/_locales/ko/messages.json
+++ b/app/_locales/ko/messages.json
@@ -1033,9 +1033,6 @@
   "confirmRecoveryPhrase": {
     "message": "비밀복구구문 컨펌"
   },
-  "confirmTitleApproveTransaction": {
-    "message": "수당 청구"
-  },
   "confirmTitleDeployContract": {
     "message": "계약 배포"
   },
diff --git a/app/_locales/pt/messages.json b/app/_locales/pt/messages.json
index c7afcceb33e8..c6d61aa82191 100644
--- a/app/_locales/pt/messages.json
+++ b/app/_locales/pt/messages.json
@@ -1033,9 +1033,6 @@
   "confirmRecoveryPhrase": {
     "message": "Confirmar Frase de Recuperação Secreta"
   },
-  "confirmTitleApproveTransaction": {
-    "message": "Solicitação de limite de gasto"
-  },
   "confirmTitleDeployContract": {
     "message": "Implementar um contrato"
   },
diff --git a/app/_locales/ru/messages.json b/app/_locales/ru/messages.json
index c9236e4396bd..86d2ee689f56 100644
--- a/app/_locales/ru/messages.json
+++ b/app/_locales/ru/messages.json
@@ -1033,9 +1033,6 @@
   "confirmRecoveryPhrase": {
     "message": "Подтвердите секретную фразу для восстановления"
   },
-  "confirmTitleApproveTransaction": {
-    "message": "Запрос квоты"
-  },
   "confirmTitleDeployContract": {
     "message": "Развернуть контракт"
   },
diff --git a/app/_locales/tl/messages.json b/app/_locales/tl/messages.json
index 30ee4b2096eb..8db1d4af4f7f 100644
--- a/app/_locales/tl/messages.json
+++ b/app/_locales/tl/messages.json
@@ -1033,9 +1033,6 @@
   "confirmRecoveryPhrase": {
     "message": "Kumpirmahin ang Lihim na Parirala sa Pagbawi"
   },
-  "confirmTitleApproveTransaction": {
-    "message": "Hiling sa allowance"
-  },
   "confirmTitleDeployContract": {
     "message": "Mag-deploy ng kontrata"
   },
diff --git a/app/_locales/tr/messages.json b/app/_locales/tr/messages.json
index 16f7c1eb8a85..20319a113bec 100644
--- a/app/_locales/tr/messages.json
+++ b/app/_locales/tr/messages.json
@@ -1033,9 +1033,6 @@
   "confirmRecoveryPhrase": {
     "message": "Gizli Kurtarma İfadesini Onayla"
   },
-  "confirmTitleApproveTransaction": {
-    "message": "Ödenek talebi"
-  },
   "confirmTitleDeployContract": {
     "message": "Bir sözleşme kurulumu gerçekleştirin"
   },
diff --git a/app/_locales/vi/messages.json b/app/_locales/vi/messages.json
index 39c62a701e4f..9221bcbb0ad8 100644
--- a/app/_locales/vi/messages.json
+++ b/app/_locales/vi/messages.json
@@ -1033,9 +1033,6 @@
   "confirmRecoveryPhrase": {
     "message": "Xác nhận Cụm từ khôi phục bí mật"
   },
-  "confirmTitleApproveTransaction": {
-    "message": "Yêu cầu cho phép"
-  },
   "confirmTitleDeployContract": {
     "message": "Triển khai hợp đồng"
   },
diff --git a/app/_locales/zh_CN/messages.json b/app/_locales/zh_CN/messages.json
index 9c5da6003052..ba4e23972f38 100644
--- a/app/_locales/zh_CN/messages.json
+++ b/app/_locales/zh_CN/messages.json
@@ -1033,9 +1033,6 @@
   "confirmRecoveryPhrase": {
     "message": "确认私钥助记词"
   },
-  "confirmTitleApproveTransaction": {
-    "message": "许可请求"
-  },
   "confirmTitleDeployContract": {
     "message": "部署合约"
   },
diff --git a/test/e2e/tests/confirmations/transactions/erc721-approve-redesign.spec.ts b/test/e2e/tests/confirmations/transactions/erc721-approve-redesign.spec.ts
index c7ceb6c42c94..e949e77e0e36 100644
--- a/test/e2e/tests/confirmations/transactions/erc721-approve-redesign.spec.ts
+++ b/test/e2e/tests/confirmations/transactions/erc721-approve-redesign.spec.ts
@@ -145,7 +145,7 @@ async function assertApproveDetails(driver: Driver) {
 
   await driver.waitForSelector({
     css: 'h2',
-    text: 'Allowance request',
+    text: 'Withdrawal request',
   });
 
   await driver.waitForSelector({
diff --git a/test/integration/confirmations/transactions/erc721-approve.test.tsx b/test/integration/confirmations/transactions/erc721-approve.test.tsx
index c158717cc9c9..4f211576e6cd 100644
--- a/test/integration/confirmations/transactions/erc721-approve.test.tsx
+++ b/test/integration/confirmations/transactions/erc721-approve.test.tsx
@@ -163,7 +163,9 @@ describe('ERC721 Approve Confirmation', () => {
     });
 
     expect(
-      await screen.findByText(tEn('confirmTitleApproveTransaction') as string),
+      await screen.findByText(
+        tEn('confirmTitleApproveTransactionNFT') as string,
+      ),
     ).toBeInTheDocument();
     expect(
       await screen.findByText(
diff --git a/ui/pages/confirmations/components/confirm/title/title.test.tsx b/ui/pages/confirmations/components/confirm/title/title.test.tsx
index 3d4d6672940d..b100f831581d 100644
--- a/ui/pages/confirmations/components/confirm/title/title.test.tsx
+++ b/ui/pages/confirmations/components/confirm/title/title.test.tsx
@@ -124,7 +124,7 @@ describe('ConfirmTitle', () => {
     );
 
     expect(
-      getByText(tEn('confirmTitleApproveTransaction') as string),
+      getByText(tEn('confirmTitleApproveTransactionNFT') as string),
     ).toBeInTheDocument();
     expect(
       getByText(tEn('confirmTitleDescApproveTransaction') as string),
diff --git a/ui/pages/confirmations/components/confirm/title/title.tsx b/ui/pages/confirmations/components/confirm/title/title.tsx
index a926c0f6b482..83efc26406bf 100644
--- a/ui/pages/confirmations/components/confirm/title/title.tsx
+++ b/ui/pages/confirmations/components/confirm/title/title.tsx
@@ -88,7 +88,7 @@ const getTitle = (
       return t('confirmTitleSignature');
     case TransactionType.tokenMethodApprove:
       if (isNFT) {
-        return t('confirmTitleApproveTransaction');
+        return t('confirmTitleApproveTransactionNFT');
       }
       if (customSpendingCap === '0') {
         return t('confirmTitleRevokeApproveTransaction');

From 8c8851a21594f00730378d7031daf2a18c600840 Mon Sep 17 00:00:00 2001
From: Matthew Walsh <matthew.walsh@consensys.net>
Date: Tue, 10 Dec 2024 10:11:14 +0000
Subject: [PATCH 066/175] feat: upgrade transaction controller to get incoming
 transactions using accounts API  (#28597)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## **Description**

Update `@metamask/transaction-controller` to retrieve incoming
transactions using the accounts API rather than Etherscan.

Add incoming transaction E2E tests.

[![Open in GitHub
Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/28597?quickstart=1)

## **Related issues**

## **Manual testing steps**

## **Screenshots/Recordings**

### **Before**

### **After**

## **Pre-merge author checklist**

- [x] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension Coding
Standards](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/CODING_GUIDELINES.md).
- [x] I've completed the PR template to the best of my ability
- [x] I’ve included tests if applicable
- [x] I’ve documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [x] I’ve applied the right labels on the PR (see [labeling
guidelines](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.

## **Pre-merge reviewer checklist**

- [ ] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed).
- [ ] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.
---
 app/scripts/metamask-controller.js            |  21 +-
 package.json                                  |   2 +-
 test/e2e/fixture-builder.js                   |  18 ++
 .../page-objects/pages/home/activity-list.ts  |  27 +++
 ...rs-after-init-opt-in-background-state.json |   1 +
 .../transaction/incoming-transactions.spec.ts | 199 ++++++++++++++++++
 ui/pages/bridge/hooks/useHandleBridgeTx.ts    |   1 -
 yarn.lock                                     |  15 +-
 8 files changed, 268 insertions(+), 16 deletions(-)
 create mode 100644 test/e2e/tests/transaction/incoming-transactions.spec.ts

diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
index 0e46a598faf8..cc1bfe8b6809 100644
--- a/app/scripts/metamask-controller.js
+++ b/app/scripts/metamask-controller.js
@@ -2758,8 +2758,10 @@ export default class MetamaskController extends EventEmitter {
   }
 
   triggerNetworkrequests() {
+    this.txController.stopIncomingTransactionPolling();
+
     this.txController.startIncomingTransactionPolling([
-      this.#getGlobalNetworkClientId(),
+      this.#getGlobalChainId(),
     ]);
 
     this.tokenDetectionController.enable();
@@ -3012,9 +3014,12 @@ export default class MetamaskController extends EventEmitter {
         const chainId = this.#getGlobalChainId();
 
         await updateCurrentLocale(currentLocale);
+
         if (currState.incomingTransactionsPreferences?.[chainId]) {
+          this.txController.stopIncomingTransactionPolling();
+
           this.txController.startIncomingTransactionPolling([
-            this.#getGlobalNetworkClientId(),
+            this.#getGlobalChainId(),
           ]);
         } else {
           this.txController.stopIncomingTransactionPolling();
@@ -3085,14 +3090,14 @@ export default class MetamaskController extends EventEmitter {
     this.controllerMessenger.subscribe(
       'NetworkController:networkDidChange',
       async () => {
+        await this.txController.stopIncomingTransactionPolling();
+
         await this.txController.updateIncomingTransactions([
-          this.#getGlobalNetworkClientId(),
+          this.#getGlobalChainId(),
         ]);
 
-        await this.txController.stopIncomingTransactionPolling();
-
         await this.txController.startIncomingTransactionPolling([
-          this.#getGlobalNetworkClientId(),
+          this.#getGlobalChainId(),
         ]);
       },
     );
@@ -7086,7 +7091,9 @@ export default class MetamaskController extends EventEmitter {
       }
     }
 
-    await this.txController.updateIncomingTransactions();
+    await this.txController.updateIncomingTransactions([
+      this.#getGlobalChainId(),
+    ]);
   }
 
   async _notifyAccountsChange(origin, newAccounts) {
diff --git a/package.json b/package.json
index 697a4477d20d..71e6cebc2c19 100644
--- a/package.json
+++ b/package.json
@@ -348,7 +348,7 @@
     "@metamask/snaps-sdk": "^6.13.0",
     "@metamask/snaps-utils": "^8.6.1",
     "@metamask/solana-wallet-snap": "^0.1.9",
-    "@metamask/transaction-controller": "^41.0.0",
+    "@metamask/transaction-controller": "^42.0.0",
     "@metamask/user-operation-controller": "^19.0.0",
     "@metamask/utils": "^10.0.1",
     "@ngraveio/bc-ur": "^1.1.12",
diff --git a/test/e2e/fixture-builder.js b/test/e2e/fixture-builder.js
index d2dc32297737..89471203c77e 100644
--- a/test/e2e/fixture-builder.js
+++ b/test/e2e/fixture-builder.js
@@ -1481,6 +1481,24 @@ class FixtureBuilder {
       });
   }
 
+  withIncomingTransactionsPreferences(incomingTransactionsPreferences) {
+    return this.withPreferencesController({
+      featureFlags: {
+        showIncomingTransactions: incomingTransactionsPreferences,
+      },
+    });
+  }
+
+  withIncomingTransactionsCache(cache) {
+    return this.withTransactionController({ lastFetchedBlockNumbers: cache });
+  }
+
+  withTransactions(transactions) {
+    return this.withTransactionController({
+      transactions,
+    });
+  }
+
   build() {
     this.fixture.meta = {
       version: FIXTURE_STATE_METADATA_VERSION,
diff --git a/test/e2e/page-objects/pages/home/activity-list.ts b/test/e2e/page-objects/pages/home/activity-list.ts
index 76ea76c5932f..efec4bf2aa0a 100644
--- a/test/e2e/page-objects/pages/home/activity-list.ts
+++ b/test/e2e/page-objects/pages/home/activity-list.ts
@@ -19,6 +19,9 @@ class ActivityListPage {
   private readonly transactionAmountsInActivity =
     '[data-testid="transaction-list-item-primary-currency"]';
 
+  private readonly activityListAction =
+    '[data-testid="activity-list-item-action"]';
+
   constructor(driver: Driver) {
     this.driver = driver;
   }
@@ -124,6 +127,30 @@ class ActivityListPage {
       `Amount for transaction ${expectedNumber} is displayed as ${expectedAmount}`,
     );
   }
+
+  async check_txAction(expectedAction: string, expectedNumber: number = 1) {
+    const transactionActions = await this.driver.findElements(
+      this.activityListAction,
+    );
+
+    const transactionActionText = await transactionActions[
+      expectedNumber - 1
+    ].getText();
+
+    assert.equal(
+      transactionActionText,
+      expectedAction,
+      `${transactionActionText} is displayed as transaction action instead of ${expectedAction} for transaction ${expectedNumber}`,
+    );
+
+    console.log(
+      `Action for transaction ${expectedNumber} is displayed as ${expectedAction}`,
+    );
+  }
+
+  async check_noTxInActivity(): Promise<void> {
+    await this.driver.assertElementNotPresent(this.completedTransactions);
+  }
 }
 
 export default ActivityListPage;
diff --git a/test/e2e/tests/metrics/state-snapshots/errors-after-init-opt-in-background-state.json b/test/e2e/tests/metrics/state-snapshots/errors-after-init-opt-in-background-state.json
index ecd0b1d0db7a..c915bba637b7 100644
--- a/test/e2e/tests/metrics/state-snapshots/errors-after-init-opt-in-background-state.json
+++ b/test/e2e/tests/metrics/state-snapshots/errors-after-init-opt-in-background-state.json
@@ -344,6 +344,7 @@
     "allDetectedTokens": {}
   },
   "TxController": {
+    "lastFetchedBlockNumbers": "object",
     "methodData": "object",
     "transactions": "object",
     "lastFetchedBlockNumbers": "object",
diff --git a/test/e2e/tests/transaction/incoming-transactions.spec.ts b/test/e2e/tests/transaction/incoming-transactions.spec.ts
new file mode 100644
index 000000000000..e31d35c12841
--- /dev/null
+++ b/test/e2e/tests/transaction/incoming-transactions.spec.ts
@@ -0,0 +1,199 @@
+import { Mockttp } from 'mockttp';
+import { loginWithoutBalanceValidation } from '../../page-objects/flows/login.flow';
+import { Driver } from '../../webdriver/driver';
+import { DEFAULT_FIXTURE_ACCOUNT } from '../../constants';
+import { withFixtures } from '../../helpers';
+import FixtureBuilder from '../../fixture-builder';
+import { switchToNetworkFlow } from '../../page-objects/flows/network.flow';
+import HomePage from '../../page-objects/pages/home/homepage';
+import ActivityListPage from '../../page-objects/pages/home/activity-list';
+
+const TIMESTAMP_MOCK = 1234;
+
+const RESPONSE_STANDARD_MOCK = {
+  hash: '0x1',
+  timestamp: new Date(TIMESTAMP_MOCK).toISOString(),
+  chainId: 1,
+  blockNumber: 1,
+  blockHash: '0x2',
+  gas: 1,
+  gasUsed: 1,
+  gasPrice: '1',
+  effectiveGasPrice: '1',
+  nonce: 1,
+  cumulativeGasUsed: 1,
+  methodId: null,
+  value: '1230000000000000000',
+  to: DEFAULT_FIXTURE_ACCOUNT.toLowerCase(),
+  from: '0x2',
+  isError: false,
+  valueTransfers: [],
+};
+
+const RESPONSE_STANDARD_2_MOCK = {
+  ...RESPONSE_STANDARD_MOCK,
+  hash: '0x2',
+  value: '2340000000000000000',
+  timestamp: new Date(TIMESTAMP_MOCK - 1).toISOString(),
+};
+
+const RESPONSE_TOKEN_TRANSFER_MOCK = {
+  ...RESPONSE_STANDARD_MOCK,
+  to: '0x2',
+  valueTransfers: [
+    {
+      contractAddress: '0x123',
+      decimal: 18,
+      symbol: 'ABC',
+      from: '0x2',
+      to: DEFAULT_FIXTURE_ACCOUNT.toLowerCase(),
+      amount: '4560000000000000000',
+    },
+  ],
+};
+
+const RESPONSE_OUTGOING_MOCK = {
+  ...RESPONSE_STANDARD_MOCK,
+  from: DEFAULT_FIXTURE_ACCOUNT.toLowerCase(),
+  to: '0x2',
+};
+
+async function mockAccountsApi(
+  mockServer: Mockttp,
+  {
+    cursor,
+    transactions,
+  }: { cursor?: string; transactions?: Record<string, unknown>[] } = {},
+) {
+  return [
+    await mockServer
+      .forGet(
+        `https://accounts.api.cx.metamask.io/v1/accounts/${DEFAULT_FIXTURE_ACCOUNT.toLowerCase()}/transactions`,
+      )
+      .withQuery(cursor ? { cursor } : {})
+      .thenCallback(() => ({
+        statusCode: 200,
+        json: {
+          data: transactions ?? [
+            RESPONSE_STANDARD_MOCK,
+            RESPONSE_STANDARD_2_MOCK,
+          ],
+          pageInfo: { hasNextPage: false },
+        },
+      })),
+  ];
+}
+
+describe('Incoming Transactions', function () {
+  it('adds standard incoming transactions', async function () {
+    await withFixtures(
+      {
+        fixtures: new FixtureBuilder()
+          .withIncomingTransactionsPreferences(true)
+          .build(),
+        title: this.test?.fullTitle(),
+        testSpecificMock: mockAccountsApi,
+      },
+      async ({ driver }: { driver: Driver }) => {
+        const activityList = await changeNetworkAndGoToActivity(driver);
+        await activityList.check_confirmedTxNumberDisplayedInActivity(2);
+
+        await activityList.check_txAction('Receive', 1);
+        await activityList.check_txAmountInActivity('1.23 ETH', 1);
+
+        await activityList.check_txAction('Receive', 2);
+        await activityList.check_txAmountInActivity('2.34 ETH', 2);
+      },
+    );
+  });
+
+  it('ignores token transfer transactions', async function () {
+    await withFixtures(
+      {
+        fixtures: new FixtureBuilder()
+          .withIncomingTransactionsPreferences(true)
+          .build(),
+        title: this.test?.fullTitle(),
+        testSpecificMock: (server: Mockttp) =>
+          mockAccountsApi(server, {
+            transactions: [
+              RESPONSE_STANDARD_MOCK,
+              RESPONSE_TOKEN_TRANSFER_MOCK,
+            ],
+          }),
+      },
+      async ({ driver }: { driver: Driver }) => {
+        const activityList = await changeNetworkAndGoToActivity(driver);
+        await activityList.check_confirmedTxNumberDisplayedInActivity(1);
+      },
+    );
+  });
+
+  it('ignores outgoing transactions', async function () {
+    await withFixtures(
+      {
+        fixtures: new FixtureBuilder()
+          .withIncomingTransactionsPreferences(true)
+          .build(),
+        title: this.test?.fullTitle(),
+        testSpecificMock: (server: Mockttp) =>
+          mockAccountsApi(server, {
+            transactions: [RESPONSE_STANDARD_MOCK, RESPONSE_OUTGOING_MOCK],
+          }),
+      },
+      async ({ driver }: { driver: Driver }) => {
+        const activityList = await changeNetworkAndGoToActivity(driver);
+        await activityList.check_confirmedTxNumberDisplayedInActivity(1);
+      },
+    );
+  });
+
+  it('does nothing if preference disabled', async function () {
+    await withFixtures(
+      {
+        fixtures: new FixtureBuilder()
+          .withIncomingTransactionsPreferences(false)
+          .build(),
+        title: this.test?.fullTitle(),
+        testSpecificMock: mockAccountsApi,
+      },
+      async ({ driver }: { driver: Driver }) => {
+        const activityList = await changeNetworkAndGoToActivity(driver);
+        await driver.delay(2000);
+        await activityList.check_noTxInActivity();
+      },
+    );
+  });
+
+  it('ignores duplicate transactions already in state', async function () {
+    await withFixtures(
+      {
+        fixtures: new FixtureBuilder()
+          .withIncomingTransactionsPreferences(true)
+          .withTransactions([
+            {
+              hash: RESPONSE_STANDARD_MOCK.hash,
+              txParams: { from: RESPONSE_STANDARD_MOCK.from },
+            },
+          ])
+          .build(),
+        title: this.test?.fullTitle(),
+        testSpecificMock: mockAccountsApi,
+      },
+      async ({ driver }: { driver: Driver }) => {
+        const activityList = await changeNetworkAndGoToActivity(driver);
+        await activityList.check_confirmedTxNumberDisplayedInActivity(1);
+      },
+    );
+  });
+});
+
+async function changeNetworkAndGoToActivity(driver: Driver) {
+  await loginWithoutBalanceValidation(driver);
+  await switchToNetworkFlow(driver, 'Ethereum Mainnet');
+
+  const homepage = new HomePage(driver);
+  await homepage.goToActivityList();
+
+  return new ActivityListPage(driver);
+}
diff --git a/ui/pages/bridge/hooks/useHandleBridgeTx.ts b/ui/pages/bridge/hooks/useHandleBridgeTx.ts
index 6d35cc931b77..feb7400acc71 100644
--- a/ui/pages/bridge/hooks/useHandleBridgeTx.ts
+++ b/ui/pages/bridge/hooks/useHandleBridgeTx.ts
@@ -25,7 +25,6 @@ export default function useHandleBridgeTx() {
       txType: TransactionType.bridge,
       txParams: quoteResponse.trade,
       fieldsToAddToTxMeta: {
-        // @ts-expect-error TODO get this added to TxMeta type
         destinationChainId: new Numeric(quoteResponse.quote.destChainId, 10)
           .toPrefixedHexString()
           .toLowerCase() as `0x${string}`,
diff --git a/yarn.lock b/yarn.lock
index e56e610cd0ce..95b7c07916c4 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6320,9 +6320,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/transaction-controller@npm:^41.0.0":
-  version: 41.0.0
-  resolution: "@metamask/transaction-controller@npm:41.0.0"
+"@metamask/transaction-controller@npm:^42.0.0":
+  version: 42.0.0
+  resolution: "@metamask/transaction-controller@npm:42.0.0"
   dependencies:
     "@ethereumjs/common": "npm:^3.2.0"
     "@ethereumjs/tx": "npm:^4.2.0"
@@ -6331,7 +6331,7 @@ __metadata:
     "@ethersproject/contracts": "npm:^5.7.0"
     "@ethersproject/providers": "npm:^5.7.0"
     "@metamask/base-controller": "npm:^7.0.2"
-    "@metamask/controller-utils": "npm:^11.4.3"
+    "@metamask/controller-utils": "npm:^11.4.4"
     "@metamask/eth-query": "npm:^4.0.0"
     "@metamask/metamask-eth-abis": "npm:^3.1.1"
     "@metamask/nonce-tracker": "npm:^6.0.0"
@@ -6344,12 +6344,13 @@ __metadata:
     lodash: "npm:^4.17.21"
     uuid: "npm:^8.3.2"
   peerDependencies:
-    "@babel/runtime": ^7.23.9
+    "@babel/runtime": ^7.0.0
     "@metamask/accounts-controller": ^20.0.0
     "@metamask/approval-controller": ^7.0.0
+    "@metamask/eth-block-tracker": ">=9"
     "@metamask/gas-fee-controller": ^22.0.0
     "@metamask/network-controller": ^22.0.0
-  checksum: 10/67a00b2eade35fc4e635a6bcbbcd847b3986b3bdcc9730ff2c8f81234df18ed11149203c13d6bad616e859f7e25879efab36b6dc4be05a4e747b4280ae2f300d
+  checksum: 10/73c510803a720b4c1da0b82f1279a404a9b11c4ab76f8e5e4378c65d5d08bbb32c52062abfe319476cc3f5e2623a8987775c4524e55aa94002af73d73721b869
   languageName: node
   linkType: hard
 
@@ -26456,7 +26457,7 @@ __metadata:
     "@metamask/solana-wallet-snap": "npm:^0.1.9"
     "@metamask/test-bundler": "npm:^1.0.0"
     "@metamask/test-dapp": "npm:8.13.0"
-    "@metamask/transaction-controller": "npm:^41.0.0"
+    "@metamask/transaction-controller": "npm:^42.0.0"
     "@metamask/user-operation-controller": "npm:^19.0.0"
     "@metamask/utils": "npm:^10.0.1"
     "@ngraveio/bc-ur": "npm:^1.1.12"

From f9e78789663c49464956d9776d61f475794b6afe Mon Sep 17 00:00:00 2001
From: Pedro Figueiredo <pedro.figueiredo@consensys.net>
Date: Tue, 10 Dec 2024 13:34:24 +0000
Subject: [PATCH 067/175] feat: Add new gas_fee_selected property on
 Transaction * events (#29027)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<!--
Please submit this PR as a draft initially.
Do not mark it as "Ready for review" until the template has been
completely filled out, and PR status checks have passed at least once.
-->

## **Description**

As per the task title.

<!--
Write a short description of the changes included in this pull request,
also include relevant motivation and context. Have in mind the following
questions:
1. What is the reason for the change?
2. What is the improvement/solution?
-->

[![Open in GitHub
Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/29027?quickstart=1)

## **Related issues**

Fixes: https://github.com/MetaMask/MetaMask-planning/issues/3622

## **Manual testing steps**

1. Go to this page...
2.
3.

## **Screenshots/Recordings**

<!-- If applicable, add screenshots and/or recordings to visualize the
before and after of your change. -->

### **Before**

<!-- [screenshots/recordings] -->

### **After**

<!-- [screenshots/recordings] -->

<img width="697" alt="Screenshot 2024-12-09 at 17 35 30"
src="https://github.com/user-attachments/assets/f89bb9f9-4e8a-4b26-8186-57b0101edf20">

<img width="697" alt="Screenshot 2024-12-10 at 09 58 47"
src="https://github.com/user-attachments/assets/8c39d24d-4787-4285-a43c-a196d2509613">
<img width="697" alt="Screenshot 2024-12-10 at 09 58 37"
src="https://github.com/user-attachments/assets/daf7fbe4-bd25-4e26-ba30-654e49661bf7">



## **Pre-merge author checklist**

- [ ] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension Coding
Standards](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/CODING_GUIDELINES.md).
- [ ] I've completed the PR template to the best of my ability
- [ ] I’ve included tests if applicable
- [ ] I’ve documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [ ] I’ve applied the right labels on the PR (see [labeling
guidelines](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.

## **Pre-merge reviewer checklist**

- [ ] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed).
- [ ] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.
---
 app/scripts/lib/transaction/metrics.ts | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/app/scripts/lib/transaction/metrics.ts b/app/scripts/lib/transaction/metrics.ts
index 3cb33af60d3f..21a385307742 100644
--- a/app/scripts/lib/transaction/metrics.ts
+++ b/app/scripts/lib/transaction/metrics.ts
@@ -793,10 +793,14 @@ async function buildEventFragmentProperties({
     securityProviderResponse,
     simulationFails,
     id,
+    userFeeLevel,
   } = transactionMeta;
   const query = new EthQuery(transactionMetricsRequest.provider);
   const source = referrer === ORIGIN_METAMASK ? 'user' : 'dapp';
 
+  const gasFeeSelected =
+    userFeeLevel === 'dappSuggested' ? 'dapp_proposed' : userFeeLevel;
+
   const { assetType, tokenStandard } = await determineTransactionAssetType(
     transactionMeta,
     query,
@@ -1045,6 +1049,7 @@ async function buildEventFragmentProperties({
     transaction_type: transactionType,
     transaction_speed_up: type === TransactionType.retry,
     transaction_internal_id: id,
+    gas_fee_selected: gasFeeSelected,
     ...blockaidProperties,
     // ui_customizations must come after ...blockaidProperties
     ui_customizations: uiCustomizations.length > 0 ? uiCustomizations : null,

From 223cf44aa86cc36f241f841e94ff0fa799f2ee32 Mon Sep 17 00:00:00 2001
From: Priya <priya.narayanaswamy@consensys.net>
Date: Tue, 10 Dec 2024 15:17:07 +0100
Subject: [PATCH 068/175] test: fix flaky send eth transaction test (#29050)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<!--
Please submit this PR as a draft initially.
Do not mark it as "Ready for review" until the template has been
completely filled out, and PR status checks have passed at least once.
-->

## **Description**

Fixes flaky e2e test to send eth transaction from within the wallet.

[![Open in GitHub
Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/29050?quickstart=1)

## **Related issues**

Fixes:
[#28876](https://github.com/MetaMask/metamask-extension/issues/28876)

## **Manual testing steps**

1. Go to this page...
2.
3.

## **Screenshots/Recordings**

<!-- If applicable, add screenshots and/or recordings to visualize the
before and after of your change. -->

### **Before**

<!-- [screenshots/recordings] -->

### **After**

<!-- [screenshots/recordings] -->

## **Pre-merge author checklist**

- [ ] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension Coding
Standards](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/CODING_GUIDELINES.md).
- [ ] I've completed the PR template to the best of my ability
- [ ] I’ve included tests if applicable
- [ ] I’ve documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [ ] I’ve applied the right labels on the PR (see [labeling
guidelines](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.

## **Pre-merge reviewer checklist**

- [ ] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed).
- [ ] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.
---
 test/e2e/tests/transaction/send-eth.spec.js | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/test/e2e/tests/transaction/send-eth.spec.js b/test/e2e/tests/transaction/send-eth.spec.js
index 7bffb3f1cde1..badeb2d88540 100644
--- a/test/e2e/tests/transaction/send-eth.spec.js
+++ b/test/e2e/tests/transaction/send-eth.spec.js
@@ -469,25 +469,19 @@ describe('Send ETH', function () {
             smartContract,
             title: this.test.fullTitle(),
           },
-          async ({ driver, contractRegistry, ganacheServer }) => {
-            const contractAddress = await contractRegistry.getContractAddress(
-              smartContract,
-            );
+          async ({ driver, ganacheServer }) => {
             await logInWithBalanceValidation(driver, ganacheServer);
 
             // Wait for balance to load
             await driver.delay(500);
 
             await driver.clickElement('[data-testid="eth-overview-send"]');
-            await driver.fill(
-              'input[placeholder="Enter public address (0x) or domain name"]',
-              contractAddress,
-            );
+            await driver.clickElement({ text: 'Account 1', tag: 'button' });
 
             const inputAmount = await driver.findElement(
               'input[placeholder="0"]',
             );
-            await inputAmount.press('1');
+            await inputAmount.sendKeys('1');
 
             // Continue to next screen
             await driver.clickElement({ text: 'Continue', tag: 'button' });

From 1c2755c274e209c6e943a1b4e92fd4262b19c996 Mon Sep 17 00:00:00 2001
From: jvbriones <1674192+jvbriones@users.noreply.github.com>
Date: Tue, 10 Dec 2024 16:54:40 +0100
Subject: [PATCH 069/175] chore: update bug template to include feature
 branches (#28878)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<!--
Please submit this PR as a draft initially.
Do not mark it as "Ready for review" until the template has been
completely filled out, and PR status checks have passed at least once.
-->

## **Description**

Github bug template updated to include feature branches as a development
stage

<!--
Write a short description of the changes included in this pull request,
also include relevant motivation and context. Have in mind the following
questions:
1. What is the reason for the change?
2. What is the improvement/solution?
-->

[![Open in GitHub
Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/28878?quickstart=1)

## **Related issues**

Fixes:

## **Manual testing steps**

1. Go to this page...
2.
3.

## **Screenshots/Recordings**

<!-- If applicable, add screenshots and/or recordings to visualize the
before and after of your change. -->

### **Before**

<!-- [screenshots/recordings] -->

### **After**

<!-- [screenshots/recordings] -->

## **Pre-merge author checklist**

- [x] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension Coding
Standards](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/CODING_GUIDELINES.md).
- [x] I've completed the PR template to the best of my ability
- [x] I’ve included tests if applicable
- [x] I’ve documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [x] I’ve applied the right labels on the PR (see [labeling
guidelines](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.

## **Pre-merge reviewer checklist**

- [x] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed).
- [x] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.
---
 .github/ISSUE_TEMPLATE/bug-report.yml         |  3 ++-
 .github/guidelines/LABELING_GUIDELINES.md     |  1 +
 .../scripts/check-template-and-add-labels.ts  | 20 ++++++++++++++-----
 3 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/bug-report.yml b/.github/ISSUE_TEMPLATE/bug-report.yml
index 2b72c66524bd..a914f61ef82b 100644
--- a/.github/ISSUE_TEMPLATE/bug-report.yml
+++ b/.github/ISSUE_TEMPLATE/bug-report.yml
@@ -57,7 +57,8 @@ body:
        - In production (default)
        - In beta
        - During release testing
-       - On the development branch
+       - On main branch
+       - On a feature branch
    validations:
      required: true
  - type: input
diff --git a/.github/guidelines/LABELING_GUIDELINES.md b/.github/guidelines/LABELING_GUIDELINES.md
index ea37c2e5f03d..86affe59b646 100644
--- a/.github/guidelines/LABELING_GUIDELINES.md
+++ b/.github/guidelines/LABELING_GUIDELINES.md
@@ -15,6 +15,7 @@ It's essential to ensure that PRs have the appropriate labels before they are co
 
 ### Optional labels:
 - **regression-main**: This label can manually be added to a bug report issue at the time of its creation if the bug is present on the development branch, i.e., `main`, but is not yet released in production.
+- **feature-branch-bug**: This label can manually be added to a bug report issue at the time of its creation if the bug is present on a feature branch, i.e., before merging to `main`.
 - **needs-qa**: If the PR includes a new features, complex testing steps, or large refactors, this label must be added to indicated PR requires a full manual QA prior being merged and added to a release.
 
 ### Labels prohibited when PR needs to be merged:
diff --git a/.github/scripts/check-template-and-add-labels.ts b/.github/scripts/check-template-and-add-labels.ts
index 418174df2a90..25cce0998fa7 100644
--- a/.github/scripts/check-template-and-add-labels.ts
+++ b/.github/scripts/check-template-and-add-labels.ts
@@ -22,7 +22,8 @@ import { TemplateType, templates } from './shared/template';
 import { retrievePullRequest } from './shared/pull-request';
 
 enum RegressionStage {
-  Development,
+  DevelopmentFeature,
+  DevelopmentMain,
   Testing,
   Beta,
   Production
@@ -217,8 +218,10 @@ function extractRegressionStageFromBugReportIssueBody(
   const extractedAnswer = match ? match[1].trim() : undefined;
 
   switch (extractedAnswer) {
-    case 'On the development branch':
-      return RegressionStage.Development;
+    case 'On a feature branch':
+      return RegressionStage.DevelopmentFeature;
+    case 'On main branch':
+      return RegressionStage.DevelopmentMain;
     case 'During release testing':
       return RegressionStage.Testing;
     case 'In beta':
@@ -332,11 +335,18 @@ async function userBelongsToMetaMaskOrg(
 // This function crafts appropriate label, corresponding to regression stage and release version.
 function craftRegressionLabel(regressionStage: RegressionStage | undefined, releaseVersion: string | undefined): Label {
   switch (regressionStage) {
-    case RegressionStage.Development:
+    case RegressionStage.DevelopmentFeature:
+      return {
+        name: `feature-branch-bug`,
+        color: '5319E7', // violet
+        description: `bug that was found on a feature branch, but not yet merged in main branch`,
+      };
+
+    case RegressionStage.DevelopmentMain:
       return {
         name: `regression-main`,
         color: '5319E7', // violet
-        description: `Regression bug that was found on development branch, but not yet present in production`,
+        description: `Regression bug that was found on main branch, but not yet present in production`,
       };
 
     case RegressionStage.Testing:

From ac4bdeae45cd7904b0f3dcce5b64067aa57c06ca Mon Sep 17 00:00:00 2001
From: Matthew Walsh <matthew.walsh@consensys.net>
Date: Tue, 10 Dec 2024 17:30:26 +0000
Subject: [PATCH 070/175] feat: unified confirmation navigation (#28761)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## **Description**

Support a single navigation queue between all types of pending
confirmation, including:

- Transactions
- Signatures
- Template Confirmations (e.g. Snap Dialogs, Smart Transaction Status
Page)
- Get Encryption Public Key
- Decrypt
- Add Token
- Add NFT
- Connect

Specifically:

- Add `useConfirmationNavigation` hook to centralise all confirmation
routing.
- Use routing hook in:
  - `ConfirmPageContainerNavigation`
  - `Home`
  - `Nav`
  - `syncConfirmPath`
- Replace custom navigation in `ConfirmationPage` with `Nav` component.
- Add `confirmationId` property to `Nav` component and remove coupling
to `useCurrentConfirmation` hook.
- Add `Nav` component to:
  - `ConfirmAddSuggestedNFT`
  - `ConfirmAddSuggestedToken`
  - `ConfirmDecryptMessage`
  - `ConfirmEncryptionPublicKey`
  - `PermissionConnectHeader`
- Add associated E2E test.
- Remove manual header sizing from `ConfirmationPage` component.
- Fix template confirmation storybooks.
- Add snap dialog storybooks.

[![Open in GitHub
Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/28761?quickstart=1)

## **Related issues**

## **Manual testing steps**

1. Add unapproved transaction.
2. Add unapproved signature request
3. Install test dialog snap.
4. Create confirmation via test dialog snap.
5. Verify confirmation count is 3 and navigation functions between them.

## **Screenshots/Recordings**

### **Before**

### **After**


https://github.com/user-attachments/assets/5d59032c-0626-4603-aeac-3661b365a825

## **Pre-merge author checklist**

- [ ] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension Coding
Standards](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/CODING_GUIDELINES.md).
- [ ] I've completed the PR template to the best of my ability
- [ ] I’ve included tests if applicable
- [ ] I’ve documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [ ] I’ve applied the right labels on the PR (see [labeling
guidelines](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.

## **Pre-merge reviewer checklist**

- [ ] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed).
- [ ] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.
---
 .storybook/index.css                          |  18 ++
 .storybook/preview.js                         |   1 +
 app/_locales/de/messages.json                 |   4 -
 app/_locales/el/messages.json                 |   4 -
 app/_locales/en/messages.json                 |   4 -
 app/_locales/en_GB/messages.json              |   4 -
 app/_locales/es/messages.json                 |   4 -
 app/_locales/es_419/messages.json             |   4 -
 app/_locales/fr/messages.json                 |   4 -
 app/_locales/hi/messages.json                 |   4 -
 app/_locales/id/messages.json                 |   4 -
 app/_locales/ja/messages.json                 |   4 -
 app/_locales/ko/messages.json                 |   4 -
 app/_locales/ph/messages.json                 |   4 -
 app/_locales/pt/messages.json                 |   4 -
 app/_locales/pt_BR/messages.json              |   4 -
 app/_locales/ru/messages.json                 |   4 -
 app/_locales/tl/messages.json                 |   4 -
 app/_locales/tr/messages.json                 |   4 -
 app/_locales/vi/messages.json                 |   4 -
 app/_locales/zh_CN/messages.json              |   4 -
 app/_locales/zh_TW/messages.json              |   4 -
 app/scripts/background.js                     |  36 +--
 app/scripts/lib/approval/utils.test.ts        | 103 ++++++
 app/scripts/lib/approval/utils.ts             |  56 ++++
 app/scripts/metamask-controller.js            |  25 +-
 test/e2e/page-objects/pages/test-snaps.ts     |  50 +++
 .../tests/confirmations/navigation.spec.ts    |  50 ++-
 .../permission-connect-header.js              |  99 +++---
 .../permission-connect-header.test.js         |   5 +
 .../confirm-add-suggested-nft.js              |   3 +
 .../confirm-add-suggested-token.js            |   3 +
 .../confirm-decrypt-message.component.js      |  32 +-
 .../confirm-decrypt-message.component.test.js |  10 +-
 .../confirm-decrypt-message.scss              |   1 +
 ...confirm-encryption-public-key.component.js |  26 +-
 ...confirm-encryption-public-key.container.js |  10 +-
 ...irm-page-container-navigation.component.js |  77 ++---
 .../nav/__snapshots__/nav.test.tsx.snap       |   4 +-
 .../components/confirm/nav/index.tsx          |   2 +-
 .../components/confirm/nav/nav.stories.tsx    | 116 +++----
 .../components/confirm/nav/nav.test.tsx       |  11 +-
 .../components/confirm/nav/nav.tsx            |  93 ++----
 .../signature-request-original.test.js.snap   |   4 +-
 .../signature-request-siwe.test.js.snap       |   4 +-
 .../signature-request-siwe.test.js            |   4 +
 .../signature-request.test.js.snap            |   8 +-
 .../confirm-send-ether.test.js.snap           |   8 +-
 .../__snapshots__/index.test.js.snap          |   4 +-
 .../confirm-transaction-base.test.js.snap     |   4 +-
 ui/pages/confirmations/confirm/confirm.tsx    |   4 +-
 .../confirmation/confirmation.js              | 292 ++++++++----------
 .../stories/snap-dialog.stories.tsx           | 118 +++++++
 .../confirmation/stories/util.js              |  10 +-
 .../add-ethereum-chain.test.js.snap           |   2 +-
 .../create-named-snap-account.test.js.snap    |  57 +++-
 .../create-snap-account.test.js.snap          |   2 +-
 .../__snapshots__/error.test.js.snap          |   2 +-
 .../remove-snap-account.test.js.snap          |   2 +-
 .../snap-account-redirect.test.js.snap        |   2 +-
 .../__snapshots__/success.test.js.snap        |   2 +-
 .../switch-ethereum-chain.test.js.snap        |   4 +-
 .../hooks/syncConfirmPath.test.ts             |  18 +-
 .../confirmations/hooks/syncConfirmPath.ts    |  19 +-
 .../hooks/useConfirmationNavigation.test.ts   | 228 ++++++++++++++
 .../hooks/useConfirmationNavigation.ts        | 146 +++++++++
 .../token-allowance.test.js.snap              |   4 +-
 ui/pages/home/home.component.js               |  50 +--
 ui/pages/home/home.container.js               |  34 +-
 .../permissions-connect.component.js          |   1 +
 ui/selectors/approvals.ts                     |   2 +-
 ui/selectors/selectors.js                     |   2 +-
 ui/store/actions.ts                           |  12 +
 73 files changed, 1301 insertions(+), 659 deletions(-)
 create mode 100644 .storybook/index.css
 create mode 100644 app/scripts/lib/approval/utils.test.ts
 create mode 100644 app/scripts/lib/approval/utils.ts
 create mode 100644 test/e2e/page-objects/pages/test-snaps.ts
 create mode 100644 ui/pages/confirmations/confirmation/stories/snap-dialog.stories.tsx
 create mode 100644 ui/pages/confirmations/hooks/useConfirmationNavigation.test.ts
 create mode 100644 ui/pages/confirmations/hooks/useConfirmationNavigation.ts

diff --git a/.storybook/index.css b/.storybook/index.css
new file mode 100644
index 000000000000..48ebae78fe46
--- /dev/null
+++ b/.storybook/index.css
@@ -0,0 +1,18 @@
+/* Fixes for any styles that are not compatible with Storybook */
+
+.create-snap-account-page, .remove-snap-account-page, .snap-ui-renderer {
+  width: 100% !important;
+}
+
+.snap-ui-renderer__footer-centered {
+  position: initial !important;
+  margin-top: auto !important;
+}
+
+.snap-ui-renderer__container {
+  padding-bottom: 0 !important;
+}
+
+.snap-ui-renderer__panel {
+  overflow-y: auto !important;
+}
diff --git a/.storybook/preview.js b/.storybook/preview.js
index 525c364f2072..273afa2468b0 100644
--- a/.storybook/preview.js
+++ b/.storybook/preview.js
@@ -21,6 +21,7 @@ import { metamaskStorybookTheme } from './metamask-storybook-theme';
 import { DocsContainer } from '@storybook/addon-docs';
 import { themes } from '@storybook/theming';
 import { AlertMetricsProvider } from '../ui/components/app/alert-system/contexts/alertMetricsContext';
+import './index.css';
 
 // eslint-disable-next-line
 /* @ts-expect-error: Avoids error from window property not existing */
diff --git a/app/_locales/de/messages.json b/app/_locales/de/messages.json
index 416fc2454fee..6d0878b57d5c 100644
--- a/app/_locales/de/messages.json
+++ b/app/_locales/de/messages.json
@@ -6598,10 +6598,6 @@
   "wrongNetworkName": {
     "message": "Laut unseren Aufzeichnungen stimmt dieser Netzwerkname nicht mit dieser Chain-ID überein."
   },
-  "xOfYPending": {
-    "message": "$1 von $2 ausstehend",
-    "description": "$1 and $2 are intended to be two numbers, where $2 is a total number of pending confirmations, and $1 is a count towards that total"
-  },
   "yes": {
     "message": "Ja"
   },
diff --git a/app/_locales/el/messages.json b/app/_locales/el/messages.json
index 90209c25f6e9..58045c5b0578 100644
--- a/app/_locales/el/messages.json
+++ b/app/_locales/el/messages.json
@@ -6598,10 +6598,6 @@
   "wrongNetworkName": {
     "message": "Σύμφωνα με τα αρχεία μας, το όνομα του δικτύου ενδέχεται να μην αντιστοιχεί με αυτό το αναγνωριστικό αλυσίδας."
   },
-  "xOfYPending": {
-    "message": "$1 από $2 σε εκκρεμότητα",
-    "description": "$1 and $2 are intended to be two numbers, where $2 is a total number of pending confirmations, and $1 is a count towards that total"
-  },
   "yes": {
     "message": "Ναι"
   },
diff --git a/app/_locales/en/messages.json b/app/_locales/en/messages.json
index f6f03b616087..a23df7a26395 100644
--- a/app/_locales/en/messages.json
+++ b/app/_locales/en/messages.json
@@ -6782,10 +6782,6 @@
   "wrongNetworkName": {
     "message": "According to our records, the network name may not correctly match this chain ID."
   },
-  "xOfYPending": {
-    "message": "$1 of $2 pending",
-    "description": "$1 and $2 are intended to be two numbers, where $2 is a total number of pending confirmations, and $1 is a count towards that total"
-  },
   "yes": {
     "message": "Yes"
   },
diff --git a/app/_locales/en_GB/messages.json b/app/_locales/en_GB/messages.json
index 92ad7c646a36..2addf34f3c26 100644
--- a/app/_locales/en_GB/messages.json
+++ b/app/_locales/en_GB/messages.json
@@ -6310,10 +6310,6 @@
   "wrongNetworkName": {
     "message": "According to our records, the network name may not correctly match this chain ID."
   },
-  "xOfYPending": {
-    "message": "$1 of $2 pending",
-    "description": "$1 and $2 are intended to be two numbers, where $2 is a total number of pending confirmations, and $1 is a count towards that total"
-  },
   "yes": {
     "message": "Yes"
   },
diff --git a/app/_locales/es/messages.json b/app/_locales/es/messages.json
index 066e4e40b841..f5bec514637e 100644
--- a/app/_locales/es/messages.json
+++ b/app/_locales/es/messages.json
@@ -6598,10 +6598,6 @@
   "wrongNetworkName": {
     "message": "Según nuestros registros, es posible que el nombre de la red no coincida correctamente con este ID de cadena."
   },
-  "xOfYPending": {
-    "message": "$1 de $2 están pendientes",
-    "description": "$1 and $2 are intended to be two numbers, where $2 is a total number of pending confirmations, and $1 is a count towards that total"
-  },
   "yes": {
     "message": "Sí"
   },
diff --git a/app/_locales/es_419/messages.json b/app/_locales/es_419/messages.json
index 511ee6cbef71..8006ca4405be 100644
--- a/app/_locales/es_419/messages.json
+++ b/app/_locales/es_419/messages.json
@@ -2375,10 +2375,6 @@
   "whatsThis": {
     "message": "¿Qué es esto?"
   },
-  "xOfYPending": {
-    "message": "$1 de $2 están pendientes",
-    "description": "$1 and $2 are intended to be two numbers, where $2 is a total number of pending confirmations, and $1 is a count towards that total"
-  },
   "youNeedToAllowCameraAccess": {
     "message": "Necesita permitir el acceso a la cámara para usar esta función."
   },
diff --git a/app/_locales/fr/messages.json b/app/_locales/fr/messages.json
index a3c20374639f..4d5e59b25c52 100644
--- a/app/_locales/fr/messages.json
+++ b/app/_locales/fr/messages.json
@@ -6598,10 +6598,6 @@
   "wrongNetworkName": {
     "message": "Selon nos informations, il se peut que le nom du réseau ne corresponde pas exactement à l’ID de chaîne."
   },
-  "xOfYPending": {
-    "message": "$1 sur $2 en attente",
-    "description": "$1 and $2 are intended to be two numbers, where $2 is a total number of pending confirmations, and $1 is a count towards that total"
-  },
   "yes": {
     "message": "Oui"
   },
diff --git a/app/_locales/hi/messages.json b/app/_locales/hi/messages.json
index 0e108a94e585..2d4bcc52b891 100644
--- a/app/_locales/hi/messages.json
+++ b/app/_locales/hi/messages.json
@@ -6598,10 +6598,6 @@
   "wrongNetworkName": {
     "message": "हमारे रिकॉर्ड के अनुसार, नेटवर्क का नाम इस चेन ID से ठीक से मेल नहीं खा सकता है।"
   },
-  "xOfYPending": {
-    "message": "$2 में से $1 लंबित",
-    "description": "$1 and $2 are intended to be two numbers, where $2 is a total number of pending confirmations, and $1 is a count towards that total"
-  },
   "yes": {
     "message": "हां"
   },
diff --git a/app/_locales/id/messages.json b/app/_locales/id/messages.json
index 261d57c9ed10..9135a2e56bcf 100644
--- a/app/_locales/id/messages.json
+++ b/app/_locales/id/messages.json
@@ -6598,10 +6598,6 @@
   "wrongNetworkName": {
     "message": "Menurut catatan kami, nama jaringan mungkin tidak cocok dengan ID chain ini."
   },
-  "xOfYPending": {
-    "message": "$1 dari $2 berstatus menunggu",
-    "description": "$1 and $2 are intended to be two numbers, where $2 is a total number of pending confirmations, and $1 is a count towards that total"
-  },
   "yes": {
     "message": "Ya"
   },
diff --git a/app/_locales/ja/messages.json b/app/_locales/ja/messages.json
index 11b804eac0f9..8404c4eb3af4 100644
--- a/app/_locales/ja/messages.json
+++ b/app/_locales/ja/messages.json
@@ -6598,10 +6598,6 @@
   "wrongNetworkName": {
     "message": "弊社の記録によると、ネットワーク名がこのチェーンIDと正しく一致していない可能性があります。"
   },
-  "xOfYPending": {
-    "message": "$2件中$1件が保留中",
-    "description": "$1 and $2 are intended to be two numbers, where $2 is a total number of pending confirmations, and $1 is a count towards that total"
-  },
   "yes": {
     "message": "はい"
   },
diff --git a/app/_locales/ko/messages.json b/app/_locales/ko/messages.json
index 7a8fad19debb..cbd48592c7d0 100644
--- a/app/_locales/ko/messages.json
+++ b/app/_locales/ko/messages.json
@@ -6598,10 +6598,6 @@
   "wrongNetworkName": {
     "message": "기록에 따르면 네트워크 이름이 이 체인 ID와 일치하지 않습니다."
   },
-  "xOfYPending": {
-    "message": "$1/$2개 보류 중",
-    "description": "$1 and $2 are intended to be two numbers, where $2 is a total number of pending confirmations, and $1 is a count towards that total"
-  },
   "yes": {
     "message": "예"
   },
diff --git a/app/_locales/ph/messages.json b/app/_locales/ph/messages.json
index 3c08d76cb186..3d40dbfefd77 100644
--- a/app/_locales/ph/messages.json
+++ b/app/_locales/ph/messages.json
@@ -1591,10 +1591,6 @@
   "whatsThis": {
     "message": "Ano ito?"
   },
-  "xOfYPending": {
-    "message": "$1 sa $2 ang nakabinbin",
-    "description": "$1 and $2 are intended to be two numbers, where $2 is a total number of pending confirmations, and $1 is a count towards that total"
-  },
   "youNeedToAllowCameraAccess": {
     "message": "Kailangan mong payagan ang pag-access sa camera para magamit ang feature na ito."
   },
diff --git a/app/_locales/pt/messages.json b/app/_locales/pt/messages.json
index c6d61aa82191..3a01b378c686 100644
--- a/app/_locales/pt/messages.json
+++ b/app/_locales/pt/messages.json
@@ -6598,10 +6598,6 @@
   "wrongNetworkName": {
     "message": "De acordo com os nossos registros, o nome da rede pode não corresponder a esta ID de cadeia."
   },
-  "xOfYPending": {
-    "message": "$1 de $2 pendente(s)",
-    "description": "$1 and $2 are intended to be two numbers, where $2 is a total number of pending confirmations, and $1 is a count towards that total"
-  },
   "yes": {
     "message": "Sim"
   },
diff --git a/app/_locales/pt_BR/messages.json b/app/_locales/pt_BR/messages.json
index ebf2af88c186..0bc1005ad674 100644
--- a/app/_locales/pt_BR/messages.json
+++ b/app/_locales/pt_BR/messages.json
@@ -2375,10 +2375,6 @@
   "whatsThis": {
     "message": "O que é isso?"
   },
-  "xOfYPending": {
-    "message": "$1 de $2 pendente",
-    "description": "$1 and $2 are intended to be two numbers, where $2 is a total number of pending confirmations, and $1 is a count towards that total"
-  },
   "youNeedToAllowCameraAccess": {
     "message": "Você precisa permitir o acesso à câmera para usar esse recurso."
   },
diff --git a/app/_locales/ru/messages.json b/app/_locales/ru/messages.json
index 86d2ee689f56..385670721c1f 100644
--- a/app/_locales/ru/messages.json
+++ b/app/_locales/ru/messages.json
@@ -6598,10 +6598,6 @@
   "wrongNetworkName": {
     "message": "Согласно нашим записям, имя сети может не соответствовать этому ID блокчейна."
   },
-  "xOfYPending": {
-    "message": "$1 из $2 ожидающих",
-    "description": "$1 and $2 are intended to be two numbers, where $2 is a total number of pending confirmations, and $1 is a count towards that total"
-  },
   "yes": {
     "message": "Да"
   },
diff --git a/app/_locales/tl/messages.json b/app/_locales/tl/messages.json
index 8db1d4af4f7f..a13c9c6d3006 100644
--- a/app/_locales/tl/messages.json
+++ b/app/_locales/tl/messages.json
@@ -6598,10 +6598,6 @@
   "wrongNetworkName": {
     "message": "Ayon sa aming mga talaan, ang pangalan ng network ay maaaring hindi tumugma nang tama sa ID ng chain na ito."
   },
-  "xOfYPending": {
-    "message": "$1 ng $2 ang nakabinbin",
-    "description": "$1 and $2 are intended to be two numbers, where $2 is a total number of pending confirmations, and $1 is a count towards that total"
-  },
   "yes": {
     "message": "Oo"
   },
diff --git a/app/_locales/tr/messages.json b/app/_locales/tr/messages.json
index 20319a113bec..8f761e554caa 100644
--- a/app/_locales/tr/messages.json
+++ b/app/_locales/tr/messages.json
@@ -6598,10 +6598,6 @@
   "wrongNetworkName": {
     "message": "Kayıtlarımıza göre ağ adı bu zincir kimliği ile doğru şekilde eşleşmiyor olabilir."
   },
-  "xOfYPending": {
-    "message": "$1 / $2 bekliyor",
-    "description": "$1 and $2 are intended to be two numbers, where $2 is a total number of pending confirmations, and $1 is a count towards that total"
-  },
   "yes": {
     "message": "Evet"
   },
diff --git a/app/_locales/vi/messages.json b/app/_locales/vi/messages.json
index 9221bcbb0ad8..883f08f49a7e 100644
--- a/app/_locales/vi/messages.json
+++ b/app/_locales/vi/messages.json
@@ -6598,10 +6598,6 @@
   "wrongNetworkName": {
     "message": "Theo hồ sơ của chúng tôi, tên mạng có thể không khớp chính xác với ID chuỗi này."
   },
-  "xOfYPending": {
-    "message": "$1/$2 đang chờ xử lý",
-    "description": "$1 and $2 are intended to be two numbers, where $2 is a total number of pending confirmations, and $1 is a count towards that total"
-  },
   "yes": {
     "message": "Có"
   },
diff --git a/app/_locales/zh_CN/messages.json b/app/_locales/zh_CN/messages.json
index ba4e23972f38..fb7ed008d6f6 100644
--- a/app/_locales/zh_CN/messages.json
+++ b/app/_locales/zh_CN/messages.json
@@ -6598,10 +6598,6 @@
   "wrongNetworkName": {
     "message": "根据我们的记录，该网络名称可能与此链 ID 不匹配。"
   },
-  "xOfYPending": {
-    "message": "$1 / $2 待处理",
-    "description": "$1 and $2 are intended to be two numbers, where $2 is a total number of pending confirmations, and $1 is a count towards that total"
-  },
   "yes": {
     "message": "是"
   },
diff --git a/app/_locales/zh_TW/messages.json b/app/_locales/zh_TW/messages.json
index 29953f67c941..ed1793427a90 100644
--- a/app/_locales/zh_TW/messages.json
+++ b/app/_locales/zh_TW/messages.json
@@ -1375,10 +1375,6 @@
   "whatsThis": {
     "message": "這是什麼？"
   },
-  "xOfYPending": {
-    "message": "$1 之 $2 等待中",
-    "description": "$1 and $2 are intended to be two numbers, where $2 is a total number of pending confirmations, and $1 is a count towards that total"
-  },
   "youNeedToAllowCameraAccess": {
     "message": "需要准許存取攝影鏡頭才能啟用此功能"
   },
diff --git a/app/scripts/background.js b/app/scripts/background.js
index 1b037f09328b..e9aaf2cab20b 100644
--- a/app/scripts/background.js
+++ b/app/scripts/background.js
@@ -15,11 +15,7 @@ import log from 'loglevel';
 import browser from 'webextension-polyfill';
 import { storeAsStream } from '@metamask/obs-store';
 import { isObject } from '@metamask/utils';
-import { ApprovalType } from '@metamask/controller-utils';
 import PortStream from 'extension-port-stream';
-
-import { providerErrors } from '@metamask/rpc-errors';
-import { DIALOG_APPROVAL_TYPES } from '@metamask/snaps-rpc-methods';
 import { NotificationServicesController } from '@metamask/notification-services-controller';
 
 import {
@@ -29,9 +25,6 @@ import {
   EXTENSION_MESSAGES,
   PLATFORM_FIREFOX,
   MESSAGE_TYPE,
-  ///: BEGIN:ONLY_INCLUDE_IF(keyring-snaps)
-  SNAP_MANAGE_ACCOUNTS_CONFIRMATION_TYPES,
-  ///: END:ONLY_INCLUDE_IF
 } from '../../shared/constants/app';
 import {
   REJECT_NOTIFICATION_CLOSE,
@@ -1201,34 +1194,7 @@ export function setupController(
       REJECT_NOTIFICATION_CLOSE,
     );
 
-    // Finally, resolve snap dialog approvals on Flask and reject all the others managed by the ApprovalController.
-    Object.values(controller.approvalController.state.pendingApprovals).forEach(
-      ({ id, type }) => {
-        switch (type) {
-          case ApprovalType.SnapDialogAlert:
-          case ApprovalType.SnapDialogPrompt:
-          case DIALOG_APPROVAL_TYPES.default:
-            controller.approvalController.accept(id, null);
-            break;
-          case ApprovalType.SnapDialogConfirmation:
-            controller.approvalController.accept(id, false);
-            break;
-          ///: BEGIN:ONLY_INCLUDE_IF(keyring-snaps)
-          case SNAP_MANAGE_ACCOUNTS_CONFIRMATION_TYPES.confirmAccountCreation:
-          case SNAP_MANAGE_ACCOUNTS_CONFIRMATION_TYPES.confirmAccountRemoval:
-          case SNAP_MANAGE_ACCOUNTS_CONFIRMATION_TYPES.showSnapAccountRedirect:
-            controller.approvalController.accept(id, false);
-            break;
-          ///: END:ONLY_INCLUDE_IF
-          default:
-            controller.approvalController.reject(
-              id,
-              providerErrors.userRejectedRequest(),
-            );
-            break;
-        }
-      },
-    );
+    controller.rejectAllPendingApprovals();
   }
 
   // Updates the snaps registry and check for newly blocked snaps to block if the user has at least one snap installed that isn't preinstalled.
diff --git a/app/scripts/lib/approval/utils.test.ts b/app/scripts/lib/approval/utils.test.ts
new file mode 100644
index 000000000000..14c472df89ba
--- /dev/null
+++ b/app/scripts/lib/approval/utils.test.ts
@@ -0,0 +1,103 @@
+import {
+  ApprovalController,
+  ApprovalRequest,
+} from '@metamask/approval-controller';
+import { Json } from '@metamask/utils';
+import { ApprovalType } from '@metamask/controller-utils';
+import { providerErrors } from '@metamask/rpc-errors';
+import { DIALOG_APPROVAL_TYPES } from '@metamask/snaps-rpc-methods';
+import { SNAP_MANAGE_ACCOUNTS_CONFIRMATION_TYPES } from '../../../../shared/constants/app';
+import { rejectAllApprovals } from './utils';
+
+const ID_MOCK = '123';
+const ID_MOCK_2 = '456';
+const INTERFACE_ID_MOCK = '789';
+
+function createApprovalControllerMock(
+  pendingApprovals: Partial<ApprovalRequest<Record<string, Json>>>[],
+) {
+  return {
+    state: {
+      pendingApprovals,
+    },
+    accept: jest.fn(),
+    reject: jest.fn(),
+  } as unknown as jest.Mocked<ApprovalController>;
+}
+
+describe('Approval Utils', () => {
+  describe('rejectAllApprovals', () => {
+    it('rejects approval requests with rejected error', () => {
+      const approvalController = createApprovalControllerMock([
+        { id: ID_MOCK, type: ApprovalType.Transaction },
+        { id: ID_MOCK_2, type: ApprovalType.EthSignTypedData },
+      ]);
+
+      rejectAllApprovals({
+        approvalController,
+      });
+
+      expect(approvalController.reject).toHaveBeenCalledTimes(2);
+      expect(approvalController.reject).toHaveBeenCalledWith(
+        ID_MOCK,
+        providerErrors.userRejectedRequest(),
+      );
+      expect(approvalController.reject).toHaveBeenCalledWith(
+        ID_MOCK_2,
+        providerErrors.userRejectedRequest(),
+      );
+    });
+
+    // @ts-expect-error This function is missing from the Mocha type definitions
+    it.each([
+      ApprovalType.SnapDialogAlert,
+      ApprovalType.SnapDialogPrompt,
+      DIALOG_APPROVAL_TYPES.default,
+    ])('accepts pending approval if type is %s', (type: string) => {
+      const approvalController = createApprovalControllerMock([
+        { id: ID_MOCK, type },
+      ]);
+
+      rejectAllApprovals({ approvalController });
+
+      expect(approvalController.accept).toHaveBeenCalledTimes(1);
+      expect(approvalController.accept).toHaveBeenCalledWith(ID_MOCK, null);
+    });
+
+    // @ts-expect-error This function is missing from the Mocha type definitions
+    it.each([
+      ApprovalType.SnapDialogConfirmation,
+      SNAP_MANAGE_ACCOUNTS_CONFIRMATION_TYPES.confirmAccountCreation,
+      SNAP_MANAGE_ACCOUNTS_CONFIRMATION_TYPES.confirmAccountRemoval,
+      SNAP_MANAGE_ACCOUNTS_CONFIRMATION_TYPES.showSnapAccountRedirect,
+    ])('accepts pending approval if type is %s', (type: string) => {
+      const approvalController = createApprovalControllerMock([
+        { id: ID_MOCK, type },
+      ]);
+
+      rejectAllApprovals({ approvalController });
+
+      expect(approvalController.accept).toHaveBeenCalledTimes(1);
+      expect(approvalController.accept).toHaveBeenCalledWith(ID_MOCK, false);
+    });
+
+    // @ts-expect-error This function is missing from the Mocha type definitions
+    it.each([
+      ApprovalType.SnapDialogAlert,
+      ApprovalType.SnapDialogPrompt,
+      DIALOG_APPROVAL_TYPES.default,
+      ApprovalType.SnapDialogConfirmation,
+    ])('deletes interface if type is %s', (type: string) => {
+      const approvalController = createApprovalControllerMock([
+        { id: ID_MOCK, type, requestData: { id: INTERFACE_ID_MOCK } },
+      ]);
+
+      const deleteInterface = jest.fn();
+
+      rejectAllApprovals({ approvalController, deleteInterface });
+
+      expect(deleteInterface).toHaveBeenCalledTimes(1);
+      expect(deleteInterface).toHaveBeenCalledWith(INTERFACE_ID_MOCK);
+    });
+  });
+});
diff --git a/app/scripts/lib/approval/utils.ts b/app/scripts/lib/approval/utils.ts
new file mode 100644
index 000000000000..5bd44b5db079
--- /dev/null
+++ b/app/scripts/lib/approval/utils.ts
@@ -0,0 +1,56 @@
+import { ApprovalController } from '@metamask/approval-controller';
+import { ApprovalType } from '@metamask/controller-utils';
+import { DIALOG_APPROVAL_TYPES } from '@metamask/snaps-rpc-methods';
+import { providerErrors } from '@metamask/rpc-errors';
+import { createProjectLogger } from '@metamask/utils';
+///: BEGIN:ONLY_INCLUDE_IF(keyring-snaps)
+import { SNAP_MANAGE_ACCOUNTS_CONFIRMATION_TYPES } from '../../../../shared/constants/app';
+///: END:ONLY_INCLUDE_IF
+
+const log = createProjectLogger('approval-utils');
+
+export function rejectAllApprovals({
+  approvalController,
+  deleteInterface,
+}: {
+  approvalController: ApprovalController;
+  deleteInterface?: (id: string) => void;
+}) {
+  const approvalRequestsById = approvalController.state.pendingApprovals;
+  const approvalRequests = Object.values(approvalRequestsById);
+
+  for (const approvalRequest of approvalRequests) {
+    const { id, type } = approvalRequest;
+    const interfaceId = approvalRequest.requestData?.id as string;
+
+    switch (type) {
+      case ApprovalType.SnapDialogAlert:
+      case ApprovalType.SnapDialogPrompt:
+      case DIALOG_APPROVAL_TYPES.default:
+        log('Rejecting snap dialog', { id, interfaceId });
+        approvalController.accept(id, null);
+        deleteInterface?.(interfaceId);
+        break;
+
+      case ApprovalType.SnapDialogConfirmation:
+        log('Rejecting snap confirmation', { id, interfaceId });
+        approvalController.accept(id, false);
+        deleteInterface?.(interfaceId);
+        break;
+
+      ///: BEGIN:ONLY_INCLUDE_IF(keyring-snaps)
+      case SNAP_MANAGE_ACCOUNTS_CONFIRMATION_TYPES.confirmAccountCreation:
+      case SNAP_MANAGE_ACCOUNTS_CONFIRMATION_TYPES.confirmAccountRemoval:
+      case SNAP_MANAGE_ACCOUNTS_CONFIRMATION_TYPES.showSnapAccountRedirect:
+        log('Rejecting snap account confirmation', { id });
+        approvalController.accept(id, false);
+        break;
+      ///: END:ONLY_INCLUDE_IF
+
+      default:
+        log('Rejecting pending approval', { id });
+        approvalController.reject(id, providerErrors.userRejectedRequest());
+        break;
+    }
+  }
+}
diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
index cc1bfe8b6809..c0fbd99a13e6 100644
--- a/app/scripts/metamask-controller.js
+++ b/app/scripts/metamask-controller.js
@@ -380,6 +380,7 @@ import { PatchStore } from './lib/PatchStore';
 import { sanitizeUIState } from './lib/state-utils';
 import BridgeStatusController from './controllers/bridge-status/bridge-status-controller';
 import { BRIDGE_STATUS_CONTROLLER_NAME } from './controllers/bridge-status/constants';
+import { rejectAllApprovals } from './lib/approval/utils';
 
 const { TRIGGER_TYPES } = NotificationServicesController.Constants;
 export const METAMASK_CONTROLLER_EVENTS = {
@@ -3558,10 +3559,6 @@ export default class MetamaskController extends EventEmitter {
       markNotificationPopupAsAutomaticallyClosed: () =>
         this.notificationManager.markAsAutomaticallyClosed(),
 
-      // approval
-      requestUserApproval:
-        approvalController.addAndShowApprovalRequest.bind(approvalController),
-
       // primary keyring management
       addNewAccount: this.addNewAccount.bind(this),
       getSeedPhrase: this.getSeedPhrase.bind(this),
@@ -4185,9 +4182,12 @@ export default class MetamaskController extends EventEmitter {
       ),
       trackInsightSnapView: this.trackInsightSnapView.bind(this),
 
-      // approval controller
-      resolvePendingApproval: this.resolvePendingApproval,
+      // ApprovalController
+      rejectAllPendingApprovals: this.rejectAllPendingApprovals.bind(this),
       rejectPendingApproval: this.rejectPendingApproval,
+      requestUserApproval:
+        approvalController.addAndShowApprovalRequest.bind(approvalController),
+      resolvePendingApproval: this.resolvePendingApproval,
 
       // Notifications
       resetViewedNotifications: announcementController.resetViewed.bind(
@@ -7080,6 +7080,19 @@ export default class MetamaskController extends EventEmitter {
     }
   };
 
+  rejectAllPendingApprovals() {
+    const deleteInterface = (id) =>
+      this.controllerMessenger.call(
+        'SnapInterfaceController:deleteInterface',
+        id,
+      );
+
+    rejectAllApprovals({
+      approvalController: this.approvalController,
+      deleteInterface,
+    });
+  }
+
   async _onAccountChange(newAddress) {
     const permittedAccountsMap = getPermittedAccountsByOrigin(
       this.permissionController.state,
diff --git a/test/e2e/page-objects/pages/test-snaps.ts b/test/e2e/page-objects/pages/test-snaps.ts
new file mode 100644
index 000000000000..327947d121bc
--- /dev/null
+++ b/test/e2e/page-objects/pages/test-snaps.ts
@@ -0,0 +1,50 @@
+import { Driver } from '../../webdriver/driver';
+import { TEST_SNAPS_WEBSITE_URL } from '../../snaps/enums';
+import { WINDOW_TITLES } from '../../helpers';
+
+export class TestSnaps {
+  driver: Driver;
+
+  private readonly connectDialogsSnapButton =
+    '[data-testid="dialogs"] [data-testid="connect-button"]';
+
+  private readonly dialogsSnapConfirmationButton = '#sendConfirmationButton';
+
+  constructor(driver: Driver) {
+    this.driver = driver;
+  }
+
+  async openPage() {
+    await this.driver.openNewPage(TEST_SNAPS_WEBSITE_URL);
+    await this.driver.delay(1000);
+  }
+
+  async clickConnectDialogsSnapButton() {
+    await this.driver.clickElement(this.connectDialogsSnapButton);
+  }
+
+  async clickDialogsSnapConfirmationButton() {
+    await this.driver.clickElement(this.dialogsSnapConfirmationButton);
+  }
+
+  async completeSnapInstallConfirmation() {
+    await this.driver.switchToWindowWithTitle(WINDOW_TITLES.Dialog);
+
+    await this.driver.clickElement({
+      text: 'Connect',
+      tag: 'button',
+    });
+
+    await this.driver.clickElement({
+      text: 'Confirm',
+      tag: 'button',
+    });
+
+    await this.driver.clickElement({
+      text: 'OK',
+      tag: 'button',
+    });
+
+    await this.driver.switchToWindowWithTitle(WINDOW_TITLES.TestSnaps);
+  }
+}
diff --git a/test/e2e/tests/confirmations/navigation.spec.ts b/test/e2e/tests/confirmations/navigation.spec.ts
index 97985381b08b..9f26fa697068 100644
--- a/test/e2e/tests/confirmations/navigation.spec.ts
+++ b/test/e2e/tests/confirmations/navigation.spec.ts
@@ -8,9 +8,14 @@ import {
   WINDOW_TITLES,
 } from '../../helpers';
 import { Driver } from '../../webdriver/driver';
+import { loginWithoutBalanceValidation } from '../../page-objects/flows/login.flow';
+import TestDapp from '../../page-objects/pages/test-dapp';
+import { createDappTransaction } from '../../page-objects/flows/transaction';
+import { TestSnaps } from '../../page-objects/pages/test-snaps';
+import Confirmation from '../../page-objects/pages/confirmations/redesign/confirmation';
 import { withTransactionEnvelopeTypeFixtures } from './helpers';
 
-describe('Navigation Signature - Different signature types', function (this: Suite) {
+describe('Confirmation Navigation', function (this: Suite) {
   it('initiates and queues multiple signatures and confirms', async function () {
     await withTransactionEnvelopeTypeFixtures(
       this.test?.fullTitle(),
@@ -120,6 +125,49 @@ describe('Navigation Signature - Different signature types', function (this: Sui
       },
     );
   });
+
+  it('navigates between transactions, signatures, and snap dialogs', async function () {
+    await withTransactionEnvelopeTypeFixtures(
+      this.test?.fullTitle(),
+      TransactionEnvelopeType.feeMarket,
+      async ({ driver }: { driver: Driver }) => {
+        await loginWithoutBalanceValidation(driver);
+
+        const testSnaps = new TestSnaps(driver);
+        await testSnaps.openPage();
+        await testSnaps.clickConnectDialogsSnapButton();
+        await testSnaps.completeSnapInstallConfirmation();
+        await testSnaps.clickDialogsSnapConfirmationButton();
+
+        const testDapp = new TestDapp(driver);
+        await testDapp.openTestDappPage();
+        await testDapp.clickSignTypedDatav4();
+
+        await createDappTransaction(driver);
+        await driver.switchToWindowWithTitle(WINDOW_TITLES.Dialog);
+
+        const confirmation = new Confirmation(driver);
+        await confirmation.check_pageNumbers(1, 3);
+        await driver.waitForSelector({ text: 'Confirmation Dialog' });
+
+        await confirmation.clickNextPage();
+        await confirmation.check_pageNumbers(2, 3);
+        await driver.waitForSelector({ text: 'Signature request' });
+
+        await confirmation.clickNextPage();
+        await confirmation.check_pageNumbers(3, 3);
+        await driver.waitForSelector({ text: 'Transfer request' });
+
+        await confirmation.clickPreviousPage();
+        await confirmation.check_pageNumbers(2, 3);
+        await driver.waitForSelector({ text: 'Signature request' });
+
+        await confirmation.clickPreviousPage();
+        await confirmation.check_pageNumbers(1, 3);
+        await driver.waitForSelector({ text: 'Confirmation Dialog' });
+      },
+    );
+  });
 });
 
 async function verifySignTypedData(driver: Driver) {
diff --git a/ui/components/app/permission-connect-header/permission-connect-header.js b/ui/components/app/permission-connect-header/permission-connect-header.js
index c3f1c248b034..74ab6b06c824 100644
--- a/ui/components/app/permission-connect-header/permission-connect-header.js
+++ b/ui/components/app/permission-connect-header/permission-connect-header.js
@@ -19,8 +19,9 @@ import {
   AvatarBase,
 } from '../../component-library';
 import { getAvatarFallbackLetter } from '../../../helpers/utils/util';
+import { Nav } from '../../../pages/confirmations/components/confirm/nav';
 
-const PermissionConnectHeader = ({ origin, iconUrl }) => {
+const PermissionConnectHeader = ({ requestId, origin, iconUrl }) => {
   const transformOriginToTitle = (rawOrigin) => {
     try {
       const url = new URL(rawOrigin);
@@ -33,61 +34,65 @@ const PermissionConnectHeader = ({ origin, iconUrl }) => {
   const title = transformOriginToTitle(origin);
 
   return (
-    <Box
-      backgroundColor={BackgroundColor.backgroundDefault}
-      width={BlockSize.Full}
-      alignItems={AlignItems.center}
-      display={Display.Flex}
-      padding={4}
-      style={{
-        boxShadow: 'var(--shadow-size-lg) var(--color-shadow-default)',
-      }}
-    >
-      <Box>
-        {iconUrl ? (
-          <AvatarFavicon
-            backgroundColor={BackgroundColor.backgroundAlternative}
-            size={IconSize.Lg}
-            src={iconUrl}
-            name={title}
-          />
-        ) : (
-          <AvatarBase
-            size={IconSize.Lg}
-            display={Display.Flex}
-            alignItems={AlignItems.center}
-            justifyContent={JustifyContent.center}
-            color={TextColor.textAlternative}
-            style={{ borderWidth: '0px' }}
-            backgroundColor={BackgroundColor.backgroundAlternative}
-          >
-            {getAvatarFallbackLetter(title)}
-          </AvatarBase>
-        )}
-      </Box>
+    <>
+      <Nav confirmationId={requestId} />
       <Box
-        marginLeft={4}
-        marginRight={4}
+        backgroundColor={BackgroundColor.backgroundDefault}
+        width={BlockSize.Full}
+        alignItems={AlignItems.center}
         display={Display.Flex}
-        flexDirection={FlexDirection.Column}
-        style={{ overflow: 'hidden' }}
+        padding={4}
+        style={{
+          boxShadow: 'var(--shadow-size-lg) var(--color-shadow-default)',
+        }}
       >
-        <Text ellipsis fontWeight={FontWeight.Medium}>
-          {title}
-        </Text>
-        <Text
-          ellipsis
-          variant={TextVariant.bodySm}
-          color={TextColor.textAlternative}
+        <Box>
+          {iconUrl ? (
+            <AvatarFavicon
+              backgroundColor={BackgroundColor.backgroundAlternative}
+              size={IconSize.Lg}
+              src={iconUrl}
+              name={title}
+            />
+          ) : (
+            <AvatarBase
+              size={IconSize.Lg}
+              display={Display.Flex}
+              alignItems={AlignItems.center}
+              justifyContent={JustifyContent.center}
+              color={TextColor.textAlternative}
+              style={{ borderWidth: '0px' }}
+              backgroundColor={BackgroundColor.backgroundAlternative}
+            >
+              {getAvatarFallbackLetter(title)}
+            </AvatarBase>
+          )}
+        </Box>
+        <Box
+          marginLeft={4}
+          marginRight={4}
+          display={Display.Flex}
+          flexDirection={FlexDirection.Column}
+          style={{ overflow: 'hidden' }}
         >
-          {origin}
-        </Text>
+          <Text ellipsis fontWeight={FontWeight.Medium}>
+            {title}
+          </Text>
+          <Text
+            ellipsis
+            variant={TextVariant.bodySm}
+            color={TextColor.textAlternative}
+          >
+            {origin}
+          </Text>
+        </Box>
       </Box>
-    </Box>
+    </>
   );
 };
 
 PermissionConnectHeader.propTypes = {
+  requestId: PropTypes.string,
   origin: PropTypes.string,
   iconUrl: PropTypes.string,
 };
diff --git a/ui/components/app/permission-connect-header/permission-connect-header.test.js b/ui/components/app/permission-connect-header/permission-connect-header.test.js
index 51b53b3d0f1f..6b0cbd0263e6 100644
--- a/ui/components/app/permission-connect-header/permission-connect-header.test.js
+++ b/ui/components/app/permission-connect-header/permission-connect-header.test.js
@@ -1,8 +1,11 @@
 import React from 'react';
 import { screen } from '@testing-library/react';
+import configureMockStore from 'redux-mock-store';
 import { renderWithProvider } from '../../../../test/jest';
 import PermissionConnectHeader from './permission-connect-header';
 
+const STORE_MOCK = configureMockStore()({ metamask: { pendingApprovals: {} } });
+
 describe('Permission Connect Header', () => {
   const mockOriginData = {
     origin: 'https://metamask.github.io',
@@ -17,6 +20,7 @@ describe('Permission Connect Header', () => {
         origin={mockOriginData.origin}
         iconUrl={mockOriginData.iconUrl}
       />,
+      STORE_MOCK,
     );
 
     expect(screen.getByText(expectedTitle)).toBeInTheDocument();
@@ -33,6 +37,7 @@ describe('Permission Connect Header', () => {
         origin={mockOriginData.origin}
         iconUrl={undefined}
       />,
+      STORE_MOCK,
     );
 
     expect(screen.getByText(expectedTitle)).toBeInTheDocument();
diff --git a/ui/pages/confirm-add-suggested-nft/confirm-add-suggested-nft.js b/ui/pages/confirm-add-suggested-nft/confirm-add-suggested-nft.js
index a94216acf64e..27d7ddeb0488 100644
--- a/ui/pages/confirm-add-suggested-nft/confirm-add-suggested-nft.js
+++ b/ui/pages/confirm-add-suggested-nft/confirm-add-suggested-nft.js
@@ -60,6 +60,7 @@ import { useUserPreferencedCurrency } from '../../hooks/useUserPreferencedCurren
 import { useCurrencyDisplay } from '../../hooks/useCurrencyDisplay';
 import { useOriginMetadata } from '../../hooks/useOriginMetadata';
 import { isEqualCaseInsensitive } from '../../../shared/modules/string-utils';
+import { Nav } from '../confirmations/components/confirm/nav';
 
 const ConfirmAddSuggestedNFT = () => {
   const t = useContext(I18nContext);
@@ -96,6 +97,7 @@ const ConfirmAddSuggestedNFT = () => {
   });
 
   const originMetadata = useOriginMetadata(suggestedNfts[0]?.origin) || {};
+  const approvalId = suggestedNfts[0]?.id;
 
   const handleAddNftsClick = useCallback(async () => {
     await Promise.all(
@@ -187,6 +189,7 @@ const ConfirmAddSuggestedNFT = () => {
       display={Display.Flex}
       flexDirection={FlexDirection.Column}
     >
+      <Nav confirmationId={approvalId} />
       <Box paddingBottom={2} className="confirm-add-suggested-nft__header">
         <NetworkAccountBalanceHeader
           accountName={accountName}
diff --git a/ui/pages/confirm-add-suggested-token/confirm-add-suggested-token.js b/ui/pages/confirm-add-suggested-token/confirm-add-suggested-token.js
index f099ea80bfd5..95754cb00337 100644
--- a/ui/pages/confirm-add-suggested-token/confirm-add-suggested-token.js
+++ b/ui/pages/confirm-add-suggested-token/confirm-add-suggested-token.js
@@ -32,6 +32,7 @@ import {
 } from '../../../shared/constants/transaction';
 import { getSuggestedTokens } from '../../selectors';
 import { Severity } from '../../helpers/constants/design-system';
+import { Nav } from '../confirmations/components/confirm/nav';
 
 function getTokenName(name, symbol) {
   return name === undefined ? symbol : `${name} (${symbol})`;
@@ -84,6 +85,7 @@ const ConfirmAddSuggestedToken = () => {
   const suggestedTokens = useSelector(getSuggestedTokens);
   const tokens = useSelector(getTokens);
   const trackEvent = useContext(MetaMetricsContext);
+  const approvalId = suggestedTokens[0]?.id;
 
   const knownTokenBannerAlert = useMemo(() => {
     return (
@@ -168,6 +170,7 @@ const ConfirmAddSuggestedToken = () => {
 
   return (
     <div className="page-container">
+      <Nav confirmationId={approvalId} />
       <div className="page-container__header">
         <div className="page-container__title">{t('addSuggestedTokens')}</div>
         <div className="page-container__subtitle">
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 17b982668bda..d286b4cad6d1 100644
--- a/ui/pages/confirm-decrypt-message/confirm-decrypt-message.component.js
+++ b/ui/pages/confirm-decrypt-message/confirm-decrypt-message.component.js
@@ -5,7 +5,7 @@ import copyToClipboard from 'copy-to-clipboard';
 import classnames from 'classnames';
 import log from 'loglevel';
 import { useDispatch, useSelector } from 'react-redux';
-import { useHistory } from 'react-router-dom';
+import { useHistory, useParams } from 'react-router-dom';
 import { cloneDeep } from 'lodash';
 
 import AccountListItem from '../../components/app/account-list-item';
@@ -43,19 +43,23 @@ import {
   getTargetAccountWithSendEtherInfo,
   unconfirmedTransactionsListSelector,
 } from '../../selectors';
+import { Nav } from '../confirmations/components/confirm/nav';
 
-const Header = () => {
+const Header = ({ approvalId }) => {
   const t = useI18nContext();
   return (
-    <div className="request-decrypt-message__header">
-      <div className="request-decrypt-message__header-background" />
-      <div className="request-decrypt-message__header__text">
-        {t('decryptRequest')}
-      </div>
-      <div className="request-decrypt-message__header__tip-container">
-        <div className="request-decrypt-message__header__tip" />
+    <>
+      <Nav confirmationId={approvalId} />
+      <div className="request-decrypt-message__header">
+        <div className="request-decrypt-message__header-background" />
+        <div className="request-decrypt-message__header__text">
+          {t('decryptRequest')}
+        </div>
+        <div className="request-decrypt-message__header__tip-container">
+          <div className="request-decrypt-message__header__tip" />
+        </div>
       </div>
-    </div>
+    </>
   );
 };
 
@@ -391,11 +395,15 @@ const ConfirmDecryptMessage = () => {
   const [rawMessage, setRawMessage] = useState('');
   const mostRecentOverviewPage = useSelector(getMostRecentOverviewPage);
   const nativeCurrency = useSelector(getNativeCurrency);
+  const { id: approvalId } = useParams();
 
   const unconfirmedTransactions = useSelector(
     unconfirmedTransactionsListSelector,
   );
-  const messageData = cloneDeep(unconfirmedTransactions[0]);
+
+  const messageData = cloneDeep(
+    unconfirmedTransactions.find((tx) => tx.id === approvalId),
+  );
 
   const fromAccount = useSelector((state) =>
     getTargetAccountWithSendEtherInfo(state, messageData?.msgParams?.from),
@@ -427,7 +435,7 @@ const ConfirmDecryptMessage = () => {
 
   return (
     <div className="request-decrypt-message__container">
-      <Header />
+      <Header approvalId={approvalId} />
       <div className="request-decrypt-message__body">
         <Account fromAccount={fromAccount} nativeCurrency={nativeCurrency} />
         <VisualSection
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
index 7884cb22e4bb..23ed18e7bf38 100644
--- a/ui/pages/confirm-decrypt-message/confirm-decrypt-message.component.test.js
+++ b/ui/pages/confirm-decrypt-message/confirm-decrypt-message.component.test.js
@@ -14,6 +14,15 @@ import { useScrollRequired } from '../../hooks/useScrollRequired';
 import { MetaMetricsContext } from '../../contexts/metametrics';
 import ConfirmDecryptMessage from './confirm-decrypt-message.component';
 
+const messageIdMock = '12345';
+
+jest.mock('react-router-dom', () => ({
+  ...jest.requireActual('react-router-dom'),
+  useParams: () => ({
+    id: messageIdMock,
+  }),
+}));
+
 const messageData = {
   domain: {
     chainId: 97,
@@ -22,7 +31,6 @@ const messageData = {
     version: '1',
   },
 };
-const messageIdMock = '12345';
 const messageMock = {
   id: messageIdMock,
   time: 123,
diff --git a/ui/pages/confirm-decrypt-message/confirm-decrypt-message.scss b/ui/pages/confirm-decrypt-message/confirm-decrypt-message.scss
index ac33ae6afc8c..cd7ce01a48e7 100644
--- a/ui/pages/confirm-decrypt-message/confirm-decrypt-message.scss
+++ b/ui/pages/confirm-decrypt-message/confirm-decrypt-message.scss
@@ -153,6 +153,7 @@
     flex-flow: column;
     flex: 1 1 auto;
     height: 0;
+    overflow-y: auto;
   }
 
   &__notice {
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 dd84bea68360..76efe3c357a8 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,7 @@ import { MetaMetricsEventCategory } from '../../../shared/constants/metametrics'
 import SiteOrigin from '../../components/ui/site-origin';
 import { Numeric } from '../../../shared/modules/Numeric';
 import { EtherDenomination } from '../../../shared/constants/common';
+import { Nav } from '../confirmations/components/confirm/nav';
 
 export default class ConfirmEncryptionPublicKey extends Component {
   static contextTypes = {
@@ -35,18 +36,23 @@ export default class ConfirmEncryptionPublicKey extends Component {
   };
 
   renderHeader = () => {
-    return (
-      <div className="request-encryption-public-key__header">
-        <div className="request-encryption-public-key__header-background" />
-
-        <div className="request-encryption-public-key__header__text">
-          {this.context.t('encryptionPublicKeyRequest')}
-        </div>
+    const approvalId = this.props.txData?.id;
 
-        <div className="request-encryption-public-key__header__tip-container">
-          <div className="request-encryption-public-key__header__tip" />
+    return (
+      <>
+        <Nav confirmationId={approvalId} />
+        <div className="request-encryption-public-key__header">
+          <div className="request-encryption-public-key__header-background" />
+
+          <div className="request-encryption-public-key__header__text">
+            {this.context.t('encryptionPublicKeyRequest')}
+          </div>
+
+          <div className="request-encryption-public-key__header__tip-container">
+            <div className="request-encryption-public-key__header__tip" />
+          </div>
         </div>
-      </div>
+      </>
     );
   };
 
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 554ba41fdaa4..f422599e72e9 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
@@ -18,14 +18,20 @@ import { getMostRecentOverviewPage } from '../../ducks/history/history';
 import { getNativeCurrency } from '../../ducks/metamask/metamask';
 import ConfirmEncryptionPublicKey from './confirm-encryption-public-key.component';
 
-function mapStateToProps(state) {
+function mapStateToProps(state, ownProps) {
   const {
     metamask: { subjectMetadata = {} },
   } = state;
 
   const unconfirmedTransactions = unconfirmedTransactionsListSelector(state);
 
-  const txData = unconfirmedTransactions[0];
+  const {
+    match: {
+      params: { id: approvalId },
+    },
+  } = ownProps;
+
+  const txData = unconfirmedTransactions.find((tx) => tx.id === approvalId);
 
   const fromAccount = getTargetAccountWithSendEtherInfo(
     state,
diff --git a/ui/pages/confirmations/components/confirm-page-container/confirm-page-container-navigation/confirm-page-container-navigation.component.js b/ui/pages/confirmations/components/confirm-page-container/confirm-page-container-navigation/confirm-page-container-navigation.component.js
index 2912d8955d52..9b0767375113 100755
--- a/ui/pages/confirmations/components/confirm-page-container/confirm-page-container-navigation/confirm-page-container-navigation.component.js
+++ b/ui/pages/confirmations/components/confirm-page-container/confirm-page-container-navigation/confirm-page-container-navigation.component.js
@@ -1,67 +1,30 @@
-import React, { useContext } from 'react';
-import { useDispatch, useSelector } from 'react-redux';
-import { useHistory, useParams } from 'react-router-dom';
-import {
-  unapprovedDecryptMsgsSelector,
-  unapprovedEncryptionPublicKeyMsgsSelector,
-  unconfirmedTransactionsListSelector,
-} from '../../../../../selectors';
+import React, { useCallback, useContext } from 'react';
+import { useDispatch } from 'react-redux';
+import { useParams } from 'react-router-dom';
 import { I18nContext } from '../../../../../contexts/i18n';
-import {
-  CONFIRM_TRANSACTION_ROUTE,
-  SIGNATURE_REQUEST_PATH,
-} from '../../../../../helpers/constants/routes';
 import { clearConfirmTransaction } from '../../../../../ducks/confirm-transaction/confirm-transaction.duck';
 import { QueueType } from '../../../../../../shared/constants/metametrics';
 import { useQueuedConfirmationsEvent } from '../../../hooks/useQueuedConfirmationEvents';
+import { useConfirmationNavigation } from '../../../hooks/useConfirmationNavigation';
 
 const ConfirmPageContainerNavigation = () => {
   const t = useContext(I18nContext);
   const dispatch = useDispatch();
-  const history = useHistory();
   const { id } = useParams();
+  const { count, getIndex, navigateToIndex } = useConfirmationNavigation();
+  const currentPosition = getIndex(id);
 
-  const unapprovedDecryptMsgs = useSelector(unapprovedDecryptMsgsSelector);
-  const unapprovedEncryptionPublicKeyMsgs = useSelector(
-    unapprovedEncryptionPublicKeyMsgsSelector,
-  );
-  const unconfirmedTransactions =
-    useSelector(unconfirmedTransactionsListSelector) ?? [];
-
-  const enumUnapprovedDecryptMsgsKey = Object.keys(unapprovedDecryptMsgs || {});
-  const enumUnapprovedEncryptMsgsKey = Object.keys(
-    unapprovedEncryptionPublicKeyMsgs || {},
-  );
-  const enumDecryptAndEncryptMsgs = [
-    ...enumUnapprovedDecryptMsgsKey,
-    ...enumUnapprovedEncryptMsgsKey,
-  ];
-
-  const enumUnapprovedTxs = unconfirmedTransactions
-    .map((tx) => tx.id)
-    .filter((key) => enumDecryptAndEncryptMsgs.includes(key) === false);
-
-  const currentPosition = enumUnapprovedTxs.indexOf(id);
-
-  const totalTx = enumUnapprovedTxs.length;
+  const totalTx = count;
   const positionOfCurrentTx = currentPosition + 1;
-  const nextTxId = enumUnapprovedTxs[currentPosition + 1];
-  const prevTxId = enumUnapprovedTxs[currentPosition - 1];
-  const showNavigation = enumUnapprovedTxs.length > 1;
-  const firstTx = enumUnapprovedTxs[0];
-  const lastTx = enumUnapprovedTxs[enumUnapprovedTxs.length - 1];
+  const showNavigation = count > 1;
 
-  const onNextTx = (txId) => {
-    if (txId) {
+  const onNextTx = useCallback(
+    (index) => {
       dispatch(clearConfirmTransaction());
-      const position = enumUnapprovedTxs.indexOf(txId);
-      history.push(
-        unconfirmedTransactions[position]?.msgParams
-          ? `${CONFIRM_TRANSACTION_ROUTE}/${txId}${SIGNATURE_REQUEST_PATH}`
-          : `${CONFIRM_TRANSACTION_ROUTE}/${txId}`,
-      );
-    }
-  };
+      navigateToIndex(index);
+    },
+    [dispatch, navigateToIndex],
+  );
 
   useQueuedConfirmationsEvent(QueueType.NavigationHeader);
 
@@ -76,20 +39,20 @@ const ConfirmPageContainerNavigation = () => {
         className="confirm-page-container-navigation__container"
         data-testid="navigation-container"
         style={{
-          visibility: prevTxId ? 'initial' : 'hidden',
+          visibility: currentPosition > 0 ? 'initial' : 'hidden',
         }}
       >
         <button
           className="confirm-page-container-navigation__arrow"
           data-testid="first-page"
-          onClick={() => onNextTx(firstTx)}
+          onClick={() => onNextTx(0)}
         >
           <i className="fa fa-angle-double-left fa-2x" />
         </button>
         <button
           className="confirm-page-container-navigation__arrow"
           data-testid="previous-page"
-          onClick={() => onNextTx(prevTxId)}
+          onClick={() => onNextTx(currentPosition - 1)}
         >
           <i className="fa fa-angle-left fa-2x" />
         </button>
@@ -105,20 +68,20 @@ const ConfirmPageContainerNavigation = () => {
       <div
         className="confirm-page-container-navigation__container"
         style={{
-          visibility: nextTxId ? 'initial' : 'hidden',
+          visibility: currentPosition < count - 1 ? 'initial' : 'hidden',
         }}
       >
         <button
           className="confirm-page-container-navigation__arrow"
           data-testid="next-page"
-          onClick={() => onNextTx(nextTxId)}
+          onClick={() => onNextTx(currentPosition + 1)}
         >
           <i className="fa fa-angle-right fa-2x" />
         </button>
         <button
           className="confirm-page-container-navigation__arrow"
           data-testid="last-page"
-          onClick={() => onNextTx(lastTx)}
+          onClick={() => onNextTx(count - 1)}
         >
           <i className="fa fa-angle-double-right fa-2x" />
         </button>
diff --git a/ui/pages/confirmations/components/confirm/nav/__snapshots__/nav.test.tsx.snap b/ui/pages/confirmations/components/confirm/nav/__snapshots__/nav.test.tsx.snap
index 7f01578bf041..cd1499ef7008 100644
--- a/ui/pages/confirmations/components/confirm/nav/__snapshots__/nav.test.tsx.snap
+++ b/ui/pages/confirmations/components/confirm/nav/__snapshots__/nav.test.tsx.snap
@@ -3,8 +3,8 @@
 exports[`ConfirmNav should match snapshot 1`] = `
 <div>
   <div
-    class="mm-box mm-box--padding-3 mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-space-between mm-box--align-items-center mm-box--background-color-background-default"
-    style="z-index: 2;"
+    class="mm-box mm-box--padding-3 mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-space-between mm-box--align-items-center mm-box--width-full mm-box--background-color-background-default"
+    style="z-index: 2; position: relative;"
   >
     <div
       class="mm-box mm-box--display-flex mm-box--align-items-center"
diff --git a/ui/pages/confirmations/components/confirm/nav/index.tsx b/ui/pages/confirmations/components/confirm/nav/index.tsx
index 43403c4d7350..38d674589980 100644
--- a/ui/pages/confirmations/components/confirm/nav/index.tsx
+++ b/ui/pages/confirmations/components/confirm/nav/index.tsx
@@ -1 +1 @@
-export { default as Nav } from './nav';
+export * from './nav';
diff --git a/ui/pages/confirmations/components/confirm/nav/nav.stories.tsx b/ui/pages/confirmations/components/confirm/nav/nav.stories.tsx
index 53d87a1eef0d..dcab7d83b6fa 100644
--- a/ui/pages/confirmations/components/confirm/nav/nav.stories.tsx
+++ b/ui/pages/confirmations/components/confirm/nav/nav.stories.tsx
@@ -1,80 +1,88 @@
 import React from 'react';
 import { Provider } from 'react-redux';
-import { TransactionStatus, TransactionType } from '@metamask/transaction-controller';
+import {
+  TransactionStatus,
+  TransactionType,
+} from '@metamask/transaction-controller';
 
 import mockState from '../../../../../../test/data/mock-state.json';
 import configureStore from '../../../../../store/store';
 import { ConfirmContextProvider } from '../../../context/confirm';
 
-import Nav from './nav';
+import { ConfirmNav } from './nav';
 import { getMockConfirmState } from '../../../../../../test/data/confirmations/helper';
 
-const store = configureStore(getMockConfirmState({
-  metamask: {
-    ...mockState.metamask,
-    pendingApprovals: {
-      testApprovalId: {
-        id: 'testApprovalId',
-        time: 1528133319641,
-        origin: 'metamask',
-        type: 'personal_sign',
-        requestData: {
-          txId: 'testTransactionId',
+const store = configureStore(
+  getMockConfirmState({
+    metamask: {
+      ...mockState.metamask,
+      pendingApprovals: {
+        testApprovalId: {
+          id: 'testApprovalId',
+          time: 1528133319641,
+          origin: 'metamask',
+          type: 'personal_sign',
+          requestData: {
+            txId: 'testTransactionId',
+          },
+          requestState: {
+            test: 'value',
+          },
         },
-        requestState: {
-          test: 'value',
+        testApprovalId2: {
+          id: 'testApprovalId2',
+          time: 1528133319641,
+          origin: 'metamask',
+          type: 'personal_sign',
+          requestData: {
+            txId: 'testTransactionId',
+          },
+          requestState: {
+            test: 'value',
+          },
+        },
+        testApprovalId3: {
+          id: 'testApprovalId3',
+          time: 1528133319649,
+          origin: 'metamask',
+          type: 'personal_sign',
+          requestData: {
+            txId: 'testTransactionId',
+          },
+          requestState: {
+            test: 'value',
+          },
         },
       },
+    },
+    unapprovedPersonalMsgs: {
       testApprovalId2: {
         id: 'testApprovalId2',
-        time: 1528133319641,
-        origin: 'metamask',
-        type: 'personal_sign',
-        requestData: {
-          txId: 'testTransactionId',
-        },
-        requestState: {
-          test: 'value',
-        },
-      },
-      testApprovalId3: {
-        id: 'testApprovalId3',
-        time: 1528133319649,
-        origin: 'metamask',
-        type: 'personal_sign',
-        requestData: {
-          txId: 'testTransactionId',
-        },
-        requestState: {
-          test: 'value',
+        type: TransactionType.personalSign,
+        chainId: '0x5',
+        status: TransactionStatus.unapproved,
+        msgParams: {
+          from: '0x0dcd5d886577d5081b0c52e242ef29e70be3e7bc',
         },
       },
     },
-  },
-  unapprovedPersonalMsgs: {
-    testApprovalId2: {
-      id: 'testApprovalId2',
-      type: TransactionType.personalSign,
-      chainId: '0x5',
-      status: TransactionStatus.unapproved,
-      msgParams: {
-        from: '0x0dcd5d886577d5081b0c52e242ef29e70be3e7bc',
-      },
-    },
-  },
-}));
+  }),
+);
 
 const Story = {
   title: 'Components/App/Confirm/Nav',
-  component: Nav,
-  decorators: [(story: any) => <Provider store={store}>
-    <ConfirmContextProvider>{story()}</ConfirmContextProvider>
-  </Provider>,
-  ]
+  component: ConfirmNav,
+  decorators: [
+    (story: any) => (
+      <Provider store={store}>
+        <ConfirmContextProvider>{story()}</ConfirmContextProvider>
+      </Provider>
+    ),
+  ],
 };
 
 export default Story;
 
-export const DefaultStory = () => <Nav />;
+export const DefaultStory = () => <ConfirmNav />;
 
 DefaultStory.storyName = 'Default';
diff --git a/ui/pages/confirmations/components/confirm/nav/nav.test.tsx b/ui/pages/confirmations/components/confirm/nav/nav.test.tsx
index 0291c7de521b..0ca5f206c3b2 100644
--- a/ui/pages/confirmations/components/confirm/nav/nav.test.tsx
+++ b/ui/pages/confirmations/components/confirm/nav/nav.test.tsx
@@ -9,8 +9,7 @@ import { renderWithConfirmContextProvider } from '../../../../../../test/lib/con
 import { fireEvent } from '../../../../../../test/jest';
 import * as Actions from '../../../../../store/actions';
 import configureStore from '../../../../../store/store';
-
-import Nav from './nav';
+import { ConfirmNav } from './nav';
 
 jest.mock('react-redux', () => ({
   ...jest.requireActual('react-redux'),
@@ -82,7 +81,7 @@ const render = () => {
     }),
   );
 
-  return renderWithConfirmContextProvider(<Nav />, store);
+  return renderWithConfirmContextProvider(<ConfirmNav />, store);
 };
 
 describe('ConfirmNav', () => {
@@ -113,15 +112,15 @@ describe('ConfirmNav', () => {
     expect(mockHistoryReplace).toHaveBeenCalledTimes(1);
   });
 
-  it('invoke action rejectPendingApproval for all pending approvals when "Reject all" button is clicked', () => {
+  it('invoke action rejectAllApprovals when "Reject all" button is clicked', () => {
     const { getByRole } = render();
     const rejectAllButton = getByRole('button', { name: /Reject all/iu });
     const rejectSpy = jest
-      .spyOn(Actions, 'rejectPendingApproval')
+      .spyOn(Actions, 'rejectAllApprovals')
       // TODO: Replace `any` with type
       // eslint-disable-next-line @typescript-eslint/no-explicit-any
       .mockImplementation(() => ({} as any));
     fireEvent.click(rejectAllButton);
-    expect(rejectSpy).toHaveBeenCalledTimes(3);
+    expect(rejectSpy).toHaveBeenCalledTimes(1);
   });
 });
diff --git a/ui/pages/confirmations/components/confirm/nav/nav.tsx b/ui/pages/confirmations/components/confirm/nav/nav.tsx
index 2d962fb5b6ab..20b0f24e3321 100644
--- a/ui/pages/confirmations/components/confirm/nav/nav.tsx
+++ b/ui/pages/confirmations/components/confirm/nav/nav.tsx
@@ -1,9 +1,6 @@
-import { providerErrors, serializeError } from '@metamask/rpc-errors';
-import React, { useCallback, useMemo } from 'react';
-import { useDispatch, useSelector } from 'react-redux';
-import { useHistory } from 'react-router-dom';
+import React, { useCallback } from 'react';
 
-import { ApprovalType } from '@metamask/controller-utils';
+import { useDispatch } from 'react-redux';
 import { QueueType } from '../../../../../../shared/constants/metametrics';
 import {
   Box,
@@ -17,6 +14,7 @@ import {
 import {
   AlignItems,
   BackgroundColor,
+  BlockSize,
   BorderRadius,
   Display,
   FlexDirection,
@@ -26,68 +24,38 @@ import {
   TextColor,
   TextVariant,
 } from '../../../../../helpers/constants/design-system';
-import {
-  CONFIRM_TRANSACTION_ROUTE,
-  SIGNATURE_REQUEST_PATH,
-} from '../../../../../helpers/constants/routes';
 import { useI18nContext } from '../../../../../hooks/useI18nContext';
-import { pendingConfirmationsSortedSelector } from '../../../../../selectors';
-import { rejectPendingApproval } from '../../../../../store/actions';
-import { useConfirmContext } from '../../../context/confirm';
+import { rejectAllApprovals } from '../../../../../store/actions';
 import { useQueuedConfirmationsEvent } from '../../../hooks/useQueuedConfirmationEvents';
-import { isCorrectSignatureApprovalType } from '../../../../../../shared/lib/confirmation.utils';
+import { useConfirmationNavigation } from '../../../hooks/useConfirmationNavigation';
+import { useConfirmContext } from '../../../context/confirm';
+
+export type NavProps = {
+  confirmationId?: string;
+};
 
-const Nav = () => {
-  const history = useHistory();
+export const Nav = ({ confirmationId }: NavProps) => {
   const t = useI18nContext();
   const dispatch = useDispatch();
 
-  const { currentConfirmation } = useConfirmContext();
-
-  const pendingConfirmations = useSelector(pendingConfirmationsSortedSelector);
+  const { count, getIndex, navigateToIndex } = useConfirmationNavigation();
 
-  const currentConfirmationPosition = useMemo(() => {
-    if (pendingConfirmations?.length <= 0 || !currentConfirmation) {
-      return 0;
-    }
-    return pendingConfirmations.findIndex(
-      ({ id }) => id === currentConfirmation.id,
-    );
-  }, [currentConfirmation, pendingConfirmations]);
+  const position = getIndex(confirmationId);
 
-  const onNavigateToTransaction = useCallback(
-    (pos: number) => {
-      const nextConfirmation =
-        pendingConfirmations[currentConfirmationPosition + pos];
-      // todo: once all signature request pages are ported to new designs
-      // SIGNATURE_REQUEST_PATH from path below can be removed
-      // In new routing all confirmations will support
-      // "/confirm-transaction/<confirmation_id>"
-      history.replace(
-        `${CONFIRM_TRANSACTION_ROUTE}/${nextConfirmation.id}${
-          isCorrectSignatureApprovalType(nextConfirmation.type as ApprovalType)
-            ? SIGNATURE_REQUEST_PATH
-            : ''
-        }`,
-      );
+  const onNavigateButtonClick = useCallback(
+    (change: number) => {
+      navigateToIndex(position + change);
     },
-    [currentConfirmationPosition, pendingConfirmations],
+    [position, navigateToIndex],
   );
 
-  const onRejectAll = useCallback(() => {
-    pendingConfirmations.forEach((conf) => {
-      dispatch(
-        rejectPendingApproval(
-          conf.id,
-          serializeError(providerErrors.userRejectedRequest()),
-        ),
-      );
-    });
-  }, [pendingConfirmations]);
+  const onRejectAll = useCallback(async () => {
+    await dispatch(rejectAllApprovals());
+  }, [dispatch]);
 
   useQueuedConfirmationsEvent(QueueType.NavigationHeader);
 
-  if (pendingConfirmations.length <= 1) {
+  if (count <= 1) {
     return null;
   }
 
@@ -99,8 +67,10 @@ const Nav = () => {
       flexDirection={FlexDirection.Row}
       justifyContent={JustifyContent.spaceBetween}
       padding={3}
+      width={BlockSize.Full}
       style={{
         zIndex: 2,
+        position: 'relative',
       }}
     >
       <Box alignItems={AlignItems.center} display={Display.Flex}>
@@ -111,9 +81,9 @@ const Nav = () => {
           borderRadius={BorderRadius.full}
           className="confirm_nav__left_btn"
           color={IconColor.iconAlternative}
-          disabled={currentConfirmationPosition === 0}
+          disabled={position === 0}
           iconName={IconName.ArrowLeft}
-          onClick={() => onNavigateToTransaction(-1)}
+          onClick={() => onNavigateButtonClick(-1)}
           size={ButtonIconSize.Sm}
         />
         <Text
@@ -122,7 +92,7 @@ const Nav = () => {
           variant={TextVariant.bodySm}
           data-testid="confirm-page-nav-position"
         >
-          {currentConfirmationPosition + 1} of {pendingConfirmations.length}
+          {position + 1} of {count}
         </Text>
         <ButtonIcon
           ariaLabel="Next Confirmation"
@@ -131,11 +101,9 @@ const Nav = () => {
           borderRadius={BorderRadius.full}
           className="confirm_nav__right_btn"
           color={IconColor.iconAlternative}
-          disabled={
-            currentConfirmationPosition === pendingConfirmations.length - 1
-          }
+          disabled={position === count - 1}
           iconName={IconName.ArrowRight}
-          onClick={() => onNavigateToTransaction(1)}
+          onClick={() => onNavigateButtonClick(1)}
           size={ButtonIconSize.Sm}
         />
       </Box>
@@ -156,4 +124,7 @@ const Nav = () => {
   );
 };
 
-export default Nav;
+export const ConfirmNav = () => {
+  const { currentConfirmation } = useConfirmContext();
+  return <Nav confirmationId={currentConfirmation?.id} />;
+};
diff --git a/ui/pages/confirmations/components/signature-request-original/__snapshots__/signature-request-original.test.js.snap b/ui/pages/confirmations/components/signature-request-original/__snapshots__/signature-request-original.test.js.snap
index 5230656202d3..e90c797844a6 100644
--- a/ui/pages/confirmations/components/signature-request-original/__snapshots__/signature-request-original.test.js.snap
+++ b/ui/pages/confirmations/components/signature-request-original/__snapshots__/signature-request-original.test.js.snap
@@ -40,7 +40,7 @@ exports[`SignatureRequestOriginal should match snapshot 1`] = `
           <div
             class="confirm-page-container-navigation__navtext"
           >
-            0
+            1
              
             of
              
@@ -54,7 +54,7 @@ exports[`SignatureRequestOriginal should match snapshot 1`] = `
         </div>
         <div
           class="confirm-page-container-navigation__container"
-          style="visibility: initial;"
+          style="visibility: hidden;"
         >
           <button
             class="confirm-page-container-navigation__arrow"
diff --git a/ui/pages/confirmations/components/signature-request-siwe/__snapshots__/signature-request-siwe.test.js.snap b/ui/pages/confirmations/components/signature-request-siwe/__snapshots__/signature-request-siwe.test.js.snap
index fcf0bb30d8a3..63f215934a52 100644
--- a/ui/pages/confirmations/components/signature-request-siwe/__snapshots__/signature-request-siwe.test.js.snap
+++ b/ui/pages/confirmations/components/signature-request-siwe/__snapshots__/signature-request-siwe.test.js.snap
@@ -40,7 +40,7 @@ exports[`SignatureRequestSIWE (Sign in with Ethereum) should match snapshot 1`]
           <div
             class="confirm-page-container-navigation__navtext"
           >
-            0
+            1
              
             of
              
@@ -54,7 +54,7 @@ exports[`SignatureRequestSIWE (Sign in with Ethereum) should match snapshot 1`]
         </div>
         <div
           class="confirm-page-container-navigation__container"
-          style="visibility: initial;"
+          style="visibility: hidden;"
         >
           <button
             class="confirm-page-container-navigation__arrow"
diff --git a/ui/pages/confirmations/components/signature-request-siwe/signature-request-siwe.test.js b/ui/pages/confirmations/components/signature-request-siwe/signature-request-siwe.test.js
index f8f1a67b8cbc..99c37b07f317 100644
--- a/ui/pages/confirmations/components/signature-request-siwe/signature-request-siwe.test.js
+++ b/ui/pages/confirmations/components/signature-request-siwe/signature-request-siwe.test.js
@@ -192,6 +192,10 @@ describe('SignatureRequestSIWE (Sign in with Ethereum)', () => {
             },
           ],
           unapprovedPersonalMsgCount: 2,
+          pendingApprovals: {
+            test1: { type: ApprovalType.PersonalSign },
+            test2: { type: ApprovalType.PersonalSign },
+          },
         },
       });
 
diff --git a/ui/pages/confirmations/components/signature-request/__snapshots__/signature-request.test.js.snap b/ui/pages/confirmations/components/signature-request/__snapshots__/signature-request.test.js.snap
index 943f8699b9aa..340e55fec5f3 100644
--- a/ui/pages/confirmations/components/signature-request/__snapshots__/signature-request.test.js.snap
+++ b/ui/pages/confirmations/components/signature-request/__snapshots__/signature-request.test.js.snap
@@ -37,11 +37,11 @@ exports[`Signature Request Component render should match snapshot when we are us
         <div
           class="confirm-page-container-navigation__navtext"
         >
-          0
+          1
            
           of
            
-          0
+          1
         </div>
         <div
           class="confirm-page-container-navigation__longtext"
@@ -810,11 +810,11 @@ exports[`Signature Request Component render should match snapshot when we want t
         <div
           class="confirm-page-container-navigation__navtext"
         >
-          0
+          1
            
           of
            
-          0
+          1
         </div>
         <div
           class="confirm-page-container-navigation__longtext"
diff --git a/ui/pages/confirmations/confirm-send-ether/__snapshots__/confirm-send-ether.test.js.snap b/ui/pages/confirmations/confirm-send-ether/__snapshots__/confirm-send-ether.test.js.snap
index 9ec3f2ac08d2..8fbb99891d01 100644
--- a/ui/pages/confirmations/confirm-send-ether/__snapshots__/confirm-send-ether.test.js.snap
+++ b/ui/pages/confirmations/confirm-send-ether/__snapshots__/confirm-send-ether.test.js.snap
@@ -8,7 +8,7 @@ exports[`ConfirmSendEther should render correct information for for confirm send
   >
     <div
       class="confirm-page-container-navigation"
-      style="display: flex;"
+      style="display: none;"
     >
       <div
         class="confirm-page-container-navigation__container"
@@ -38,11 +38,11 @@ exports[`ConfirmSendEther should render correct information for for confirm send
         <div
           class="confirm-page-container-navigation__navtext"
         >
-          0
+          1
            
           of
            
-          2
+          1
         </div>
         <div
           class="confirm-page-container-navigation__longtext"
@@ -52,7 +52,7 @@ exports[`ConfirmSendEther should render correct information for for confirm send
       </div>
       <div
         class="confirm-page-container-navigation__container"
-        style="visibility: initial;"
+        style="visibility: hidden;"
       >
         <button
           class="confirm-page-container-navigation__arrow"
diff --git a/ui/pages/confirmations/confirm-signature-request/__snapshots__/index.test.js.snap b/ui/pages/confirmations/confirm-signature-request/__snapshots__/index.test.js.snap
index 9dc64fcc57eb..824326bc3b2e 100644
--- a/ui/pages/confirmations/confirm-signature-request/__snapshots__/index.test.js.snap
+++ b/ui/pages/confirmations/confirm-signature-request/__snapshots__/index.test.js.snap
@@ -37,7 +37,7 @@ exports[`Confirm Signature Request Component render should match snapshot 1`] =
         <div
           class="confirm-page-container-navigation__navtext"
         >
-          0
+          1
            
           of
            
@@ -51,7 +51,7 @@ exports[`Confirm Signature Request Component render should match snapshot 1`] =
       </div>
       <div
         class="confirm-page-container-navigation__container"
-        style="visibility: initial;"
+        style="visibility: hidden;"
       >
         <button
           class="confirm-page-container-navigation__arrow"
diff --git a/ui/pages/confirmations/confirm-transaction-base/__snapshots__/confirm-transaction-base.test.js.snap b/ui/pages/confirmations/confirm-transaction-base/__snapshots__/confirm-transaction-base.test.js.snap
index 5cdbdd5de6a5..28045194b316 100644
--- a/ui/pages/confirmations/confirm-transaction-base/__snapshots__/confirm-transaction-base.test.js.snap
+++ b/ui/pages/confirmations/confirm-transaction-base/__snapshots__/confirm-transaction-base.test.js.snap
@@ -38,7 +38,7 @@ exports[`Confirm Transaction Base should match snapshot 1`] = `
         <div
           class="confirm-page-container-navigation__navtext"
         >
-          0
+          1
            
           of
            
@@ -52,7 +52,7 @@ exports[`Confirm Transaction Base should match snapshot 1`] = `
       </div>
       <div
         class="confirm-page-container-navigation__container"
-        style="visibility: initial;"
+        style="visibility: hidden;"
       >
         <button
           class="confirm-page-container-navigation__arrow"
diff --git a/ui/pages/confirmations/confirm/confirm.tsx b/ui/pages/confirmations/confirm/confirm.tsx
index 67df9ccfd222..ed2cb9047271 100644
--- a/ui/pages/confirmations/confirm/confirm.tsx
+++ b/ui/pages/confirmations/confirm/confirm.tsx
@@ -15,13 +15,13 @@ import { Footer } from '../components/confirm/footer';
 import { Header } from '../components/confirm/header';
 import { Info } from '../components/confirm/info';
 import { LedgerInfo } from '../components/confirm/ledger-info';
-import { Nav } from '../components/confirm/nav';
 import { NetworkChangeToast } from '../components/confirm/network-change-toast';
 import { PluggableSection } from '../components/confirm/pluggable-section';
 import ScrollToBottom from '../components/confirm/scroll-to-bottom';
 import { Title } from '../components/confirm/title';
 import EditGasFeePopover from '../components/edit-gas-fee-popover';
 import { ConfirmContextProvider, useConfirmContext } from '../context/confirm';
+import { ConfirmNav } from '../components/confirm/nav/nav';
 
 const EIP1559TransactionGasModal = () => {
   return (
@@ -51,7 +51,7 @@ const Confirm = () => (
         <EIP1559TransactionGasModal />
         <ConfirmAlerts>
           <Page className="confirm_wrapper">
-            <Nav />
+            <ConfirmNav />
             <Header />
             <ScrollToBottom>
               {
diff --git a/ui/pages/confirmations/confirmation/confirmation.js b/ui/pages/confirmations/confirmation/confirmation.js
index c2d42be40e47..d8d951871586 100644
--- a/ui/pages/confirmations/confirmation/confirmation.js
+++ b/ui/pages/confirmations/confirmation/confirmation.js
@@ -1,3 +1,4 @@
+/* eslint-disable react/prop-types */
 import React, {
   useCallback,
   useEffect,
@@ -36,7 +37,7 @@ import {
 } from '../../../selectors';
 import { getNetworkConfigurationsByChainId } from '../../../../shared/modules/selectors/networks';
 import Callout from '../../../components/ui/callout';
-import { Box, Icon, IconName } from '../../../components/component-library';
+import { Box } from '../../../components/component-library';
 import Loading from '../../../components/ui/loading-screen';
 import SnapAuthorshipHeader from '../../../components/app/snaps/snap-authorship-header';
 import { SnapUIRenderer } from '../../../components/app/snaps/snap-ui-renderer';
@@ -44,10 +45,10 @@ import { SnapUIRenderer } from '../../../components/app/snaps/snap-ui-renderer';
 import { SNAP_MANAGE_ACCOUNTS_CONFIRMATION_TYPES } from '../../../../shared/constants/app';
 ///: END:ONLY_INCLUDE_IF
 import { DAY } from '../../../../shared/constants/time';
-import {
-  BlockSize,
-  BackgroundColor,
-} from '../../../helpers/constants/design-system';
+import { BackgroundColor } from '../../../helpers/constants/design-system';
+import { Nav } from '../components/confirm/nav';
+import { ConfirmContextProvider } from '../context/confirm';
+import { useConfirmationNavigation } from '../hooks/useConfirmationNavigation';
 import ConfirmationFooter from './components/confirmation-footer';
 import {
   getTemplateValues,
@@ -55,8 +56,7 @@ import {
   getTemplateState,
 } from './templates';
 
-// TODO(rekmarks): This component and all of its sub-components should probably
-// be renamed to "Dialog", now that we are using it in that manner.
+const SNAP_CUSTOM_UI_DIALOG = Object.values(DIALOG_APPROVAL_TYPES);
 
 /**
  * a very simple reducer using produce from Immer to keep state manipulation
@@ -195,6 +195,30 @@ function useTemplateState(pendingConfirmation) {
   return [templateState];
 }
 
+function Header({ confirmation, isSnapCustomUIDialog, onCancel }) {
+  const { count } = useConfirmationNavigation();
+  const { origin } = confirmation ?? {};
+
+  const hideSnapBranding = useSelector((state) =>
+    getHideSnapBranding(state, origin),
+  );
+
+  const requiresSnapHeader = isSnapCustomUIDialog && !hideSnapBranding;
+
+  if (count <= 1 && !requiresSnapHeader) {
+    return null;
+  }
+
+  return (
+    <Box style={{ width: '100%', position: 'relative' }}>
+      <Nav confirmationId={confirmation?.id} />
+      {requiresSnapHeader && (
+        <SnapAuthorshipHeader snapId={origin} onCancel={onCancel} />
+      )}
+    </Box>
+  );
+}
+
 export default function ConfirmationPage({
   redirectToHomeOnZeroConfirmations = true,
 }) {
@@ -217,18 +241,12 @@ export default function ConfirmationPage({
   const [approvalFlowLoadingText, setApprovalFlowLoadingText] = useState(null);
 
   const { id } = useParams();
-  const pendingRoutedConfirmation = pendingConfirmations.findIndex(
+  const pendingRoutedConfirmation = pendingConfirmations.find(
     (confirmation) => confirmation.id === id,
   );
 
-  const isRoutedConfirmation = id && pendingRoutedConfirmation !== -1;
-
-  const [currentPendingConfirmation, setCurrentPendingConfirmation] = useState(
-    // Confirmations that are directly routed to get priority and will be initially shown above the current queue.
-    isRoutedConfirmation ? pendingRoutedConfirmation : 0,
-  );
-
-  const pendingConfirmation = pendingConfirmations[currentPendingConfirmation];
+  const pendingConfirmation =
+    pendingRoutedConfirmation ?? pendingConfirmations[0];
 
   const [matchedChain, setMatchedChain] = useState({});
   const [chainFetchComplete, setChainFetchComplete] = useState(false);
@@ -258,16 +276,10 @@ export default function ConfirmationPage({
 
   const snapsMetadata = useSelector(getSnapsMetadata);
 
-  const hideSnapBranding = useSelector((state) =>
-    getHideSnapBranding(state, pendingConfirmation?.origin),
-  );
-
   const name = snapsMetadata[pendingConfirmation?.origin]?.name;
 
   const SNAP_DIALOG_TYPE = Object.values(DIALOG_APPROVAL_TYPES);
 
-  const SNAP_CUSTOM_UI_DIALOG = Object.values(DIALOG_APPROVAL_TYPES);
-
   ///: BEGIN:ONLY_INCLUDE_IF(keyring-snaps)
   SNAP_DIALOG_TYPE.push(
     ...Object.values(SNAP_MANAGE_ACCOUNTS_CONFIRMATION_TYPES),
@@ -345,18 +357,12 @@ export default function ConfirmationPage({
       redirectToHomeOnZeroConfirmations
     ) {
       history.push(DEFAULT_ROUTE);
-    } else if (
-      pendingConfirmations.length &&
-      pendingConfirmations.length <= currentPendingConfirmation
-    ) {
-      setCurrentPendingConfirmation(pendingConfirmations.length - 1);
     }
   }, [
     pendingConfirmations,
     approvalFlows,
     totalUnapprovedCount,
     history,
-    currentPendingConfirmation,
     redirectToHomeOnZeroConfirmations,
   ]);
 
@@ -487,159 +493,105 @@ export default function ConfirmationPage({
       ? handleSubmit
       : null);
 
-  const NAVIGATION_CONTROLS_HEIGHT = 32;
-  const SNAP_DIALOG_HEADER_HEIGHT = 64;
-
-  let contentMargin = 0;
-  if (pendingConfirmations.length > 1) {
-    contentMargin += NAVIGATION_CONTROLS_HEIGHT;
-  }
-  if (isSnapCustomUIDialog && !hideSnapBranding) {
-    contentMargin += SNAP_DIALOG_HEADER_HEIGHT;
-  }
-
   return (
-    <div className="confirmation-page">
-      {pendingConfirmations.length > 1 && (
+    <ConfirmContextProvider>
+      <div className="confirmation-page">
+        <Header
+          confirmation={pendingConfirmation}
+          isSnapCustomUIDialog={isSnapCustomUIDialog}
+          onCancel={handleSnapDialogCancel}
+        />
         <Box
-          className="confirmation-page__navigation"
-          style={{ position: 'fixed', zIndex: 1 }}
-          width={BlockSize.Screen}
+          className="confirmation-page__content"
+          padding={isSnapCustomUIDialog ? 0 : 4}
+          style={{
+            overflowY: 'auto',
+          }}
         >
-          <p>
-            {t('xOfYPending', [
-              currentPendingConfirmation + 1,
-              pendingConfirmations.length,
-            ])}
-          </p>
-          {currentPendingConfirmation > 0 && (
-            <button
-              className="confirmation-page__navigation-button"
-              onClick={() =>
-                setCurrentPendingConfirmation(currentPendingConfirmation - 1)
+          {isSnapCustomUIDialog ? (
+            <SnapUIRenderer
+              snapId={pendingConfirmation?.origin}
+              interfaceId={pendingConfirmation?.requestData.id}
+              isPrompt={isSnapPrompt}
+              inputValue={
+                isSnapPrompt && inputStates[pendingConfirmation?.type]
+              }
+              onInputChange={isSnapPrompt && onInputChange}
+              placeholder={
+                isSnapPrompt && pendingConfirmation?.requestData.placeholder
               }
-            >
-              <Icon name={IconName.ArrowLeft} />
-            </button>
+              useDelineator={false}
+              onCancel={handleSnapDialogCancel}
+              useFooter={isSnapDefaultDialog}
+              contentBackgroundColor={BackgroundColor.backgroundAlternative}
+            />
+          ) : (
+            <MetaMaskTemplateRenderer sections={templatedValues.content} />
+          )}
+          {showWarningModal && (
+            <ConfirmationWarningModal
+              onSubmit={async () => {
+                const res = await templatedValues.onSubmit();
+                await handleSubmitResult(res);
+                setShowWarningModal(false);
+              }}
+              onCancel={templatedValues.onCancel}
+            />
           )}
-          <button
-            className="confirmation-page__navigation-button"
-            disabled={
-              currentPendingConfirmation + 1 === pendingConfirmations.length
+        </Box>
+        {!isSnapDefaultDialog && (
+          <ConfirmationFooter
+            alerts={
+              alertState[pendingConfirmation.id] &&
+              Object.values(alertState[pendingConfirmation.id])
+                .filter((alert) => alert.dismissed === false)
+                .map((alert, idx, filtered) => (
+                  <Callout
+                    key={alert.id}
+                    severity={alert.severity}
+                    dismiss={() => dismissAlert(alert.id)}
+                    isFirst={idx === 0}
+                    isLast={idx === filtered.length - 1}
+                    isMultiple={filtered.length > 1}
+                  >
+                    <MetaMaskTemplateRenderer sections={alert.content} />
+                  </Callout>
+                ))
             }
-            onClick={() =>
-              setCurrentPendingConfirmation(currentPendingConfirmation + 1)
+            style={
+              isSnapDialog
+                ? {
+                    boxShadow:
+                      'var(--shadow-size-lg) var(--color-shadow-default)',
+                  }
+                : {}
             }
-          >
-            <Icon name={IconName.ArrowRight} />
-          </button>
-        </Box>
-      )}
-      {isSnapCustomUIDialog && !hideSnapBranding && (
-        <Box
-          width={BlockSize.Screen}
-          style={{
-            position: 'fixed',
-            zIndex: 1,
-            marginTop: pendingConfirmations.length > 1 ? '32px' : 'initial',
-          }}
-        >
-          <SnapAuthorshipHeader
-            snapId={pendingConfirmation?.origin}
-            onCancel={handleSnapDialogCancel}
-          />
-        </Box>
-      )}
-      <Box
-        className="confirmation-page__content"
-        padding={isSnapCustomUIDialog ? 0 : 4}
-        style={{
-          marginTop: `${contentMargin}px`,
-          overflowY: 'auto',
-        }}
-      >
-        {isSnapCustomUIDialog ? (
-          <SnapUIRenderer
-            snapId={pendingConfirmation?.origin}
-            interfaceId={pendingConfirmation?.requestData.id}
-            isPrompt={isSnapPrompt}
-            inputValue={isSnapPrompt && inputStates[pendingConfirmation?.type]}
-            onInputChange={isSnapPrompt && onInputChange}
-            placeholder={
-              isSnapPrompt && pendingConfirmation?.requestData.placeholder
+            actionsStyle={
+              isSnapDialog
+                ? {
+                    borderTop: 0,
+                  }
+                : {}
             }
-            useDelineator={false}
-            onCancel={handleSnapDialogCancel}
-            useFooter={isSnapDefaultDialog}
-            contentBackgroundColor={BackgroundColor.backgroundAlternative}
-          />
-        ) : (
-          <MetaMaskTemplateRenderer sections={templatedValues.content} />
-        )}
-
-        {showWarningModal && (
-          <ConfirmationWarningModal
-            onSubmit={async () => {
-              const res = await templatedValues.onSubmit();
-              await handleSubmitResult(res);
-              setShowWarningModal(false);
-            }}
+            onSubmit={!templatedValues.hideSubmitButton && handleSubmit}
             onCancel={templatedValues.onCancel}
+            submitText={templatedValues.submitText}
+            cancelText={templatedValues.cancelText}
+            loadingText={loadingText || templatedValues.loadingText}
+            loading={loading}
+            submitAlerts={submitAlerts.map((alert, idx) => (
+              <Callout
+                key={alert.id}
+                severity={alert.severity}
+                isFirst={idx === 0}
+              >
+                <MetaMaskTemplateRenderer sections={alert.content} />
+              </Callout>
+            ))}
           />
         )}
-      </Box>
-      {!isSnapDefaultDialog && (
-        <ConfirmationFooter
-          alerts={
-            alertState[pendingConfirmation.id] &&
-            Object.values(alertState[pendingConfirmation.id])
-              .filter((alert) => alert.dismissed === false)
-              .map((alert, idx, filtered) => (
-                <Callout
-                  key={alert.id}
-                  severity={alert.severity}
-                  dismiss={() => dismissAlert(alert.id)}
-                  isFirst={idx === 0}
-                  isLast={idx === filtered.length - 1}
-                  isMultiple={filtered.length > 1}
-                >
-                  <MetaMaskTemplateRenderer sections={alert.content} />
-                </Callout>
-              ))
-          }
-          style={
-            isSnapDialog
-              ? {
-                  boxShadow:
-                    'var(--shadow-size-lg) var(--color-shadow-default)',
-                }
-              : {}
-          }
-          actionsStyle={
-            isSnapDialog
-              ? {
-                  borderTop: 0,
-                }
-              : {}
-          }
-          onSubmit={!templatedValues.hideSubmitButton && handleSubmit}
-          onCancel={templatedValues.onCancel}
-          submitText={templatedValues.submitText}
-          cancelText={templatedValues.cancelText}
-          loadingText={loadingText || templatedValues.loadingText}
-          loading={loading}
-          submitAlerts={submitAlerts.map((alert, idx) => (
-            <Callout
-              key={alert.id}
-              severity={alert.severity}
-              isFirst={idx === 0}
-            >
-              <MetaMaskTemplateRenderer sections={alert.content} />
-            </Callout>
-          ))}
-        />
-      )}
-    </div>
+      </div>
+    </ConfirmContextProvider>
   );
 }
 
diff --git a/ui/pages/confirmations/confirmation/stories/snap-dialog.stories.tsx b/ui/pages/confirmations/confirmation/stories/snap-dialog.stories.tsx
new file mode 100644
index 000000000000..df2740dbe9d7
--- /dev/null
+++ b/ui/pages/confirmations/confirmation/stories/snap-dialog.stories.tsx
@@ -0,0 +1,118 @@
+import React from 'react';
+import { ApprovalType } from '@metamask/controller-utils';
+import { getJsxElementFromComponent } from '@metamask/snaps-utils';
+import { button, copyable, heading, panel, text } from '@metamask/snaps-sdk';
+import ConfirmationPage from '../confirmation';
+import { PendingApproval } from './util';
+
+export default {
+  title: 'Pages/ConfirmationPage/SnapDialog',
+  component: ConfirmationPage,
+  args: {},
+};
+
+const STATE_MOCK_DEFAULT = {
+  interfaces: {
+    testInterfaceId: {
+      content: getJsxElementFromComponent(
+        panel([
+          heading('Test Heading'),
+          text('Test Text'),
+          copyable('Test Copyable'),
+          button('Test Button'),
+        ]),
+      ),
+      state: {},
+      snapId: 'local:http://localhost:8080/',
+    },
+  },
+};
+
+const STATE_MOCK_SCROLL = {
+  interfaces: {
+    testInterfaceId: {
+      content: getJsxElementFromComponent(
+        panel([
+          heading('Test Heading'),
+          text('Test Text'),
+          text('Test Text'),
+          text('Test Text'),
+          text('Test Text'),
+          text('Test Text'),
+          text('Test Text'),
+          text('Test Text'),
+          text('Test Text'),
+          text('Test Text'),
+          text('Test Text'),
+          text('Test Text'),
+          text('Test Text'),
+          text('Test Text'),
+          text('Test Text'),
+          text('Test Text'),
+        ]),
+      ),
+      state: {},
+      snapId: 'local:http://localhost:8080/',
+    },
+  },
+};
+
+const STATE_MOCK_NAVIGATION = {
+  ...STATE_MOCK_DEFAULT,
+  pendingApprovals: {
+    testId: {
+      id: 'testId',
+      origin: 'npm:@test/test-snap',
+    },
+    testId2: {
+      id: 'testId2',
+      type: ApprovalType.Transaction,
+    },
+    testId3: {
+      id: 'testId3',
+      type: ApprovalType.Transaction,
+    },
+  },
+};
+
+export const DefaultStory = () => {
+  return (
+    <PendingApproval
+      type={ApprovalType.SnapDialogDefault}
+      requestData={{ id: 'testInterfaceId' }}
+      state={STATE_MOCK_DEFAULT}
+    >
+      <ConfirmationPage />
+    </PendingApproval>
+  );
+};
+
+DefaultStory.storyName = 'Default';
+
+export const ScrollStory = () => {
+  return (
+    <PendingApproval
+      type={ApprovalType.SnapDialogDefault}
+      requestData={{ id: 'testInterfaceId' }}
+      state={STATE_MOCK_SCROLL}
+    >
+      <ConfirmationPage />
+    </PendingApproval>
+  );
+};
+
+ScrollStory.storyName = 'Scrolling';
+
+export const NavigationStory = () => {
+  return (
+    <PendingApproval
+      type={ApprovalType.SnapDialogDefault}
+      requestData={{ id: 'testInterfaceId' }}
+      state={STATE_MOCK_NAVIGATION}
+    >
+      <ConfirmationPage />
+    </PendingApproval>
+  );
+};
+
+NavigationStory.storyName = 'Navigation';
diff --git a/ui/pages/confirmations/confirmation/stories/util.js b/ui/pages/confirmations/confirmation/stories/util.js
index bb0a661ae470..e2101c3da136 100644
--- a/ui/pages/confirmations/confirmation/stories/util.js
+++ b/ui/pages/confirmations/confirmation/stories/util.js
@@ -56,7 +56,7 @@ const STORE_MOCK = {
       'npm:@test/test-snap': {
         id: 'npm:@test/test-snap',
         manifest: {
-          description: 'Test Snap',
+          proposedName: 'Test Snap',
         },
       },
     },
@@ -64,8 +64,12 @@ const STORE_MOCK = {
 };
 
 // eslint-disable-next-line react/prop-types
-export function PendingApproval({ children, requestData, type }) {
-  const mockState = { ...STORE_MOCK };
+export function PendingApproval({ children, requestData, state, type }) {
+  const mockState = {
+    ...STORE_MOCK,
+    metamask: { ...STORE_MOCK.metamask, ...state },
+  };
+
   const pendingApproval = mockState.metamask.pendingApprovals.testId;
 
   pendingApproval.type = type;
diff --git a/ui/pages/confirmations/confirmation/templates/__snapshots__/add-ethereum-chain.test.js.snap b/ui/pages/confirmations/confirmation/templates/__snapshots__/add-ethereum-chain.test.js.snap
index d29769f0ca7f..27baa7f5cb79 100644
--- a/ui/pages/confirmations/confirmation/templates/__snapshots__/add-ethereum-chain.test.js.snap
+++ b/ui/pages/confirmations/confirmation/templates/__snapshots__/add-ethereum-chain.test.js.snap
@@ -7,7 +7,7 @@ exports[`add-ethereum-chain confirmation should match snapshot 1`] = `
   >
     <div
       class="mm-box confirmation-page__content mm-box--padding-4"
-      style="margin-top: 0px; overflow-y: auto;"
+      style="overflow-y: auto;"
     >
       <h3
         class="box box--md:margin-4 box--margin-top-1 box--margin-bottom-1 box--flex-direction-row typography typography--h3 typography--weight-bold typography--style-normal typography--align-center typography--color-text-default"
diff --git a/ui/pages/confirmations/confirmation/templates/__snapshots__/create-named-snap-account.test.js.snap b/ui/pages/confirmations/confirmation/templates/__snapshots__/create-named-snap-account.test.js.snap
index aacd67bc4ad8..a84c42e6f172 100644
--- a/ui/pages/confirmations/confirmation/templates/__snapshots__/create-named-snap-account.test.js.snap
+++ b/ui/pages/confirmations/confirmation/templates/__snapshots__/create-named-snap-account.test.js.snap
@@ -5,9 +5,64 @@ exports[`create-named-snap-account confirmation matches snapshot 1`] = `
   <div
     class="confirmation-page"
   >
+    <div
+      class="mm-box"
+      style="width: 100%; position: relative;"
+    >
+      <div
+        class="mm-box mm-box--padding-3 mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-space-between mm-box--align-items-center mm-box--width-full mm-box--background-color-background-default"
+        style="z-index: 2; position: relative;"
+      >
+        <div
+          class="mm-box mm-box--display-flex mm-box--align-items-center"
+        >
+          <button
+            aria-label="Previous Confirmation"
+            class="mm-box mm-button-icon mm-button-icon--size-sm mm-button-icon--disabled confirm_nav__left_btn mm-box--display-inline-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-icon-alternative mm-box--background-color-background-alternative mm-box--rounded-full"
+            data-testid="confirm-nav__previous-confirmation"
+            disabled=""
+          >
+            <span
+              class="mm-box mm-icon mm-icon--size-sm mm-box--display-inline-block mm-box--color-inherit"
+              style="mask-image: url('./images/icons/arrow-left.svg');"
+            />
+          </button>
+          <p
+            class="mm-box mm-text mm-text--body-sm mm-box--margin-inline-2 mm-box--color-text-alternative"
+            data-testid="confirm-page-nav-position"
+          >
+            1
+             of 
+            2
+          </p>
+          <button
+            aria-label="Next Confirmation"
+            class="mm-box mm-button-icon mm-button-icon--size-sm confirm_nav__right_btn mm-box--display-inline-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-icon-alternative mm-box--background-color-background-alternative mm-box--rounded-full"
+            data-testid="confirm-nav__next-confirmation"
+          >
+            <span
+              class="mm-box mm-icon mm-icon--size-sm mm-box--display-inline-block mm-box--color-inherit"
+              style="mask-image: url('./images/icons/arrow-right.svg');"
+            />
+          </button>
+        </div>
+        <button
+          class="mm-box mm-text mm-button-base mm-button-base--size-md confirm_nav__reject_all mm-button-primary mm-text--body-md-medium mm-text--font-weight-normal mm-box--padding-0 mm-box--padding-right-3 mm-box--padding-left-3 mm-box--display-inline-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-primary-inverse mm-box--background-color-primary-default mm-box--rounded-xl"
+          data-testid="confirm-nav__reject-all"
+          data-theme="light"
+          type="secondary"
+        >
+          <span
+            class="mm-box mm-icon mm-icon--size-sm mm-box--margin-inline-end-1 mm-box--display-inline-block mm-box--color-inherit"
+            style="mask-image: url('./images/icons/close.svg');"
+          />
+          Reject all
+        </button>
+      </div>
+    </div>
     <div
       class="mm-box confirmation-page__content mm-box--padding-4"
-      style="margin-top: 0px; overflow-y: auto;"
+      style="overflow-y: auto;"
     >
       <div
         class="mm-box name-snap-account-page mm-box--padding-4"
diff --git a/ui/pages/confirmations/confirmation/templates/__snapshots__/create-snap-account.test.js.snap b/ui/pages/confirmations/confirmation/templates/__snapshots__/create-snap-account.test.js.snap
index 850025310848..3b65da3f25be 100644
--- a/ui/pages/confirmations/confirmation/templates/__snapshots__/create-snap-account.test.js.snap
+++ b/ui/pages/confirmations/confirmation/templates/__snapshots__/create-snap-account.test.js.snap
@@ -7,7 +7,7 @@ exports[`create-snap-account confirmation should match snapshot 1`] = `
   >
     <div
       class="mm-box confirmation-page__content mm-box--padding-4"
-      style="margin-top: 0px; overflow-y: auto;"
+      style="overflow-y: auto;"
     >
       <div
         class="mm-box create-snap-account-page mm-box--margin-bottom-0 mm-box--display-flex mm-box--flex-direction-column mm-box--align-items-center mm-box--width-full mm-box--height-full mm-box--border-style-none"
diff --git a/ui/pages/confirmations/confirmation/templates/__snapshots__/error.test.js.snap b/ui/pages/confirmations/confirmation/templates/__snapshots__/error.test.js.snap
index 3ddae9288742..d577cb0ce95f 100644
--- a/ui/pages/confirmations/confirmation/templates/__snapshots__/error.test.js.snap
+++ b/ui/pages/confirmations/confirmation/templates/__snapshots__/error.test.js.snap
@@ -7,7 +7,7 @@ exports[`error template matches the snapshot 1`] = `
   >
     <div
       class="mm-box confirmation-page__content mm-box--padding-4"
-      style="margin-top: 0px; overflow-y: auto;"
+      style="overflow-y: auto;"
     >
       <h2
         class="box box--margin-top-1 box--margin-bottom-1 box--flex-direction-row typography typography--h2 typography--weight-normal typography--style-normal typography--color-text-default"
diff --git a/ui/pages/confirmations/confirmation/templates/__snapshots__/remove-snap-account.test.js.snap b/ui/pages/confirmations/confirmation/templates/__snapshots__/remove-snap-account.test.js.snap
index 317071e6be26..1673efaa6631 100644
--- a/ui/pages/confirmations/confirmation/templates/__snapshots__/remove-snap-account.test.js.snap
+++ b/ui/pages/confirmations/confirmation/templates/__snapshots__/remove-snap-account.test.js.snap
@@ -7,7 +7,7 @@ exports[`remove-snap-account confirmation should match snapshot 1`] = `
   >
     <div
       class="mm-box confirmation-page__content mm-box--padding-4"
-      style="margin-top: 0px; overflow-y: auto;"
+      style="overflow-y: auto;"
     >
       <div
         class="mm-box remove-snap-account-page mm-box--margin-bottom-0 mm-box--display-flex mm-box--flex-direction-column mm-box--align-items-center mm-box--width-full mm-box--height-full mm-box--border-style-none"
diff --git a/ui/pages/confirmations/confirmation/templates/__snapshots__/snap-account-redirect.test.js.snap b/ui/pages/confirmations/confirmation/templates/__snapshots__/snap-account-redirect.test.js.snap
index b4230e3a824f..2bb01a78a6b0 100644
--- a/ui/pages/confirmations/confirmation/templates/__snapshots__/snap-account-redirect.test.js.snap
+++ b/ui/pages/confirmations/confirmation/templates/__snapshots__/snap-account-redirect.test.js.snap
@@ -7,7 +7,7 @@ exports[`snap-account-redirect confirmation should match snapshot 1`] = `
   >
     <div
       class="mm-box confirmation-page__content mm-box--padding-4"
-      style="margin-top: 0px; overflow-y: auto;"
+      style="overflow-y: auto;"
     >
       <div
         class="mm-box create-snap-account-page mm-box--flex-direction-column mm-box--align-items-center mm-box--width-full mm-box--height-full mm-box--border-style-none"
diff --git a/ui/pages/confirmations/confirmation/templates/__snapshots__/success.test.js.snap b/ui/pages/confirmations/confirmation/templates/__snapshots__/success.test.js.snap
index 3d99fcdffc56..875b142831a5 100644
--- a/ui/pages/confirmations/confirmation/templates/__snapshots__/success.test.js.snap
+++ b/ui/pages/confirmations/confirmation/templates/__snapshots__/success.test.js.snap
@@ -7,7 +7,7 @@ exports[`success template matches the snapshot 1`] = `
   >
     <div
       class="mm-box confirmation-page__content mm-box--padding-4"
-      style="margin-top: 0px; overflow-y: auto;"
+      style="overflow-y: auto;"
     >
       <h2
         class="box box--margin-top-1 box--margin-bottom-1 box--flex-direction-row typography typography--h2 typography--weight-normal typography--style-normal typography--color-text-default"
diff --git a/ui/pages/confirmations/confirmation/templates/__snapshots__/switch-ethereum-chain.test.js.snap b/ui/pages/confirmations/confirmation/templates/__snapshots__/switch-ethereum-chain.test.js.snap
index 6d6b37f6e6d8..8bf1adbf278b 100644
--- a/ui/pages/confirmations/confirmation/templates/__snapshots__/switch-ethereum-chain.test.js.snap
+++ b/ui/pages/confirmations/confirmation/templates/__snapshots__/switch-ethereum-chain.test.js.snap
@@ -7,7 +7,7 @@ exports[`switch-ethereum-chain confirmation should match snapshot 1`] = `
   >
     <div
       class="mm-box confirmation-page__content mm-box--padding-4"
-      style="margin-top: 0px; overflow-y: auto;"
+      style="overflow-y: auto;"
     >
       <h3
         class="box box--md:margin-2 box--margin-top-1 box--margin-bottom-1 box--sm:padding-4 box--lg:padding-4 box--flex-direction-row typography typography--h3 typography--weight-normal typography--style-normal typography--align-center typography--color-text-default"
@@ -99,7 +99,7 @@ exports[`switch-ethereum-chain confirmation should show alert if there are pendi
   >
     <div
       class="mm-box confirmation-page__content mm-box--padding-4"
-      style="margin-top: 0px; overflow-y: auto;"
+      style="overflow-y: auto;"
     >
       <h3
         class="box box--md:margin-2 box--margin-top-1 box--margin-bottom-1 box--sm:padding-4 box--lg:padding-4 box--flex-direction-row typography typography--h3 typography--weight-normal typography--style-normal typography--align-center typography--color-text-default"
diff --git a/ui/pages/confirmations/hooks/syncConfirmPath.test.ts b/ui/pages/confirmations/hooks/syncConfirmPath.test.ts
index 9fd64f37ad9d..eb01018a22c5 100644
--- a/ui/pages/confirmations/hooks/syncConfirmPath.test.ts
+++ b/ui/pages/confirmations/hooks/syncConfirmPath.test.ts
@@ -1,3 +1,4 @@
+import { ApprovalType } from '@metamask/controller-utils';
 import mockState from '../../../../test/data/mock-state.json';
 import { unapprovedPersonalSignMsg } from '../../../../test/data/confirmations/personal_sign';
 import { renderHookWithConfirmContextProvider } from '../../../../test/lib/confirmations/render-helpers';
@@ -10,11 +11,24 @@ jest.mock('react-router-dom', () => ({
   useHistory: () => ({ replace: mockHistoryReplace }),
 }));
 
+const STATE_MOCK = {
+  ...mockState,
+  metamask: {
+    ...mockState.metamask,
+    pendingApprovals: {
+      [unapprovedPersonalSignMsg.id]: {
+        id: unapprovedPersonalSignMsg.id,
+        type: ApprovalType.PersonalSign,
+      },
+    },
+  },
+};
+
 describe('syncConfirmPath', () => {
   it('should execute correctly', () => {
     const result = renderHookWithConfirmContextProvider(
       () => syncConfirmPath(unapprovedPersonalSignMsg),
-      mockState,
+      STATE_MOCK,
     );
     expect(result).toBeDefined();
   });
@@ -23,7 +37,7 @@ describe('syncConfirmPath', () => {
     mockHistoryReplace.mockClear();
     renderHookWithConfirmContextProvider(
       () => syncConfirmPath(unapprovedPersonalSignMsg),
-      mockState,
+      STATE_MOCK,
     );
     expect(mockHistoryReplace).toHaveBeenCalled();
   });
diff --git a/ui/pages/confirmations/hooks/syncConfirmPath.ts b/ui/pages/confirmations/hooks/syncConfirmPath.ts
index ec6df090bba8..dc66fc0b1451 100644
--- a/ui/pages/confirmations/hooks/syncConfirmPath.ts
+++ b/ui/pages/confirmations/hooks/syncConfirmPath.ts
@@ -1,22 +1,23 @@
 import { useEffect } from 'react';
-import { useHistory, useParams } from 'react-router-dom';
+import { useParams } from 'react-router-dom';
 
-import { CONFIRM_TRANSACTION_ROUTE } from '../../../helpers/constants/routes';
 import { Confirmation } from '../types/confirm';
+import { useConfirmationNavigation } from './useConfirmationNavigation';
 
 const syncConfirmPath = (currentConfirmation?: Confirmation) => {
-  const history = useHistory();
-  const { id: paramsTransactionId } = useParams<{ id: string }>();
+  const { navigateToId } = useConfirmationNavigation();
+  const { id: paramId } = useParams<{ id: string }>();
+  const confirmationId = currentConfirmation?.id;
 
-  // Redirect below is done to keep the confirmation routes backward compatible
   useEffect(() => {
-    if (!currentConfirmation) {
+    if (!confirmationId) {
       return;
     }
-    if (!paramsTransactionId) {
-      history.replace(`${CONFIRM_TRANSACTION_ROUTE}/${currentConfirmation.id}`);
+
+    if (!paramId) {
+      navigateToId(confirmationId);
     }
-  }, [currentConfirmation, paramsTransactionId]);
+  }, [confirmationId, paramId, navigateToId]);
 };
 
 export default syncConfirmPath;
diff --git a/ui/pages/confirmations/hooks/useConfirmationNavigation.test.ts b/ui/pages/confirmations/hooks/useConfirmationNavigation.test.ts
new file mode 100644
index 000000000000..edaddc0e520f
--- /dev/null
+++ b/ui/pages/confirmations/hooks/useConfirmationNavigation.test.ts
@@ -0,0 +1,228 @@
+import { useHistory } from 'react-router-dom';
+import { ApprovalType } from '@metamask/controller-utils';
+import { Json } from '@metamask/utils';
+import { ApprovalFlowState } from '@metamask/approval-controller';
+import { renderHookWithProvider } from '../../../../test/lib/render-helpers';
+import mockState from '../../../../test/data/mock-state.json';
+import {
+  CONFIRM_ADD_SUGGESTED_NFT_ROUTE,
+  CONFIRM_ADD_SUGGESTED_TOKEN_ROUTE,
+  CONFIRM_TRANSACTION_ROUTE,
+  CONFIRMATION_V_NEXT_ROUTE,
+  CONNECT_ROUTE,
+  DECRYPT_MESSAGE_REQUEST_PATH,
+  ENCRYPTION_PUBLIC_KEY_REQUEST_PATH,
+  SIGNATURE_REQUEST_PATH,
+} from '../../../helpers/constants/routes';
+import { useConfirmationNavigation } from './useConfirmationNavigation';
+
+jest.mock('react-router-dom', () => ({
+  ...jest.requireActual('react-router-dom'),
+  useHistory: jest.fn(),
+}));
+
+jest.mock('../confirmation/templates', () => ({
+  TEMPLATED_CONFIRMATION_APPROVAL_TYPES: ['wallet_addEthereumChain'],
+}));
+
+const APPROVAL_ID_MOCK = '123-456';
+const APPROVAL_ID_2_MOCK = '456-789';
+
+function renderHook(
+  approvalType: ApprovalType,
+  requestData?: Json,
+  approvalFlows?: ApprovalFlowState[],
+) {
+  const { result } = renderHookWithProvider(() => useConfirmationNavigation(), {
+    ...mockState,
+    metamask: {
+      ...mockState.metamask,
+      pendingApprovals: {
+        [APPROVAL_ID_MOCK]: {
+          id: APPROVAL_ID_MOCK,
+          type: approvalType,
+          requestData,
+        },
+        [APPROVAL_ID_2_MOCK]: {
+          id: APPROVAL_ID_2_MOCK,
+          type: approvalType,
+          requestData,
+        },
+      },
+      approvalFlows,
+    },
+  });
+
+  return result.current;
+}
+
+describe('useConfirmationNavigation', () => {
+  const useHistoryMock = jest.mocked(useHistory);
+  const history = { replace: jest.fn() };
+
+  beforeEach(() => {
+    jest.resetAllMocks();
+    useHistoryMock.mockReturnValue(history);
+  });
+
+  describe('navigateToId', () => {
+    it('navigates to transaction route', () => {
+      const result = renderHook(ApprovalType.Transaction);
+
+      result.navigateToId(APPROVAL_ID_MOCK);
+
+      expect(history.replace).toHaveBeenCalledTimes(1);
+      expect(history.replace).toHaveBeenCalledWith(
+        `${CONFIRM_TRANSACTION_ROUTE}/${APPROVAL_ID_MOCK}`,
+      );
+    });
+
+    it('navigates to signature route', () => {
+      const result = renderHook(ApprovalType.EthSignTypedData);
+
+      result.navigateToId(APPROVAL_ID_MOCK);
+
+      expect(history.replace).toHaveBeenCalledTimes(1);
+      expect(history.replace).toHaveBeenCalledWith(
+        `${CONFIRM_TRANSACTION_ROUTE}/${APPROVAL_ID_MOCK}${SIGNATURE_REQUEST_PATH}`,
+      );
+    });
+
+    it('navigates to template route', () => {
+      const result = renderHook(ApprovalType.AddEthereumChain);
+
+      result.navigateToId(APPROVAL_ID_MOCK);
+
+      expect(history.replace).toHaveBeenCalledTimes(1);
+      expect(history.replace).toHaveBeenCalledWith(
+        `${CONFIRMATION_V_NEXT_ROUTE}/${APPROVAL_ID_MOCK}`,
+      );
+    });
+
+    it('navigates to template route if approval flow', () => {
+      const result = renderHook(undefined as never, undefined, [{} as never]);
+
+      result.navigateToId(undefined);
+
+      expect(history.replace).toHaveBeenCalledTimes(1);
+      expect(history.replace).toHaveBeenCalledWith(
+        `${CONFIRMATION_V_NEXT_ROUTE}`,
+      );
+    });
+
+    it('navigates to connect route', () => {
+      const result = renderHook(ApprovalType.WalletRequestPermissions);
+
+      result.navigateToId(APPROVAL_ID_MOCK);
+
+      expect(history.replace).toHaveBeenCalledTimes(1);
+      expect(history.replace).toHaveBeenCalledWith(
+        `${CONNECT_ROUTE}/${APPROVAL_ID_MOCK}`,
+      );
+    });
+
+    it('navigates to add token route if no token ID', () => {
+      const result = renderHook(ApprovalType.WatchAsset);
+
+      result.navigateToId(APPROVAL_ID_MOCK);
+
+      expect(history.replace).toHaveBeenCalledTimes(1);
+      expect(history.replace).toHaveBeenCalledWith(
+        `${CONFIRM_ADD_SUGGESTED_TOKEN_ROUTE}`,
+      );
+    });
+
+    it('navigates to add NFT route if token ID', () => {
+      const result = renderHook(ApprovalType.WatchAsset, {
+        asset: { tokenId: '123' },
+      });
+
+      result.navigateToId(APPROVAL_ID_MOCK);
+
+      expect(history.replace).toHaveBeenCalledTimes(1);
+      expect(history.replace).toHaveBeenCalledWith(
+        `${CONFIRM_ADD_SUGGESTED_NFT_ROUTE}`,
+      );
+    });
+
+    it('navigates to encrypt route', () => {
+      const result = renderHook(ApprovalType.EthGetEncryptionPublicKey);
+
+      result.navigateToId(APPROVAL_ID_MOCK);
+
+      expect(history.replace).toHaveBeenCalledTimes(1);
+      expect(history.replace).toHaveBeenCalledWith(
+        `${CONFIRM_TRANSACTION_ROUTE}/${APPROVAL_ID_MOCK}${ENCRYPTION_PUBLIC_KEY_REQUEST_PATH}`,
+      );
+    });
+
+    it('navigates to decrypt route', () => {
+      const result = renderHook(ApprovalType.EthDecrypt);
+
+      result.navigateToId(APPROVAL_ID_MOCK);
+
+      expect(history.replace).toHaveBeenCalledTimes(1);
+      expect(history.replace).toHaveBeenCalledWith(
+        `${CONFIRM_TRANSACTION_ROUTE}/${APPROVAL_ID_MOCK}${DECRYPT_MESSAGE_REQUEST_PATH}`,
+      );
+    });
+
+    it('does not navigate if no matching confirmation found', () => {
+      const result = renderHook(ApprovalType.AddEthereumChain);
+
+      result.navigateToId('invalidId');
+
+      expect(history.replace).toHaveBeenCalledTimes(0);
+    });
+
+    it('does not navigate if no confirmation ID provided', () => {
+      const result = renderHook(ApprovalType.AddEthereumChain);
+
+      result.navigateToId();
+
+      expect(history.replace).toHaveBeenCalledTimes(0);
+    });
+  });
+
+  describe('navigateToIndex', () => {
+    it('navigates to the confirmation at the given index', () => {
+      const result = renderHook(ApprovalType.Transaction);
+
+      result.navigateToIndex(1);
+
+      expect(history.replace).toHaveBeenCalledTimes(1);
+      expect(history.replace).toHaveBeenCalledWith(
+        `${CONFIRM_TRANSACTION_ROUTE}/${APPROVAL_ID_2_MOCK}`,
+      );
+    });
+  });
+
+  describe('count', () => {
+    it('returns the number of confirmations', () => {
+      const result = renderHook(ApprovalType.Transaction);
+      expect(result.count).toBe(2);
+    });
+  });
+
+  describe('getIndex', () => {
+    it('returns the index of the given confirmation', () => {
+      const result = renderHook(ApprovalType.Transaction);
+      expect(result.getIndex(APPROVAL_ID_2_MOCK)).toBe(1);
+    });
+
+    it('returns 0 if no confirmation ID is provided', () => {
+      const result = renderHook(ApprovalType.Transaction);
+      expect(result.getIndex()).toBe(0);
+    });
+  });
+
+  describe('confirmations', () => {
+    it('returns the list of confirmations', () => {
+      const result = renderHook(ApprovalType.Transaction);
+      expect(result.confirmations.map(({ id }: { id: string }) => id)).toEqual([
+        APPROVAL_ID_MOCK,
+        APPROVAL_ID_2_MOCK,
+      ]);
+    });
+  });
+});
diff --git a/ui/pages/confirmations/hooks/useConfirmationNavigation.ts b/ui/pages/confirmations/hooks/useConfirmationNavigation.ts
new file mode 100644
index 000000000000..9a5cdfc5cd9e
--- /dev/null
+++ b/ui/pages/confirmations/hooks/useConfirmationNavigation.ts
@@ -0,0 +1,146 @@
+import { useCallback } from 'react';
+import { useSelector } from 'react-redux';
+import { useHistory } from 'react-router-dom';
+import { ApprovalType } from '@metamask/controller-utils';
+import { isEqual } from 'lodash';
+import { ApprovalRequest } from '@metamask/approval-controller';
+import { Json } from '@metamask/utils';
+import { TEMPLATED_CONFIRMATION_APPROVAL_TYPES } from '../confirmation/templates';
+import {
+  CONFIRM_ADD_SUGGESTED_NFT_ROUTE,
+  CONFIRM_ADD_SUGGESTED_TOKEN_ROUTE,
+  CONFIRM_TRANSACTION_ROUTE,
+  CONFIRMATION_V_NEXT_ROUTE,
+  CONNECT_ROUTE,
+  DECRYPT_MESSAGE_REQUEST_PATH,
+  ENCRYPTION_PUBLIC_KEY_REQUEST_PATH,
+  SIGNATURE_REQUEST_PATH,
+} from '../../../helpers/constants/routes';
+import { isSignatureTransactionType } from '../utils';
+import {
+  getApprovalFlows,
+  pendingApprovalsSortedSelector,
+} from '../../../selectors';
+
+const CONNECT_APPROVAL_TYPES = [
+  ApprovalType.WalletRequestPermissions,
+  'wallet_installSnap',
+  'wallet_updateSnap',
+  'wallet_installSnapResult',
+];
+
+export function useConfirmationNavigation() {
+  const confirmations = useSelector(pendingApprovalsSortedSelector, isEqual);
+  const approvalFlows = useSelector(getApprovalFlows, isEqual);
+  const history = useHistory();
+
+  const getIndex = useCallback(
+    (confirmationId?: string) => {
+      if (!confirmationId) {
+        return 0;
+      }
+
+      return confirmations.findIndex(({ id }) => id === confirmationId);
+    },
+    [confirmations],
+  );
+
+  const navigateToId = useCallback(
+    (confirmationId?: string) => {
+      navigateToConfirmation(
+        confirmationId,
+        confirmations,
+        Boolean(approvalFlows?.length),
+        history,
+      );
+    },
+    [confirmations, history],
+  );
+
+  const navigateToIndex = useCallback(
+    (index: number) => {
+      const nextConfirmation = confirmations[index];
+      navigateToId(nextConfirmation?.id);
+    },
+    [confirmations, navigateToId],
+  );
+
+  const count = confirmations.length;
+
+  return { confirmations, count, getIndex, navigateToId, navigateToIndex };
+}
+
+export function navigateToConfirmation(
+  confirmationId: string | undefined,
+  confirmations: ApprovalRequest<Record<string, Json>>[],
+  hasApprovalFlows: boolean,
+  history: ReturnType<typeof useHistory>,
+) {
+  if (hasApprovalFlows) {
+    history.replace(`${CONFIRMATION_V_NEXT_ROUTE}`);
+    return;
+  }
+
+  if (confirmations?.length <= 0 || !confirmationId) {
+    return;
+  }
+
+  const nextConfirmation = confirmations.find(
+    (confirmation) => confirmation.id === confirmationId,
+  );
+
+  if (!nextConfirmation) {
+    return;
+  }
+
+  const type = nextConfirmation.type as ApprovalType;
+
+  if (TEMPLATED_CONFIRMATION_APPROVAL_TYPES.includes(type)) {
+    history.replace(`${CONFIRMATION_V_NEXT_ROUTE}/${confirmationId}`);
+    return;
+  }
+
+  if (isSignatureTransactionType(nextConfirmation)) {
+    history.replace(
+      `${CONFIRM_TRANSACTION_ROUTE}/${confirmationId}${SIGNATURE_REQUEST_PATH}`,
+    );
+    return;
+  }
+
+  if (type === ApprovalType.Transaction) {
+    history.replace(`${CONFIRM_TRANSACTION_ROUTE}/${confirmationId}`);
+    return;
+  }
+
+  if (type === ApprovalType.EthDecrypt) {
+    history.replace(
+      `${CONFIRM_TRANSACTION_ROUTE}/${confirmationId}${DECRYPT_MESSAGE_REQUEST_PATH}`,
+    );
+    return;
+  }
+
+  if (type === ApprovalType.EthGetEncryptionPublicKey) {
+    history.replace(
+      `${CONFIRM_TRANSACTION_ROUTE}/${confirmationId}${ENCRYPTION_PUBLIC_KEY_REQUEST_PATH}`,
+    );
+    return;
+  }
+
+  if (CONNECT_APPROVAL_TYPES.includes(type)) {
+    history.replace(`${CONNECT_ROUTE}/${confirmationId}`);
+    return;
+  }
+
+  const tokenId = (
+    nextConfirmation?.requestData?.asset as Record<string, unknown>
+  )?.tokenId as string;
+
+  if (type === ApprovalType.WatchAsset && !tokenId) {
+    history.replace(`${CONFIRM_ADD_SUGGESTED_TOKEN_ROUTE}`);
+    return;
+  }
+
+  if (type === ApprovalType.WatchAsset && tokenId) {
+    history.replace(`${CONFIRM_ADD_SUGGESTED_NFT_ROUTE}`);
+  }
+}
diff --git a/ui/pages/confirmations/token-allowance/__snapshots__/token-allowance.test.js.snap b/ui/pages/confirmations/token-allowance/__snapshots__/token-allowance.test.js.snap
index bc44e728df86..9d8fe0947ee3 100644
--- a/ui/pages/confirmations/token-allowance/__snapshots__/token-allowance.test.js.snap
+++ b/ui/pages/confirmations/token-allowance/__snapshots__/token-allowance.test.js.snap
@@ -40,11 +40,11 @@ exports[`TokenAllowancePage when mounted should match snapshot 1`] = `
           <div
             class="confirm-page-container-navigation__navtext"
           >
-            0
+            1
              
             of
              
-            0
+            1
           </div>
           <div
             class="confirm-page-container-navigation__longtext"
diff --git a/ui/pages/home/home.component.js b/ui/pages/home/home.component.js
index 9ac71dd6a766..df4ebaca0776 100644
--- a/ui/pages/home/home.component.js
+++ b/ui/pages/home/home.component.js
@@ -54,15 +54,10 @@ import MultiRpcEditModal from '../../components/app/multi-rpc-edit-modal/multi-r
 ///: END:ONLY_INCLUDE_IF
 import {
   RESTORE_VAULT_ROUTE,
-  CONFIRM_TRANSACTION_ROUTE,
-  CONFIRM_ADD_SUGGESTED_TOKEN_ROUTE,
-  CONFIRM_ADD_SUGGESTED_NFT_ROUTE,
-  CONNECT_ROUTE,
   CONNECTED_ROUTE,
   CONNECTED_ACCOUNTS_ROUTE,
   AWAITING_SWAP_ROUTE,
   PREPARE_SWAP_ROUTE,
-  CONFIRMATION_V_NEXT_ROUTE,
   ///: BEGIN:ONLY_INCLUDE_IF(build-main,build-beta,build-flask)
   ONBOARDING_SECURE_YOUR_WALLET_ROUTE,
   ///: END:ONLY_INCLUDE_IF
@@ -80,6 +75,7 @@ import {
 } from '../../../shared/lib/ui-utils';
 import { AccountOverview } from '../../components/multichain/account-overview';
 import { setEditedNetwork } from '../../store/actions';
+import { navigateToConfirmation } from '../confirmations/hooks/useConfirmationNavigation';
 ///: BEGIN:ONLY_INCLUDE_IF(build-mmi)
 import { AccountType } from '../../../shared/constants/custody';
 ///: END:ONLY_INCLUDE_IF
@@ -128,9 +124,6 @@ export default class Home extends PureComponent {
   static propTypes = {
     history: PropTypes.object,
     forgottenPassword: PropTypes.bool,
-    hasTransactionPendingApprovals: PropTypes.bool.isRequired,
-    hasWatchTokenPendingApprovals: PropTypes.bool,
-    hasWatchNftPendingApprovals: PropTypes.bool,
     setConnectedStatusPopoverHasBeenShown: PropTypes.func,
     ///: BEGIN:ONLY_INCLUDE_IF(build-main,build-beta,build-flask)
     shouldShowSeedPhraseReminder: PropTypes.bool.isRequired,
@@ -158,7 +151,6 @@ export default class Home extends PureComponent {
     ///: END:ONLY_INCLUDE_IF
     newNetworkAddedConfigurationId: PropTypes.string,
     isNotification: PropTypes.bool.isRequired,
-    firstPermissionsRequestId: PropTypes.string,
     // This prop is used in the `shouldCloseNotificationPopup` function
     // eslint-disable-next-line react/no-unused-prop-types
     totalUnapprovedCount: PropTypes.number.isRequired,
@@ -175,9 +167,7 @@ export default class Home extends PureComponent {
     setWeb3ShimUsageAlertDismissed: PropTypes.func.isRequired,
     originOfCurrentTab: PropTypes.string,
     disableWeb3ShimUsageAlert: PropTypes.func.isRequired,
-    pendingConfirmations: PropTypes.arrayOf(PropTypes.object).isRequired,
-    pendingConfirmationsPrioritized: PropTypes.arrayOf(PropTypes.object)
-      .isRequired,
+    pendingApprovals: PropTypes.arrayOf(PropTypes.object).isRequired,
     hasApprovalFlows: PropTypes.bool.isRequired,
     infuraBlocked: PropTypes.bool.isRequired,
     setRecoveryPhraseReminderHasBeenShown: PropTypes.func.isRequired,
@@ -229,14 +219,11 @@ export default class Home extends PureComponent {
 
     const {
       closeNotificationPopup,
-      firstPermissionsRequestId,
       haveSwapsQuotes,
       isNotification,
+      pendingApprovals,
       showAwaitingSwapScreen,
-      hasWatchTokenPendingApprovals,
-      hasWatchNftPendingApprovals,
       swapsFetchParams,
-      hasTransactionPendingApprovals,
       location,
     } = this.props;
     const stayOnHomePage = Boolean(location?.state?.stayOnHomePage);
@@ -245,10 +232,7 @@ export default class Home extends PureComponent {
       this.state.notificationClosing = true;
       closeNotificationPopup();
     } else if (
-      firstPermissionsRequestId ||
-      hasTransactionPendingApprovals ||
-      hasWatchTokenPendingApprovals ||
-      hasWatchNftPendingApprovals ||
+      pendingApprovals.length ||
       (!isNotification &&
         !stayOnHomePage &&
         (showAwaitingSwapScreen || haveSwapsQuotes || swapsFetchParams))
@@ -302,18 +286,13 @@ export default class Home extends PureComponent {
 
   checkStatusAndNavigate() {
     const {
-      firstPermissionsRequestId,
       history,
       isNotification,
-      hasTransactionPendingApprovals,
-      hasWatchTokenPendingApprovals,
-      hasWatchNftPendingApprovals,
       haveSwapsQuotes,
       showAwaitingSwapScreen,
       swapsFetchParams,
       location,
-      pendingConfirmations,
-      pendingConfirmationsPrioritized,
+      pendingApprovals,
       hasApprovalFlows,
     } = this.props;
     const stayOnHomePage = Boolean(location?.state?.stayOnHomePage);
@@ -327,18 +306,13 @@ export default class Home extends PureComponent {
       history.push(AWAITING_SWAP_ROUTE);
     } else if (canRedirect && (haveSwapsQuotes || swapsFetchParams)) {
       history.push(PREPARE_SWAP_ROUTE);
-    } else if (firstPermissionsRequestId) {
-      history.push(`${CONNECT_ROUTE}/${firstPermissionsRequestId}`);
-    } else if (pendingConfirmationsPrioritized.length > 0) {
-      history.push(CONFIRMATION_V_NEXT_ROUTE);
-    } else if (hasTransactionPendingApprovals) {
-      history.push(CONFIRM_TRANSACTION_ROUTE);
-    } else if (hasWatchTokenPendingApprovals) {
-      history.push(CONFIRM_ADD_SUGGESTED_TOKEN_ROUTE);
-    } else if (hasWatchNftPendingApprovals) {
-      history.push(CONFIRM_ADD_SUGGESTED_NFT_ROUTE);
-    } else if (pendingConfirmations.length > 0 || hasApprovalFlows) {
-      history.push(CONFIRMATION_V_NEXT_ROUTE);
+    } else if (pendingApprovals.length) {
+      navigateToConfirmation(
+        pendingApprovals[0].id,
+        pendingApprovals,
+        hasApprovalFlows,
+        history,
+      );
     }
     ///: BEGIN:ONLY_INCLUDE_IF(build-mmi)
     this.checkInstitutionalConnectRequest();
diff --git a/ui/pages/home/home.container.js b/ui/pages/home/home.container.js
index da4677111e63..4fb46ccc1744 100644
--- a/ui/pages/home/home.container.js
+++ b/ui/pages/home/home.container.js
@@ -19,12 +19,9 @@ import { getInstitutionalConnectRequests } from '../../ducks/institutional/insti
 import {
   activeTabHasPermissions,
   getUseExternalServices,
-  getFirstPermissionRequest,
-  getFirstSnapInstallOrUpdateRequest,
   getIsMainnet,
   getOriginOfCurrentTab,
   getTotalUnapprovedCount,
-  getUnapprovedTemplatedConfirmations,
   getWeb3ShimUsageStateForOrigin,
   getShowWhatsNewPopup,
   getSortedAnnouncementsToShow,
@@ -37,15 +34,13 @@ import {
   getNewTokensImported,
   getShouldShowSeedPhraseReminder,
   getRemoveNftMessage,
-  getSuggestedTokens,
-  getSuggestedNfts,
   getApprovalFlows,
   getNewTokensImportedError,
   hasPendingApprovals,
   getSelectedInternalAccount,
   getQueuedRequestCount,
   getEditedNetwork,
-  getPrioritizedUnapprovedTemplatedConfirmations,
+  pendingApprovalsSortedSelector,
   ///: BEGIN:ONLY_INCLUDE_IF(build-mmi)
   getAccountType,
   ///: END:ONLY_INCLUDE_IF
@@ -92,7 +87,6 @@ import {
   AlertTypes,
   Web3ShimUsageAlertStates,
 } from '../../../shared/constants/alerts';
-import { hasTransactionPendingApprovals } from '../../selectors/transactions';
 import Home from './home.component';
 
 const mapStateToProps = (state) => {
@@ -114,9 +108,7 @@ const mapStateToProps = (state) => {
   const totalUnapprovedAndQueuedRequestCount =
     totalUnapprovedCount + queuedRequestCount;
   const swapsEnabled = getSwapsFeatureIsLive(state);
-  const pendingConfirmations = getUnapprovedTemplatedConfirmations(state);
-  const pendingConfirmationsPrioritized =
-    getPrioritizedUnapprovedTemplatedConfirmations(state);
+  const pendingApprovals = pendingApprovalsSortedSelector(state);
 
   ///: BEGIN:ONLY_INCLUDE_IF(build-mmi)
   const institutionalConnectRequests = getInstitutionalConnectRequests(state);
@@ -126,17 +118,6 @@ const mapStateToProps = (state) => {
   const isPopup = envType === ENVIRONMENT_TYPE_POPUP;
   const isNotification = envType === ENVIRONMENT_TYPE_NOTIFICATION;
 
-  let firstPermissionsRequest, firstPermissionsRequestId;
-  firstPermissionsRequest = getFirstPermissionRequest(state);
-  firstPermissionsRequestId = firstPermissionsRequest?.metadata.id || null;
-
-  // getFirstPermissionRequest should be updated with snap update logic once we hit main extension release
-
-  if (!firstPermissionsRequest) {
-    firstPermissionsRequest = getFirstSnapInstallOrUpdateRequest(state);
-    firstPermissionsRequestId = firstPermissionsRequest?.metadata.id || null;
-  }
-
   const originOfCurrentTab = getOriginOfCurrentTab(state);
   const shouldShowWeb3ShimUsageNotification =
     isPopup &&
@@ -145,10 +126,6 @@ const mapStateToProps = (state) => {
     getWeb3ShimUsageStateForOrigin(state, originOfCurrentTab) ===
       Web3ShimUsageAlertStates.recorded;
 
-  const hasWatchTokenPendingApprovals = getSuggestedTokens(state).length > 0;
-
-  const hasWatchNftPendingApprovals = getSuggestedNfts(state).length > 0;
-
   const hasAllowedPopupRedirectApprovals = hasPendingApprovals(state, [
     ///: BEGIN:ONLY_INCLUDE_IF(keyring-snaps)
     SNAP_MANAGE_ACCOUNTS_CONFIRMATION_TYPES.confirmAccountCreation,
@@ -167,16 +144,12 @@ const mapStateToProps = (state) => {
     useExternalServices: getUseExternalServices(state),
     isBasicConfigurationModalOpen: appState.showBasicFunctionalityModal,
     forgottenPassword,
-    hasWatchTokenPendingApprovals,
-    hasWatchNftPendingApprovals,
     swapsEnabled,
-    hasTransactionPendingApprovals: hasTransactionPendingApprovals(state),
     shouldShowSeedPhraseReminder: getShouldShowSeedPhraseReminder(state),
     isPopup,
     isNotification,
     dataCollectionForMarketing,
     selectedAddress,
-    firstPermissionsRequestId,
     totalUnapprovedCount,
     totalUnapprovedAndQueuedRequestCount,
     participateInMetaMetrics,
@@ -191,8 +164,7 @@ const mapStateToProps = (state) => {
     isMainnet: getIsMainnet(state),
     originOfCurrentTab,
     shouldShowWeb3ShimUsageNotification,
-    pendingConfirmations,
-    pendingConfirmationsPrioritized,
+    pendingApprovals,
     infuraBlocked: getInfuraBlocked(state),
     announcementsToShow: getSortedAnnouncementsToShow(state).length > 0,
     showWhatsNewPopup,
diff --git a/ui/pages/permissions-connect/permissions-connect.component.js b/ui/pages/permissions-connect/permissions-connect.component.js
index 6d37b46e39e2..17f73d633953 100644
--- a/ui/pages/permissions-connect/permissions-connect.component.js
+++ b/ui/pages/permissions-connect/permissions-connect.component.js
@@ -287,6 +287,7 @@ export default class PermissionConnect extends Component {
           />
         ) : (
           <PermissionConnectHeader
+            requestId={permissionsRequestId}
             origin={targetSubjectMetadata.origin}
             iconUrl={targetSubjectMetadata.iconUrl}
           />
diff --git a/ui/selectors/approvals.ts b/ui/selectors/approvals.ts
index 14e2362d0708..55a5d052579c 100644
--- a/ui/selectors/approvals.ts
+++ b/ui/selectors/approvals.ts
@@ -51,7 +51,7 @@ export function getApprovalFlows(state: ApprovalsMetaMaskState) {
 }
 
 export function getPendingApprovals(state: ApprovalsMetaMaskState) {
-  return Object.values(state.metamask.pendingApprovals ?? []);
+  return Object.values(state.metamask.pendingApprovals ?? {});
 }
 
 export function pendingApprovalsSortedSelector(state: ApprovalsMetaMaskState) {
diff --git a/ui/selectors/selectors.js b/ui/selectors/selectors.js
index 591b569874ec..4d14fe94cef5 100644
--- a/ui/selectors/selectors.js
+++ b/ui/selectors/selectors.js
@@ -1058,7 +1058,7 @@ export function getIsNonStandardEthChain(state) {
 }
 
 export function getPreferences({ metamask }) {
-  return metamask.preferences;
+  return metamask.preferences ?? {};
 }
 
 export function getSendInputCurrencySwitched({ appState }) {
diff --git a/ui/store/actions.ts b/ui/store/actions.ts
index 5ed6fe7ddf62..3cd104ed38ff 100644
--- a/ui/store/actions.ts
+++ b/ui/store/actions.ts
@@ -5304,6 +5304,18 @@ export function requestUserApproval({
   };
 }
 
+export function rejectAllApprovals() {
+  return async (dispatch: MetaMaskReduxDispatch) => {
+    await submitRequestToBackground('rejectAllPendingApprovals');
+
+    const { pendingApprovals } = await forceUpdateMetamaskState(dispatch);
+
+    if (Object.values(pendingApprovals).length === 0) {
+      dispatch(closeCurrentNotificationWindow());
+    }
+  };
+}
+
 export async function getCurrentNetworkEIP1559Compatibility(): Promise<
   boolean | undefined
 > {

From 3802e3df663419935988552ffbebb2e6ea3cd080 Mon Sep 17 00:00:00 2001
From: infiniteflower <139582705+infiniteflower@users.noreply.github.com>
Date: Tue, 10 Dec 2024 13:22:09 -0500
Subject: [PATCH 071/175] fix: cross chain swap tx order (#28939)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<!--
Please submit this PR as a draft initially.
Do not mark it as "Ready for review" until the template has been
completely filled out, and PR status checks have passed at least once.
-->

## **Description**

<!--
Write a short description of the changes included in this pull request,
also include relevant motivation and context. Have in mind the following
questions:
1. What is the reason for the change?
2. What is the improvement/solution?
-->

[![Open in GitHub
Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/28939?quickstart=1)

This PR fixes the ordering of `bridgeApproval` and `bridge` type txs.

For non-STX, we revert back to using `addTransactionAndWaitForPublish`.
We only use `addTransaction` when it is a `bridge` type STX.

## **Related issues**

Fixes:

## **Manual testing steps**

1. Add `BRIDGE_USE_DEV_APIS=1` to `.metamaskrc`
1. Do a bridge
2. Go to Activity
3. Observe that ordering is correct

## **Screenshots/Recordings**

<!-- If applicable, add screenshots and/or recordings to visualize the
before and after of your change. -->

### **Before**

<!-- [screenshots/recordings] -->

### **After**

<!-- [screenshots/recordings] -->



https://github.com/user-attachments/assets/a9f77144-9996-4202-868f-dc2d96c65403



## **Pre-merge author checklist**

- [x] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension Coding
Standards](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/CODING_GUIDELINES.md).
- [x] I've completed the PR template to the best of my ability
- [ ] I’ve included tests if applicable
- [ ] I’ve documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [x] I’ve applied the right labels on the PR (see [labeling
guidelines](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.

## **Pre-merge reviewer checklist**

- [ ] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed).
- [ ] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.
---
 ui/pages/bridge/hooks/useHandleTx.ts          | 20 +++++++++++++++----
 .../hooks/useSubmitBridgeTransaction.test.tsx | 14 +++++++++++--
 .../hooks/useSubmitBridgeTransaction.ts       |  9 ++++-----
 3 files changed, 32 insertions(+), 11 deletions(-)

diff --git a/ui/pages/bridge/hooks/useHandleTx.ts b/ui/pages/bridge/hooks/useHandleTx.ts
index 70deb084c87c..c3a3ede01002 100644
--- a/ui/pages/bridge/hooks/useHandleTx.ts
+++ b/ui/pages/bridge/hooks/useHandleTx.ts
@@ -7,6 +7,7 @@ import {
   forceUpdateMetamaskState,
   addTransaction,
   updateTransaction,
+  addTransactionAndWaitForPublish,
 } from '../../../store/actions';
 import {
   getHexMaxGasLimit,
@@ -16,6 +17,7 @@ import { getGasFeeEstimates } from '../../../ducks/metamask/metamask';
 import { checkNetworkAndAccountSupports1559 } from '../../../selectors';
 import { ChainId } from '../types';
 import { decimalToPrefixedHex } from '../../../../shared/modules/conversion.utils';
+import { getIsSmartTransaction } from '../../../../shared/modules/selectors';
 
 export default function useHandleTx() {
   const dispatch = useDispatch();
@@ -23,6 +25,7 @@ export default function useHandleTx() {
     checkNetworkAndAccountSupports1559,
   );
   const networkGasFeeEstimates = useSelector(getGasFeeEstimates);
+  const shouldUseSmartTransaction = useSelector(getIsSmartTransaction);
 
   const handleTx = async ({
     txType,
@@ -59,13 +62,22 @@ export default function useHandleTx() {
       maxPriorityFeePerGas,
     };
 
+    // For the bridge tx only
     // Need access to the txMeta.id right away so we can track it in BridgeStatusController,
     // so we call addTransaction instead of addTransactionAndWaitForPublish
     // if it's an STX, addTransactionAndWaitForPublish blocks until there is a txHash
-    const txMeta = await addTransaction(finalTxParams, {
-      requireApproval: false,
-      type: txType,
-    });
+    let txMeta: TransactionMeta;
+    if (txType === TransactionType.bridge && shouldUseSmartTransaction) {
+      txMeta = await addTransaction(finalTxParams, {
+        requireApproval: false,
+        type: txType,
+      });
+    } else {
+      txMeta = await addTransactionAndWaitForPublish(finalTxParams, {
+        requireApproval: false,
+        type: txType,
+      });
+    }
 
     // Note that updateTransaction doesn't actually error if you add fields that don't conform the to the txMeta type
     // they will be there at runtime, but you just don't get any type safety checks on them
diff --git a/ui/pages/bridge/hooks/useSubmitBridgeTransaction.test.tsx b/ui/pages/bridge/hooks/useSubmitBridgeTransaction.test.tsx
index a84dc7aae443..b64768cb47e8 100644
--- a/ui/pages/bridge/hooks/useSubmitBridgeTransaction.test.tsx
+++ b/ui/pages/bridge/hooks/useSubmitBridgeTransaction.test.tsx
@@ -36,6 +36,7 @@ jest.mock('../../../store/actions', () => {
   return {
     ...original,
     addTransaction: jest.fn(),
+    addTransactionAndWaitForPublish: jest.fn(),
     addToken: jest.fn().mockImplementation(original.addToken),
     addNetwork: jest.fn().mockImplementation(original.addNetwork),
   };
@@ -178,11 +179,20 @@ describe('ui/pages/bridge/hooks/useSubmitBridgeTransaction', () => {
           id: 'txMetaId-01',
         };
       });
+      const mockAddTransactionAndWaitForPublish = jest.fn(() => {
+        return {
+          id: 'txMetaId-02',
+        };
+      });
 
       // For some reason, setBackgroundConnection does not work, gets hung up on the promise, so mock this way instead
       (actions.addTransaction as jest.Mock).mockImplementation(
         mockAddTransaction,
       );
+      (actions.addTransactionAndWaitForPublish as jest.Mock).mockImplementation(
+        mockAddTransactionAndWaitForPublish,
+      );
+
       const store = makeMockStore();
       const { result } = renderHook(() => useSubmitBridgeTransaction(), {
         wrapper: makeWrapper(store),
@@ -194,7 +204,7 @@ describe('ui/pages/bridge/hooks/useSubmitBridgeTransaction', () => {
       );
 
       // Assert
-      expect(mockAddTransaction).toHaveBeenNthCalledWith(
+      expect(mockAddTransactionAndWaitForPublish).toHaveBeenNthCalledWith(
         1,
         {
           chainId: '0x1',
@@ -213,7 +223,7 @@ describe('ui/pages/bridge/hooks/useSubmitBridgeTransaction', () => {
         },
       );
       expect(mockAddTransaction).toHaveBeenNthCalledWith(
-        2,
+        1,
         {
           chainId: '0x1',
           data: '0x3ce33bff0000000000000000000000000000000000000000000000000000000000000080000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb480000000000000000000000000000000000000000000000000000000000a7d8c000000000000000000000000000000000000000000000000000000000000000c0000000000000000000000000000000000000000000000000000000000000000d6c6966694164617074657256320000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001e0000000000000000000000000e397c4883ec89ed4fc9d258f00c689708b2799c9000000000000000000000000e397c4883ec89ed4fc9d258f00c689708b2799c9000000000000000000000000000000000000000000000000000000000000a4b1000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb48000000000000000000000000af88d065e77c8cc2239327c5edb3a432268e58310000000000000000000000000000000000000000000000000000000000a660c6000000000000000000000000000000000000000000000000000000000000014000000000000000000000000000000000000000000000000000000000000177fa000000000000000000000000e6b738da243e8fa2a0ed5915645789add5de515200000000000000000000000000000000000000000000000000000000000000902340ab8fc3119af1d016a0eec5fe6ef47965741f6f7a4734bf784bf3ae3f2452a0b86991c6218b36c1d19d4a2e9eb0ce3606eb4800000000000000000000000000a660c60000a4b10008df3abdeb853d66fefedfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffd00dfeeddeadbeef8932eb23bad9bddb5cf81426f78279a53c6c3b7100000000000000000000000000000000740cfc1bc02079862368cb4eea1332bd9f2dfa925fc757fd51e40919859b87ca031a2a12d67e4ca4ba67d52b59114b3e18c1e8c839ae015112af82e92251db701b',
diff --git a/ui/pages/bridge/hooks/useSubmitBridgeTransaction.ts b/ui/pages/bridge/hooks/useSubmitBridgeTransaction.ts
index 9985757d7fa3..a0fd8bc73508 100644
--- a/ui/pages/bridge/hooks/useSubmitBridgeTransaction.ts
+++ b/ui/pages/bridge/hooks/useSubmitBridgeTransaction.ts
@@ -30,11 +30,6 @@ export default function useSubmitBridgeTransaction() {
       });
     }
 
-    // Route user to activity tab on Home page
-    // Do it ahead of time because otherwise STX waits for a txHash on TransactionType.bridge and that can take a while
-    await dispatch(setDefaultHomeActiveTabName('activity'));
-    history.push(DEFAULT_ROUTE);
-
     const bridgeTxMeta = await handleBridgeTx({
       quoteResponse,
       approvalTxId: approvalTxMeta?.id,
@@ -67,6 +62,10 @@ export default function useSubmitBridgeTransaction() {
     if (quoteResponse.quote.destAsset.address !== zeroAddress()) {
       await addDestToken(quoteResponse);
     }
+
+    // Route user to activity tab on Home page
+    await dispatch(setDefaultHomeActiveTabName('activity'));
+    history.push(DEFAULT_ROUTE);
   };
 
   return {

From bbb49d27e90b31526e812f94a77b5736a4eb7b39 Mon Sep 17 00:00:00 2001
From: Bryan Fullam <bryan.fullam@consensys.net>
Date: Wed, 11 Dec 2024 02:44:07 +0700
Subject: [PATCH 072/175] refactor: decouple extension config from bridge API
 feature flags (#28983)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## **Description**

We are currently unable to scope specific source and destination allow
lists to extension. This PR refactors the existing system of using the
bridge api allowlists to instead use an extension-scoped feature flag
for all extension related configs.

[![Open in GitHub
Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/28983?quickstart=1)

## **Related issues**

Fixes:

## **Manual testing steps**

1. Go to bridge
2. Complete successful bridge

## **Screenshots/Recordings**

<!-- If applicable, add screenshots and/or recordings to visualize the
before and after of your change. -->

### **Before**

<!-- [screenshots/recordings] -->

### **After**

<!-- [screenshots/recordings] -->

## **Pre-merge author checklist**

- [x] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension Coding
Standards](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/CODING_GUIDELINES.md).
- [x] I've completed the PR template to the best of my ability
- [x] I’ve included tests if applicable
- [x] I’ve documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [ ] I’ve applied the right labels on the PR (see [labeling
guidelines](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.

## **Pre-merge reviewer checklist**

- [ ] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed).
- [ ] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.
---
 app/scripts/constants/sentry-state.ts         |  8 +-
 .../bridge/bridge-controller.test.ts          | 32 ++++--
 app/scripts/controllers/bridge/constants.ts   |  5 +-
 app/scripts/controllers/bridge/types.ts       |  9 +-
 shared/types/bridge.ts                        |  4 +
 test/e2e/default-fixture.js                   | 20 +++-
 test/e2e/fixture-builder.js                   |  7 +-
 .../bridge/bridge-button-routing.spec.ts      |  8 +-
 test/e2e/tests/bridge/bridge-test-utils.ts    |  4 +
 test/e2e/tests/bridge/constants.ts            |  9 +-
 ...rs-after-init-opt-in-background-state.json | 14 ++-
 .../errors-after-init-opt-in-ui-state.json    | 14 ++-
 ...s-before-init-opt-in-background-state.json | 17 ++--
 .../errors-before-init-opt-in-ui-state.json   | 34 ++-----
 .../data/onboarding-completion-route.json     |  4 +-
 test/jest/mock-store.js                       |  8 +-
 ui/ducks/bridge/selectors.test.ts             | 98 +++++++++++++------
 ui/ducks/bridge/selectors.ts                  | 15 +--
 ui/hooks/bridge/useBridging.test.ts           | 17 ++--
 ui/pages/bridge/bridge.util.test.ts           | 94 +++++++++++++-----
 ui/pages/bridge/bridge.util.ts                | 30 +++---
 ui/pages/bridge/index.test.tsx                |  4 +-
 .../bridge/prepare/bridge-cta-button.test.tsx | 80 ++++++++++++---
 .../prepare/prepare-bridge-page.test.tsx      | 43 ++++++--
 .../bridge/quotes/bridge-quote-card.test.tsx  | 35 +++++--
 ui/pages/bridge/types.ts                      |  9 +-
 ui/pages/bridge/utils/validators.ts           | 25 +++--
 ui/selectors/selectors.js                     |  3 +-
 28 files changed, 442 insertions(+), 208 deletions(-)
 create mode 100644 shared/types/bridge.ts

diff --git a/app/scripts/constants/sentry-state.ts b/app/scripts/constants/sentry-state.ts
index 1087b5ac608b..8a01e9a0f9f9 100644
--- a/app/scripts/constants/sentry-state.ts
+++ b/app/scripts/constants/sentry-state.ts
@@ -97,10 +97,10 @@ export const SENTRY_BACKGROUND_STATE = {
   BridgeController: {
     bridgeState: {
       bridgeFeatureFlags: {
-        extensionConfig: false,
-        extensionSupport: false,
-        destNetworkAllowlist: [],
-        srcNetworkAllowlist: [],
+        extensionConfig: {
+          support: false,
+          chains: {},
+        },
       },
       destTokens: {},
       destTopAssets: [],
diff --git a/app/scripts/controllers/bridge/bridge-controller.test.ts b/app/scripts/controllers/bridge/bridge-controller.test.ts
index dcfe4b21554e..d83844e62cb0 100644
--- a/app/scripts/controllers/bridge/bridge-controller.test.ts
+++ b/app/scripts/controllers/bridge/bridge-controller.test.ts
@@ -66,10 +66,26 @@ describe('BridgeController', function () {
         'extension-config': {
           refreshRate: 3,
           maxRefreshCount: 3,
+          support: true,
+          chains: {
+            '10': {
+              isActiveSrc: true,
+              isActiveDest: false,
+            },
+            '534352': {
+              isActiveSrc: true,
+              isActiveDest: false,
+            },
+            '137': {
+              isActiveSrc: false,
+              isActiveDest: true,
+            },
+            '42161': {
+              isActiveSrc: false,
+              isActiveDest: true,
+            },
+          },
         },
-        'extension-support': true,
-        'src-network-allowlist': [10, 534352],
-        'dest-network-allowlist': [137, 42161],
         'approval-gas-multiplier': {
           '137': 1.1,
           '42161': 1.2,
@@ -114,12 +130,16 @@ describe('BridgeController', function () {
 
   it('setBridgeFeatureFlags should fetch and set the bridge feature flags', async function () {
     const expectedFeatureFlagsResponse = {
-      extensionSupport: true,
-      destNetworkAllowlist: [CHAIN_IDS.POLYGON, CHAIN_IDS.ARBITRUM],
-      srcNetworkAllowlist: [CHAIN_IDS.OPTIMISM, CHAIN_IDS.SCROLL],
       extensionConfig: {
         maxRefreshCount: 3,
         refreshRate: 3,
+        support: true,
+        chains: {
+          [CHAIN_IDS.OPTIMISM]: { isActiveSrc: true, isActiveDest: false },
+          [CHAIN_IDS.SCROLL]: { isActiveSrc: true, isActiveDest: false },
+          [CHAIN_IDS.POLYGON]: { isActiveSrc: false, isActiveDest: true },
+          [CHAIN_IDS.ARBITRUM]: { isActiveSrc: false, isActiveDest: true },
+        },
       },
     };
     expect(bridgeController.state).toStrictEqual(EMPTY_INIT_STATE);
diff --git a/app/scripts/controllers/bridge/constants.ts b/app/scripts/controllers/bridge/constants.ts
index ec60f8e6a0a4..3ad807436062 100644
--- a/app/scripts/controllers/bridge/constants.ts
+++ b/app/scripts/controllers/bridge/constants.ts
@@ -20,10 +20,9 @@ export const DEFAULT_BRIDGE_CONTROLLER_STATE: BridgeControllerState = {
     [BridgeFeatureFlagsKey.EXTENSION_CONFIG]: {
       refreshRate: REFRESH_INTERVAL_MS,
       maxRefreshCount: DEFAULT_MAX_REFRESH_COUNT,
+      support: false,
+      chains: {},
     },
-    [BridgeFeatureFlagsKey.EXTENSION_SUPPORT]: false,
-    [BridgeFeatureFlagsKey.NETWORK_SRC_ALLOWLIST]: [],
-    [BridgeFeatureFlagsKey.NETWORK_DEST_ALLOWLIST]: [],
   },
   srcTokens: {},
   srcTopAssets: [],
diff --git a/app/scripts/controllers/bridge/types.ts b/app/scripts/controllers/bridge/types.ts
index c9e221b82418..c9d59a8470f4 100644
--- a/app/scripts/controllers/bridge/types.ts
+++ b/app/scripts/controllers/bridge/types.ts
@@ -16,24 +16,21 @@ import {
   // TODO: Remove restricted import
   // eslint-disable-next-line import/no-restricted-paths
 } from '../../../../ui/pages/bridge/types';
+import { ChainConfiguration } from '../../../../shared/types/bridge';
 import BridgeController from './bridge-controller';
 import { BRIDGE_CONTROLLER_NAME, RequestStatus } from './constants';
 
 export enum BridgeFeatureFlagsKey {
   EXTENSION_CONFIG = 'extensionConfig',
-  EXTENSION_SUPPORT = 'extensionSupport',
-  NETWORK_SRC_ALLOWLIST = 'srcNetworkAllowlist',
-  NETWORK_DEST_ALLOWLIST = 'destNetworkAllowlist',
 }
 
 export type BridgeFeatureFlags = {
   [BridgeFeatureFlagsKey.EXTENSION_CONFIG]: {
     refreshRate: number;
     maxRefreshCount: number;
+    support: boolean;
+    chains: Record<Hex, ChainConfiguration>;
   };
-  [BridgeFeatureFlagsKey.EXTENSION_SUPPORT]: boolean;
-  [BridgeFeatureFlagsKey.NETWORK_SRC_ALLOWLIST]: Hex[];
-  [BridgeFeatureFlagsKey.NETWORK_DEST_ALLOWLIST]: Hex[];
 };
 
 export type BridgeControllerState = {
diff --git a/shared/types/bridge.ts b/shared/types/bridge.ts
new file mode 100644
index 000000000000..6cfab93f47ed
--- /dev/null
+++ b/shared/types/bridge.ts
@@ -0,0 +1,4 @@
+export type ChainConfiguration = {
+  isActiveSrc: boolean;
+  isActiveDest: boolean;
+};
diff --git a/test/e2e/default-fixture.js b/test/e2e/default-fixture.js
index a6845e40ec4c..5bb2a24d0c5c 100644
--- a/test/e2e/default-fixture.js
+++ b/test/e2e/default-fixture.js
@@ -120,9 +120,23 @@ function defaultFixture(inputChainId = CHAIN_IDS.LOCALHOST) {
       BridgeController: {
         bridgeState: {
           bridgeFeatureFlags: {
-            extensionSupport: false,
-            srcNetworkAllowlist: ['0x1', '0xa', '0xe708'],
-            destNetworkAllowlist: ['0x1', '0xa', '0xe708'],
+            extensionConfig: {
+              support: false,
+              chains: {
+                '0x1': {
+                  isActiveSrc: true,
+                  isActiveDest: true,
+                },
+                '0xa': {
+                  isActiveSrc: true,
+                  isActiveDest: true,
+                },
+                '0xe708': {
+                  isActiveSrc: true,
+                  isActiveDest: true,
+                },
+              },
+            },
           },
           destTokens: {},
           destTopAssets: [],
diff --git a/test/e2e/fixture-builder.js b/test/e2e/fixture-builder.js
index 89471203c77e..555ab2c2cc2a 100644
--- a/test/e2e/fixture-builder.js
+++ b/test/e2e/fixture-builder.js
@@ -452,9 +452,10 @@ class FixtureBuilder {
     this.fixture.data.BridgeController = {
       bridgeState: {
         bridgeFeatureFlags: {
-          destNetworkAllowlist: [],
-          extensionSupport: false,
-          srcNetworkAllowlist: [],
+          extensionConfig: {
+            support: false,
+            chains: {},
+          },
         },
         destTokens: {},
         destTopAssets: [],
diff --git a/test/e2e/tests/bridge/bridge-button-routing.spec.ts b/test/e2e/tests/bridge/bridge-button-routing.spec.ts
index a3ecb70a2967..90cd03bd6dff 100644
--- a/test/e2e/tests/bridge/bridge-button-routing.spec.ts
+++ b/test/e2e/tests/bridge/bridge-button-routing.spec.ts
@@ -1,11 +1,17 @@
 import { Suite } from 'mocha';
 import { logInWithBalanceValidation, withFixtures } from '../../helpers';
 import { BridgePage, getBridgeFixtures } from './bridge-test-utils';
+import { DEFAULT_FEATURE_FLAGS_RESPONSE } from './constants';
 
 describe('Click bridge button @no-mmi', function (this: Suite) {
   it('loads placeholder swap route from wallet overview when flag is turned on', async function () {
     await withFixtures(
-      getBridgeFixtures(this.test?.fullTitle(), { 'extension-support': true }),
+      getBridgeFixtures(this.test?.fullTitle(), {
+        'extension-config': {
+          ...DEFAULT_FEATURE_FLAGS_RESPONSE['extension-config'],
+          support: true,
+        },
+      }),
       async ({ driver, ganacheServer }) => {
         const bridgePage = new BridgePage(driver);
         await logInWithBalanceValidation(driver, ganacheServer);
diff --git a/test/e2e/tests/bridge/bridge-test-utils.ts b/test/e2e/tests/bridge/bridge-test-utils.ts
index 930f0196673e..cf57deb59f96 100644
--- a/test/e2e/tests/bridge/bridge-test-utils.ts
+++ b/test/e2e/tests/bridge/bridge-test-utils.ts
@@ -112,6 +112,10 @@ const mockServer =
               json: {
                 ...DEFAULT_FEATURE_FLAGS_RESPONSE,
                 ...featureFlagOverrides,
+                'extension-config': {
+                  ...DEFAULT_FEATURE_FLAGS_RESPONSE['extension-config'],
+                  ...featureFlagOverrides['extension-config'],
+                },
               },
             };
           }),
diff --git a/test/e2e/tests/bridge/constants.ts b/test/e2e/tests/bridge/constants.ts
index ae7fc37a62c6..d5b6da9afc61 100644
--- a/test/e2e/tests/bridge/constants.ts
+++ b/test/e2e/tests/bridge/constants.ts
@@ -4,10 +4,13 @@ export const DEFAULT_FEATURE_FLAGS_RESPONSE: FeatureFlagResponse = {
   'extension-config': {
     refreshRate: 30,
     maxRefreshCount: 5,
+    support: false,
+    chains: {
+      '1': { isActiveSrc: true, isActiveDest: true },
+      '42161': { isActiveSrc: true, isActiveDest: true },
+      '59144': { isActiveSrc: true, isActiveDest: true },
+    },
   },
-  'extension-support': false,
-  'src-network-allowlist': [1, 42161, 59144],
-  'dest-network-allowlist': [1, 42161, 59144],
 };
 
 export const LOCATOR = {
diff --git a/test/e2e/tests/metrics/state-snapshots/errors-after-init-opt-in-background-state.json b/test/e2e/tests/metrics/state-snapshots/errors-after-init-opt-in-background-state.json
index c915bba637b7..8e64bd8a92fa 100644
--- a/test/e2e/tests/metrics/state-snapshots/errors-after-init-opt-in-background-state.json
+++ b/test/e2e/tests/metrics/state-snapshots/errors-after-init-opt-in-background-state.json
@@ -61,10 +61,16 @@
   "BridgeController": {
     "bridgeState": {
       "bridgeFeatureFlags": {
-        "extensionConfig": "object",
-        "extensionSupport": "boolean",
-        "srcNetworkAllowlist": { "0": "string", "1": "string", "2": "string" },
-        "destNetworkAllowlist": { "0": "string", "1": "string", "2": "string" }
+        "extensionConfig": {
+          "maxRefreshCount": "number",
+          "refreshRate": "number",
+          "support": "boolean",
+          "chains": {
+            "0x1": "object",
+            "0xa4b1": "object",
+            "0xe708": "object"
+          }
+        }
       },
       "srcTokens": {},
       "srcTopAssets": {},
diff --git a/test/e2e/tests/metrics/state-snapshots/errors-after-init-opt-in-ui-state.json b/test/e2e/tests/metrics/state-snapshots/errors-after-init-opt-in-ui-state.json
index ccecc8669c81..0c1f27681c5a 100644
--- a/test/e2e/tests/metrics/state-snapshots/errors-after-init-opt-in-ui-state.json
+++ b/test/e2e/tests/metrics/state-snapshots/errors-after-init-opt-in-ui-state.json
@@ -284,10 +284,16 @@
     },
     "bridgeState": {
       "bridgeFeatureFlags": {
-        "extensionConfig": "object",
-        "extensionSupport": "boolean",
-        "srcNetworkAllowlist": { "0": "string", "1": "string", "2": "string" },
-        "destNetworkAllowlist": { "0": "string", "1": "string", "2": "string" }
+        "extensionConfig": {
+          "maxRefreshCount": "number",
+          "refreshRate": "number",
+          "support": "boolean",
+          "chains": {
+            "0x1": "object",
+            "0xa4b1": "object",
+            "0xe708": "object"
+          }
+        }
       },
       "srcTokens": {},
       "srcTopAssets": {},
diff --git a/test/e2e/tests/metrics/state-snapshots/errors-before-init-opt-in-background-state.json b/test/e2e/tests/metrics/state-snapshots/errors-before-init-opt-in-background-state.json
index 1a1009c02c23..c443b0fe84ec 100644
--- a/test/e2e/tests/metrics/state-snapshots/errors-before-init-opt-in-background-state.json
+++ b/test/e2e/tests/metrics/state-snapshots/errors-before-init-opt-in-background-state.json
@@ -143,16 +143,13 @@
     "BridgeController": {
       "bridgeState": {
         "bridgeFeatureFlags": {
-          "extensionSupport": "boolean",
-          "srcNetworkAllowlist": {
-            "0": "string",
-            "1": "string",
-            "2": "string"
-          },
-          "destNetworkAllowlist": {
-            "0": "string",
-            "1": "string",
-            "2": "string"
+          "extensionConfig": {
+            "support": "boolean",
+            "chains": {
+              "0x1": "object",
+              "0xa": "object",
+              "0xe708": "object"
+            }
           }
         },
         "destTokens": {},
diff --git a/test/e2e/tests/metrics/state-snapshots/errors-before-init-opt-in-ui-state.json b/test/e2e/tests/metrics/state-snapshots/errors-before-init-opt-in-ui-state.json
index e7fe6fd2a641..012ccabe6f2f 100644
--- a/test/e2e/tests/metrics/state-snapshots/errors-before-init-opt-in-ui-state.json
+++ b/test/e2e/tests/metrics/state-snapshots/errors-before-init-opt-in-ui-state.json
@@ -44,23 +44,6 @@
       "newPrivacyPolicyToastShownDate": "number",
       "snapsInstallPrivacyWarningShown": true
     },
-    "BridgeController": {
-      "bridgeState": {
-        "bridgeFeatureFlags": {
-          "extensionSupport": "boolean",
-          "srcNetworkAllowlist": {
-            "0": "string",
-            "1": "string",
-            "2": "string"
-          },
-          "destNetworkAllowlist": {
-            "0": "string",
-            "1": "string",
-            "2": "string"
-          }
-        }
-      }
-    },
     "CurrencyController": {
       "currentCurrency": "usd",
       "currencyRates": {
@@ -169,16 +152,13 @@
     "BridgeController": {
       "bridgeState": {
         "bridgeFeatureFlags": {
-          "extensionSupport": "boolean",
-          "srcNetworkAllowlist": {
-            "0": "string",
-            "1": "string",
-            "2": "string"
-          },
-          "destNetworkAllowlist": {
-            "0": "string",
-            "1": "string",
-            "2": "string"
+          "extensionConfig": {
+            "support": "boolean",
+            "chains": {
+              "0x1": "object",
+              "0xa": "object",
+              "0xe708": "object"
+            }
           }
         },
         "destTokens": {},
diff --git a/test/integration/data/onboarding-completion-route.json b/test/integration/data/onboarding-completion-route.json
index 33d0680ab8a0..3e470b1494e6 100644
--- a/test/integration/data/onboarding-completion-route.json
+++ b/test/integration/data/onboarding-completion-route.json
@@ -59,7 +59,9 @@
   "approvalFlows": [],
   "bridgeState": {
     "bridgeFeatureFlags": {
-      "extensionSupport": false
+      "extensionConfig": {
+        "support": false
+      }
     }
   },
   "browserEnvironment": { "os": "mac", "browser": "firefox" },
diff --git a/test/jest/mock-store.js b/test/jest/mock-store.js
index 422c54f13bf1..e315fe10c9a5 100644
--- a/test/jest/mock-store.js
+++ b/test/jest/mock-store.js
@@ -745,10 +745,12 @@ export const createBridgeMockStore = (
       bridgeState: {
         ...(swapsStore.metamask.bridgeState ?? {}),
         bridgeFeatureFlags: {
-          extensionSupport: false,
-          srcNetworkAllowlist: [],
-          destNetworkAllowlist: [],
           ...featureFlagOverrides,
+          extensionConfig: {
+            support: false,
+            chains: {},
+            ...featureFlagOverrides.extensionConfig,
+          },
         },
         quotes: DEFAULT_BRIDGE_CONTROLLER_STATE.quotes,
         quoteRequest: DEFAULT_BRIDGE_CONTROLLER_STATE.quoteRequest,
diff --git a/ui/ducks/bridge/selectors.test.ts b/ui/ducks/bridge/selectors.test.ts
index 3b150c3fde35..50f81fb1fb94 100644
--- a/ui/ducks/bridge/selectors.test.ts
+++ b/ui/ducks/bridge/selectors.test.ts
@@ -34,7 +34,13 @@ describe('Bridge selectors', () => {
   describe('getFromChain', () => {
     it('returns the fromChain from the state', () => {
       const state = createBridgeMockStore({
-        featureFlagOverrides: { srcNetworkAllowlist: [CHAIN_IDS.ARBITRUM] },
+        featureFlagOverrides: {
+          extensionConfig: {
+            chains: {
+              [CHAIN_IDS.ARBITRUM]: { isActiveSrc: true, isActiveDest: false },
+            },
+          },
+        },
         bridgeSliceOverrides: { toChainId: '0xe708' },
         metamaskStateOverrides: {
           ...mockNetworkState(FEATURED_RPCS[1]),
@@ -63,7 +69,13 @@ describe('Bridge selectors', () => {
   describe('getToChain', () => {
     it('returns the toChain from the state', () => {
       const state = createBridgeMockStore({
-        featureFlagOverrides: { destNetworkAllowlist: ['0xe708'] },
+        featureFlagOverrides: {
+          extensionConfig: {
+            chains: {
+              '0xe708': { isActiveSrc: false, isActiveDest: true },
+            },
+          },
+        },
         bridgeSliceOverrides: { toChainId: '0xe708' },
       });
 
@@ -156,12 +168,17 @@ describe('Bridge selectors', () => {
     it('excludes disabled chains from options', () => {
       const state = createBridgeMockStore({
         featureFlagOverrides: {
-          srcNetworkAllowlist: [
-            CHAIN_IDS.MAINNET,
-            CHAIN_IDS.LINEA_MAINNET,
-            CHAIN_IDS.OPTIMISM,
-            CHAIN_IDS.POLYGON,
-          ],
+          extensionConfig: {
+            chains: {
+              [CHAIN_IDS.MAINNET]: { isActiveSrc: true, isActiveDest: false },
+              [CHAIN_IDS.LINEA_MAINNET]: {
+                isActiveSrc: true,
+                isActiveDest: false,
+              },
+              [CHAIN_IDS.OPTIMISM]: { isActiveSrc: true, isActiveDest: false },
+              [CHAIN_IDS.POLYGON]: { isActiveSrc: true, isActiveDest: false },
+            },
+          },
         },
         bridgeSliceOverrides: { toChainId: CHAIN_IDS.LINEA_MAINNET },
       });
@@ -188,12 +205,17 @@ describe('Bridge selectors', () => {
     it('excludes selected providerConfig and disabled chains from options', () => {
       const state = createBridgeMockStore({
         featureFlagOverrides: {
-          destNetworkAllowlist: [
-            CHAIN_IDS.ARBITRUM,
-            CHAIN_IDS.LINEA_MAINNET,
-            CHAIN_IDS.OPTIMISM,
-            CHAIN_IDS.POLYGON,
-          ],
+          extensionConfig: {
+            chains: {
+              [CHAIN_IDS.ARBITRUM]: { isActiveSrc: false, isActiveDest: true },
+              [CHAIN_IDS.LINEA_MAINNET]: {
+                isActiveSrc: false,
+                isActiveDest: true,
+              },
+              [CHAIN_IDS.OPTIMISM]: { isActiveSrc: false, isActiveDest: true },
+              [CHAIN_IDS.POLYGON]: { isActiveSrc: false, isActiveDest: true },
+            },
+          },
         },
         metamaskStateOverrides: {
           ...mockNetworkState(...FEATURED_RPCS),
@@ -225,9 +247,13 @@ describe('Bridge selectors', () => {
     it('returns false if bridge is not enabled', () => {
       const state = createBridgeMockStore({
         featureFlagOverrides: {
-          extensionSupport: false,
-          srcNetworkAllowlist: ['0x1'],
-          destNetworkAllowlist: ['0x38'],
+          extensionConfig: {
+            support: false,
+            chains: {
+              '0x1': { isActiveSrc: true, isActiveDest: false },
+              '0x38': { isActiveSrc: false, isActiveDest: true },
+            },
+          },
         },
         bridgeSliceOverrides: { toChainId: '0x38' },
         metamaskStateOverrides: {
@@ -243,9 +269,12 @@ describe('Bridge selectors', () => {
     it('returns false if toChainId is null', () => {
       const state = createBridgeMockStore({
         featureFlagOverrides: {
-          extensionSupport: true,
-          srcNetworkAllowlist: ['0x1'],
-          destNetworkAllowlist: ['0x1'],
+          extensionConfig: {
+            support: true,
+            chains: {
+              '0x1': { isActiveSrc: true, isActiveDest: true },
+            },
+          },
         },
         bridgeSliceOverrides: { toChainId: null },
         metamaskStateOverrides: {
@@ -261,9 +290,12 @@ describe('Bridge selectors', () => {
     it('returns false if fromChain and toChainId have the same chainId', () => {
       const state = createBridgeMockStore({
         featureFlagOverrides: {
-          extensionSupport: true,
-          srcNetworkAllowlist: ['0x1'],
-          destNetworkAllowlist: ['0x1'],
+          extensionConfig: {
+            support: true,
+            chains: {
+              '0x1': { isActiveSrc: true, isActiveDest: true },
+            },
+          },
         },
         bridgeSliceOverrides: { toChainId: '0x1' },
         metamaskStateOverrides: {
@@ -279,9 +311,13 @@ describe('Bridge selectors', () => {
     it('returns false if useExternalServices is not enabled', () => {
       const state = createBridgeMockStore({
         featureFlagOverrides: {
-          extensionSupport: true,
-          srcNetworkAllowlist: ['0x1'],
-          destNetworkAllowlist: ['0x38'],
+          extensionConfig: {
+            support: true,
+            chains: {
+              '0x1': { isActiveSrc: true, isActiveDest: false },
+              '0x38': { isActiveSrc: false, isActiveDest: true },
+            },
+          },
         },
         bridgeSliceOverrides: { toChainId: '0x38' },
         metamaskStateOverrides: {
@@ -297,9 +333,13 @@ describe('Bridge selectors', () => {
     it('returns true if bridge is enabled and fromChain and toChainId have different chainIds', () => {
       const state = createBridgeMockStore({
         featureFlagOverrides: {
-          extensionSupport: true,
-          srcNetworkAllowlist: ['0x1'],
-          destNetworkAllowlist: ['0x38'],
+          extensionConfig: {
+            support: true,
+            chains: {
+              '0x1': { isActiveSrc: true, isActiveDest: false },
+              '0x38': { isActiveSrc: false, isActiveDest: true },
+            },
+          },
         },
         bridgeSliceOverrides: { toChainId: '0x38' },
         metamaskStateOverrides: {
diff --git a/ui/ducks/bridge/selectors.ts b/ui/ducks/bridge/selectors.ts
index b78a0d09de51..4ad4308535a0 100644
--- a/ui/ducks/bridge/selectors.ts
+++ b/ui/ducks/bridge/selectors.ts
@@ -79,10 +79,11 @@ export const getFromChains = createDeepEqualSelector(
   getAllBridgeableNetworks,
   (state: BridgeAppState) => state.metamask.bridgeState?.bridgeFeatureFlags,
   (allBridgeableNetworks, bridgeFeatureFlags) =>
-    allBridgeableNetworks.filter(({ chainId }) =>
-      bridgeFeatureFlags[BridgeFeatureFlagsKey.NETWORK_SRC_ALLOWLIST].includes(
-        chainId,
-      ),
+    allBridgeableNetworks.filter(
+      ({ chainId }) =>
+        bridgeFeatureFlags[BridgeFeatureFlagsKey.EXTENSION_CONFIG].chains[
+          chainId
+        ]?.isActiveSrc,
     ),
 );
 
@@ -111,9 +112,9 @@ export const getToChains = createDeepEqualSelector(
       ({ chainId }) =>
         fromChain?.chainId &&
         chainId !== fromChain.chainId &&
-        bridgeFeatureFlags[
-          BridgeFeatureFlagsKey.NETWORK_DEST_ALLOWLIST
-        ].includes(chainId),
+        bridgeFeatureFlags[BridgeFeatureFlagsKey.EXTENSION_CONFIG].chains[
+          chainId
+        ]?.isActiveDest,
     ),
 );
 
diff --git a/ui/hooks/bridge/useBridging.test.ts b/ui/hooks/bridge/useBridging.test.ts
index 9fe02c439048..291401270a3e 100644
--- a/ui/hooks/bridge/useBridging.test.ts
+++ b/ui/hooks/bridge/useBridging.test.ts
@@ -42,11 +42,11 @@ describe('useBridging', () => {
     });
   });
 
-  describe('extensionSupport=false, chainId=1', () => {
+  describe('extensionConfig.support=false, chainId=1', () => {
     beforeEach(() => {
       nock(BRIDGE_API_BASE_URL)
         .get('/getAllFeatureFlags')
-        .reply(200, { 'extension-support': false });
+        .reply(200, { 'extension-config': { support: false } });
       jest.clearAllMocks();
     });
     // @ts-expect-error This is missing from the Mocha type definitions
@@ -91,7 +91,9 @@ describe('useBridging', () => {
             metaMetricsId: MOCK_METAMETRICS_ID,
             bridgeState: {
               bridgeFeatureFlags: {
-                extensionSupport: false,
+                extensionConfig: {
+                  support: false,
+                },
               },
             },
             internalAccounts: {
@@ -113,11 +115,11 @@ describe('useBridging', () => {
     );
   });
 
-  describe('extensionSupport=true, chain=1', () => {
+  describe('extensionConfig.support=true, chain=1', () => {
     beforeEach(() => {
       nock(BRIDGE_API_BASE_URL)
         .get('/getAllFeatureFlags')
-        .reply(200, { 'extension-support': true });
+        .reply(200, { 'extension-config': { support: true } });
       jest.clearAllMocks();
     });
     // @ts-expect-error This is missing from the Mocha type definitions
@@ -161,8 +163,11 @@ describe('useBridging', () => {
             ...mockNetworkState({ chainId: CHAIN_IDS.MAINNET }),
             metaMetricsId: MOCK_METAMETRICS_ID,
             bridgeState: {
+              isBridgeEnabled: true,
               bridgeFeatureFlags: {
-                extensionSupport: true,
+                extensionConfig: {
+                  support: true,
+                },
               },
             },
             internalAccounts: {
diff --git a/ui/pages/bridge/bridge.util.test.ts b/ui/pages/bridge/bridge.util.test.ts
index 30514dbf7f96..a22cc39876b4 100644
--- a/ui/pages/bridge/bridge.util.test.ts
+++ b/ui/pages/bridge/bridge.util.test.ts
@@ -22,10 +22,34 @@ describe('Bridge utils', () => {
         'extension-config': {
           refreshRate: 3,
           maxRefreshCount: 1,
+          support: true,
+          chains: {
+            '1': {
+              isActiveSrc: true,
+              isActiveDest: true,
+            },
+            '10': {
+              isActiveSrc: true,
+              isActiveDest: false,
+            },
+            '59144': {
+              isActiveSrc: true,
+              isActiveDest: true,
+            },
+            '120': {
+              isActiveSrc: true,
+              isActiveDest: false,
+            },
+            '137': {
+              isActiveSrc: false,
+              isActiveDest: true,
+            },
+            '11111': {
+              isActiveSrc: false,
+              isActiveDest: true,
+            },
+          },
         },
-        'extension-support': true,
-        'src-network-allowlist': [1, 10, 59144, 120],
-        'dest-network-allowlist': [1, 137, 59144, 11111],
       };
 
       (fetchWithCache as jest.Mock).mockResolvedValue(mockResponse);
@@ -46,29 +70,54 @@ describe('Bridge utils', () => {
         extensionConfig: {
           maxRefreshCount: 1,
           refreshRate: 3,
+          support: true,
+          chains: {
+            [CHAIN_IDS.MAINNET]: {
+              isActiveSrc: true,
+              isActiveDest: true,
+            },
+            [CHAIN_IDS.OPTIMISM]: {
+              isActiveSrc: true,
+              isActiveDest: false,
+            },
+            [CHAIN_IDS.LINEA_MAINNET]: {
+              isActiveSrc: true,
+              isActiveDest: true,
+            },
+            '0x78': {
+              isActiveSrc: true,
+              isActiveDest: false,
+            },
+            [CHAIN_IDS.POLYGON]: {
+              isActiveSrc: false,
+              isActiveDest: true,
+            },
+            '0x2b67': {
+              isActiveSrc: false,
+              isActiveDest: true,
+            },
+          },
         },
-        extensionSupport: true,
-        srcNetworkAllowlist: [
-          CHAIN_IDS.MAINNET,
-          CHAIN_IDS.OPTIMISM,
-          CHAIN_IDS.LINEA_MAINNET,
-          '0x78',
-        ],
-        destNetworkAllowlist: [
-          CHAIN_IDS.MAINNET,
-          CHAIN_IDS.POLYGON,
-          CHAIN_IDS.LINEA_MAINNET,
-          '0x2b67',
-        ],
       });
     });
 
     it('should use fallback bridge feature flags if response is unexpected', async () => {
       const mockResponse = {
-        'extension-support': 25,
-        'src-network-allowlist': ['a', 'b', 1],
-        a: 'b',
-        'dest-network-allowlist': [1, 137, 59144, 11111],
+        'extension-config': {
+          refreshRate: 3,
+          maxRefreshCount: 1,
+          support: 25,
+          chains: {
+            a: {
+              isActiveSrc: 1,
+              isActiveDest: 'test',
+            },
+            '2': {
+              isActiveSrc: 'test',
+              isActiveDest: 2,
+            },
+          },
+        },
       };
 
       (fetchWithCache as jest.Mock).mockResolvedValue(mockResponse);
@@ -89,10 +138,9 @@ describe('Bridge utils', () => {
         extensionConfig: {
           maxRefreshCount: 5,
           refreshRate: 30000,
+          support: false,
+          chains: {},
         },
-        extensionSupport: false,
-        srcNetworkAllowlist: [],
-        destNetworkAllowlist: [],
       });
     });
 
diff --git a/ui/pages/bridge/bridge.util.ts b/ui/pages/bridge/bridge.util.ts
index 577b1827b160..13db68ba2ca4 100644
--- a/ui/pages/bridge/bridge.util.ts
+++ b/ui/pages/bridge/bridge.util.ts
@@ -72,16 +72,18 @@ export async function fetchBridgeFeatureFlags(): Promise<BridgeFeatureFlags> {
     )
   ) {
     return {
-      [BridgeFeatureFlagsKey.EXTENSION_CONFIG]:
-        rawFeatureFlags[BridgeFlag.EXTENSION_CONFIG],
-      [BridgeFeatureFlagsKey.EXTENSION_SUPPORT]:
-        rawFeatureFlags[BridgeFlag.EXTENSION_SUPPORT],
-      [BridgeFeatureFlagsKey.NETWORK_SRC_ALLOWLIST]: rawFeatureFlags[
-        BridgeFlag.NETWORK_SRC_ALLOWLIST
-      ].map((chainIdDec) => add0x(decimalToHex(chainIdDec))),
-      [BridgeFeatureFlagsKey.NETWORK_DEST_ALLOWLIST]: rawFeatureFlags[
-        BridgeFlag.NETWORK_DEST_ALLOWLIST
-      ].map((chainIdDec) => add0x(decimalToHex(chainIdDec))),
+      [BridgeFeatureFlagsKey.EXTENSION_CONFIG]: {
+        ...rawFeatureFlags[BridgeFlag.EXTENSION_CONFIG],
+        chains: Object.entries(
+          rawFeatureFlags[BridgeFlag.EXTENSION_CONFIG].chains,
+        ).reduce(
+          (acc, [chainId, value]) => ({
+            ...acc,
+            [add0x(decimalToHex(chainId))]: value,
+          }),
+          {},
+        ),
+      },
     };
   }
 
@@ -89,13 +91,9 @@ export async function fetchBridgeFeatureFlags(): Promise<BridgeFeatureFlags> {
     [BridgeFeatureFlagsKey.EXTENSION_CONFIG]: {
       refreshRate: REFRESH_INTERVAL_MS,
       maxRefreshCount: 5,
+      support: false,
+      chains: {},
     },
-    // TODO set default to true once bridging is live
-    [BridgeFeatureFlagsKey.EXTENSION_SUPPORT]: false,
-    // TODO set default to ALLOWED_BRIDGE_CHAIN_IDS once bridging is live
-    [BridgeFeatureFlagsKey.NETWORK_SRC_ALLOWLIST]: [],
-    // TODO set default to ALLOWED_BRIDGE_CHAIN_IDS once bridging is live
-    [BridgeFeatureFlagsKey.NETWORK_DEST_ALLOWLIST]: [],
   };
 }
 
diff --git a/ui/pages/bridge/index.test.tsx b/ui/pages/bridge/index.test.tsx
index 2b0275962afe..81d6b6e2ba45 100644
--- a/ui/pages/bridge/index.test.tsx
+++ b/ui/pages/bridge/index.test.tsx
@@ -64,7 +64,9 @@ describe('Bridge', () => {
 
   it('renders the component with initial props', async () => {
     const swapsMockStore = createBridgeMockStore({
-      featureFlagOverrides: { extensionSupport: true },
+      featureFlagOverrides: {
+        extensionConfig: { support: true },
+      },
     });
     const store = configureMockStore(middleware)(swapsMockStore);
 
diff --git a/ui/pages/bridge/prepare/bridge-cta-button.test.tsx b/ui/pages/bridge/prepare/bridge-cta-button.test.tsx
index e20a7e661796..c4ff26f6c743 100644
--- a/ui/pages/bridge/prepare/bridge-cta-button.test.tsx
+++ b/ui/pages/bridge/prepare/bridge-cta-button.test.tsx
@@ -13,8 +13,12 @@ describe('BridgeCTAButton', () => {
   it("should render the component's initial state", () => {
     const mockStore = createBridgeMockStore({
       featureFlagOverrides: {
-        srcNetworkAllowlist: [CHAIN_IDS.MAINNET, CHAIN_IDS.OPTIMISM],
-        destNetworkAllowlist: [CHAIN_IDS.OPTIMISM],
+        extensionConfig: {
+          chains: {
+            [CHAIN_IDS.MAINNET]: { isActiveSrc: true, isActiveDest: false },
+            [CHAIN_IDS.OPTIMISM]: { isActiveSrc: true, isActiveDest: true },
+          },
+        },
       },
       bridgeSliceOverrides: { fromTokenInputValue: 1 },
     });
@@ -32,8 +36,16 @@ describe('BridgeCTAButton', () => {
   it('should render the component when amount is missing', () => {
     const mockStore = createBridgeMockStore({
       featureFlagOverrides: {
-        srcNetworkAllowlist: [CHAIN_IDS.MAINNET, CHAIN_IDS.OPTIMISM],
-        destNetworkAllowlist: [CHAIN_IDS.LINEA_MAINNET],
+        extensionConfig: {
+          chains: {
+            [CHAIN_IDS.MAINNET]: { isActiveSrc: true, isActiveDest: false },
+            [CHAIN_IDS.OPTIMISM]: { isActiveSrc: true, isActiveDest: false },
+            [CHAIN_IDS.LINEA_MAINNET]: {
+              isActiveSrc: false,
+              isActiveDest: true,
+            },
+          },
+        },
       },
       bridgeSliceOverrides: {
         fromTokenInputValue: null,
@@ -54,8 +66,16 @@ describe('BridgeCTAButton', () => {
   it('should render the component when amount and dest token is missing', () => {
     const mockStore = createBridgeMockStore({
       featureFlagOverrides: {
-        srcNetworkAllowlist: [CHAIN_IDS.MAINNET, CHAIN_IDS.OPTIMISM],
-        destNetworkAllowlist: [CHAIN_IDS.LINEA_MAINNET],
+        extensionConfig: {
+          chains: {
+            [CHAIN_IDS.MAINNET]: { isActiveSrc: true, isActiveDest: false },
+            [CHAIN_IDS.OPTIMISM]: { isActiveSrc: true, isActiveDest: false },
+            [CHAIN_IDS.LINEA_MAINNET]: {
+              isActiveSrc: false,
+              isActiveDest: true,
+            },
+          },
+        },
       },
       bridgeSliceOverrides: {
         fromTokenInputValue: null,
@@ -76,8 +96,16 @@ describe('BridgeCTAButton', () => {
   it('should render the component when tx is submittable', () => {
     const mockStore = createBridgeMockStore({
       featureFlagOverrides: {
-        srcNetworkAllowlist: [CHAIN_IDS.MAINNET, CHAIN_IDS.OPTIMISM],
-        destNetworkAllowlist: [CHAIN_IDS.LINEA_MAINNET],
+        extensionConfig: {
+          chains: {
+            [CHAIN_IDS.MAINNET]: { isActiveSrc: true, isActiveDest: false },
+            [CHAIN_IDS.OPTIMISM]: { isActiveSrc: true, isActiveDest: false },
+            [CHAIN_IDS.LINEA_MAINNET]: {
+              isActiveSrc: false,
+              isActiveDest: true,
+            },
+          },
+        },
       },
       bridgeSliceOverrides: {
         fromTokenInputValue: 1,
@@ -103,8 +131,22 @@ describe('BridgeCTAButton', () => {
   it('should disable the component when quotes are loading and there are no existing quotes', () => {
     const mockStore = createBridgeMockStore({
       featureFlagOverrides: {
-        srcNetworkAllowlist: [CHAIN_IDS.MAINNET, CHAIN_IDS.OPTIMISM],
-        destNetworkAllowlist: [CHAIN_IDS.LINEA_MAINNET],
+        extensionConfig: {
+          chains: {
+            [CHAIN_IDS.MAINNET]: {
+              isActiveSrc: true,
+              isActiveDest: false,
+            },
+            [CHAIN_IDS.OPTIMISM]: {
+              isActiveSrc: true,
+              isActiveDest: false,
+            },
+            [CHAIN_IDS.LINEA_MAINNET]: {
+              isActiveSrc: false,
+              isActiveDest: true,
+            },
+          },
+        },
       },
       bridgeSliceOverrides: {
         fromTokenInputValue: 1,
@@ -130,8 +172,22 @@ describe('BridgeCTAButton', () => {
   it('should enable the component when quotes are loading and there are existing quotes', () => {
     const mockStore = createBridgeMockStore({
       featureFlagOverrides: {
-        srcNetworkAllowlist: [CHAIN_IDS.MAINNET, CHAIN_IDS.OPTIMISM],
-        destNetworkAllowlist: [CHAIN_IDS.LINEA_MAINNET],
+        extensionConfig: {
+          chains: {
+            [CHAIN_IDS.MAINNET]: {
+              isActiveSrc: true,
+              isActiveDest: false,
+            },
+            [CHAIN_IDS.OPTIMISM]: {
+              isActiveSrc: true,
+              isActiveDest: false,
+            },
+            [CHAIN_IDS.LINEA_MAINNET]: {
+              isActiveSrc: false,
+              isActiveDest: true,
+            },
+          },
+        },
       },
       bridgeSliceOverrides: {
         fromTokenInputValue: 1,
diff --git a/ui/pages/bridge/prepare/prepare-bridge-page.test.tsx b/ui/pages/bridge/prepare/prepare-bridge-page.test.tsx
index 28a754ac85b5..520b9d4f3328 100644
--- a/ui/pages/bridge/prepare/prepare-bridge-page.test.tsx
+++ b/ui/pages/bridge/prepare/prepare-bridge-page.test.tsx
@@ -29,8 +29,18 @@ describe('PrepareBridgePage', () => {
       .mockReturnValue([{ get: () => null }] as never);
     const mockStore = createBridgeMockStore({
       featureFlagOverrides: {
-        srcNetworkAllowlist: [CHAIN_IDS.MAINNET, CHAIN_IDS.OPTIMISM],
-        destNetworkAllowlist: [CHAIN_IDS.OPTIMISM],
+        extensionConfig: {
+          chains: {
+            [CHAIN_IDS.MAINNET]: {
+              isActiveSrc: true,
+              isActiveDest: false,
+            },
+            [CHAIN_IDS.OPTIMISM]: {
+              isActiveSrc: true,
+              isActiveDest: true,
+            },
+          },
+        },
       },
     });
     const { container, getByRole, getByTestId } = renderWithProvider(
@@ -62,8 +72,19 @@ describe('PrepareBridgePage', () => {
       .mockReturnValue([{ get: () => '0x3103910' }, jest.fn()] as never);
     const mockStore = createBridgeMockStore({
       featureFlagOverrides: {
-        srcNetworkAllowlist: [CHAIN_IDS.MAINNET, CHAIN_IDS.LINEA_MAINNET],
-        destNetworkAllowlist: [CHAIN_IDS.LINEA_MAINNET],
+        extensionConfig: {
+          support: true,
+          chains: {
+            [CHAIN_IDS.MAINNET]: {
+              isActiveSrc: true,
+              isActiveDest: false,
+            },
+            [CHAIN_IDS.LINEA_MAINNET]: {
+              isActiveSrc: true,
+              isActiveDest: true,
+            },
+          },
+        },
         destTokens: {
           '0x1f9840a85d5af5bf1d1762f925bdaddc4201f984': {
             iconUrl: 'http://url',
@@ -123,8 +144,18 @@ describe('PrepareBridgePage', () => {
   it('should throw an error if token decimals are not defined', async () => {
     const mockStore = createBridgeMockStore({
       featureFlagOverrides: {
-        srcNetworkAllowlist: [CHAIN_IDS.MAINNET, CHAIN_IDS.LINEA_MAINNET],
-        destNetworkAllowlist: [CHAIN_IDS.LINEA_MAINNET],
+        extensionConfig: {
+          chains: {
+            [CHAIN_IDS.MAINNET]: {
+              isActiveSrc: true,
+              isActiveDest: false,
+            },
+            [CHAIN_IDS.LINEA_MAINNET]: {
+              isActiveSrc: true,
+              isActiveDest: true,
+            },
+          },
+        },
       },
       bridgeSliceOverrides: {
         fromTokenInputValue: 1,
diff --git a/ui/pages/bridge/quotes/bridge-quote-card.test.tsx b/ui/pages/bridge/quotes/bridge-quote-card.test.tsx
index 60285fbce9ba..59db6fa4cc63 100644
--- a/ui/pages/bridge/quotes/bridge-quote-card.test.tsx
+++ b/ui/pages/bridge/quotes/bridge-quote-card.test.tsx
@@ -18,9 +18,14 @@ describe('BridgeQuoteCard', () => {
   it('should render the recommended quote', async () => {
     const mockStore = createBridgeMockStore({
       featureFlagOverrides: {
-        srcNetworkAllowlist: [CHAIN_IDS.MAINNET, CHAIN_IDS.OPTIMISM],
-        destNetworkAllowlist: [CHAIN_IDS.OPTIMISM],
-        extensionConfig: { maxRefreshCount: 5, refreshRate: 30000 },
+        extensionConfig: {
+          maxRefreshCount: 5,
+          refreshRate: 30000,
+          chains: {
+            [CHAIN_IDS.MAINNET]: { isActiveSrc: true, isActiveDest: false },
+            [CHAIN_IDS.OPTIMISM]: { isActiveSrc: true, isActiveDest: true },
+          },
+        },
       },
       bridgeSliceOverrides: { fromTokenInputValue: 1 },
       bridgeStateOverrides: {
@@ -42,8 +47,12 @@ describe('BridgeQuoteCard', () => {
   it('should render the recommended quote while loading new quotes', async () => {
     const mockStore = createBridgeMockStore({
       featureFlagOverrides: {
-        srcNetworkAllowlist: [CHAIN_IDS.MAINNET, CHAIN_IDS.OPTIMISM],
-        destNetworkAllowlist: [CHAIN_IDS.OPTIMISM],
+        extensionConfig: {
+          chains: {
+            [CHAIN_IDS.MAINNET]: { isActiveSrc: true, isActiveDest: false },
+            [CHAIN_IDS.OPTIMISM]: { isActiveSrc: true, isActiveDest: true },
+          },
+        },
       },
       bridgeSliceOverrides: { fromTokenInputValue: 1 },
       bridgeStateOverrides: {
@@ -64,8 +73,12 @@ describe('BridgeQuoteCard', () => {
   it('should not render when there is no quote', async () => {
     const mockStore = createBridgeMockStore({
       featureFlagOverrides: {
-        srcNetworkAllowlist: [CHAIN_IDS.MAINNET, CHAIN_IDS.OPTIMISM],
-        destNetworkAllowlist: [CHAIN_IDS.OPTIMISM],
+        extensionConfig: {
+          chains: {
+            [CHAIN_IDS.MAINNET]: { isActiveSrc: true, isActiveDest: false },
+            [CHAIN_IDS.OPTIMISM]: { isActiveSrc: true, isActiveDest: true },
+          },
+        },
       },
       bridgeSliceOverrides: { fromTokenInputValue: 1 },
       bridgeStateOverrides: {
@@ -85,8 +98,12 @@ describe('BridgeQuoteCard', () => {
   it('should not render when there is a quote fetch error', async () => {
     const mockStore = createBridgeMockStore({
       featureFlagOverrides: {
-        srcNetworkAllowlist: [CHAIN_IDS.MAINNET, CHAIN_IDS.OPTIMISM],
-        destNetworkAllowlist: [CHAIN_IDS.OPTIMISM],
+        extensionConfig: {
+          chains: {
+            [CHAIN_IDS.MAINNET]: { isActiveSrc: true, isActiveDest: false },
+            [CHAIN_IDS.OPTIMISM]: { isActiveSrc: true, isActiveDest: true },
+          },
+        },
       },
       bridgeSliceOverrides: { fromTokenInputValue: 1 },
       bridgeStateOverrides: {
diff --git a/ui/pages/bridge/types.ts b/ui/pages/bridge/types.ts
index 61143bb9de68..fac5948a2201 100644
--- a/ui/pages/bridge/types.ts
+++ b/ui/pages/bridge/types.ts
@@ -1,4 +1,5 @@
 import { BigNumber } from 'bignumber.js';
+import { ChainConfiguration } from '../../../shared/types/bridge';
 
 export type L1GasFees = {
   l1GasFeesInHexWei?: string; // l1 fees for approval and trade in hex wei, appended by controller
@@ -25,9 +26,6 @@ export enum SortOrder {
 // Types copied from Metabridge API
 export enum BridgeFlag {
   EXTENSION_CONFIG = 'extension-config',
-  EXTENSION_SUPPORT = 'extension-support',
-  NETWORK_SRC_ALLOWLIST = 'src-network-allowlist',
-  NETWORK_DEST_ALLOWLIST = 'dest-network-allowlist',
 }
 
 type DecimalChainId = string;
@@ -37,10 +35,9 @@ export type FeatureFlagResponse = {
   [BridgeFlag.EXTENSION_CONFIG]: {
     refreshRate: number;
     maxRefreshCount: number;
+    support: boolean;
+    chains: Record<number, ChainConfiguration>;
   };
-  [BridgeFlag.EXTENSION_SUPPORT]: boolean;
-  [BridgeFlag.NETWORK_SRC_ALLOWLIST]: number[];
-  [BridgeFlag.NETWORK_DEST_ALLOWLIST]: number[];
 };
 
 export type BridgeAsset = {
diff --git a/ui/pages/bridge/utils/validators.ts b/ui/pages/bridge/utils/validators.ts
index 01c716522968..a07eae493c79 100644
--- a/ui/pages/bridge/utils/validators.ts
+++ b/ui/pages/bridge/utils/validators.ts
@@ -39,20 +39,17 @@ export const FEATURE_FLAG_VALIDATORS = [
       'refreshRate' in v &&
       isValidNumber(v.refreshRate) &&
       'maxRefreshCount' in v &&
-      isValidNumber(v.maxRefreshCount),
-  },
-  { property: BridgeFlag.EXTENSION_SUPPORT, type: 'boolean' },
-  {
-    property: BridgeFlag.NETWORK_SRC_ALLOWLIST,
-    type: 'object',
-    validator: (v: unknown): v is number[] =>
-      isValidObject(v) && Object.values(v).every(isValidNumber),
-  },
-  {
-    property: BridgeFlag.NETWORK_DEST_ALLOWLIST,
-    type: 'object',
-    validator: (v: unknown): v is number[] =>
-      isValidObject(v) && Object.values(v).every(isValidNumber),
+      isValidNumber(v.maxRefreshCount) &&
+      'chains' in v &&
+      isValidObject(v.chains) &&
+      Object.values(v.chains).every((chain) => isValidObject(chain)) &&
+      Object.values(v.chains).every(
+        (chain) =>
+          'isActiveSrc' in chain &&
+          'isActiveDest' in chain &&
+          typeof chain.isActiveSrc === 'boolean' &&
+          typeof chain.isActiveDest === 'boolean',
+      ),
   },
 ];
 
diff --git a/ui/selectors/selectors.js b/ui/selectors/selectors.js
index 4d14fe94cef5..a2d6605819df 100644
--- a/ui/selectors/selectors.js
+++ b/ui/selectors/selectors.js
@@ -1541,7 +1541,8 @@ export const getIsBridgeEnabled = createSelector(
   (bridgeFeatureFlags, shouldUseExternalServices) => {
     return (
       (shouldUseExternalServices &&
-        bridgeFeatureFlags?.[BridgeFeatureFlagsKey.EXTENSION_SUPPORT]) ??
+        bridgeFeatureFlags?.[BridgeFeatureFlagsKey.EXTENSION_CONFIG]
+          ?.support) ??
       false
     );
   },

From 12aea26a728a55ded3479c2c1cc23a338981d07b Mon Sep 17 00:00:00 2001
From: infiniteflower <139582705+infiniteflower@users.noreply.github.com>
Date: Tue, 10 Dec 2024 15:29:48 -0500
Subject: [PATCH 073/175] fix: incorrect cross chain swaps activity item values
 (#28899)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<!--
Please submit this PR as a draft initially.
Do not mark it as "Ready for review" until the template has been
completely filled out, and PR status checks have passed at least once.
-->

## **Description**

<!--
Write a short description of the changes included in this pull request,
also include relevant motivation and context. Have in mind the following
questions:
1. What is the reason for the change?
2. What is the improvement/solution?
-->

This PR fixes the Bridge activity list item not showing the proper token
symbol, token amount, and display currency amount.

[![Open in GitHub
Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/28899?quickstart=1)

## **Related issues**

## **Manual testing steps**

1. Do a Bridge
2. Go to tx history
3. Observe proper values

## **Screenshots/Recordings**

<!-- If applicable, add screenshots and/or recordings to visualize the
before and after of your change. -->

### **Before**

<!-- [screenshots/recordings] -->

![Screenshot 2024-12-03 at 3 44
55 PM](https://github.com/user-attachments/assets/f43e96f4-be08-48ec-b39f-6ecb9c283863)


### **After**

<!-- [screenshots/recordings] -->

![Screenshot 2024-12-03 at 3 43
38 PM](https://github.com/user-attachments/assets/51057305-7c8b-4337-9003-02c94a740705)


## **Pre-merge author checklist**

- [x] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension Coding
Standards](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/CODING_GUIDELINES.md).
- [x] I've completed the PR template to the best of my ability
- [ ] I’ve included tests if applicable
- [x] I’ve documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [x] I’ve applied the right labels on the PR (see [labeling
guidelines](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.

## **Pre-merge reviewer checklist**

- [ ] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed).
- [ ] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.
---
 shared/types/bridge-status.ts                 |  2 +-
 ui/hooks/bridge/useBridgeTxHistoryData.ts     | 18 +++++----
 ui/hooks/useTransactionDisplayData.js         | 10 +++--
 .../bridge/hooks/useBridgeTokenDisplayData.ts | 39 +++++++++++++++++++
 .../bridge-activity-item-tx-segments.tsx      |  4 +-
 ui/pages/bridge/types.ts                      |  4 +-
 6 files changed, 62 insertions(+), 15 deletions(-)
 create mode 100644 ui/pages/bridge/hooks/useBridgeTokenDisplayData.ts

diff --git a/shared/types/bridge-status.ts b/shared/types/bridge-status.ts
index 568b0fe420c5..0003705ba41f 100644
--- a/shared/types/bridge-status.ts
+++ b/shared/types/bridge-status.ts
@@ -124,7 +124,7 @@ export type BridgeHistoryItem = {
   slippagePercentage: number;
   completionTime?: number;
   pricingData?: {
-    amountSent: string; // This is from QuoteMetadata.sentAmount.amount, accounts for the MM fees
+    amountSent: string; // This is from QuoteMetadata.sentAmount.amount, the actual amount sent by user in non-atomic decimal form
 
     quotedGasInUsd?: string;
     quotedReturnInUsd?: string;
diff --git a/ui/hooks/bridge/useBridgeTxHistoryData.ts b/ui/hooks/bridge/useBridgeTxHistoryData.ts
index 6de4f7ef75b5..dc6db53896ae 100644
--- a/ui/hooks/bridge/useBridgeTxHistoryData.ts
+++ b/ui/hooks/bridge/useBridgeTxHistoryData.ts
@@ -14,15 +14,17 @@ export const FINAL_NON_CONFIRMED_STATUSES = [
   TransactionStatus.rejected,
 ];
 
+export type TransactionGroup = {
+  hasCancelled: boolean;
+  hasRetried: boolean;
+  initialTransaction: TransactionMeta;
+  nonce: Hex;
+  primaryTransaction: TransactionMeta;
+  transactions: TransactionMeta[];
+};
+
 export type UseBridgeTxHistoryDataProps = {
-  transactionGroup: {
-    hasCancelled: boolean;
-    hasRetried: boolean;
-    initialTransaction: TransactionMeta;
-    nonce: Hex;
-    primaryTransaction: TransactionMeta;
-    transactions: TransactionMeta[];
-  };
+  transactionGroup: TransactionGroup;
 };
 
 export function useBridgeTxHistoryData({
diff --git a/ui/hooks/useTransactionDisplayData.js b/ui/hooks/useTransactionDisplayData.js
index 66b9102d5c29..e29b52edad88 100644
--- a/ui/hooks/useTransactionDisplayData.js
+++ b/ui/hooks/useTransactionDisplayData.js
@@ -36,6 +36,7 @@ import { captureSingleException } from '../store/actions';
 import { isEqualCaseInsensitive } from '../../shared/modules/string-utils';
 import { getTokenValueParam } from '../../shared/lib/metamask-controller-utils';
 import { selectBridgeHistoryForAccount } from '../ducks/bridge-status/selectors';
+import { useBridgeTokenDisplayData } from '../pages/bridge/hooks/useBridgeTokenDisplayData';
 import { useI18nContext } from './useI18nContext';
 import { useTokenFiatAmount } from './useTokenFiatAmount';
 import { useUserPreferencedCurrency } from './useUserPreferencedCurrency';
@@ -257,6 +258,8 @@ export function useTransactionDisplayData(transactionGroup) {
     isViewingReceivedTokenFromSwap,
   } = useSwappedTokenValue(transactionGroup, currentAsset);
 
+  const bridgeTokenDisplayData = useBridgeTokenDisplayData(transactionGroup);
+
   if (signatureTypes.includes(type)) {
     category = TransactionGroupCategory.signatureRequest;
     title = t('signatureRequest');
@@ -382,9 +385,10 @@ export function useTransactionDisplayData(transactionGroup) {
     primarySuffix = primaryTransaction.sourceTokenSymbol;
   } else if (type === TransactionType.bridge) {
     title = t('bridgeToChain', [destChainName || '']);
-    category = TransactionGroupCategory.bridge;
-    // TODO add primaryDisplayValue,primarySuffix
-    // also secondaryDisplayValue, secondarySuffix
+    category = bridgeTokenDisplayData.category;
+    primarySuffix = bridgeTokenDisplayData.sourceTokenSymbol;
+    primaryDisplayValue = bridgeTokenDisplayData.sourceTokenAmountSent;
+    secondaryDisplayValue = bridgeTokenDisplayData.displayCurrencyAmount;
   } else {
     dispatch(
       captureSingleException(
diff --git a/ui/pages/bridge/hooks/useBridgeTokenDisplayData.ts b/ui/pages/bridge/hooks/useBridgeTokenDisplayData.ts
new file mode 100644
index 000000000000..0c8bf2dc40bb
--- /dev/null
+++ b/ui/pages/bridge/hooks/useBridgeTokenDisplayData.ts
@@ -0,0 +1,39 @@
+import { useSelector } from 'react-redux';
+import { TransactionGroup } from '../../../hooks/bridge/useBridgeTxHistoryData';
+import { getCurrentChainId } from '../../../../shared/modules/selectors/networks';
+import { useTokenFiatAmount } from '../../../hooks/useTokenFiatAmount';
+import { TransactionGroupCategory } from '../../../../shared/constants/transaction';
+import { selectBridgeHistoryForAccount } from '../../../ducks/bridge-status/selectors';
+import { BridgeHistoryItem } from '../../../../shared/types/bridge-status';
+
+/**
+ * A Bridge transaction group's primaryTransaction contains details of the swap,
+ * including the source (from) and destination (to) token type (ETH, DAI, etc..)
+ *
+ * @param transactionGroup - A Bridge transaction group
+ */
+export function useBridgeTokenDisplayData(transactionGroup: TransactionGroup) {
+  const { primaryTransaction } = transactionGroup;
+  const chainId = useSelector(getCurrentChainId);
+  const bridgeHistory = useSelector(selectBridgeHistoryForAccount);
+
+  const bridgeHistoryItem: BridgeHistoryItem | undefined =
+    bridgeHistory[primaryTransaction.id];
+
+  // Display currency can be fiat or a token
+  const displayCurrencyAmount = useTokenFiatAmount(
+    primaryTransaction.sourceTokenAddress,
+    bridgeHistoryItem?.pricingData?.amountSent,
+    primaryTransaction.sourceTokenSymbol,
+    {},
+    true,
+    chainId,
+  );
+
+  return {
+    category: TransactionGroupCategory.bridge,
+    displayCurrencyAmount,
+    sourceTokenSymbol: primaryTransaction.sourceTokenSymbol,
+    sourceTokenAmountSent: bridgeHistoryItem?.pricingData?.amountSent,
+  };
+}
diff --git a/ui/pages/bridge/transaction-details/bridge-activity-item-tx-segments.tsx b/ui/pages/bridge/transaction-details/bridge-activity-item-tx-segments.tsx
index a757eddffb79..fc5cc1f8d71d 100644
--- a/ui/pages/bridge/transaction-details/bridge-activity-item-tx-segments.tsx
+++ b/ui/pages/bridge/transaction-details/bridge-activity-item-tx-segments.tsx
@@ -14,7 +14,7 @@ import {
   FlexDirection,
   TextColor,
 } from '../../../helpers/constants/design-system';
-import { UseBridgeTxHistoryDataProps } from '../../../hooks/bridge/useBridgeTxHistoryData';
+import { TransactionGroup } from '../../../hooks/bridge/useBridgeTxHistoryData';
 import Segment from './segment';
 
 const getTxIndex = (srcTxStatus: StatusTypes) => {
@@ -64,7 +64,7 @@ export default function BridgeActivityItemTxSegments({
   transactionGroup,
 }: {
   bridgeTxHistoryItem?: BridgeHistoryItem;
-  transactionGroup: UseBridgeTxHistoryDataProps['transactionGroup'];
+  transactionGroup: TransactionGroup;
 }) {
   const { initialTransaction } = transactionGroup;
   const srcTxStatus = getSrcTxStatus(initialTransaction);
diff --git a/ui/pages/bridge/types.ts b/ui/pages/bridge/types.ts
index fac5948a2201..d7aab880ec76 100644
--- a/ui/pages/bridge/types.ts
+++ b/ui/pages/bridge/types.ts
@@ -56,7 +56,7 @@ export type QuoteRequest = {
   destChainId: ChainId;
   srcTokenAddress: string;
   destTokenAddress: string;
-  srcTokenAmount: string;
+  srcTokenAmount: string; // This is the amount sent
   slippage: number;
   aggIds?: string[];
   bridgeIds?: string[];
@@ -94,6 +94,8 @@ export type Quote = {
   requestId: string;
   srcChainId: ChainId;
   srcAsset: BridgeAsset;
+  // This is amount sent - metabridge fee, however, some tokens have a fee of 0
+  // So sometimes it's equal to amount sent
   srcTokenAmount: string;
   destChainId: ChainId;
   destAsset: BridgeAsset;

From 5789e1ceebdb59a2fd02feb3e3dee035988ba2f2 Mon Sep 17 00:00:00 2001
From: Salim TOUBAL <salim.toubal@outlook.com>
Date: Tue, 10 Dec 2024 22:44:43 +0100
Subject: [PATCH 074/175] fix: fix sticky autodetection banner (#29061)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<!--
Please submit this PR as a draft initially.
Do not mark it as "Ready for review" until the template has been
completely filled out, and PR status checks have passed at least once.
-->

## **Description**

fix sticky autodetection banner
<!--
Write a short description of the changes included in this pull request,
also include relevant motivation and context. Have in mind the following
questions:
1. What is the reason for the change?
2. What is the improvement/solution?
-->

[![Open in GitHub
Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/29061?quickstart=1)

## **Related issues**

Fixes: #29059

## **Manual testing steps**

1. Go to autodetected banner
2. click on ignore all
3. you should have allNetworks selected

## **Screenshots/Recordings**

<!-- If applicable, add screenshots and/or recordings to visualize the
before and after of your change. -->

### **Before**

<!-- [screenshots/recordings] -->

### **After**






https://drive.google.com/file/d/11zcmgV1Bdq5wx9MkDlhxr8oDBr9DGB3d/view?usp=sharing




<!-- [screenshots/recordings] -->

## **Pre-merge author checklist**

- [ ] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension Coding
Standards](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/CODING_GUIDELINES.md).
- [ ] I've completed the PR template to the best of my ability
- [ ] I’ve included tests if applicable
- [ ] I’ve documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [ ] I’ve applied the right labels on the PR (see [labeling
guidelines](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.

## **Pre-merge reviewer checklist**

- [ ] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed).
- [ ] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.

---------

Co-authored-by: Brian Bergeron <brian.e.bergeron@gmail.com>
---
 ...tected-token-ignored-popover.test.tsx.snap | 153 ++++++++++++++++++
 .../detected-token-ignored-popover.js         |   1 +
 .../detected-token-ignored-popover.test.tsx   |  37 +++++
 .../app/detected-token/detected-token.js      |  12 +-
 4 files changed, 198 insertions(+), 5 deletions(-)
 create mode 100644 ui/components/app/detected-token/detected-token-ignored-popover/__snapshots__/detected-token-ignored-popover.test.tsx.snap
 create mode 100644 ui/components/app/detected-token/detected-token-ignored-popover/detected-token-ignored-popover.test.tsx

diff --git a/ui/components/app/detected-token/detected-token-ignored-popover/__snapshots__/detected-token-ignored-popover.test.tsx.snap b/ui/components/app/detected-token/detected-token-ignored-popover/__snapshots__/detected-token-ignored-popover.test.tsx.snap
new file mode 100644
index 000000000000..3839c8d23201
--- /dev/null
+++ b/ui/components/app/detected-token/detected-token-ignored-popover/__snapshots__/detected-token-ignored-popover.test.tsx.snap
@@ -0,0 +1,153 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`DetectedTokenIgnoredPopover should match snapshot for ignore mode 1`] = `
+<body>
+  <div
+    id="popover-content"
+  />
+  <div />
+  <div
+    class="mm-modal detected-token-ignored-popover detected-token-ignored-popover--ignore"
+  >
+    <div
+      aria-hidden="true"
+      class="mm-box mm-modal-overlay mm-box--width-full mm-box--height-full mm-box--background-color-overlay-default"
+    />
+    <div
+      data-focus-guard="true"
+      style="width: 1px; height: 0px; padding: 0px; overflow: hidden; position: fixed; top: 1px; left: 1px;"
+      tabindex="0"
+    />
+    <div
+      data-focus-lock-disabled="false"
+    >
+      <div
+        class="mm-box mm-modal-content mm-box--padding-top-4 mm-box--sm:padding-top-8 mm-box--md:padding-top-12 mm-box--padding-right-4 mm-box--padding-bottom-4 mm-box--sm:padding-bottom-8 mm-box--md:padding-bottom-12 mm-box--padding-left-4 mm-box--display-flex mm-box--justify-content-center mm-box--align-items-flex-start mm-box--width-screen mm-box--height-screen"
+      >
+        <section
+          aria-modal="true"
+          class="mm-box mm-modal-content__dialog mm-modal-content__dialog--size-sm mm-box--padding-4 mm-box--width-full mm-box--background-color-background-default mm-box--rounded-lg"
+          role="dialog"
+          style="overflow-y: auto;"
+        >
+          <div
+            class="mm-box mm-header-base mm-modal-header mm-box--margin-bottom-4 mm-box--display-flex mm-box--justify-content-space-between"
+          >
+            <div
+              class="mm-box"
+            >
+              <header
+                class="mm-box mm-text mm-text--heading-sm mm-text--text-align-center mm-box--color-text-default"
+              >
+                [areYouSure]
+              </header>
+            </div>
+          </div>
+          <p
+            class="mm-box mm-text mm-text--body-md mm-box--margin-bottom-4 mm-box--color-text-default"
+          >
+            [ignoreTokenWarning]
+          </p>
+          <div
+            class="mm-box mm-box--display-flex mm-box--gap-4 mm-box--justify-content-center"
+          >
+            <button
+              class="mm-box mm-text mm-button-base mm-button-base--size-lg mm-button-base--block detected-token-ignored-popover__ignore-button mm-button-secondary mm-text--body-md-medium mm-box--padding-0 mm-box--padding-right-4 mm-box--padding-left-4 mm-box--display-inline-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-primary-default mm-box--background-color-transparent mm-box--rounded-pill mm-box--border-color-primary-default box--border-style-solid box--border-width-1"
+            >
+              [cancel]
+            </button>
+            <button
+              class="mm-box mm-text mm-button-base mm-button-base--size-lg mm-button-base--block detected-token-ignored-popover__import-button mm-button-primary mm-text--body-md-medium mm-box--padding-0 mm-box--padding-right-4 mm-box--padding-left-4 mm-box--display-inline-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-primary-inverse mm-box--background-color-primary-default mm-box--rounded-pill"
+              data-testid="detected-token-ignored-popover-confirm-button"
+              data-theme="light"
+            >
+              [confirm]
+            </button>
+          </div>
+        </section>
+      </div>
+    </div>
+    <div
+      data-focus-guard="true"
+      style="width: 1px; height: 0px; padding: 0px; overflow: hidden; position: fixed; top: 1px; left: 1px;"
+      tabindex="0"
+    />
+  </div>
+</body>
+`;
+
+exports[`DetectedTokenIgnoredPopover should match snapshot for import mode 1`] = `
+<body>
+  <div
+    id="popover-content"
+  />
+  <div />
+  <div
+    class="mm-modal detected-token-ignored-popover detected-token-ignored-popover--import"
+  >
+    <div
+      aria-hidden="true"
+      class="mm-box mm-modal-overlay mm-box--width-full mm-box--height-full mm-box--background-color-overlay-default"
+    />
+    <div
+      data-focus-guard="true"
+      style="width: 1px; height: 0px; padding: 0px; overflow: hidden; position: fixed; top: 1px; left: 1px;"
+      tabindex="0"
+    />
+    <div
+      data-focus-lock-disabled="false"
+    >
+      <div
+        class="mm-box mm-modal-content mm-box--padding-top-4 mm-box--sm:padding-top-8 mm-box--md:padding-top-12 mm-box--padding-right-4 mm-box--padding-bottom-4 mm-box--sm:padding-bottom-8 mm-box--md:padding-bottom-12 mm-box--padding-left-4 mm-box--display-flex mm-box--justify-content-center mm-box--align-items-flex-start mm-box--width-screen mm-box--height-screen"
+      >
+        <section
+          aria-modal="true"
+          class="mm-box mm-modal-content__dialog mm-modal-content__dialog--size-sm mm-box--padding-4 mm-box--width-full mm-box--background-color-background-default mm-box--rounded-lg"
+          role="dialog"
+          style="overflow-y: auto;"
+        >
+          <div
+            class="mm-box mm-header-base mm-modal-header mm-box--margin-bottom-4 mm-box--display-flex mm-box--justify-content-space-between"
+          >
+            <div
+              class="mm-box"
+            >
+              <header
+                class="mm-box mm-text mm-text--heading-sm mm-text--text-align-center mm-box--color-text-default"
+              >
+                [importSelectedTokens]
+              </header>
+            </div>
+          </div>
+          <p
+            class="mm-box mm-text mm-text--body-md mm-box--margin-bottom-4 mm-box--color-text-default"
+          >
+            [importSelectedTokensDescription]
+          </p>
+          <div
+            class="mm-box mm-box--display-flex mm-box--gap-4 mm-box--justify-content-center"
+          >
+            <button
+              class="mm-box mm-text mm-button-base mm-button-base--size-lg mm-button-base--block detected-token-ignored-popover__ignore-button mm-button-secondary mm-text--body-md-medium mm-box--padding-0 mm-box--padding-right-4 mm-box--padding-left-4 mm-box--display-inline-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-primary-default mm-box--background-color-transparent mm-box--rounded-pill mm-box--border-color-primary-default box--border-style-solid box--border-width-1"
+            >
+              [cancel]
+            </button>
+            <button
+              class="mm-box mm-text mm-button-base mm-button-base--size-lg mm-button-base--block detected-token-ignored-popover__import-button mm-button-primary mm-text--body-md-medium mm-box--padding-0 mm-box--padding-right-4 mm-box--padding-left-4 mm-box--display-inline-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-primary-inverse mm-box--background-color-primary-default mm-box--rounded-pill"
+              data-testid="detected-token-ignored-popover-confirm-button"
+              data-theme="light"
+            >
+              [confirm]
+            </button>
+          </div>
+        </section>
+      </div>
+    </div>
+    <div
+      data-focus-guard="true"
+      style="width: 1px; height: 0px; padding: 0px; overflow: hidden; position: fixed; top: 1px; left: 1px;"
+      tabindex="0"
+    />
+  </div>
+</body>
+`;
diff --git a/ui/components/app/detected-token/detected-token-ignored-popover/detected-token-ignored-popover.js b/ui/components/app/detected-token/detected-token-ignored-popover/detected-token-ignored-popover.js
index fa449ee96a98..8f809607802a 100644
--- a/ui/components/app/detected-token/detected-token-ignored-popover/detected-token-ignored-popover.js
+++ b/ui/components/app/detected-token/detected-token-ignored-popover/detected-token-ignored-popover.js
@@ -69,6 +69,7 @@ const DetectedTokenIgnoredPopover = ({
             variant={BUTTON_VARIANT.PRIMARY}
             onClick={handleClearTokensSelection}
             size={BUTTON_SIZES.LG}
+            data-testid="detected-token-ignored-popover-confirm-button"
           >
             {t('confirm')}
           </Button>
diff --git a/ui/components/app/detected-token/detected-token-ignored-popover/detected-token-ignored-popover.test.tsx b/ui/components/app/detected-token/detected-token-ignored-popover/detected-token-ignored-popover.test.tsx
new file mode 100644
index 000000000000..17792ef49bb6
--- /dev/null
+++ b/ui/components/app/detected-token/detected-token-ignored-popover/detected-token-ignored-popover.test.tsx
@@ -0,0 +1,37 @@
+import React from 'react';
+import { render, screen, fireEvent } from '@testing-library/react';
+import DetectedTokenIgnoredPopover from './detected-token-ignored-popover';
+
+describe('DetectedTokenIgnoredPopover', () => {
+  const defaultProps = {
+    partiallyIgnoreDetectedTokens: false,
+    onCancelIgnore: jest.fn(),
+    handleClearTokensSelection: jest.fn(),
+    isOpen: true,
+  };
+
+  const renderComponent = (props = {}) =>
+    render(<DetectedTokenIgnoredPopover {...defaultProps} {...props} />);
+
+  it('should match snapshot for ignore mode', () => {
+    const { baseElement } = renderComponent();
+    expect(baseElement).toMatchSnapshot();
+  });
+
+  it('should match snapshot for import mode', () => {
+    const { baseElement } = renderComponent({
+      partiallyIgnoreDetectedTokens: true,
+    });
+    expect(baseElement).toMatchSnapshot();
+  });
+
+  it('should call handleClearTokensSelection when the confirm button is clicked', () => {
+    renderComponent();
+    const confirmButton = screen.getByTestId(
+      'detected-token-ignored-popover-confirm-button',
+    );
+    fireEvent.click(confirmButton);
+    expect(defaultProps.handleClearTokensSelection).toHaveBeenCalled();
+    expect(defaultProps.handleClearTokensSelection).not.toThrow();
+  });
+});
diff --git a/ui/components/app/detected-token/detected-token.js b/ui/components/app/detected-token/detected-token.js
index 12957e1aca31..e1480760def5 100644
--- a/ui/components/app/detected-token/detected-token.js
+++ b/ui/components/app/detected-token/detected-token.js
@@ -210,14 +210,16 @@ const DetectedToken = ({ setShowDetectedTokens }) => {
 
       const promises = Object.entries(groupedByChainId).map(
         async ([chainId, tokens]) => {
-          const chainConfig = allNetworks[chainId];
-          const { defaultRpcEndpointIndex } = chainConfig;
-          const { networkClientId: networkInstanceId } =
-            chainConfig.rpcEndpoints[defaultRpcEndpointIndex];
+          const { defaultRpcEndpointIndex, rpcEndpoints } =
+            allNetworks[chainId];
+          const networkInstanceId =
+            rpcEndpoints[defaultRpcEndpointIndex].networkClientId;
+
+          const tokensToIgnore = tokens.map((token) => token.address);
 
           await dispatch(
             ignoreTokens({
-              tokensToIgnore: tokens,
+              tokensToIgnore,
               dontShowLoadingIndicator: true,
               networkClientId: networkInstanceId,
             }),

From 653177ac7a2838ee6458333715eeac5bad348dcf Mon Sep 17 00:00:00 2001
From: micaelae <100321200+micaelae@users.noreply.github.com>
Date: Tue, 10 Dec 2024 13:47:07 -0800
Subject: [PATCH 075/175] chore: emit cross-chain swaps metrics + validation
 error logic (#28713)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<!--
Please submit this PR as a draft initially.
Do not mark it as "Ready for review" until the template has been
completely filled out, and PR status checks have passed at least once.
-->

## **Description**
Changes include
- Input/quote validation logic for `isInsufficientBalance`,
`isInsufficientGasBalance` and `isEstimatedReturnLow`(no ui yet but
these get included in metrics)
- Type-safe event emitter for cross-chain swaps
- Refactored token exchange rate fetching process so that values can be
reused for metrics without additional network calls
- Adding new events described in
https://docs.google.com/document/d/1hAoqEzlSnPDMfmiYBf8FNykYZ_LLbmZjKyTtjPmeEbs/edit?tab=t.0
- Note that these events that haven't been added bc they depend on tx
status changes
  - ActionFailed
  - ActionCompleted


<!--
Write a short description of the changes included in this pull request,
also include relevant motivation and context. Have in mind the following
questions:
1. What is the reason for the change?
2. What is the improvement/solution?
-->

[![Open in GitHub
Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/28713?quickstart=1)

## **Related issues**

Depends on [this segment-schema
PR](https://github.com/Consensys/segment-schema/pull/226)

Fixes: https://consensyssoftware.atlassian.net/browse/MMS-1453

## **Manual testing steps**

1. Open background inspector and filter requests including "batch"
2. Perform an e2e transaction
3. Verify that expected events are published

## **Screenshots/Recordings**

<!-- If applicable, add screenshots and/or recordings to visualize the
before and after of your change. -->

### **Before**

<!-- [screenshots/recordings] -->

### **After**
N/A
<!-- [screenshots/recordings] -->

## **Pre-merge author checklist**

- [X] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension Coding
Standards](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/CODING_GUIDELINES.md).
- [X] I've completed the PR template to the best of my ability
- [X] I’ve included tests if applicable
- [X] I’ve documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [X] I’ve applied the right labels on the PR (see [labeling
guidelines](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.

## **Pre-merge reviewer checklist**

- [ ] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed).
- [ ] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.
---
 app/scripts/constants/sentry-state.ts         |   2 +
 .../bridge/bridge-controller.test.ts          |  12 +-
 .../controllers/bridge/bridge-controller.ts   |  51 +-
 app/scripts/controllers/bridge/constants.ts   |  10 +-
 app/scripts/controllers/bridge/types.ts       |   2 +
 shared/constants/bridge.ts                    |   1 +
 shared/constants/metametrics.ts               |  15 +-
 test/e2e/tests/metrics/errors.spec.js         |   2 +
 test/jest/mock-store.js                       |   2 +-
 ui/ducks/bridge/bridge.test.ts                |   8 +-
 ui/ducks/bridge/bridge.ts                     |  10 +-
 ui/ducks/bridge/selectors.test.ts             | 566 ++++++++++++++++--
 ui/ducks/bridge/selectors.ts                  | 217 ++++++-
 ui/ducks/bridge/utils.ts                      |  81 ++-
 ui/helpers/constants/routes.ts                |   1 +
 ui/hooks/bridge/events/types.ts               |  47 ++
 .../bridge/events/useConvertedUsdAmounts.ts   |  75 +++
 ui/hooks/bridge/events/useQuoteProperties.ts  |  25 +
 .../events/useRequestMetadataProperties.ts    |  38 ++
 .../bridge/events/useRequestProperties.ts     |  54 ++
 ui/hooks/bridge/events/useTradeProperties.ts  |  24 +
 ui/hooks/bridge/useBridgeExchangeRates.ts     |  84 +++
 ui/hooks/bridge/useBridging.ts                |  17 +
 .../bridge/useCrossChainSwapsEventTracker.ts  | 113 ++++
 ui/hooks/bridge/useIsTxSubmittable.ts         |  49 ++
 ui/hooks/bridge/useLatestBalance.ts           |   5 +
 ui/hooks/bridge/useQuoteFetchEvents.ts        | 151 +++++
 .../hooks/useSubmitBridgeTransaction.ts       |   1 +
 ui/pages/bridge/index.tsx                     |  22 +-
 .../prepare-bridge-page.test.tsx.snap         |   8 +-
 ui/pages/bridge/prepare/bridge-cta-button.tsx |  52 +-
 .../bridge/prepare/bridge-input-group.tsx     |  20 +-
 .../prepare/prepare-bridge-page.test.tsx      |   7 +-
 .../bridge/prepare/prepare-bridge-page.tsx    |  83 +--
 ui/pages/bridge/quotes/bridge-quote-card.tsx  |  31 +-
 .../bridge/quotes/bridge-quotes-modal.tsx     |  67 ++-
 ui/pages/bridge/types.ts                      |  18 +-
 ui/pages/bridge/utils/quote.test.ts           |  91 ++-
 ui/pages/bridge/utils/quote.ts                |  40 +-
 ui/selectors/selectors.js                     |  14 +
 40 files changed, 1880 insertions(+), 236 deletions(-)
 create mode 100644 ui/hooks/bridge/events/types.ts
 create mode 100644 ui/hooks/bridge/events/useConvertedUsdAmounts.ts
 create mode 100644 ui/hooks/bridge/events/useQuoteProperties.ts
 create mode 100644 ui/hooks/bridge/events/useRequestMetadataProperties.ts
 create mode 100644 ui/hooks/bridge/events/useRequestProperties.ts
 create mode 100644 ui/hooks/bridge/events/useTradeProperties.ts
 create mode 100644 ui/hooks/bridge/useBridgeExchangeRates.ts
 create mode 100644 ui/hooks/bridge/useCrossChainSwapsEventTracker.ts
 create mode 100644 ui/hooks/bridge/useIsTxSubmittable.ts
 create mode 100644 ui/hooks/bridge/useQuoteFetchEvents.ts

diff --git a/app/scripts/constants/sentry-state.ts b/app/scripts/constants/sentry-state.ts
index 8a01e9a0f9f9..52fae4d7909a 100644
--- a/app/scripts/constants/sentry-state.ts
+++ b/app/scripts/constants/sentry-state.ts
@@ -116,8 +116,10 @@ export const SENTRY_BACKGROUND_STATE = {
         srcTokenAmount: true,
       },
       quotes: [],
+      quotesInitialLoadTime: true,
       quotesLastFetched: true,
       quotesLoadingStatus: true,
+      quoteFetchError: true,
       quotesRefreshCount: true,
     },
   },
diff --git a/app/scripts/controllers/bridge/bridge-controller.test.ts b/app/scripts/controllers/bridge/bridge-controller.test.ts
index d83844e62cb0..9ffb95832350 100644
--- a/app/scripts/controllers/bridge/bridge-controller.test.ts
+++ b/app/scripts/controllers/bridge/bridge-controller.test.ts
@@ -413,6 +413,7 @@ describe('BridgeController', function () {
           ...mockBridgeQuotesNativeErc20Eth,
         ],
         quotesLoadingStatus: 1,
+        quoteFetchError: undefined,
         quotesRefreshCount: 2,
       }),
     );
@@ -433,12 +434,14 @@ describe('BridgeController', function () {
           ...mockBridgeQuotesNativeErc20Eth,
         ],
         quotesLoadingStatus: 2,
+        quoteFetchError: 'Network error',
         quotesRefreshCount: 3,
       }),
     );
-    expect(bridgeController.state.bridgeState.quotesLastFetched).toStrictEqual(
-      secondFetchTime,
-    );
+    secondFetchTime &&
+      expect(
+        bridgeController.state.bridgeState.quotesLastFetched,
+      ).toBeGreaterThan(secondFetchTime);
 
     expect(hasSufficientBalanceSpy).toHaveBeenCalledTimes(1);
     expect(getLayer1GasFeeMock).not.toHaveBeenCalled();
@@ -507,6 +510,7 @@ describe('BridgeController', function () {
         quoteRequest: { ...quoteRequest, walletAddress: undefined },
         quotes: DEFAULT_BRIDGE_CONTROLLER_STATE.quotes,
         quotesLastFetched: DEFAULT_BRIDGE_CONTROLLER_STATE.quotesLastFetched,
+        quotesInitialLoadTime: undefined,
         quotesLoadingStatus:
           DEFAULT_BRIDGE_CONTROLLER_STATE.quotesLoadingStatus,
       }),
@@ -544,6 +548,7 @@ describe('BridgeController', function () {
         quotes: mockBridgeQuotesNativeErc20Eth,
         quotesLoadingStatus: 1,
         quotesRefreshCount: 1,
+        quotesInitialLoadTime: 11000,
       }),
     );
     const firstFetchTime =
@@ -560,6 +565,7 @@ describe('BridgeController', function () {
         quotes: mockBridgeQuotesNativeErc20Eth,
         quotesLoadingStatus: 1,
         quotesRefreshCount: 1,
+        quotesInitialLoadTime: 11000,
       }),
     );
     const secondFetchTime =
diff --git a/app/scripts/controllers/bridge/bridge-controller.ts b/app/scripts/controllers/bridge/bridge-controller.ts
index 319c5406c259..031725530f52 100644
--- a/app/scripts/controllers/bridge/bridge-controller.ts
+++ b/app/scripts/controllers/bridge/bridge-controller.ts
@@ -70,6 +70,8 @@ export default class BridgeController extends StaticIntervalPollingController<Br
 > {
   #abortController: AbortController | undefined;
 
+  #quotesFirstFetched: number | undefined;
+
   #getLayer1GasFee: (params: {
     transactionParams: TransactionParams;
     chainId: ChainId;
@@ -150,11 +152,15 @@ export default class BridgeController extends StaticIntervalPollingController<Br
         quotesLastFetched: DEFAULT_BRIDGE_CONTROLLER_STATE.quotesLastFetched,
         quotesLoadingStatus:
           DEFAULT_BRIDGE_CONTROLLER_STATE.quotesLoadingStatus,
+        quoteFetchError: DEFAULT_BRIDGE_CONTROLLER_STATE.quoteFetchError,
         quotesRefreshCount: DEFAULT_BRIDGE_CONTROLLER_STATE.quotesRefreshCount,
+        quotesInitialLoadTime:
+          DEFAULT_BRIDGE_CONTROLLER_STATE.quotesInitialLoadTime,
       };
     });
 
     if (isValidQuoteRequest(updatedQuoteRequest)) {
+      this.#quotesFirstFetched = Date.now();
       const walletAddress = this.#getSelectedAccount().address;
       const srcChainIdInHex = add0x(
         decimalToHex(updatedQuoteRequest.srcChainId),
@@ -242,11 +248,9 @@ export default class BridgeController extends StaticIntervalPollingController<Br
         ...bridgeState,
         quotesLoadingStatus: RequestStatus.LOADING,
         quoteRequest: updatedQuoteRequest,
+        quoteFetchError: DEFAULT_BRIDGE_CONTROLLER_STATE.quoteFetchError,
       };
     });
-    const { maxRefreshCount } =
-      bridgeState.bridgeFeatureFlags[BridgeFeatureFlagsKey.EXTENSION_CONFIG];
-    const newQuotesRefreshCount = bridgeState.quotesRefreshCount + 1;
 
     try {
       const quotes = await fetchBridgeQuotes(
@@ -254,24 +258,13 @@ export default class BridgeController extends StaticIntervalPollingController<Br
         this.#abortController.signal,
       );
 
-      // Stop polling if the maximum number of refreshes has been reached
-      if (
-        (updatedQuoteRequest.insufficientBal && newQuotesRefreshCount >= 1) ||
-        (!updatedQuoteRequest.insufficientBal &&
-          newQuotesRefreshCount >= maxRefreshCount)
-      ) {
-        this.stopAllPolling();
-      }
-
       const quotesWithL1GasFees = await this.#appendL1GasFees(quotes);
 
       this.update((_state) => {
         _state.bridgeState = {
           ..._state.bridgeState,
           quotes: quotesWithL1GasFees,
-          quotesLastFetched: Date.now(),
           quotesLoadingStatus: RequestStatus.FETCHED,
-          quotesRefreshCount: newQuotesRefreshCount,
         };
       });
     } catch (error) {
@@ -284,11 +277,39 @@ export default class BridgeController extends StaticIntervalPollingController<Br
       this.update((_state) => {
         _state.bridgeState = {
           ...bridgeState,
+          quoteFetchError:
+            error instanceof Error ? error.message : 'Unknown error',
           quotesLoadingStatus: RequestStatus.ERROR,
-          quotesRefreshCount: newQuotesRefreshCount,
         };
       });
       console.log('Failed to fetch bridge quotes', error);
+    } finally {
+      const { maxRefreshCount } =
+        bridgeState.bridgeFeatureFlags[BridgeFeatureFlagsKey.EXTENSION_CONFIG];
+
+      const updatedQuotesRefreshCount = bridgeState.quotesRefreshCount + 1;
+      // Stop polling if the maximum number of refreshes has been reached
+      if (
+        updatedQuoteRequest.insufficientBal ||
+        (!updatedQuoteRequest.insufficientBal &&
+          updatedQuotesRefreshCount >= maxRefreshCount)
+      ) {
+        this.stopAllPolling();
+      }
+
+      // Update quote fetching stats
+      const quotesLastFetched = Date.now();
+      this.update((_state) => {
+        _state.bridgeState = {
+          ..._state.bridgeState,
+          quotesInitialLoadTime:
+            updatedQuotesRefreshCount === 1 && this.#quotesFirstFetched
+              ? quotesLastFetched - this.#quotesFirstFetched
+              : bridgeState.quotesInitialLoadTime,
+          quotesLastFetched,
+          quotesRefreshCount: updatedQuotesRefreshCount,
+        };
+      });
     }
   };
 
diff --git a/app/scripts/controllers/bridge/constants.ts b/app/scripts/controllers/bridge/constants.ts
index 3ad807436062..2d507418b5d9 100644
--- a/app/scripts/controllers/bridge/constants.ts
+++ b/app/scripts/controllers/bridge/constants.ts
@@ -1,13 +1,15 @@
 import { zeroAddress } from 'ethereumjs-util';
 import { Hex } from '@metamask/utils';
-import { METABRIDGE_ETHEREUM_ADDRESS } from '../../../../shared/constants/bridge';
+import {
+  BRIDGE_DEFAULT_SLIPPAGE,
+  METABRIDGE_ETHEREUM_ADDRESS,
+} from '../../../../shared/constants/bridge';
 import { CHAIN_IDS } from '../../../../shared/constants/network';
 import { BridgeControllerState, BridgeFeatureFlagsKey } from './types';
 
 export const BRIDGE_CONTROLLER_NAME = 'BridgeController';
 export const REFRESH_INTERVAL_MS = 30 * 1000;
 const DEFAULT_MAX_REFRESH_COUNT = 5;
-const DEFAULT_SLIPPAGE = 0.5;
 
 export enum RequestStatus {
   LOADING,
@@ -31,11 +33,13 @@ export const DEFAULT_BRIDGE_CONTROLLER_STATE: BridgeControllerState = {
   quoteRequest: {
     walletAddress: undefined,
     srcTokenAddress: zeroAddress(),
-    slippage: DEFAULT_SLIPPAGE,
+    slippage: BRIDGE_DEFAULT_SLIPPAGE,
   },
+  quotesInitialLoadTime: undefined,
   quotes: [],
   quotesLastFetched: undefined,
   quotesLoadingStatus: undefined,
+  quoteFetchError: undefined,
   quotesRefreshCount: 0,
 };
 
diff --git a/app/scripts/controllers/bridge/types.ts b/app/scripts/controllers/bridge/types.ts
index c9d59a8470f4..6a28eb9d6ffd 100644
--- a/app/scripts/controllers/bridge/types.ts
+++ b/app/scripts/controllers/bridge/types.ts
@@ -41,8 +41,10 @@ export type BridgeControllerState = {
   destTopAssets: { address: string }[];
   quoteRequest: Partial<QuoteRequest>;
   quotes: (QuoteResponse & L1GasFees)[];
+  quotesInitialLoadTime?: number;
   quotesLastFetched?: number;
   quotesLoadingStatus?: RequestStatus;
+  quoteFetchError?: string;
   quotesRefreshCount: number;
 };
 
diff --git a/shared/constants/bridge.ts b/shared/constants/bridge.ts
index 8ad27dce4944..eb2ceb065590 100644
--- a/shared/constants/bridge.ts
+++ b/shared/constants/bridge.ts
@@ -30,3 +30,4 @@ export const BRIDGE_QUOTE_MAX_ETA_SECONDS = 60 * 60; // 1 hour
 export const BRIDGE_QUOTE_MAX_RETURN_DIFFERENCE_PERCENTAGE = 0.8; // if a quote returns in x times less return than the best quote, ignore it
 
 export const BRIDGE_PREFERRED_GAS_ESTIMATE = 'medium';
+export const BRIDGE_DEFAULT_SLIPPAGE = 0.5;
diff --git a/shared/constants/metametrics.ts b/shared/constants/metametrics.ts
index c87af10544c3..d46bad603a83 100644
--- a/shared/constants/metametrics.ts
+++ b/shared/constants/metametrics.ts
@@ -861,7 +861,6 @@ export enum MetaMetricsEventName {
   NotificationsActivated = 'Notifications Activated',
   PushNotificationReceived = 'Push Notification Received',
   PushNotificationClicked = 'Push Notification Clicked',
-
   // Send
   sendAssetSelected = 'Send Asset Selected',
   sendFlowExited = 'Send Flow Exited',
@@ -870,6 +869,19 @@ export enum MetaMetricsEventName {
   sendSwapQuoteRequested = 'Send Swap Quote Requested',
   sendSwapQuoteReceived = 'Send Swap Quote Received',
   sendTokenModalOpened = 'Send Token Modal Opened',
+  // Cross Chain Swaps
+  ActionCompleted = 'Action Completed',
+  ActionFailed = 'Action Failed',
+  ActionOpened = 'Action Opened',
+  ActionSubmitted = 'Action Submitted',
+  AllQuotesOpened = 'All Quotes Opened',
+  AllQuotesSorted = 'All Quotes Sorted',
+  InputChanged = 'Input Changed',
+  InputSourceDestinationFlipped = 'Source and Destination Flipped',
+  CrossChainSwapsQuoteError = 'Cross-chain Quote Error',
+  QuoteSelected = 'Quote Selected',
+  CrossChainSwapsQuotesReceived = 'Cross-chain Quotes Received',
+  CrossChainSwapsQuotesRequested = 'Cross-chain Quotes Requested',
 }
 
 export enum MetaMetricsEventAccountType {
@@ -931,6 +943,7 @@ export enum MetaMetricsEventCategory {
   ///: BEGIN:ONLY_INCLUDE_IF(build-mmi)
   MMI = 'Institutional',
   ///: END:ONLY_INCLUDE_IF
+  CrossChainSwaps = 'Cross Chain Swaps',
 }
 
 export enum MetaMetricsEventLinkType {
diff --git a/test/e2e/tests/metrics/errors.spec.js b/test/e2e/tests/metrics/errors.spec.js
index b35a38d83206..7ddbe6c1117a 100644
--- a/test/e2e/tests/metrics/errors.spec.js
+++ b/test/e2e/tests/metrics/errors.spec.js
@@ -877,6 +877,8 @@ describe('Sentry errors', function () {
         quotesLastFetched: true,
         quotesLoadingStatus: true,
         quotesRefreshCount: true,
+        quoteFetchError: true,
+        quotesInitialLoadTime: true,
       },
       currentPopupId: false, // Initialized as undefined
       // Part of transaction controller store, but missing from the initial
diff --git a/test/jest/mock-store.js b/test/jest/mock-store.js
index e315fe10c9a5..f937dcac0cf5 100644
--- a/test/jest/mock-store.js
+++ b/test/jest/mock-store.js
@@ -722,7 +722,7 @@ export const createBridgeMockStore = (
     ...swapsStore,
     bridge: {
       toChainId: null,
-      sortOrder: 0,
+      sortOrder: 'cost_ascending',
       ...bridgeSliceOverrides,
     },
     metamask: {
diff --git a/ui/ducks/bridge/bridge.test.ts b/ui/ducks/bridge/bridge.test.ts
index f4638c992906..7b00c95d09a4 100644
--- a/ui/ducks/bridge/bridge.test.ts
+++ b/ui/ducks/bridge/bridge.test.ts
@@ -150,7 +150,7 @@ describe('Ducks - Bridge', () => {
         fromToken: null,
         toToken: null,
         fromTokenInputValue: null,
-        sortOrder: 0,
+        sortOrder: 'cost_ascending',
         toTokenExchangeRate: null,
         fromTokenExchangeRate: null,
       });
@@ -213,7 +213,7 @@ describe('Ducks - Bridge', () => {
         fromTokenExchangeRate: null,
         fromTokenInputValue: null,
         selectedQuote: null,
-        sortOrder: 0,
+        sortOrder: 'cost_ascending',
         toChainId: null,
         toToken: null,
         toTokenExchangeRate: null,
@@ -260,7 +260,7 @@ describe('Ducks - Bridge', () => {
       expect(newState).toStrictEqual({
         toChainId: null,
         toTokenExchangeRate: 0.356628,
-        sortOrder: 0,
+        sortOrder: 'cost_ascending',
       });
     });
 
@@ -305,7 +305,7 @@ describe('Ducks - Bridge', () => {
       expect(newState).toStrictEqual({
         toChainId: null,
         toTokenExchangeRate: 0.999881,
-        sortOrder: 0,
+        sortOrder: 'cost_ascending',
       });
     });
   });
diff --git a/ui/ducks/bridge/bridge.ts b/ui/ducks/bridge/bridge.ts
index edb0c9ca0d13..7abdb8c751e8 100644
--- a/ui/ducks/bridge/bridge.ts
+++ b/ui/ducks/bridge/bridge.ts
@@ -15,8 +15,8 @@ export type BridgeState = {
   fromToken: SwapsTokenObject | SwapsEthToken | null;
   toToken: SwapsTokenObject | SwapsEthToken | null;
   fromTokenInputValue: string | null;
-  fromTokenExchangeRate: number | null;
-  toTokenExchangeRate: number | null;
+  fromTokenExchangeRate: number | null; // Exchange rate from selected token to the default currency (can be fiat or crypto)
+  toTokenExchangeRate: number | null; // Exchange rate from the selected token to the default currency (can be fiat or crypto)
   sortOrder: SortOrder;
   selectedQuote: (QuoteResponse & QuoteMetadata) | null; // Alternate quote selected by user. When quotes refresh, the best match will be activated.
 };
@@ -70,6 +70,12 @@ const bridgeSlice = createSlice({
     },
   },
   extraReducers: (builder) => {
+    builder.addCase(setDestTokenExchangeRates.pending, (state) => {
+      state.toTokenExchangeRate = null;
+    });
+    builder.addCase(setSrcTokenExchangeRates.pending, (state) => {
+      state.fromTokenExchangeRate = null;
+    });
     builder.addCase(setDestTokenExchangeRates.fulfilled, (state, action) => {
       state.toTokenExchangeRate = action.payload ?? null;
     });
diff --git a/ui/ducks/bridge/selectors.test.ts b/ui/ducks/bridge/selectors.test.ts
index 50f81fb1fb94..344fab115311 100644
--- a/ui/ducks/bridge/selectors.test.ts
+++ b/ui/ducks/bridge/selectors.test.ts
@@ -1,4 +1,5 @@
 import { BigNumber } from 'bignumber.js';
+import { zeroAddress } from 'ethereumjs-util';
 import { createBridgeMockStore } from '../../../test/jest/mock-store';
 import {
   BUILT_IN_NETWORKS,
@@ -28,6 +29,7 @@ import {
   getToToken,
   getToTokens,
   getToTopAssets,
+  getValidationErrors,
 } from './selectors';
 
 describe('Bridge selectors', () => {
@@ -538,10 +540,20 @@ describe('Bridge selectors', () => {
   describe('getBridgeQuotes', () => {
     it('returns quote list and fetch data, insufficientBal=false,quotesRefreshCount=5', () => {
       const state = createBridgeMockStore({
-        featureFlagOverrides: { extensionConfig: { maxRefreshCount: 5 } },
+        featureFlagOverrides: {
+          extensionConfig: {
+            maxRefreshCount: 5,
+            chains: {
+              '0xa': { isActiveSrc: true, isActiveDest: false },
+              '0x89': { isActiveSrc: false, isActiveDest: true },
+            },
+          },
+        },
         bridgeSliceOverrides: {
-          toChainId: '0x1',
+          toChainId: '0x89',
           fromTokenExchangeRate: 1,
+          fromToken: { address: zeroAddress(), symbol: 'TEST' },
+          toToken: { address: zeroAddress(), symbol: 'TEST' },
           toTokenExchangeRate: 0.99,
           toNativeExchangeRate: 0.354073,
         },
@@ -551,6 +563,7 @@ describe('Bridge selectors', () => {
           quotesFetchStatus: 1,
           quotesRefreshCount: 5,
           quotesLastFetched: 100,
+          quotesInitialLoadTime: 11000,
           srcTokens: { '0x00': { address: '0x00', symbol: 'TEST' } },
           srcTopAssets: [{ address: '0x00', symbol: 'TEST' }],
         },
@@ -558,31 +571,43 @@ describe('Bridge selectors', () => {
           currencyRates: {
             ETH: {
               conversionRate: 1,
+              usdConversionRate: 1,
+            },
+            POL: {
+              conversionRate: 1,
+              usdConversionRate: 1,
             },
           },
+          marketData: {},
+          ...mockNetworkState(
+            { chainId: CHAIN_IDS.MAINNET },
+            { chainId: CHAIN_IDS.LINEA_MAINNET },
+            { chainId: CHAIN_IDS.POLYGON },
+            { chainId: CHAIN_IDS.OPTIMISM },
+          ),
         },
       });
 
       const recommendedQuoteMetadata = {
         adjustedReturn: {
-          fiat: expect.any(Object),
+          valueInCurrency: expect.any(Object),
         },
-        cost: { fiat: new BigNumber('0.15656287141025952') },
+        cost: { valueInCurrency: new BigNumber('0.15656287141025952') },
         sentAmount: {
-          fiat: new BigNumber('14'),
+          valueInCurrency: new BigNumber('14'),
           amount: new BigNumber('14'),
         },
         swapRate: new BigNumber('0.998877142857142857142857142857142857'),
         toTokenAmount: {
-          fiat: new BigNumber('13.8444372'),
+          valueInCurrency: new BigNumber('13.8444372'),
           amount: new BigNumber('13.98428'),
         },
         gasFee: {
           amount: new BigNumber('7.141025952e-8'),
-          fiat: new BigNumber('7.141025952e-8'),
+          valueInCurrency: new BigNumber('7.141025952e-8'),
         },
         totalNetworkFee: {
-          fiat: new BigNumber('0.00100007141025952'),
+          valueInCurrency: new BigNumber('0.00100007141025952'),
           amount: new BigNumber('0.00100007141025952'),
         },
       };
@@ -602,24 +627,36 @@ describe('Bridge selectors', () => {
         quotesLastFetchedMs: 100,
         isLoading: false,
         quotesRefreshCount: 5,
+        quotesInitialLoadTimeMs: 11000,
         isQuoteGoingToRefresh: false,
+        quoteFetchError: undefined,
       });
     });
 
     it('returns quote list and fetch data, insufficientBal=false,quotesRefreshCount=2', () => {
       const state = createBridgeMockStore({
-        featureFlagOverrides: { extensionConfig: { maxRefreshCount: 5 } },
+        featureFlagOverrides: {
+          extensionConfig: {
+            maxRefreshCount: 5,
+            chains: {
+              '0xa': { isActiveSrc: true, isActiveDest: false },
+              '0x89': { isActiveSrc: false, isActiveDest: true },
+            },
+          },
+        },
         bridgeSliceOverrides: {
-          toChainId: '0x1',
+          toChainId: '0x89',
+          fromToken: { address: zeroAddress(), symbol: 'ETH' },
+          toToken: { address: zeroAddress(), symbol: 'TEST' },
           fromTokenExchangeRate: 1,
           toTokenExchangeRate: 0.99,
-          toNativeExchangeRate: 0.354073,
         },
         bridgeStateOverrides: {
           quoteRequest: { insufficientBal: false },
           quotes: mockErc20Erc20Quotes,
           quotesFetchStatus: 1,
           quotesRefreshCount: 2,
+          quotesInitialLoadTime: 11000,
           quotesLastFetched: 100,
           srcTokens: { '0x00': { address: '0x00', symbol: 'TEST' } },
           srcTopAssets: [{ address: '0x00', symbol: 'TEST' }],
@@ -629,38 +666,49 @@ describe('Bridge selectors', () => {
             ETH: {
               conversionRate: 1,
             },
+            POL: {
+              conversionRate: 0.354073,
+              usdConversionRate: 1,
+            },
           },
+          marketData: {},
+          ...mockNetworkState(
+            { chainId: CHAIN_IDS.MAINNET },
+            { chainId: CHAIN_IDS.LINEA_MAINNET },
+            { chainId: CHAIN_IDS.POLYGON },
+            { chainId: CHAIN_IDS.OPTIMISM },
+          ),
         },
       });
       const result = getBridgeQuotes(state as never);
 
       const recommendedQuoteMetadata = {
         adjustedReturn: {
-          fiat: new BigNumber('13.84343712858974048'),
+          valueInCurrency: new BigNumber('13.843437128589739081572'),
         },
-        cost: { fiat: new BigNumber('0.15656287141025952') },
+        cost: { valueInCurrency: new BigNumber('0.156562871410260918428') },
         sentAmount: {
-          fiat: new BigNumber('14'),
+          valueInCurrency: new BigNumber('14'),
           amount: new BigNumber('14'),
         },
         swapRate: new BigNumber('0.998877142857142857142857142857142857'),
         toTokenAmount: {
-          fiat: new BigNumber('13.8444372'),
+          valueInCurrency: new BigNumber('13.844437199999998601572'),
           amount: new BigNumber('13.98428'),
         },
         gasFee: {
           amount: new BigNumber('7.141025952e-8'),
-          fiat: new BigNumber('7.141025952e-8'),
+          valueInCurrency: new BigNumber('7.141025952e-8'),
         },
         totalNetworkFee: {
-          fiat: new BigNumber('0.00100007141025952'),
+          valueInCurrency: new BigNumber('0.00100007141025952'),
           amount: new BigNumber('0.00100007141025952'),
         },
       };
       expect(result.sortedQuotes).toHaveLength(2);
       const EXPECTED_SORTED_COSTS = [
-        { fiat: new BigNumber('0.15656287141025952') },
-        { fiat: new BigNumber('0.33900008283534464') },
+        { valueInCurrency: new BigNumber('0.156562871410260918428') },
+        { valueInCurrency: new BigNumber('0.33900008283534602') },
       ];
       result.sortedQuotes.forEach((quote, idx) => {
         expect(quote.cost).toStrictEqual(EXPECTED_SORTED_COSTS[idx]);
@@ -679,17 +727,28 @@ describe('Bridge selectors', () => {
         isLoading: false,
         quotesRefreshCount: 2,
         isQuoteGoingToRefresh: true,
+        quotesInitialLoadTimeMs: 11000,
+        quoteFetchError: undefined,
       });
     });
 
     it('returns quote list and fetch data, insufficientBal=true', () => {
       const state = createBridgeMockStore({
-        featureFlagOverrides: { extensionConfig: { maxRefreshCount: 5 } },
+        featureFlagOverrides: {
+          extensionConfig: {
+            maxRefreshCount: 5,
+            chains: {
+              '0xa': { isActiveSrc: true, isActiveDest: false },
+              '0x89': { isActiveSrc: false, isActiveDest: true },
+            },
+          },
+        },
         bridgeSliceOverrides: {
-          toChainId: '0x1',
+          toChainId: '0x89',
+          fromToken: { address: zeroAddress(), symbol: 'ETH' },
+          toToken: { address: zeroAddress(), symbol: 'TEST' },
           fromTokenExchangeRate: 1,
           toTokenExchangeRate: 0.99,
-          toNativeExchangeRate: 0.354073,
         },
         bridgeStateOverrides: {
           quoteRequest: { insufficientBal: true },
@@ -697,6 +756,7 @@ describe('Bridge selectors', () => {
           quotesFetchStatus: 1,
           quotesRefreshCount: 1,
           quotesLastFetched: 100,
+          quotesInitialLoadTime: 11000,
           srcTokens: { '0x00': { address: '0x00', symbol: 'TEST' } },
           srcTopAssets: [{ address: '0x00', symbol: 'TEST' }],
         },
@@ -705,38 +765,49 @@ describe('Bridge selectors', () => {
             ETH: {
               conversionRate: 1,
             },
+            POL: {
+              conversionRate: 1,
+              usdConversionRate: 1,
+            },
           },
+          marketData: {},
+          ...mockNetworkState(
+            { chainId: CHAIN_IDS.MAINNET },
+            { chainId: CHAIN_IDS.LINEA_MAINNET },
+            { chainId: CHAIN_IDS.POLYGON },
+            { chainId: CHAIN_IDS.OPTIMISM },
+          ),
         },
       });
       const result = getBridgeQuotes(state as never);
 
       const recommendedQuoteMetadata = {
         adjustedReturn: {
-          fiat: new BigNumber('13.84343712858974048'),
+          valueInCurrency: new BigNumber('13.84343712858974048'),
         },
-        cost: { fiat: new BigNumber('0.15656287141025952') },
+        cost: { valueInCurrency: new BigNumber('0.15656287141025952') },
         sentAmount: {
-          fiat: new BigNumber('14'),
+          valueInCurrency: new BigNumber('14'),
           amount: new BigNumber('14'),
         },
         swapRate: new BigNumber('0.998877142857142857142857142857142857'),
         toTokenAmount: {
-          fiat: new BigNumber('13.8444372'),
+          valueInCurrency: new BigNumber('13.8444372'),
           amount: new BigNumber('13.98428'),
         },
         gasFee: {
           amount: new BigNumber('7.141025952e-8'),
-          fiat: new BigNumber('7.141025952e-8'),
+          valueInCurrency: new BigNumber('7.141025952e-8'),
         },
         totalNetworkFee: {
-          fiat: new BigNumber('0.00100007141025952'),
+          valueInCurrency: new BigNumber('0.00100007141025952'),
           amount: new BigNumber('0.00100007141025952'),
         },
       };
       expect(result.sortedQuotes).toHaveLength(2);
       const EXPECTED_SORTED_COSTS = [
-        { fiat: new BigNumber('0.15656287141025952') },
-        { fiat: new BigNumber('0.33900008283534464') },
+        { valueInCurrency: new BigNumber('0.15656287141025952') },
+        { valueInCurrency: new BigNumber('0.33900008283534464') },
       ];
       result.sortedQuotes.forEach((quote, idx) => {
         expect(quote.cost).toStrictEqual(EXPECTED_SORTED_COSTS[idx]);
@@ -753,9 +824,11 @@ describe('Bridge selectors', () => {
           ...recommendedQuoteMetadata,
         },
         quotesLastFetchedMs: 100,
+        quotesInitialLoadTimeMs: 11000,
         isLoading: false,
         quotesRefreshCount: 1,
         isQuoteGoingToRefresh: false,
+        quoteFetchError: undefined,
       });
     });
   });
@@ -773,7 +846,9 @@ describe('Bridge selectors', () => {
         quotesLastFetchedMs: undefined,
         quotesRefreshCount: undefined,
         recommendedQuote: undefined,
+        quotesInitialLoadTimeMs: undefined,
         sortedQuotes: [],
+        quoteFetchError: undefined,
       });
     });
 
@@ -889,10 +964,21 @@ describe('Bridge selectors', () => {
 
     it('should recommend 2nd fastest quote if adjustedReturn is less than 80% of cheapest quote', () => {
       const state = createBridgeMockStore({
+        featureFlagOverrides: {
+          extensionConfig: {
+            chains: {
+              '0xa': { isActiveSrc: true, isActiveDest: false },
+              '0x89': { isActiveSrc: false, isActiveDest: true },
+            },
+          },
+        },
         bridgeSliceOverrides: {
+          toChainId: '0x89',
+          fromToken: { address: zeroAddress(), symbol: 'ETH' },
+          toToken: { address: zeroAddress(), symbol: 'TEST' },
+          fromTokenExchangeRate: 2524.25,
           sortOrder: SortOrder.ETA_ASC,
           toTokenExchangeRate: 0.998781,
-          toNativeExchangeRate: 0.354073,
         },
         bridgeStateOverrides: {
           quotes: [
@@ -913,7 +999,18 @@ describe('Bridge selectors', () => {
             ETH: {
               conversionRate: 2524.25,
             },
+            POL: {
+              conversionRate: 0.354073,
+              usdConversionRate: 1,
+            },
           },
+          marketData: {},
+          ...mockNetworkState(
+            { chainId: CHAIN_IDS.MAINNET },
+            { chainId: CHAIN_IDS.LINEA_MAINNET },
+            { chainId: CHAIN_IDS.POLYGON },
+            { chainId: CHAIN_IDS.OPTIMISM },
+          ),
         },
       });
 
@@ -934,15 +1031,19 @@ describe('Bridge selectors', () => {
       expect(recommendedQuote?.quote.requestId).toStrictEqual(
         '4277a368-40d7-4e82-aa67-74f29dc5f98a',
       );
-      expect(sentAmount?.fiat?.toString()).toStrictEqual('25.2425');
-      expect(totalNetworkFee?.fiat?.toString()).toStrictEqual(
+      expect(sentAmount?.valueInCurrency?.toString()).toStrictEqual('25.2425');
+      expect(totalNetworkFee?.valueInCurrency?.toString()).toStrictEqual(
         '2.52459306428938562',
       );
-      expect(toTokenAmount?.fiat?.toString()).toStrictEqual('24.226654664163');
-      expect(adjustedReturn?.fiat?.toString()).toStrictEqual(
+      expect(toTokenAmount?.valueInCurrency?.toString()).toStrictEqual(
+        '24.226654664163',
+      );
+      expect(adjustedReturn?.valueInCurrency?.toString()).toStrictEqual(
         '21.70206159987361438',
       );
-      expect(cost?.fiat?.toString()).toStrictEqual('3.54043840012638562');
+      expect(cost?.valueInCurrency?.toString()).toStrictEqual(
+        '3.54043840012638562',
+      );
       expect(sortedQuotes).toHaveLength(3);
       expect(sortedQuotes[0]?.quote.requestId).toStrictEqual('fastestQuote');
       expect(sortedQuotes[1]?.quote.requestId).toStrictEqual(
@@ -953,4 +1054,397 @@ describe('Bridge selectors', () => {
       );
     });
   });
+
+  describe('getValidationErrors', () => {
+    it('should return isNoQuotesAvailable=true', () => {
+      const state = createBridgeMockStore({
+        bridgeSliceOverrides: { toChainId: '0x1' },
+        bridgeStateOverrides: {
+          srcTokens: { '0x00': { address: '0x00', symbol: 'TEST' } },
+          srcTopAssets: [{ address: '0x00', symbol: 'TEST' }],
+          quotes: [],
+          quotesLastFetched: Date.now(),
+        },
+      });
+      const result = getValidationErrors(state as never);
+
+      expect(result.isNoQuotesAvailable).toStrictEqual(true);
+    });
+
+    it('should  return isNoQuotesAvailable=false on initial load', () => {
+      const state = createBridgeMockStore({
+        bridgeSliceOverrides: { toChainId: '0x1' },
+        bridgeStateOverrides: {
+          srcTokens: { '0x00': { address: '0x00', symbol: 'TEST' } },
+          srcTopAssets: [{ address: '0x00', symbol: 'TEST' }],
+          quotes: [],
+        },
+      });
+      const result = getValidationErrors(state as never);
+
+      expect(result.isNoQuotesAvailable).toStrictEqual(false);
+    });
+
+    it('should return isInsufficientBalance=true', () => {
+      const state = createBridgeMockStore({
+        bridgeSliceOverrides: {
+          toChainId: '0x1',
+          fromTokenInputValue: '0.001',
+        },
+        bridgeStateOverrides: {
+          srcTokens: { '0x00': { address: '0x00', symbol: 'TEST' } },
+          srcTopAssets: [{ address: '0x00', symbol: 'TEST' }],
+          quotesLastFetched: Date.now(),
+        },
+      });
+      const result = getValidationErrors(state as never);
+
+      expect(
+        result.isInsufficientBalance(new BigNumber(0.00099)),
+      ).toStrictEqual(true);
+    });
+
+    it('should return isInsufficientBalance=false when there is no input amount', () => {
+      const state = createBridgeMockStore({
+        bridgeSliceOverrides: { toChainId: '0x1' },
+        bridgeStateOverrides: {
+          srcTokens: { '0x00': { address: '0x00', symbol: 'TEST' } },
+          srcTopAssets: [{ address: '0x00', symbol: 'TEST' }],
+          quotesLastFetched: Date.now(),
+        },
+      });
+      const result = getValidationErrors(state as never);
+
+      expect(
+        result.isInsufficientBalance(new BigNumber(0.00099)),
+      ).toStrictEqual(false);
+    });
+
+    it('should return isInsufficientBalance=false when there is no balance', () => {
+      const state = createBridgeMockStore({
+        bridgeSliceOverrides: { toChainId: '0x1' },
+        bridgeStateOverrides: {
+          srcTokens: { '0x00': { address: '0x00', symbol: 'TEST' } },
+          srcTopAssets: [{ address: '0x00', symbol: 'TEST' }],
+          quotesLastFetched: Date.now(),
+        },
+      });
+      const result = getValidationErrors(state as never);
+
+      expect(result.isInsufficientBalance()).toStrictEqual(false);
+    });
+
+    it('should return isInsufficientBalance=false when balance is 0', () => {
+      const state = createBridgeMockStore({
+        bridgeSliceOverrides: {
+          toChainId: '0x1',
+          fromTokenInputValue: '0.001',
+        },
+        bridgeStateOverrides: {
+          srcTokens: { '0x00': { address: '0x00', symbol: 'TEST' } },
+          srcTopAssets: [{ address: '0x00', symbol: 'TEST' }],
+          quotesLastFetched: Date.now(),
+        },
+      });
+      const result = getValidationErrors(state as never);
+
+      expect(result.isInsufficientBalance(new BigNumber(0))).toStrictEqual(
+        true,
+      );
+    });
+
+    it('should return isInsufficientGasBalance=true when balance is equal to srcAmount and fromToken is native', () => {
+      const state = createBridgeMockStore({
+        bridgeSliceOverrides: {
+          toChainId: '0x1',
+          fromTokenInputValue: '0.001',
+          fromToken: { address: zeroAddress(), decimals: 18 },
+        },
+        bridgeStateOverrides: {
+          srcTokens: { '0x00': { address: '0x00', symbol: 'TEST' } },
+          srcTopAssets: [{ address: '0x00', symbol: 'TEST' }],
+          quotesLastFetched: Date.now(),
+          quoteRequest: { srcTokenAmount: '10000000000000000' },
+        },
+      });
+      const result = getValidationErrors(state as never);
+
+      expect(
+        result.isInsufficientGasBalance(new BigNumber(0.01)),
+      ).toStrictEqual(true);
+    });
+
+    it('should return isInsufficientGasBalance=true when balance is 0 and fromToken is erc20', () => {
+      const state = createBridgeMockStore({
+        featureFlagOverrides: { destNetworkAllowlist: ['0x89'] },
+        bridgeSliceOverrides: {
+          toChainId: '0x89',
+          toToken: {
+            address: '0x3c499c542cef5e3811e1192ce70d8cc03d5c3359',
+            symbol: 'TEST',
+          },
+          fromTokenInputValue: '0.001',
+          fromToken: {
+            address: '0x3c499c542cef5e3811e1192ce70d8cc03d5c3359',
+            decimals: 6,
+          },
+          toTokenExchangeRate: 0.798781,
+        },
+        bridgeStateOverrides: {
+          srcTokens: { '0x00': { address: '0x00', symbol: 'TEST' } },
+          srcTopAssets: [{ address: '0x00', symbol: 'TEST' }],
+          quotesLastFetched: Date.now(),
+          quoteRequest: { srcTokenAmount: '100000000' },
+        },
+        metamaskStateOverrides: {
+          currencyRates: {
+            POL: {
+              conversionRate: 0.354073,
+              usdConversionRate: 1,
+            },
+          },
+          ...mockNetworkState(
+            { chainId: CHAIN_IDS.MAINNET },
+            { chainId: CHAIN_IDS.LINEA_MAINNET },
+            { chainId: CHAIN_IDS.POLYGON },
+          ),
+        },
+      });
+      const result = getValidationErrors(state as never);
+
+      expect(result.isInsufficientGasBalance(new BigNumber(0))).toStrictEqual(
+        true,
+      );
+    });
+
+    it('should return isInsufficientGasBalance=false if there is no fromAmount', () => {
+      const state = createBridgeMockStore({
+        bridgeSliceOverrides: {
+          toChainId: '0x1',
+          fromTokenInputValue: '0.001',
+        },
+        bridgeStateOverrides: {
+          srcTokens: { '0x00': { address: '0x00', symbol: 'TEST' } },
+          srcTopAssets: [{ address: '0x00', symbol: 'TEST' }],
+          quotesLastFetched: Date.now(),
+          quoteRequest: {},
+        },
+      });
+      const result = getValidationErrors(state as never);
+
+      expect(result.isInsufficientGasBalance(new BigNumber(0))).toStrictEqual(
+        false,
+      );
+    });
+
+    it('should return isInsufficientGasBalance=false when quotes have been loaded', () => {
+      const state = createBridgeMockStore({
+        bridgeSliceOverrides: {
+          toChainId: '0x1',
+          fromTokenInputValue: '0.001',
+        },
+        bridgeStateOverrides: {
+          srcTokens: { '0x00': { address: '0x00', symbol: 'TEST' } },
+          srcTopAssets: [{ address: '0x00', symbol: 'TEST' }],
+          quotesLastFetched: Date.now(),
+          quotes: mockErc20Erc20Quotes,
+        },
+      });
+      const result = getValidationErrors(state as never);
+
+      expect(result.isInsufficientGasBalance(new BigNumber(0))).toStrictEqual(
+        false,
+      );
+    });
+
+    it('should return isInsufficientGasForQuote=true when balance is less than required network fees in quote', () => {
+      const state = createBridgeMockStore({
+        bridgeSliceOverrides: {
+          toChainId: '0x1',
+          fromTokenInputValue: '0.001',
+          fromToken: { address: zeroAddress(), decimals: 18 },
+        },
+        bridgeStateOverrides: {
+          srcTokens: { '0x00': { address: '0x00', symbol: 'TEST' } },
+          srcTopAssets: [{ address: '0x00', symbol: 'TEST' }],
+          quotesLastFetched: Date.now(),
+          quotes: mockBridgeQuotesNativeErc20,
+        },
+      });
+      const result = getValidationErrors(state as never);
+
+      expect(
+        getBridgeQuotes(state as never).activeQuote?.totalNetworkFee.amount,
+      ).toStrictEqual(new BigNumber('0.00100012486628784'));
+      expect(
+        getBridgeQuotes(state as never).activeQuote?.sentAmount.amount,
+      ).toStrictEqual(new BigNumber('0.01'));
+      expect(
+        result.isInsufficientGasForQuote(new BigNumber(0.001)),
+      ).toStrictEqual(true);
+    });
+
+    it('should return isInsufficientGasForQuote=false when balance is greater than required network fees in quote', () => {
+      const state = createBridgeMockStore({
+        bridgeSliceOverrides: {
+          toChainId: '0x1',
+          fromTokenInputValue: '0.001',
+          fromToken: { address: zeroAddress(), decimals: 18 },
+        },
+        bridgeStateOverrides: {
+          srcTokens: { '0x00': { address: '0x00', symbol: 'TEST' } },
+          srcTopAssets: [{ address: '0x00', symbol: 'TEST' }],
+          quotesLastFetched: Date.now(),
+          quotes: mockBridgeQuotesNativeErc20,
+        },
+      });
+      const result = getValidationErrors(state as never);
+
+      expect(
+        getBridgeQuotes(state as never).activeQuote?.totalNetworkFee.amount,
+      ).toStrictEqual(new BigNumber('0.00100012486628784'));
+      expect(
+        getBridgeQuotes(state as never).activeQuote?.sentAmount.amount,
+      ).toStrictEqual(new BigNumber('0.01'));
+      expect(
+        result.isInsufficientGasForQuote(new BigNumber('0.01100012486628785')),
+      ).toStrictEqual(false);
+    });
+
+    it('should return isEstimatedReturnLow=true return value is 20% less than sent funds', () => {
+      const state = createBridgeMockStore({
+        featureFlagOverrides: {
+          extensionConfig: {
+            chains: {
+              '0xa': { isActiveSrc: true, isActiveDest: false },
+              '0x89': { isActiveSrc: false, isActiveDest: true },
+            },
+          },
+        },
+        bridgeSliceOverrides: {
+          toChainId: '0x89',
+          fromToken: { address: zeroAddress(), symbol: 'ETH' },
+          toToken: { address: zeroAddress(), symbol: 'TEST' },
+          fromTokenExchangeRate: 2524.25,
+          toTokenExchangeRate: 0.798781,
+        },
+        bridgeStateOverrides: {
+          quotes: mockBridgeQuotesNativeErc20,
+        },
+        metamaskStateOverrides: {
+          currencyRates: {
+            ETH: {
+              conversionRate: 2524.25,
+            },
+            POL: {
+              conversionRate: 0.354073,
+              usdConversionRate: 1,
+            },
+          },
+          marketData: {},
+          ...mockNetworkState(
+            { chainId: CHAIN_IDS.MAINNET },
+            { chainId: CHAIN_IDS.LINEA_MAINNET },
+            { chainId: CHAIN_IDS.POLYGON },
+            { chainId: CHAIN_IDS.OPTIMISM },
+          ),
+        },
+      });
+      const result = getValidationErrors(state as never);
+
+      expect(
+        getBridgeQuotes(state as never).activeQuote?.sentAmount.valueInCurrency,
+      ).toStrictEqual(new BigNumber('25.2425'));
+      expect(
+        getBridgeQuotes(state as never).activeQuote?.totalNetworkFee
+          .valueInCurrency,
+      ).toStrictEqual(new BigNumber('2.52456519372708012'));
+      expect(
+        getBridgeQuotes(state as never).activeQuote?.adjustedReturn
+          .valueInCurrency,
+      ).toStrictEqual(new BigNumber('16.99676538473491988'));
+      expect(result.isEstimatedReturnLow).toStrictEqual(true);
+    });
+
+    it('should return isEstimatedReturnLow=false when return value is more than 80% of sent funds', () => {
+      const state = createBridgeMockStore({
+        featureFlagOverrides: {
+          extensionConfig: {
+            chains: {
+              '0xa': { isActiveSrc: true, isActiveDest: false },
+              '0x89': { isActiveSrc: false, isActiveDest: true },
+            },
+          },
+        },
+        bridgeSliceOverrides: {
+          toChainId: '0x89',
+          fromToken: { address: zeroAddress(), symbol: 'ETH' },
+          toToken: { address: zeroAddress(), symbol: 'TEST' },
+          fromTokenExchangeRate: 2524.25,
+          toTokenExchangeRate: 0.998781,
+        },
+        bridgeStateOverrides: {
+          quotes: mockBridgeQuotesNativeErc20,
+        },
+        metamaskStateOverrides: {
+          currencyRates: {
+            ETH: {
+              conversionRate: 2524.25,
+              usdConversionRate: 1,
+            },
+            POL: {
+              conversionRate: 1,
+              usdConversionRate: 1,
+            },
+          },
+          marketData: {},
+          ...mockNetworkState(
+            { chainId: CHAIN_IDS.MAINNET },
+            { chainId: CHAIN_IDS.LINEA_MAINNET },
+            { chainId: CHAIN_IDS.POLYGON },
+            { chainId: CHAIN_IDS.OPTIMISM },
+          ),
+        },
+      });
+      const result = getValidationErrors(state as never);
+
+      expect(
+        getBridgeQuotes(state as never).activeQuote?.sentAmount.valueInCurrency,
+      ).toStrictEqual(new BigNumber('25.2425'));
+      expect(
+        getBridgeQuotes(state as never).activeQuote?.totalNetworkFee
+          .valueInCurrency,
+      ).toStrictEqual(new BigNumber('2.52456519372708012'));
+      expect(
+        getBridgeQuotes(state as never).activeQuote?.adjustedReturn
+          .valueInCurrency,
+      ).toStrictEqual(new BigNumber('21.88454578473491988'));
+      expect(result.isEstimatedReturnLow).toStrictEqual(false);
+    });
+
+    it('should return isEstimatedReturnLow=false if there are no quotes', () => {
+      const state = createBridgeMockStore({
+        bridgeSliceOverrides: {
+          toTokenExchangeRate: 0.998781,
+          toNativeExchangeRate: 0.354073,
+        },
+        bridgeStateOverrides: {
+          quotes: [],
+        },
+        metamaskStateOverrides: {
+          currencyRates: {
+            ETH: {
+              conversionRate: 2524.25,
+            },
+          },
+        },
+      });
+      const result = getValidationErrors(state as never);
+
+      expect(getBridgeQuotes(state as never).activeQuote).toStrictEqual(
+        undefined,
+      );
+      expect(result.isEstimatedReturnLow).toStrictEqual(false);
+    });
+  });
 });
diff --git a/ui/ducks/bridge/selectors.ts b/ui/ducks/bridge/selectors.ts
index 4ad4308535a0..2fd3d9586deb 100644
--- a/ui/ducks/bridge/selectors.ts
+++ b/ui/ducks/bridge/selectors.ts
@@ -8,7 +8,11 @@ import { GasFeeEstimates } from '@metamask/gas-fee-controller';
 import { BigNumber } from 'bignumber.js';
 import {
   getIsBridgeEnabled,
+  getMarketData,
   getSwapsDefaultToken,
+  getUSDConversionRate,
+  getUSDConversionRateByChainId,
+  selectConversionRateByChainId,
   SwapsEthToken,
 } from '../../selectors/selectors';
 import {
@@ -50,12 +54,23 @@ import {
   isNativeAddress,
 } from '../../pages/bridge/utils/quote';
 import { decGWEIToHexWEI } from '../../../shared/modules/conversion.utils';
+import { calcTokenAmount } from '../../../shared/lib/transactions-controller-utils';
+import {
+  exchangeRatesFromNativeAndCurrencyRates,
+  exchangeRateFromMarketData,
+  tokenPriceInNativeAsset,
+} from './utils';
 import { BridgeState } from './bridge';
 
 type BridgeAppState = {
   metamask: { bridgeState: BridgeControllerState } & NetworkState & {
       useExternalServices: boolean;
-      currencyRates: { [currency: string]: { conversionRate: number } };
+      currencyRates: {
+        [currency: string]: {
+          conversionRate: number;
+          usdConversionRate?: number;
+        };
+      };
     };
   bridge: BridgeState;
 };
@@ -188,27 +203,76 @@ const _getBridgeFeesPerGas = createSelector(
 export const getBridgeSortOrder = (state: BridgeAppState) =>
   state.bridge.sortOrder;
 
+export const getFromTokenConversionRate = createSelector(
+  getFromChain,
+  getMarketData,
+  getFromToken,
+  getUSDConversionRate,
+  getConversionRate,
+  (state) => state.bridge.fromTokenExchangeRate,
+  (
+    fromChain,
+    marketData,
+    fromToken,
+    nativeToUsdRate,
+    nativeToCurrencyRate,
+    fromTokenExchangeRate,
+  ) => {
+    if (fromChain?.chainId && fromToken && marketData) {
+      const tokenToNativeAssetRate =
+        exchangeRateFromMarketData(
+          fromChain.chainId,
+          fromToken.address,
+          marketData,
+        ) ??
+        tokenPriceInNativeAsset(fromTokenExchangeRate, nativeToCurrencyRate);
+
+      return exchangeRatesFromNativeAndCurrencyRates(
+        tokenToNativeAssetRate,
+        nativeToCurrencyRate,
+        nativeToUsdRate,
+      );
+    }
+    return exchangeRatesFromNativeAndCurrencyRates();
+  },
+);
+
 // A dest network can be selected before it's imported
 // The cached exchange rate won't be available so the rate from the bridge state is used
-const _getToTokenExchangeRate = createSelector(
-  (state) => state.metamask.currencyRates,
-  (state: BridgeAppState) => state.bridge.toTokenExchangeRate,
+export const getToTokenConversionRate = createDeepEqualSelector(
   getToChain,
+  getMarketData,
   getToToken,
-  (cachedCurrencyRates, toTokenExchangeRate, toChain, toToken) => {
-    return (
-      toTokenExchangeRate ??
-      (isNativeAddress(toToken?.address) && toChain?.nativeCurrency
-        ? cachedCurrencyRates[toChain.nativeCurrency]?.conversionRate
-        : null)
-    );
+  (state) => ({
+    state,
+    toTokenExchangeRate: state.bridge.toTokenExchangeRate,
+  }),
+  (toChain, marketData, toToken, { state, toTokenExchangeRate }) => {
+    if (toChain?.chainId && toToken && marketData) {
+      const { chainId } = toChain;
+
+      const nativeToCurrencyRate = selectConversionRateByChainId(
+        state,
+        chainId,
+      );
+      const nativeToUsdRate = getUSDConversionRateByChainId(chainId)(state);
+      const tokenToNativeAssetRate =
+        exchangeRateFromMarketData(chainId, toToken.address, marketData) ??
+        tokenPriceInNativeAsset(toTokenExchangeRate, nativeToCurrencyRate);
+      return exchangeRatesFromNativeAndCurrencyRates(
+        tokenToNativeAssetRate,
+        nativeToCurrencyRate,
+        nativeToUsdRate,
+      );
+    }
+    return exchangeRatesFromNativeAndCurrencyRates();
   },
 );
 
 const _getQuotesWithMetadata = createDeepEqualSelector(
   (state) => state.metamask.bridgeState.quotes,
-  _getToTokenExchangeRate,
-  (state: BridgeAppState) => state.bridge.fromTokenExchangeRate,
+  getToTokenConversionRate,
+  getFromTokenConversionRate,
   getConversionRate,
   _getBridgeFeesPerGas,
   (
@@ -219,7 +283,10 @@ const _getQuotesWithMetadata = createDeepEqualSelector(
     { estimatedBaseFeeInDecGwei, maxPriorityFeePerGasInDecGwei },
   ): (QuoteResponse & QuoteMetadata)[] => {
     const newQuotes = quotes.map((quote: QuoteResponse) => {
-      const toTokenAmount = calcToAmount(quote.quote, toTokenExchangeRate);
+      const toTokenAmount = calcToAmount(
+        quote.quote,
+        toTokenExchangeRate.valueInCurrency,
+      );
       const gasFee = calcTotalGasFee(
         quote,
         estimatedBaseFeeInDecGwei,
@@ -229,17 +296,17 @@ const _getQuotesWithMetadata = createDeepEqualSelector(
       const relayerFee = calcRelayerFee(quote, nativeExchangeRate);
       const totalNetworkFee = {
         amount: gasFee.amount.plus(relayerFee.amount),
-        fiat: gasFee.fiat?.plus(relayerFee.fiat || '0') ?? null,
+        valueInCurrency:
+          gasFee.valueInCurrency?.plus(relayerFee.valueInCurrency || '0') ??
+          null,
       };
       const sentAmount = calcSentAmount(
         quote.quote,
-        isNativeAddress(quote.quote.srcAsset.address)
-          ? nativeExchangeRate
-          : fromTokenExchangeRate,
+        fromTokenExchangeRate.valueInCurrency,
       );
       const adjustedReturn = calcAdjustedReturn(
-        toTokenAmount.fiat,
-        totalNetworkFee.fiat,
+        toTokenAmount.valueInCurrency,
+        totalNetworkFee.valueInCurrency,
       );
 
       return {
@@ -250,7 +317,10 @@ const _getQuotesWithMetadata = createDeepEqualSelector(
         adjustedReturn,
         gasFee,
         swapRate: calcSwapRate(sentAmount.amount, toTokenAmount.amount),
-        cost: calcCost(adjustedReturn.fiat, sentAmount.fiat),
+        cost: calcCost(
+          adjustedReturn.valueInCurrency,
+          sentAmount.valueInCurrency,
+        ),
       };
     });
 
@@ -271,7 +341,11 @@ const _getSortedQuotesWithMetadata = createDeepEqualSelector(
         );
       case SortOrder.COST_ASC:
       default:
-        return orderBy(quotesWithMetadata, ({ cost }) => cost.fiat, 'asc');
+        return orderBy(
+          quotesWithMetadata,
+          ({ cost }) => cost.valueInCurrency,
+          'asc',
+        );
     }
   },
 );
@@ -286,15 +360,15 @@ const _getRecommendedQuote = createDeepEqualSelector(
 
     const bestReturnValue = BigNumber.max(
       sortedQuotesWithMetadata.map(
-        ({ adjustedReturn }) => adjustedReturn.fiat ?? 0,
+        ({ adjustedReturn }) => adjustedReturn.valueInCurrency ?? 0,
       ),
     );
 
     const isFastestQuoteValueReasonable = (
-      adjustedReturnInFiat: BigNumber | null,
+      adjustedReturnInCurrency: BigNumber | null,
     ) =>
-      adjustedReturnInFiat
-        ? adjustedReturnInFiat
+      adjustedReturnInCurrency
+        ? adjustedReturnInCurrency
             .div(bestReturnValue)
             .gte(BRIDGE_QUOTE_MAX_RETURN_DIFFERENCE_PERCENTAGE)
         : true;
@@ -306,7 +380,7 @@ const _getRecommendedQuote = createDeepEqualSelector(
     return (
       sortedQuotesWithMetadata.find((quote) => {
         return sortOrder === SortOrder.ETA_ASC
-          ? isFastestQuoteValueReasonable(quote.adjustedReturn.fiat)
+          ? isFastestQuoteValueReasonable(quote.adjustedReturn.valueInCurrency)
           : isBestPricedQuoteETAReasonable(
               quote.estimatedProcessingTimeInSeconds,
             );
@@ -343,6 +417,8 @@ export const getBridgeQuotes = createSelector(
   (state) =>
     state.metamask.bridgeState.quotesLoadingStatus === RequestStatus.LOADING,
   (state: BridgeAppState) => state.metamask.bridgeState.quotesRefreshCount,
+  (state: BridgeAppState) => state.metamask.bridgeState.quotesInitialLoadTime,
+  (state: BridgeAppState) => state.metamask.bridgeState.quoteFetchError,
   getBridgeQuotesConfig,
   getQuoteRequest,
   (
@@ -352,6 +428,8 @@ export const getBridgeQuotes = createSelector(
     quotesLastFetchedMs,
     isLoading,
     quotesRefreshCount,
+    quotesInitialLoadTimeMs,
+    quoteFetchError,
     { maxRefreshCount },
     { insufficientBal },
   ) => ({
@@ -360,7 +438,9 @@ export const getBridgeQuotes = createSelector(
     activeQuote: selectedQuote ?? recommendedQuote,
     quotesLastFetchedMs,
     isLoading,
+    quoteFetchError,
     quotesRefreshCount,
+    quotesInitialLoadTimeMs,
     isQuoteGoingToRefresh: insufficientBal
       ? false
       : quotesRefreshCount < maxRefreshCount,
@@ -376,3 +456,86 @@ export const getIsBridgeTx = createDeepEqualSelector(
       ? fromChain.chainId !== toChain.chainId
       : false,
 );
+
+const _getValidatedSrcAmount = createSelector(
+  getFromToken,
+  (state: BridgeAppState) =>
+    state.metamask.bridgeState.quoteRequest.srcTokenAmount,
+  (fromToken, srcTokenAmount) =>
+    srcTokenAmount && fromToken?.decimals
+      ? calcTokenAmount(srcTokenAmount, Number(fromToken.decimals)).toString()
+      : null,
+);
+
+export const getFromAmountInCurrency = createSelector(
+  getFromToken,
+  getFromChain,
+  _getValidatedSrcAmount,
+  getFromTokenConversionRate,
+  (
+    fromToken,
+    fromChain,
+    validatedSrcAmount,
+    { valueInCurrency: fromTokenToCurrencyExchangeRate },
+  ) => {
+    if (fromToken?.symbol && fromChain?.chainId && validatedSrcAmount) {
+      if (fromTokenToCurrencyExchangeRate) {
+        return new BigNumber(validatedSrcAmount).mul(
+          new BigNumber(fromTokenToCurrencyExchangeRate.toString() ?? 1),
+        );
+      }
+    }
+    return new BigNumber(0);
+  },
+);
+
+export const getValidationErrors = createDeepEqualSelector(
+  getBridgeQuotes,
+  getFromAmount,
+  _getValidatedSrcAmount,
+  getFromToken,
+  (
+    { activeQuote, quotesLastFetchedMs, isLoading },
+    fromAmount,
+    validatedSrcAmount,
+    fromToken,
+  ) => {
+    return {
+      isNoQuotesAvailable: Boolean(
+        !activeQuote && quotesLastFetchedMs && !isLoading,
+      ),
+      // Shown prior to fetching quotes
+      isInsufficientGasBalance: (balance?: BigNumber) => {
+        if (balance && !activeQuote && validatedSrcAmount && fromToken) {
+          return isNativeAddress(fromToken.address)
+            ? balance.eq(validatedSrcAmount)
+            : balance.lte(0);
+        }
+        return false;
+      },
+      // Shown after fetching quotes
+      isInsufficientGasForQuote: (balance?: BigNumber) => {
+        if (balance && activeQuote && fromToken) {
+          return isNativeAddress(fromToken.address)
+            ? balance
+                .sub(activeQuote.totalNetworkFee.amount)
+                .sub(activeQuote.sentAmount.amount)
+                .lte(0)
+            : balance.lte(activeQuote.totalNetworkFee.amount);
+        }
+        return false;
+      },
+      isInsufficientBalance: (balance?: BigNumber) =>
+        fromAmount && balance !== undefined ? balance.lt(fromAmount) : false,
+      isEstimatedReturnLow:
+        activeQuote?.sentAmount?.valueInCurrency &&
+        activeQuote?.adjustedReturn?.valueInCurrency
+          ? activeQuote.adjustedReturn.valueInCurrency.lt(
+              new BigNumber(
+                BRIDGE_QUOTE_MAX_RETURN_DIFFERENCE_PERCENTAGE,
+              ).times(activeQuote.sentAmount.valueInCurrency),
+            )
+          : false,
+    };
+  },
+);
diff --git a/ui/ducks/bridge/utils.ts b/ui/ducks/bridge/utils.ts
index de45111cc10b..1ddd7871d4df 100644
--- a/ui/ducks/bridge/utils.ts
+++ b/ui/ducks/bridge/utils.ts
@@ -1,11 +1,12 @@
 import { Hex } from '@metamask/utils';
 import { BigNumber } from 'bignumber.js';
 import { getAddress } from 'ethers/lib/utils';
+import { ContractMarketData } from '@metamask/assets-controllers';
 import { decGWEIToHexWEI } from '../../../shared/modules/conversion.utils';
 import { Numeric } from '../../../shared/modules/Numeric';
 import { TxData } from '../../pages/bridge/types';
 import { getTransaction1559GasFeeEstimates } from '../../pages/swaps/swaps.util';
-import { fetchTokenExchangeRates } from '../../helpers/utils/util';
+import { fetchTokenExchangeRates as fetchTokenExchangeRatesUtil } from '../../helpers/utils/util';
 
 // We don't need to use gas multipliers here because the gasLimit from Bridge API already included it
 export const getHexMaxGasLimit = (gasLimit: number) => {
@@ -48,6 +49,28 @@ export const getTxGasEstimates = async ({
   };
 };
 
+const fetchTokenExchangeRates = async (
+  chainId: string,
+  currency: string,
+  ...tokenAddresses: string[]
+) => {
+  const exchangeRates = await fetchTokenExchangeRatesUtil(
+    currency,
+    tokenAddresses,
+    chainId,
+  );
+  return Object.keys(exchangeRates).reduce(
+    (acc: Record<string, number | undefined>, address) => {
+      acc[address.toLowerCase()] = exchangeRates[address];
+      return acc;
+    },
+    {},
+  );
+};
+
+// This fetches the exchange rate for a token in a given currency. This is only called when the exchange
+// rate is not available in the TokenRatesController, which happens when the selected token has not been
+// imported into the wallet
 export const getTokenExchangeRate = async (request: {
   chainId: Hex;
   tokenAddress: string;
@@ -55,12 +78,58 @@ export const getTokenExchangeRate = async (request: {
 }) => {
   const { chainId, tokenAddress, currency } = request;
   const exchangeRates = await fetchTokenExchangeRates(
-    currency,
-    [tokenAddress],
     chainId,
+    currency,
+    tokenAddress,
   );
-  return (
+  const exchangeRate =
     exchangeRates?.[tokenAddress.toLowerCase()] ??
-    exchangeRates?.[getAddress(tokenAddress)]
-  );
+    exchangeRates?.[getAddress(tokenAddress)];
+  return exchangeRate;
+};
+
+// This extracts a token's exchange rate from the marketData state object
+export const exchangeRateFromMarketData = (
+  chainId: string,
+  tokenAddress: string,
+  marketData?: Record<string, ContractMarketData>,
+) =>
+  (
+    marketData?.[chainId]?.[tokenAddress.toLowerCase() as Hex] ??
+    marketData?.[chainId]?.[getAddress(tokenAddress) as Hex]
+  )?.price;
+
+export const tokenAmountToCurrency = (
+  amount: string | BigNumber,
+  exchangeRate: number,
+) =>
+  new Numeric(amount, 10)
+    // Stringify exchangeRate before applying conversion to avoid floating point issues
+    .applyConversionRate(new BigNumber(exchangeRate.toString(), 10))
+    .toNumber();
+
+export const tokenPriceInNativeAsset = (
+  tokenExchangeRate?: number | null,
+  nativeToCurrencyRate?: number | null,
+) => {
+  return tokenExchangeRate && nativeToCurrencyRate
+    ? tokenExchangeRate / nativeToCurrencyRate
+    : null;
+};
+
+export const exchangeRatesFromNativeAndCurrencyRates = (
+  tokenToNativeAssetRate?: number | null,
+  nativeToCurrencyRate?: number | null,
+  nativeToUsdRate?: number | null,
+) => {
+  return {
+    valueInCurrency:
+      tokenToNativeAssetRate && nativeToCurrencyRate
+        ? tokenToNativeAssetRate * nativeToCurrencyRate
+        : null,
+    usd:
+      tokenToNativeAssetRate && nativeToUsdRate
+        ? tokenToNativeAssetRate * nativeToUsdRate
+        : null,
+  };
 };
diff --git a/ui/helpers/constants/routes.ts b/ui/helpers/constants/routes.ts
index 330d3ad20815..da12a52be812 100644
--- a/ui/helpers/constants/routes.ts
+++ b/ui/helpers/constants/routes.ts
@@ -232,6 +232,7 @@ PATH_NAME_MAP[
 ] = 'Encryption Public Key Request Page';
 
 export const CROSS_CHAIN_SWAP_ROUTE = '/cross-chain';
+PATH_NAME_MAP[CROSS_CHAIN_SWAP_ROUTE] = 'Prepare Cross Chain Swap Page';
 export const CROSS_CHAIN_SWAP_TX_DETAILS_ROUTE = '/cross-chain/tx-details';
 
 export const SWAPS_ROUTE = '/swaps';
diff --git a/ui/hooks/bridge/events/types.ts b/ui/hooks/bridge/events/types.ts
new file mode 100644
index 000000000000..53c97b5c245b
--- /dev/null
+++ b/ui/hooks/bridge/events/types.ts
@@ -0,0 +1,47 @@
+import { StatusTypes } from '../../../../shared/types/bridge-status';
+
+export enum ActionType {
+  CROSSCHAIN_V1 = 'crosschain-v1',
+  SWAPBRIDGE_V1 = 'swapbridge-v1',
+}
+
+export type RequestParams = {
+  chain_id_source: string;
+  chain_id_destination?: string;
+  token_symbol_source: string;
+  token_symbol_destination?: string;
+  token_address_source: string;
+  token_address_destination?: string;
+};
+
+export type RequestMetadata = {
+  slippage_limit: number;
+  custom_slippage: boolean;
+  usd_amount_source: number;
+  stx_enabled: boolean;
+  is_hardware_wallet: boolean;
+  swap_type: ActionType;
+};
+
+export type QuoteFetchData = {
+  can_submit: boolean;
+  best_quote_provider?: `${string}_${string}`;
+  quotes_count: number;
+  quotes_list: `${string}_${string}`[];
+  initial_load_time_all_quotes: number;
+};
+
+export type TradeData = {
+  usd_quoted_gas: number;
+  gas_included: boolean;
+  quoted_time_minutes: number;
+  usd_quoted_return: number;
+  provider: `${string}_${string}`;
+};
+
+export type TxStatusData = {
+  allowance_reset_transaction?: StatusTypes;
+  approval_transaction?: StatusTypes;
+  source_transaction: StatusTypes;
+  destination_transaction?: StatusTypes;
+};
diff --git a/ui/hooks/bridge/events/useConvertedUsdAmounts.ts b/ui/hooks/bridge/events/useConvertedUsdAmounts.ts
new file mode 100644
index 000000000000..7ad432579c43
--- /dev/null
+++ b/ui/hooks/bridge/events/useConvertedUsdAmounts.ts
@@ -0,0 +1,75 @@
+/* eslint-disable camelcase */
+import { useSelector } from 'react-redux';
+import {
+  getBridgeQuotes,
+  getFromAmountInCurrency,
+  getFromTokenConversionRate,
+  getQuoteRequest,
+  getToTokenConversionRate,
+  getFromAmount,
+} from '../../../ducks/bridge/selectors';
+import { getCurrentCurrency, getUSDConversionRate } from '../../../selectors';
+import { tokenAmountToCurrency } from '../../../ducks/bridge/utils';
+
+const USD_CURRENCY_CODE = 'usd';
+
+// This hook is used to get the converted USD amounts for the bridge trade
+// It returns the converted token value if the user's selected currency is USD
+// Otherwise, it converts the token amounts to USD using the exchange rates
+// If the amount's usd value is not available, it defaults to 0
+export const useConvertedUsdAmounts = () => {
+  const { srcTokenAddress, destTokenAddress } = useSelector(getQuoteRequest);
+  const { activeQuote } = useSelector(getBridgeQuotes);
+  const fromAmountInputValueInCurrency = useSelector(getFromAmountInCurrency);
+  const fromAmountInputValue = useSelector(getFromAmount);
+  const fromTokenConversionRate = useSelector(getFromTokenConversionRate);
+  const toTokenConversionRate = useSelector(getToTokenConversionRate);
+  const currency = useSelector(getCurrentCurrency);
+  const nativeToUsdRate = useSelector(getUSDConversionRate);
+
+  // Use values from activeQuote if available, otherwise use validated input field values
+  const fromTokenAddress = (
+    activeQuote ? activeQuote.quote.srcAsset.address : srcTokenAddress
+  )?.toLowerCase();
+  const toTokenAddress = (
+    activeQuote ? activeQuote.quote.destAsset.address : destTokenAddress
+  )?.toLowerCase();
+
+  const fromAmountInCurrency =
+    activeQuote?.sentAmount?.valueInCurrency ?? fromAmountInputValueInCurrency;
+  const fromAmount = fromAmountInputValue ?? activeQuote?.sentAmount.amount;
+
+  const isCurrencyUsd = currency.toLowerCase() === USD_CURRENCY_CODE;
+
+  return {
+    // If a quote is passed in, derive the usd amount source from the quote
+    // otherwise use input field values
+    usd_amount_source: isCurrencyUsd
+      ? fromAmountInCurrency.toNumber()
+      : (fromTokenConversionRate?.usd &&
+          fromAmount &&
+          fromTokenAddress &&
+          tokenAmountToCurrency(fromAmount, fromTokenConversionRate.usd)) ||
+        0,
+    // If user's selected currency is not usd, use usd exchange rates for
+    // the gas token and convert the quoted gas amount to usd
+    usd_quoted_gas:
+      (isCurrencyUsd
+        ? activeQuote?.gasFee.valueInCurrency?.toNumber()
+        : activeQuote?.gasFee.amount &&
+          tokenAmountToCurrency(activeQuote.gasFee.amount, nativeToUsdRate)) ||
+      0,
+    // If user's selected currency is not usd, use usd exchange rates for
+    // the dest asset and convert the dest amount to usd
+    usd_quoted_return:
+      (isCurrencyUsd
+        ? activeQuote?.toTokenAmount?.valueInCurrency?.toNumber()
+        : activeQuote?.toTokenAmount?.amount &&
+          toTokenAddress &&
+          toTokenConversionRate.usd &&
+          tokenAmountToCurrency(
+            activeQuote.toTokenAmount.amount,
+            toTokenConversionRate.usd,
+          )) || 0,
+  };
+};
diff --git a/ui/hooks/bridge/events/useQuoteProperties.ts b/ui/hooks/bridge/events/useQuoteProperties.ts
new file mode 100644
index 000000000000..67c0e9a2b915
--- /dev/null
+++ b/ui/hooks/bridge/events/useQuoteProperties.ts
@@ -0,0 +1,25 @@
+/* eslint-disable camelcase */
+import { useSelector } from 'react-redux';
+import { getBridgeQuotes } from '../../../ducks/bridge/selectors';
+import { formatProviderLabel } from '../../../pages/bridge/utils/quote';
+import { useIsTxSubmittable } from '../useIsTxSubmittable';
+import { SECOND } from '../../../../shared/constants/time';
+
+export const useQuoteProperties = () => {
+  const { recommendedQuote, sortedQuotes, quotesInitialLoadTimeMs } =
+    useSelector(getBridgeQuotes);
+
+  const can_submit = useIsTxSubmittable();
+
+  const initial_load_time_all_quotes = quotesInitialLoadTimeMs
+    ? quotesInitialLoadTimeMs / SECOND
+    : 0;
+
+  return {
+    can_submit,
+    best_quote_provider: formatProviderLabel(recommendedQuote),
+    quotes_count: sortedQuotes.length,
+    quotes_list: sortedQuotes.map(formatProviderLabel),
+    initial_load_time_all_quotes,
+  };
+};
diff --git a/ui/hooks/bridge/events/useRequestMetadataProperties.ts b/ui/hooks/bridge/events/useRequestMetadataProperties.ts
new file mode 100644
index 000000000000..d0effe026803
--- /dev/null
+++ b/ui/hooks/bridge/events/useRequestMetadataProperties.ts
@@ -0,0 +1,38 @@
+/* eslint-disable camelcase */
+import { useSelector } from 'react-redux';
+import {
+  getIsBridgeTx,
+  getQuoteRequest,
+} from '../../../ducks/bridge/selectors';
+import { isHardwareKeyring } from '../../../helpers/utils/hardware';
+import { getCurrentKeyring } from '../../../selectors';
+import { getIsSmartTransaction } from '../../../../shared/modules/selectors';
+import { BRIDGE_DEFAULT_SLIPPAGE } from '../../../../shared/constants/bridge';
+import { ActionType } from './types';
+import { useConvertedUsdAmounts } from './useConvertedUsdAmounts';
+
+export const useRequestMetadataProperties = () => {
+  const { slippage } = useSelector(getQuoteRequest);
+  const isBridgeTx = useSelector(getIsBridgeTx);
+  const stx_enabled = useSelector(getIsSmartTransaction);
+  const { usd_amount_source } = useConvertedUsdAmounts();
+
+  const keyring = useSelector(getCurrentKeyring);
+  // @ts-expect-error keyring type is possibly wrong
+  const is_hardware_wallet = isHardwareKeyring(keyring.type) ?? false;
+
+  const slippage_limit = slippage;
+  const swap_type = isBridgeTx
+    ? ActionType.CROSSCHAIN_V1
+    : ActionType.SWAPBRIDGE_V1;
+  const custom_slippage = slippage_limit !== BRIDGE_DEFAULT_SLIPPAGE;
+
+  return {
+    slippage_limit: slippage ?? BRIDGE_DEFAULT_SLIPPAGE,
+    custom_slippage,
+    is_hardware_wallet,
+    swap_type,
+    stx_enabled,
+    usd_amount_source,
+  };
+};
diff --git a/ui/hooks/bridge/events/useRequestProperties.ts b/ui/hooks/bridge/events/useRequestProperties.ts
new file mode 100644
index 000000000000..5477436f46a5
--- /dev/null
+++ b/ui/hooks/bridge/events/useRequestProperties.ts
@@ -0,0 +1,54 @@
+/* eslint-disable camelcase */
+import { useSelector } from 'react-redux';
+import {
+  getQuoteRequest,
+  getFromToken,
+  getToToken,
+} from '../../../ducks/bridge/selectors';
+import { Numeric } from '../../../../shared/modules/Numeric';
+
+export const useRequestProperties = () => {
+  const { srcChainId, destChainId, srcTokenAddress, destTokenAddress } =
+    useSelector(getQuoteRequest);
+  const fromToken = useSelector(getFromToken);
+  const toToken = useSelector(getToToken);
+
+  const chain_id_source =
+    srcChainId && new Numeric(srcChainId, 10).toPrefixedHexString();
+  const chain_id_destination =
+    destChainId && new Numeric(destChainId, 10).toPrefixedHexString();
+  const token_symbol_source = fromToken?.symbol;
+  const token_symbol_destination = toToken?.symbol;
+  const token_address_source = srcTokenAddress?.toLowerCase();
+  const token_address_destination = destTokenAddress?.toLowerCase();
+
+  if (
+    chain_id_source &&
+    chain_id_destination &&
+    token_address_source &&
+    token_address_destination &&
+    token_symbol_source &&
+    token_symbol_destination
+  ) {
+    return {
+      quoteRequestProperties: {
+        chain_id_source,
+        chain_id_destination,
+        token_symbol_source,
+        token_symbol_destination,
+        token_address_source,
+        token_address_destination,
+      },
+      flippedRequestProperties: {
+        chain_id_source: chain_id_destination,
+        chain_id_destination: chain_id_source,
+        token_symbol_source: token_symbol_destination,
+        token_symbol_destination: token_symbol_source,
+        token_address_source: token_address_destination,
+        token_address_destination: token_address_source,
+      },
+    };
+  }
+
+  return {};
+};
diff --git a/ui/hooks/bridge/events/useTradeProperties.ts b/ui/hooks/bridge/events/useTradeProperties.ts
new file mode 100644
index 000000000000..361d271ac371
--- /dev/null
+++ b/ui/hooks/bridge/events/useTradeProperties.ts
@@ -0,0 +1,24 @@
+/* eslint-disable camelcase */
+import { useSelector } from 'react-redux';
+import { getBridgeQuotes } from '../../../ducks/bridge/selectors';
+import { formatProviderLabel } from '../../../pages/bridge/utils/quote';
+import { useConvertedUsdAmounts } from './useConvertedUsdAmounts';
+
+export const useTradeProperties = () => {
+  const { activeQuote } = useSelector(getBridgeQuotes);
+  const { usd_amount_source, usd_quoted_gas, usd_quoted_return } =
+    useConvertedUsdAmounts();
+
+  const quoted_time_minutes = activeQuote?.estimatedProcessingTimeInSeconds
+    ? activeQuote.estimatedProcessingTimeInSeconds / 60
+    : 0;
+
+  return {
+    gas_included: false, // TODO check if trade has gas included
+    quoted_time_minutes,
+    provider: formatProviderLabel(activeQuote),
+    usd_amount_source,
+    usd_quoted_gas,
+    usd_quoted_return,
+  };
+};
diff --git a/ui/hooks/bridge/useBridgeExchangeRates.ts b/ui/hooks/bridge/useBridgeExchangeRates.ts
new file mode 100644
index 000000000000..ef3c6669a2c8
--- /dev/null
+++ b/ui/hooks/bridge/useBridgeExchangeRates.ts
@@ -0,0 +1,84 @@
+import { useEffect } from 'react';
+import { useDispatch, useSelector } from 'react-redux';
+import {
+  getBridgeQuotes,
+  getQuoteRequest,
+  getToChain,
+} from '../../ducks/bridge/selectors';
+import { getCurrentCurrency, getMarketData } from '../../selectors';
+import { decimalToPrefixedHex } from '../../../shared/modules/conversion.utils';
+import { getCurrentChainId } from '../../../shared/modules/selectors/networks';
+import {
+  setDestTokenExchangeRates,
+  setSrcTokenExchangeRates,
+} from '../../ducks/bridge/bridge';
+import { exchangeRateFromMarketData } from '../../ducks/bridge/utils';
+
+export const useBridgeExchangeRates = () => {
+  const { srcTokenAddress, destTokenAddress } = useSelector(getQuoteRequest);
+  const { activeQuote } = useSelector(getBridgeQuotes);
+  const chainId = useSelector(getCurrentChainId);
+  const toChain = useSelector(getToChain);
+
+  const dispatch = useDispatch();
+
+  const currency = useSelector(getCurrentCurrency);
+
+  // Use values from activeQuote if available, otherwise use validated input field values
+  const fromTokenAddress = (
+    activeQuote ? activeQuote.quote.srcAsset.address : srcTokenAddress
+  )?.toLowerCase();
+  const toTokenAddress = (
+    activeQuote ? activeQuote.quote.destAsset.address : destTokenAddress
+  )?.toLowerCase();
+  const fromChainId = activeQuote
+    ? decimalToPrefixedHex(activeQuote.quote.srcChainId)
+    : chainId;
+  const toChainId = activeQuote
+    ? decimalToPrefixedHex(activeQuote.quote.destChainId)
+    : toChain?.chainId;
+
+  const marketData = useSelector(getMarketData);
+
+  // Fetch exchange rates for selected src token if not found in marketData
+  useEffect(() => {
+    if (fromChainId && fromTokenAddress) {
+      const exchangeRate = exchangeRateFromMarketData(
+        fromChainId,
+        fromTokenAddress,
+        marketData,
+      );
+
+      if (!exchangeRate) {
+        dispatch(
+          setSrcTokenExchangeRates({
+            chainId: fromChainId,
+            tokenAddress: fromTokenAddress,
+            currency,
+          }),
+        );
+      }
+    }
+  }, [fromChainId, fromTokenAddress]);
+
+  // Fetch exchange rates for selected dest token if not found in marketData
+  useEffect(() => {
+    if (toChainId && toTokenAddress) {
+      const exchangeRate = exchangeRateFromMarketData(
+        toChainId,
+        toTokenAddress,
+        marketData,
+      );
+
+      if (!exchangeRate) {
+        dispatch(
+          setDestTokenExchangeRates({
+            chainId: toChainId,
+            tokenAddress: toTokenAddress,
+            currency,
+          }),
+        );
+      }
+    }
+  }, [toChainId, toTokenAddress]);
+};
diff --git a/ui/hooks/bridge/useBridging.ts b/ui/hooks/bridge/useBridging.ts
index 62945e3e7a92..a8307658e285 100644
--- a/ui/hooks/bridge/useBridging.ts
+++ b/ui/hooks/bridge/useBridging.ts
@@ -17,6 +17,7 @@ import { MetaMetricsContext } from '../../contexts/metametrics';
 import {
   MetaMetricsEventCategory,
   MetaMetricsEventName,
+  MetaMetricsSwapsEventSource,
 } from '../../../shared/constants/metametrics';
 
 import {
@@ -30,12 +31,14 @@ import { isHardwareKeyring } from '../../helpers/utils/hardware';
 import { getPortfolioUrl } from '../../helpers/utils/portfolio';
 import { SwapsTokenObject } from '../../../shared/constants/swaps';
 import { getProviderConfig } from '../../../shared/modules/selectors/networks';
+import { useCrossChainSwapsEventTracker } from './useCrossChainSwapsEventTracker';
 ///: END:ONLY_INCLUDE_IF
 
 const useBridging = () => {
   const dispatch = useDispatch();
   const history = useHistory();
   const trackEvent = useContext(MetaMetricsContext);
+  const trackCrossChainSwapsEvent = useCrossChainSwapsEventTracker();
 
   const metaMetricsId = useSelector(getMetaMetricsId);
   const isMetaMetricsEnabled = useSelector(getParticipateInMetaMetrics);
@@ -63,6 +66,19 @@ const useBridging = () => {
       }
 
       if (isBridgeSupported) {
+        trackCrossChainSwapsEvent({
+          event: MetaMetricsEventName.ActionOpened,
+          category: MetaMetricsEventCategory.Navigation,
+          properties: {
+            location:
+              location === 'Home'
+                ? MetaMetricsSwapsEventSource.MainView
+                : MetaMetricsSwapsEventSource.TokenView,
+            chain_id_source: providerConfig.chainId,
+            token_symbol_source: token.symbol,
+            token_address_source: token.address,
+          },
+        });
         trackEvent({
           event: MetaMetricsEventName.BridgeLinkClicked,
           category: MetaMetricsEventCategory.Navigation,
@@ -118,6 +134,7 @@ const useBridging = () => {
       history,
       metaMetricsId,
       trackEvent,
+      trackCrossChainSwapsEvent,
       isMetaMetricsEnabled,
       isMarketingEnabled,
       providerConfig,
diff --git a/ui/hooks/bridge/useCrossChainSwapsEventTracker.ts b/ui/hooks/bridge/useCrossChainSwapsEventTracker.ts
new file mode 100644
index 000000000000..f28244cba995
--- /dev/null
+++ b/ui/hooks/bridge/useCrossChainSwapsEventTracker.ts
@@ -0,0 +1,113 @@
+import { useCallback, useContext } from 'react';
+import { MetaMetricsContext } from '../../contexts/metametrics';
+import {
+  MetaMetricsEventCategory,
+  MetaMetricsEventName,
+  MetaMetricsSwapsEventSource,
+} from '../../../shared/constants/metametrics';
+import { SortOrder } from '../../pages/bridge/types';
+import {
+  RequestParams,
+  RequestMetadata,
+  TradeData,
+  QuoteFetchData,
+  ActionType,
+  TxStatusData,
+} from './events/types';
+
+export type CrossChainSwapsEventProperties = {
+  [MetaMetricsEventName.ActionOpened]: RequestParams & {
+    location: MetaMetricsSwapsEventSource;
+  };
+  [MetaMetricsEventName.ActionCompleted]: RequestParams &
+    RequestMetadata &
+    TradeData &
+    TxStatusData & {
+      usd_actual_return: number;
+      actual_time_minutes: number;
+      quote_vs_execution_ratio: number;
+      quoted_vs_used_gas_ratio: number;
+    };
+  [MetaMetricsEventName.ActionSubmitted]: RequestParams &
+    RequestMetadata &
+    TradeData;
+  [MetaMetricsEventName.ActionFailed]: RequestParams &
+    RequestMetadata &
+    TradeData &
+    TxStatusData & {
+      actual_time_minutes: number;
+      error_message: string;
+    };
+  [MetaMetricsEventName.CrossChainSwapsQuotesRequested]: RequestParams &
+    RequestMetadata & {
+      has_sufficient_funds: boolean;
+    };
+  [MetaMetricsEventName.AllQuotesOpened]: RequestParams &
+    RequestMetadata &
+    QuoteFetchData;
+  [MetaMetricsEventName.AllQuotesSorted]: RequestParams &
+    RequestMetadata &
+    QuoteFetchData & { sort_order: SortOrder };
+  [MetaMetricsEventName.QuoteSelected]: RequestParams &
+    RequestMetadata &
+    QuoteFetchData &
+    TradeData & {
+      is_best_quote: boolean;
+    };
+  [MetaMetricsEventName.CrossChainSwapsQuotesReceived]: RequestParams &
+    RequestMetadata &
+    QuoteFetchData &
+    TradeData & {
+      refresh_count: number; // starts from 0
+      warnings: string[];
+    };
+  [MetaMetricsEventName.InputSourceDestinationFlipped]: RequestParams;
+  [MetaMetricsEventName.InputChanged]: {
+    input:
+      | 'token_source'
+      | 'token_destination'
+      | 'chain_source'
+      | 'chain_destination'
+      | 'slippage';
+    value: string;
+  };
+  [MetaMetricsEventName.CrossChainSwapsQuoteError]: RequestParams &
+    RequestMetadata & {
+      error_message: string;
+      has_sufficient_funds: boolean;
+    };
+};
+
+/**
+ * Returns trackCrossChainSwapsEvent method, which emits metrics using the provided event name, category, and properties.
+ * The callback has type-safe parameters to ensure input properties satisfy the required event properties defined in CrossChainSwapsEventProperties.
+ *
+ * @returns The trackCrossChainSwapsEvent method which wraps the MetaMetricsContext trackEvent method.
+ */
+export const useCrossChainSwapsEventTracker = () => {
+  const trackEvent = useContext(MetaMetricsContext);
+
+  const trackCrossChainSwapsEvent = useCallback(
+    <EventName extends keyof CrossChainSwapsEventProperties>({
+      event,
+      category,
+      properties,
+    }: {
+      event: EventName;
+      category?: MetaMetricsEventCategory;
+      properties: CrossChainSwapsEventProperties[EventName];
+    }) => {
+      trackEvent({
+        category: category ?? MetaMetricsEventCategory.CrossChainSwaps,
+        event,
+        properties: {
+          action_type: ActionType.CROSSCHAIN_V1,
+          ...properties,
+        },
+      });
+    },
+    [trackEvent],
+  );
+
+  return trackCrossChainSwapsEvent;
+};
diff --git a/ui/hooks/bridge/useIsTxSubmittable.ts b/ui/hooks/bridge/useIsTxSubmittable.ts
new file mode 100644
index 000000000000..8302001c5bf8
--- /dev/null
+++ b/ui/hooks/bridge/useIsTxSubmittable.ts
@@ -0,0 +1,49 @@
+import { useSelector } from 'react-redux';
+import { SWAPS_CHAINID_DEFAULT_TOKEN_MAP } from '../../../shared/constants/swaps';
+import {
+  getBridgeQuotes,
+  getFromAmount,
+  getFromChain,
+  getFromToken,
+  getToChain,
+  getValidationErrors,
+  getToToken,
+} from '../../ducks/bridge/selectors';
+import useLatestBalance from './useLatestBalance';
+
+export const useIsTxSubmittable = () => {
+  const fromToken = useSelector(getFromToken);
+  const toToken = useSelector(getToToken);
+  const fromChain = useSelector(getFromChain);
+  const toChain = useSelector(getToChain);
+  const fromAmount = useSelector(getFromAmount);
+  const { activeQuote } = useSelector(getBridgeQuotes);
+
+  const {
+    isInsufficientBalance,
+    isInsufficientGasBalance,
+    isInsufficientGasForQuote,
+  } = useSelector(getValidationErrors);
+
+  const { balanceAmount } = useLatestBalance(fromToken, fromChain?.chainId);
+  const { balanceAmount: nativeAssetBalance } = useLatestBalance(
+    fromChain?.chainId
+      ? SWAPS_CHAINID_DEFAULT_TOKEN_MAP[
+          fromChain.chainId as keyof typeof SWAPS_CHAINID_DEFAULT_TOKEN_MAP
+        ]
+      : null,
+    fromChain?.chainId,
+  );
+
+  return Boolean(
+    fromToken &&
+      toToken &&
+      fromChain &&
+      toChain &&
+      fromAmount &&
+      activeQuote &&
+      !isInsufficientBalance(balanceAmount) &&
+      !isInsufficientGasBalance(nativeAssetBalance) &&
+      !isInsufficientGasForQuote(nativeAssetBalance),
+  );
+};
diff --git a/ui/hooks/bridge/useLatestBalance.ts b/ui/hooks/bridge/useLatestBalance.ts
index b3398dc18333..6aaf7da68c0c 100644
--- a/ui/hooks/bridge/useLatestBalance.ts
+++ b/ui/hooks/bridge/useLatestBalance.ts
@@ -7,6 +7,7 @@ import { getSelectedInternalAccount, SwapsEthToken } from '../../selectors';
 import { SwapsTokenObject } from '../../../shared/constants/swaps';
 import { calcLatestSrcBalance } from '../../../shared/modules/bridge-utils/balance';
 import { useAsyncResult } from '../useAsyncResult';
+import { calcTokenAmount } from '../../../shared/lib/transactions-controller-utils';
 
 /**
  * Custom hook to fetch and format the latest balance of a given token or native asset.
@@ -58,6 +59,10 @@ const useLatestBalance = (
             .round(DEFAULT_PRECISION)
             .toString()
         : undefined,
+    balanceAmount:
+      token && latestBalance
+        ? calcTokenAmount(latestBalance.toString(), tokenDecimals)
+        : undefined,
   };
 };
 
diff --git a/ui/hooks/bridge/useQuoteFetchEvents.ts b/ui/hooks/bridge/useQuoteFetchEvents.ts
new file mode 100644
index 000000000000..a272430c3f2a
--- /dev/null
+++ b/ui/hooks/bridge/useQuoteFetchEvents.ts
@@ -0,0 +1,151 @@
+/* eslint-disable camelcase */
+import { useEffect, useMemo } from 'react';
+import { useSelector } from 'react-redux';
+import { MetaMetricsEventName } from '../../../shared/constants/metametrics';
+import {
+  getBridgeQuotes,
+  getFromAmount,
+  getFromChain,
+  getFromToken,
+  getQuoteRequest,
+  getValidationErrors,
+} from '../../ducks/bridge/selectors';
+import { SWAPS_CHAINID_DEFAULT_TOKEN_MAP } from '../../../shared/constants/swaps';
+import { useCrossChainSwapsEventTracker } from './useCrossChainSwapsEventTracker';
+import useLatestBalance from './useLatestBalance';
+import { useRequestMetadataProperties } from './events/useRequestMetadataProperties';
+import { useRequestProperties } from './events/useRequestProperties';
+import { useTradeProperties } from './events/useTradeProperties';
+import { useConvertedUsdAmounts } from './events/useConvertedUsdAmounts';
+import { useQuoteProperties } from './events/useQuoteProperties';
+
+// This hook is used to track cross chain swaps events related to quote-fetching
+export const useQuoteFetchEvents = () => {
+  const trackCrossChainSwapsEvent = useCrossChainSwapsEventTracker();
+  const {
+    isLoading,
+    quotesRefreshCount,
+    quoteFetchError,
+    quotesInitialLoadTimeMs,
+  } = useSelector(getBridgeQuotes);
+  const { insufficientBal, srcTokenAddress } = useSelector(getQuoteRequest);
+  const fromTokenInputValue = useSelector(getFromAmount);
+  const validationErrors = useSelector(getValidationErrors);
+
+  const { quoteRequestProperties } = useRequestProperties();
+  const requestMetadataProperties = useRequestMetadataProperties();
+  const { usd_amount_source } = useConvertedUsdAmounts();
+
+  const has_sufficient_funds = !insufficientBal;
+
+  const quoteListProperties = useQuoteProperties();
+  const tradeProperties = useTradeProperties();
+
+  const fromToken = useSelector(getFromToken);
+  const fromChain = useSelector(getFromChain);
+
+  const { balanceAmount } = useLatestBalance(fromToken, fromChain?.chainId);
+  const { balanceAmount: nativeAssetBalance } = useLatestBalance(
+    fromChain?.chainId
+      ? SWAPS_CHAINID_DEFAULT_TOKEN_MAP[
+          fromChain.chainId as keyof typeof SWAPS_CHAINID_DEFAULT_TOKEN_MAP
+        ]
+      : null,
+    fromChain?.chainId,
+  );
+
+  const warnings = useMemo(() => {
+    const {
+      isEstimatedReturnLow,
+      isNoQuotesAvailable,
+      isInsufficientGasBalance,
+      isInsufficientGasForQuote,
+      isInsufficientBalance,
+    } = validationErrors;
+
+    const latestWarnings = [];
+
+    isEstimatedReturnLow && latestWarnings.push('low_return');
+    isNoQuotesAvailable && latestWarnings.push('no_quotes');
+    isInsufficientGasBalance(nativeAssetBalance) &&
+      latestWarnings.push('insufficient_gas_balance');
+    isInsufficientGasForQuote(nativeAssetBalance) &&
+      latestWarnings.push('insufficient_gas_for_selected_quote');
+    isInsufficientBalance(balanceAmount) &&
+      latestWarnings.push('insufficient_balance');
+
+    return latestWarnings;
+  }, [validationErrors]);
+
+  // Emitted when quotes are fetched for the first time for a given request
+  useEffect(() => {
+    const isInitialFetch =
+      isLoading &&
+      quotesRefreshCount === 0 &&
+      quotesInitialLoadTimeMs === undefined;
+
+    if (
+      quoteRequestProperties &&
+      fromTokenInputValue &&
+      srcTokenAddress &&
+      isInitialFetch
+    ) {
+      trackCrossChainSwapsEvent({
+        event: MetaMetricsEventName.CrossChainSwapsQuotesRequested,
+        properties: {
+          ...quoteRequestProperties,
+          ...requestMetadataProperties,
+          has_sufficient_funds,
+          usd_amount_source,
+        },
+      });
+    }
+  }, [isLoading, quotesInitialLoadTimeMs]);
+
+  // Emitted when an error is caught during fetch
+  useEffect(() => {
+    if (
+      quoteRequestProperties &&
+      fromTokenInputValue &&
+      srcTokenAddress &&
+      quoteFetchError
+    ) {
+      trackCrossChainSwapsEvent({
+        event: MetaMetricsEventName.CrossChainSwapsQuoteError,
+        properties: {
+          ...quoteRequestProperties,
+          ...requestMetadataProperties,
+          has_sufficient_funds,
+          usd_amount_source,
+          error_message: quoteFetchError,
+        },
+      });
+    }
+  }, [quoteFetchError]);
+
+  // Emitted after each time quotes are fetched successfully
+  useEffect(() => {
+    if (
+      fromTokenInputValue &&
+      srcTokenAddress &&
+      !isLoading &&
+      quotesRefreshCount >= 0 &&
+      quoteListProperties.initial_load_time_all_quotes > 0 &&
+      quoteRequestProperties &&
+      !quoteFetchError &&
+      tradeProperties
+    ) {
+      trackCrossChainSwapsEvent({
+        event: MetaMetricsEventName.CrossChainSwapsQuotesReceived,
+        properties: {
+          ...quoteRequestProperties,
+          ...requestMetadataProperties,
+          ...quoteListProperties,
+          ...tradeProperties,
+          refresh_count: quotesRefreshCount - 1,
+          warnings,
+        },
+      });
+    }
+  }, [quotesRefreshCount]);
+};
diff --git a/ui/pages/bridge/hooks/useSubmitBridgeTransaction.ts b/ui/pages/bridge/hooks/useSubmitBridgeTransaction.ts
index a0fd8bc73508..5750e398b1ff 100644
--- a/ui/pages/bridge/hooks/useSubmitBridgeTransaction.ts
+++ b/ui/pages/bridge/hooks/useSubmitBridgeTransaction.ts
@@ -20,6 +20,7 @@ export default function useSubmitBridgeTransaction() {
   const submitBridgeTransaction = async (
     quoteResponse: QuoteResponse & QuoteMetadata,
   ) => {
+    // TODO catch errors and emit ActionFailed here
     // Execute transaction(s)
     let approvalTxMeta: TransactionMeta | undefined;
     if (quoteResponse?.approval) {
diff --git a/ui/pages/bridge/index.tsx b/ui/pages/bridge/index.tsx
index 6dd54b424d06..9eddeffee798 100644
--- a/ui/pages/bridge/index.tsx
+++ b/ui/pages/bridge/index.tsx
@@ -1,7 +1,6 @@
 import React, { useContext, useEffect } from 'react';
 import { useDispatch, useSelector } from 'react-redux';
 import { Switch, useHistory } from 'react-router-dom';
-import { zeroAddress } from 'ethereumjs-util';
 import { I18nContext } from '../../contexts/i18n';
 import { clearSwapsState } from '../../ducks/swaps/swaps';
 import {
@@ -30,12 +29,10 @@ import {
   Header,
 } from '../../components/multichain/pages/page';
 import { useSwapsFeatureFlags } from '../swaps/hooks/useSwapsFeatureFlags';
-import {
-  resetBridgeState,
-  setFromChain,
-  setSrcTokenExchangeRates,
-} from '../../ducks/bridge/actions';
+import { resetBridgeState, setFromChain } from '../../ducks/bridge/actions';
 import { useGasFeeEstimates } from '../../hooks/useGasFeeEstimates';
+import { useBridgeExchangeRates } from '../../hooks/bridge/useBridgeExchangeRates';
+import { useQuoteFetchEvents } from '../../hooks/bridge/useQuoteFetchEvents';
 import PrepareBridgePage from './prepare/prepare-bridge-page';
 import { BridgeCTAButton } from './prepare/bridge-cta-button';
 
@@ -55,15 +52,8 @@ const CrossChainSwap = () => {
   const currency = useSelector(getCurrentCurrency);
 
   useEffect(() => {
-    if (isBridgeChain && isBridgeEnabled && providerConfig && currency) {
+    if (isBridgeChain && isBridgeEnabled && providerConfig) {
       dispatch(setFromChain(providerConfig.chainId));
-      dispatch(
-        setSrcTokenExchangeRates({
-          chainId: providerConfig.chainId,
-          tokenAddress: zeroAddress(),
-          currency,
-        }),
-      );
     }
   }, [isBridgeChain, isBridgeEnabled, providerConfig, currency]);
 
@@ -85,6 +75,10 @@ const CrossChainSwap = () => {
 
   // Needed for refreshing gas estimates
   useGasFeeEstimates(providerConfig?.id);
+  // Needed for fetching exchange rates for tokens that have not been imported
+  useBridgeExchangeRates();
+  // Emits events related to quote-fetching
+  useQuoteFetchEvents();
 
   const redirectToDefaultRoute = async () => {
     history.push({
diff --git a/ui/pages/bridge/prepare/__snapshots__/prepare-bridge-page.test.tsx.snap b/ui/pages/bridge/prepare/__snapshots__/prepare-bridge-page.test.tsx.snap
index 26e25b8bd4cd..a14e8ef5f05e 100644
--- a/ui/pages/bridge/prepare/__snapshots__/prepare-bridge-page.test.tsx.snap
+++ b/ui/pages/bridge/prepare/__snapshots__/prepare-bridge-page.test.tsx.snap
@@ -97,7 +97,7 @@ exports[`PrepareBridgePage should render the component, with initial state 1`] =
           class="mm-box prepare-bridge-page__amounts-row"
         >
           <p
-            class="mm-box mm-text mm-text--body-md mm-box--color-text-default"
+            class="mm-box mm-text mm-text--body-md mm-box--color-text-alternative"
           >
              
           </p>
@@ -182,7 +182,7 @@ exports[`PrepareBridgePage should render the component, with initial state 1`] =
           class="mm-box prepare-bridge-page__amounts-row"
         >
           <p
-            class="mm-box mm-text mm-text--body-md mm-box--color-text-default"
+            class="mm-box mm-text mm-text--body-md mm-box--color-text-alternative"
           >
              
           </p>
@@ -308,7 +308,7 @@ exports[`PrepareBridgePage should render the component, with inputs set 1`] = `
           class="mm-box prepare-bridge-page__amounts-row"
         >
           <p
-            class="mm-box mm-text mm-text--body-md mm-box--color-text-default"
+            class="mm-box mm-text mm-text--body-md mm-box--color-text-alternative"
           >
              
           </p>
@@ -437,7 +437,7 @@ exports[`PrepareBridgePage should render the component, with inputs set 1`] = `
           class="mm-box prepare-bridge-page__amounts-row"
         >
           <p
-            class="mm-box mm-text mm-text--body-md mm-box--color-text-default"
+            class="mm-box mm-text mm-text--body-md mm-box--color-text-alternative"
           >
              
           </p>
diff --git a/ui/pages/bridge/prepare/bridge-cta-button.tsx b/ui/pages/bridge/prepare/bridge-cta-button.tsx
index b148b71c67f0..3a23d9735bca 100644
--- a/ui/pages/bridge/prepare/bridge-cta-button.tsx
+++ b/ui/pages/bridge/prepare/bridge-cta-button.tsx
@@ -5,12 +5,19 @@ import {
   getFromAmount,
   getFromChain,
   getFromToken,
-  getToChain,
   getToToken,
   getBridgeQuotes,
+  getValidationErrors,
 } from '../../../ducks/bridge/selectors';
 import { useI18nContext } from '../../../hooks/useI18nContext';
 import useSubmitBridgeTransaction from '../hooks/useSubmitBridgeTransaction';
+import useLatestBalance from '../../../hooks/bridge/useLatestBalance';
+import { useIsTxSubmittable } from '../../../hooks/bridge/useIsTxSubmittable';
+import { useCrossChainSwapsEventTracker } from '../../../hooks/bridge/useCrossChainSwapsEventTracker';
+import { useRequestProperties } from '../../../hooks/bridge/events/useRequestProperties';
+import { useRequestMetadataProperties } from '../../../hooks/bridge/events/useRequestMetadataProperties';
+import { useTradeProperties } from '../../../hooks/bridge/events/useTradeProperties';
+import { MetaMetricsEventName } from '../../../../shared/constants/metametrics';
 
 export const BridgeCTAButton = () => {
   const t = useI18nContext();
@@ -19,7 +26,6 @@ export const BridgeCTAButton = () => {
   const toToken = useSelector(getToToken);
 
   const fromChain = useSelector(getFromChain);
-  const toChain = useSelector(getToChain);
 
   const fromAmount = useSelector(getFromAmount);
 
@@ -27,14 +33,30 @@ export const BridgeCTAButton = () => {
 
   const { submitBridgeTransaction } = useSubmitBridgeTransaction();
 
-  const isTxSubmittable =
-    fromToken && toToken && fromChain && toChain && fromAmount && activeQuote;
+  const { isNoQuotesAvailable, isInsufficientBalance } =
+    useSelector(getValidationErrors);
+
+  const { balanceAmount } = useLatestBalance(fromToken, fromChain?.chainId);
+
+  const isTxSubmittable = useIsTxSubmittable();
+  const trackCrossChainSwapsEvent = useCrossChainSwapsEventTracker();
+  const { quoteRequestProperties } = useRequestProperties();
+  const requestMetadataProperties = useRequestMetadataProperties();
+  const tradeProperties = useTradeProperties();
 
   const label = useMemo(() => {
     if (isLoading && !isTxSubmittable) {
       return t('swapFetchingQuotes');
     }
 
+    if (isNoQuotesAvailable) {
+      return t('swapQuotesNotAvailableErrorTitle');
+    }
+
+    if (isInsufficientBalance(balanceAmount)) {
+      return t('alertReasonInsufficientBalance');
+    }
+
     if (!fromAmount) {
       if (!toToken) {
         return t('bridgeSelectTokenAndAmount');
@@ -47,13 +69,31 @@ export const BridgeCTAButton = () => {
     }
 
     return t('swapSelectToken');
-  }, [isLoading, fromAmount, toToken, isTxSubmittable]);
+  }, [
+    isLoading,
+    fromAmount,
+    toToken,
+    isTxSubmittable,
+    balanceAmount,
+    isInsufficientBalance,
+  ]);
 
   return (
     <Button
       data-testid="bridge-cta-button"
       onClick={() => {
-        if (isTxSubmittable) {
+        if (activeQuote && isTxSubmittable) {
+          quoteRequestProperties &&
+            requestMetadataProperties &&
+            tradeProperties &&
+            trackCrossChainSwapsEvent({
+              event: MetaMetricsEventName.ActionSubmitted,
+              properties: {
+                ...quoteRequestProperties,
+                ...requestMetadataProperties,
+                ...tradeProperties,
+              },
+            });
           submitBridgeTransaction(activeQuote);
         }
       }}
diff --git a/ui/pages/bridge/prepare/bridge-input-group.tsx b/ui/pages/bridge/prepare/bridge-input-group.tsx
index 0dbecf6cffdd..2627b9e04102 100644
--- a/ui/pages/bridge/prepare/bridge-input-group.tsx
+++ b/ui/pages/bridge/prepare/bridge-input-group.tsx
@@ -28,7 +28,11 @@ import {
   CHAIN_ID_TOKEN_IMAGE_MAP,
 } from '../../../../shared/constants/network';
 import useLatestBalance from '../../../hooks/bridge/useLatestBalance';
-import { getBridgeQuotes } from '../../../ducks/bridge/selectors';
+import {
+  getBridgeQuotes,
+  getValidationErrors,
+} from '../../../ducks/bridge/selectors';
+import { TextColor } from '../../../helpers/constants/design-system';
 
 const generateAssetFromToken = (
   chainId: Hex,
@@ -80,6 +84,7 @@ export const BridgeInputGroup = ({
   const t = useI18nContext();
 
   const { isLoading, activeQuote } = useSelector(getBridgeQuotes);
+  const { isInsufficientBalance } = useSelector(getValidationErrors);
 
   const tokenFiatValue = useTokenFiatAmount(
     token?.address || undefined,
@@ -96,11 +101,14 @@ export const BridgeInputGroup = ({
     true,
   );
 
-  const { formattedBalance } = useLatestBalance(
+  const { formattedBalance, balanceAmount } = useLatestBalance(
     token,
     networkProps?.network?.chainId,
   );
 
+  const isAmountReadOnly =
+    amountFieldProps?.readOnly || amountFieldProps?.disabled;
+
   return (
     <Box className={className}>
       <Box className="prepare-bridge-page__input-row">
@@ -140,7 +148,13 @@ export const BridgeInputGroup = ({
         </Tooltip>
       </Box>
       <Box className="prepare-bridge-page__amounts-row">
-        <Text>
+        <Text
+          color={
+            !isAmountReadOnly && isInsufficientBalance(balanceAmount)
+              ? TextColor.errorDefault
+              : TextColor.textAlternative
+          }
+        >
           {formattedBalance ? `${t('balance')}: ${formattedBalance}` : ' '}
         </Text>
         <CurrencyDisplay
diff --git a/ui/pages/bridge/prepare/prepare-bridge-page.test.tsx b/ui/pages/bridge/prepare/prepare-bridge-page.test.tsx
index 520b9d4f3328..1e77461d2464 100644
--- a/ui/pages/bridge/prepare/prepare-bridge-page.test.tsx
+++ b/ui/pages/bridge/prepare/prepare-bridge-page.test.tsx
@@ -96,7 +96,10 @@ describe('PrepareBridgePage', () => {
       },
       bridgeSliceOverrides: {
         fromTokenInputValue: '1',
-        fromToken: { address: '0x3103910', decimals: 6 },
+        fromToken: {
+          address: '0x1f9840a85d5af5bf1d1762f925bdaddc4201f984',
+          decimals: 6,
+        },
         toToken: {
           iconUrl: 'http://url',
           symbol: 'UNI',
@@ -107,7 +110,7 @@ describe('PrepareBridgePage', () => {
       },
       bridgeStateOverrides: {
         quoteRequest: {
-          srcTokenAddress: '0x3103910',
+          srcTokenAddress: '0x1f9840a85d5af5bf1d1762f925bdaddc4201f984',
           destTokenAddress: '0x1f9840a85d5af5bf1d1762f925bdaddc4201f984',
           srcChainId: 1,
           destChainId: 10,
diff --git a/ui/pages/bridge/prepare/prepare-bridge-page.tsx b/ui/pages/bridge/prepare/prepare-bridge-page.tsx
index aea037c71f13..2cf97891189f 100644
--- a/ui/pages/bridge/prepare/prepare-bridge-page.tsx
+++ b/ui/pages/bridge/prepare/prepare-bridge-page.tsx
@@ -2,15 +2,11 @@ import React, { useCallback, useEffect, useMemo, useState } from 'react';
 import { useSelector, useDispatch } from 'react-redux';
 import classnames from 'classnames';
 import { debounce } from 'lodash';
-import { Hex } from '@metamask/utils';
-import { zeroAddress } from 'ethereumjs-util';
 import { useHistory, useLocation } from 'react-router-dom';
 import {
-  setDestTokenExchangeRates,
   setFromChain,
   setFromToken,
   setFromTokenInputValue,
-  setSrcTokenExchangeRates,
   setSelectedQuote,
   setToChain,
   setToChainId,
@@ -48,8 +44,12 @@ import { calcTokenValue } from '../../../../shared/lib/swaps-utils';
 import { BridgeQuoteCard } from '../quotes/bridge-quote-card';
 import { isValidQuoteRequest } from '../utils/quote';
 import { getProviderConfig } from '../../../../shared/modules/selectors/networks';
-import { getCurrentCurrency } from '../../../selectors';
-import { SECOND } from '../../../../shared/constants/time';
+import {
+  CrossChainSwapsEventProperties,
+  useCrossChainSwapsEventTracker,
+} from '../../../hooks/bridge/useCrossChainSwapsEventTracker';
+import { useRequestProperties } from '../../../hooks/bridge/events/useRequestProperties';
+import { MetaMetricsEventName } from '../../../../shared/constants/metametrics';
 import { BridgeInputGroup } from './bridge-input-group';
 
 const PrepareBridgePage = () => {
@@ -57,8 +57,6 @@ const PrepareBridgePage = () => {
 
   const t = useI18nContext();
 
-  const currency = useSelector(getCurrentCurrency);
-
   const fromToken = useSelector(getFromToken);
   const fromTokens = useSelector(getFromTokens);
   const fromTopAssets = useSelector(getFromTopAssets);
@@ -92,6 +90,9 @@ const PrepareBridgePage = () => {
     toChain?.chainId,
   );
 
+  const { flippedRequestProperties } = useRequestProperties();
+  const trackCrossChainSwapsEvent = useCrossChainSwapsEventTracker();
+
   const [rotateSwitchTokens, setRotateSwitchTokens] = useState(false);
 
   const quoteParams = useMemo(
@@ -135,18 +136,16 @@ const PrepareBridgePage = () => {
     debouncedUpdateQuoteRequestInController(quoteParams);
   }, Object.values(quoteParams));
 
-  const debouncedFetchFromExchangeRate = debounce(
-    (chainId: Hex, tokenAddress: string) => {
-      dispatch(setSrcTokenExchangeRates({ chainId, tokenAddress, currency }));
-    },
-    SECOND,
-  );
-
-  const debouncedFetchToExchangeRate = debounce(
-    (chainId: Hex, tokenAddress: string) => {
-      dispatch(setDestTokenExchangeRates({ chainId, tokenAddress, currency }));
+  const trackInputEvent = useCallback(
+    (
+      properties: CrossChainSwapsEventProperties[MetaMetricsEventName.InputChanged],
+    ) => {
+      trackCrossChainSwapsEvent({
+        event: MetaMetricsEventName.InputChanged,
+        properties,
+      });
     },
-    SECOND,
+    [],
   );
 
   const { search } = useLocation();
@@ -180,7 +179,6 @@ const PrepareBridgePage = () => {
         // If there is a matching fromToken, set it as the fromToken
         const matchedToken = fromTokens[tokenAddressFromUrl];
         dispatch(setFromToken(matchedToken));
-        debouncedFetchFromExchangeRate(fromChain.chainId, matchedToken.address);
         removeTokenFromUrl();
         break;
       }
@@ -202,16 +200,25 @@ const PrepareBridgePage = () => {
             dispatch(setFromTokenInputValue(e));
           }}
           onAssetChange={(token) => {
+            token?.address &&
+              trackInputEvent({
+                input: 'token_source',
+                value: token.address,
+              });
             dispatch(setFromToken(token));
             dispatch(setFromTokenInputValue(null));
-            fromChain?.chainId &&
-              token?.address &&
-              debouncedFetchFromExchangeRate(fromChain.chainId, token.address);
           }}
           networkProps={{
             network: fromChain,
             networks: fromChains,
             onNetworkChange: (networkConfig) => {
+              trackInputEvent({
+                input: 'chain_source',
+                value: networkConfig.chainId,
+              });
+              if (networkConfig.chainId === toChain?.chainId) {
+                dispatch(setToChainId(null));
+              }
               dispatch(
                 setActiveNetwork(
                   networkConfig.rpcEndpoints[
@@ -248,6 +255,11 @@ const PrepareBridgePage = () => {
             disabled={!isValidQuoteRequest(quoteRequest, false)}
             onClick={() => {
               setRotateSwitchTokens(!rotateSwitchTokens);
+              flippedRequestProperties &&
+                trackCrossChainSwapsEvent({
+                  event: MetaMetricsEventName.InputSourceDestinationFlipped,
+                  properties: flippedRequestProperties,
+                });
               const toChainClientId =
                 toChain?.defaultRpcEndpointIndex !== undefined &&
                 toChain?.rpcEndpoints
@@ -261,19 +273,6 @@ const PrepareBridgePage = () => {
               fromChain?.chainId && dispatch(setToChain(fromChain.chainId));
               fromChain?.chainId && dispatch(setToChainId(fromChain.chainId));
               dispatch(setToToken(fromToken));
-              fromChain?.chainId &&
-                fromToken?.address &&
-                debouncedFetchToExchangeRate(
-                  fromChain.chainId,
-                  fromToken.address,
-                );
-              toChain?.chainId &&
-                toToken?.address &&
-                toToken.address !== zeroAddress() &&
-                debouncedFetchFromExchangeRate(
-                  toChain.chainId,
-                  toToken.address,
-                );
             }}
           />
         </Box>
@@ -283,15 +282,21 @@ const PrepareBridgePage = () => {
           header={t('bridgeTo')}
           token={toToken}
           onAssetChange={(token) => {
+            token?.address &&
+              trackInputEvent({
+                input: 'token_destination',
+                value: token.address,
+              });
             dispatch(setToToken(token));
-            toChain?.chainId &&
-              token?.address &&
-              debouncedFetchToExchangeRate(toChain.chainId, token.address);
           }}
           networkProps={{
             network: toChain,
             networks: toChains,
             onNetworkChange: (networkConfig) => {
+              trackInputEvent({
+                input: 'chain_destination',
+                value: networkConfig.chainId,
+              });
               dispatch(setToChainId(networkConfig.chainId));
               dispatch(setToChain(networkConfig.chainId));
             },
diff --git a/ui/pages/bridge/quotes/bridge-quote-card.tsx b/ui/pages/bridge/quotes/bridge-quote-card.tsx
index 8adf675afbb3..72c09403f033 100644
--- a/ui/pages/bridge/quotes/bridge-quote-card.tsx
+++ b/ui/pages/bridge/quotes/bridge-quote-card.tsx
@@ -9,7 +9,7 @@ import {
 import { getBridgeQuotes } from '../../../ducks/bridge/selectors';
 import { useI18nContext } from '../../../hooks/useI18nContext';
 import {
-  formatFiatAmount,
+  formatCurrencyAmount,
   formatTokenAmount,
   formatEtaInMinutes,
 } from '../utils/quote';
@@ -17,8 +17,13 @@ import { useCountdownTimer } from '../../../hooks/bridge/useCountdownTimer';
 import MascotBackgroundAnimation from '../../swaps/mascot-background-animation/mascot-background-animation';
 import { getCurrentCurrency } from '../../../selectors';
 import { getNativeCurrency } from '../../../ducks/metamask/metamask';
-import { QuoteInfoRow } from './quote-info-row';
+import { useCrossChainSwapsEventTracker } from '../../../hooks/bridge/useCrossChainSwapsEventTracker';
+import { useRequestProperties } from '../../../hooks/bridge/events/useRequestProperties';
+import { useRequestMetadataProperties } from '../../../hooks/bridge/events/useRequestMetadataProperties';
+import { useQuoteProperties } from '../../../hooks/bridge/events/useQuoteProperties';
+import { MetaMetricsEventName } from '../../../../shared/constants/metametrics';
 import { BridgeQuotesModal } from './bridge-quotes-modal';
+import { QuoteInfoRow } from './quote-info-row';
 
 export const BridgeQuoteCard = () => {
   const t = useI18nContext();
@@ -29,6 +34,11 @@ export const BridgeQuoteCard = () => {
 
   const secondsUntilNextRefresh = useCountdownTimer();
 
+  const trackCrossChainSwapsEvent = useCrossChainSwapsEventTracker();
+  const { quoteRequestProperties } = useRequestProperties();
+  const requestMetadataProperties = useRequestMetadataProperties();
+  const quoteListProperties = useQuoteProperties();
+
   const [showAllQuotes, setShowAllQuotes] = useState(false);
 
   if (isLoading && !activeQuote) {
@@ -75,15 +85,15 @@ export const BridgeQuoteCard = () => {
             label={t('totalFees')}
             tooltipText={t('bridgeTotalFeesTooltipText')}
             description={
-              formatFiatAmount(
-                activeQuote.totalNetworkFee?.fiat,
+              formatCurrencyAmount(
+                activeQuote.totalNetworkFee?.valueInCurrency,
                 currency,
                 2,
               ) ??
               formatTokenAmount(activeQuote.totalNetworkFee?.amount, ticker, 6)
             }
             secondaryDescription={
-              activeQuote.totalNetworkFee?.fiat
+              activeQuote.totalNetworkFee?.valueInCurrency
                 ? formatTokenAmount(
                     activeQuote.totalNetworkFee?.amount,
                     ticker,
@@ -101,6 +111,17 @@ export const BridgeQuoteCard = () => {
           <Button
             variant={ButtonVariant.Link}
             onClick={() => {
+              quoteRequestProperties &&
+                requestMetadataProperties &&
+                quoteListProperties &&
+                trackCrossChainSwapsEvent({
+                  event: MetaMetricsEventName.AllQuotesOpened,
+                  properties: {
+                    ...quoteRequestProperties,
+                    ...requestMetadataProperties,
+                    ...quoteListProperties,
+                  },
+                });
               setShowAllQuotes(true);
             }}
           >
diff --git a/ui/pages/bridge/quotes/bridge-quotes-modal.tsx b/ui/pages/bridge/quotes/bridge-quotes-modal.tsx
index 0f4986aa18fc..d251b8ab72f5 100644
--- a/ui/pages/bridge/quotes/bridge-quotes-modal.tsx
+++ b/ui/pages/bridge/quotes/bridge-quotes-modal.tsx
@@ -20,7 +20,7 @@ import {
 } from '../../../helpers/constants/design-system';
 import {
   formatEtaInMinutes,
-  formatFiatAmount,
+  formatCurrencyAmount,
   formatTokenAmount,
 } from '../utils/quote';
 import { useI18nContext } from '../../../hooks/useI18nContext';
@@ -33,6 +33,12 @@ import {
 } from '../../../ducks/bridge/selectors';
 import { Column, Row } from '../layout';
 import { getNativeCurrency } from '../../../ducks/metamask/metamask';
+import { useQuoteProperties } from '../../../hooks/bridge/events/useQuoteProperties';
+import { useRequestMetadataProperties } from '../../../hooks/bridge/events/useRequestMetadataProperties';
+import { useRequestProperties } from '../../../hooks/bridge/events/useRequestProperties';
+import { useCrossChainSwapsEventTracker } from '../../../hooks/bridge/useCrossChainSwapsEventTracker';
+import { MetaMetricsEventName } from '../../../../shared/constants/metametrics';
+import { useTradeProperties } from '../../../hooks/bridge/events/useTradeProperties';
 
 export const BridgeQuotesModal = ({
   onClose,
@@ -41,11 +47,18 @@ export const BridgeQuotesModal = ({
   const t = useI18nContext();
   const dispatch = useDispatch();
 
-  const { sortedQuotes, activeQuote } = useSelector(getBridgeQuotes);
+  const { sortedQuotes, activeQuote, recommendedQuote } =
+    useSelector(getBridgeQuotes);
   const sortOrder = useSelector(getBridgeSortOrder);
   const currency = useSelector(getCurrentCurrency);
   const nativeCurrency = useSelector(getNativeCurrency);
 
+  const trackCrossChainSwapsEvent = useCrossChainSwapsEventTracker();
+  const { quoteRequestProperties } = useRequestProperties();
+  const requestMetadataProperties = useRequestMetadataProperties();
+  const quoteListProperties = useQuoteProperties();
+  const tradeProperties = useTradeProperties();
+
   return (
     <Modal className="quotes-modal" onClose={onClose} {...modalProps}>
       <ModalOverlay />
@@ -69,7 +82,21 @@ export const BridgeQuotesModal = ({
           ].map(([sortOrderOption, label, icon]) => (
             <ButtonLink
               key={label}
-              onClick={() => dispatch(setSortOrder(sortOrderOption))}
+              onClick={() => {
+                quoteRequestProperties &&
+                  requestMetadataProperties &&
+                  quoteListProperties &&
+                  trackCrossChainSwapsEvent({
+                    event: MetaMetricsEventName.AllQuotesSorted,
+                    properties: {
+                      ...quoteRequestProperties,
+                      ...requestMetadataProperties,
+                      ...quoteListProperties,
+                      sort_order: sortOrder,
+                    },
+                  });
+                dispatch(setSortOrder(sortOrderOption));
+              }}
               startIconName={
                 sortOrder === sortOrderOption && sortOrder === SortOrder.ETA_ASC
                   ? icon
@@ -117,6 +144,8 @@ export const BridgeQuotesModal = ({
               quote: { destAsset, bridges, requestId },
             } = quote;
             const isQuoteActive = requestId === activeQuote?.quote.requestId;
+            const isRecommendedQuote =
+              requestId === recommendedQuote?.quote.requestId;
 
             return (
               <Row
@@ -127,6 +156,21 @@ export const BridgeQuotesModal = ({
                 }
                 onClick={() => {
                   dispatch(setSelectedQuote(quote));
+                  // Emit QuoteSelected event after dispatching setSelectedQuote
+                  quoteRequestProperties &&
+                    requestMetadataProperties &&
+                    quoteListProperties &&
+                    tradeProperties &&
+                    trackCrossChainSwapsEvent({
+                      event: MetaMetricsEventName.QuoteSelected,
+                      properties: {
+                        ...quoteRequestProperties,
+                        ...requestMetadataProperties,
+                        ...quoteListProperties,
+                        ...tradeProperties,
+                        is_best_quote: isRecommendedQuote,
+                      },
+                    });
                   onClose();
                 }}
                 paddingInline={4}
@@ -149,12 +193,17 @@ export const BridgeQuotesModal = ({
                 )}
                 <Column>
                   <Text variant={TextVariant.bodyMd}>
-                    {cost.fiat && formatFiatAmount(cost.fiat, currency, 0)}
+                    {cost.valueInCurrency &&
+                      formatCurrencyAmount(cost.valueInCurrency, currency, 0)}
                   </Text>
                   {[
-                    totalNetworkFee?.fiat
+                    totalNetworkFee?.valueInCurrency
                       ? t('quotedNetworkFee', [
-                          formatFiatAmount(totalNetworkFee.fiat, currency, 0),
+                          formatCurrencyAmount(
+                            totalNetworkFee.valueInCurrency,
+                            currency,
+                            0,
+                          ),
                         ])
                       : t('quotedNetworkFee', [
                           formatTokenAmount(
@@ -167,7 +216,11 @@ export const BridgeQuotesModal = ({
                         ? 'quotedReceivingAmount'
                         : 'quotedReceiveAmount',
                       [
-                        formatFiatAmount(toTokenAmount.fiat, currency, 0) ??
+                        formatCurrencyAmount(
+                          toTokenAmount.valueInCurrency,
+                          currency,
+                          0,
+                        ) ??
                           formatTokenAmount(
                             toTokenAmount.amount,
                             destAsset.symbol,
diff --git a/ui/pages/bridge/types.ts b/ui/pages/bridge/types.ts
index d7aab880ec76..db6d7e8e1394 100644
--- a/ui/pages/bridge/types.ts
+++ b/ui/pages/bridge/types.ts
@@ -6,21 +6,21 @@ export type L1GasFees = {
 };
 
 // Values derived from the quote response
-// fiat values are calculated based on the user's selected currency
+// valueInCurrency values are calculated based on the user's selected currency
 export type QuoteMetadata = {
-  gasFee: { amount: BigNumber; fiat: BigNumber | null };
-  totalNetworkFee: { amount: BigNumber; fiat: BigNumber | null }; // gasFees + relayerFees
-  toTokenAmount: { amount: BigNumber; fiat: BigNumber | null };
-  adjustedReturn: { fiat: BigNumber | null }; // destTokenAmount - totalNetworkFee
-  sentAmount: { amount: BigNumber; fiat: BigNumber | null }; // srcTokenAmount + metabridgeFee
+  gasFee: { amount: BigNumber; valueInCurrency: BigNumber | null };
+  totalNetworkFee: { amount: BigNumber; valueInCurrency: BigNumber | null }; // gasFees + relayerFees
+  toTokenAmount: { amount: BigNumber; valueInCurrency: BigNumber | null };
+  adjustedReturn: { valueInCurrency: BigNumber | null }; // destTokenAmount - totalNetworkFee
+  sentAmount: { amount: BigNumber; valueInCurrency: BigNumber | null }; // srcTokenAmount + metabridgeFee
   swapRate: BigNumber; // destTokenAmount / sentAmount
-  cost: { fiat: BigNumber | null }; // sentAmount - adjustedReturn
+  cost: { valueInCurrency: BigNumber | null }; // sentAmount - adjustedReturn
 };
 
 // Sort order set by the user
 export enum SortOrder {
-  COST_ASC,
-  ETA_ASC,
+  COST_ASC = 'cost_ascending',
+  ETA_ASC = 'time_descending',
 }
 
 // Types copied from Metabridge API
diff --git a/ui/pages/bridge/utils/quote.test.ts b/ui/pages/bridge/utils/quote.test.ts
index eec342517f83..f27cc5f63608 100644
--- a/ui/pages/bridge/utils/quote.test.ts
+++ b/ui/pages/bridge/utils/quote.test.ts
@@ -24,21 +24,21 @@ describe('Bridge quote utils', () => {
       NATIVE_TOKEN,
       '1009000000000000000',
       2521.73,
-      { amount: '1.009', fiat: '2544.42557' },
+      { amount: '1.009', valueInCurrency: '2544.42557' },
     ],
     [
       'erc20',
       ERC20_TOKEN,
       '2543140000',
       0.999781,
-      { amount: '2543.14', fiat: '2542.58305234' },
+      { amount: '2543.14', valueInCurrency: '2542.58305234' },
     ],
     [
       'erc20 with null exchange rates',
       ERC20_TOKEN,
       '2543140000',
       null,
-      { amount: '2543.14', fiat: undefined },
+      { amount: '2543.14', valueInCurrency: undefined },
     ],
   ])(
     'calcToAmount: toToken is %s',
@@ -47,7 +47,7 @@ describe('Bridge quote utils', () => {
       destAsset: { decimals: number; address: string },
       destTokenAmount: string,
       toTokenExchangeRate: number,
-      { amount, fiat }: { amount: string; fiat: string },
+      { amount, valueInCurrency }: { amount: string; valueInCurrency: string },
     ) => {
       const result = calcToAmount(
         {
@@ -57,7 +57,7 @@ describe('Bridge quote utils', () => {
         toTokenExchangeRate,
       );
       expect(result.amount?.toString()).toStrictEqual(amount);
-      expect(result.fiat?.toString()).toStrictEqual(fiat);
+      expect(result.valueInCurrency?.toString()).toStrictEqual(valueInCurrency);
     },
   );
 
@@ -70,7 +70,7 @@ describe('Bridge quote utils', () => {
       2515.02,
       {
         amount: '1.143217728',
-        fiat: '2875.21545027456',
+        valueInCurrency: '2875.21545027456',
       },
     ],
     [
@@ -78,14 +78,14 @@ describe('Bridge quote utils', () => {
       ERC20_TOKEN,
       '100000000',
       0.999781,
-      { amount: '100.512', fiat: '100.489987872' },
+      { amount: '100.512', valueInCurrency: '100.489987872' },
     ],
     [
       'erc20 with null exchange rates',
       ERC20_TOKEN,
       '2543140000',
       null,
-      { amount: '2543.652', fiat: undefined },
+      { amount: '2543.652', valueInCurrency: undefined },
     ],
   ])(
     'calcSentAmount: fromToken is %s',
@@ -94,7 +94,7 @@ describe('Bridge quote utils', () => {
       srcAsset: { decimals: number; address: string },
       srcTokenAmount: string,
       fromTokenExchangeRate: number,
-      { amount, fiat }: { amount: string; fiat: string },
+      { amount, valueInCurrency }: { amount: string; valueInCurrency: string },
     ) => {
       const result = calcSentAmount(
         {
@@ -109,7 +109,7 @@ describe('Bridge quote utils', () => {
         fromTokenExchangeRate,
       );
       expect(result.amount?.toString()).toStrictEqual(amount);
-      expect(result.fiat?.toString()).toStrictEqual(fiat);
+      expect(result.valueInCurrency?.toString()).toStrictEqual(valueInCurrency);
     },
   );
 
@@ -120,7 +120,7 @@ describe('Bridge quote utils', () => {
       NATIVE_TOKEN,
       '1000000000000000000',
       '0x0de0b6b3a7640000',
-      { amount: '2.2351800712e-7', fiat: '0.0005626887014840304' },
+      { amount: '2.2351800712e-7', valueInCurrency: '0.0005626887014840304' },
       undefined,
     ],
     [
@@ -128,7 +128,7 @@ describe('Bridge quote utils', () => {
       ERC20_TOKEN,
       '100000000',
       '0x00',
-      { amount: '2.2351800712e-7', fiat: '0.0005626887014840304' },
+      { amount: '2.2351800712e-7', valueInCurrency: '0.0005626887014840304' },
       undefined,
     ],
     [
@@ -136,7 +136,7 @@ describe('Bridge quote utils', () => {
       ERC20_TOKEN,
       '100000000',
       '0x00',
-      { amount: '4.4703601424e-7', fiat: '0.0011253774029680608' },
+      { amount: '4.4703601424e-7', valueInCurrency: '0.0011253774029680608' },
       1092677,
     ],
     [
@@ -144,7 +144,10 @@ describe('Bridge quote utils', () => {
       ERC20_TOKEN,
       '100000000',
       '0x0de0b6b3a7640000',
-      { amount: '1.00000022351800712', fiat: '2517.4205626887014840304' },
+      {
+        amount: '1.00000022351800712',
+        valueInCurrency: '2517.4205626887014840304',
+      },
       undefined,
     ],
     [
@@ -152,7 +155,10 @@ describe('Bridge quote utils', () => {
       NATIVE_TOKEN,
       '1000000000000000000',
       '0x0de1b6b3a7640000',
-      { amount: '0.000281698494717776', fiat: '0.70915342457242365792' },
+      {
+        amount: '0.000281698494717776',
+        valueInCurrency: '0.70915342457242365792',
+      },
       undefined,
     ],
   ])(
@@ -162,7 +168,7 @@ describe('Bridge quote utils', () => {
       srcAsset: { decimals: number; address: string },
       srcTokenAmount: string,
       value: string,
-      { amount, fiat }: { amount: string; fiat: string },
+      { amount, valueInCurrency }: { amount: string; valueInCurrency: string },
       approvalGasLimit?: number,
     ) => {
       const feeData = { metabridge: { amount: 0 } };
@@ -175,10 +181,12 @@ describe('Bridge quote utils', () => {
       const relayerFee = calcRelayerFee(quote, 2517.42);
       const result = {
         amount: gasFee.amount.plus(relayerFee.amount),
-        fiat: gasFee.fiat?.plus(relayerFee.fiat || '0') ?? null,
+        valueInCurrency:
+          gasFee.valueInCurrency?.plus(relayerFee.valueInCurrency || '0') ??
+          null,
       };
       expect(result.amount?.toString()).toStrictEqual(amount);
-      expect(result.fiat?.toString()).toStrictEqual(fiat);
+      expect(result.valueInCurrency?.toString()).toStrictEqual(valueInCurrency);
     },
   );
 
@@ -189,7 +197,10 @@ describe('Bridge quote utils', () => {
       NATIVE_TOKEN,
       '1000000000000000000',
       '0x0de0b6b3a7640000',
-      { amount: '0.000002832228395508', fiat: '0.00712990840741974936' },
+      {
+        amount: '0.000002832228395508',
+        valueInCurrency: '0.00712990840741974936',
+      },
       undefined,
     ],
     [
@@ -197,7 +208,10 @@ describe('Bridge quote utils', () => {
       ERC20_TOKEN,
       '100000000',
       '0x00',
-      { amount: '0.000002832228395508', fiat: '0.00712990840741974936' },
+      {
+        amount: '0.000002832228395508',
+        valueInCurrency: '0.00712990840741974936',
+      },
       undefined,
     ],
     [
@@ -205,7 +219,10 @@ describe('Bridge quote utils', () => {
       ERC20_TOKEN,
       '100000000',
       '0x00',
-      { amount: '0.000003055746402628', fiat: '0.00769259710890377976' },
+      {
+        amount: '0.000003055746402628',
+        valueInCurrency: '0.00769259710890377976',
+      },
       1092677,
     ],
     [
@@ -213,7 +230,10 @@ describe('Bridge quote utils', () => {
       ERC20_TOKEN,
       '100000000',
       '0x0de0b6b3a7640000',
-      { amount: '1.000002832228395508', fiat: '2517.42712990840741974936' },
+      {
+        amount: '1.000002832228395508',
+        valueInCurrency: '2517.42712990840741974936',
+      },
       undefined,
     ],
     [
@@ -221,7 +241,10 @@ describe('Bridge quote utils', () => {
       NATIVE_TOKEN,
       '1000000000000000000',
       '0x0de1b6b3a7640000',
-      { amount: '0.000284307205106164', fiat: '0.71572064427835937688' },
+      {
+        amount: '0.000284307205106164',
+        valueInCurrency: '0.71572064427835937688',
+      },
       undefined,
     ],
   ])(
@@ -231,7 +254,7 @@ describe('Bridge quote utils', () => {
       srcAsset: { decimals: number; address: string },
       srcTokenAmount: string,
       value: string,
-      { amount, fiat }: { amount: string; fiat: string },
+      { amount, valueInCurrency }: { amount: string; valueInCurrency: string },
       approvalGasLimit?: number,
     ) => {
       const feeData = { metabridge: { amount: 0 } };
@@ -245,10 +268,12 @@ describe('Bridge quote utils', () => {
       const relayerFee = calcRelayerFee(quote, 2517.42);
       const result = {
         amount: gasFee.amount.plus(relayerFee.amount),
-        fiat: gasFee.fiat?.plus(relayerFee.fiat || '0') ?? null,
+        valueInCurrency:
+          gasFee.valueInCurrency?.plus(relayerFee.valueInCurrency || '0') ??
+          null,
       };
       expect(result.amount?.toString()).toStrictEqual(amount);
-      expect(result.fiat?.toString()).toStrictEqual(fiat);
+      expect(result.valueInCurrency?.toString()).toStrictEqual(valueInCurrency);
     },
   );
 
@@ -262,18 +287,18 @@ describe('Bridge quote utils', () => {
     ],
     ['unavailable', null, null, null],
   ])(
-    'calcAdjustedReturn: fiat amounts are %s',
+    'calcAdjustedReturn: valueInCurrency amounts are %s',
     (
       _: string,
-      destTokenAmountInFiat: BigNumber,
-      totalNetworkFeeInFiat: BigNumber,
-      fiat: string,
+      destTokenAmountInCurrency: BigNumber,
+      totalNetworkFeeInCurrency: BigNumber,
+      valueInCurrency: string,
     ) => {
       const result = calcAdjustedReturn(
-        destTokenAmountInFiat,
-        totalNetworkFeeInFiat,
+        destTokenAmountInCurrency,
+        totalNetworkFeeInCurrency,
       );
-      expect(result.fiat).toStrictEqual(fiat);
+      expect(result.valueInCurrency).toStrictEqual(valueInCurrency);
     },
   );
 
diff --git a/ui/pages/bridge/utils/quote.ts b/ui/pages/bridge/utils/quote.ts
index 2fff7e9c1b18..05acc09db520 100644
--- a/ui/pages/bridge/utils/quote.ts
+++ b/ui/pages/bridge/utils/quote.ts
@@ -41,7 +41,10 @@ export const isValidQuoteRequest = (
         partialRequest[field as keyof typeof partialRequest] !== undefined &&
         !isNaN(Number(partialRequest[field as keyof typeof partialRequest])) &&
         partialRequest[field as keyof typeof partialRequest] !== null,
-    )
+    ) &&
+    (requireAmount
+      ? Boolean((partialRequest.srcTokenAmount ?? '').match(/^[1-9]\d*$/u))
+      : true)
   );
 };
 
@@ -55,7 +58,7 @@ export const calcToAmount = (
   );
   return {
     amount: normalizedDestAmount,
-    fiat: exchangeRate
+    valueInCurrency: exchangeRate
       ? normalizedDestAmount.mul(exchangeRate.toString())
       : null,
   };
@@ -71,7 +74,7 @@ export const calcSentAmount = (
   );
   return {
     amount: normalizedSentAmount,
-    fiat: exchangeRate
+    valueInCurrency: exchangeRate
       ? normalizedSentAmount.mul(exchangeRate.toString())
       : null,
   };
@@ -95,7 +98,7 @@ export const calcRelayerFee = (
   );
   return {
     amount: relayerFeeInNative,
-    fiat: nativeExchangeRate
+    valueInCurrency: nativeExchangeRate
       ? relayerFeeInNative.mul(nativeExchangeRate.toString())
       : null,
   };
@@ -136,17 +139,17 @@ export const calcTotalGasFee = (
 
   return {
     amount: gasFeesInDecEth,
-    fiat: gasFeesInUSD,
+    valueInCurrency: gasFeesInUSD,
   };
 };
 
 export const calcAdjustedReturn = (
-  destTokenAmountInFiat: BigNumber | null,
-  totalNetworkFeeInFiat: BigNumber | null,
+  destTokenAmountInCurrency: BigNumber | null,
+  totalNetworkFeeInCurrency: BigNumber | null,
 ) => ({
-  fiat:
-    destTokenAmountInFiat && totalNetworkFeeInFiat
-      ? destTokenAmountInFiat.minus(totalNetworkFeeInFiat)
+  valueInCurrency:
+    destTokenAmountInCurrency && totalNetworkFeeInCurrency
+      ? destTokenAmountInCurrency.minus(totalNetworkFeeInCurrency)
       : null,
 });
 
@@ -156,12 +159,12 @@ export const calcSwapRate = (
 ) => destTokenAmount.div(sentAmount);
 
 export const calcCost = (
-  adjustedReturnInFiat: BigNumber | null,
-  sentAmountInFiat: BigNumber | null,
+  adjustedReturnInCurrency: BigNumber | null,
+  sentAmountInCurrency: BigNumber | null,
 ) => ({
-  fiat:
-    adjustedReturnInFiat && sentAmountInFiat
-      ? sentAmountInFiat.minus(adjustedReturnInFiat)
+  valueInCurrency:
+    adjustedReturnInCurrency && sentAmountInCurrency
+      ? sentAmountInCurrency.minus(adjustedReturnInCurrency)
       : null,
 });
 
@@ -174,7 +177,7 @@ export const formatTokenAmount = (
   precision: number = 2,
 ) => `${amount.toFixed(precision)} ${symbol}`;
 
-export const formatFiatAmount = (
+export const formatCurrencyAmount = (
   amount: BigNumber | null,
   currency: string,
   precision: number = DEFAULT_PRECISION,
@@ -192,3 +195,8 @@ export const formatFiatAmount = (
   }
   return formatCurrency(amount.toString(), currency, precision);
 };
+
+export const formatProviderLabel = (
+  quote?: QuoteResponse,
+): `${string}_${string}` =>
+  `${quote?.quote.bridgeId}_${quote?.quote.bridges[0]}`;
diff --git a/ui/selectors/selectors.js b/ui/selectors/selectors.js
index a2d6605819df..f3d05baad507 100644
--- a/ui/selectors/selectors.js
+++ b/ui/selectors/selectors.js
@@ -1453,6 +1453,20 @@ export function getUSDConversionRate(state) {
     ?.usdConversionRate;
 }
 
+export const getUSDConversionRateByChainId = (chainId) =>
+  createSelector(
+    getCurrencyRates,
+    (state) => selectNetworkConfigurationByChainId(state, chainId),
+    (currencyRates, networkConfiguration) => {
+      if (!networkConfiguration) {
+        return undefined;
+      }
+
+      const { nativeCurrency } = networkConfiguration;
+      return currencyRates[nativeCurrency]?.usdConversionRate;
+    },
+  );
+
 export function getCurrencyRates(state) {
   return state.metamask.currencyRates;
 }

From e7bba6d8947497e90ecc8c8be649a807d329bcc4 Mon Sep 17 00:00:00 2001
From: Nick Gambino <35090461+gambinish@users.noreply.github.com>
Date: Tue, 10 Dec 2024 15:52:31 -0800
Subject: [PATCH 076/175] refactor: Init getTokenNetworkFilter selector
 (#29068)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## **Description**

We are falling back to an empty object when tokenNetworkFilter is
undefined in several areas around the app. This PR aims to consolidate
those within a single selector to make is easier to maintain and fall
back on.

This only mitigates the issue. Root cause is that the
`tokenNetworkFilter` needs to be added via a migration script in order
to properly be present, without having to fallback.

[![Open in GitHub
Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/29068?quickstart=1)

## **Related issues**

Fixes:
https://metamask.sentry.io/issues/6125799129/?environment=production&project=273505&query=is%3Aunresolved%20issue.priority%3A%5Bhigh%2C%20medium%5D%20firstRelease%3A12.9.0&referrer=issue-stream&sort=freq&statsPeriod=7d&stream_index=0

## **Manual testing steps**

1. Hardcode tokenNetworkFilter to undefined, should not break app.

## **Screenshots/Recordings**

<!-- If applicable, add screenshots and/or recordings to visualize the
before and after of your change. -->

### **Before**

<!-- [screenshots/recordings] -->

### **After**

<!-- [screenshots/recordings] -->

## **Pre-merge author checklist**

- [x] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension Coding
Standards](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/CODING_GUIDELINES.md).
- [x] I've completed the PR template to the best of my ability
- [x] I’ve included tests if applicable
- [x] I’ve documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [x] I’ve applied the right labels on the PR (see [labeling
guidelines](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.

## **Pre-merge reviewer checklist**

- [ ] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed).
- [ ] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.

---------

Co-authored-by: Brian Bergeron <brian.e.bergeron@gmail.com>
---
 .../asset-list-control-bar.tsx                      | 13 ++++++++-----
 ui/components/app/assets/asset-list/asset-list.tsx  |  6 +++---
 .../asset-list/network-filter/network-filter.tsx    | 10 +++++-----
 ui/components/app/assets/token-list/token-list.tsx  |  7 ++++---
 .../detected-token-selection-popover.js             |  6 +++---
 ui/components/app/detected-token/detected-token.js  |  6 +++---
 .../detected-token-banner/detected-token-banner.js  |  6 +++---
 .../network-list-menu/network-list-menu.tsx         |  4 ++--
 ui/selectors/selectors.js                           |  8 ++++++--
 9 files changed, 37 insertions(+), 29 deletions(-)

diff --git a/ui/components/app/assets/asset-list/asset-list-control-bar/asset-list-control-bar.tsx b/ui/components/app/assets/asset-list/asset-list-control-bar/asset-list-control-bar.tsx
index 00e0692cfc73..768d2bb896eb 100644
--- a/ui/components/app/assets/asset-list/asset-list-control-bar/asset-list-control-bar.tsx
+++ b/ui/components/app/assets/asset-list/asset-list-control-bar/asset-list-control-bar.tsx
@@ -1,6 +1,9 @@
 import React, { useEffect, useRef, useState, useContext, useMemo } from 'react';
 import { useDispatch, useSelector } from 'react-redux';
-import { getCurrentNetwork, getPreferences } from '../../../../../selectors';
+import {
+  getCurrentNetwork,
+  getTokenNetworkFilter,
+} from '../../../../../selectors';
 import { getNetworkConfigurationsByChainId } from '../../../../../../shared/modules/selectors/networks';
 import {
   Box,
@@ -55,7 +58,7 @@ const AssetListControlBar = ({ showTokensLinks }: AssetListControlBarProps) => {
   const currentNetwork = useSelector(getCurrentNetwork);
   const allNetworks = useSelector(getNetworkConfigurationsByChainId);
 
-  const { tokenNetworkFilter } = useSelector(getPreferences);
+  const tokenNetworkFilter = useSelector(getTokenNetworkFilter);
   const [isTokenSortPopoverOpen, setIsTokenSortPopoverOpen] = useState(false);
   const [isImportTokensPopoverOpen, setIsImportTokensPopoverOpen] =
     useState(false);
@@ -72,7 +75,7 @@ const AssetListControlBar = ({ showTokensLinks }: AssetListControlBarProps) => {
   });
 
   const allNetworksFilterShown =
-    Object.keys(tokenNetworkFilter || {}).length !==
+    Object.keys(tokenNetworkFilter).length !==
     Object.keys(allOpts || {}).length;
 
   useEffect(() => {
@@ -88,7 +91,7 @@ const AssetListControlBar = ({ showTokensLinks }: AssetListControlBarProps) => {
   useEffect(() => {
     if (
       process.env.PORTFOLIO_VIEW &&
-      Object.keys(tokenNetworkFilter || {}).length === 0
+      Object.keys(tokenNetworkFilter).length === 0
     ) {
       dispatch(setTokenNetworkFilter(allOpts));
     } else {
@@ -99,7 +102,7 @@ const AssetListControlBar = ({ showTokensLinks }: AssetListControlBarProps) => {
   // When a network gets added/removed we want to make sure that we switch to the filtered list of the current network
   // We only want to do this if the "Current Network" filter is selected
   useEffect(() => {
-    if (Object.keys(tokenNetworkFilter || {}).length === 1) {
+    if (Object.keys(tokenNetworkFilter).length === 1) {
       dispatch(setTokenNetworkFilter({ [currentNetwork.chainId]: true }));
     }
   }, [Object.keys(allNetworks).length]);
diff --git a/ui/components/app/assets/asset-list/asset-list.tsx b/ui/components/app/assets/asset-list/asset-list.tsx
index ab2adb308bf4..6a82295cb2f3 100644
--- a/ui/components/app/assets/asset-list/asset-list.tsx
+++ b/ui/components/app/assets/asset-list/asset-list.tsx
@@ -7,8 +7,8 @@ import {
   getAllDetectedTokensForSelectedAddress,
   getDetectedTokensInCurrentNetwork,
   getIstokenDetectionInactiveOnNonMainnetSupportedNetwork,
-  getPreferences,
   getSelectedAccount,
+  getTokenNetworkFilter,
 } from '../../../../selectors';
 import { getNetworkConfigurationsByChainId } from '../../../../../shared/modules/selectors/networks';
 import {
@@ -80,14 +80,14 @@ const AssetList = ({ onClickAsset, showTokensLinks }: AssetListProps) => {
   );
 
   const allNetworks = useSelector(getNetworkConfigurationsByChainId);
-  const { tokenNetworkFilter } = useSelector(getPreferences);
+  const tokenNetworkFilter = useSelector(getTokenNetworkFilter);
   const allOpts: Record<string, boolean> = {};
   Object.keys(allNetworks || {}).forEach((chainId) => {
     allOpts[chainId] = true;
   });
 
   const allNetworksFilterShown =
-    Object.keys(tokenNetworkFilter || {}).length !==
+    Object.keys(tokenNetworkFilter).length !==
     Object.keys(allOpts || {}).length;
 
   const [showFundingMethodModal, setShowFundingMethodModal] = useState(false);
diff --git a/ui/components/app/assets/asset-list/network-filter/network-filter.tsx b/ui/components/app/assets/asset-list/network-filter/network-filter.tsx
index e1fdd8db9535..eece5530eea4 100644
--- a/ui/components/app/assets/asset-list/network-filter/network-filter.tsx
+++ b/ui/components/app/assets/asset-list/network-filter/network-filter.tsx
@@ -3,10 +3,10 @@ import { useDispatch, useSelector } from 'react-redux';
 import { setTokenNetworkFilter } from '../../../../../store/actions';
 import {
   getCurrentNetwork,
-  getPreferences,
   getShouldHideZeroBalanceTokens,
   getSelectedAccount,
   getAllChainsToPoll,
+  getTokenNetworkFilter,
 } from '../../../../../selectors';
 import {
   getCurrentChainId,
@@ -48,7 +48,7 @@ const NetworkFilter = ({ handleClose }: SortControlProps) => {
   const selectedAccount = useSelector(getSelectedAccount);
   const allNetworks = useSelector(getNetworkConfigurationsByChainId);
   const [chainsToShow, setChainsToShow] = useState<string[]>([]);
-  const { tokenNetworkFilter } = useSelector(getPreferences);
+  const tokenNetworkFilter = useSelector(getTokenNetworkFilter);
   const shouldHideZeroBalanceTokens = useSelector(
     getShouldHideZeroBalanceTokens,
   );
@@ -102,7 +102,7 @@ const NetworkFilter = ({ handleClose }: SortControlProps) => {
     <>
       <SelectableListItem
         isSelected={
-          Object.keys(tokenNetworkFilter || {}).length ===
+          Object.keys(tokenNetworkFilter).length ===
           Object.keys(allNetworks || {}).length
         }
         onClick={() => handleFilter(allOpts)}
@@ -163,8 +163,8 @@ const NetworkFilter = ({ handleClose }: SortControlProps) => {
       </SelectableListItem>
       <SelectableListItem
         isSelected={
-          tokenNetworkFilter[chainId] &&
-          Object.keys(tokenNetworkFilter || {}).length === 1
+          Object.keys(tokenNetworkFilter).length === 1 &&
+          tokenNetworkFilter[chainId]
         }
         onClick={() => handleFilter({ [chainId]: true })}
         testId="network-filter-current"
diff --git a/ui/components/app/assets/token-list/token-list.tsx b/ui/components/app/assets/token-list/token-list.tsx
index d3e67f6204cc..8a8b207c6397 100644
--- a/ui/components/app/assets/token-list/token-list.tsx
+++ b/ui/components/app/assets/token-list/token-list.tsx
@@ -17,6 +17,7 @@ import {
   getSelectedAccountTokensAcrossChains,
   getShowFiatInTestnets,
   getTokenExchangeRates,
+  getTokenNetworkFilter,
 } from '../../../../selectors';
 import { getConversionRate } from '../../../../ducks/metamask/metamask';
 import { filterAssets } from '../util/filter';
@@ -86,8 +87,8 @@ export default function TokenList({
   const dispatch = useDispatch();
   const currentNetwork = useSelector(getCurrentNetwork);
   const allNetworks = useSelector(getNetworkConfigurationIdByChainId);
-  const { tokenSortConfig, tokenNetworkFilter, privacyMode } =
-    useSelector(getPreferences);
+  const { tokenSortConfig, privacyMode } = useSelector(getPreferences);
+  const tokenNetworkFilter = useSelector(getTokenNetworkFilter);
   const selectedAccount = useSelector(getSelectedAccount);
   const conversionRate = useSelector(getConversionRate);
   const contractExchangeRates = useSelector(
@@ -116,7 +117,7 @@ export default function TokenList({
       const allNetworkFilters = Object.fromEntries(
         Object.keys(allNetworks).map((chainId) => [chainId, true]),
       );
-      if (Object.keys(tokenNetworkFilter || {}).length > 1) {
+      if (Object.keys(tokenNetworkFilter).length > 1) {
         dispatch(setTokenNetworkFilter(allNetworkFilters));
       }
     }
diff --git a/ui/components/app/detected-token/detected-token-selection-popover/detected-token-selection-popover.js b/ui/components/app/detected-token/detected-token-selection-popover/detected-token-selection-popover.js
index 4c674a5c437f..ae5e1048037f 100644
--- a/ui/components/app/detected-token/detected-token-selection-popover/detected-token-selection-popover.js
+++ b/ui/components/app/detected-token/detected-token-selection-popover/detected-token-selection-popover.js
@@ -17,7 +17,7 @@ import {
   getAllDetectedTokensForSelectedAddress,
   getCurrentNetwork,
   getDetectedTokensInCurrentNetwork,
-  getPreferences,
+  getTokenNetworkFilter,
 } from '../../../../selectors';
 
 import Popover from '../../../ui/popover';
@@ -41,14 +41,14 @@ const DetectedTokenSelectionPopover = ({
 
   const detectedTokens = useSelector(getDetectedTokensInCurrentNetwork);
   const allNetworks = useSelector(getNetworkConfigurationsByChainId);
-  const { tokenNetworkFilter } = useSelector(getPreferences);
+  const tokenNetworkFilter = useSelector(getTokenNetworkFilter);
   const allOpts = {};
   Object.keys(allNetworks || {}).forEach((networkId) => {
     allOpts[networkId] = true;
   });
 
   const allNetworksFilterShown =
-    Object.keys(tokenNetworkFilter || {}).length !==
+    Object.keys(tokenNetworkFilter).length !==
     Object.keys(allOpts || {}).length;
 
   const currentNetwork = useSelector(getCurrentNetwork);
diff --git a/ui/components/app/detected-token/detected-token.js b/ui/components/app/detected-token/detected-token.js
index e1480760def5..b28eb8f51ff8 100644
--- a/ui/components/app/detected-token/detected-token.js
+++ b/ui/components/app/detected-token/detected-token.js
@@ -16,7 +16,7 @@ import {
 import {
   getAllDetectedTokensForSelectedAddress,
   getDetectedTokensInCurrentNetwork,
-  getPreferences,
+  getTokenNetworkFilter,
 } from '../../../selectors';
 import { MetaMetricsContext } from '../../../contexts/metametrics';
 
@@ -63,14 +63,14 @@ const DetectedToken = ({ setShowDetectedTokens }) => {
   );
   const currentChainId = useSelector(getCurrentChainId);
   const allNetworks = useSelector(getNetworkConfigurationsByChainId);
-  const { tokenNetworkFilter } = useSelector(getPreferences);
+  const tokenNetworkFilter = useSelector(getTokenNetworkFilter);
   const allOpts = {};
   Object.keys(allNetworks || {}).forEach((chainId) => {
     allOpts[chainId] = true;
   });
 
   const allNetworksFilterShown =
-    Object.keys(tokenNetworkFilter || {}).length !==
+    Object.keys(tokenNetworkFilter).length !==
     Object.keys(allOpts || {}).length;
 
   const totalDetectedTokens = useMemo(() => {
diff --git a/ui/components/multichain/detected-token-banner/detected-token-banner.js b/ui/components/multichain/detected-token-banner/detected-token-banner.js
index 7cd315d57cab..2b6f7238024f 100644
--- a/ui/components/multichain/detected-token-banner/detected-token-banner.js
+++ b/ui/components/multichain/detected-token-banner/detected-token-banner.js
@@ -11,7 +11,7 @@ import {
 import {
   getDetectedTokensInCurrentNetwork,
   getAllDetectedTokensForSelectedAddress,
-  getPreferences,
+  getTokenNetworkFilter,
 } from '../../../selectors';
 import { MetaMetricsContext } from '../../../contexts/metametrics';
 import {
@@ -28,7 +28,7 @@ export const DetectedTokensBanner = ({
 }) => {
   const t = useI18nContext();
   const trackEvent = useContext(MetaMetricsContext);
-  const { tokenNetworkFilter } = useSelector(getPreferences);
+  const tokenNetworkFilter = useSelector(getTokenNetworkFilter);
   const allNetworks = useSelector(getNetworkConfigurationsByChainId);
 
   const allOpts = {};
@@ -37,7 +37,7 @@ export const DetectedTokensBanner = ({
   });
 
   const allNetworksFilterShown =
-    Object.keys(tokenNetworkFilter || {}).length !==
+    Object.keys(tokenNetworkFilter).length !==
     Object.keys(allOpts || {}).length;
 
   const detectedTokens = useSelector(getDetectedTokensInCurrentNetwork);
diff --git a/ui/components/multichain/network-list-menu/network-list-menu.tsx b/ui/components/multichain/network-list-menu/network-list-menu.tsx
index 28680b24ba45..390996980f11 100644
--- a/ui/components/multichain/network-list-menu/network-list-menu.tsx
+++ b/ui/components/multichain/network-list-menu/network-list-menu.tsx
@@ -54,7 +54,7 @@ import {
   getAllDomains,
   getPermittedChainsForSelectedTab,
   getPermittedAccountsForSelectedTab,
-  getPreferences,
+  getTokenNetworkFilter,
 } from '../../../selectors';
 import ToggleButton from '../../ui/toggle-button';
 import {
@@ -116,7 +116,7 @@ export const NetworkListMenu = ({ onClose }: { onClose: () => void }) => {
   const dispatch = useDispatch();
   const trackEvent = useContext(MetaMetricsContext);
 
-  const { tokenNetworkFilter } = useSelector(getPreferences);
+  const tokenNetworkFilter = useSelector(getTokenNetworkFilter);
   const showTestNetworks = useSelector(getShowTestNetworks);
   const currentChainId = useSelector(getCurrentChainId);
   const selectedTabOrigin = useSelector(getOriginOfCurrentTab);
diff --git a/ui/selectors/selectors.js b/ui/selectors/selectors.js
index f3d05baad507..d05b0695dcd5 100644
--- a/ui/selectors/selectors.js
+++ b/ui/selectors/selectors.js
@@ -1076,8 +1076,7 @@ export function getPetnamesEnabled(state) {
 
 export function getIsTokenNetworkFilterEqualCurrentNetwork(state) {
   const chainId = getCurrentChainId(state);
-  const { tokenNetworkFilter: tokenNetworkFilterValue } = getPreferences(state);
-  const tokenNetworkFilter = tokenNetworkFilterValue || {};
+  const tokenNetworkFilter = getTokenNetworkFilter(state);
   if (
     Object.keys(tokenNetworkFilter).length === 1 &&
     Object.keys(tokenNetworkFilter)[0] === chainId
@@ -1087,6 +1086,11 @@ export function getIsTokenNetworkFilterEqualCurrentNetwork(state) {
   return false;
 }
 
+export function getTokenNetworkFilter(state) {
+  const { tokenNetworkFilter } = getPreferences(state);
+  return tokenNetworkFilter || {};
+}
+
 export function getUseTransactionSimulations(state) {
   return Boolean(state.metamask.useTransactionSimulations);
 }

From 3453c9519b179905ee76b5bdeadf88713f925ba1 Mon Sep 17 00:00:00 2001
From: Nick Gambino <35090461+gambinish@users.noreply.github.com>
Date: Tue, 10 Dec 2024 17:37:44 -0800
Subject: [PATCH 077/175] fix: Token list should respect hidezerobalance
 setting (#29058)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## **Description**

If a token is not a native asset for a chain, and the balance is zero,
it should not be rendered if the `hideZeroBalance` setting is toggled to
true.

[![Open in GitHub
Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/29058?quickstart=1)

## **Related issues**

Fixes: erc20 and native tokens with zero balance rendering on asset list
on 12.9 release.

## **Manual testing steps**

1. Add an erc20 token to any chain with zero balance, should display
when imported by default
2. Toggle `hideZeroBalance` setting to true in general settings

> Respect the "hide zero balance" setting (when true):
- Native tokens should always display with zero balance when on the
current network filter.
- Native tokens should not display with zero balance when on all
networks filter
- ERC20 tokens with zero balances should respect the setting on both the
current and all networks.
   Respect the "hide zero balance" setting (when false):
- Native tokens should always display with zero balance when on the
current network filter.
- Native tokens should always display with zero balance when on all
networks filter
- ERC20 tokens always display with zero balance on both the current and
all networks filter.

## **Screenshots/Recordings**


https://github.com/user-attachments/assets/aaee7e23-ab5c-4216-89e5-dc11485200bc

## **Pre-merge author checklist**

- [x] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension Coding
Standards](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/CODING_GUIDELINES.md).
- [x] I've completed the PR template to the best of my ability
- [x] I’ve included tests if applicable
- [x] I’ve documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [x] I’ve applied the right labels on the PR (see [labeling
guidelines](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.

## **Pre-merge reviewer checklist**

- [ ] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed).
- [ ] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.

---------

Co-authored-by: sahar-fehri <sahar.fehri@consensys.net>
---
 .../app/assets/token-list/token-list.tsx      | 41 +++++++++++++------
 1 file changed, 29 insertions(+), 12 deletions(-)

diff --git a/ui/components/app/assets/token-list/token-list.tsx b/ui/components/app/assets/token-list/token-list.tsx
index 8a8b207c6397..a2ba7674f6a2 100644
--- a/ui/components/app/assets/token-list/token-list.tsx
+++ b/ui/components/app/assets/token-list/token-list.tsx
@@ -8,6 +8,7 @@ import {
   getCurrencyRates,
   getCurrentNetwork,
   getIsTestnet,
+  getIsTokenNetworkFilterEqualCurrentNetwork,
   getMarketData,
   getNetworkConfigurationIdByChainId,
   getNewTokensImported,
@@ -87,7 +88,8 @@ export default function TokenList({
   const dispatch = useDispatch();
   const currentNetwork = useSelector(getCurrentNetwork);
   const allNetworks = useSelector(getNetworkConfigurationIdByChainId);
-  const { tokenSortConfig, privacyMode } = useSelector(getPreferences);
+  const { tokenSortConfig, privacyMode, hideZeroBalanceTokens } =
+    useSelector(getPreferences);
   const tokenNetworkFilter = useSelector(getTokenNetworkFilter);
   const selectedAccount = useSelector(getSelectedAccount);
   const conversionRate = useSelector(getConversionRate);
@@ -97,6 +99,9 @@ export default function TokenList({
   );
   const newTokensImported = useSelector(getNewTokensImported);
   const selectedAccountTokensChains = useFilteredAccountTokens(currentNetwork);
+  const isOnCurrentNetwork = useSelector(
+    getIsTokenNetworkFilterEqualCurrentNetwork,
+  );
 
   const { tokenBalances } = useTokenBalances();
   const selectedAccountTokenBalancesAcrossChains =
@@ -110,7 +115,7 @@ export default function TokenList({
   const nativeBalances: Record<Hex, Hex> = useSelector(
     getSelectedAccountNativeTokenCachedBalanceByChainId,
   ) as Record<Hex, Hex>;
-
+  const isTestnet = useSelector(getIsTestnet);
   // Ensure newly added networks are included in the tokenNetworkFilter
   useEffect(() => {
     if (process.env.PORTFOLIO_VIEW) {
@@ -148,14 +153,28 @@ export default function TokenList({
             currencyRates,
           });
 
-          // Append processed token with balance and fiat amount
-          tokensWithBalance.push({
-            ...token,
-            balance,
-            tokenFiatAmount,
-            chainId,
-            string: String(balance),
-          });
+          // Respect the "hide zero balance" setting (when true):
+          // - Native tokens should always display with zero balance when on the current network filter.
+          // - Native tokens should not display with zero balance when on all networks filter
+          // - ERC20 tokens with zero balances should respect the setting on both the current and all networks.
+
+          // Respect the "hide zero balance" setting (when false):
+          // - Native tokens should always display with zero balance when on the current network filter.
+          // - Native tokens should always display with zero balance when on all networks filter
+          // - ERC20 tokens always display with zero balance on both the current and all networks filter.
+          if (
+            !hideZeroBalanceTokens ||
+            balance !== '0' ||
+            (token.isNative && isOnCurrentNetwork)
+          ) {
+            tokensWithBalance.push({
+              ...token,
+              balance,
+              tokenFiatAmount,
+              chainId,
+              string: String(balance),
+            });
+          }
         });
       },
     );
@@ -217,8 +236,6 @@ export default function TokenList({
     console.log(t('loadingTokens'));
   }
 
-  // Check if testnet
-  const isTestnet = useSelector(getIsTestnet);
   const shouldShowFiat = useMultichainSelector(
     getMultichainShouldShowFiat,
     selectedAccount,

From 5f8af0e9ec063b7b9154c7fb73791379acd75ab7 Mon Sep 17 00:00:00 2001
From: Garrett Bear <garrett.whisten@consensys.net>
Date: Tue, 10 Dec 2024 18:09:12 -0800
Subject: [PATCH 078/175] fix: Remove Storybook theme flex style (#27783)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## **Description**

In this PR, I updated the wrapper of the Storybook to remove the flex
layout, as seen in the provided before and after screenshots. The change
simplifies the layout, which was previously managed with a flexbox that
is no longer necessary.

This modification improves layout management for the `FormTextField`
component examples. Both light and dark modes are supported, ensuring a
consistent appearance across different themes.

## **Related issues**

None reported.

## **Manual testing steps**

1. Open the Storybook interface.
2. Navigate to the `FormTextField` component.
3. Observe the layout in both light and dark themes.
4. Verify that the form elements are correctly aligned and behave as
expected.

## **Screenshots/Recordings**

### **Before**
<img width="1221" alt="Screenshot 2024-10-10 at 3 48 41 PM"
src="https://github.com/user-attachments/assets/1c2e1b91-6c1b-458e-bf35-47db1645c21a">



### **After**

<img width="1079" alt="Screenshot 2024-10-10 at 3 51 02 PM"
src="https://github.com/user-attachments/assets/61e1c0d5-6fa8-4490-8a2b-ee9a12d04377">


https://github.com/user-attachments/assets/48c56e71-8dde-4f4b-8a78-15b8f25d116c



## **Pre-merge author checklist**

- [x] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension Coding
Standards](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/CODING_GUIDELINES.md).
- [x] I've completed the PR template to the best of my ability.
- [ ] I’ve included tests if applicable.
- [ ] I’ve documented my code using [JSDoc](https://jsdoc.app/) format
if applicable.
- [x] I’ve applied the right labels on the PR (see [labeling
guidelines](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.

## **Pre-merge reviewer checklist**

- [ ] I've manually tested the PR (e.g., pull and build the branch, run
the app, and test the code being changed).
- [ ] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and/or screenshots.
---
 .storybook/preview.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.storybook/preview.js b/.storybook/preview.js
index 273afa2468b0..fc23daec5533 100644
--- a/.storybook/preview.js
+++ b/.storybook/preview.js
@@ -186,7 +186,6 @@ const withColorScheme = (Story, context) => {
       <div
         {...props}
         style={{
-          display: 'flex',
           padding: '1rem',
           backgroundColor: 'var(--color-background-default)',
           color: 'var(--color-text-default)',

From 07d4265d1665d94ec580ef65fe8e020641e57c4a Mon Sep 17 00:00:00 2001
From: Brian Bergeron <brian.e.bergeron@gmail.com>
Date: Wed, 11 Dec 2024 02:11:23 -0800
Subject: [PATCH 079/175] feat: only poll popular networks (#29071)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<!--
Please submit this PR as a draft initially.
Do not mark it as "Ready for review" until the template has been
completely filled out, and PR status checks have passed at least once.
-->

## **Description**

To reduce the impact of showing assets across all networks, which can be
unbounded, this PR scopes the portfolio view to the 9 popular networks
built into metamask.

[![Open in GitHub
Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/29071?quickstart=1)

## **Related issues**

Fixes: https://github.com/MetaMask/metamask-extension/issues/29055

## **Manual testing steps**

1. On popular networks:
- The token filter should allow switching between popular networks and
current network
  - The filter should work as described
  - RPC requests in the background should only hit the popular networks

2. On other networks
- The token filter should become disabled and scoped to the current
network
  - RPC requests in the background should only hit the current network

## **Screenshots/Recordings**

<!-- If applicable, add screenshots and/or recordings to visualize the
before and after of your change. -->

### **Before**

<!-- [screenshots/recordings] -->

### **After**

<!-- [screenshots/recordings] -->

## **Pre-merge author checklist**

- [ ] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension Coding
Standards](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/CODING_GUIDELINES.md).
- [ ] I've completed the PR template to the best of my ability
- [ ] I’ve included tests if applicable
- [ ] I’ve documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [ ] I’ve applied the right labels on the PR (see [labeling
guidelines](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.

## **Pre-merge reviewer checklist**

- [ ] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed).
- [ ] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.

---------

Co-authored-by: Nicholas Gambino <nicholas.gambino@consensys.net>
---
 app/_locales/en/messages.json                 | 11 ++---
 shared/constants/network.ts                   |  5 +++
 ...rs-after-init-opt-in-background-state.json |  6 ---
 .../errors-after-init-opt-in-ui-state.json    |  6 ---
 .../asset-list-control-bar.tsx                | 22 ++++++----
 .../network-filter/network-filter.tsx         |  2 +-
 .../app/assets/token-list/token-list.tsx      |  6 ++-
 .../network-list-menu/network-list-menu.tsx   |  6 +--
 ui/pages/asset/components/asset-page.tsx      |  2 +-
 ui/selectors/selectors.js                     | 42 +++++++++++++++++--
 10 files changed, 73 insertions(+), 35 deletions(-)

diff --git a/app/_locales/en/messages.json b/app/_locales/en/messages.json
index a23df7a26395..7a6495a498a6 100644
--- a/app/_locales/en/messages.json
+++ b/app/_locales/en/messages.json
@@ -509,10 +509,6 @@
   "allCustodianAccountsConnectedTitle": {
     "message": "No accounts available to connect"
   },
-  "allNetworks": {
-    "message": "All networks",
-    "description": "Speicifies to token network filter to filter by all Networks"
-  },
   "allOfYour": {
     "message": "All of your $1",
     "description": "$1 is the symbol or name of the token that the user is approving spending"
@@ -4308,6 +4304,9 @@
     "message": "Some of these networks rely on third parties. The connections may be less reliable or enable third-parties to track activity. $1",
     "description": "$1 is Learn more link"
   },
+  "popularNetworks": {
+    "message": "Popular networks"
+  },
   "portfolio": {
     "message": "Portfolio"
   },
@@ -4472,7 +4471,9 @@
   "quoteRate": {
     "message": "Quote rate"
   },
-  "quotedNetworkFee": { "message": "$1 network fee" },
+  "quotedNetworkFee": {
+    "message": "$1 network fee"
+  },
   "quotedReceiveAmount": {
     "message": "$1 receive amount"
   },
diff --git a/shared/constants/network.ts b/shared/constants/network.ts
index 60522a3cd03e..30f59c156dda 100644
--- a/shared/constants/network.ts
+++ b/shared/constants/network.ts
@@ -1096,6 +1096,11 @@ export const FEATURED_RPCS: AddNetworkFields[] = [
   },
 ];
 
+export const FEATURED_NETWORK_CHAIN_IDS = [
+  CHAIN_IDS.MAINNET,
+  ...FEATURED_RPCS.map((rpc) => rpc.chainId),
+];
+
 export const infuraChainIdsTestNets: string[] = [
   CHAIN_IDS.SEPOLIA,
   CHAIN_IDS.HOLESKY,
diff --git a/test/e2e/tests/metrics/state-snapshots/errors-after-init-opt-in-background-state.json b/test/e2e/tests/metrics/state-snapshots/errors-after-init-opt-in-background-state.json
index 8e64bd8a92fa..c28cd91f5815 100644
--- a/test/e2e/tests/metrics/state-snapshots/errors-after-init-opt-in-background-state.json
+++ b/test/e2e/tests/metrics/state-snapshots/errors-after-init-opt-in-background-state.json
@@ -242,10 +242,6 @@
       "tokenSortConfig": "object",
       "shouldShowAggregatedBalancePopover": "boolean",
       "tokenNetworkFilter": {
-        "0x1": "boolean",
-        "0xaa36a7": "boolean",
-        "0xe705": "boolean",
-        "0xe708": "boolean",
         "0x539": "boolean"
       },
       "redesignedConfirmationsEnabled": true,
@@ -334,8 +330,6 @@
   "TokenListController": {
     "tokenList": "object",
     "tokensChainsCache": {
-      "0x1": "object",
-      "0xe708": "object",
       "0x539": "object"
     },
     "preventPollingOnNetworkRestart": false
diff --git a/test/e2e/tests/metrics/state-snapshots/errors-after-init-opt-in-ui-state.json b/test/e2e/tests/metrics/state-snapshots/errors-after-init-opt-in-ui-state.json
index 0c1f27681c5a..079934c65eec 100644
--- a/test/e2e/tests/metrics/state-snapshots/errors-after-init-opt-in-ui-state.json
+++ b/test/e2e/tests/metrics/state-snapshots/errors-after-init-opt-in-ui-state.json
@@ -38,10 +38,6 @@
       "tokenSortConfig": "object",
       "shouldShowAggregatedBalancePopover": "boolean",
       "tokenNetworkFilter": {
-        "0x1": "boolean",
-        "0xaa36a7": "boolean",
-        "0xe705": "boolean",
-        "0xe708": "boolean",
         "0x539": "boolean"
       },
       "redesignedConfirmationsEnabled": true,
@@ -180,8 +176,6 @@
     "nonRPCGasFeeApisDisabled": "boolean",
     "tokenList": "object",
     "tokensChainsCache": {
-      "0x1": "object",
-      "0xe708": "object",
       "0x539": "object"
     },
     "preventPollingOnNetworkRestart": false,
diff --git a/ui/components/app/assets/asset-list/asset-list-control-bar/asset-list-control-bar.tsx b/ui/components/app/assets/asset-list/asset-list-control-bar/asset-list-control-bar.tsx
index 768d2bb896eb..348fd82fbdaa 100644
--- a/ui/components/app/assets/asset-list/asset-list-control-bar/asset-list-control-bar.tsx
+++ b/ui/components/app/assets/asset-list/asset-list-control-bar/asset-list-control-bar.tsx
@@ -2,6 +2,7 @@ import React, { useEffect, useRef, useState, useContext, useMemo } from 'react';
 import { useDispatch, useSelector } from 'react-redux';
 import {
   getCurrentNetwork,
+  getIsTokenNetworkFilterEqualCurrentNetwork,
   getTokenNetworkFilter,
 } from '../../../../../selectors';
 import { getNetworkConfigurationsByChainId } from '../../../../../../shared/modules/selectors/networks';
@@ -26,7 +27,10 @@ import {
 import ImportControl from '../import-control';
 import { useI18nContext } from '../../../../../hooks/useI18nContext';
 import { MetaMetricsContext } from '../../../../../contexts/metametrics';
-import { TEST_CHAINS } from '../../../../../../shared/constants/network';
+import {
+  FEATURED_NETWORK_CHAIN_IDS,
+  TEST_CHAINS,
+} from '../../../../../../shared/constants/network';
 import {
   MetaMetricsEventCategory,
   MetaMetricsEventName,
@@ -57,6 +61,9 @@ const AssetListControlBar = ({ showTokensLinks }: AssetListControlBarProps) => {
   const popoverRef = useRef<HTMLDivElement>(null);
   const currentNetwork = useSelector(getCurrentNetwork);
   const allNetworks = useSelector(getNetworkConfigurationsByChainId);
+  const isTokenNetworkFilterEqualCurrentNetwork = useSelector(
+    getIsTokenNetworkFilterEqualCurrentNetwork,
+  );
 
   const tokenNetworkFilter = useSelector(getTokenNetworkFilter);
   const [isTokenSortPopoverOpen, setIsTokenSortPopoverOpen] = useState(false);
@@ -74,10 +81,6 @@ const AssetListControlBar = ({ showTokensLinks }: AssetListControlBarProps) => {
     allOpts[chainId] = true;
   });
 
-  const allNetworksFilterShown =
-    Object.keys(tokenNetworkFilter).length !==
-    Object.keys(allOpts || {}).length;
-
   useEffect(() => {
     if (isTestNetwork) {
       const testnetFilter = { [currentNetwork.chainId]: true };
@@ -175,7 +178,10 @@ const AssetListControlBar = ({ showTokensLinks }: AssetListControlBarProps) => {
             className="asset-list-control-bar__button asset-list-control-bar__network_control"
             onClick={toggleNetworkFilterPopover}
             size={ButtonBaseSize.Sm}
-            disabled={isTestNetwork}
+            disabled={
+              isTestNetwork ||
+              !FEATURED_NETWORK_CHAIN_IDS.includes(currentNetwork.chainId)
+            }
             endIconName={IconName.ArrowDown}
             backgroundColor={
               isNetworkFilterPopoverOpen
@@ -186,9 +192,9 @@ const AssetListControlBar = ({ showTokensLinks }: AssetListControlBarProps) => {
             marginRight={isFullScreen ? 2 : null}
             ellipsis
           >
-            {allNetworksFilterShown
+            {isTokenNetworkFilterEqualCurrentNetwork
               ? currentNetwork?.nickname ?? t('currentNetwork')
-              : t('allNetworks')}
+              : t('popularNetworks')}
           </ButtonBase>
         )}
 
diff --git a/ui/components/app/assets/asset-list/network-filter/network-filter.tsx b/ui/components/app/assets/asset-list/network-filter/network-filter.tsx
index eece5530eea4..4f75dcc7381a 100644
--- a/ui/components/app/assets/asset-list/network-filter/network-filter.tsx
+++ b/ui/components/app/assets/asset-list/network-filter/network-filter.tsx
@@ -119,7 +119,7 @@ const NetworkFilter = ({ handleClose }: SortControlProps) => {
               variant={TextVariant.bodyMdMedium}
               color={TextColor.textDefault}
             >
-              {t('allNetworks')}
+              {t('popularNetworks')}
             </Text>
             <Text
               variant={TextVariant.bodySmMedium}
diff --git a/ui/components/app/assets/token-list/token-list.tsx b/ui/components/app/assets/token-list/token-list.tsx
index a2ba7674f6a2..5b84827e6fc7 100644
--- a/ui/components/app/assets/token-list/token-list.tsx
+++ b/ui/components/app/assets/token-list/token-list.tsx
@@ -5,6 +5,7 @@ import TokenCell from '../token-cell';
 import { TEST_CHAINS } from '../../../../../shared/constants/network';
 import { sortAssets } from '../util/sort';
 import {
+  getChainIdsToPoll,
   getCurrencyRates,
   getCurrentNetwork,
   getIsTestnet,
@@ -93,6 +94,7 @@ export default function TokenList({
   const tokenNetworkFilter = useSelector(getTokenNetworkFilter);
   const selectedAccount = useSelector(getSelectedAccount);
   const conversionRate = useSelector(getConversionRate);
+  const chainIdsToPoll = useSelector(getChainIdsToPoll);
   const contractExchangeRates = useSelector(
     getTokenExchangeRates,
     shallowEqual,
@@ -103,7 +105,9 @@ export default function TokenList({
     getIsTokenNetworkFilterEqualCurrentNetwork,
   );
 
-  const { tokenBalances } = useTokenBalances();
+  const { tokenBalances } = useTokenBalances({
+    chainIds: chainIdsToPoll as Hex[],
+  });
   const selectedAccountTokenBalancesAcrossChains =
     tokenBalances[selectedAccount.address];
 
diff --git a/ui/components/multichain/network-list-menu/network-list-menu.tsx b/ui/components/multichain/network-list-menu/network-list-menu.tsx
index 390996980f11..481ddfe5142f 100644
--- a/ui/components/multichain/network-list-menu/network-list-menu.tsx
+++ b/ui/components/multichain/network-list-menu/network-list-menu.tsx
@@ -54,7 +54,7 @@ import {
   getAllDomains,
   getPermittedChainsForSelectedTab,
   getPermittedAccountsForSelectedTab,
-  getTokenNetworkFilter,
+  getPreferences,
 } from '../../../selectors';
 import ToggleButton from '../../ui/toggle-button';
 import {
@@ -116,7 +116,7 @@ export const NetworkListMenu = ({ onClose }: { onClose: () => void }) => {
   const dispatch = useDispatch();
   const trackEvent = useContext(MetaMetricsContext);
 
-  const tokenNetworkFilter = useSelector(getTokenNetworkFilter);
+  const { tokenNetworkFilter } = useSelector(getPreferences);
   const showTestNetworks = useSelector(getShowTestNetworks);
   const currentChainId = useSelector(getCurrentChainId);
   const selectedTabOrigin = useSelector(getOriginOfCurrentTab);
@@ -294,7 +294,7 @@ export const NetworkListMenu = ({ onClose }: { onClose: () => void }) => {
 
           // as a user, I don't want my network selection to force update my filter when I have "All Networks" toggled on
           // however, if I am already filtered on "Current Network", we'll want to filter by the selected network when the network changes
-          if (Object.keys(tokenNetworkFilter).length <= 1) {
+          if (Object.keys(tokenNetworkFilter || {}).length <= 1) {
             dispatch(setTokenNetworkFilter({ [network.chainId]: true }));
           } else if (process.env.PORTFOLIO_VIEW) {
             dispatch(setTokenNetworkFilter(allOpts));
diff --git a/ui/pages/asset/components/asset-page.tsx b/ui/pages/asset/components/asset-page.tsx
index 570528cd1acb..566a85d3c02e 100644
--- a/ui/pages/asset/components/asset-page.tsx
+++ b/ui/pages/asset/components/asset-page.tsx
@@ -139,7 +139,7 @@ const AssetPage = ({
     getSelectedAccountNativeTokenCachedBalanceByChainId,
   ) as Record<Hex, Hex>;
 
-  const { tokenBalances } = useTokenBalances();
+  const { tokenBalances } = useTokenBalances({ chainIds: [chainId] });
   const selectedAccountTokenBalancesAcrossChains =
     tokenBalances[selectedAccount.address];
 
diff --git a/ui/selectors/selectors.js b/ui/selectors/selectors.js
index d05b0695dcd5..eb24d1e76350 100644
--- a/ui/selectors/selectors.js
+++ b/ui/selectors/selectors.js
@@ -49,6 +49,7 @@ import {
   MOONBEAM_DISPLAY_NAME,
   MOONRIVER_DISPLAY_NAME,
   TEST_NETWORK_IDS,
+  FEATURED_NETWORK_CHAIN_IDS,
 } from '../../shared/constants/network';
 import {
   WebHIDConnectedStatuses,
@@ -1086,9 +1087,35 @@ export function getIsTokenNetworkFilterEqualCurrentNetwork(state) {
   return false;
 }
 
+/**
+ * Returns an object indicating which networks
+ * tokens should be shown on in the portfolio view.
+ *
+ * @param {*} state
+ * @returns {Record<Hex, boolean>}
+ */
 export function getTokenNetworkFilter(state) {
+  const currentChainId = getCurrentChainId(state);
   const { tokenNetworkFilter } = getPreferences(state);
-  return tokenNetworkFilter || {};
+
+  // Portfolio view not enabled outside popular networks
+  if (
+    !process.env.PORTFOLIO_VIEW ||
+    !FEATURED_NETWORK_CHAIN_IDS.includes(currentChainId)
+  ) {
+    return { [currentChainId]: true };
+  }
+
+  // Portfolio view only enabled on featured networks
+  return Object.entries(tokenNetworkFilter || {}).reduce(
+    (acc, [chainId, value]) => {
+      if (FEATURED_NETWORK_CHAIN_IDS.includes(chainId)) {
+        acc[chainId] = value;
+      }
+      return acc;
+    },
+    {},
+  );
 }
 
 export function getUseTransactionSimulations(state) {
@@ -2364,7 +2391,9 @@ export const getAllChainsToPoll = createDeepEqualSelector(
     }
 
     return Object.keys(networkConfigurations).filter(
-      (chainId) => chainId === currentChainId || !TEST_CHAINS.includes(chainId),
+      (chainId) =>
+        chainId === currentChainId ||
+        FEATURED_NETWORK_CHAIN_IDS.includes(chainId),
     );
   },
 );
@@ -2386,7 +2415,9 @@ export const getChainIdsToPoll = createDeepEqualSelector(
     }
 
     return Object.keys(networkConfigurations).filter(
-      (chainId) => chainId === currentChainId || !TEST_CHAINS.includes(chainId),
+      (chainId) =>
+        chainId === currentChainId ||
+        FEATURED_NETWORK_CHAIN_IDS.includes(chainId),
     );
   },
 );
@@ -2414,7 +2445,10 @@ export const getNetworkClientIdsToPoll = createDeepEqualSelector(
 
     return Object.entries(networkConfigurations).reduce(
       (acc, [chainId, network]) => {
-        if (chainId === currentChainId || !TEST_CHAINS.includes(chainId)) {
+        if (
+          chainId === currentChainId ||
+          FEATURED_NETWORK_CHAIN_IDS.includes(chainId)
+        ) {
           acc.push(
             network.rpcEndpoints[network.defaultRpcEndpointIndex]
               .networkClientId,

From 0556088f55ff932a5767d0b008191b5a6c9d6849 Mon Sep 17 00:00:00 2001
From: micaelae <100321200+micaelae@users.noreply.github.com>
Date: Wed, 11 Dec 2024 07:18:46 -0800
Subject: [PATCH 080/175] fix: replace hardcoded slippage + expire bridge
 quotes (#29028)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<!--
Please submit this PR as a draft initially.
Do not mark it as "Ready for review" until the template has been
completely filled out, and PR status checks have passed at least once.
-->

## **Description**
Changes
- Replaces hardcoded slippage with the slippage percentage included in
the quote request
- Disables tx submission 30s after final quote fetch

<!--
Write a short description of the changes included in this pull request,
also include relevant motivation and context. Have in mind the following
questions:
1. What is the reason for the change?
2. What is the improvement/solution?
-->

[![Open in GitHub
Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/29028?quickstart=1)

## **Related issues**

Fixes: https://consensyssoftware.atlassian.net/browse/MMS-1771

## **Manual testing steps**

1. Submit a tx
2. Request quotes with sufficient balance
3. 30 seconds after the last fetch, the CTA should be disabled

## **Screenshots/Recordings**

<!-- If applicable, add screenshots and/or recordings to visualize the
before and after of your change. -->

### **Before**

<!-- [screenshots/recordings] -->

### **After**

<!-- [screenshots/recordings] -->

## **Pre-merge author checklist**

- [X] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension Coding
Standards](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/CODING_GUIDELINES.md).
- [X] I've completed the PR template to the best of my ability
- [X] I’ve included tests if applicable
- [X] I’ve documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [X] I’ve applied the right labels on the PR (see [labeling
guidelines](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.

## **Pre-merge reviewer checklist**

- [ ] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed).
- [ ] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.
---
 app/_locales/en/messages.json                 |  3 ++
 .../hooks/useSubmitBridgeTransaction.ts       |  6 ++--
 ui/pages/bridge/prepare/bridge-cta-button.tsx | 31 +++++++++++++++++--
 3 files changed, 35 insertions(+), 5 deletions(-)

diff --git a/app/_locales/en/messages.json b/app/_locales/en/messages.json
index 7a6495a498a6..43396b0fe8a0 100644
--- a/app/_locales/en/messages.json
+++ b/app/_locales/en/messages.json
@@ -877,6 +877,9 @@
   "bridgeNetCost": {
     "message": "Net cost"
   },
+  "bridgeQuoteExpired": {
+    "message": "Quotes expired - please request again"
+  },
   "bridgeSelectNetwork": {
     "message": "Select network"
   },
diff --git a/ui/pages/bridge/hooks/useSubmitBridgeTransaction.ts b/ui/pages/bridge/hooks/useSubmitBridgeTransaction.ts
index 5750e398b1ff..39e905631e82 100644
--- a/ui/pages/bridge/hooks/useSubmitBridgeTransaction.ts
+++ b/ui/pages/bridge/hooks/useSubmitBridgeTransaction.ts
@@ -1,4 +1,4 @@
-import { useDispatch } from 'react-redux';
+import { useDispatch, useSelector } from 'react-redux';
 import { zeroAddress } from 'ethereumjs-util';
 import { useHistory } from 'react-router-dom';
 import { TransactionMeta } from '@metamask/transaction-controller';
@@ -6,6 +6,7 @@ import { QuoteMetadata, QuoteResponse } from '../types';
 import { DEFAULT_ROUTE } from '../../../helpers/constants/routes';
 import { setDefaultHomeActiveTabName } from '../../../store/actions';
 import { startPollingForBridgeTxStatus } from '../../../ducks/bridge-status/actions';
+import { getQuoteRequest } from '../../../ducks/bridge/selectors';
 import useAddToken from './useAddToken';
 import useHandleApprovalTx from './useHandleApprovalTx';
 import useHandleBridgeTx from './useHandleBridgeTx';
@@ -16,6 +17,7 @@ export default function useSubmitBridgeTransaction() {
   const { addSourceToken, addDestToken } = useAddToken();
   const { handleApprovalTx } = useHandleApprovalTx();
   const { handleBridgeTx } = useHandleBridgeTx();
+  const { slippage } = useSelector(getQuoteRequest);
 
   const submitBridgeTransaction = async (
     quoteResponse: QuoteResponse & QuoteMetadata,
@@ -51,7 +53,7 @@ export default function useSubmitBridgeTransaction() {
         bridgeTxMeta,
         statusRequest,
         quoteResponse,
-        slippagePercentage: 0, // TODO pull this from redux/bridgecontroller once it's implemented. currently hardcoded in quoteRequest.slippage right now
+        slippagePercentage: slippage ?? 0,
         startTime: bridgeTxMeta.time,
       }),
     );
diff --git a/ui/pages/bridge/prepare/bridge-cta-button.tsx b/ui/pages/bridge/prepare/bridge-cta-button.tsx
index 3a23d9735bca..c8738a6551de 100644
--- a/ui/pages/bridge/prepare/bridge-cta-button.tsx
+++ b/ui/pages/bridge/prepare/bridge-cta-button.tsx
@@ -1,4 +1,4 @@
-import React, { useMemo } from 'react';
+import React, { useEffect, useMemo, useState } from 'react';
 import { useSelector } from 'react-redux';
 import { Button } from '../../../components/component-library';
 import {
@@ -8,6 +8,7 @@ import {
   getToToken,
   getBridgeQuotes,
   getValidationErrors,
+  getBridgeQuotesConfig,
 } from '../../../ducks/bridge/selectors';
 import { useI18nContext } from '../../../hooks/useI18nContext';
 import useSubmitBridgeTransaction from '../hooks/useSubmitBridgeTransaction';
@@ -29,7 +30,9 @@ export const BridgeCTAButton = () => {
 
   const fromAmount = useSelector(getFromAmount);
 
-  const { isLoading, activeQuote } = useSelector(getBridgeQuotes);
+  const { isLoading, activeQuote, isQuoteGoingToRefresh, quotesRefreshCount } =
+    useSelector(getBridgeQuotes);
+  const { maxRefreshCount, refreshRate } = useSelector(getBridgeQuotesConfig);
 
   const { submitBridgeTransaction } = useSubmitBridgeTransaction();
 
@@ -44,7 +47,28 @@ export const BridgeCTAButton = () => {
   const requestMetadataProperties = useRequestMetadataProperties();
   const tradeProperties = useTradeProperties();
 
+  const [isQuoteExpired, setIsQuoteExpired] = useState(false);
+  useEffect(() => {
+    let timeout: NodeJS.Timeout;
+    // Reset the isQuoteExpired if quote fethching restarts
+    if (quotesRefreshCount === 0) {
+      setIsQuoteExpired(false);
+      return () => clearTimeout(timeout);
+    }
+    // After the last quote refresh, set a timeout to expire the quote and disable the CTA
+    if (quotesRefreshCount >= maxRefreshCount && !isQuoteGoingToRefresh) {
+      timeout = setTimeout(() => {
+        setIsQuoteExpired(true);
+      }, refreshRate);
+    }
+    return () => clearTimeout(timeout);
+  }, [isQuoteGoingToRefresh, quotesRefreshCount]);
+
   const label = useMemo(() => {
+    if (isQuoteExpired) {
+      return t('bridgeQuoteExpired');
+    }
+
     if (isLoading && !isTxSubmittable) {
       return t('swapFetchingQuotes');
     }
@@ -76,6 +100,7 @@ export const BridgeCTAButton = () => {
     isTxSubmittable,
     balanceAmount,
     isInsufficientBalance,
+    isQuoteExpired,
   ]);
 
   return (
@@ -97,7 +122,7 @@ export const BridgeCTAButton = () => {
           submitBridgeTransaction(activeQuote);
         }
       }}
-      disabled={!isTxSubmittable}
+      disabled={!isTxSubmittable || isQuoteExpired}
     >
       {label}
     </Button>

From 2bd3db8994097460d535698ec9d9f0731f610610 Mon Sep 17 00:00:00 2001
From: Norbert Elter <72046715+itsyoboieltr@users.noreply.github.com>
Date: Wed, 11 Dec 2024 21:22:33 +0400
Subject: [PATCH 081/175] feat: log-merge-group-failure (#28799)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<!--
Please submit this PR as a draft initially.
Do not mark it as "Ready for review" until the template has been
completely filled out, and PR status checks have passed at least once.
-->

## **Description**

<!--
Write a short description of the changes included in this pull request,
also include relevant motivation and context. Have in mind the following
questions:
1. What is the reason for the change?
2. What is the improvement/solution?
-->

[![Open in GitHub
Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/28799?quickstart=1)

This PR integrates the new reusable workflow
(https://github.com/MetaMask/github-tools/pull/31) that can be used to
write data to google sheets when the merge group event fails.
Environment variables (= GitHub secrets) are required to configure:
- GOOGLE_APPLICATION_CREDENTIALS, GOOGLE_SERVICE_ACCOUNT: The google
service account that is used for authentication with the google sheets
api.
- The service account needs to have access to the google sheet you
intend to operate on. To give access to the google sheet, you need to
click the "Share" button in the top-right corner. Enter the service
account's email (can be found on google cloud console), give "Editor"
permissions. After this, the service account will have access to this
spreadsheet, allowing read and write operations.
- SPREADSHEET_ID: unique identifier that can be found in the url when
you open the google sheet
- SHEET_NAME: name of a sheet in a spreadsheet that can be found on the
bottom

Short summary of what happens in the workflow:
1. Google api authentication setup
2. Check if current date exists in the spreadsheet
3. If current date exists, increment number of PRs by 1
4. If current date does not exist, create a new row with the current
date, and the number 1 (so that it can be incremented later, if more
merge group events fail on the same day).

Spreadsheet here:
https://docs.google.com/spreadsheets/d/11niHgT_E2YzzXHXQSxX5LNdA6i0GG5aa-OZWvn7_-o4

Dashboard here:
https://lookerstudio.google.com/u/1/reporting/e7e8f90e-72aa-4128-ae01-6305bf3393f4/page/p_pz1dszarmd

## **Related issues**

Fixes: https://github.com/MetaMask/MetaMask-planning/issues/3400

## **Manual testing steps**

1. When the workflow runs, depending on the state of the spreadsheet:
- If the current date already exists, the number of PRs removed from the
merge queue should be incremented by 1.
- If the current date does not exist, a new row should be added with the
current date, and the number of PRs should be set to 1.

I created a private repository to test it, and there it worked. The
actual production usage can only be tested if we merge and see if
anything gets removed from the merge queue, in this case the spreadsheet
should get updated.

## **Screenshots/Recordings**

Not applicable

## **Pre-merge author checklist**

- [x] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension Coding
Standards](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/CODING_GUIDELINES.md).
- [x] I've completed the PR template to the best of my ability
- [x] I’ve included tests if applicable
- [x] I’ve documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [x] I’ve applied the right labels on the PR (see [labeling
guidelines](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.

## **Pre-merge reviewer checklist**

- [ ] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed).
- [ ] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.
---
 .github/workflows/main.yml                    | 18 +++++++++++
 .../wait-for-circleci-workflow-status.yml     | 30 +++++++++++++++++++
 2 files changed, 48 insertions(+)
 create mode 100644 .github/workflows/wait-for-circleci-workflow-status.yml

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 2554557b9c35..c7907455701d 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -32,12 +32,17 @@ jobs:
     name: Run tests
     uses: ./.github/workflows/run-tests.yml
 
+  wait-for-circleci-workflow-status:
+    name: Wait for CircleCI workflow status
+    uses: ./.github/workflows/wait-for-circleci-workflow-status.yml
+
   all-jobs-completed:
     name: All jobs completed
     runs-on: ubuntu-latest
     needs:
       - check-workflows
       - run-tests
+      - wait-for-circleci-workflow-status
     outputs:
       PASSED: ${{ steps.set-output.outputs.PASSED }}
     steps:
@@ -58,3 +63,16 @@ jobs:
           if [[ $passed != "true" ]]; then
             exit 1
           fi
+
+  log-merge-group-failure:
+    name: Log merge group failure
+    # Only run this job if the merge group event fails, skip on forks
+    if: ${{ github.event_name == 'merge_group' && failure() && !github.event.repository.fork }}
+    needs:
+      - all-jobs-pass
+    uses: metamask/github-tools/.github/workflows/log-merge-group-failure.yml@6bbad335a01fce1a9ec1eabd9515542c225d46c0
+    secrets:
+      GOOGLE_APPLICATION_CREDENTIALS: ${{ secrets.GOOGLE_APPLICATION_CREDENTIALS }}
+      GOOGLE_SERVICE_ACCOUNT: ${{ secrets.GOOGLE_SERVICE_ACCOUNT }}
+      SPREADSHEET_ID: ${{ secrets.GOOGLE_MERGE_QUEUE_SPREADSHEET_ID }}
+      SHEET_NAME: ${{ secrets.GOOGLE_MERGE_QUEUE_SHEET_NAME }}
diff --git a/.github/workflows/wait-for-circleci-workflow-status.yml b/.github/workflows/wait-for-circleci-workflow-status.yml
new file mode 100644
index 000000000000..18e5ef7825d5
--- /dev/null
+++ b/.github/workflows/wait-for-circleci-workflow-status.yml
@@ -0,0 +1,30 @@
+name: Wait for CircleCI workflow status
+
+on:
+  workflow_call:
+
+jobs:
+  wait-for-circleci-workflow-status:
+    name: Wait for CircleCI workflow status
+    runs-on: ubuntu-latest
+    steps:
+      - name: Wait for CircleCI workflow status
+        env:
+          OWNER: ${{ github.repository_owner }}
+          REPOSITORY: ${{ github.event.repository.name }}
+          BRANCH: ${{ github.head_ref || github.ref_name }}
+        run: |
+          pipeline_id=$(curl --silent "https://circleci.com/api/v2/project/gh/$OWNER/$REPOSITORY/pipeline?branch=$BRANCH" | jq -r ".items[0].id")
+          workflow_status=$(curl --silent "https://circleci.com/api/v2/pipeline/$pipeline_id/workflow" | jq -r ".items[0].status")
+
+          if [ "$workflow_status" == "running" ]; then
+            while [ "$workflow_status" == "running" ]; do
+              sleep 30
+              workflow_status=$(curl --silent "https://circleci.com/api/v2/pipeline/$pipeline_id/workflow" | jq -r ".items[0].status")
+            done
+          fi
+
+          if [ "$workflow_status" != "success" ]; then
+            echo "::error::Workflow status is '$workflow_status'. Exiting with error."
+            exit 1
+          fi

From 17fe0d2f9007adab7b6a06f4dc75fee0d98e4e1c Mon Sep 17 00:00:00 2001
From: Derek Brans <dbrans@gmail.com>
Date: Wed, 11 Dec 2024 13:04:19 -0500
Subject: [PATCH 082/175] chore: pass the Extension Version to the Uninstall
 URL (#28935)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## **Description**

Update the uninstall URL to include an application version for all
users, even those with MetaMetrics disabled.

[![Open in GitHub
Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/28935?quickstart=1)

## **Related issues**

Fixes: https://github.com/MetaMask/metamask-extension/issues/28414

## **Manual testing steps**

I do not know how to test this manually.
1.
2.
3.

## **Screenshots/Recordings**

<!-- If applicable, add screenshots and/or recordings to visualize the
before and after of your change. -->

### **Before**

<!-- [screenshots/recordings] -->

### **After**

<!-- [screenshots/recordings] -->

## **Pre-merge author checklist**

- [ ] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension Coding
Standards](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/CODING_GUIDELINES.md).
- [ ] I've completed the PR template to the best of my ability
- [ ] I’ve included tests if applicable
- [ ] I’ve documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [ ] I’ve applied the right labels on the PR (see [labeling
guidelines](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.

## **Pre-merge reviewer checklist**

- [ ] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed).
- [ ] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.

Co-authored-by: Norbert Elter <72046715+itsyoboieltr@users.noreply.github.com>
---
 .../metametrics-controller.test.ts            | 40 +++++++++++++++++--
 .../controllers/metametrics-controller.ts     |  7 ++--
 2 files changed, 41 insertions(+), 6 deletions(-)

diff --git a/app/scripts/controllers/metametrics-controller.test.ts b/app/scripts/controllers/metametrics-controller.test.ts
index 57c49547c28b..bee3c3c323d2 100644
--- a/app/scripts/controllers/metametrics-controller.test.ts
+++ b/app/scripts/controllers/metametrics-controller.test.ts
@@ -1669,12 +1669,12 @@ describe('MetaMetricsController', function () {
           },
           ShowNativeTokenAsMainBalance: true,
           allNfts: {},
-          names: {
-            ethereumAddress: {},
-          },
           participateInMetaMetrics: true,
           dataCollectionForMarketing: false,
           preferences: { privacyMode: true, tokenNetworkFilter: [] },
+          names: {
+            ethereumAddress: {},
+          },
           securityAlertsEnabled: true,
           security_providers: ['blockaid'],
           currentCurrency: 'usd',
@@ -1842,6 +1842,40 @@ describe('MetaMetricsController', function () {
       );
     });
   });
+  describe('updateExtensionUninstallUrl', function () {
+    it('should include extension version in uninstall URL regardless of MetaMetrics participation', async function () {
+      await withController(({ controller }) => {
+        const setUninstallURLSpy = jest.spyOn(
+          MOCK_EXTENSION.runtime,
+          'setUninstallURL',
+        );
+
+        // Test with MetaMetrics disabled
+        controller.updateExtensionUninstallUrl(false, 'test-id');
+        expect(setUninstallURLSpy).toHaveBeenCalledWith(
+          expect.stringContaining(`av=${VERSION}`),
+        );
+        expect(setUninstallURLSpy).toHaveBeenCalledWith(
+          expect.not.stringContaining('mmi='),
+        );
+        expect(setUninstallURLSpy).toHaveBeenCalledWith(
+          expect.not.stringContaining('env='),
+        );
+
+        // Test with MetaMetrics enabled
+        controller.updateExtensionUninstallUrl(true, 'test-id');
+        expect(setUninstallURLSpy).toHaveBeenCalledWith(
+          expect.stringContaining(`av=${VERSION}`),
+        );
+        expect(setUninstallURLSpy).toHaveBeenCalledWith(
+          expect.stringContaining('mmi='),
+        );
+        expect(setUninstallURLSpy).toHaveBeenCalledWith(
+          expect.stringContaining('env='),
+        );
+      });
+    });
+  });
 });
 
 type WithControllerOptions = {
diff --git a/app/scripts/controllers/metametrics-controller.ts b/app/scripts/controllers/metametrics-controller.ts
index b2030080e3db..9668a9f25b09 100644
--- a/app/scripts/controllers/metametrics-controller.ts
+++ b/app/scripts/controllers/metametrics-controller.ts
@@ -778,13 +778,14 @@ export default class MetaMetricsController extends BaseController<
     const query: {
       mmi?: string;
       env?: string;
-      av?: string;
-    } = {};
+      av: string;
+    } = {
+      av: this.version,
+    };
     if (participateInMetaMetrics) {
       // We only want to track these things if a user opted into metrics.
       query.mmi = Buffer.from(metaMetricsId).toString('base64');
       query.env = this.#environment;
-      query.av = this.version;
     }
     const queryString = new URLSearchParams(query);
 

From d758bf9330f378213d04a7f982d12fb52d9de619 Mon Sep 17 00:00:00 2001
From: micaelae <100321200+micaelae@users.noreply.github.com>
Date: Wed, 11 Dec 2024 10:11:30 -0800
Subject: [PATCH 083/175] chore: change default network avatar style (#28976)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<!--
Please submit this PR as a draft initially.
Do not mark it as "Ready for review" until the template has been
completely filled out, and PR status checks have passed at least once.
-->

## **Description**
This PR changes the default position of the network avatar to the
bottomRight of the token. It also changes the default shape from a
circle to a rounded square

Figma:
https://www.figma.com/design/IuOIRmU3wI0IdJIfol0ESu/Cross-Chain-Swaps?node-id=7-24563&node-type=canvas&m=dev

<!--
Write a short description of the changes included in this pull request,
also include relevant motivation and context. Have in mind the following
questions:
1. What is the reason for the change?
2. What is the improvement/solution?
-->

[![Open in GitHub
Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/28976?quickstart=1)

## **Related issues**

Fixes: N/A

## **Manual testing steps**

1. Visually inspect AvatarNetwork instances (token list, network picker,
activity, etc

## **Screenshots/Recordings**

<!-- If applicable, add screenshots and/or recordings to visualize the
before and after of your change. -->

### **Before**
![Screenshot 2024-12-09 at 11 20
35 AM](https://github.com/user-attachments/assets/46711271-ef5a-4d1d-a9b6-fea93cd3bed4)
![Screenshot 2024-12-09 at 11 20
40 AM](https://github.com/user-attachments/assets/28fd5c27-d91a-49b1-ba60-5e240f1a768e)



### **After**
![Screenshot 2024-12-09 at 11 18
59 AM](https://github.com/user-attachments/assets/67ed09a8-befb-49a0-ad6b-5c4d65ad428c)
![Screenshot 2024-12-09 at 11 18
45 AM](https://github.com/user-attachments/assets/6ae812aa-988b-48e0-befb-702c7fc664ec)


<!-- [screenshots/recordings] -->

## **Pre-merge author checklist**

- [X] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension Coding
Standards](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/CODING_GUIDELINES.md).
- [X] I've completed the PR template to the best of my ability
- [X] I’ve included tests if applicable
- [X] I’ve documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [X] I’ve applied the right labels on the PR (see [labeling
guidelines](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.

## **Pre-merge reviewer checklist**

- [ ] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed).
- [ ] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.
---
 app/images/arbitrum.svg                       | 51 +++++--------------
 app/images/avax-token.svg                     |  7 +--
 app/images/base.svg                           |  5 +-
 app/images/bnb.svg                            |  8 ++-
 app/images/eth_logo.svg                       | 24 ++++++---
 app/images/linea-logo-mainnet.svg             | 10 ++--
 app/images/optimism.svg                       | 16 ++++--
 app/images/pol-token.svg                      | 23 ++-------
 app/images/zk-sync.svg                        | 17 ++-----
 .../__snapshots__/nft-details.test.js.snap    |  2 +-
 .../__snapshots__/nft-full-image.test.js.snap |  2 +-
 .../__snapshots__/token-cell.test.tsx.snap    |  4 +-
 .../incoming-transaction-toggle.test.js.snap  | 14 ++---
 .../multi-rpc-edit-modal.test.tsx.snap        |  2 +-
 .../network-list-item.test.tsx.snap           |  2 +-
 .../smart-transaction-list-item.component.js  |  2 -
 .../transaction-list-item.component.js        |  2 -
 .../avatar-network.test.tsx.snap              |  2 +-
 .../avatar-network/avatar-network.tsx         |  5 +-
 .../__snapshots__/badge-wrapper.test.tsx.snap |  2 +-
 .../badge-wrapper/badge-wrapper.scss          |  4 +-
 .../badge-wrapper/badge-wrapper.test.tsx      |  9 +++-
 .../badge-wrapper/badge-wrapper.tsx           |  4 +-
 .../picker-network.test.tsx.snap              |  4 +-
 .../picker-network/picker-network.tsx         |  2 +-
 .../__snapshots__/app-header.test.js.snap     |  8 +--
 .../asset-picker-modal-network.test.tsx.snap  |  8 +--
 .../__snapshots__/asset-picker.test.tsx.snap  | 12 ++---
 .../network-list-item.test.js.snap            |  2 +-
 .../network-list-menu.test.js.snap            | 20 ++++----
 .../select-rpc-url-modal.test.tsx.snap        |  2 +-
 .../network-picker.test.tsx.snap              |  4 +-
 .../token-list-item.test.tsx.snap             |  4 +-
 .../multichain/token-list-item/index.scss     |  4 --
 .../__snapshots__/asset-page.test.tsx.snap    | 12 ++---
 .../prepare-bridge-page.test.tsx.snap         | 12 ++---
 ui/pages/bridge/prepare/index.scss            |  6 ---
 .../confirm-detail-row.component.test.js.snap |  4 +-
 ...ge-container-header.component.test.js.snap |  4 +-
 .../header/__snapshots__/header.test.tsx.snap |  4 +-
 .../native-transfer.test.tsx.snap             |  2 +-
 .../nft-token-transfer.test.tsx.snap          |  4 +-
 .../nft-send-heading.test.tsx.snap            |  2 +-
 .../token-details-section.test.tsx.snap       |  2 +-
 .../token-transfer.test.tsx.snap              |  2 +-
 ...ture-request-header.component.test.js.snap |  8 +--
 .../confirm-send-ether.test.js.snap           |  6 +--
 .../__snapshots__/confirm.test.tsx.snap       | 12 ++---
 .../switch-ethereum-chain.test.js.snap        |  8 +--
 .../__snapshots__/security-tab.test.js.snap   |  4 +-
 50 files changed, 173 insertions(+), 206 deletions(-)

diff --git a/app/images/arbitrum.svg b/app/images/arbitrum.svg
index 9c19a48f2d72..f6fdd140c38e 100644
--- a/app/images/arbitrum.svg
+++ b/app/images/arbitrum.svg
@@ -1,40 +1,15 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 27.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 1080 1218.5" style="enable-background:new 0 0 1080 1218.5;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:#213147;}
-	.st1{fill:#12AAFF;}
-	.st2{fill:#9DCCED;}
-	.st3{fill:#FFFFFF;}
-</style>
-<g>
-	<path class="st0" d="M41,370.4v477.7c0,30.5,16.3,58.7,42.7,73.9l413.7,238.9c26.4,15.2,58.9,15.2,85.3,0L996.4,922
-		c26.4-15.2,42.7-43.4,42.7-73.9V370.4c0-30.5-16.3-58.7-42.7-73.9L582.7,57.6c-26.4-15.2-58.9-15.2-85.3,0L83.6,296.5
-		C57.2,311.7,41,339.9,41,370.4z"/>
-	<g>
-		<g>
-			<g>
-				<path class="st1" d="M630.3,701.9l-59,161.8c-1.6,4.5-1.6,9.4,0,13.9L672.8,1156l117.4-67.8L649.3,701.9
-					C646.1,693,633.5,693,630.3,701.9z"/>
-			</g>
-			<g>
-				<path class="st1" d="M748.6,429.8c-3.2-8.9-15.8-8.9-19,0l-59,161.8c-1.6,4.5-1.6,9.4,0,13.9l166.3,455.8l117.4-67.8
-					L748.6,429.8z"/>
-			</g>
-		</g>
-	</g>
-	<path class="st2" d="M540,75.5c2.9,0,5.8,0.8,8.4,2.2l447.7,258.5c5.2,3,8.4,8.6,8.4,14.5v516.9c0,6-3.2,11.5-8.4,14.5
-		l-447.7,258.5c-2.5,1.5-5.5,2.2-8.4,2.2c-2.9,0-5.8-0.8-8.4-2.2L83.9,882.3c-5.2-3-8.4-8.6-8.4-14.5V350.8c0-6,3.2-11.5,8.4-14.5
-		L531.6,77.8C534.2,76.3,537.1,75.5,540,75.5 M540,0c-15.9,0-31.9,4.1-46.2,12.4L46.2,270.8c-28.6,16.5-46.2,47-46.2,80v516.9
-		c0,33,17.6,63.5,46.2,80l447.7,258.5c14.3,8.2,30.2,12.4,46.2,12.4c15.9,0,31.9-4.1,46.2-12.4l447.7-258.5
-		c28.6-16.5,46.2-47,46.2-80V350.8c0-33-17.6-63.5-46.2-80L586.2,12.4C571.9,4.1,555.9,0,540,0L540,0z"/>
-	<polygon class="st0" points="243.9,1061.9 285.1,949.1 368,1018 290.5,1088.8 	"/>
-	<g>
-		<path class="st3" d="M502.3,313.8H388.8c-8.5,0-16.1,5.3-19,13.3l-243.3,667l117.4,67.8l267.9-734.5
-			C514.3,320.8,509.4,313.8,502.3,313.8z"/>
-		<path class="st3" d="M700.9,313.8H587.4c-8.5,0-16.1,5.3-19,13.3l-277.8,761.6l117.4,67.8l302.4-829.1
-			C712.8,320.8,707.9,313.8,700.9,313.8z"/>
-	</g>
+<svg width="346" height="360" viewBox="0 0 346 360" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect width="346" height="360" fill="#213147"/>
+<mask id="mask0_2614_45487" style="mask-type:luminance" maskUnits="userSpaceOnUse" x="71" y="66" width="202" height="228">
+<path d="M273 66H71V294H273V66Z" fill="white"/>
+</mask>
+<g mask="url(#mask0_2614_45487)">
+<path d="M78.668 135.307V224.693C78.668 230.4 81.7167 235.676 86.6545 238.52L164.032 283.222C168.969 286.066 175.048 286.066 179.986 283.222L257.363 238.52C262.301 235.676 265.35 230.4 265.35 224.693V135.307C265.35 129.6 262.301 124.324 257.363 121.479L179.986 76.7777C175.048 73.9335 168.969 73.9335 164.032 76.7777L86.6357 121.479C81.698 124.324 78.668 129.6 78.668 135.307Z" fill="#213147"/>
+<path d="M188.889 197.337L177.853 227.612C177.554 228.454 177.554 229.371 177.853 230.213L196.838 282.306L218.796 269.62L192.442 197.337C191.844 195.672 189.487 195.672 188.889 197.337Z" fill="#12AAFF"/>
+<path d="M211.015 146.423C210.416 144.758 208.059 144.758 207.461 146.423L196.426 176.698C196.126 177.54 196.126 178.457 196.426 179.299L227.53 264.586L249.488 251.9L211.015 146.423Z" fill="#12AAFF"/>
+<path d="M172 80.1272C172.542 80.1272 173.085 80.2769 173.571 80.5389L257.308 128.908C258.28 129.47 258.879 130.517 258.879 131.621V228.341C258.879 229.464 258.28 230.493 257.308 231.054L173.571 279.424C173.104 279.704 172.542 279.835 172 279.835C171.458 279.835 170.915 279.686 170.429 279.424L86.6924 231.092C85.7198 230.53 85.1213 229.483 85.1213 228.379V131.64C85.1213 130.517 85.7198 129.488 86.6924 128.927L170.429 80.5576C170.915 80.2769 171.458 80.1272 172 80.1272ZM172 66C169.026 66 166.034 66.7672 163.359 68.3202L79.6411 116.671C74.2919 119.758 71 125.465 71 131.64V228.36C71 234.535 74.2919 240.242 79.6411 243.329L163.378 291.698C166.052 293.233 169.026 294.019 172.019 294.019C174.993 294.019 177.985 293.252 180.66 291.698L264.396 243.329C269.746 240.242 273.037 234.535 273.037 228.36V131.64C273.037 125.465 269.746 119.758 264.396 116.671L180.641 68.3202C177.966 66.7672 174.974 66 172 66Z" fill="#9DCCED"/>
+<path d="M116.619 264.699L124.325 243.592L139.83 256.484L125.335 269.732L116.619 264.699Z" fill="#213147"/>
+<path d="M164.949 124.717H143.72C142.13 124.717 140.709 125.708 140.166 127.205L94.6602 252.011L116.618 264.698L166.726 127.262C167.193 126.027 166.277 124.717 164.949 124.717Z" fill="white"/>
+<path d="M202.095 124.717H180.866C179.276 124.717 177.855 125.708 177.312 127.205L125.354 269.712L147.312 282.399L203.872 127.262C204.321 126.027 203.404 124.717 202.095 124.717Z" fill="white"/>
 </g>
 </svg>
diff --git a/app/images/avax-token.svg b/app/images/avax-token.svg
index 55473a0f2400..ea08a9c1a0ee 100644
--- a/app/images/avax-token.svg
+++ b/app/images/avax-token.svg
@@ -1,4 +1,5 @@
-<svg width="1503" height="1504" viewBox="0 0 1503 1504" fill="none" xmlns="http://www.w3.org/2000/svg">
-<rect x="287" y="258" width="928" height="844" fill="white"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M1502.5 752C1502.5 1166.77 1166.27 1503 751.5 1503C336.734 1503 0.5 1166.77 0.5 752C0.5 337.234 336.734 1 751.5 1C1166.27 1 1502.5 337.234 1502.5 752ZM538.688 1050.86H392.94C362.314 1050.86 347.186 1050.86 337.962 1044.96C327.999 1038.5 321.911 1027.8 321.173 1015.99C320.619 1005.11 328.184 991.822 343.312 965.255L703.182 330.935C718.495 303.999 726.243 290.531 736.021 285.55C746.537 280.2 759.083 280.2 769.599 285.55C779.377 290.531 787.126 303.999 802.438 330.935L876.42 460.079L876.797 460.738C893.336 489.635 901.723 504.289 905.385 519.669C909.443 536.458 909.443 554.169 905.385 570.958C901.695 586.455 893.393 601.215 876.604 630.549L687.573 964.702L687.084 965.558C670.436 994.693 661.999 1009.46 650.306 1020.6C637.576 1032.78 622.263 1041.63 605.474 1046.62C590.161 1050.86 573.004 1050.86 538.688 1050.86ZM906.75 1050.86H1115.59C1146.4 1050.86 1161.9 1050.86 1171.13 1044.78C1181.09 1038.32 1187.36 1027.43 1187.92 1015.63C1188.45 1005.1 1181.05 992.33 1166.55 967.307C1166.05 966.455 1165.55 965.588 1165.04 964.706L1060.43 785.75L1059.24 783.735C1044.54 758.877 1037.12 746.324 1027.59 741.472C1017.08 736.121 1004.71 736.121 994.199 741.472C984.605 746.453 976.857 759.552 961.544 785.934L857.306 964.891L856.949 965.507C841.69 991.847 834.064 1005.01 834.614 1015.81C835.352 1027.62 841.44 1038.5 851.402 1044.96C860.443 1050.86 875.94 1050.86 906.75 1050.86Z" fill="#E84142"/>
+<svg width="360" height="360" viewBox="0 0 360 360" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect width="360" height="360" fill="#FF394A"/>
+<path d="M232.147 198.754C235.252 193.465 242.964 193.465 246.035 198.754L279.031 255.125C282.136 260.413 278.247 266.999 272.071 266.999H206.077C199.901 266.999 196.046 260.413 199.117 255.125L232.113 198.754H232.147Z" fill="white"/>
+<path d="M212.216 161.22C215.219 155.965 215.219 149.481 212.216 144.192L185.157 96.9668C182.12 91.6777 174.545 91.6777 171.508 96.9668L80.9468 255.057C77.9097 260.346 81.6971 266.965 87.7713 266.965H141.856C147.895 266.965 153.457 263.724 156.46 258.469L212.182 161.185L212.216 161.22Z" fill="white"/>
 </svg>
diff --git a/app/images/base.svg b/app/images/base.svg
index 22d89358f633..114aeb900f1b 100644
--- a/app/images/base.svg
+++ b/app/images/base.svg
@@ -1,3 +1,4 @@
-<svg width="111" height="111" viewBox="0 0 111 111" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M54.921 110.034C85.359 110.034 110.034 85.402 110.034 55.017C110.034 24.6319 85.359 0 54.921 0C26.0432 0 2.35281 22.1714 0 50.3923H72.8467V59.6416H3.9565e-07C2.35281 87.8625 26.0432 110.034 54.921 110.034Z" fill="#0052FF"/>
+<svg width="360" height="360" viewBox="0 0 360 360" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect width="360" height="360" fill="#0052FF"/>
+<path d="M178.915 282.19C235.952 282.19 282.19 236.033 282.19 179.095C282.19 122.157 235.952 76 178.915 76C124.802 76 80.4089 117.546 76 170.429H212.506V187.761H76C80.4089 240.643 124.802 282.19 178.915 282.19Z" fill="white"/>
 </svg>
diff --git a/app/images/bnb.svg b/app/images/bnb.svg
index b1f1841b84e0..e2ba1e86cea1 100644
--- a/app/images/bnb.svg
+++ b/app/images/bnb.svg
@@ -1,3 +1,7 @@
-<svg width="96" height="96" viewBox="0 0 96 96" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M22.8814 14.7044L48.1429 0L73.4043 14.7044L64.117 20.1366L48.1429 10.8644L32.1687 20.1366L22.8814 14.7044ZM73.4043 33.2488L64.117 27.8166L48.1429 37.0888L32.1687 27.8166L22.8814 33.2488V44.1132L38.8555 53.3854V71.9297L48.1429 77.362L57.4302 71.9297V53.3854L73.4043 44.1132V33.2488ZM73.4043 62.6576V51.7932L64.117 57.2254V68.0898L73.4043 62.6576ZM79.9984 66.4976L64.0243 75.7698V86.6341L89.2857 71.9297V42.521L79.9984 47.9532V66.4976ZM70.7111 23.9766L79.9984 29.4088V40.2732L89.2857 34.841V23.9766L79.9984 18.5444L70.7111 23.9766ZM38.8555 79.7034V90.5678L48.1429 96L57.4302 90.5678V79.7034L48.1429 85.1356L38.8555 79.7034ZM22.8814 62.6576L32.1687 68.0898V57.2254L22.8814 51.7932V62.6576ZM38.8555 23.9766L48.1429 29.4088L57.4302 23.9766L48.1429 18.5444L38.8555 23.9766ZM16.2873 29.4088L25.5746 23.9766L16.2873 18.5444L7 23.9766V34.841L16.2873 40.2732V29.4088ZM16.2873 47.9532L7 42.521V71.9297L32.2615 86.6341V75.7698L16.2873 66.4976V47.9532Z" fill="#F0B90B"/>
+<svg width="360" height="360" viewBox="0 0 360 360" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect width="360" height="360" fill="#F0B90B"/>
+<path d="M105.306 179.535L105.423 223.394L142.007 245.323V271L84.0131 236.352V166.71L105.306 179.535ZM105.306 135.677V161.235L84 148.396V122.839L105.306 110L126.716 122.839L105.306 135.677ZM157.284 122.839L178.59 110L200 122.839L178.59 135.677L157.284 122.839Z" fill="white"/>
+<path d="M120 213.781V188.232L141.643 201.007V226.436L120 213.781ZM157.163 253.796L178.806 266.571L200.555 253.796V279.226L178.806 292L157.163 279.226V253.796ZM231.595 122.774L253.238 110L274.987 122.774V148.204L253.238 160.978V135.549L231.595 122.774ZM253.238 222.826L253.357 179.187L275 166.413V235.706L216.088 270.181V244.632L253.238 222.826Z" fill="white"/>
+<path d="M238 214.081L217 227V201.04L238 188V214.081Z" fill="white"/>
+<path d="M237.881 145.225L238 170.775L200.68 192.596V236.344L179.007 249L157.334 236.344V192.596L120.013 170.775V145.225L141.779 132.45L178.874 154.376L216.194 132.45L237.973 145.225H237.881ZM120 101.596L178.887 67L237.881 101.596L216.208 114.371L178.887 92.4446L141.673 114.371L120 101.596Z" fill="white"/>
 </svg>
diff --git a/app/images/eth_logo.svg b/app/images/eth_logo.svg
index 5bffa07d0ff5..0b1e0ed3ad77 100644
--- a/app/images/eth_logo.svg
+++ b/app/images/eth_logo.svg
@@ -1,9 +1,17 @@
-<svg width="60" height="60" viewBox="0 0 60 60" fill="none" xmlns="http://www.w3.org/2000/svg">
-<circle cx="30" cy="30" r="30" fill="#627EEA"/>
-<path d="M29.9961 14L29.7776 14.7293V35.8904L29.9961 36.1046L39.9937 30.2984L29.9961 14Z" fill="#C0CBF6"/>
-<path d="M29.9979 14L20 30.2984L29.9979 36.1046V25.8336V14Z" fill="white"/>
-<path d="M29.9962 37.9614L29.873 38.1089V45.6468L29.9962 46.0001L39.9999 32.1582L29.9962 37.9614Z" fill="#C0CBF6"/>
-<path d="M29.9979 46V37.9613L20 32.1581L29.9979 46Z" fill="white"/>
-<path d="M29.9963 36.116L39.9939 30.3098L29.9963 25.845V36.116Z" fill="#8197EE"/>
-<path d="M20 30.3097L29.9979 36.1159V25.8449L20 30.3097Z" fill="#C0CBF6"/>
+<svg width="360" height="360" viewBox="0 0 360 360" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect width="360" height="360" fill="#627EEA"/>
+<g clip-path="url(#clip0_2590_45232)">
+<path d="M180 330C262.843 330 330 262.843 330 180C330 97.1573 262.843 30 180 30C97.1573 30 30 97.1573 30 180C30 262.843 97.1573 330 180 330Z" fill="#627EEA"/>
+<path d="M184.669 67.5V150.656L254.953 182.062L184.669 67.5Z" fill="white" fill-opacity="0.602"/>
+<path d="M184.669 67.5L114.375 182.062L184.669 150.656V67.5Z" fill="white"/>
+<path d="M184.669 235.95V292.454L255 195.15L184.669 235.95Z" fill="white" fill-opacity="0.602"/>
+<path d="M184.669 292.454V235.941L114.375 195.15L184.669 292.454Z" fill="white"/>
+<path d="M184.669 222.873L254.953 182.063L184.669 150.676V222.873Z" fill="white" fill-opacity="0.2"/>
+<path d="M114.375 182.063L184.669 222.873V150.676L114.375 182.063Z" fill="white" fill-opacity="0.602"/>
+</g>
+<defs>
+<clipPath id="clip0_2590_45232">
+<rect width="300" height="300" fill="white" transform="translate(30 30)"/>
+</clipPath>
+</defs>
 </svg>
diff --git a/app/images/linea-logo-mainnet.svg b/app/images/linea-logo-mainnet.svg
index bb56377bd349..c92953d73938 100644
--- a/app/images/linea-logo-mainnet.svg
+++ b/app/images/linea-logo-mainnet.svg
@@ -1,11 +1,11 @@
 <svg width="200" height="208" viewBox="0 0 200 208" fill="none" xmlns="http://www.w3.org/2000/svg">
-<rect width="199.4" height="207.623" fill="#121212"/>
-<g clip-path="url(#clip0_2303_643)">
-<path d="M132.369 155.99H49.7001V68.8854H68.6148V139.109H132.369V155.981V155.99Z" fill="white"/>
-<path d="M132.369 85.7575C141.687 85.7575 149.241 78.2036 149.241 68.8855C149.241 59.5673 141.687 52.0134 132.369 52.0134C123.05 52.0134 115.497 59.5673 115.497 68.8855C115.497 78.2036 123.05 85.7575 132.369 85.7575Z" fill="white"/>
+<rect width="199.4" height="207.623" fill="#61DFFF"/>
+<g clip-path="url(#clip0_2318_291)">
+<path d="M132.369 155.99H49.7001V68.8854H68.6148V139.109H132.369V155.981V155.99Z" fill="#121212"/>
+<path d="M132.369 85.7575C141.687 85.7575 149.241 78.2037 149.241 68.8855C149.241 59.5673 141.687 52.0134 132.369 52.0134C123.05 52.0134 115.497 59.5673 115.497 68.8855C115.497 78.2037 123.05 85.7575 132.369 85.7575Z" fill="#121212"/>
 </g>
 <defs>
-<clipPath id="clip0_2303_643">
+<clipPath id="clip0_2318_291">
 <rect width="99.5407" height="103.977" fill="white" transform="translate(49.7001 52.0134)"/>
 </clipPath>
 </defs>
diff --git a/app/images/optimism.svg b/app/images/optimism.svg
index 2e5ce3103d08..6ee446335bb2 100644
--- a/app/images/optimism.svg
+++ b/app/images/optimism.svg
@@ -1,5 +1,13 @@
-<svg width="500" height="500" viewBox="0 0 500 500" fill="none" xmlns="http://www.w3.org/2000/svg">
-<circle cx="250" cy="250" r="250" fill="#FF0420"/>
-<path d="M177.133 316.446C162.247 316.446 150.051 312.943 140.544 305.938C131.162 298.808 126.471 288.676 126.471 275.541C126.471 272.789 126.784 269.411 127.409 265.408C129.036 256.402 131.35 245.581 134.352 232.947C142.858 198.547 164.812 181.347 200.213 181.347C209.845 181.347 218.476 182.973 226.107 186.225C233.738 189.352 239.742 194.106 244.12 200.486C248.498 206.74 250.688 214.246 250.688 223.002C250.688 225.629 250.375 228.944 249.749 232.947C247.873 244.08 245.621 254.901 242.994 265.408C238.616 282.546 231.048 295.368 220.29 303.874C209.532 312.255 195.147 316.446 177.133 316.446ZM179.76 289.426C186.766 289.426 192.707 287.362 197.586 283.234C202.59 279.106 206.155 272.789 208.281 264.283C211.158 252.524 213.348 242.266 214.849 233.51C215.349 230.883 215.599 228.194 215.599 225.441C215.599 214.058 209.657 208.366 197.774 208.366C190.768 208.366 184.764 210.43 179.76 214.558C174.882 218.687 171.379 225.004 169.253 233.51C167.001 241.891 164.749 252.149 162.498 264.283C161.997 266.784 161.747 269.411 161.747 272.163C161.747 283.672 167.752 289.426 179.76 289.426Z" fill="white"/>
-<path d="M259.303 314.57C257.927 314.57 256.863 314.132 256.113 313.256C255.487 312.255 255.3 311.13 255.55 309.879L281.444 187.914C281.694 186.538 282.382 185.412 283.508 184.536C284.634 183.661 285.822 183.223 287.073 183.223H336.985C350.87 183.223 362.003 186.1 370.384 191.854C378.891 197.609 383.144 205.927 383.144 216.81C383.144 219.937 382.769 223.19 382.018 226.567C378.891 240.953 372.574 251.586 363.067 258.466C353.685 265.346 340.8 268.786 324.413 268.786H299.082L290.451 309.879C290.2 311.255 289.512 312.38 288.387 313.256C287.261 314.132 286.072 314.57 284.822 314.57H259.303ZM325.727 242.892C330.98 242.892 335.546 241.453 339.424 238.576C343.427 235.699 346.054 231.571 347.305 226.192C347.68 224.065 347.868 222.189 347.868 220.563C347.868 216.935 346.805 214.183 344.678 212.307C342.551 210.305 338.924 209.305 333.795 209.305H311.278L304.148 242.892H325.727Z" fill="white"/>
+<svg width="360" height="360" viewBox="0 0 360 360" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect width="360" height="360" fill="#FF0420"/>
+<g clip-path="url(#clip0_2575_42407)">
+<path d="M180 360C279.411 360 360 279.411 360 180C360 80.5888 279.411 0 180 0C80.5888 0 0 80.5888 0 180C0 279.411 80.5888 360 180 360Z" fill="#FF0420"/>
+<path d="M127.536 227.842C116.818 227.842 108.037 225.319 101.192 220.276C94.4366 215.142 91.0591 207.847 91.0591 198.39C91.0591 196.409 91.2844 193.976 91.7344 191.094C92.9059 184.61 94.572 176.819 96.7334 167.722C102.858 142.954 118.665 130.57 144.153 130.57C151.088 130.57 157.303 131.741 162.797 134.082C168.291 136.334 172.614 139.757 175.766 144.35C178.919 148.853 180.495 154.258 180.495 160.562C180.495 162.453 180.27 164.84 179.819 167.722C178.469 175.738 176.847 183.529 174.956 191.094C171.803 203.434 166.355 212.665 158.609 218.79C150.863 224.824 140.506 227.842 127.536 227.842ZM129.427 208.387C134.471 208.387 138.749 206.901 142.262 203.929C145.865 200.957 148.432 196.409 149.962 190.284C152.034 181.818 153.611 174.432 154.691 168.128C155.051 166.236 155.231 164.3 155.231 162.318C155.231 154.122 150.953 150.024 142.397 150.024C137.353 150.024 133.03 151.51 129.427 154.482C125.915 157.455 123.393 162.003 121.862 168.128C120.241 174.162 118.619 181.548 116.999 190.284C116.638 192.085 116.458 193.976 116.458 195.958C116.458 204.244 120.781 208.387 129.427 208.387Z" fill="white"/>
+<path d="M186.698 226.49C185.707 226.49 184.941 226.174 184.401 225.544C183.951 224.823 183.816 224.013 183.996 223.112L202.64 135.297C202.82 134.307 203.315 133.496 204.126 132.865C204.936 132.235 205.792 131.92 206.692 131.92H242.629C252.626 131.92 260.642 133.991 266.676 138.134C272.801 142.278 275.864 148.267 275.864 156.103C275.864 158.354 275.594 160.696 275.053 163.128C272.801 173.486 268.253 181.141 261.408 186.095C254.653 191.048 245.376 193.525 233.577 193.525H215.339L209.125 223.112C208.944 224.103 208.449 224.913 207.639 225.544C206.828 226.174 205.972 226.49 205.072 226.49H186.698ZM234.523 174.882C238.305 174.882 241.593 173.846 244.385 171.774C247.267 169.703 249.159 166.73 250.059 162.858C250.329 161.326 250.465 159.975 250.465 158.805C250.465 156.193 249.7 154.211 248.168 152.86C246.637 151.419 244.025 150.699 240.332 150.699H224.12L218.986 174.882H234.523Z" fill="white"/>
+</g>
+<defs>
+<clipPath id="clip0_2575_42407">
+<rect width="360" height="360" fill="white"/>
+</clipPath>
+</defs>
 </svg>
diff --git a/app/images/pol-token.svg b/app/images/pol-token.svg
index 10b192a9fa15..5c750420f80c 100644
--- a/app/images/pol-token.svg
+++ b/app/images/pol-token.svg
@@ -1,21 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 489.82 489.82">
-  <defs>
-    <style>
-      .cls-1 {
-        fill: url(#linear-gradient);
-      }
-
-      .cls-2 {
-        fill: #f5f0fd;
-      }
-    </style>
-    <linearGradient id="linear-gradient" x1="123.67" y1="158.51" x2="374.75" y2="341.59" gradientTransform="translate(0 491.82) scale(1 -1)" gradientUnits="userSpaceOnUse">
-      <stop offset="0" stop-color="#a726c1"/>
-      <stop offset=".88" stop-color="#803bdf"/>
-      <stop offset="1" stop-color="#7b3fe4"/>
-    </linearGradient>
-  </defs>
-  <circle class="cls-2" cx="244.91" cy="244.91" r="244.91"/>
-  <path class="cls-1" d="m315.74,297.76l69.29-40.01c3.67-2.12,5.94-6.06,5.94-10.3v-80.01c0-4.23-2.28-8.18-5.94-10.3l-69.29-40.01c-3.67-2.12-8.22-2.11-11.89,0l-69.29,40.01c-3.67,2.12-5.94,6.07-5.94,10.3v142.99l-48.59,28.05-48.59-28.05v-56.11l48.59-28.05,32.05,18.5v-37.64l-26.11-15.07c-1.8-1.04-3.86-1.59-5.95-1.59s-4.15.55-5.94,1.59l-69.29,40.01c-3.67,2.12-5.94,6.06-5.94,10.3v80.01c0,4.23,2.28,8.18,5.94,10.3l69.29,40.01c3.66,2.11,8.22,2.11,11.89,0l69.29-40c3.67-2.12,5.94-6.07,5.94-10.3v-142.99l.88-.5,47.71-27.55,48.59,28.05v56.11l-48.59,28.05-32-18.48v37.64l26.06,15.05c3.67,2.11,8.22,2.11,11.89,0h0Z"/>
+<svg width="360" height="360" viewBox="0 0 360 360" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect width="360" height="360" fill="#6C00F6"/>
+<path d="M218.804 99.5819L168.572 128.432V218.473L140.856 234.539L112.97 218.46V186.313L140.856 170.39L158.786 180.788V154.779L140.699 144.511L90.4795 173.687V231.399L140.869 260.418L191.088 231.399V141.371L218.974 125.291L246.846 141.371V173.374L218.974 189.597L200.887 179.107V204.986L218.804 215.319L269.519 186.47V128.432L218.804 99.5819Z" fill="white"/>
 </svg>
diff --git a/app/images/zk-sync.svg b/app/images/zk-sync.svg
index 55021930f1da..ea60764b484c 100644
--- a/app/images/zk-sync.svg
+++ b/app/images/zk-sync.svg
@@ -1,14 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 27.2.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 400 400" style="enable-background:new 0 0 400 400;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill-rule:evenodd;clip-rule:evenodd;fill:#FFFFFF;}
-	.st1{fill-rule:evenodd;clip-rule:evenodd;}
-</style>
-<circle class="st0" cx="200" cy="200" r="200"/>
-<g>
-	<path class="st1" d="M316,199l-66.7-66.4v48.6l-66.2,48.7l66.2,0v35.5L316,199z"/>
-	<path class="st1" d="M81,199l66.7,66.4v-48.3l66.2-49.1l-66.2,0v-35.5L81,199z"/>
-</g>
+<svg width="360" height="360" viewBox="0 0 360 360" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect width="360" height="360" fill="#3667F6"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M294 180L229.27 115V162.603L165 210.265L229.27 210.309V245L294 180Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M65 180L129.967 245V197.9L194 150.208L129.967 150.164V115L65 180Z" fill="white"/>
 </svg>
diff --git a/ui/components/app/assets/nfts/nft-details/__snapshots__/nft-details.test.js.snap b/ui/components/app/assets/nfts/nft-details/__snapshots__/nft-details.test.js.snap
index d6b0de0c043e..dd91a6bb0188 100644
--- a/ui/components/app/assets/nfts/nft-details/__snapshots__/nft-details.test.js.snap
+++ b/ui/components/app/assets/nfts/nft-details/__snapshots__/nft-details.test.js.snap
@@ -66,7 +66,7 @@ exports[`NFT Details should match minimal props and state snapshot 1`] = `
                   style="top: -4px; right: -4px;"
                 >
                   <div
-                    class="mm-box mm-text mm-avatar-base mm-avatar-base--size-sm mm-avatar-network nft-item__network-badge mm-text--body-sm mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-background-default mm-box--border-width-2 box--border-style-solid"
+                    class="mm-box mm-text mm-avatar-base mm-avatar-base--size-sm mm-avatar-network nft-item__network-badge mm-text--body-sm mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-md mm-box--border-color-background-default mm-box--border-width-2 box--border-style-solid"
                     data-testid="nft-network-badge"
                   >
                     G
diff --git a/ui/components/app/assets/nfts/nft-details/__snapshots__/nft-full-image.test.js.snap b/ui/components/app/assets/nfts/nft-details/__snapshots__/nft-full-image.test.js.snap
index 7b4d6b11abc6..e9ac6e3e6a26 100644
--- a/ui/components/app/assets/nfts/nft-details/__snapshots__/nft-full-image.test.js.snap
+++ b/ui/components/app/assets/nfts/nft-details/__snapshots__/nft-full-image.test.js.snap
@@ -64,7 +64,7 @@ exports[`NFT full image should match snapshot 1`] = `
                     style="top: -4px; right: -4px;"
                   >
                     <div
-                      class="mm-box mm-text mm-avatar-base mm-avatar-base--size-sm mm-avatar-network nft-item__network-badge mm-text--body-sm mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-background-default mm-box--border-width-2 box--border-style-solid"
+                      class="mm-box mm-text mm-avatar-base mm-avatar-base--size-sm mm-avatar-network nft-item__network-badge mm-text--body-sm mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-md mm-box--border-color-background-default mm-box--border-width-2 box--border-style-solid"
                       data-testid="nft-network-badge"
                     >
                       G
diff --git a/ui/components/app/assets/token-cell/__snapshots__/token-cell.test.tsx.snap b/ui/components/app/assets/token-cell/__snapshots__/token-cell.test.tsx.snap
index 30efc922ec7e..9a62f050e644 100644
--- a/ui/components/app/assets/token-cell/__snapshots__/token-cell.test.tsx.snap
+++ b/ui/components/app/assets/token-cell/__snapshots__/token-cell.test.tsx.snap
@@ -24,10 +24,10 @@ exports[`Token Cell should match snapshot 1`] = `
           />
         </div>
         <div
-          class="mm-box mm-badge-wrapper__badge-container mm-badge-wrapper__badge-container--circular-top-right"
+          class="mm-box mm-badge-wrapper__badge-container mm-badge-wrapper__badge-container--rectangular-bottom-right"
         >
           <div
-            class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-network multichain-token-list-item__badge__avatar-network mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
+            class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-network multichain-token-list-item__badge__avatar-network mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-md mm-box--border-color-background-default mm-box--border-width-1 box--border-style-solid"
           >
             <img
               alt="network logo"
diff --git a/ui/components/app/incoming-trasaction-toggle/__snapshots__/incoming-transaction-toggle.test.js.snap b/ui/components/app/incoming-trasaction-toggle/__snapshots__/incoming-transaction-toggle.test.js.snap
index 8c44078d57cd..20b0b6bf5d7f 100644
--- a/ui/components/app/incoming-trasaction-toggle/__snapshots__/incoming-transaction-toggle.test.js.snap
+++ b/ui/components/app/incoming-trasaction-toggle/__snapshots__/incoming-transaction-toggle.test.js.snap
@@ -23,7 +23,7 @@ exports[`IncomingTransactionToggle should render existing incoming transaction p
         class="mm-box network-toggle-wrapper__overflow-container mm-box--display-flex mm-box--gap-4 mm-box--align-items-center mm-box--width-full mm-box--background-color-transparent"
       >
         <div
-          class="mm-box mm-text mm-avatar-base mm-avatar-base--size-sm mm-avatar-network mm-text--body-sm mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
+          class="mm-box mm-text mm-avatar-base mm-avatar-base--size-sm mm-avatar-network mm-text--body-sm mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-md mm-box--border-color-background-default mm-box--border-width-1 box--border-style-solid"
         >
           <img
             alt="Ethereum Mainnet logo"
@@ -110,7 +110,7 @@ exports[`IncomingTransactionToggle should render existing incoming transaction p
         class="mm-box network-toggle-wrapper__overflow-container mm-box--display-flex mm-box--gap-4 mm-box--align-items-center mm-box--width-full mm-box--background-color-transparent"
       >
         <div
-          class="mm-box mm-text mm-avatar-base mm-avatar-base--size-sm mm-avatar-network mm-text--body-sm mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
+          class="mm-box mm-text mm-avatar-base mm-avatar-base--size-sm mm-avatar-network mm-text--body-sm mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-md mm-box--border-color-background-default mm-box--border-width-1 box--border-style-solid"
         >
           <img
             alt="Linea Mainnet logo"
@@ -197,7 +197,7 @@ exports[`IncomingTransactionToggle should render existing incoming transaction p
         class="mm-box network-toggle-wrapper__overflow-container mm-box--display-flex mm-box--gap-4 mm-box--align-items-center mm-box--width-full mm-box--background-color-transparent"
       >
         <div
-          class="mm-box mm-text mm-avatar-base mm-avatar-base--size-sm mm-avatar-network mm-text--body-sm mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
+          class="mm-box mm-text mm-avatar-base mm-avatar-base--size-sm mm-avatar-network mm-text--body-sm mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-md mm-box--border-color-background-default mm-box--border-width-1 box--border-style-solid"
         >
           <img
             alt="FANTOM logo"
@@ -284,7 +284,7 @@ exports[`IncomingTransactionToggle should render existing incoming transaction p
         class="mm-box network-toggle-wrapper__overflow-container mm-box--display-flex mm-box--gap-4 mm-box--align-items-center mm-box--width-full mm-box--background-color-transparent"
       >
         <div
-          class="mm-box mm-text mm-avatar-base mm-avatar-base--size-sm mm-avatar-network mm-text--body-sm mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
+          class="mm-box mm-text mm-avatar-base mm-avatar-base--size-sm mm-avatar-network mm-text--body-sm mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-md mm-box--border-color-background-default mm-box--border-width-1 box--border-style-solid"
         >
           G
         </div>
@@ -367,7 +367,7 @@ exports[`IncomingTransactionToggle should render existing incoming transaction p
         class="mm-box network-toggle-wrapper__overflow-container mm-box--display-flex mm-box--gap-4 mm-box--align-items-center mm-box--width-full mm-box--background-color-transparent"
       >
         <div
-          class="mm-box mm-text mm-avatar-base mm-avatar-base--size-sm mm-avatar-network mm-text--body-sm mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
+          class="mm-box mm-text mm-avatar-base mm-avatar-base--size-sm mm-avatar-network mm-text--body-sm mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-md mm-box--border-color-background-default mm-box--border-width-1 box--border-style-solid"
         >
           S
         </div>
@@ -450,7 +450,7 @@ exports[`IncomingTransactionToggle should render existing incoming transaction p
         class="mm-box network-toggle-wrapper__overflow-container mm-box--display-flex mm-box--gap-4 mm-box--align-items-center mm-box--width-full mm-box--background-color-transparent"
       >
         <div
-          class="mm-box mm-text mm-avatar-base mm-avatar-base--size-sm mm-avatar-network mm-text--body-sm mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
+          class="mm-box mm-text mm-avatar-base mm-avatar-base--size-sm mm-avatar-network mm-text--body-sm mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-md mm-box--border-color-background-default mm-box--border-width-1 box--border-style-solid"
         >
           <img
             alt="Linea Goerli logo"
@@ -537,7 +537,7 @@ exports[`IncomingTransactionToggle should render existing incoming transaction p
         class="mm-box network-toggle-wrapper__overflow-container mm-box--display-flex mm-box--gap-4 mm-box--align-items-center mm-box--width-full mm-box--background-color-transparent"
       >
         <div
-          class="mm-box mm-text mm-avatar-base mm-avatar-base--size-sm mm-avatar-network mm-text--body-sm mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
+          class="mm-box mm-text mm-avatar-base mm-avatar-base--size-sm mm-avatar-network mm-text--body-sm mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-md mm-box--border-color-background-default mm-box--border-width-1 box--border-style-solid"
         >
           <img
             alt="Linea Sepolia logo"
diff --git a/ui/components/app/multi-rpc-edit-modal/__snapshots__/multi-rpc-edit-modal.test.tsx.snap b/ui/components/app/multi-rpc-edit-modal/__snapshots__/multi-rpc-edit-modal.test.tsx.snap
index 9aa4f875431b..65040451ffff 100644
--- a/ui/components/app/multi-rpc-edit-modal/__snapshots__/multi-rpc-edit-modal.test.tsx.snap
+++ b/ui/components/app/multi-rpc-edit-modal/__snapshots__/multi-rpc-edit-modal.test.tsx.snap
@@ -63,7 +63,7 @@ exports[`MultiRpcEditModal renders correctly with required props 1`] = `
                     class="mm-box mm-box--display-flex mm-box--align-items-center mm-box--width-8/12"
                   >
                     <div
-                      class="mm-box mm-text mm-avatar-base mm-avatar-base--size-md mm-avatar-network mm-text--body-sm mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
+                      class="mm-box mm-text mm-avatar-base mm-avatar-base--size-md mm-avatar-network mm-text--body-sm mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-md mm-box--border-color-background-default mm-box--border-width-1 box--border-style-solid"
                     >
                       <img
                         alt="Ethereum Mainnet logo"
diff --git a/ui/components/app/multi-rpc-edit-modal/network-list-item/__snapshots__/network-list-item.test.tsx.snap b/ui/components/app/multi-rpc-edit-modal/network-list-item/__snapshots__/network-list-item.test.tsx.snap
index acb76cf700c8..daffa7d7bb2e 100644
--- a/ui/components/app/multi-rpc-edit-modal/network-list-item/__snapshots__/network-list-item.test.tsx.snap
+++ b/ui/components/app/multi-rpc-edit-modal/network-list-item/__snapshots__/network-list-item.test.tsx.snap
@@ -9,7 +9,7 @@ exports[`NetworkListItem renders correctly with required props 1`] = `
       class="mm-box mm-box--display-flex mm-box--align-items-center mm-box--width-8/12"
     >
       <div
-        class="mm-box mm-text mm-avatar-base mm-avatar-base--size-md mm-avatar-network mm-text--body-sm mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
+        class="mm-box mm-text mm-avatar-base mm-avatar-base--size-md mm-avatar-network mm-text--body-sm mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-md mm-box--border-color-background-default mm-box--border-width-1 box--border-style-solid"
       >
         <img
           alt="Ethereum Mainnet logo"
diff --git a/ui/components/app/transaction-list-item/smart-transaction-list-item.component.js b/ui/components/app/transaction-list-item/smart-transaction-list-item.component.js
index d339d01f6fa1..5c1658918dbe 100644
--- a/ui/components/app/transaction-list-item/smart-transaction-list-item.component.js
+++ b/ui/components/app/transaction-list-item/smart-transaction-list-item.component.js
@@ -68,7 +68,6 @@ export default function SmartTransactionListItem({
         icon={
           <BadgeWrapper
             anchorElementShape={BadgeWrapperAnchorElementShape.circular}
-            positionObj={{ top: -4, right: -4 }}
             display={Display.Block}
             badge={
               <AvatarNetwork
@@ -77,7 +76,6 @@ export default function SmartTransactionListItem({
                 size={AvatarNetworkSize.Xs}
                 name={currentChain?.nickname}
                 src={currentChain?.rpcPrefs?.imageUrl}
-                borderWidth={1}
                 borderColor={BackgroundColor.backgroundDefault}
               />
             }
diff --git a/ui/components/app/transaction-list-item/transaction-list-item.component.js b/ui/components/app/transaction-list-item/transaction-list-item.component.js
index 61c00fac6402..fed0f925a3ac 100644
--- a/ui/components/app/transaction-list-item/transaction-list-item.component.js
+++ b/ui/components/app/transaction-list-item/transaction-list-item.component.js
@@ -329,7 +329,6 @@ function TransactionListItemInner({
             ///: END:ONLY_INCLUDE_IF
             <BadgeWrapper
               anchorElementShape={BadgeWrapperAnchorElementShape.circular}
-              positionObj={{ top: -4, right: -4 }}
               display={Display.Block}
               badge={
                 <AvatarNetwork
@@ -338,7 +337,6 @@ function TransactionListItemInner({
                   size={AvatarNetworkSize.Xs}
                   name={currentChain?.nickname}
                   src={currentChain?.rpcPrefs?.imageUrl}
-                  borderWidth={1}
                   borderColor={BackgroundColor.backgroundDefault}
                   backgroundColor={testNetworkBackgroundColor}
                 />
diff --git a/ui/components/component-library/avatar-network/__snapshots__/avatar-network.test.tsx.snap b/ui/components/component-library/avatar-network/__snapshots__/avatar-network.test.tsx.snap
index 053fae825a3e..54e146e01cef 100644
--- a/ui/components/component-library/avatar-network/__snapshots__/avatar-network.test.tsx.snap
+++ b/ui/components/component-library/avatar-network/__snapshots__/avatar-network.test.tsx.snap
@@ -3,7 +3,7 @@
 exports[`AvatarNetwork should render correctly 1`] = `
 <div>
   <div
-    class="mm-box mm-text mm-avatar-base mm-avatar-base--size-md mm-avatar-network mm-text--body-sm mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
+    class="mm-box mm-text mm-avatar-base mm-avatar-base--size-md mm-avatar-network mm-text--body-sm mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-md mm-box--border-color-background-default mm-box--border-width-1 box--border-style-solid"
     data-testid="avatar-network"
   >
     <img
diff --git a/ui/components/component-library/avatar-network/avatar-network.tsx b/ui/components/component-library/avatar-network/avatar-network.tsx
index 487f2ad7ee05..9a1a68dc4bca 100644
--- a/ui/components/component-library/avatar-network/avatar-network.tsx
+++ b/ui/components/component-library/avatar-network/avatar-network.tsx
@@ -7,6 +7,7 @@ import {
   TextColor,
   BackgroundColor,
   BorderColor,
+  BorderRadius,
 } from '../../../helpers/constants/design-system';
 import type { PolymorphicRef } from '../box';
 import { AvatarBase, AvatarBaseProps } from '../avatar-base';
@@ -22,7 +23,7 @@ export const AvatarNetwork: AvatarNetworkComponent = React.forwardRef(
       showHalo,
       color = TextColor.textDefault,
       backgroundColor = BackgroundColor.backgroundAlternative,
-      borderColor = BorderColor.transparent,
+      borderColor = BorderColor.backgroundDefault,
       className = '',
       ...props
     }: AvatarNetworkProps<C>,
@@ -52,6 +53,8 @@ export const AvatarNetwork: AvatarNetworkComponent = React.forwardRef(
           showHalo ? 'mm-avatar-network--with-halo' : '',
           className,
         )}
+        borderRadius={BorderRadius.MD}
+        borderWidth={1}
         {...{
           backgroundColor,
           borderColor,
diff --git a/ui/components/component-library/badge-wrapper/__snapshots__/badge-wrapper.test.tsx.snap b/ui/components/component-library/badge-wrapper/__snapshots__/badge-wrapper.test.tsx.snap
index 983e2412776c..8efea13c3561 100644
--- a/ui/components/component-library/badge-wrapper/__snapshots__/badge-wrapper.test.tsx.snap
+++ b/ui/components/component-library/badge-wrapper/__snapshots__/badge-wrapper.test.tsx.snap
@@ -7,7 +7,7 @@ exports[`BadgeWrapper should render correctly 1`] = `
   >
     content
     <div
-      class="mm-box mm-badge-wrapper__badge-container mm-badge-wrapper__badge-container--circular-top-right"
+      class="mm-box mm-badge-wrapper__badge-container mm-badge-wrapper__badge-container--rectangular-bottom-right"
     >
       <div
         data-testid="badge"
diff --git a/ui/components/component-library/badge-wrapper/badge-wrapper.scss b/ui/components/component-library/badge-wrapper/badge-wrapper.scss
index e0869bc1c256..14e3820db834 100644
--- a/ui/components/component-library/badge-wrapper/badge-wrapper.scss
+++ b/ui/components/component-library/badge-wrapper/badge-wrapper.scss
@@ -32,8 +32,8 @@
 }
 
 .mm-badge-wrapper {
-  --badge-wrapper-position-circular: 14%;
-  --badge-wrapper-position-rectangular: 0;
+  --badge-wrapper-position-circular: 7%;
+  --badge-wrapper-position-rectangular: 11%;
 
   position: relative;
   align-self: start; // prevents stretching of badge-wrapper when in flexbox container to maintain badge positioning
diff --git a/ui/components/component-library/badge-wrapper/badge-wrapper.test.tsx b/ui/components/component-library/badge-wrapper/badge-wrapper.test.tsx
index 93b458df0b29..96c9a6c0036a 100644
--- a/ui/components/component-library/badge-wrapper/badge-wrapper.test.tsx
+++ b/ui/components/component-library/badge-wrapper/badge-wrapper.test.tsx
@@ -42,6 +42,7 @@ describe('BadgeWrapper', () => {
           badge={<div>badge</div>}
           badgeContainerProps={{ 'data-testid': 'badge-top-right' }}
           position={BadgeWrapperPosition.topRight}
+          anchorElementShape={BadgeWrapperAnchorElementShape.circular}
         >
           content top-right
         </BadgeWrapper>
@@ -49,6 +50,7 @@ describe('BadgeWrapper', () => {
           badge={<div>badge</div>}
           badgeContainerProps={{ 'data-testid': 'badge-top-left' }}
           position={BadgeWrapperPosition.topLeft}
+          anchorElementShape={BadgeWrapperAnchorElementShape.circular}
         >
           content top-left
         </BadgeWrapper>
@@ -56,6 +58,7 @@ describe('BadgeWrapper', () => {
           badge={<div>badge</div>}
           badgeContainerProps={{ 'data-testid': 'badge-bottom-right' }}
           position={BadgeWrapperPosition.bottomRight}
+          anchorElementShape={BadgeWrapperAnchorElementShape.circular}
         >
           content bottom-right
         </BadgeWrapper>
@@ -63,6 +66,7 @@ describe('BadgeWrapper', () => {
           badge={<div>badge</div>}
           badgeContainerProps={{ 'data-testid': 'badge-bottom-left' }}
           position={BadgeWrapperPosition.bottomLeft}
+          anchorElementShape={BadgeWrapperAnchorElementShape.circular}
         >
           content bottom-left
         </BadgeWrapper>
@@ -70,7 +74,7 @@ describe('BadgeWrapper', () => {
     );
     expect(getByText('content default')).toBeDefined();
     expect(getByTestId('badge-default')).toHaveClass(
-      'mm-badge-wrapper__badge-container--circular-top-right',
+      'mm-badge-wrapper__badge-container--rectangular-bottom-right',
     );
     expect(getByText('content top-right')).toBeDefined();
     expect(getByTestId('badge-top-right')).toHaveClass(
@@ -119,6 +123,8 @@ describe('BadgeWrapper', () => {
         <BadgeWrapper
           badge={<div>badge</div>}
           badgeContainerProps={{ 'data-testid': 'badge-circular' }}
+          anchorElementShape={BadgeWrapperAnchorElementShape.circular}
+          position={BadgeWrapperPosition.topRight}
         >
           content circular
         </BadgeWrapper>
@@ -126,6 +132,7 @@ describe('BadgeWrapper', () => {
           badge={<div>badge</div>}
           badgeContainerProps={{ 'data-testid': 'badge-rectangular' }}
           anchorElementShape={BadgeWrapperAnchorElementShape.rectangular}
+          position={BadgeWrapperPosition.topRight}
         >
           content rectangular
         </BadgeWrapper>
diff --git a/ui/components/component-library/badge-wrapper/badge-wrapper.tsx b/ui/components/component-library/badge-wrapper/badge-wrapper.tsx
index 8ccd69d7cf9a..5d046c6150bd 100644
--- a/ui/components/component-library/badge-wrapper/badge-wrapper.tsx
+++ b/ui/components/component-library/badge-wrapper/badge-wrapper.tsx
@@ -18,9 +18,9 @@ export const BadgeWrapper: BadgeWrapperComponent = React.forwardRef(
       children,
       badge,
       badgeContainerProps,
-      position = BadgeWrapperPosition.topRight,
+      position = BadgeWrapperPosition.bottomRight,
       positionObj,
-      anchorElementShape = BadgeWrapperAnchorElementShape.circular,
+      anchorElementShape = BadgeWrapperAnchorElementShape.rectangular,
       className = '',
       ...props
     }: BadgeWrapperProps<C>,
diff --git a/ui/components/component-library/picker-network/__snapshots__/picker-network.test.tsx.snap b/ui/components/component-library/picker-network/__snapshots__/picker-network.test.tsx.snap
index 0827e30f349a..3e43996dc512 100644
--- a/ui/components/component-library/picker-network/__snapshots__/picker-network.test.tsx.snap
+++ b/ui/components/component-library/picker-network/__snapshots__/picker-network.test.tsx.snap
@@ -3,11 +3,11 @@
 exports[`PickerNetwork should render the label inside the PickerNetwork 1`] = `
 <div>
   <button
-    class="mm-box mm-picker-network mm-box--padding-right-4 mm-box--padding-left-2 mm-box--display-flex mm-box--gap-2 mm-box--align-items-center mm-box--background-color-background-alternative mm-box--rounded-pill"
+    class="mm-box mm-picker-network mm-box--padding-right-2 mm-box--padding-left-2 mm-box--display-flex mm-box--gap-2 mm-box--align-items-center mm-box--background-color-background-alternative mm-box--rounded-pill"
     data-testid="picker-network"
   >
     <div
-      class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-network mm-picker-network__avatar-network mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
+      class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-network mm-picker-network__avatar-network mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-md mm-box--border-color-background-default mm-box--border-width-1 box--border-style-solid"
     >
       I
     </div>
diff --git a/ui/components/component-library/picker-network/picker-network.tsx b/ui/components/component-library/picker-network/picker-network.tsx
index fd2a2a78b8bc..7363b1e16bc3 100644
--- a/ui/components/component-library/picker-network/picker-network.tsx
+++ b/ui/components/component-library/picker-network/picker-network.tsx
@@ -44,7 +44,7 @@ export const PickerNetwork: PickerNetworkComponent = React.forwardRef(
         backgroundColor={BackgroundColor.backgroundAlternative}
         alignItems={AlignItems.center}
         paddingLeft={2}
-        paddingRight={4}
+        paddingRight={2}
         gap={2}
         borderRadius={BorderRadius.pill}
         display={Display.Flex}
diff --git a/ui/components/multichain/app-header/__snapshots__/app-header.test.js.snap b/ui/components/multichain/app-header/__snapshots__/app-header.test.js.snap
index fc0ab6f50467..27600ce7dc4e 100644
--- a/ui/components/multichain/app-header/__snapshots__/app-header.test.js.snap
+++ b/ui/components/multichain/app-header/__snapshots__/app-header.test.js.snap
@@ -11,11 +11,11 @@ exports[`App Header locked state matches snapshot: locked 1`] = `
       <div>
         <button
           aria-label="Network Menu Chain 5"
-          class="mm-box mm-picker-network multichain-app-header__contents__network-picker mm-box--padding-right-4 mm-box--padding-left-2 mm-box--display-flex mm-box--gap-2 mm-box--align-items-center mm-box--background-color-background-alternative mm-box--rounded-pill"
+          class="mm-box mm-picker-network multichain-app-header__contents__network-picker mm-box--padding-right-2 mm-box--padding-left-2 mm-box--display-flex mm-box--gap-2 mm-box--align-items-center mm-box--background-color-background-alternative mm-box--rounded-pill"
           data-testid="network-display"
         >
           <div
-            class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-network mm-picker-network__avatar-network mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
+            class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-network mm-picker-network__avatar-network mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-md mm-box--border-color-background-default mm-box--border-width-1 box--border-style-solid"
             role="img"
           >
             C
@@ -436,12 +436,12 @@ exports[`App Header unlocked state matches snapshot: unlocked 1`] = `
       <div>
         <button
           aria-label="Network Menu Chain 5"
-          class="mm-box mm-picker-network multichain-app-header__contents__network-picker mm-box--margin-2 mm-box--padding-right-4 mm-box--padding-left-2 mm-box--display-none mm-box--sm:display-flex mm-box--gap-2 mm-box--align-items-center mm-box--background-color-background-alternative mm-box--rounded-pill"
+          class="mm-box mm-picker-network multichain-app-header__contents__network-picker mm-box--margin-2 mm-box--padding-right-2 mm-box--padding-left-2 mm-box--display-none mm-box--sm:display-flex mm-box--gap-2 mm-box--align-items-center mm-box--background-color-background-alternative mm-box--rounded-pill"
           data-testid="network-display"
           disabled=""
         >
           <div
-            class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-network mm-picker-network__avatar-network mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
+            class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-network mm-picker-network__avatar-network mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-md mm-box--border-color-background-default mm-box--border-width-1 box--border-style-solid"
             role="img"
           >
             C
diff --git a/ui/components/multichain/asset-picker-amount/asset-picker-modal/__snapshots__/asset-picker-modal-network.test.tsx.snap b/ui/components/multichain/asset-picker-amount/asset-picker-modal/__snapshots__/asset-picker-modal-network.test.tsx.snap
index c51245502300..4e0e3640a75a 100644
--- a/ui/components/multichain/asset-picker-amount/asset-picker-modal/__snapshots__/asset-picker-modal-network.test.tsx.snap
+++ b/ui/components/multichain/asset-picker-amount/asset-picker-modal/__snapshots__/asset-picker-modal-network.test.tsx.snap
@@ -171,7 +171,7 @@ exports[`AssetPickerModalNetwork should not show selected network when network p
                 class="mm-box multichain-network-list-item mm-box--padding-top-4 mm-box--padding-right-4 mm-box--padding-bottom-4 mm-box--padding-left-4 mm-box--display-flex mm-box--gap-4 mm-box--justify-content-space-between mm-box--align-items-center mm-box--width-full mm-box--background-color-transparent"
               >
                 <div
-                  class="mm-box mm-text mm-avatar-base mm-avatar-base--size-md mm-avatar-network mm-text--body-sm mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-background-default box--border-style-solid box--border-width-1"
+                  class="mm-box mm-text mm-avatar-base mm-avatar-base--size-md mm-avatar-network mm-text--body-sm mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-md mm-box--border-color-background-default mm-box--border-width-1 box--border-style-solid"
                 >
                   <img
                     alt="Network name 3 logo"
@@ -200,7 +200,7 @@ exports[`AssetPickerModalNetwork should not show selected network when network p
                 class="mm-box multichain-network-list-item mm-box--padding-top-4 mm-box--padding-right-4 mm-box--padding-bottom-4 mm-box--padding-left-4 mm-box--display-flex mm-box--gap-4 mm-box--justify-content-space-between mm-box--align-items-center mm-box--width-full mm-box--background-color-transparent"
               >
                 <div
-                  class="mm-box mm-text mm-avatar-base mm-avatar-base--size-md mm-avatar-network mm-text--body-sm mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-background-default box--border-style-solid box--border-width-1"
+                  class="mm-box mm-text mm-avatar-base mm-avatar-base--size-md mm-avatar-network mm-text--body-sm mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-md mm-box--border-color-background-default mm-box--border-width-1 box--border-style-solid"
                 >
                   <img
                     alt="Network name 4 logo"
@@ -323,7 +323,7 @@ exports[`AssetPickerModalNetwork should use passed in network as default when ne
                   class="mm-box multichain-network-list-item__selected-indicator mm-box--background-color-primary-default mm-box--rounded-pill"
                 />
                 <div
-                  class="mm-box mm-text mm-avatar-base mm-avatar-base--size-md mm-avatar-network mm-text--body-sm mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-background-default box--border-style-solid box--border-width-1"
+                  class="mm-box mm-text mm-avatar-base mm-avatar-base--size-md mm-avatar-network mm-text--body-sm mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-md mm-box--border-color-background-default mm-box--border-width-1 box--border-style-solid"
                 >
                   <img
                     alt="Network name 3 logo"
@@ -352,7 +352,7 @@ exports[`AssetPickerModalNetwork should use passed in network as default when ne
                 class="mm-box multichain-network-list-item mm-box--padding-top-4 mm-box--padding-right-4 mm-box--padding-bottom-4 mm-box--padding-left-4 mm-box--display-flex mm-box--gap-4 mm-box--justify-content-space-between mm-box--align-items-center mm-box--width-full mm-box--background-color-transparent"
               >
                 <div
-                  class="mm-box mm-text mm-avatar-base mm-avatar-base--size-md mm-avatar-network mm-text--body-sm mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-background-default box--border-style-solid box--border-width-1"
+                  class="mm-box mm-text mm-avatar-base mm-avatar-base--size-md mm-avatar-network mm-text--body-sm mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-md mm-box--border-color-background-default mm-box--border-width-1 box--border-style-solid"
                 >
                   <img
                     alt="Network name 4 logo"
diff --git a/ui/components/multichain/asset-picker-amount/asset-picker/__snapshots__/asset-picker.test.tsx.snap b/ui/components/multichain/asset-picker-amount/asset-picker/__snapshots__/asset-picker.test.tsx.snap
index 42c7b204d708..0f9502843859 100644
--- a/ui/components/multichain/asset-picker-amount/asset-picker/__snapshots__/asset-picker.test.tsx.snap
+++ b/ui/components/multichain/asset-picker-amount/asset-picker/__snapshots__/asset-picker.test.tsx.snap
@@ -28,10 +28,10 @@ exports[`AssetPicker matches snapshot 1`] = `
               />
             </div>
             <div
-              class="mm-box mm-badge-wrapper__badge-container mm-badge-wrapper__badge-container--circular-top-right"
+              class="mm-box mm-badge-wrapper__badge-container mm-badge-wrapper__badge-container--rectangular-bottom-right"
             >
               <div
-                class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-network mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-border-muted box--border-style-solid box--border-width-1"
+                class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-network mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-md mm-box--border-color-border-muted mm-box--border-width-1 box--border-style-solid"
               >
                 <img
                   alt="Ethereum Mainnet logo"
@@ -96,10 +96,10 @@ exports[`AssetPicker render if disabled 1`] = `
               s
             </div>
             <div
-              class="mm-box mm-badge-wrapper__badge-container mm-badge-wrapper__badge-container--circular-top-right"
+              class="mm-box mm-badge-wrapper__badge-container mm-badge-wrapper__badge-container--rectangular-bottom-right"
             >
               <div
-                class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-network mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-border-default box--border-style-solid box--border-width-1"
+                class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-network mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-md mm-box--border-color-border-default mm-box--border-width-1 box--border-style-solid"
               >
                 ?
               </div>
@@ -162,10 +162,10 @@ exports[`AssetPicker should render network picker when networks prop is defined
               />
             </div>
             <div
-              class="mm-box mm-badge-wrapper__badge-container mm-badge-wrapper__badge-container--circular-top-right"
+              class="mm-box mm-badge-wrapper__badge-container mm-badge-wrapper__badge-container--rectangular-bottom-right"
             >
               <div
-                class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-network mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-border-muted box--border-style-solid box--border-width-1"
+                class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-network mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-md mm-box--border-color-border-muted mm-box--border-width-1 box--border-style-solid"
               >
                 <img
                   alt="network logo"
diff --git a/ui/components/multichain/network-list-item/__snapshots__/network-list-item.test.js.snap b/ui/components/multichain/network-list-item/__snapshots__/network-list-item.test.js.snap
index fdf65d6d9337..38f44e767f77 100644
--- a/ui/components/multichain/network-list-item/__snapshots__/network-list-item.test.js.snap
+++ b/ui/components/multichain/network-list-item/__snapshots__/network-list-item.test.js.snap
@@ -6,7 +6,7 @@ exports[`NetworkListItem renders properly 1`] = `
     class="mm-box multichain-network-list-item mm-box--padding-top-4 mm-box--padding-right-4 mm-box--padding-bottom-4 mm-box--padding-left-4 mm-box--display-flex mm-box--gap-4 mm-box--justify-content-space-between mm-box--align-items-center mm-box--width-full mm-box--background-color-transparent"
   >
     <div
-      class="mm-box mm-text mm-avatar-base mm-avatar-base--size-md mm-avatar-network mm-text--body-sm mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-background-default box--border-style-solid box--border-width-1"
+      class="mm-box mm-text mm-avatar-base mm-avatar-base--size-md mm-avatar-network mm-text--body-sm mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-md mm-box--border-color-background-default mm-box--border-width-1 box--border-style-solid"
     >
       <img
         alt="Polygon logo"
diff --git a/ui/components/multichain/network-list-menu/__snapshots__/network-list-menu.test.js.snap b/ui/components/multichain/network-list-menu/__snapshots__/network-list-menu.test.js.snap
index 0bd083b01636..f2042c2385bd 100644
--- a/ui/components/multichain/network-list-menu/__snapshots__/network-list-menu.test.js.snap
+++ b/ui/components/multichain/network-list-menu/__snapshots__/network-list-menu.test.js.snap
@@ -116,7 +116,7 @@ exports[`NetworkListMenu renders properly 1`] = `
                       class="mm-box multichain-network-list-item__selected-indicator mm-box--background-color-primary-default mm-box--rounded-pill"
                     />
                     <div
-                      class="mm-box mm-text mm-avatar-base mm-avatar-base--size-sm mm-avatar-network mm-text--body-sm mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-background-default box--border-style-solid box--border-width-1"
+                      class="mm-box mm-text mm-avatar-base mm-avatar-base--size-sm mm-avatar-network mm-text--body-sm mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-md mm-box--border-color-background-default mm-box--border-width-1 box--border-style-solid"
                     >
                       <img
                         alt="Ethereum Mainnet logo"
@@ -167,7 +167,7 @@ exports[`NetworkListMenu renders properly 1`] = `
                     class="mm-box multichain-network-list-item mm-box--padding-top-4 mm-box--padding-right-4 mm-box--padding-bottom-4 mm-box--padding-left-4 mm-box--display-flex mm-box--gap-4 mm-box--justify-content-space-between mm-box--align-items-center mm-box--width-full mm-box--background-color-transparent"
                   >
                     <div
-                      class="mm-box mm-text mm-avatar-base mm-avatar-base--size-sm mm-avatar-network mm-text--body-sm mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-background-default box--border-style-solid box--border-width-1"
+                      class="mm-box mm-text mm-avatar-base mm-avatar-base--size-sm mm-avatar-network mm-text--body-sm mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-md mm-box--border-color-background-default mm-box--border-width-1 box--border-style-solid"
                     >
                       <img
                         alt="Linea Mainnet logo"
@@ -218,7 +218,7 @@ exports[`NetworkListMenu renders properly 1`] = `
                     class="mm-box multichain-network-list-item mm-box--padding-top-4 mm-box--padding-right-4 mm-box--padding-bottom-4 mm-box--padding-left-4 mm-box--display-flex mm-box--gap-4 mm-box--justify-content-space-between mm-box--align-items-center mm-box--width-full mm-box--background-color-transparent"
                   >
                     <div
-                      class="mm-box mm-text mm-avatar-base mm-avatar-base--size-sm mm-avatar-network mm-text--body-sm mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-background-default box--border-style-solid box--border-width-1"
+                      class="mm-box mm-text mm-avatar-base mm-avatar-base--size-sm mm-avatar-network mm-text--body-sm mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-md mm-box--border-color-background-default mm-box--border-width-1 box--border-style-solid"
                     >
                       <img
                         alt="BNB Chain logo"
@@ -269,7 +269,7 @@ exports[`NetworkListMenu renders properly 1`] = `
                     class="mm-box multichain-network-list-item mm-box--padding-top-4 mm-box--padding-right-4 mm-box--padding-bottom-4 mm-box--padding-left-4 mm-box--display-flex mm-box--gap-4 mm-box--justify-content-space-between mm-box--align-items-center mm-box--width-full mm-box--background-color-transparent"
                   >
                     <div
-                      class="mm-box mm-text mm-avatar-base mm-avatar-base--size-sm mm-avatar-network mm-text--body-sm mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-background-default box--border-style-solid box--border-width-1"
+                      class="mm-box mm-text mm-avatar-base mm-avatar-base--size-sm mm-avatar-network mm-text--body-sm mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-md mm-box--border-color-background-default mm-box--border-width-1 box--border-style-solid"
                     >
                       C
                     </div>
@@ -337,7 +337,7 @@ exports[`NetworkListMenu renders properly 1`] = `
                       class="mm-box mm-box--display-flex mm-box--align-items-center"
                     >
                       <div
-                        class="mm-box mm-text mm-avatar-base mm-avatar-base--size-sm mm-avatar-network mm-text--body-sm mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-background-default box--border-style-solid box--border-width-1"
+                        class="mm-box mm-text mm-avatar-base mm-avatar-base--size-sm mm-avatar-network mm-text--body-sm mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-md mm-box--border-color-background-default mm-box--border-width-1 box--border-style-solid"
                       >
                         <img
                           alt="Arbitrum One logo"
@@ -375,7 +375,7 @@ exports[`NetworkListMenu renders properly 1`] = `
                       class="mm-box mm-box--display-flex mm-box--align-items-center"
                     >
                       <div
-                        class="mm-box mm-text mm-avatar-base mm-avatar-base--size-sm mm-avatar-network mm-text--body-sm mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-background-default box--border-style-solid box--border-width-1"
+                        class="mm-box mm-text mm-avatar-base mm-avatar-base--size-sm mm-avatar-network mm-text--body-sm mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-md mm-box--border-color-background-default mm-box--border-width-1 box--border-style-solid"
                       >
                         <img
                           alt="Avalanche Network C-Chain logo"
@@ -413,7 +413,7 @@ exports[`NetworkListMenu renders properly 1`] = `
                       class="mm-box mm-box--display-flex mm-box--align-items-center"
                     >
                       <div
-                        class="mm-box mm-text mm-avatar-base mm-avatar-base--size-sm mm-avatar-network mm-text--body-sm mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-background-default box--border-style-solid box--border-width-1"
+                        class="mm-box mm-text mm-avatar-base mm-avatar-base--size-sm mm-avatar-network mm-text--body-sm mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-md mm-box--border-color-background-default mm-box--border-width-1 box--border-style-solid"
                       >
                         <img
                           alt="Base Mainnet logo"
@@ -451,7 +451,7 @@ exports[`NetworkListMenu renders properly 1`] = `
                       class="mm-box mm-box--display-flex mm-box--align-items-center"
                     >
                       <div
-                        class="mm-box mm-text mm-avatar-base mm-avatar-base--size-sm mm-avatar-network mm-text--body-sm mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-background-default box--border-style-solid box--border-width-1"
+                        class="mm-box mm-text mm-avatar-base mm-avatar-base--size-sm mm-avatar-network mm-text--body-sm mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-md mm-box--border-color-background-default mm-box--border-width-1 box--border-style-solid"
                       >
                         <img
                           alt="OP Mainnet logo"
@@ -489,7 +489,7 @@ exports[`NetworkListMenu renders properly 1`] = `
                       class="mm-box mm-box--display-flex mm-box--align-items-center"
                     >
                       <div
-                        class="mm-box mm-text mm-avatar-base mm-avatar-base--size-sm mm-avatar-network mm-text--body-sm mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-background-default box--border-style-solid box--border-width-1"
+                        class="mm-box mm-text mm-avatar-base mm-avatar-base--size-sm mm-avatar-network mm-text--body-sm mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-md mm-box--border-color-background-default mm-box--border-width-1 box--border-style-solid"
                       >
                         <img
                           alt="Polygon Mainnet logo"
@@ -527,7 +527,7 @@ exports[`NetworkListMenu renders properly 1`] = `
                       class="mm-box mm-box--display-flex mm-box--align-items-center"
                     >
                       <div
-                        class="mm-box mm-text mm-avatar-base mm-avatar-base--size-sm mm-avatar-network mm-text--body-sm mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-background-default box--border-style-solid box--border-width-1"
+                        class="mm-box mm-text mm-avatar-base mm-avatar-base--size-sm mm-avatar-network mm-text--body-sm mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-md mm-box--border-color-background-default mm-box--border-width-1 box--border-style-solid"
                       >
                         <img
                           alt="zkSync Era Mainnet logo"
diff --git a/ui/components/multichain/network-list-menu/select-rpc-url-modal/__snapshots__/select-rpc-url-modal.test.tsx.snap b/ui/components/multichain/network-list-menu/select-rpc-url-modal/__snapshots__/select-rpc-url-modal.test.tsx.snap
index ebb23db52186..db132984c179 100644
--- a/ui/components/multichain/network-list-menu/select-rpc-url-modal/__snapshots__/select-rpc-url-modal.test.tsx.snap
+++ b/ui/components/multichain/network-list-menu/select-rpc-url-modal/__snapshots__/select-rpc-url-modal.test.tsx.snap
@@ -12,7 +12,7 @@ exports[`SelectRpcUrlModal Component renders select rpc url 1`] = `
         class="mm-box mm-box--margin-auto mm-box--padding-top-1 mm-box--padding-bottom-8 mm-box--display-flex mm-box--align-items-center"
       >
         <div
-          class="mm-box mm-text mm-avatar-base mm-avatar-base--size-sm mm-avatar-network mm-text--body-sm mm-text--text-transform-uppercase mm-box--margin-right-1 mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
+          class="mm-box mm-text mm-avatar-base mm-avatar-base--size-sm mm-avatar-network mm-text--body-sm mm-text--text-transform-uppercase mm-box--margin-right-1 mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-md mm-box--border-color-background-default mm-box--border-width-1 box--border-style-solid"
         >
           <img
             alt="Ethereum Mainnet logo"
diff --git a/ui/components/multichain/pages/send/components/__snapshots__/network-picker.test.tsx.snap b/ui/components/multichain/pages/send/components/__snapshots__/network-picker.test.tsx.snap
index 37ca306bc436..3428358159e1 100644
--- a/ui/components/multichain/pages/send/components/__snapshots__/network-picker.test.tsx.snap
+++ b/ui/components/multichain/pages/send/components/__snapshots__/network-picker.test.tsx.snap
@@ -6,11 +6,11 @@ exports[`SendPageNetworkPicker render renders correctly 1`] = `
     class="mm-box mm-box--padding-bottom-4 mm-box--display-flex mm-box--flex-direction-column"
   >
     <button
-      class="mm-box mm-picker-network mm-box--padding-right-4 mm-box--padding-left-2 mm-box--display-flex mm-box--gap-2 mm-box--align-items-center mm-box--background-color-background-alternative mm-box--rounded-pill"
+      class="mm-box mm-picker-network mm-box--padding-right-2 mm-box--padding-left-2 mm-box--display-flex mm-box--gap-2 mm-box--align-items-center mm-box--background-color-background-alternative mm-box--rounded-pill"
       data-testid="send-page-network-picker"
     >
       <div
-        class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-network mm-picker-network__avatar-network mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
+        class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-network mm-picker-network__avatar-network mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-md mm-box--border-color-background-default mm-box--border-width-1 box--border-style-solid"
       >
         G
       </div>
diff --git a/ui/components/multichain/token-list-item/__snapshots__/token-list-item.test.tsx.snap b/ui/components/multichain/token-list-item/__snapshots__/token-list-item.test.tsx.snap
index ea78644919cc..dbf89d4d4132 100644
--- a/ui/components/multichain/token-list-item/__snapshots__/token-list-item.test.tsx.snap
+++ b/ui/components/multichain/token-list-item/__snapshots__/token-list-item.test.tsx.snap
@@ -20,10 +20,10 @@ exports[`TokenListItem should render correctly 1`] = `
           ?
         </div>
         <div
-          class="mm-box mm-badge-wrapper__badge-container mm-badge-wrapper__badge-container--circular-top-right"
+          class="mm-box mm-badge-wrapper__badge-container mm-badge-wrapper__badge-container--rectangular-bottom-right"
         >
           <div
-            class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-network multichain-token-list-item__badge__avatar-network mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
+            class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-network multichain-token-list-item__badge__avatar-network mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-md mm-box--border-color-background-default mm-box--border-width-1 box--border-style-solid"
           >
             <img
               alt="network logo"
diff --git a/ui/components/multichain/token-list-item/index.scss b/ui/components/multichain/token-list-item/index.scss
index d73591ddcdba..f40fcf5a1df6 100644
--- a/ui/components/multichain/token-list-item/index.scss
+++ b/ui/components/multichain/token-list-item/index.scss
@@ -10,9 +10,5 @@
 
   &__badge {
     align-self: center;
-
-    &__avatar-network {
-      box-sizing: content-box;
-    }
   }
 }
diff --git a/ui/pages/asset/components/__snapshots__/asset-page.test.tsx.snap b/ui/pages/asset/components/__snapshots__/asset-page.test.tsx.snap
index a5965d2fbe30..d6e4c675f8e1 100644
--- a/ui/pages/asset/components/__snapshots__/asset-page.test.tsx.snap
+++ b/ui/pages/asset/components/__snapshots__/asset-page.test.tsx.snap
@@ -194,10 +194,10 @@ exports[`AssetPage should render a native asset 1`] = `
               T
             </div>
             <div
-              class="mm-box mm-badge-wrapper__badge-container mm-badge-wrapper__badge-container--circular-top-right"
+              class="mm-box mm-badge-wrapper__badge-container mm-badge-wrapper__badge-container--rectangular-bottom-right"
             >
               <div
-                class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-network multichain-token-list-item__badge__avatar-network mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
+                class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-network multichain-token-list-item__badge__avatar-network mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-md mm-box--border-color-background-default mm-box--border-width-1 box--border-style-solid"
               >
                 <img
                   alt="static-logo"
@@ -519,10 +519,10 @@ exports[`AssetPage should render an ERC20 asset without prices 1`] = `
               T
             </div>
             <div
-              class="mm-box mm-badge-wrapper__badge-container mm-badge-wrapper__badge-container--circular-top-right"
+              class="mm-box mm-badge-wrapper__badge-container mm-badge-wrapper__badge-container--rectangular-bottom-right"
             >
               <div
-                class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-network multichain-token-list-item__badge__avatar-network mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
+                class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-network multichain-token-list-item__badge__avatar-network mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-md mm-box--border-color-background-default mm-box--border-width-1 box--border-style-solid"
               >
                 <img
                   alt="static-logo"
@@ -1030,10 +1030,10 @@ exports[`AssetPage should render an ERC20 token with prices 1`] = `
               T
             </div>
             <div
-              class="mm-box mm-badge-wrapper__badge-container mm-badge-wrapper__badge-container--circular-top-right"
+              class="mm-box mm-badge-wrapper__badge-container mm-badge-wrapper__badge-container--rectangular-bottom-right"
             >
               <div
-                class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-network multichain-token-list-item__badge__avatar-network mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
+                class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-network multichain-token-list-item__badge__avatar-network mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-md mm-box--border-color-background-default mm-box--border-width-1 box--border-style-solid"
               >
                 <img
                   alt="static-logo"
diff --git a/ui/pages/bridge/prepare/__snapshots__/prepare-bridge-page.test.tsx.snap b/ui/pages/bridge/prepare/__snapshots__/prepare-bridge-page.test.tsx.snap
index a14e8ef5f05e..8c73ba3c82b2 100644
--- a/ui/pages/bridge/prepare/__snapshots__/prepare-bridge-page.test.tsx.snap
+++ b/ui/pages/bridge/prepare/__snapshots__/prepare-bridge-page.test.tsx.snap
@@ -40,10 +40,10 @@ exports[`PrepareBridgePage should render the component, with initial state 1`] =
                       />
                     </div>
                     <div
-                      class="mm-box mm-badge-wrapper__badge-container mm-badge-wrapper__badge-container--circular-top-right"
+                      class="mm-box mm-badge-wrapper__badge-container mm-badge-wrapper__badge-container--rectangular-bottom-right"
                     >
                       <div
-                        class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-network mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-border-muted box--border-style-solid box--border-width-1"
+                        class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-network mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-md mm-box--border-color-border-muted mm-box--border-width-1 box--border-style-solid"
                       >
                         <img
                           alt="Ethereum Mainnet logo"
@@ -244,10 +244,10 @@ exports[`PrepareBridgePage should render the component, with inputs set 1`] = `
                       />
                     </div>
                     <div
-                      class="mm-box mm-badge-wrapper__badge-container mm-badge-wrapper__badge-container--circular-top-right"
+                      class="mm-box mm-badge-wrapper__badge-container mm-badge-wrapper__badge-container--rectangular-bottom-right"
                     >
                       <div
-                        class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-network mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-border-muted box--border-style-solid box--border-width-1"
+                        class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-network mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-md mm-box--border-color-border-muted mm-box--border-width-1 box--border-style-solid"
                       >
                         <img
                           alt="Ethereum Mainnet logo"
@@ -371,10 +371,10 @@ exports[`PrepareBridgePage should render the component, with inputs set 1`] = `
                       />
                     </div>
                     <div
-                      class="mm-box mm-badge-wrapper__badge-container mm-badge-wrapper__badge-container--circular-top-right"
+                      class="mm-box mm-badge-wrapper__badge-container mm-badge-wrapper__badge-container--rectangular-bottom-right"
                     >
                       <div
-                        class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-network mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-border-muted box--border-style-solid box--border-width-1"
+                        class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-network mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-md mm-box--border-color-border-muted mm-box--border-width-1 box--border-style-solid"
                       >
                         <img
                           alt="Linea Mainnet logo"
diff --git a/ui/pages/bridge/prepare/index.scss b/ui/pages/bridge/prepare/index.scss
index 9a523d8a7e91..079c057c59de 100644
--- a/ui/pages/bridge/prepare/index.scss
+++ b/ui/pages/bridge/prepare/index.scss
@@ -1,11 +1,5 @@
 @use "design-system";
 
-.tokens-main-view-modal {
-  .multichain-asset-picker-list-item .mm-badge-wrapper__badge-container {
-    display: none;
-  }
-}
-
 .prepare-bridge-page {
   display: flex;
   flex-flow: column;
diff --git a/ui/pages/confirmations/components/confirm-page-container/confirm-detail-row/__snapshots__/confirm-detail-row.component.test.js.snap b/ui/pages/confirmations/components/confirm-page-container/confirm-detail-row/__snapshots__/confirm-detail-row.component.test.js.snap
index 073d23aebf88..4206c835f1ca 100644
--- a/ui/pages/confirmations/components/confirm-page-container/confirm-detail-row/__snapshots__/confirm-detail-row.component.test.js.snap
+++ b/ui/pages/confirmations/components/confirm-page-container/confirm-detail-row/__snapshots__/confirm-detail-row.component.test.js.snap
@@ -20,7 +20,7 @@ exports[`Confirm Detail Row Component should match snapshot 1`] = `
           variant="inherit"
         >
           <div
-            class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-network mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
+            class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-network mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-md mm-box--border-color-background-default mm-box--border-width-1 box--border-style-solid"
           >
             G
           </div>
@@ -41,7 +41,7 @@ exports[`Confirm Detail Row Component should match snapshot 1`] = `
           variant="inherit"
         >
           <div
-            class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-network mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
+            class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-network mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-md mm-box--border-color-background-default mm-box--border-width-1 box--border-style-solid"
           >
             G
           </div>
diff --git a/ui/pages/confirmations/components/confirm-page-container/confirm-page-container-header/__snapshots__/confirm-page-container-header.component.test.js.snap b/ui/pages/confirmations/components/confirm-page-container/confirm-page-container-header/__snapshots__/confirm-page-container-header.component.test.js.snap
index 296e42db6bc5..98fe98ec4138 100644
--- a/ui/pages/confirmations/components/confirm-page-container/confirm-page-container-header/__snapshots__/confirm-page-container-header.component.test.js.snap
+++ b/ui/pages/confirmations/components/confirm-page-container/confirm-page-container-header/__snapshots__/confirm-page-container-header.component.test.js.snap
@@ -25,10 +25,10 @@ exports[`Confirm Detail Row Component should match snapshot 1`] = `
         </span>
       </div>
       <div
-        class="mm-box mm-picker-network network-display mm-box--padding-right-4 mm-box--padding-left-2 mm-box--display-flex mm-box--gap-2 mm-box--align-items-center mm-box--background-color-transparent mm-box--rounded-pill mm-box--border-color-border-muted mm-box--border-width-0 box--border-style-solid box--border-width-1"
+        class="mm-box mm-picker-network network-display mm-box--padding-right-2 mm-box--padding-left-2 mm-box--display-flex mm-box--gap-2 mm-box--align-items-center mm-box--background-color-transparent mm-box--rounded-pill mm-box--border-color-border-muted mm-box--border-width-0 box--border-style-solid box--border-width-1"
       >
         <div
-          class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-network mm-picker-network__avatar-network mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
+          class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-network mm-picker-network__avatar-network mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-md mm-box--border-color-background-default mm-box--border-width-1 box--border-style-solid"
         >
           G
         </div>
diff --git a/ui/pages/confirmations/components/confirm/header/__snapshots__/header.test.tsx.snap b/ui/pages/confirmations/components/confirm/header/__snapshots__/header.test.tsx.snap
index 621318c6ebe2..3ae6ec8c9b92 100644
--- a/ui/pages/confirmations/components/confirm/header/__snapshots__/header.test.tsx.snap
+++ b/ui/pages/confirmations/components/confirm/header/__snapshots__/header.test.tsx.snap
@@ -57,7 +57,7 @@ exports[`Header should match snapshot with signature confirmation 1`] = `
           </div>
         </div>
         <div
-          class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-network confirm_header__avatar-network mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-goerli mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
+          class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-network confirm_header__avatar-network mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-goerli mm-box--rounded-md mm-box--border-color-background-default mm-box--border-width-1 box--border-style-solid"
         >
           G
         </div>
@@ -243,7 +243,7 @@ exports[`Header should match snapshot with transaction confirmation 1`] = `
           </div>
         </div>
         <div
-          class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-network confirm_header__avatar-network mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-goerli mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
+          class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-network confirm_header__avatar-network mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-goerli mm-box--rounded-md mm-box--border-color-background-default mm-box--border-width-1 box--border-style-solid"
         >
           G
         </div>
diff --git a/ui/pages/confirmations/components/confirm/info/native-transfer/__snapshots__/native-transfer.test.tsx.snap b/ui/pages/confirmations/components/confirm/info/native-transfer/__snapshots__/native-transfer.test.tsx.snap
index 3074f81a0241..c194a43564f7 100644
--- a/ui/pages/confirmations/components/confirm/info/native-transfer/__snapshots__/native-transfer.test.tsx.snap
+++ b/ui/pages/confirmations/components/confirm/info/native-transfer/__snapshots__/native-transfer.test.tsx.snap
@@ -130,7 +130,7 @@ exports[`NativeTransferInfo renders correctly 1`] = `
         class="mm-box mm-box--display-flex mm-box--gap-2 mm-box--flex-wrap-wrap mm-box--align-items-center mm-box--min-width-0"
       >
         <div
-          class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-network mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-background-default box--border-style-solid box--border-width-1"
+          class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-network mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-md mm-box--border-color-background-default mm-box--border-width-1 box--border-style-solid"
         >
           G
         </div>
diff --git a/ui/pages/confirmations/components/confirm/info/nft-token-transfer/__snapshots__/nft-token-transfer.test.tsx.snap b/ui/pages/confirmations/components/confirm/info/nft-token-transfer/__snapshots__/nft-token-transfer.test.tsx.snap
index 6e55d4c44f1e..07b9ad69b2ab 100644
--- a/ui/pages/confirmations/components/confirm/info/nft-token-transfer/__snapshots__/nft-token-transfer.test.tsx.snap
+++ b/ui/pages/confirmations/components/confirm/info/nft-token-transfer/__snapshots__/nft-token-transfer.test.tsx.snap
@@ -26,7 +26,7 @@ exports[`NFTTokenTransferInfo renders correctly 1`] = `
             style="top: -4px; right: -4px;"
           >
             <div
-              class="mm-box mm-text mm-avatar-base mm-avatar-base--size-sm mm-avatar-network nft-item__network-badge mm-text--body-sm mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-background-default mm-box--border-width-2 box--border-style-solid"
+              class="mm-box mm-text mm-avatar-base mm-avatar-base--size-sm mm-avatar-network nft-item__network-badge mm-text--body-sm mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-md mm-box--border-color-background-default mm-box--border-width-2 box--border-style-solid"
               data-testid="nft-network-badge"
             >
               G
@@ -158,7 +158,7 @@ exports[`NFTTokenTransferInfo renders correctly 1`] = `
         class="mm-box mm-box--display-flex mm-box--gap-2 mm-box--flex-wrap-wrap mm-box--align-items-center mm-box--min-width-0"
       >
         <div
-          class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-network mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-background-default box--border-style-solid box--border-width-1"
+          class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-network mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-md mm-box--border-color-background-default mm-box--border-width-1 box--border-style-solid"
         >
           G
         </div>
diff --git a/ui/pages/confirmations/components/confirm/info/shared/nft-send-heading/__snapshots__/nft-send-heading.test.tsx.snap b/ui/pages/confirmations/components/confirm/info/shared/nft-send-heading/__snapshots__/nft-send-heading.test.tsx.snap
index 5559f00fa01f..27dd7b495b36 100644
--- a/ui/pages/confirmations/components/confirm/info/shared/nft-send-heading/__snapshots__/nft-send-heading.test.tsx.snap
+++ b/ui/pages/confirmations/components/confirm/info/shared/nft-send-heading/__snapshots__/nft-send-heading.test.tsx.snap
@@ -26,7 +26,7 @@ exports[`<NFTSendHeading /> renders component 1`] = `
             style="top: -4px; right: -4px;"
           >
             <div
-              class="mm-box mm-text mm-avatar-base mm-avatar-base--size-sm mm-avatar-network nft-item__network-badge mm-text--body-sm mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-background-default mm-box--border-width-2 box--border-style-solid"
+              class="mm-box mm-text mm-avatar-base mm-avatar-base--size-sm mm-avatar-network nft-item__network-badge mm-text--body-sm mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-md mm-box--border-color-background-default mm-box--border-width-2 box--border-style-solid"
               data-testid="nft-network-badge"
             >
               G
diff --git a/ui/pages/confirmations/components/confirm/info/token-transfer/__snapshots__/token-details-section.test.tsx.snap b/ui/pages/confirmations/components/confirm/info/token-transfer/__snapshots__/token-details-section.test.tsx.snap
index 863510e1780b..f85c89c22981 100644
--- a/ui/pages/confirmations/components/confirm/info/token-transfer/__snapshots__/token-details-section.test.tsx.snap
+++ b/ui/pages/confirmations/components/confirm/info/token-transfer/__snapshots__/token-details-section.test.tsx.snap
@@ -27,7 +27,7 @@ exports[`TokenDetailsSection renders correctly 1`] = `
         class="mm-box mm-box--display-flex mm-box--gap-2 mm-box--flex-wrap-wrap mm-box--align-items-center mm-box--min-width-0"
       >
         <div
-          class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-network mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-background-default box--border-style-solid box--border-width-1"
+          class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-network mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-md mm-box--border-color-background-default mm-box--border-width-1 box--border-style-solid"
         >
           G
         </div>
diff --git a/ui/pages/confirmations/components/confirm/info/token-transfer/__snapshots__/token-transfer.test.tsx.snap b/ui/pages/confirmations/components/confirm/info/token-transfer/__snapshots__/token-transfer.test.tsx.snap
index 4578e639f25c..4cb3213f8dae 100644
--- a/ui/pages/confirmations/components/confirm/info/token-transfer/__snapshots__/token-transfer.test.tsx.snap
+++ b/ui/pages/confirmations/components/confirm/info/token-transfer/__snapshots__/token-transfer.test.tsx.snap
@@ -159,7 +159,7 @@ exports[`TokenTransferInfo renders correctly 1`] = `
         class="mm-box mm-box--display-flex mm-box--gap-2 mm-box--flex-wrap-wrap mm-box--align-items-center mm-box--min-width-0"
       >
         <div
-          class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-network mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-background-default box--border-style-solid box--border-width-1"
+          class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-network mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-md mm-box--border-color-background-default mm-box--border-width-1 box--border-style-solid"
         >
           G
         </div>
diff --git a/ui/pages/confirmations/components/signature-request/signature-request-header/__snapshots__/signature-request-header.component.test.js.snap b/ui/pages/confirmations/components/signature-request/signature-request-header/__snapshots__/signature-request-header.component.test.js.snap
index 5a990c7daa37..5cb275d146e1 100644
--- a/ui/pages/confirmations/components/signature-request/signature-request-header/__snapshots__/signature-request-header.component.test.js.snap
+++ b/ui/pages/confirmations/components/signature-request/signature-request-header/__snapshots__/signature-request-header.component.test.js.snap
@@ -71,10 +71,10 @@ exports[`SignatureRequestHeader renders correctly with fromAccount 1`] = `
       class="signature-request-header--network"
     >
       <div
-        class="mm-box mm-picker-network network-display mm-box--padding-right-4 mm-box--padding-left-2 mm-box--display-flex mm-box--gap-2 mm-box--align-items-center mm-box--background-color-transparent mm-box--rounded-pill mm-box--border-color-border-muted mm-box--border-width-0 box--border-style-solid box--border-width-1"
+        class="mm-box mm-picker-network network-display mm-box--padding-right-2 mm-box--padding-left-2 mm-box--display-flex mm-box--gap-2 mm-box--align-items-center mm-box--background-color-transparent mm-box--rounded-pill mm-box--border-color-border-muted mm-box--border-width-0 box--border-style-solid box--border-width-1"
       >
         <div
-          class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-network mm-picker-network__avatar-network mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
+          class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-network mm-picker-network__avatar-network mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-md mm-box--border-color-background-default mm-box--border-width-1 box--border-style-solid"
         >
           G
         </div>
@@ -106,10 +106,10 @@ exports[`SignatureRequestHeader renders correctly without fromAccount 1`] = `
       class="signature-request-header--network"
     >
       <div
-        class="mm-box mm-picker-network network-display mm-box--padding-right-4 mm-box--padding-left-2 mm-box--display-flex mm-box--gap-2 mm-box--align-items-center mm-box--background-color-transparent mm-box--rounded-pill mm-box--border-color-border-muted mm-box--border-width-0 box--border-style-solid box--border-width-1"
+        class="mm-box mm-picker-network network-display mm-box--padding-right-2 mm-box--padding-left-2 mm-box--display-flex mm-box--gap-2 mm-box--align-items-center mm-box--background-color-transparent mm-box--rounded-pill mm-box--border-color-border-muted mm-box--border-width-0 box--border-style-solid box--border-width-1"
       >
         <div
-          class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-network mm-picker-network__avatar-network mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
+          class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-network mm-picker-network__avatar-network mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-md mm-box--border-color-background-default mm-box--border-width-1 box--border-style-solid"
         >
           G
         </div>
diff --git a/ui/pages/confirmations/confirm-send-ether/__snapshots__/confirm-send-ether.test.js.snap b/ui/pages/confirmations/confirm-send-ether/__snapshots__/confirm-send-ether.test.js.snap
index 8fbb99891d01..792a9e86e51c 100644
--- a/ui/pages/confirmations/confirm-send-ether/__snapshots__/confirm-send-ether.test.js.snap
+++ b/ui/pages/confirmations/confirm-send-ether/__snapshots__/confirm-send-ether.test.js.snap
@@ -80,10 +80,10 @@ exports[`ConfirmSendEther should render correct information for for confirm send
         class="confirm-page-container-header__row"
       >
         <div
-          class="mm-box mm-picker-network network-display mm-box--padding-right-4 mm-box--padding-left-2 mm-box--display-flex mm-box--gap-2 mm-box--align-items-center mm-box--background-color-transparent mm-box--rounded-pill mm-box--border-color-border-muted mm-box--border-width-0 box--border-style-solid box--border-width-1"
+          class="mm-box mm-picker-network network-display mm-box--padding-right-2 mm-box--padding-left-2 mm-box--display-flex mm-box--gap-2 mm-box--align-items-center mm-box--background-color-transparent mm-box--rounded-pill mm-box--border-color-border-muted mm-box--border-width-0 box--border-style-solid box--border-width-1"
         >
           <div
-            class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-network mm-picker-network__avatar-network mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
+            class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-network mm-picker-network__avatar-network mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-md mm-box--border-color-background-default mm-box--border-width-1 box--border-style-solid"
           >
             G
           </div>
@@ -299,7 +299,7 @@ exports[`ConfirmSendEther should render correct information for for confirm send
                 variant="inherit"
               >
                 <div
-                  class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-network mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
+                  class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-network mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-md mm-box--border-color-background-default mm-box--border-width-1 box--border-style-solid"
                 >
                   G
                 </div>
diff --git a/ui/pages/confirmations/confirm/__snapshots__/confirm.test.tsx.snap b/ui/pages/confirmations/confirm/__snapshots__/confirm.test.tsx.snap
index 178c3647f91f..ecfc0522fd18 100644
--- a/ui/pages/confirmations/confirm/__snapshots__/confirm.test.tsx.snap
+++ b/ui/pages/confirmations/confirm/__snapshots__/confirm.test.tsx.snap
@@ -63,7 +63,7 @@ exports[`Confirm matches snapshot for signature - personal sign type 1`] = `
               </div>
             </div>
             <div
-              class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-network confirm_header__avatar-network mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-goerli mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
+              class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-network confirm_header__avatar-network mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-goerli mm-box--rounded-md mm-box--border-color-background-default mm-box--border-width-1 box--border-style-solid"
             >
               G
             </div>
@@ -320,7 +320,7 @@ exports[`Confirm should match snapshot for signature - typed sign - V4 - PermitB
               </div>
             </div>
             <div
-              class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-network confirm_header__avatar-network mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-goerli mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
+              class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-network confirm_header__avatar-network mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-goerli mm-box--rounded-md mm-box--border-color-background-default mm-box--border-width-1 box--border-style-solid"
             >
               G
             </div>
@@ -903,7 +903,7 @@ exports[`Confirm should match snapshot for signature - typed sign - V4 - PermitS
               </div>
             </div>
             <div
-              class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-network confirm_header__avatar-network mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-goerli mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
+              class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-network confirm_header__avatar-network mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-goerli mm-box--rounded-md mm-box--border-color-background-default mm-box--border-width-1 box--border-style-solid"
             >
               G
             </div>
@@ -1433,7 +1433,7 @@ exports[`Confirm should match snapshot for signature - typed sign - V4 1`] = `
               </div>
             </div>
             <div
-              class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-network confirm_header__avatar-network mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-goerli mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
+              class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-network confirm_header__avatar-network mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-goerli mm-box--rounded-md mm-box--border-color-background-default mm-box--border-width-1 box--border-style-solid"
             >
               G
             </div>
@@ -2452,7 +2452,7 @@ exports[`Confirm should match snapshot for signature - typed sign - permit 1`] =
               </div>
             </div>
             <div
-              class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-network confirm_header__avatar-network mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-goerli mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
+              class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-network confirm_header__avatar-network mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-goerli mm-box--rounded-md mm-box--border-color-background-default mm-box--border-width-1 box--border-style-solid"
             >
               G
             </div>
@@ -2978,7 +2978,7 @@ exports[`Confirm should match snapshot signature - typed sign - order 1`] = `
               </div>
             </div>
             <div
-              class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-network confirm_header__avatar-network mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-goerli mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
+              class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-network confirm_header__avatar-network mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-goerli mm-box--rounded-md mm-box--border-color-background-default mm-box--border-width-1 box--border-style-solid"
             >
               G
             </div>
diff --git a/ui/pages/confirmations/confirmation/templates/__snapshots__/switch-ethereum-chain.test.js.snap b/ui/pages/confirmations/confirmation/templates/__snapshots__/switch-ethereum-chain.test.js.snap
index 8bf1adbf278b..7c654fc0bde0 100644
--- a/ui/pages/confirmations/confirmation/templates/__snapshots__/switch-ethereum-chain.test.js.snap
+++ b/ui/pages/confirmations/confirmation/templates/__snapshots__/switch-ethereum-chain.test.js.snap
@@ -29,7 +29,7 @@ exports[`switch-ethereum-chain confirmation should match snapshot 1`] = `
             class="mm-box confirmation-network-switch__icon mm-box--display-block"
           >
             <div
-              class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xl mm-avatar-network mm-text--body-lg-medium mm-text--text-transform-uppercase mm-box--margin-bottom-2 mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
+              class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xl mm-avatar-network mm-text--body-lg-medium mm-text--text-transform-uppercase mm-box--margin-bottom-2 mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-md mm-box--border-color-background-default mm-box--border-width-1 box--border-style-solid"
             >
               T
             </div>
@@ -54,7 +54,7 @@ exports[`switch-ethereum-chain confirmation should match snapshot 1`] = `
             class="mm-box confirmation-network-switch__icon mm-box--display-block"
           >
             <div
-              class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xl mm-avatar-network mm-text--body-lg-medium mm-text--text-transform-uppercase mm-box--margin-bottom-2 mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
+              class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xl mm-avatar-network mm-text--body-lg-medium mm-text--text-transform-uppercase mm-box--margin-bottom-2 mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-md mm-box--border-color-background-default mm-box--border-width-1 box--border-style-solid"
             >
               T
             </div>
@@ -121,7 +121,7 @@ exports[`switch-ethereum-chain confirmation should show alert if there are pendi
             class="mm-box confirmation-network-switch__icon mm-box--display-block"
           >
             <div
-              class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xl mm-avatar-network mm-text--body-lg-medium mm-text--text-transform-uppercase mm-box--margin-bottom-2 mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
+              class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xl mm-avatar-network mm-text--body-lg-medium mm-text--text-transform-uppercase mm-box--margin-bottom-2 mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-md mm-box--border-color-background-default mm-box--border-width-1 box--border-style-solid"
             >
               T
             </div>
@@ -146,7 +146,7 @@ exports[`switch-ethereum-chain confirmation should show alert if there are pendi
             class="mm-box confirmation-network-switch__icon mm-box--display-block"
           >
             <div
-              class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xl mm-avatar-network mm-text--body-lg-medium mm-text--text-transform-uppercase mm-box--margin-bottom-2 mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
+              class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xl mm-avatar-network mm-text--body-lg-medium mm-text--text-transform-uppercase mm-box--margin-bottom-2 mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-md mm-box--border-color-background-default mm-box--border-width-1 box--border-style-solid"
             >
               T
             </div>
diff --git a/ui/pages/settings/security-tab/__snapshots__/security-tab.test.js.snap b/ui/pages/settings/security-tab/__snapshots__/security-tab.test.js.snap
index 23d2b80519a3..43d8a4de1914 100644
--- a/ui/pages/settings/security-tab/__snapshots__/security-tab.test.js.snap
+++ b/ui/pages/settings/security-tab/__snapshots__/security-tab.test.js.snap
@@ -563,7 +563,7 @@ exports[`Security Tab should match snapshot 1`] = `
             class="mm-box network-toggle-wrapper__overflow-container mm-box--display-flex mm-box--gap-4 mm-box--align-items-center mm-box--width-full mm-box--background-color-transparent"
           >
             <div
-              class="mm-box mm-text mm-avatar-base mm-avatar-base--size-sm mm-avatar-network mm-text--body-sm mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
+              class="mm-box mm-text mm-avatar-base mm-avatar-base--size-sm mm-avatar-network mm-text--body-sm mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-md mm-box--border-color-background-default mm-box--border-width-1 box--border-style-solid"
             >
               <img
                 alt="Custom Mainnet RPC logo"
@@ -650,7 +650,7 @@ exports[`Security Tab should match snapshot 1`] = `
             class="mm-box network-toggle-wrapper__overflow-container mm-box--display-flex mm-box--gap-4 mm-box--align-items-center mm-box--width-full mm-box--background-color-transparent"
           >
             <div
-              class="mm-box mm-text mm-avatar-base mm-avatar-base--size-sm mm-avatar-network mm-text--body-sm mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
+              class="mm-box mm-text mm-avatar-base mm-avatar-base--size-sm mm-avatar-network mm-text--body-sm mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-md mm-box--border-color-background-default mm-box--border-width-1 box--border-style-solid"
             >
               G
             </div>

From 5f6e31ae33e7228855ae20f272570e63ed11c285 Mon Sep 17 00:00:00 2001
From: Norbert Elter <72046715+itsyoboieltr@users.noreply.github.com>
Date: Wed, 11 Dec 2024 22:11:47 +0400
Subject: [PATCH 084/175] fix: SonarCloud branch information (#29072)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<!--
Please submit this PR as a draft initially.
Do not mark it as "Ready for review" until the template has been
completely filled out, and PR status checks have passed at least once.
-->

## **Description**

<!--
Write a short description of the changes included in this pull request,
also include relevant motivation and context. Have in mind the following
questions:
1. What is the reason for the change?
2. What is the improvement/solution?
-->

[![Open in GitHub
Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/29072?quickstart=1)

In this [slack
thread](https://consensys.slack.com/archives/CTQAGKY5V/p1733397151519159?thread_ts=1732116793.123109&cid=CTQAGKY5V)
it was reported that SonarCloud is only executed on "main". Following
some investigation, we discovered that it is executed on other branches
too, but the SonarCloud UI displays the branch always as "main" due to a
problem with the wrong branch name being reported by the workflow. We
identified that this issue was introduced by the
https://github.com/MetaMask/metamask-extension/pull/27700 that updated
the SonarCloud workflow to enable execution on forks. Enabling execution
on forks required some security measures to avoid arbitrary code
execution by malicious actors, which seems to have confused the
SonarCloud GitHub Action.

In order to solve this problem, the workflow now overrides the analysis
parameters, according to the documentation
[here](https://docs.sonarsource.com/sonarqube-cloud/advanced-setup/analysis-parameters/).

## **Related issues**

Fixes: https://github.com/MetaMask/MetaMask-planning/issues/3774

## **Manual testing steps**

1. Run SonarCloud scan (after merging, as the workflow only executes
from main), and see PRs and branches correctly displayed on the
SonarCloud UI.

## **Screenshots/Recordings**

Not applicable

## **Pre-merge author checklist**

- [x] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension Coding
Standards](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/CODING_GUIDELINES.md).
- [x] I've completed the PR template to the best of my ability
- [x] I’ve included tests if applicable
- [x] I’ve documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [x] I’ve applied the right labels on the PR (see [labeling
guidelines](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.

## **Pre-merge reviewer checklist**

- [ ] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed).
- [ ] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.

---------

Co-authored-by: Danica Shen <zhaodanica@gmail.com>
---
 .github/workflows/sonarcloud.yml | 24 ++++++++++++++++++++++--
 1 file changed, 22 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/sonarcloud.yml b/.github/workflows/sonarcloud.yml
index 8b12876de1cd..9c8681bc8824 100644
--- a/.github/workflows/sonarcloud.yml
+++ b/.github/workflows/sonarcloud.yml
@@ -3,6 +3,9 @@
 # actions that may result in code from that branch being executed
 # such as installing dependencies or running build scripts.
 
+# For security reasons, this file always uses the latest version from the default branch.
+# Changes made in feature branches or forks will not take effect until they are merged.
+
 name: SonarCloud
 
 on:
@@ -17,9 +20,9 @@ permissions:
 
 jobs:
   sonarcloud:
-    # Only scan code from non-forked repositories that have passed the tests
+    # Only scan code from non-forked repositories that have completed successfully using the push and pull_request events
     # This will skip scanning the code for forks, but will run for the main repository on PRs from forks
-    if: ${{ github.event.workflow_run.conclusion == 'success' && github.event.workflow_run.repository.fork == false }}
+    if: ${{ github.event.workflow_run.conclusion == 'success' && contains(fromJSON('["push", "pull_request"]'), github.event.workflow_run.event) && !github.event.workflow_run.repository.fork }}
     name: SonarCloud
     runs-on: ubuntu-latest
     steps:
@@ -50,6 +53,23 @@ jobs:
           fi
           echo "$sonar_project_properties" > sonar-project.properties
 
+      - name: Update sonar-project.properties with branch information
+        env:
+          EVENT: ${{ github.event.workflow_run.event }}
+          HEAD_BRANCH: ${{ github.event.workflow_run.head_branch }}
+          BASE_BRANCH: ${{ github.event.workflow_run.pull_requests[0].base.ref || '' }}
+          PR_NUMBER: ${{ github.event.workflow_run.pull_requests[0].number || '' }}
+        run: |
+          if [ "$EVENT" == "pull_request" ]; then
+            {
+              echo "sonar.pullrequest.branch=$HEAD_BRANCH"
+              echo "sonar.pullrequest.base=$BASE_BRANCH"
+              echo "sonar.pullrequest.key=$PR_NUMBER"
+            } >> sonar-project.properties
+          else
+            echo "sonar.branch.name=$HEAD_BRANCH" >> sonar-project.properties
+          fi
+
       - name: SonarCloud Scan
         # This is SonarSource/sonarcloud-github-action@v2.0.0
         uses: SonarSource/sonarcloud-github-action@4b4d7634dab97dcee0b75763a54a6dc92a9e6bc1

From e9651814518389775c739d0caa46bbec00e1db60 Mon Sep 17 00:00:00 2001
From: cryptodev-2s <109512101+cryptodev-2s@users.noreply.github.com>
Date: Wed, 11 Dec 2024 19:28:10 +0100
Subject: [PATCH 085/175] chore: bump
 {profile-sync,notification-services}-controller (#29088)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<!--
Please submit this PR as a draft initially.
Do not mark it as "Ready for review" until the template has been
completely filled out, and PR status checks have passed at least once.
-->

## **Description**


We want to ensure that mobile is using the latest versions of all
controllers.

- Bump `@metamask/notification-services-controller` from 0.14.0 to
0.15.0 ([view
changes](https://github.com/MetaMask/core/blob/main/packages/notification-services-controller/CHANGELOG.md))
  - There are no notable changes between these versions.
- Bump `@metamask/profile-sync-controller` from 2.0.0 to 3.0.0 ([view
changes](https://github.com/MetaMask/core/blob/main/packages/profile-sync-controller/CHANGELOG.md))
- The `UserStorageController` messenger must now allow the actions
`NetworkController:getState`, `NetworkController:addNetwork`,
`NetworkController:removeNetwork`, and `NetworkController:updateNetwork`
- The `UserStorageController` messenger must now allow the event
`NetworkController:networkRemoved`

<!--
Write a short description of the changes included in this pull request,
also include relevant motivation and context. Have in mind the following
questions:
1. What is the reason for the change?
2. What is the improvement/solution?
-->

[![Open in GitHub
Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/29088?quickstart=1)

## **Related issues**

Fixes: https://github.com/MetaMask/metamask-extension/issues/28856,
https://github.com/MetaMask/metamask-extension/issues/29034

## **Manual testing steps**

## **Screenshots/Recordings**

<!-- If applicable, add screenshots and/or recordings to visualize the
before and after of your change. -->

### **Before**

<!-- [screenshots/recordings] -->

### **After**

<!-- [screenshots/recordings] -->

## **Pre-merge author checklist**

- [x] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension Coding
Standards](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/CODING_GUIDELINES.md).
- [x] I've completed the PR template to the best of my ability
- [x] I’ve included tests if applicable
- [x] I’ve documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [x] I’ve applied the right labels on the PR (see [labeling
guidelines](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.

## **Pre-merge reviewer checklist**

- [ ] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed).
- [ ] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.

---------

Co-authored-by: MetaMask Bot <metamaskbot@users.noreply.github.com>
---
 app/scripts/metamask-controller.js    |   5 ++
 lavamoat/browserify/beta/policy.json  |   1 +
 lavamoat/browserify/flask/policy.json |   1 +
 lavamoat/browserify/main/policy.json  |   1 +
 lavamoat/browserify/mmi/policy.json   |   1 +
 package.json                          |   4 +-
 yarn.lock                             | 111 ++++++++++++++++----------
 7 files changed, 82 insertions(+), 42 deletions(-)

diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
index c0fbd99a13e6..f7ac1ce266d6 100644
--- a/app/scripts/metamask-controller.js
+++ b/app/scripts/metamask-controller.js
@@ -1663,12 +1663,17 @@ export default class MetamaskController extends EventEmitter {
           'NotificationServicesController:selectIsNotificationServicesEnabled',
           'AccountsController:listAccounts',
           'AccountsController:updateAccountMetadata',
+          'NetworkController:getState',
+          'NetworkController:addNetwork',
+          'NetworkController:removeNetwork',
+          'NetworkController:updateNetwork',
         ],
         allowedEvents: [
           'KeyringController:lock',
           'KeyringController:unlock',
           'AccountsController:accountAdded',
           'AccountsController:accountRenamed',
+          'NetworkController:networkRemoved',
         ],
       }),
     });
diff --git a/lavamoat/browserify/beta/policy.json b/lavamoat/browserify/beta/policy.json
index 9d441c704ed0..79058c8c6954 100644
--- a/lavamoat/browserify/beta/policy.json
+++ b/lavamoat/browserify/beta/policy.json
@@ -2128,6 +2128,7 @@
         "@metamask/base-controller": true,
         "@metamask/keyring-api": true,
         "@metamask/keyring-controller": true,
+        "@metamask/network-controller": true,
         "@metamask/profile-sync-controller>@noble/ciphers": true,
         "@metamask/profile-sync-controller>siwe": true,
         "@noble/hashes": true,
diff --git a/lavamoat/browserify/flask/policy.json b/lavamoat/browserify/flask/policy.json
index 9d441c704ed0..79058c8c6954 100644
--- a/lavamoat/browserify/flask/policy.json
+++ b/lavamoat/browserify/flask/policy.json
@@ -2128,6 +2128,7 @@
         "@metamask/base-controller": true,
         "@metamask/keyring-api": true,
         "@metamask/keyring-controller": true,
+        "@metamask/network-controller": true,
         "@metamask/profile-sync-controller>@noble/ciphers": true,
         "@metamask/profile-sync-controller>siwe": true,
         "@noble/hashes": true,
diff --git a/lavamoat/browserify/main/policy.json b/lavamoat/browserify/main/policy.json
index 9d441c704ed0..79058c8c6954 100644
--- a/lavamoat/browserify/main/policy.json
+++ b/lavamoat/browserify/main/policy.json
@@ -2128,6 +2128,7 @@
         "@metamask/base-controller": true,
         "@metamask/keyring-api": true,
         "@metamask/keyring-controller": true,
+        "@metamask/network-controller": true,
         "@metamask/profile-sync-controller>@noble/ciphers": true,
         "@metamask/profile-sync-controller>siwe": true,
         "@noble/hashes": true,
diff --git a/lavamoat/browserify/mmi/policy.json b/lavamoat/browserify/mmi/policy.json
index 88f77a11d112..99635e6aa997 100644
--- a/lavamoat/browserify/mmi/policy.json
+++ b/lavamoat/browserify/mmi/policy.json
@@ -2220,6 +2220,7 @@
         "@metamask/base-controller": true,
         "@metamask/keyring-api": true,
         "@metamask/keyring-controller": true,
+        "@metamask/network-controller": true,
         "@metamask/profile-sync-controller>@noble/ciphers": true,
         "@metamask/profile-sync-controller>siwe": true,
         "@noble/hashes": true,
diff --git a/package.json b/package.json
index 71e6cebc2c19..ee392c924ad0 100644
--- a/package.json
+++ b/package.json
@@ -321,7 +321,7 @@
     "@metamask/metamask-eth-abis": "^3.1.1",
     "@metamask/name-controller": "^8.0.0",
     "@metamask/network-controller": "patch:@metamask/network-controller@npm%3A22.1.0#~/.yarn/patches/@metamask-network-controller-npm-22.1.0-621c281f70.patch",
-    "@metamask/notification-services-controller": "^0.14.0",
+    "@metamask/notification-services-controller": "^0.15.0",
     "@metamask/object-multiplex": "^2.0.0",
     "@metamask/obs-store": "^9.0.0",
     "@metamask/permission-controller": "^11.0.0",
@@ -331,7 +331,7 @@
     "@metamask/post-message-stream": "^8.0.0",
     "@metamask/ppom-validator": "0.36.0",
     "@metamask/preinstalled-example-snap": "^0.2.0",
-    "@metamask/profile-sync-controller": "^2.0.0",
+    "@metamask/profile-sync-controller": "^3.0.0",
     "@metamask/providers": "^18.2.0",
     "@metamask/queued-request-controller": "^7.0.1",
     "@metamask/rate-limit-controller": "^6.0.0",
diff --git a/yarn.lock b/yarn.lock
index 95b7c07916c4..8ae140c6d516 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5180,16 +5180,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/eth-block-tracker@npm:^11.0.1, @metamask/eth-block-tracker@npm:^11.0.2":
-  version: 11.0.2
-  resolution: "@metamask/eth-block-tracker@npm:11.0.2"
+"@metamask/eth-block-tracker@npm:^11.0.2, @metamask/eth-block-tracker@npm:^11.0.3":
+  version: 11.0.3
+  resolution: "@metamask/eth-block-tracker@npm:11.0.3"
   dependencies:
     "@metamask/eth-json-rpc-provider": "npm:^4.1.5"
     "@metamask/safe-event-emitter": "npm:^3.1.1"
     "@metamask/utils": "npm:^9.1.0"
     json-rpc-random-id: "npm:^1.0.1"
     pify: "npm:^5.0.0"
-  checksum: 10/11d22bd86056401aa41eff5a32e862f3644eaf03040d8aa54a95cb0c1dfd3e3ce7e650c25efabbe0954cc6ba5f92172c338b518df84f73c4601c4bbc960b588a
+  checksum: 10/c73a570f889c613ab309643c84a4aed1a4eeed5c101434da84b34babe2352218c65f863602e013a8a55052e3f80a538efed865cc5fb7af558d168c52c5a399a4
   languageName: node
   linkType: hard
 
@@ -5231,11 +5231,11 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/eth-json-rpc-middleware@npm:^15.0.0":
-  version: 15.0.0
-  resolution: "@metamask/eth-json-rpc-middleware@npm:15.0.0"
+"@metamask/eth-json-rpc-middleware@npm:^15.0.0, @metamask/eth-json-rpc-middleware@npm:^15.0.1":
+  version: 15.0.1
+  resolution: "@metamask/eth-json-rpc-middleware@npm:15.0.1"
   dependencies:
-    "@metamask/eth-block-tracker": "npm:^11.0.1"
+    "@metamask/eth-block-tracker": "npm:^11.0.3"
     "@metamask/eth-json-rpc-provider": "npm:^4.1.5"
     "@metamask/eth-sig-util": "npm:^7.0.3"
     "@metamask/json-rpc-engine": "npm:^10.0.0"
@@ -5246,7 +5246,7 @@ __metadata:
     klona: "npm:^2.0.6"
     pify: "npm:^5.0.0"
     safe-stable-stringify: "npm:^2.4.3"
-  checksum: 10/3c48d34264c695535f2b4e819fb602d835b6ed37309116a06d04d1b706a7335e0205cd4ccdbf1d3e9dc15ebf40d88954a9a2dc18a91f223dcd6d6392e026a5e9
+  checksum: 10/9777fca31440bf0076f5d2c24e2ddb4848ecd9d41b0a5d6114c27339567e60bfcb9057d6bfa81f18f5ca0ffa848ecf9603c765f606b8de206d3e34dba519c501
   languageName: node
   linkType: hard
 
@@ -5622,9 +5622,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/keyring-controller@npm:^19.0.0":
-  version: 19.0.0
-  resolution: "@metamask/keyring-controller@npm:19.0.0"
+"@metamask/keyring-controller@npm:^19.0.0, @metamask/keyring-controller@npm:^19.0.1":
+  version: 19.0.1
+  resolution: "@metamask/keyring-controller@npm:19.0.1"
   dependencies:
     "@ethereumjs/util": "npm:^8.1.0"
     "@keystonehq/metamask-airgapped-keyring": "npm:^0.14.1"
@@ -5634,12 +5634,15 @@ __metadata:
     "@metamask/eth-sig-util": "npm:^8.0.0"
     "@metamask/eth-simple-keyring": "npm:^6.0.5"
     "@metamask/keyring-api": "npm:^10.1.0"
-    "@metamask/message-manager": "npm:^11.0.1"
+    "@metamask/message-manager": "npm:^11.0.2"
     "@metamask/utils": "npm:^10.0.0"
     async-mutex: "npm:^0.5.0"
     ethereumjs-wallet: "npm:^1.0.1"
     immer: "npm:^9.0.6"
-  checksum: 10/4614b53f9dd053edcc470e1d949a57ee5982b544c3ea9c6635b6a2d40fef5f2bd606aa8a45d3a5c519e93dc60c45ba5a5efafefb2c9843c85522477335d208a2
+  peerDependencies:
+    "@metamask/providers": ^18.1.0
+    webextension-polyfill: ^0.10.0 || ^0.11.0 || ^0.12.0
+  checksum: 10/09aa13bbb7d85b155122763d12a8fd409d4ebe9612093b2c303da8077ecdbeb32d93acc32db2f29911e8dcbc35fb17463b0e467cf5795f019798b9466de009a2
   languageName: node
   linkType: hard
 
@@ -5664,18 +5667,18 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/message-manager@npm:^11.0.0, @metamask/message-manager@npm:^11.0.1":
-  version: 11.0.1
-  resolution: "@metamask/message-manager@npm:11.0.1"
+"@metamask/message-manager@npm:^11.0.0, @metamask/message-manager@npm:^11.0.2":
+  version: 11.0.3
+  resolution: "@metamask/message-manager@npm:11.0.3"
   dependencies:
     "@metamask/base-controller": "npm:^7.0.2"
-    "@metamask/controller-utils": "npm:^11.4.2"
+    "@metamask/controller-utils": "npm:^11.4.4"
     "@metamask/eth-sig-util": "npm:^8.0.0"
     "@metamask/utils": "npm:^10.0.0"
     "@types/uuid": "npm:^8.3.0"
-    jsonschema: "npm:^1.2.4"
+    jsonschema: "npm:^1.4.1"
     uuid: "npm:^8.3.2"
-  checksum: 10/a63a79bbddfd06ca729ca1ca2a1f2fd9b5c930efaaee1d8bc077f7352ae058ff7f99c9b6bdfd7f7d3df4328a3c3606922d961d45c8d39c2b7afb4a893ec1cf6b
+  checksum: 10/18f5b0091474fc45e854db9c91ad8f5f898017ba9a08b01c770904ad3929b004c65298fe246b989f3c92fd2f03b5932dfa31adadb95ca81ce6940cb28a2ec793
   languageName: node
   linkType: hard
 
@@ -5705,7 +5708,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/network-controller@npm:22.1.0, @metamask/network-controller@npm:^22.0.2":
+"@metamask/network-controller@npm:22.1.0":
   version: 22.1.0
   resolution: "@metamask/network-controller@npm:22.1.0"
   dependencies:
@@ -5731,6 +5734,32 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@metamask/network-controller@npm:^22.1.0":
+  version: 22.1.1
+  resolution: "@metamask/network-controller@npm:22.1.1"
+  dependencies:
+    "@metamask/base-controller": "npm:^7.0.2"
+    "@metamask/controller-utils": "npm:^11.4.4"
+    "@metamask/eth-block-tracker": "npm:^11.0.3"
+    "@metamask/eth-json-rpc-infura": "npm:^10.0.0"
+    "@metamask/eth-json-rpc-middleware": "npm:^15.0.1"
+    "@metamask/eth-json-rpc-provider": "npm:^4.1.6"
+    "@metamask/eth-query": "npm:^4.0.0"
+    "@metamask/json-rpc-engine": "npm:^10.0.1"
+    "@metamask/rpc-errors": "npm:^7.0.1"
+    "@metamask/swappable-obj-proxy": "npm:^2.3.0"
+    "@metamask/utils": "npm:^10.0.0"
+    async-mutex: "npm:^0.5.0"
+    fast-deep-equal: "npm:^3.1.3"
+    immer: "npm:^9.0.6"
+    loglevel: "npm:^1.8.1"
+    reselect: "npm:^5.1.1"
+    uri-js: "npm:^4.4.1"
+    uuid: "npm:^8.3.2"
+  checksum: 10/688d9ef111e66699d6129e5c4022db683d64441d437d3ad01160cefc892897115b3d5061aa174693775e3c20060b4a20c112c8a4f1c426f5f7c2f79a1839d564
+  languageName: node
+  linkType: hard
+
 "@metamask/network-controller@patch:@metamask/network-controller@npm%3A22.1.0#~/.yarn/patches/@metamask-network-controller-npm-22.1.0-621c281f70.patch":
   version: 22.1.0
   resolution: "@metamask/network-controller@patch:@metamask/network-controller@npm%3A22.1.0#~/.yarn/patches/@metamask-network-controller-npm-22.1.0-621c281f70.patch::version=22.1.0&hash=93e992"
@@ -5769,13 +5798,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/notification-services-controller@npm:^0.14.0":
-  version: 0.14.0
-  resolution: "@metamask/notification-services-controller@npm:0.14.0"
+"@metamask/notification-services-controller@npm:^0.15.0":
+  version: 0.15.0
+  resolution: "@metamask/notification-services-controller@npm:0.15.0"
   dependencies:
     "@contentful/rich-text-html-renderer": "npm:^16.5.2"
     "@metamask/base-controller": "npm:^7.0.2"
-    "@metamask/controller-utils": "npm:^11.4.3"
+    "@metamask/controller-utils": "npm:^11.4.4"
     "@metamask/utils": "npm:^10.0.0"
     bignumber.js: "npm:^9.1.2"
     firebase: "npm:^10.11.0"
@@ -5783,8 +5812,8 @@ __metadata:
     uuid: "npm:^8.3.2"
   peerDependencies:
     "@metamask/keyring-controller": ^19.0.0
-    "@metamask/profile-sync-controller": ^2.0.0
-  checksum: 10/9cc467eb0d5f3ece77c77480d301fe7322545b4826b06c3a15345376ad77923f79155d3276febe044f46d3d91166ca67660f23dc486ce24fce6727e42f35b78a
+    "@metamask/profile-sync-controller": ^3.0.0
+  checksum: 10/03df3672d059e6a678855a61d324d5a2671b2a7e17c384f4208304009b52663c6b5ffbf780d2d6389bfad6e395d426c91862163fdd1445372e31ea8bfe2fe592
   languageName: node
   linkType: hard
 
@@ -5943,14 +5972,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/profile-sync-controller@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "@metamask/profile-sync-controller@npm:2.0.0"
+"@metamask/profile-sync-controller@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "@metamask/profile-sync-controller@npm:3.0.0"
   dependencies:
     "@metamask/base-controller": "npm:^7.0.2"
     "@metamask/keyring-api": "npm:^10.1.0"
-    "@metamask/keyring-controller": "npm:^19.0.0"
-    "@metamask/network-controller": "npm:^22.0.2"
+    "@metamask/keyring-controller": "npm:^19.0.1"
+    "@metamask/network-controller": "npm:^22.1.0"
     "@metamask/snaps-sdk": "npm:^6.7.0"
     "@metamask/snaps-utils": "npm:^8.3.0"
     "@noble/ciphers": "npm:^0.5.2"
@@ -5962,8 +5991,10 @@ __metadata:
     "@metamask/accounts-controller": ^20.0.0
     "@metamask/keyring-controller": ^19.0.0
     "@metamask/network-controller": ^22.0.0
+    "@metamask/providers": ^18.1.0
     "@metamask/snaps-controllers": ^9.10.0
-  checksum: 10/72c3cb3ea4148960c7eb4615a10f0f508fda285e6786906f2b0d95cfaca624425973bce47e5478c86de0f9ad3cb44a9637bbe3d9e43e4d75fe6d867d63aa0342
+    webextension-polyfill: ^0.10.0 || ^0.11.0 || ^0.12.0
+  checksum: 10/5329492b4fd92801807e1c657c8ec9e8822d9ab32feba8d23714f8f0e88dffddc860c600a2c5f7a48f6ee358cdf536e2f39a6659f6ab68a8fee579ccf24da57a
   languageName: node
   linkType: hard
 
@@ -6283,10 +6314,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/swappable-obj-proxy@npm:^2.2.0":
-  version: 2.2.0
-  resolution: "@metamask/swappable-obj-proxy@npm:2.2.0"
-  checksum: 10/bc7a1f496d06327f1db84fe2ed75637b6f2f5db0806d3927f250d5abab9cc70a26ff37283ea7f2db7987e48d2540f6821091d1f3000d6771f29c4d91c402f724
+"@metamask/swappable-obj-proxy@npm:^2.2.0, @metamask/swappable-obj-proxy@npm:^2.3.0":
+  version: 2.3.0
+  resolution: "@metamask/swappable-obj-proxy@npm:2.3.0"
+  checksum: 10/1255c599de9237f06df2390719d6dfcb1f168873df61bbaad5ce376efbc057e2030260b94855569313faeb412b7df9b062d209f4b0b163a3dc02f29d42139e1f
   languageName: node
   linkType: hard
 
@@ -24632,7 +24663,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"jsonschema@npm:^1.2.4, jsonschema@npm:^1.4.1":
+"jsonschema@npm:^1.4.1":
   version: 1.4.1
   resolution: "jsonschema@npm:1.4.1"
   checksum: 10/d7a188da7a3100a2caa362b80e98666d46607b7a7153aac405b8e758132961911c6df02d444d4700691330874e21a62639f550e856b21ddd28423690751ca9c6
@@ -26426,7 +26457,7 @@ __metadata:
     "@metamask/metamask-eth-abis": "npm:^3.1.1"
     "@metamask/name-controller": "npm:^8.0.0"
     "@metamask/network-controller": "patch:@metamask/network-controller@npm%3A22.1.0#~/.yarn/patches/@metamask-network-controller-npm-22.1.0-621c281f70.patch"
-    "@metamask/notification-services-controller": "npm:^0.14.0"
+    "@metamask/notification-services-controller": "npm:^0.15.0"
     "@metamask/object-multiplex": "npm:^2.0.0"
     "@metamask/obs-store": "npm:^9.0.0"
     "@metamask/permission-controller": "npm:^11.0.0"
@@ -26438,7 +26469,7 @@ __metadata:
     "@metamask/ppom-validator": "npm:0.36.0"
     "@metamask/preferences-controller": "npm:^15.0.1"
     "@metamask/preinstalled-example-snap": "npm:^0.2.0"
-    "@metamask/profile-sync-controller": "npm:^2.0.0"
+    "@metamask/profile-sync-controller": "npm:^3.0.0"
     "@metamask/providers": "npm:^18.2.0"
     "@metamask/queued-request-controller": "npm:^7.0.1"
     "@metamask/rate-limit-controller": "npm:^6.0.0"

From 5de217302dc3b977cba4fca17c7a303790c2924f Mon Sep 17 00:00:00 2001
From: Matthew Walsh <matthew.walsh@consensys.net>
Date: Wed, 11 Dec 2024 18:44:39 +0000
Subject: [PATCH 086/175] test: fix flaky confirmation E2E tests (#29104)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## **Description**

Fix flaky E2E tests in:

- `test/e2e/json-rpc/switchEthereumChain.spec.js`
- `test/e2e/tests/confirmations/navigation.spec.ts` (Firefox Only)

[![Open in GitHub
Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/29104?quickstart=1)

## **Related issues**

Fixes: #29090

## **Manual testing steps**

## **Screenshots/Recordings**

### **Before**

### **After**

## **Pre-merge author checklist**

- [x] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension Coding
Standards](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/CODING_GUIDELINES.md).
- [x] I've completed the PR template to the best of my ability
- [x] I’ve included tests if applicable
- [x] I’ve documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [x] I’ve applied the right labels on the PR (see [labeling
guidelines](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.

## **Pre-merge reviewer checklist**

- [ ] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed).
- [ ] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.
---
 test/e2e/fixture-builder.js                   |  9 +++++++++
 test/e2e/json-rpc/switchEthereumChain.spec.js |  1 +
 test/e2e/page-objects/pages/test-snaps.ts     | 10 ++++++++--
 3 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/test/e2e/fixture-builder.js b/test/e2e/fixture-builder.js
index 555ab2c2cc2a..020c4db1c64b 100644
--- a/test/e2e/fixture-builder.js
+++ b/test/e2e/fixture-builder.js
@@ -688,6 +688,15 @@ class FixtureBuilder {
     });
   }
 
+  withPreferencesControllerSmartTransactionsOptedOut() {
+    return this.withPreferencesController({
+      preferences: {
+        smartTransactionsOptInStatus: false,
+        tokenNetworkFilter: {},
+      },
+    });
+  }
+
   withPreferencesControllerAndFeatureFlag(flags) {
     merge(this.fixture.data.PreferencesController, flags);
     return this;
diff --git a/test/e2e/json-rpc/switchEthereumChain.spec.js b/test/e2e/json-rpc/switchEthereumChain.spec.js
index 6a8576b3f136..e55dfc622865 100644
--- a/test/e2e/json-rpc/switchEthereumChain.spec.js
+++ b/test/e2e/json-rpc/switchEthereumChain.spec.js
@@ -262,6 +262,7 @@ describe('Switch Ethereum Chain for two dapps', function () {
           dapp: true,
           fixtures: new FixtureBuilder()
             .withNetworkControllerDoubleGanache()
+            .withPreferencesControllerSmartTransactionsOptedOut()
             .build(),
           dappOptions: { numberOfDapps: 2 },
           ganacheOptions: {
diff --git a/test/e2e/page-objects/pages/test-snaps.ts b/test/e2e/page-objects/pages/test-snaps.ts
index 327947d121bc..8bb285321ef5 100644
--- a/test/e2e/page-objects/pages/test-snaps.ts
+++ b/test/e2e/page-objects/pages/test-snaps.ts
@@ -1,10 +1,12 @@
 import { Driver } from '../../webdriver/driver';
 import { TEST_SNAPS_WEBSITE_URL } from '../../snaps/enums';
-import { WINDOW_TITLES } from '../../helpers';
+import { largeDelayMs, WINDOW_TITLES } from '../../helpers';
 
 export class TestSnaps {
   driver: Driver;
 
+  private readonly installedSnapsHeader = '[data-testid="InstalledSnaps"]';
+
   private readonly connectDialogsSnapButton =
     '[data-testid="dialogs"] [data-testid="connect-button"]';
 
@@ -16,10 +18,14 @@ export class TestSnaps {
 
   async openPage() {
     await this.driver.openNewPage(TEST_SNAPS_WEBSITE_URL);
-    await this.driver.delay(1000);
+    await this.driver.waitForSelector(this.installedSnapsHeader);
   }
 
   async clickConnectDialogsSnapButton() {
+    await this.driver.scrollToElement(
+      this.driver.findClickableElement(this.connectDialogsSnapButton),
+    );
+    await this.driver.delay(largeDelayMs);
     await this.driver.clickElement(this.connectDialogsSnapButton);
   }
 

From e0f6575a6dc80913532f33202b1d3e91b31137b4 Mon Sep 17 00:00:00 2001
From: AugmentedMode <31675118+AugmentedMode@users.noreply.github.com>
Date: Wed, 11 Dec 2024 14:03:17 -0500
Subject: [PATCH 087/175] feat: add websocket support for c2 detection (#28782)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<!--
Please submit this PR as a draft initially.
Do not mark it as "Ready for review" until the template has been
completely filled out, and PR status checks have passed at least once.
-->

## **Description**


This pull request adds WebSocket support to the MetaMask extension's
phishing detection functionality. Scammers have started using WebSocket
connections for command-and-control (C2) operations to bypass
traditional HTTP-based phishing detection. This PR allows the extension
to intercept and block WebSocket handshake requests (`ws://` and
`wss://`) in addition to HTTP/HTTPS requests.

The key changes include:
1. Adding WebSocket schemes (`ws://*/*` and `wss://*/*`) to the `urls`
filter in `background.js`.
2. Updating the `manifest.json` to include WebSocket permissions in the
`host_permissions` field.

This ensures that malicious WebSocket connections can be detected and
blocked.


<!--
Write a short description of the changes included in this pull request,
also include relevant motivation and context. Have in mind the following
questions:
1. What is the reason for the change?
2. What is the improvement/solution?
-->

[![Open in GitHub
Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/28782?quickstart=1)

## **Related issues**

Fixes: https://github.com/MetaMask/MetaMask-planning/issues/3788

## **Manual testing steps**

1. Navigate to `example.com`
2. Initiate a WebSocket connection to a known safe domain (e.g.,
`wss://example.com`) and verify it works as expected by going to the
`console` via right clicking and hitting inspect. Then type into the
console `new WebSocket("https://example.com/")`
3. Attempt a WebSocket connection to a domain flagged as phishing, and
verify the connection is blocked and appropriate warnings are displayed
by going to the `console` via right clicking and hitting inspect. Then
type into the console `new WebSocket("https://walietconnectapi.com/")`


## **Screenshots/Recordings**

<!-- If applicable, add screenshots and/or recordings to visualize the
before and after of your change. -->

### **Before**

No support for detecting WebSocket phishing connections.

---

### **After**

WebSocket phishing connections are detected and blocked during the
handshake phase.


<!-- [screenshots/recordings] -->

## **Pre-merge author checklist**

- [x] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension Coding
Standards](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/CODING_GUIDELINES.md).
- [x] I've completed the PR template to the best of my ability
- [x] I’ve included tests if applicable
- [x] I’ve documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [x] I’ve applied the right labels on the PR (see [labeling
guidelines](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.

## **Pre-merge reviewer checklist**

- [ ] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed).
- [ ] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.
---
 app/manifest/v2/_base.json                    |  2 +
 app/manifest/v3/_base.json                    |  4 +-
 app/scripts/background.js                     |  2 +-
 privacy-snapshot.json                         |  3 +-
 test/e2e/helpers.js                           | 44 +++++++++++
 test/e2e/tests/phishing-controller/mocks.js   | 19 +++--
 .../phishing-detection.spec.js                | 76 ++++++++++++++++++-
 7 files changed, 136 insertions(+), 14 deletions(-)

diff --git a/app/manifest/v2/_base.json b/app/manifest/v2/_base.json
index f29b7458a9e5..2f41a7e987fa 100644
--- a/app/manifest/v2/_base.json
+++ b/app/manifest/v2/_base.json
@@ -66,6 +66,8 @@
     "clipboardWrite",
     "http://*/*",
     "https://*/*",
+    "ws://*/*",
+    "wss://*/*",
     "activeTab",
     "webRequest",
     "webRequestBlocking",
diff --git a/app/manifest/v3/_base.json b/app/manifest/v3/_base.json
index 4d6ee38437d3..89758033f33a 100644
--- a/app/manifest/v3/_base.json
+++ b/app/manifest/v3/_base.json
@@ -50,7 +50,9 @@
     "http://localhost:8545/",
     "file://*/*",
     "http://*/*",
-    "https://*/*"
+    "https://*/*",
+    "ws://*/*",
+    "wss://*/*"
   ],
   "icons": {
     "16": "images/icon-16.png",
diff --git a/app/scripts/background.js b/app/scripts/background.js
index e9aaf2cab20b..3571be9022fa 100644
--- a/app/scripts/background.js
+++ b/app/scripts/background.js
@@ -323,7 +323,7 @@ function maybeDetectPhishing(theController) {
       return {};
     },
     {
-      urls: ['http://*/*', 'https://*/*'],
+      urls: ['http://*/*', 'https://*/*', 'ws://*/*', 'wss://*/*'],
     },
     isManifestV2 ? ['blocking'] : [],
   );
diff --git a/privacy-snapshot.json b/privacy-snapshot.json
index 49eedf275364..230634421d52 100644
--- a/privacy-snapshot.json
+++ b/privacy-snapshot.json
@@ -72,5 +72,6 @@
   "unresponsive-rpc.test",
   "unresponsive-rpc.url",
   "user-storage.api.cx.metamask.io",
-  "www.4byte.directory"
+  "www.4byte.directory",
+  "verify.walletconnect.com"
 ]
diff --git a/test/e2e/helpers.js b/test/e2e/helpers.js
index b06c29b17acf..4ade3f2e48ba 100644
--- a/test/e2e/helpers.js
+++ b/test/e2e/helpers.js
@@ -4,6 +4,7 @@ const BigNumber = require('bignumber.js');
 const mockttp = require('mockttp');
 const detectPort = require('detect-port');
 const { difference } = require('lodash');
+const WebSocket = require('ws');
 const createStaticServer = require('../../development/create-static-server');
 const { setupMocking } = require('./mock-e2e');
 const { Ganache } = require('./seeder/ganache');
@@ -640,6 +641,48 @@ async function unlockWallet(
   }
 }
 
+/**
+ * Simulates a WebSocket connection by executing a script in the browser context.
+ *
+ * @param {WebDriver} driver - The WebDriver instance.
+ * @param {string} hostname - The hostname to connect to.
+ */
+async function createWebSocketConnection(driver, hostname) {
+  try {
+    await driver.executeScript(async (wsHostname) => {
+      const url = `ws://${wsHostname}:8000`;
+
+      const socket = new WebSocket(url);
+
+      socket.onopen = () => {
+        console.log('WebSocket connection opened');
+        socket.send('Hello, server!');
+      };
+
+      socket.onerror = (error) => {
+        console.error(
+          'WebSocket error:',
+          error.message || 'Connection blocked',
+        );
+      };
+
+      socket.onmessage = (event) => {
+        console.log('Message received from server:', event.data);
+      };
+
+      socket.onclose = () => {
+        console.log('WebSocket connection closed');
+      };
+    }, hostname);
+  } catch (error) {
+    console.error(
+      `Failed to execute WebSocket connection script for ws://${hostname}:8081`,
+      error,
+    );
+    throw error;
+  }
+}
+
 const logInWithBalanceValidation = async (driver, ganacheServer) => {
   await unlockWallet(driver);
   // Wait for balance to load
@@ -975,4 +1018,5 @@ module.exports = {
   tempToggleSettingRedesignedTransactionConfirmations,
   openMenuSafe,
   sentryRegEx,
+  createWebSocketConnection,
 };
diff --git a/test/e2e/tests/phishing-controller/mocks.js b/test/e2e/tests/phishing-controller/mocks.js
index fe11118c6fd2..3165847740bf 100644
--- a/test/e2e/tests/phishing-controller/mocks.js
+++ b/test/e2e/tests/phishing-controller/mocks.js
@@ -10,7 +10,9 @@ const {
 const lastUpdated = 1;
 const defaultHotlist = { data: [] };
 const defaultC2DomainBlocklist = {
-  recentlyAdded: [],
+  recentlyAdded: [
+    '33c8e026e76cea2df82322428554c932961cd80080fa379454350d7f13371f36', // hash for malicious.localhost
+  ],
   recentlyRemoved: [],
   lastFetchedAt: '2024-08-27T15:30:45Z',
 };
@@ -95,15 +97,12 @@ async function setupPhishingDetectionMocks(
       };
     });
 
-  await mockServer
-    .forGet(C2_DOMAIN_BLOCKLIST_URL)
-    .withQuery({ timestamp: '2024-08-27T15:30:45Z' })
-    .thenCallback(() => {
-      return {
-        statusCode: 200,
-        json: defaultC2DomainBlocklist,
-      };
-    });
+  await mockServer.forGet(C2_DOMAIN_BLOCKLIST_URL).thenCallback(() => {
+    return {
+      statusCode: 200,
+      json: defaultC2DomainBlocklist,
+    };
+  });
 
   await mockServer
     .forGet('https://github.com/MetaMask/eth-phishing-detect/issues/new')
diff --git a/test/e2e/tests/phishing-controller/phishing-detection.spec.js b/test/e2e/tests/phishing-controller/phishing-detection.spec.js
index ad199cea1e70..98184b85224e 100644
--- a/test/e2e/tests/phishing-controller/phishing-detection.spec.js
+++ b/test/e2e/tests/phishing-controller/phishing-detection.spec.js
@@ -2,13 +2,13 @@ const { strict: assert } = require('assert');
 const { createServer } = require('node:http');
 const { createDeferredPromise } = require('@metamask/utils');
 const { until } = require('selenium-webdriver');
-
 const {
   defaultGanacheOptions,
   withFixtures,
   openDapp,
   unlockWallet,
   WINDOW_TITLES,
+  createWebSocketConnection,
 } = require('../../helpers');
 const FixtureBuilder = require('../../fixture-builder');
 const {
@@ -315,6 +315,80 @@ describe('Phishing Detection', function () {
     );
   });
 
+  it('should block a website that makes a websocket connection to a malicious command and control server', async function () {
+    const testPageURL = 'http://localhost:8080';
+    await withFixtures(
+      {
+        fixtures: new FixtureBuilder().build(),
+        ganacheOptions: defaultGanacheOptions,
+        title: this.test.fullTitle(),
+        testSpecificMock: async (mockServer) => {
+          await mockServer.forAnyWebSocket().thenEcho();
+          await setupPhishingDetectionMocks(mockServer, {
+            blockProvider: BlockProvider.MetaMask,
+          });
+        },
+        dapp: true,
+      },
+      async ({ driver }) => {
+        await unlockWallet(driver);
+
+        await driver.openNewPage(testPageURL);
+
+        await createWebSocketConnection(driver, 'malicious.localhost');
+
+        await driver.switchToWindowWithTitle(
+          'MetaMask Phishing Detection',
+          10000,
+        );
+
+        await driver.waitForSelector({
+          testId: 'unsafe-continue-loaded',
+        });
+
+        await driver.clickElement({
+          text: 'Back to safety',
+        });
+
+        const currentUrl = await driver.getCurrentUrl();
+        const expectedPortfolioUrl = `https://portfolio.metamask.io/?metamaskEntry=phishing_page_portfolio_button`;
+
+        assert.equal(currentUrl, expectedPortfolioUrl);
+      },
+    );
+  });
+
+  it('should not block a website that makes a safe WebSocket connection', async function () {
+    const testPageURL = 'http://localhost:8080/';
+    await withFixtures(
+      {
+        fixtures: new FixtureBuilder().build(),
+        ganacheOptions: defaultGanacheOptions,
+        title: this.test.fullTitle(),
+        testSpecificMock: async (mockServer) => {
+          await mockServer.forAnyWebSocket().thenEcho();
+          await setupPhishingDetectionMocks(mockServer, {
+            blockProvider: BlockProvider.MetaMask,
+          });
+        },
+        dapp: true,
+      },
+      async ({ driver }) => {
+        await unlockWallet(driver);
+
+        await driver.openNewPage(testPageURL);
+
+        await createWebSocketConnection(driver, 'safe.localhost');
+
+        await driver.wait(until.titleIs(WINDOW_TITLES.TestDApp), 10000);
+
+        const currentUrl = await driver.getCurrentUrl();
+
+        assert.equal(currentUrl, testPageURL);
+      },
+    );
+  });
+
   describe('Phishing redirect protections', function () {
     /**
      * Status codes 305 (via Location header) and 306 (Set-Proxy) header do not

From 2693e6cd1f9e551e3c857f3a25398463b509591f Mon Sep 17 00:00:00 2001
From: Brian Bergeron <brian.e.bergeron@gmail.com>
Date: Wed, 11 Dec 2024 12:13:38 -0800
Subject: [PATCH 088/175] fix: token detection across multiple networks
 (#29108)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## **Description**

Fixes an issue where even though 'popular networks' was selected in the
token filter, it was only showing detected tokens on the current
network.

There were various places checking for
`Object.keys(tokenNetworkFilter).length ===
Object.keys(allNetworks).length`, which is no longer an accurate way to
check the state of the filter, since it's now been narrowed to only
include popular networks. The selector
`getIsTokenNetworkFilterEqualCurrentNetwork` is used instead.



[![Open in GitHub
Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/29108?quickstart=1)

## **Related issues**

Fixes:

## **Manual testing steps**

1. Onboard a wallet with tokens across chains
2. When token filter is on 'popular networks', it should show # of
detected tokens across chains
3. When token filter is on current network, it should show # of detected
tokens on current chain

## **Screenshots/Recordings**

<!-- If applicable, add screenshots and/or recordings to visualize the
before and after of your change. -->

### **Before**

<!-- [screenshots/recordings] -->

### **After**

<!-- [screenshots/recordings] -->

## **Pre-merge author checklist**

- [ ] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension Coding
Standards](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/CODING_GUIDELINES.md).
- [ ] I've completed the PR template to the best of my ability
- [ ] I’ve included tests if applicable
- [ ] I’ve documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [ ] I’ve applied the right labels on the PR (see [labeling
guidelines](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.

## **Pre-merge reviewer checklist**

- [ ] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed).
- [ ] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.
---
 .../app/assets/asset-list/asset-list.tsx      | 18 ++----
 .../network-filter/network-filter.tsx         | 10 ++--
 .../detected-token-selection-popover.js       | 32 +++++-----
 .../app/detected-token/detected-token.js      | 39 +++++++-----
 .../detected-token-banner.js                  | 15 +++--
 ui/selectors/selectors.test.js                | 59 +++++++++++++++++++
 6 files changed, 115 insertions(+), 58 deletions(-)

diff --git a/ui/components/app/assets/asset-list/asset-list.tsx b/ui/components/app/assets/asset-list/asset-list.tsx
index 6a82295cb2f3..3cd06ec4686b 100644
--- a/ui/components/app/assets/asset-list/asset-list.tsx
+++ b/ui/components/app/assets/asset-list/asset-list.tsx
@@ -7,10 +7,9 @@ import {
   getAllDetectedTokensForSelectedAddress,
   getDetectedTokensInCurrentNetwork,
   getIstokenDetectionInactiveOnNonMainnetSupportedNetwork,
+  getIsTokenNetworkFilterEqualCurrentNetwork,
   getSelectedAccount,
-  getTokenNetworkFilter,
 } from '../../../../selectors';
-import { getNetworkConfigurationsByChainId } from '../../../../../shared/modules/selectors/networks';
 import {
   getMultichainIsEvm,
   getMultichainSelectedAccountCachedBalance,
@@ -79,16 +78,9 @@ const AssetList = ({ onClickAsset, showTokensLinks }: AssetListProps) => {
     getIstokenDetectionInactiveOnNonMainnetSupportedNetwork,
   );
 
-  const allNetworks = useSelector(getNetworkConfigurationsByChainId);
-  const tokenNetworkFilter = useSelector(getTokenNetworkFilter);
-  const allOpts: Record<string, boolean> = {};
-  Object.keys(allNetworks || {}).forEach((chainId) => {
-    allOpts[chainId] = true;
-  });
-
-  const allNetworksFilterShown =
-    Object.keys(tokenNetworkFilter).length !==
-    Object.keys(allOpts || {}).length;
+  const isTokenNetworkFilterEqualCurrentNetwork = useSelector(
+    getIsTokenNetworkFilterEqualCurrentNetwork,
+  );
 
   const [showFundingMethodModal, setShowFundingMethodModal] = useState(false);
   const [showReceiveModal, setShowReceiveModal] = useState(false);
@@ -118,7 +110,7 @@ const AssetList = ({ onClickAsset, showTokensLinks }: AssetListProps) => {
 
   const totalTokens =
     process.env.PORTFOLIO_VIEW &&
-    !allNetworksFilterShown &&
+    !isTokenNetworkFilterEqualCurrentNetwork &&
     detectedTokensMultichain
       ? (Object.values(detectedTokensMultichain).reduce(
           // @ts-expect-error TS18046: 'tokenArray' is of type 'unknown'
diff --git a/ui/components/app/assets/asset-list/network-filter/network-filter.tsx b/ui/components/app/assets/asset-list/network-filter/network-filter.tsx
index 4f75dcc7381a..2c50824702b1 100644
--- a/ui/components/app/assets/asset-list/network-filter/network-filter.tsx
+++ b/ui/components/app/assets/asset-list/network-filter/network-filter.tsx
@@ -7,6 +7,7 @@ import {
   getSelectedAccount,
   getAllChainsToPoll,
   getTokenNetworkFilter,
+  getIsTokenNetworkFilterEqualCurrentNetwork,
 } from '../../../../../selectors';
 import {
   getCurrentChainId,
@@ -49,6 +50,10 @@ const NetworkFilter = ({ handleClose }: SortControlProps) => {
   const allNetworks = useSelector(getNetworkConfigurationsByChainId);
   const [chainsToShow, setChainsToShow] = useState<string[]>([]);
   const tokenNetworkFilter = useSelector(getTokenNetworkFilter);
+  const isTokenNetworkFilterEqualCurrentNetwork = useSelector(
+    getIsTokenNetworkFilterEqualCurrentNetwork,
+  );
+
   const shouldHideZeroBalanceTokens = useSelector(
     getShouldHideZeroBalanceTokens,
   );
@@ -101,10 +106,7 @@ const NetworkFilter = ({ handleClose }: SortControlProps) => {
   return (
     <>
       <SelectableListItem
-        isSelected={
-          Object.keys(tokenNetworkFilter).length ===
-          Object.keys(allNetworks || {}).length
-        }
+        isSelected={!isTokenNetworkFilterEqualCurrentNetwork}
         onClick={() => handleFilter(allOpts)}
         testId="network-filter-all"
       >
diff --git a/ui/components/app/detected-token/detected-token-selection-popover/detected-token-selection-popover.js b/ui/components/app/detected-token/detected-token-selection-popover/detected-token-selection-popover.js
index ae5e1048037f..570e52fb055b 100644
--- a/ui/components/app/detected-token/detected-token-selection-popover/detected-token-selection-popover.js
+++ b/ui/components/app/detected-token/detected-token-selection-popover/detected-token-selection-popover.js
@@ -9,15 +9,12 @@ import {
   MetaMetricsEventName,
   MetaMetricsTokenEventSource,
 } from '../../../../../shared/constants/metametrics';
-import {
-  getCurrentChainId,
-  getNetworkConfigurationsByChainId,
-} from '../../../../../shared/modules/selectors/networks';
+import { getCurrentChainId } from '../../../../../shared/modules/selectors/networks';
 import {
   getAllDetectedTokensForSelectedAddress,
   getCurrentNetwork,
   getDetectedTokensInCurrentNetwork,
-  getTokenNetworkFilter,
+  getIsTokenNetworkFilterEqualCurrentNetwork,
 } from '../../../../selectors';
 
 import Popover from '../../../ui/popover';
@@ -40,16 +37,9 @@ const DetectedTokenSelectionPopover = ({
   const chainId = useSelector(getCurrentChainId);
 
   const detectedTokens = useSelector(getDetectedTokensInCurrentNetwork);
-  const allNetworks = useSelector(getNetworkConfigurationsByChainId);
-  const tokenNetworkFilter = useSelector(getTokenNetworkFilter);
-  const allOpts = {};
-  Object.keys(allNetworks || {}).forEach((networkId) => {
-    allOpts[networkId] = true;
-  });
-
-  const allNetworksFilterShown =
-    Object.keys(tokenNetworkFilter).length !==
-    Object.keys(allOpts || {}).length;
+  const isTokenNetworkFilterEqualCurrentNetwork = useSelector(
+    getIsTokenNetworkFilterEqualCurrentNetwork,
+  );
 
   const currentNetwork = useSelector(getCurrentNetwork);
 
@@ -58,13 +48,18 @@ const DetectedTokenSelectionPopover = ({
   );
 
   const totalTokens = useMemo(() => {
-    return process.env.PORTFOLIO_VIEW && !allNetworksFilterShown
+    return process.env.PORTFOLIO_VIEW &&
+      !isTokenNetworkFilterEqualCurrentNetwork
       ? Object.values(detectedTokensMultichain).reduce(
           (count, tokenArray) => count + tokenArray.length,
           0,
         )
       : detectedTokens.length;
-  }, [detectedTokensMultichain, detectedTokens, allNetworksFilterShown]);
+  }, [
+    detectedTokensMultichain,
+    detectedTokens,
+    isTokenNetworkFilterEqualCurrentNetwork,
+  ]);
 
   const { selected: selectedTokens = [] } =
     sortingBasedOnTokenSelection(tokensListDetected);
@@ -124,7 +119,8 @@ const DetectedTokenSelectionPopover = ({
       onClose={onClose}
       footer={footer}
     >
-      {process.env.PORTFOLIO_VIEW && !allNetworksFilterShown ? (
+      {process.env.PORTFOLIO_VIEW &&
+      !isTokenNetworkFilterEqualCurrentNetwork ? (
         <Box margin={3}>
           {Object.entries(detectedTokensMultichain).map(
             ([networkId, tokens]) => {
diff --git a/ui/components/app/detected-token/detected-token.js b/ui/components/app/detected-token/detected-token.js
index b28eb8f51ff8..3e4d586ce77c 100644
--- a/ui/components/app/detected-token/detected-token.js
+++ b/ui/components/app/detected-token/detected-token.js
@@ -16,7 +16,7 @@ import {
 import {
   getAllDetectedTokensForSelectedAddress,
   getDetectedTokensInCurrentNetwork,
-  getTokenNetworkFilter,
+  getIsTokenNetworkFilterEqualCurrentNetwork,
 } from '../../../selectors';
 import { MetaMetricsContext } from '../../../contexts/metametrics';
 
@@ -63,27 +63,30 @@ const DetectedToken = ({ setShowDetectedTokens }) => {
   );
   const currentChainId = useSelector(getCurrentChainId);
   const allNetworks = useSelector(getNetworkConfigurationsByChainId);
-  const tokenNetworkFilter = useSelector(getTokenNetworkFilter);
-  const allOpts = {};
-  Object.keys(allNetworks || {}).forEach((chainId) => {
-    allOpts[chainId] = true;
-  });
 
-  const allNetworksFilterShown =
-    Object.keys(tokenNetworkFilter).length !==
-    Object.keys(allOpts || {}).length;
+  const isTokenNetworkFilterEqualCurrentNetwork = useSelector(
+    getIsTokenNetworkFilterEqualCurrentNetwork,
+  );
 
   const totalDetectedTokens = useMemo(() => {
-    return process.env.PORTFOLIO_VIEW && !allNetworksFilterShown
+    return process.env.PORTFOLIO_VIEW &&
+      !isTokenNetworkFilterEqualCurrentNetwork
       ? Object.values(detectedTokensMultichain).flat().length
       : detectedTokens.length;
-  }, [detectedTokens, detectedTokensMultichain, allNetworksFilterShown]);
+  }, [
+    detectedTokens,
+    detectedTokensMultichain,
+    isTokenNetworkFilterEqualCurrentNetwork,
+  ]);
 
   const [tokensListDetected, setTokensListDetected] = useState({});
 
   useEffect(() => {
     const newTokensList = () => {
-      if (process.env.PORTFOLIO_VIEW && !allNetworksFilterShown) {
+      if (
+        process.env.PORTFOLIO_VIEW &&
+        !isTokenNetworkFilterEqualCurrentNetwork
+      ) {
         return Object.entries(detectedTokensMultichain).reduce(
           (acc, [chainId, tokens]) => {
             if (Array.isArray(tokens)) {
@@ -112,7 +115,7 @@ const DetectedToken = ({ setShowDetectedTokens }) => {
 
     setTokensListDetected(newTokensList());
   }, [
-    allNetworksFilterShown,
+    isTokenNetworkFilterEqualCurrentNetwork,
     detectedTokensMultichain,
     detectedTokens,
     currentChainId,
@@ -141,7 +144,10 @@ const DetectedToken = ({ setShowDetectedTokens }) => {
       });
     });
 
-    if (process.env.PORTFOLIO_VIEW && !allNetworksFilterShown) {
+    if (
+      process.env.PORTFOLIO_VIEW &&
+      !isTokenNetworkFilterEqualCurrentNetwork
+    ) {
       const tokensByChainId = selectedTokens.reduce((acc, token) => {
         const { chainId } = token;
 
@@ -197,7 +203,10 @@ const DetectedToken = ({ setShowDetectedTokens }) => {
       },
     });
 
-    if (process.env.PORTFOLIO_VIEW && !allNetworksFilterShown) {
+    if (
+      process.env.PORTFOLIO_VIEW &&
+      !isTokenNetworkFilterEqualCurrentNetwork
+    ) {
       // group deselected tokens by chainId
       const groupedByChainId = deSelectedTokens.reduce((acc, token) => {
         const { chainId } = token;
diff --git a/ui/components/multichain/detected-token-banner/detected-token-banner.js b/ui/components/multichain/detected-token-banner/detected-token-banner.js
index 2b6f7238024f..fa2ab6d62f84 100644
--- a/ui/components/multichain/detected-token-banner/detected-token-banner.js
+++ b/ui/components/multichain/detected-token-banner/detected-token-banner.js
@@ -11,7 +11,7 @@ import {
 import {
   getDetectedTokensInCurrentNetwork,
   getAllDetectedTokensForSelectedAddress,
-  getTokenNetworkFilter,
+  getIsTokenNetworkFilterEqualCurrentNetwork,
 } from '../../../selectors';
 import { MetaMetricsContext } from '../../../contexts/metametrics';
 import {
@@ -28,7 +28,10 @@ export const DetectedTokensBanner = ({
 }) => {
   const t = useI18nContext();
   const trackEvent = useContext(MetaMetricsContext);
-  const tokenNetworkFilter = useSelector(getTokenNetworkFilter);
+  const isTokenNetworkFilterEqualCurrentNetwork = useSelector(
+    getIsTokenNetworkFilterEqualCurrentNetwork,
+  );
+
   const allNetworks = useSelector(getNetworkConfigurationsByChainId);
 
   const allOpts = {};
@@ -36,10 +39,6 @@ export const DetectedTokensBanner = ({
     allOpts[chainId] = true;
   });
 
-  const allNetworksFilterShown =
-    Object.keys(tokenNetworkFilter).length !==
-    Object.keys(allOpts || {}).length;
-
   const detectedTokens = useSelector(getDetectedTokensInCurrentNetwork);
 
   const detectedTokensMultichain = useSelector(
@@ -48,14 +47,14 @@ export const DetectedTokensBanner = ({
   const chainId = useSelector(getCurrentChainId);
 
   const detectedTokensDetails =
-    process.env.PORTFOLIO_VIEW && !allNetworksFilterShown
+    process.env.PORTFOLIO_VIEW && !isTokenNetworkFilterEqualCurrentNetwork
       ? Object.values(detectedTokensMultichain)
           .flat()
           .map(({ address, symbol }) => `${symbol} - ${address}`)
       : detectedTokens.map(({ address, symbol }) => `${symbol} - ${address}`);
 
   const totalTokens =
-    process.env.PORTFOLIO_VIEW && !allNetworksFilterShown
+    process.env.PORTFOLIO_VIEW && !isTokenNetworkFilterEqualCurrentNetwork
       ? Object.values(detectedTokensMultichain).reduce(
           (count, tokenArray) => count + tokenArray.length,
           0,
diff --git a/ui/selectors/selectors.test.js b/ui/selectors/selectors.test.js
index b4b748104189..cfee47dfafe2 100644
--- a/ui/selectors/selectors.test.js
+++ b/ui/selectors/selectors.test.js
@@ -2178,4 +2178,63 @@ describe('#getConnectedSitesList', () => {
       });
     });
   });
+
+  describe('getIsTokenNetworkFilterEqualCurrentNetwork', () => {
+    beforeEach(() => {
+      process.env.PORTFOLIO_VIEW = 'true';
+    });
+
+    afterEach(() => {
+      process.env.PORTFOLIO_VIEW = undefined;
+    });
+
+    it('returns true when the token network filter is equal to the current network', () => {
+      const state = {
+        metamask: {
+          preferences: {
+            tokenNetworkFilter: {
+              '0x1': true,
+            },
+          },
+          selectedNetworkClientId: 'mainnetNetworkConfigurationId',
+          networkConfigurationsByChainId: {
+            '0x1': {
+              chainId: '0x1',
+              rpcEndpoints: [
+                { networkClientId: 'mainnetNetworkConfigurationId' },
+              ],
+            },
+          },
+        },
+      };
+      expect(selectors.getIsTokenNetworkFilterEqualCurrentNetwork(state)).toBe(
+        true,
+      );
+    });
+
+    it('returns false when the token network filter is on multiple networks', () => {
+      const state = {
+        metamask: {
+          preferences: {
+            tokenNetworkFilter: {
+              '0x1': true,
+              '0x89': true,
+            },
+          },
+          selectedNetworkClientId: 'mainnetNetworkConfigurationId',
+          networkConfigurationsByChainId: {
+            '0x1': {
+              chainId: '0x1',
+              rpcEndpoints: [
+                { networkClientId: 'mainnetNetworkConfigurationId' },
+              ],
+            },
+          },
+        },
+      };
+      expect(selectors.getIsTokenNetworkFilterEqualCurrentNetwork(state)).toBe(
+        false,
+      );
+    });
+  });
 });

From 3d9db73c562f37273281a0ab8bd474002e8fe700 Mon Sep 17 00:00:00 2001
From: infiniteflower <139582705+infiniteflower@users.noreply.github.com>
Date: Wed, 11 Dec 2024 15:18:03 -0500
Subject: [PATCH 089/175] fix: token.icon possibly null, update validators and
 types (#29065)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<!--
Please submit this PR as a draft initially.
Do not mark it as "Ready for review" until the template has been
completely filled out, and PR status checks have passed at least once.
-->

## **Description**

<!--
Write a short description of the changes included in this pull request,
also include relevant motivation and context. Have in mind the following
questions:
1. What is the reason for the change?
2. What is the improvement/solution?
-->

[![Open in GitHub
Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/29065?quickstart=1)

This PR fixes an issue where `token.icon` returned by the Bridge API
status endpoint could be `null`, which caused validation to fail. It
updates the types and the validation to match what the Bridge API
returns.

## **Related issues**

Related to https://github.com/MetaMask/metamask-extension/pull/28899

## **Manual testing steps**

1. Go to this page...
2.
3.

## **Screenshots/Recordings**

<!-- If applicable, add screenshots and/or recordings to visualize the
before and after of your change. -->

### **Before**

<!-- [screenshots/recordings] -->

### **After**

<!-- [screenshots/recordings] -->

## **Pre-merge author checklist**

- [ ] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension Coding
Standards](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/CODING_GUIDELINES.md).
- [ ] I've completed the PR template to the best of my ability
- [ ] I’ve included tests if applicable
- [ ] I’ve documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [ ] I’ve applied the right labels on the PR (see [labeling
guidelines](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.

## **Pre-merge reviewer checklist**

- [ ] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed).
- [ ] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.
---
 .../bridge-status/validators.test.ts          | 42 +++++++++++++++++++
 .../controllers/bridge-status/validators.ts   |  7 ++--
 shared/types/bridge-status.ts                 |  2 +-
 3 files changed, 47 insertions(+), 4 deletions(-)

diff --git a/app/scripts/controllers/bridge-status/validators.test.ts b/app/scripts/controllers/bridge-status/validators.test.ts
index 18ca81d7a5b2..83877b80bdb5 100644
--- a/app/scripts/controllers/bridge-status/validators.test.ts
+++ b/app/scripts/controllers/bridge-status/validators.test.ts
@@ -162,6 +162,43 @@ const BridgeTxStatusResponses = {
       },
     },
   },
+  STATUS_COMPLETE_VALID_MISSING_FIELDS_2: {
+    status: 'COMPLETE',
+    isExpectedToken: false,
+    bridge: 'across',
+    srcChain: {
+      chainId: 10,
+      txHash:
+        '0x4c57876fad21fb5149af5a58a4aba2ca9d6b212014505dd733b75667ca4f0f2b',
+      amount: '991250000000000',
+      token: {
+        chainId: 10,
+        address: '0x4200000000000000000000000000000000000006',
+        symbol: 'WETH',
+        name: 'Wrapped Ether',
+        decimals: 18,
+        icon: 'https://media.socket.tech/tokens/all/WETH',
+        // logoURI: 'https://media.socket.tech/tokens/all/WETH',
+        // chainAgnosticId: 'ETH',
+      },
+    },
+    destChain: {
+      chainId: 8453,
+      txHash:
+        '0x60c4cad7c3eb14c7b3ace40cd4015b90927dadacbdc8673f404bea6a5603844b',
+      amount: '988339336750062',
+      token: {
+        chainId: 8453,
+        address: '0x4200000000000000000000000000000000000006',
+        symbol: 'WETH',
+        name: 'Wrapped Ether',
+        decimals: 18,
+        icon: null,
+        // logoURI: null,
+        // chainAgnosticId: null,
+      },
+    },
+  },
   STATUS_COMPLETE_INVALID_MISSING_FIELDS: {
     status: 'COMPLETE',
     isExpectedToken: true,
@@ -203,6 +240,11 @@ describe('validators', () => {
         expected: false,
         description: 'complete bridge status with missing fields',
       },
+      {
+        input: BridgeTxStatusResponses.STATUS_COMPLETE_VALID_MISSING_FIELDS_2,
+        expected: true,
+        description: 'complete bridge status with missing fields 2',
+      },
       {
         input: BridgeTxStatusResponses.STATUS_COMPLETE_VALID_MISSING_FIELDS,
         expected: true,
diff --git a/app/scripts/controllers/bridge-status/validators.ts b/app/scripts/controllers/bridge-status/validators.ts
index 69e788025b01..b942317a3119 100644
--- a/app/scripts/controllers/bridge-status/validators.ts
+++ b/app/scripts/controllers/bridge-status/validators.ts
@@ -54,9 +54,10 @@ const assetValidators = [
   },
   {
     property: 'icon',
-    type: 'string|undefined',
-    validator: (v: unknown): v is string | undefined =>
-      v === undefined || typeof v === 'string',
+    // typeof null === 'object'
+    type: 'string|undefined|object',
+    validator: (v: unknown): v is string | undefined | object =>
+      v === undefined || v === null || typeof v === 'string',
   },
 ];
 
diff --git a/shared/types/bridge-status.ts b/shared/types/bridge-status.ts
index 0003705ba41f..4c3f79bcd672 100644
--- a/shared/types/bridge-status.ts
+++ b/shared/types/bridge-status.ts
@@ -38,7 +38,7 @@ export type Asset = {
   symbol: string;
   name: string;
   decimals: number;
-  icon?: string;
+  icon?: string | null;
 };
 
 export type SrcChainStatus = {

From 1814c2b50093647a18e3d6301c91855c29c4c4f8 Mon Sep 17 00:00:00 2001
From: infiniteflower <139582705+infiniteflower@users.noreply.github.com>
Date: Wed, 11 Dec 2024 15:18:30 -0500
Subject: [PATCH 090/175] chore: update CODEOWNERS for bridge related code
 (#29029)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<!--
Please submit this PR as a draft initially.
Do not mark it as "Ready for review" until the template has been
completely filled out, and PR status checks have passed at least once.
-->

## **Description**

<!--
Write a short description of the changes included in this pull request,
also include relevant motivation and context. Have in mind the following
questions:
1. What is the reason for the change?
2. What is the improvement/solution?
-->

[![Open in GitHub
Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/29029?quickstart=1)

This PR updates `CODEOWNERS` for all Bridge related code.

## **Related issues**

n/a

## **Manual testing steps**

n/a
## **Screenshots/Recordings**

<!-- If applicable, add screenshots and/or recordings to visualize the
before and after of your change. -->

n/a

### **Before**

<!-- [screenshots/recordings] -->

### **After**

<!-- [screenshots/recordings] -->

## **Pre-merge author checklist**

- [x] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension Coding
Standards](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/CODING_GUIDELINES.md).
- [x] I've completed the PR template to the best of my ability
- [ ] I’ve included tests if applicable
- [ ] I’ve documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [x] I’ve applied the right labels on the PR (see [labeling
guidelines](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.

## **Pre-merge reviewer checklist**

- [ ] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed).
- [ ] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.
---
 .github/CODEOWNERS | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 334f177db259..ad36b9b96efd 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -96,10 +96,14 @@ ui/pages/settings/security-tab/profile-sync-toggle      @MetaMask/identity
 
 app/scripts/lib/snap-keyring         @MetaMask/accounts-engineers
 
-# Swaps team to own code for the swaps folder
+# Swaps-Bridge team to own code for the swaps folder
 ui/pages/swaps                                        @MetaMask/swaps-engineers
 app/scripts/controllers/swaps                         @MetaMask/swaps-engineers
 
+# Swaps-Bridge team to own code for the bridge folder
+**/bridge/**                                          @MetaMask/swaps-engineers
+**/bridge-status/**                                   @MetaMask/swaps-engineers
+
 # Ramps team to own code for the ramps folder
 **/ramps/**                                           @MetaMask/ramp
 

From 70bdc86711205c487d1126a2ed918144b525a1ff Mon Sep 17 00:00:00 2001
From: micaelae <100321200+micaelae@users.noreply.github.com>
Date: Wed, 11 Dec 2024 12:38:54 -0800
Subject: [PATCH 091/175] chore: enable multiselect in asset-picker network
 modal (#28975)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<!--
Please submit this PR as a draft initially.
Do not mark it as "Ready for review" until the template has been
completely filled out, and PR status checks have passed at least once.
-->

## **Description**
Figma:
https://www.figma.com/design/IuOIRmU3wI0IdJIfol0ESu/Cross-Chain-Swaps?node-id=7-24563&node-type=canvas&m=dev

Changes
- enables multi network selection in the Asset Picker, and displaying
tokens from multiple chains
- adds support for searching tokens by address
- updates the PickerNetwork component to show multiple network icons
- refactors TokenListItem for less truncation

<!--
Write a short description of the changes included in this pull request,
also include relevant motivation and context. Have in mind the following
questions:
1. What is the reason for the change?
2. What is the improvement/solution?
-->

[![Open in GitHub
Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/28975?quickstart=1)

## **Related issues**

Fixes:

## **Manual testing steps**

1. To test locally set `BRIDGE_USE_DEV_APIS=1` in .metamaskrc, then try
selecting networks/tokens in the Bridge experience
2. Also try to do some e2e tests in the Send and Swap/Send flows

## **Screenshots/Recordings**

<!-- If applicable, add screenshots and/or recordings to visualize the
before and after of your change. -->

### **Before -> After**

![Screenshot 2024-12-05 at 9 36
14 PM](https://github.com/user-attachments/assets/0a533f9e-f8f5-4574-8e99-08e11a0915f2)![Screenshot
2024-12-05 at 9 34
06 PM](https://github.com/user-attachments/assets/b7704ac0-6b78-4034-b4b5-2c504f0c93ef)

![Screenshot 2024-12-05 at 9 36
23 PM](https://github.com/user-attachments/assets/890a2aee-8fa7-46e0-9123-13556ca86c3a)![Screenshot
2024-12-05 at 9 33
54 PM](https://github.com/user-attachments/assets/cc239f12-6000-4496-9963-fcaa2c341b37)

![Screenshot 2024-12-05 at 9 36
37 PM](https://github.com/user-attachments/assets/aac2278c-ddb3-4087-94a0-be17fb659d2b)![Screenshot
2024-12-05 at 9 37
45 PM](https://github.com/user-attachments/assets/b4a8d208-2f3f-4e0f-931a-bdb47053a31c)

![Screenshot 2024-12-05 at 9 36
44 PM](https://github.com/user-attachments/assets/eca739e7-2536-44f3-b46c-b0527817bbf1)![Screenshot
2024-12-05 at 9 37
55 PM](https://github.com/user-attachments/assets/68385c35-71f0-4f84-9edd-e3a74f143a90)

![Screenshot 2024-12-10 at 11 25
09 AM](https://github.com/user-attachments/assets/e7a6a4ea-4f0c-4da2-abed-477bc297bc0b)![Screenshot
2024-12-10 at 11 25
14 AM](https://github.com/user-attachments/assets/d93ec08d-e300-4aa8-978b-631348a4be36)




<!-- [screenshots/recordings] -->

## **Pre-merge author checklist**

- [X] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension Coding
Standards](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/CODING_GUIDELINES.md).
- [X] I've completed the PR template to the best of my ability
- [X] I’ve included tests if applicable
- [X] I’ve documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [X] I’ve applied the right labels on the PR (see [labeling
guidelines](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.

## **Pre-merge reviewer checklist**

- [ ] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed).
- [ ] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.
---
 app/_locales/en/messages.json                 |  16 +
 shared/constants/bridge.ts                    |  17 +-
 test/data/mock-send-state.json                |   5 +
 .../e2e/page-objects/pages/home/asset-list.ts |   2 +-
 .../dapp-interactions/block-explorer.spec.js  |   2 +-
 .../multichain/asset-picker-send.spec.ts      |   2 +-
 .../tests/network/custom-rpc-history.spec.js  |   1 +
 test/e2e/tests/network/update-network.spec.ts |   2 +-
 .../metamask-responsive-ui.spec.js            |   2 +-
 .../tests/tokens/add-multiple-tokens.spec.js  |   2 +-
 .../tests/transaction/change-assets.spec.js   |   4 +-
 test/jest/mock-store.js                       | 107 +++++
 .../__snapshots__/token-cell.test.tsx.snap    |  68 ++-
 .../picker-network.test.tsx.snap              | 128 +++++-
 .../picker-network/picker-network.stories.tsx |  32 ++
 .../picker-network/picker-network.test.tsx    |  45 ++
 .../picker-network/picker-network.tsx         |  23 +-
 .../picker-network/picker-network.types.ts    |   5 +
 .../account-list-item.test.js.snap            |   2 +-
 .../__snapshots__/app-header.test.js.snap     |   8 +-
 .../asset-picker-amount.tsx                   |   4 +
 .../asset-picker-modal/Asset.test.tsx         |  10 +-
 .../asset-picker-modal/Asset.tsx              |  42 +-
 .../asset-picker-modal/AssetList.test.tsx     |  17 +
 .../asset-picker-modal/AssetList.tsx          |  64 ++-
 .../asset-picker-modal-network.test.tsx.snap  | 123 ++++--
 .../asset-picker-modal-network.test.tsx       |  17 +-
 .../asset-picker-modal-network.tsx            | 220 ++++++++--
 .../asset-picker-modal-search.tsx             |  15 +-
 .../asset-picker-modal.test.tsx               |  62 ++-
 .../asset-picker-modal/asset-picker-modal.tsx | 195 +++++++--
 .../asset-picker-modal/index.scss             |  12 +-
 .../asset-picker-modal/types.ts               |  18 +-
 .../asset-picker/asset-picker.stories.tsx     | 142 +++---
 .../asset-picker/asset-picker.tsx             | 168 ++++---
 .../asset-picker/index.scss                   |   5 -
 .../__snapshots__/avatar-group.test.tsx.snap  |   2 +-
 .../avatar-group/avatar-group.stories.tsx     |  26 ++
 .../multichain/avatar-group/avatar-group.tsx  |  35 +-
 .../avatar-group/avatar-group.types.tsx       |   9 +-
 .../network-list-item.test.js.snap            |  21 +-
 .../multichain/network-list-item/index.scss   |  10 +-
 .../network-list-item/network-list-item.tsx   |  71 +--
 .../network-list-menu.test.js.snap            |  84 +++-
 .../site-cell-tooltip.test.js.snap            |   4 +-
 .../network-picker.test.tsx.snap              |   4 +-
 .../multichain/pages/send/send.test.js        |   6 +-
 .../token-list-item.test.tsx.snap             | 410 +++++++++++++++++-
 .../token-list-item.stories.js                |  30 ++
 .../token-list-item/token-list-item.test.tsx  |  15 +-
 .../token-list-item/token-list-item.tsx       | 250 +++++------
 ui/ducks/bridge/utils.ts                      |   9 +
 ui/hooks/useMultichainBalances.test.ts        | 121 ++++++
 ui/hooks/useMultichainBalances.ts             | 154 +++++++
 ui/hooks/useTokensWithFiltering.test.ts       |   4 +
 ui/hooks/useTokensWithFiltering.ts            |  12 +-
 .../__snapshots__/asset-page.test.tsx.snap    | 204 ++++-----
 .../prepare-bridge-page.test.tsx.snap         |  44 +-
 .../bridge/prepare/bridge-input-group.tsx     |  10 +-
 .../prepare/prepare-bridge-page.test.tsx      |   2 +-
 .../bridge/prepare/prepare-bridge-page.tsx    |  24 +-
 ...ge-container-header.component.test.js.snap |   4 +-
 ...ture-request-header.component.test.js.snap |   8 +-
 .../confirm-send-ether.test.js.snap           |   4 +-
 .../__snapshots__/connect-page.test.tsx.snap  |   4 +-
 65 files changed, 2486 insertions(+), 682 deletions(-)
 create mode 100644 ui/hooks/useMultichainBalances.test.ts
 create mode 100644 ui/hooks/useMultichainBalances.ts

diff --git a/app/_locales/en/messages.json b/app/_locales/en/messages.json
index 43396b0fe8a0..c6fce85a2190 100644
--- a/app/_locales/en/messages.json
+++ b/app/_locales/en/messages.json
@@ -509,6 +509,9 @@
   "allCustodianAccountsConnectedTitle": {
     "message": "No accounts available to connect"
   },
+  "allNetworks": {
+    "message": "All networks"
+  },
   "allOfYour": {
     "message": "All of your $1",
     "description": "$1 is the symbol or name of the token that the user is approving spending"
@@ -580,6 +583,9 @@
     "message": "MetaMask Institutional",
     "description": "The name of the application (MMI)"
   },
+  "apply": {
+    "message": "Apply"
+  },
   "approve": {
     "message": "Approve spend limit"
   },
@@ -2934,6 +2940,7 @@
   "loadingScreenSnapMessage": {
     "message": "Please complete the transaction on the Snap."
   },
+  "loadingTokenList": { "message": "Loading token list" },
   "loadingTokens": {
     "message": "Loading tokens..."
   },
@@ -4828,6 +4835,9 @@
   "searchTokens": {
     "message": "Search tokens"
   },
+  "searchTokensByNameOrAddress": {
+    "message": "Search tokens by name or address"
+  },
   "secretRecoveryPhrase": {
     "message": "Secret Recovery Phrase"
   },
@@ -5193,6 +5203,9 @@
   "simulationsSettingSubHeader": {
     "message": "Estimate balance changes"
   },
+  "singleNetwork": {
+    "message": "1 network"
+  },
   "siweIssued": {
     "message": "Issued"
   },
@@ -5422,6 +5435,9 @@
   "solanaSupportToggleTitle": {
     "message": "Enable \"Add a new Solana account (Beta)\""
   },
+  "someNetworks": {
+    "message": "$1 networks"
+  },
   "somethingDoesntLookRight": {
     "message": "Something doesn't look right? $1",
     "description": "A false positive message for users to contact support. $1 is a link to the support page."
diff --git a/shared/constants/bridge.ts b/shared/constants/bridge.ts
index eb2ceb065590..06e0d55b8195 100644
--- a/shared/constants/bridge.ts
+++ b/shared/constants/bridge.ts
@@ -1,4 +1,4 @@
-import { CHAIN_IDS } from './network';
+import { CHAIN_IDS, NETWORK_TO_NAME_MAP } from './network';
 
 // TODO read from feature flags
 export const ALLOWED_BRIDGE_CHAIN_IDS = [
@@ -31,3 +31,18 @@ export const BRIDGE_QUOTE_MAX_RETURN_DIFFERENCE_PERCENTAGE = 0.8; // if a quote
 
 export const BRIDGE_PREFERRED_GAS_ESTIMATE = 'medium';
 export const BRIDGE_DEFAULT_SLIPPAGE = 0.5;
+
+export const NETWORK_TO_SHORT_NETWORK_NAME_MAP: Record<
+  AllowedBridgeChainIds,
+  string
+> = {
+  [CHAIN_IDS.MAINNET]: 'Ethereum',
+  [CHAIN_IDS.LINEA_MAINNET]: 'Linea',
+  [CHAIN_IDS.POLYGON]: NETWORK_TO_NAME_MAP[CHAIN_IDS.POLYGON],
+  [CHAIN_IDS.AVALANCHE]: 'Avalanche',
+  [CHAIN_IDS.BSC]: NETWORK_TO_NAME_MAP[CHAIN_IDS.BSC],
+  [CHAIN_IDS.ARBITRUM]: NETWORK_TO_NAME_MAP[CHAIN_IDS.ARBITRUM],
+  [CHAIN_IDS.OPTIMISM]: NETWORK_TO_NAME_MAP[CHAIN_IDS.OPTIMISM],
+  [CHAIN_IDS.ZKSYNC_ERA]: 'ZkSync Era',
+  [CHAIN_IDS.BASE]: 'Base',
+};
diff --git a/test/data/mock-send-state.json b/test/data/mock-send-state.json
index f9c602808719..0b7cc237547f 100644
--- a/test/data/mock-send-state.json
+++ b/test/data/mock-send-state.json
@@ -64,6 +64,11 @@
   },
   "metamask": {
     "accountsByChainId": {},
+    "tokenBalances": {
+      "0x0dcd5d886577d5081b0c52e242ef29e70be3e7bc": {
+        "0x5": {}
+      }
+    },
     "ipfsGateway": "",
     "dismissSeedBackUpReminder": false,
     "usePhishDetect": true,
diff --git a/test/e2e/page-objects/pages/home/asset-list.ts b/test/e2e/page-objects/pages/home/asset-list.ts
index c80eb9e96eed..abc5870ec04a 100644
--- a/test/e2e/page-objects/pages/home/asset-list.ts
+++ b/test/e2e/page-objects/pages/home/asset-list.ts
@@ -119,7 +119,7 @@ class AssetListPage {
    */
   async hideToken(tokenName: string): Promise<void> {
     console.log(`Hide token ${tokenName} on homepage`);
-    await this.driver.clickElement({ text: tokenName, tag: 'span' });
+    await this.driver.clickElement({ text: tokenName, tag: 'p' });
     await this.driver.clickElement(this.assetOptionsButton);
     await this.driver.clickElement(this.hideTokenButton);
     await this.driver.waitForSelector(this.hideTokenConfirmationModalTitle);
diff --git a/test/e2e/tests/dapp-interactions/block-explorer.spec.js b/test/e2e/tests/dapp-interactions/block-explorer.spec.js
index 0b01aa65aab3..d6d64dcf4322 100644
--- a/test/e2e/tests/dapp-interactions/block-explorer.spec.js
+++ b/test/e2e/tests/dapp-interactions/block-explorer.spec.js
@@ -82,7 +82,7 @@ describe('Block Explorer', function () {
 
         await driver.clickElement({
           text: 'TST',
-          tag: 'span',
+          tag: 'p',
         });
 
         await driver.clickElement('[data-testid="asset-options__button"]');
diff --git a/test/e2e/tests/multichain/asset-picker-send.spec.ts b/test/e2e/tests/multichain/asset-picker-send.spec.ts
index a071bec9426d..a6d8e193d537 100644
--- a/test/e2e/tests/multichain/asset-picker-send.spec.ts
+++ b/test/e2e/tests/multichain/asset-picker-send.spec.ts
@@ -88,7 +88,7 @@ describe('AssetPickerSendFlow @no-mmi', function () {
         await searchInputField.sendKeys('CHZ');
 
         // check that CHZ is disabled
-        const [, tkn] = await driver.findElements(
+        const [tkn] = await driver.findElements(
           '[data-testid="multichain-token-list-button"]',
         );
 
diff --git a/test/e2e/tests/network/custom-rpc-history.spec.js b/test/e2e/tests/network/custom-rpc-history.spec.js
index 6e92f532698f..2d1a52994d10 100644
--- a/test/e2e/tests/network/custom-rpc-history.spec.js
+++ b/test/e2e/tests/network/custom-rpc-history.spec.js
@@ -264,6 +264,7 @@ describe('Custom RPC history', function () {
         const customRpcs = await driver.findElements({
           text: 'Localhost 8545',
           tag: 'p',
+          css: '.multichain-network-list-item__tooltip',
         });
 
         // click Mainnet to dismiss network dropdown
diff --git a/test/e2e/tests/network/update-network.spec.ts b/test/e2e/tests/network/update-network.spec.ts
index 3f0b9882688f..f7861f46ab99 100644
--- a/test/e2e/tests/network/update-network.spec.ts
+++ b/test/e2e/tests/network/update-network.spec.ts
@@ -23,7 +23,7 @@ const selectors = {
   deleteButton: { text: 'Delete', tag: 'button' },
   cancelButton: { text: 'Cancel', tag: 'button' },
   saveButton: { text: 'Save', tag: 'button' },
-  updatedNetworkDropDown: { tag: 'span', text: 'Update Network' },
+  updatedNetworkDropDown: { tag: 'p', text: 'Update Network' },
   errorMessageInvalidUrl: {
     text: 'URLs require the appropriate HTTP/HTTPS prefix.',
   },
diff --git a/test/e2e/tests/responsive-ui/metamask-responsive-ui.spec.js b/test/e2e/tests/responsive-ui/metamask-responsive-ui.spec.js
index db43124355c2..54236d84f2f5 100644
--- a/test/e2e/tests/responsive-ui/metamask-responsive-ui.spec.js
+++ b/test/e2e/tests/responsive-ui/metamask-responsive-ui.spec.js
@@ -163,7 +163,7 @@ describe('MetaMask Responsive UI', function () {
 
           // Import Secret Recovery Phrase
           await driver.waitForSelector({
-            tag: 'span',
+            tag: 'p',
             text: 'Localhost 8545',
           });
           await driver.clickElement({
diff --git a/test/e2e/tests/tokens/add-multiple-tokens.spec.js b/test/e2e/tests/tokens/add-multiple-tokens.spec.js
index 8be2a430b622..bc6ea5e6f2c0 100644
--- a/test/e2e/tests/tokens/add-multiple-tokens.spec.js
+++ b/test/e2e/tests/tokens/add-multiple-tokens.spec.js
@@ -104,7 +104,7 @@ describe('Multiple ERC20 Watch Asset', function () {
 
         // Check all three tokens have been added to the token list.
         const addedTokens = await driver.findElements({
-          tag: 'span',
+          tag: 'p',
           text: 'TST',
         });
         assert.equal(addedTokens.length, 3);
diff --git a/test/e2e/tests/transaction/change-assets.spec.js b/test/e2e/tests/transaction/change-assets.spec.js
index 9764941771b7..33944f7a2160 100644
--- a/test/e2e/tests/transaction/change-assets.spec.js
+++ b/test/e2e/tests/transaction/change-assets.spec.js
@@ -111,7 +111,7 @@ describe('Change assets', function () {
 
           // Click the Send button
           await driver.clickElement({
-            css: '[data-testid="multichain-token-list-button"] span',
+            css: '[data-testid="multichain-token-list-button"] p',
             text: 'TST',
           });
 
@@ -471,7 +471,7 @@ describe('Change assets', function () {
 
           // Click the Send button
           await driver.clickElement({
-            css: '[data-testid="multichain-token-list-button"] span',
+            css: '[data-testid="multichain-token-list-button"] p',
             text: 'TST',
           });
 
diff --git a/test/jest/mock-store.js b/test/jest/mock-store.js
index f937dcac0cf5..84d18e1a3803 100644
--- a/test/jest/mock-store.js
+++ b/test/jest/mock-store.js
@@ -740,6 +740,113 @@ export const createBridgeMockStore = (
       },
       currencyRates: {
         ETH: { conversionRate: 2524.25 },
+        usd: { conversionRate: 1 },
+      },
+      marketData: {
+        '0x1': {
+          '0x1f9840a85d5af5bf1d1762f925bdaddc4201f984': {
+            currency: 'usd',
+            price: 2.3,
+          },
+        },
+      },
+      allTokens: {
+        [CHAIN_IDS.MAINNET]: {
+          '0x0dcd5d886577d5081b0c52e242ef29e70be3e7bc': [
+            {
+              address: '0x1f9840a85d5af5bf1d1762f925bdaddc4201f984',
+              balance: 'a',
+              decimals: 6,
+            },
+            {
+              address: '0x514910771af9ca656af840dff83e8264ecf986ca',
+              balance: 'e',
+            },
+          ],
+          '0xec1adf982415d2ef5ec55899b9bfb8bc0f29251b': [
+            {
+              address: '0x6b3595068778dd592e39a122f4f5a5cf09c90fe2',
+              balance: 'e',
+            },
+          ],
+        },
+        [CHAIN_IDS.LINEA_MAINNET]: {
+          '0x0dcd5d886577d5081b0c52e242ef29e70be3e7bc': [
+            {
+              address: '0x1f9840a85d5af5bf1d1762f925bdaddc4201f984',
+              balance: 'e',
+            },
+          ],
+          '0xec1adf982415d2ef5ec55899b9bfb8bc0f29251b': [
+            {
+              address: '0x6b3595068778dd592e39a122f4f5a5cf09c90fe2',
+              balance: 'e',
+            },
+          ],
+        },
+      },
+      accountsByChainId: {
+        [CHAIN_IDS.MAINNET]: {
+          '0x0dcd5d886577d5081b0c52e242ef29e70be3e7bc': {
+            address: '0x0dcd5d886577d5081b0c52e242ef29e70be3e7bc',
+            balance: '0xa',
+          },
+          '0xec1adf982415d2ef5ec55899b9bfb8bc0f29251b': {
+            address: '0xec1adf982415d2ef5ec55899b9bfb8bc0f29251b',
+            balance: '0xe',
+          },
+        },
+        [CHAIN_IDS.LINEA_MAINNET]: {
+          '0x0dcd5d886577d5081b0c52e242ef29e70be3e7bc': {
+            address: '0x0dcd5d886577d5081b0c52e242ef29e70be3e7bc',
+            balance: '0xe',
+          },
+          '0xec1adf982415d2ef5ec55899b9bfb8bc0f29251b': {
+            address: '0xec1adf982415d2ef5ec55899b9bfb8bc0f29251b',
+            balance: '0xe',
+          },
+        },
+      },
+      tokensChainsCache: {
+        [CHAIN_IDS.MAINNET]: {
+          timestamp: 111111,
+          data: [
+            {
+              address: '0x514910771af9ca656af840dff83e8264ecf986ca',
+              symbol: 'LINK',
+              decimals: 18,
+            },
+            {
+              address: '0xc00e94cb662c3520282e6f5717214004a7f26888',
+              symbol: 'COMP',
+              decimals: 18,
+            },
+          ],
+        },
+        [CHAIN_IDS.LINEA_MAINNET]: {
+          timestamp: 111111,
+          data: {
+            '0x514910771af9ca656af840dff83e8264ecf986ca': {
+              address: '0x514910771af9ca656af840dff83e8264ecf986ca',
+              symbol: 'LINK',
+              decimals: 18,
+            },
+            '0xc00e94cb662c3520282e6f5717214004a7f26888': {
+              address: '0xc00e94cb662c3520282e6f5717214004a7f26888',
+              symbol: 'COMP',
+              decimals: 18,
+            },
+          },
+        },
+      },
+      tokenBalances: {
+        '0x0dcd5d886577d5081b0c52e242ef29e70be3e7bc': {
+          '0x5': {},
+          '0x1': {
+            '0x514910771af9ca656af840dff83e8264ecf986ca': '0x1',
+            '0x1f9840a85d5af5bf1d1762f925bdaddc4201f984': '0x738',
+          },
+        },
       },
       ...metamaskStateOverrides,
       bridgeState: {
diff --git a/ui/components/app/assets/token-cell/__snapshots__/token-cell.test.tsx.snap b/ui/components/app/assets/token-cell/__snapshots__/token-cell.test.tsx.snap
index 9a62f050e644..7fb51f212ebd 100644
--- a/ui/components/app/assets/token-cell/__snapshots__/token-cell.test.tsx.snap
+++ b/ui/components/app/assets/token-cell/__snapshots__/token-cell.test.tsx.snap
@@ -3,13 +3,14 @@
 exports[`Token Cell should match snapshot 1`] = `
 <div>
   <div
-    class="mm-box multichain-token-list-item mm-box--display-flex mm-box--gap-4 mm-box--flex-direction-column"
+    class="mm-box multichain-token-list-item mm-box--display-flex mm-box--gap-4 mm-box--flex-direction-row mm-box--width-full mm-box--height-full"
     data-testid="multichain-token-list-item"
   >
     <a
-      class="mm-box multichain-token-list-item__container-cell multichain-token-list-item__container-cell--clickable mm-box--padding-top-2 mm-box--padding-right-4 mm-box--padding-bottom-2 mm-box--padding-left-4 mm-box--display-flex mm-box--flex-direction-row"
+      class="mm-box multichain-token-list-item__container-cell multichain-token-list-item__container-cell--clickable mm-box--padding-top-2 mm-box--padding-right-4 mm-box--padding-bottom-2 mm-box--padding-left-4 mm-box--display-flex mm-box--flex-direction-row mm-box--width-full"
       data-testid="multichain-token-list-button"
       href="#"
+      style="height: 62px;"
     >
       <div
         class="mm-box mm-badge-wrapper multichain-token-list-item__badge mm-box--margin-right-4 mm-box--display-inline-block"
@@ -38,51 +39,44 @@ exports[`Token Cell should match snapshot 1`] = `
         </div>
       </div>
       <div
-        class="mm-box multichain-token-list-item__container-cell--text-container mm-box--display-flex mm-box--flex-direction-column mm-box--width-full"
+        class="mm-box multichain-token-list-item__container-cell--text-container mm-box--display-flex mm-box--flex-direction-column mm-box--justify-content-center mm-box--width-full"
         style="flex-grow: 1; overflow: hidden;"
       >
         <div
-          class="mm-box mm-box--display-flex mm-box--gap-1 mm-box--flex-direction-row mm-box--justify-content-space-between"
+          class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-space-between"
         >
-          <div
-            class="mm-box mm-box--display-inline-block mm-box--width-1/3"
+          <p
+            class="mm-box mm-text mm-text--body-md mm-text--font-weight-medium mm-text--ellipsis mm-box--color-text-default"
           >
-            <span
-              class="mm-box mm-text mm-text--body-md mm-text--font-weight-medium mm-text--ellipsis mm-box--color-text-default"
-            >
-              TEST
-            </span>
-            <div
-              class="mm-box mm-box--display-flex"
-            >
-              <p
-                class="mm-box mm-text mm-text--body-sm-medium mm-text--ellipsis mm-box--color-text-default"
-                data-testid="token-increase-decrease-percentage-0xAnotherToken"
-              />
-            </div>
-          </div>
+            TEST
+          </p>
+          <p
+            class="mm-box mm-text mm-text--body-md mm-text--font-weight-medium mm-text--text-align-end mm-box--color-text-default"
+            data-testid="multichain-token-list-item-secondary-value"
+          >
+            $5.00
+          </p>
+        </div>
+        <div
+          class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-space-between"
+        >
           <div
-            class="mm-box mm-box--display-flex mm-box--flex-direction-column mm-box--align-items-flex-end mm-box--width-2/3"
+            class="mm-box mm-box--display-flex"
           >
             <p
-              class="mm-box mm-text mm-text--body-md mm-text--font-weight-medium mm-text--text-align-end mm-box--width-2/3 mm-box--color-text-default"
-              data-testid="multichain-token-list-item-secondary-value"
-            >
-              $5.00
-            </p>
-            <p
-              class="mm-box mm-text mm-text--body-sm-medium mm-text--text-align-end mm-box--color-text-alternative"
-              data-testid="multichain-token-list-item-value"
-            >
-              5
-               
-              TEST
-            </p>
+              class="mm-box mm-text mm-text--body-sm-medium mm-text--ellipsis mm-box--color-text-default"
+              data-testid="token-increase-decrease-percentage-0xAnotherToken"
+            />
           </div>
+          <p
+            class="mm-box mm-text mm-text--body-sm-medium mm-text--text-align-end mm-box--color-text-alternative"
+            data-testid="multichain-token-list-item-value"
+          >
+            5
+             
+            TEST
+          </p>
         </div>
-        <div
-          class="mm-box mm-box--display-flex mm-box--gap-1 mm-box--flex-direction-row mm-box--justify-content-space-between"
-        />
       </div>
     </a>
   </div>
diff --git a/ui/components/component-library/picker-network/__snapshots__/picker-network.test.tsx.snap b/ui/components/component-library/picker-network/__snapshots__/picker-network.test.tsx.snap
index 3e43996dc512..a451e62576a6 100644
--- a/ui/components/component-library/picker-network/__snapshots__/picker-network.test.tsx.snap
+++ b/ui/components/component-library/picker-network/__snapshots__/picker-network.test.tsx.snap
@@ -1,5 +1,129 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
+exports[`PickerNetwork should render multiple avatars when avatarGroupProps is present 1`] = `
+<div>
+  <button
+    class="mm-box mm-picker-network mm-box--padding-right-2 mm-box--padding-left-2 mm-box--display-flex mm-box--gap-2 mm-box--align-items-center mm-box--background-color-background-alternative mm-box--rounded-pill"
+    data-testid="picker-network"
+  >
+    <div
+      class="mm-box multichain-avatar-group mm-box--display-flex mm-box--gap-1 mm-box--align-items-center"
+      data-testid="avatar-group"
+    >
+      <div
+        class="mm-box mm-box--display-flex mm-box--align-items-center"
+      >
+        <div
+          class="mm-box mm-box--rounded-full"
+          style="margin-left: 0px;"
+        >
+          <div
+            class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-network mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-md mm-box--border-color-background-default mm-box--border-width-1 box--border-style-solid"
+          >
+            <img
+              alt="Network3 logo"
+              class="mm-avatar-network__network-image"
+              src="img2"
+            />
+          </div>
+        </div>
+        <div
+          class="mm-box mm-box--rounded-full"
+          style="margin-left: -8px;"
+        >
+          <div
+            class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-network mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-md mm-box--border-color-background-default mm-box--border-width-1 box--border-style-solid"
+          >
+            <img
+              alt="Network1 logo"
+              class="mm-avatar-network__network-image"
+              src="img1"
+            />
+          </div>
+        </div>
+        <div
+          class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-overlay-inverse mm-box--background-color-overlay-alternative mm-box--rounded-md mm-box--border-color-background-default box--border-style-solid box--border-width-1"
+          style="margin-left: -8px; font-size: 8px;"
+        >
+          +2
+        </div>
+      </div>
+    </div>
+    <p
+      class="mm-box mm-text mm-text--body-sm mm-text--ellipsis mm-box--color-text-default"
+    >
+      test
+    </p>
+    <span
+      class="mm-box mm-picker-network__arrow-down-icon mm-icon mm-icon--size-xs mm-box--margin-left-auto mm-box--display-inline-block mm-box--color-icon-default"
+      style="mask-image: url('./images/icons/arrow-down.svg');"
+    />
+  </button>
+</div>
+`;
+
+exports[`PickerNetwork should render multiple avatars with a stacked tag when isTagOverlay is present 1`] = `
+<div>
+  <button
+    class="mm-box mm-picker-network mm-box--padding-right-2 mm-box--padding-left-2 mm-box--display-flex mm-box--gap-2 mm-box--align-items-center mm-box--background-color-background-alternative mm-box--rounded-pill"
+    data-testid="picker-network"
+  >
+    <div
+      class="mm-box multichain-avatar-group mm-box--display-flex mm-box--gap-1 mm-box--align-items-center"
+      data-testid="avatar-group"
+    >
+      <div
+        class="mm-box mm-box--display-flex mm-box--align-items-center"
+      >
+        <div
+          class="mm-box mm-box--rounded-full"
+          style="margin-left: 0px;"
+        >
+          <div
+            class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-network mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-md mm-box--border-color-background-default mm-box--border-width-1 box--border-style-solid"
+          >
+            <img
+              alt="Network3 logo"
+              class="mm-avatar-network__network-image"
+              src="img2"
+            />
+          </div>
+        </div>
+        <div
+          class="mm-box mm-box--rounded-full"
+          style="margin-left: -8px;"
+        >
+          <div
+            class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-network mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-md mm-box--border-color-background-default mm-box--border-width-1 box--border-style-solid"
+          >
+            <img
+              alt="Network1 logo"
+              class="mm-avatar-network__network-image"
+              src="img1"
+            />
+          </div>
+        </div>
+        <div
+          class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-overlay-inverse mm-box--background-color-overlay-alternative mm-box--rounded-md mm-box--border-color-background-default box--border-style-solid box--border-width-1"
+          style="margin-left: -8px; font-size: 8px;"
+        >
+          +2
+        </div>
+      </div>
+    </div>
+    <p
+      class="mm-box mm-text mm-text--body-sm mm-text--ellipsis mm-box--color-text-default"
+    >
+      test
+    </p>
+    <span
+      class="mm-box mm-picker-network__arrow-down-icon mm-icon mm-icon--size-xs mm-box--margin-left-auto mm-box--display-inline-block mm-box--color-icon-default"
+      style="mask-image: url('./images/icons/arrow-down.svg');"
+    />
+  </button>
+</div>
+`;
+
 exports[`PickerNetwork should render the label inside the PickerNetwork 1`] = `
 <div>
   <button
@@ -11,11 +135,11 @@ exports[`PickerNetwork should render the label inside the PickerNetwork 1`] = `
     >
       I
     </div>
-    <span
+    <p
       class="mm-box mm-text mm-text--body-sm mm-text--ellipsis mm-box--color-text-default"
     >
       Imported
-    </span>
+    </p>
     <span
       class="mm-box mm-picker-network__arrow-down-icon mm-icon mm-icon--size-xs mm-box--margin-left-auto mm-box--display-inline-block mm-box--color-icon-default"
       style="mask-image: url('./images/icons/arrow-down.svg');"
diff --git a/ui/components/component-library/picker-network/picker-network.stories.tsx b/ui/components/component-library/picker-network/picker-network.stories.tsx
index 9960058e873e..ea35b98f397c 100644
--- a/ui/components/component-library/picker-network/picker-network.stories.tsx
+++ b/ui/components/component-library/picker-network/picker-network.stories.tsx
@@ -9,6 +9,12 @@ import {
 import { Box } from '..';
 import README from './README.mdx';
 import { PickerNetwork } from './picker-network';
+import {
+  CHAIN_ID_TO_NETWORK_IMAGE_URL_MAP,
+  CHAIN_IDS,
+} from '../../../../shared/constants/network';
+import { NETWORK_TO_SHORT_NETWORK_NAME_MAP } from '../../../../shared/constants/bridge';
+import { AvatarType } from '../../multichain/avatar-group/avatar-group.types';
 
 export default {
   title: 'Components/ComponentLibrary/PickerNetwork',
@@ -78,3 +84,29 @@ export const Width: StoryFn<typeof PickerNetwork> = (args) => (
     <PickerNetwork {...args} width={BlockSize.Full} />
   </>
 );
+
+export const AvatarGroupProps: StoryFn<typeof PickerNetwork> = () => (
+  <PickerNetwork
+    label="Arbitrum One"
+    src="./images/arbitrum.svg"
+    avatarGroupProps={{
+      limit: 2,
+      members: [
+        CHAIN_IDS.MAINNET,
+        CHAIN_IDS.POLYGON,
+        CHAIN_IDS.AVALANCHE,
+        CHAIN_IDS.BASE,
+      ].map((c) => ({
+        avatarValue:
+          CHAIN_ID_TO_NETWORK_IMAGE_URL_MAP[
+            c as keyof typeof CHAIN_ID_TO_NETWORK_IMAGE_URL_MAP
+          ],
+        symbol:
+          NETWORK_TO_SHORT_NETWORK_NAME_MAP[
+            c as keyof typeof NETWORK_TO_SHORT_NETWORK_NAME_MAP
+          ],
+      })),
+      avatarType: AvatarType.NETWORK,
+    }}
+  />
+);
diff --git a/ui/components/component-library/picker-network/picker-network.test.tsx b/ui/components/component-library/picker-network/picker-network.test.tsx
index ac7ee292b55c..d05e4a52caf9 100644
--- a/ui/components/component-library/picker-network/picker-network.test.tsx
+++ b/ui/components/component-library/picker-network/picker-network.test.tsx
@@ -2,6 +2,9 @@ import { render, screen } from '@testing-library/react';
 import React from 'react';
 
 import { IconName } from '..';
+import { renderWithProvider } from '../../../../test/lib/render-helpers';
+import configureStore from '../../../store/store';
+import { AvatarType } from '../../multichain/avatar-group/avatar-group.types';
 import { PickerNetwork } from './picker-network';
 
 describe('PickerNetwork', () => {
@@ -77,4 +80,46 @@ describe('PickerNetwork', () => {
     );
     expect(getByTestId('picker-network-label')).toHaveClass('test-class');
   });
+  // avatarGroupProps
+  it('should render multiple avatars when avatarGroupProps is present', () => {
+    const { container } = renderWithProvider(
+      <PickerNetwork
+        data-testid="picker-network"
+        label="test"
+        avatarGroupProps={{
+          members: [
+            { avatarValue: 'img1', symbol: 'Network1' },
+            { avatarValue: 'img2', symbol: 'Network3' },
+            { avatarValue: 'img3', symbol: 'Network4' },
+            { avatarValue: 'img4', symbol: 'Network4' },
+          ],
+          limit: 2,
+          avatarType: AvatarType.NETWORK,
+        }}
+      />,
+      configureStore({ metamask: { useBlockie: false } }),
+    );
+    expect(container).toMatchSnapshot();
+  });
+  it('should render multiple avatars with a stacked tag when isTagOverlay is present', () => {
+    const { container } = renderWithProvider(
+      <PickerNetwork
+        data-testid="picker-network"
+        label="test"
+        avatarGroupProps={{
+          members: [
+            { avatarValue: 'img1', symbol: 'Network1' },
+            { avatarValue: 'img2', symbol: 'Network3' },
+            { avatarValue: 'img3', symbol: 'Network4' },
+            { avatarValue: 'img4', symbol: 'Network4' },
+          ],
+          limit: 2,
+          isTagOverlay: true,
+          avatarType: AvatarType.NETWORK,
+        }}
+      />,
+      configureStore({ metamask: { useBlockie: true } }),
+    );
+    expect(container).toMatchSnapshot();
+  });
 });
diff --git a/ui/components/component-library/picker-network/picker-network.tsx b/ui/components/component-library/picker-network/picker-network.tsx
index 7363b1e16bc3..f92ad174beed 100644
--- a/ui/components/component-library/picker-network/picker-network.tsx
+++ b/ui/components/component-library/picker-network/picker-network.tsx
@@ -18,6 +18,7 @@ import {
   Text,
 } from '..';
 import { BoxProps, PolymorphicRef } from '../box';
+import { AvatarGroup } from '../../multichain/avatar-group';
 import {
   PickerNetworkComponent,
   PickerNetworkProps,
@@ -27,6 +28,7 @@ export const PickerNetwork: PickerNetworkComponent = React.forwardRef(
   <C extends React.ElementType = 'button'>(
     {
       className = '',
+      avatarGroupProps,
       avatarNetworkProps,
       iconProps,
       label,
@@ -50,14 +52,19 @@ export const PickerNetwork: PickerNetworkComponent = React.forwardRef(
         display={Display.Flex}
         {...(props as BoxProps<C>)}
       >
-        <AvatarNetwork
-          className="mm-picker-network__avatar-network"
-          src={src}
-          name={label}
-          size={AvatarNetworkSize.Xs}
-          {...avatarNetworkProps}
-        />
-        <Text as="span" ellipsis variant={TextVariant.bodySm} {...labelProps}>
+        {avatarGroupProps ? (
+          <AvatarGroup {...avatarGroupProps} isTagOverlay={true} />
+        ) : (
+          <AvatarNetwork
+            className="mm-picker-network__avatar-network"
+            src={src}
+            name={label}
+            size={AvatarNetworkSize.Xs}
+            {...avatarNetworkProps}
+          />
+        )}
+
+        <Text ellipsis variant={TextVariant.bodySm} {...labelProps}>
           {label}
         </Text>
         <Icon
diff --git a/ui/components/component-library/picker-network/picker-network.types.ts b/ui/components/component-library/picker-network/picker-network.types.ts
index d2559dc12537..3b9c6fca2ebc 100644
--- a/ui/components/component-library/picker-network/picker-network.types.ts
+++ b/ui/components/component-library/picker-network/picker-network.types.ts
@@ -5,6 +5,7 @@ import type {
 import { IconProps } from '../icon/icon.types';
 import { AvatarNetworkProps } from '../avatar-network/avatar-network.types';
 import { TextProps } from '../text';
+import { AvatarGroupProps } from '../../multichain/avatar-group/avatar-group.types';
 
 // TODO: Convert to a `type` in a future major version.
 // eslint-disable-next-line @typescript-eslint/consistent-type-definitions
@@ -13,6 +14,10 @@ export interface PickerNetworkStyleUtilityProps extends StyleUtilityProps {
    * The src accepts the string of the image to be rendered
    */
   src?: string;
+  /**
+   * The avatarComponent prop accepts an alternative avatar to be rendered
+   */
+  avatarGroupProps?: AvatarGroupProps;
   /**
    * An additional className to apply to the PickerNetwork.
    */
diff --git a/ui/components/multichain/account-list-item/__snapshots__/account-list-item.test.js.snap b/ui/components/multichain/account-list-item/__snapshots__/account-list-item.test.js.snap
index e320bd1de0e3..ab9bc540fe7a 100644
--- a/ui/components/multichain/account-list-item/__snapshots__/account-list-item.test.js.snap
+++ b/ui/components/multichain/account-list-item/__snapshots__/account-list-item.test.js.snap
@@ -273,7 +273,7 @@ exports[`AccountListItem renders AccountListItem component and shows account nam
           data-testid="avatar-group"
         >
           <div
-            class="mm-box mm-box--display-flex"
+            class="mm-box mm-box--display-flex mm-box--align-items-center"
           >
             <div
               class="mm-box mm-box--rounded-full"
diff --git a/ui/components/multichain/app-header/__snapshots__/app-header.test.js.snap b/ui/components/multichain/app-header/__snapshots__/app-header.test.js.snap
index 27600ce7dc4e..ea37f1e209ec 100644
--- a/ui/components/multichain/app-header/__snapshots__/app-header.test.js.snap
+++ b/ui/components/multichain/app-header/__snapshots__/app-header.test.js.snap
@@ -20,11 +20,11 @@ exports[`App Header locked state matches snapshot: locked 1`] = `
           >
             C
           </div>
-          <span
+          <p
             class="mm-box mm-text mm-text--body-sm mm-text--ellipsis mm-box--color-text-default"
           >
             Chain 5
-          </span>
+          </p>
           <span
             class="mm-box mm-picker-network__arrow-down-icon mm-icon mm-icon--size-xs mm-box--margin-left-auto mm-box--display-inline-block mm-box--color-icon-default"
             style="mask-image: url('./images/icons/arrow-down.svg');"
@@ -446,11 +446,11 @@ exports[`App Header unlocked state matches snapshot: unlocked 1`] = `
           >
             C
           </div>
-          <span
+          <p
             class="mm-box mm-text mm-text--body-sm mm-text--ellipsis mm-box--color-text-default"
           >
             Chain 5
-          </span>
+          </p>
           <span
             class="mm-box mm-picker-network__arrow-down-icon mm-icon mm-icon--size-xs mm-box--margin-left-auto mm-box--display-inline-block mm-box--color-icon-default"
             style="mask-image: url('./images/icons/arrow-down.svg');"
diff --git a/ui/components/multichain/asset-picker-amount/asset-picker-amount.tsx b/ui/components/multichain/asset-picker-amount/asset-picker-amount.tsx
index 07d564daca7f..e27e18e31a29 100644
--- a/ui/components/multichain/asset-picker-amount/asset-picker-amount.tsx
+++ b/ui/components/multichain/asset-picker-amount/asset-picker-amount.tsx
@@ -34,6 +34,7 @@ import {
 import { NEGATIVE_OR_ZERO_AMOUNT_TOKENS_ERROR } from '../../../pages/confirmations/send/send.constants';
 import { getNativeCurrency } from '../../../ducks/metamask/metamask';
 import useGetAssetImageUrl from '../../../hooks/useGetAssetImageUrl';
+import { getCurrentChainId } from '../../../../shared/modules/selectors/networks';
 import MaxClearButton from './max-clear-button';
 import {
   AssetPicker,
@@ -83,6 +84,7 @@ export const AssetPickerAmount = ({
   const isMaxMode = useSelector(getSendMaxModeState);
   const isNativeSendPossible = useSelector(getIsNativeSendPossible);
 
+  const currentChainId = useSelector(getCurrentChainId);
   const nativeCurrencySymbol = useSelector(getNativeCurrency);
   const nativeCurrencyImageUrl = useSelector(getNativeCurrencyImage);
   const tokenList = useSelector(getTokenList) as TokenListMap;
@@ -169,6 +171,7 @@ export const AssetPickerAmount = ({
       type: asset.type,
       image: nativeCurrencyImageUrl,
       symbol: nativeCurrencySymbol as string,
+      chainId: currentChainId,
     };
   } else if (asset?.type === AssetType.token && asset?.details?.symbol) {
     standardizedAsset = {
@@ -180,6 +183,7 @@ export const AssetPickerAmount = ({
           tokenList[asset.details.address.toLowerCase()]?.iconUrl),
       symbol: asset.details.symbol,
       address: asset.details.address,
+      chainId: currentChainId,
     };
   } else if (
     asset?.type === AssetType.NFT &&
diff --git a/ui/components/multichain/asset-picker-amount/asset-picker-modal/Asset.test.tsx b/ui/components/multichain/asset-picker-amount/asset-picker-modal/Asset.test.tsx
index 0b641101c5dd..4e80b9492626 100644
--- a/ui/components/multichain/asset-picker-amount/asset-picker-modal/Asset.test.tsx
+++ b/ui/components/multichain/asset-picker-amount/asset-picker-modal/Asset.test.tsx
@@ -1,7 +1,10 @@
 import React from 'react';
 import { render } from '@testing-library/react';
 import { useSelector } from 'react-redux';
-import { getTokenList } from '../../../../selectors';
+import {
+  getNetworkConfigurationIdByChainId,
+  getTokenList,
+} from '../../../../selectors';
 import { useTokenFiatAmount } from '../../../../hooks/useTokenFiatAmount';
 import { getIntlLocale } from '../../../../ducks/locale/locale';
 import { TokenListItem } from '../../token-list-item';
@@ -51,6 +54,10 @@ describe('Asset', () => {
         return mockState.getTokenList;
       } else if (selector === getIntlLocale) {
         return mockState.getIntlLocale;
+      } else if (selector === getNetworkConfigurationIdByChainId) {
+        return {
+          '0x1': { networkName: 'Ethereum', iconUrl: 'network-icon-url' },
+        };
       }
       return undefined;
     });
@@ -69,6 +76,7 @@ describe('Asset', () => {
         balance="10000000000000000000"
         decimals={18}
         tooltipText="tooltip"
+        chainId="0x1"
       />,
     );
 
diff --git a/ui/components/multichain/asset-picker-amount/asset-picker-modal/Asset.tsx b/ui/components/multichain/asset-picker-amount/asset-picker-modal/Asset.tsx
index f6e7e7f3ccc9..5561af182dc0 100644
--- a/ui/components/multichain/asset-picker-amount/asset-picker-modal/Asset.tsx
+++ b/ui/components/multichain/asset-picker-amount/asset-picker-modal/Asset.tsx
@@ -1,17 +1,26 @@
 import React from 'react';
 import { useSelector } from 'react-redux';
 import { BigNumber } from 'bignumber.js';
-import { getCurrentChainId } from '../../../../../shared/modules/selectors/networks';
-import { getTokenList } from '../../../../selectors';
+import {
+  getCurrentCurrency,
+  getNetworkConfigurationIdByChainId,
+  getTokenList,
+} from '../../../../selectors';
 import { useTokenFiatAmount } from '../../../../hooks/useTokenFiatAmount';
 import { TokenListItem } from '../../token-list-item';
 import { isEqualCaseInsensitive } from '../../../../../shared/modules/string-utils';
 import { formatAmount } from '../../../../pages/confirmations/components/simulation-details/formatAmount';
 import { getIntlLocale } from '../../../../ducks/locale/locale';
-import { AssetWithDisplayData, ERC20Asset } from './types';
+import { CHAIN_ID_TO_NETWORK_IMAGE_URL_MAP } from '../../../../../shared/constants/network';
+import { formatCurrency } from '../../../../helpers/utils/confirm-tx.util';
+import { AssetWithDisplayData, ERC20Asset, NativeAsset } from './types';
 
-type AssetProps = AssetWithDisplayData<ERC20Asset> & {
+type AssetProps = AssetWithDisplayData<NativeAsset | ERC20Asset> & {
   tooltipText?: string;
+  assetItemProps?: Pick<
+    React.ComponentProps<typeof TokenListItem>,
+    'isTitleNetworkName' | 'isTitleHidden'
+  >;
 };
 
 export default function Asset({
@@ -20,11 +29,18 @@ export default function Asset({
   symbol,
   string: decimalTokenAmount,
   tooltipText,
+  tokenFiatAmount,
+  chainId,
+  assetItemProps = {},
 }: AssetProps) {
   const locale = useSelector(getIntlLocale);
 
-  const chainId = useSelector(getCurrentChainId);
+  const currency = useSelector(getCurrentCurrency);
   const tokenList = useSelector(getTokenList);
+  const allNetworks = useSelector(getNetworkConfigurationIdByChainId);
+  const isTokenChainIdInWallet = Boolean(
+    chainId ? allNetworks[chainId as keyof typeof allNetworks] : true,
+  );
   const tokenData = address
     ? Object.values(tokenList).find(
         (token) =>
@@ -45,20 +61,30 @@ export default function Asset({
   const formattedAmount = decimalTokenAmount
     ? `${formatAmount(
         locale,
-        new BigNumber(decimalTokenAmount || '0', 10),
+        new BigNumber(decimalTokenAmount.toString(), 10),
       )} ${symbol}`
     : undefined;
+  const primaryAmountToUse = tokenFiatAmount
+    ? formatCurrency(tokenFiatAmount.toString(), currency, 2)
+    : formattedFiat;
 
   return (
     <TokenListItem
+      key={`${chainId}-${symbol}-${address}`}
       chainId={chainId}
       tokenSymbol={symbol}
       tokenImage={tokenImage}
-      secondary={formattedAmount}
-      primary={formattedFiat}
+      secondary={isTokenChainIdInWallet ? formattedAmount : undefined}
+      primary={isTokenChainIdInWallet ? primaryAmountToUse : undefined}
       title={title}
       tooltipText={tooltipText}
+      tokenChainImage={
+        CHAIN_ID_TO_NETWORK_IMAGE_URL_MAP[
+          chainId as keyof typeof CHAIN_ID_TO_NETWORK_IMAGE_URL_MAP
+        ]
+      }
       isPrimaryTokenSymbolHidden
+      {...assetItemProps}
     />
   );
 }
diff --git a/ui/components/multichain/asset-picker-amount/asset-picker-modal/AssetList.test.tsx b/ui/components/multichain/asset-picker-amount/asset-picker-modal/AssetList.test.tsx
index c4e4ba0ceb29..d3807b4952d1 100644
--- a/ui/components/multichain/asset-picker-amount/asset-picker-modal/AssetList.test.tsx
+++ b/ui/components/multichain/asset-picker-amount/asset-picker-modal/AssetList.test.tsx
@@ -2,6 +2,7 @@ import React from 'react';
 import { render, screen, fireEvent } from '@testing-library/react';
 import { useSelector } from 'react-redux';
 import {
+  getCurrentNetwork,
   getPreferences,
   getSelectedAccountCachedBalance,
 } from '../../../../selectors';
@@ -10,6 +11,7 @@ import { useUserPreferencedCurrency } from '../../../../hooks/useUserPreferenced
 import { useCurrencyDisplay } from '../../../../hooks/useCurrencyDisplay';
 import { AssetType } from '../../../../../shared/constants/transaction';
 import { CHAIN_ID_TOKEN_IMAGE_MAP } from '../../../../../shared/constants/network';
+import { getCurrentChainId } from '../../../../../shared/modules/selectors/networks';
 import AssetList from './AssetList';
 import { AssetWithDisplayData, ERC20Asset, NativeAsset } from './types';
 
@@ -55,6 +57,7 @@ describe('AssetList', () => {
       string: '10',
       decimals: 18,
       balance: '0',
+      chainId: '0x1',
     },
     {
       address: '0xToken2',
@@ -64,6 +67,7 @@ describe('AssetList', () => {
       string: '20',
       decimals: 6,
       balance: '10',
+      chainId: '0x1',
     },
     {
       address: null,
@@ -73,6 +77,7 @@ describe('AssetList', () => {
       string: '30',
       decimals: 18,
       balance: '0x121',
+      chainId: '0x1',
     },
   ];
   const primaryCurrency = 'USD';
@@ -110,6 +115,15 @@ describe('AssetList', () => {
   });
 
   it('should render the token list', () => {
+    (useSelector as jest.Mock).mockImplementation((selector) => {
+      if (selector === getCurrentChainId) {
+        return '0x1';
+      }
+      if (selector === getCurrentNetwork) {
+        return { chainId: '0x1' };
+      }
+      return undefined;
+    });
     render(
       <AssetList
         handleAssetChange={handleAssetChangeMock}
@@ -117,6 +131,7 @@ describe('AssetList', () => {
           type: AssetType.native,
           image: CHAIN_ID_TOKEN_IMAGE_MAP['0x1'],
           symbol: 'ETH',
+          chainId: '0x1',
         }}
         tokenList={tokenList}
       />,
@@ -134,6 +149,7 @@ describe('AssetList', () => {
           type: AssetType.native,
           image: CHAIN_ID_TOKEN_IMAGE_MAP['0x1'],
           symbol: 'ETH',
+          chainId: '0x1',
         }}
         tokenList={tokenList}
       />,
@@ -166,6 +182,7 @@ describe('AssetList', () => {
           type: AssetType.native,
           image: CHAIN_ID_TOKEN_IMAGE_MAP['0x1'],
           symbol: 'ETH',
+          chainId: '0x1',
         }}
         tokenList={tokenList}
         isTokenDisabled={(token) => token.address === '0xToken1'}
diff --git a/ui/components/multichain/asset-picker-amount/asset-picker-modal/AssetList.tsx b/ui/components/multichain/asset-picker-amount/asset-picker-modal/AssetList.tsx
index 6f867d25ca85..ece3d7046fde 100644
--- a/ui/components/multichain/asset-picker-amount/asset-picker-modal/AssetList.tsx
+++ b/ui/components/multichain/asset-picker-amount/asset-picker-modal/AssetList.tsx
@@ -1,9 +1,14 @@
 import React from 'react';
 import { useSelector } from 'react-redux';
 import classnames from 'classnames';
+import {
+  AddNetworkFields,
+  NetworkConfiguration,
+} from '@metamask/network-controller';
 import { getCurrentChainId } from '../../../../../shared/modules/selectors/networks';
 import {
   getCurrentCurrency,
+  getCurrentNetwork,
   getSelectedAccountCachedBalance,
 } from '../../../../selectors';
 import { getNativeCurrency } from '../../../../ducks/metamask/metamask';
@@ -18,6 +23,9 @@ import {
   FlexWrap,
 } from '../../../../helpers/constants/design-system';
 import { TokenListItem } from '../..';
+import LoadingScreen from '../../../ui/loading-screen';
+import { useI18nContext } from '../../../../hooks/useI18nContext';
+import { CHAIN_ID_TO_NETWORK_IMAGE_URL_MAP } from '../../../../../shared/constants/network';
 import AssetComponent from './Asset';
 import { AssetWithDisplayData, ERC20Asset, NativeAsset } from './types';
 
@@ -33,6 +41,12 @@ type AssetListProps = {
   isTokenDisabled?: (
     token: AssetWithDisplayData<ERC20Asset> | AssetWithDisplayData<NativeAsset>,
   ) => boolean;
+  network?: NetworkConfiguration | AddNetworkFields;
+  isTokenListLoading?: boolean;
+  assetItemProps?: Pick<
+    React.ComponentProps<typeof TokenListItem>,
+    'isTitleNetworkName' | 'isTitleHidden'
+  >;
 };
 
 export default function AssetList({
@@ -40,8 +54,20 @@ export default function AssetList({
   asset,
   tokenList,
   isTokenDisabled,
+  network,
+  isTokenListLoading = false,
+  assetItemProps = {},
 }: AssetListProps) {
-  const selectedToken = asset?.address;
+  const t = useI18nContext();
+  const selectedTokenAddress = asset?.address;
+
+  const currentNetwork = useSelector(getCurrentNetwork);
+  // If a network is provided, display tokens in that network
+  // Otherwise, assume tokens in the current network are displayed
+  const networkToUse = network ?? currentNetwork;
+  // This indicates whether tokens in the wallet's active network are displayed
+  const isSelectedNetworkActive =
+    networkToUse.chainId === currentNetwork.chainId;
 
   const chainId = useSelector(getCurrentChainId);
   const nativeCurrency = useSelector(getNativeCurrency);
@@ -59,9 +85,24 @@ export default function AssetList({
 
   return (
     <Box className="tokens-main-view-modal">
+      {isTokenListLoading && (
+        <LoadingScreen
+          loadingMessage={t('loadingTokenList')}
+          showLoadingSpinner
+        />
+      )}
       {tokenList.map((token) => {
         const tokenAddress = token.address?.toLowerCase();
-        const isSelected = tokenAddress === selectedToken?.toLowerCase();
+
+        const isMatchingChainId = token.chainId === networkToUse?.chainId;
+        const isMatchingAddress =
+          // the native asset can have an undefined, null, '', or zero address
+          (token.type === AssetType.native &&
+            !token.address &&
+            !selectedTokenAddress) ||
+          tokenAddress === selectedTokenAddress?.toLowerCase();
+        const isSelected = isMatchingChainId && isMatchingAddress;
+
         const isDisabled = isTokenDisabled?.(token) ?? false;
 
         return (
@@ -69,7 +110,7 @@ export default function AssetList({
             padding={0}
             gap={0}
             margin={0}
-            key={token.symbol}
+            key={`${token.symbol}-${tokenAddress ?? ''}-${token.chainId}`}
             backgroundColor={
               isSelected
                 ? BackgroundColor.primaryMuted
@@ -101,24 +142,33 @@ export default function AssetList({
               flexWrap={FlexWrap.NoWrap}
               alignItems={AlignItems.center}
             >
-              <Box marginInlineStart={2}>
-                {token.type === AssetType.native ? (
+              <Box>
+                {token.type === AssetType.native &&
+                token.chainId === chainId &&
+                isSelectedNetworkActive ? (
+                  // Only use this component for the native token of the active network
                   <TokenListItem
-                    chainId={chainId}
+                    chainId={token.chainId}
                     title={token.symbol}
                     primary={primaryCurrencyValue}
                     tokenSymbol={token.symbol}
                     secondary={secondaryCurrencyValue}
                     tokenImage={token.image}
                     isPrimaryTokenSymbolHidden
+                    tokenChainImage={
+                      CHAIN_ID_TO_NETWORK_IMAGE_URL_MAP[
+                        token.chainId as keyof typeof CHAIN_ID_TO_NETWORK_IMAGE_URL_MAP
+                      ]
+                    }
+                    {...assetItemProps}
                   />
                 ) : (
                   <AssetComponent
-                    key={token.address}
                     {...token}
                     tooltipText={
                       isDisabled ? 'swapTokenNotAvailable' : undefined
                     }
+                    assetItemProps={assetItemProps}
                   />
                 )}
               </Box>
diff --git a/ui/components/multichain/asset-picker-amount/asset-picker-modal/__snapshots__/asset-picker-modal-network.test.tsx.snap b/ui/components/multichain/asset-picker-amount/asset-picker-modal/__snapshots__/asset-picker-modal-network.test.tsx.snap
index 4e0e3640a75a..f0d99284b7a8 100644
--- a/ui/components/multichain/asset-picker-amount/asset-picker-modal/__snapshots__/asset-picker-modal-network.test.tsx.snap
+++ b/ui/components/multichain/asset-picker-amount/asset-picker-modal/__snapshots__/asset-picker-modal-network.test.tsx.snap
@@ -71,11 +71,10 @@ exports[`AssetPickerModalNetwork renders modal with no network list by default 1
             </div>
           </header>
           <div
-            class="mm-box multichain-asset-picker__network-list"
+            class="mm-box multichain-asset-picker__network-list mm-box--display-flex"
           >
             <div
-              class="mm-box mm-box--display-flex mm-box--flex-direction-column mm-box--height-full"
-              style="grid-column-start: 1; grid-column-end: 3;"
+              class="mm-box mm-box--display-flex mm-box--flex-direction-column mm-box--width-full"
             />
           </div>
         </section>
@@ -161,20 +160,19 @@ exports[`AssetPickerModalNetwork should not show selected network when network p
             </div>
           </header>
           <div
-            class="mm-box multichain-asset-picker__network-list"
+            class="mm-box multichain-asset-picker__network-list mm-box--display-flex"
           >
             <div
-              class="mm-box mm-box--display-flex mm-box--flex-direction-column mm-box--height-full"
-              style="grid-column-start: 1; grid-column-end: 3;"
+              class="mm-box mm-box--display-flex mm-box--flex-direction-column mm-box--width-full"
             >
               <div
                 class="mm-box multichain-network-list-item mm-box--padding-top-4 mm-box--padding-right-4 mm-box--padding-bottom-4 mm-box--padding-left-4 mm-box--display-flex mm-box--gap-4 mm-box--justify-content-space-between mm-box--align-items-center mm-box--width-full mm-box--background-color-transparent"
               >
                 <div
-                  class="mm-box mm-text mm-avatar-base mm-avatar-base--size-md mm-avatar-network mm-text--body-sm mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-md mm-box--border-color-background-default mm-box--border-width-1 box--border-style-solid"
+                  class="mm-box mm-text mm-avatar-base mm-avatar-base--size-sm mm-avatar-network mm-text--body-sm mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-md mm-box--border-color-background-default mm-box--border-width-1 box--border-style-solid"
                 >
                   <img
-                    alt="Network name 3 logo"
+                    alt="Ethereum logo"
                     class="mm-avatar-network__network-image"
                     src="./images/eth_logo.svg"
                   />
@@ -185,14 +183,25 @@ exports[`AssetPickerModalNetwork should not show selected network when network p
                 >
                   <div
                     class="mm-box mm-box--display-flex mm-box--align-items-center mm-box--width-full"
-                    data-testid="Network name 3"
+                    data-testid="Ethereum"
                   >
-                    <p
-                      class="mm-box mm-text mm-text--body-md mm-text--ellipsis mm-box--color-text-default mm-box--background-color-transparent"
-                      tabindex="0"
+                    <div
+                      class="multichain-network-list-item__tooltip"
                     >
-                      Network name 3
-                    </p>
+                      <div
+                        class=""
+                        style="display: inline;"
+                        tabindex="0"
+                        title=""
+                      >
+                        <p
+                          class="mm-box mm-text mm-text--body-md-medium mm-text--ellipsis mm-box--color-text-default mm-box--background-color-transparent"
+                          tabindex="0"
+                        >
+                          Ethereum
+                        </p>
+                      </div>
+                    </div>
                   </div>
                 </div>
               </div>
@@ -200,10 +209,10 @@ exports[`AssetPickerModalNetwork should not show selected network when network p
                 class="mm-box multichain-network-list-item mm-box--padding-top-4 mm-box--padding-right-4 mm-box--padding-bottom-4 mm-box--padding-left-4 mm-box--display-flex mm-box--gap-4 mm-box--justify-content-space-between mm-box--align-items-center mm-box--width-full mm-box--background-color-transparent"
               >
                 <div
-                  class="mm-box mm-text mm-avatar-base mm-avatar-base--size-md mm-avatar-network mm-text--body-sm mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-md mm-box--border-color-background-default mm-box--border-width-1 box--border-style-solid"
+                  class="mm-box mm-text mm-avatar-base mm-avatar-base--size-sm mm-avatar-network mm-text--body-sm mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-md mm-box--border-color-background-default mm-box--border-width-1 box--border-style-solid"
                 >
                   <img
-                    alt="Network name 4 logo"
+                    alt="OP Mainnet logo"
                     class="mm-avatar-network__network-image"
                     src="./images/optimism.svg"
                   />
@@ -214,14 +223,25 @@ exports[`AssetPickerModalNetwork should not show selected network when network p
                 >
                   <div
                     class="mm-box mm-box--display-flex mm-box--align-items-center mm-box--width-full"
-                    data-testid="Network name 4"
+                    data-testid="OP Mainnet"
                   >
-                    <p
-                      class="mm-box mm-text mm-text--body-md mm-text--ellipsis mm-box--color-text-default mm-box--background-color-transparent"
-                      tabindex="0"
+                    <div
+                      class="multichain-network-list-item__tooltip"
                     >
-                      Network name 4
-                    </p>
+                      <div
+                        class=""
+                        style="display: inline;"
+                        tabindex="0"
+                        title=""
+                      >
+                        <p
+                          class="mm-box mm-text mm-text--body-md-medium mm-text--ellipsis mm-box--color-text-default mm-box--background-color-transparent"
+                          tabindex="0"
+                        >
+                          OP Mainnet
+                        </p>
+                      </div>
+                    </div>
                   </div>
                 </div>
               </div>
@@ -310,11 +330,10 @@ exports[`AssetPickerModalNetwork should use passed in network as default when ne
             </div>
           </header>
           <div
-            class="mm-box multichain-asset-picker__network-list"
+            class="mm-box multichain-asset-picker__network-list mm-box--display-flex"
           >
             <div
-              class="mm-box mm-box--display-flex mm-box--flex-direction-column mm-box--height-full"
-              style="grid-column-start: 1; grid-column-end: 3;"
+              class="mm-box mm-box--display-flex mm-box--flex-direction-column mm-box--width-full"
             >
               <div
                 class="mm-box multichain-network-list-item multichain-network-list-item--selected mm-box--padding-top-4 mm-box--padding-right-4 mm-box--padding-bottom-4 mm-box--padding-left-4 mm-box--display-flex mm-box--gap-4 mm-box--justify-content-space-between mm-box--align-items-center mm-box--width-full mm-box--background-color-primary-muted"
@@ -323,10 +342,10 @@ exports[`AssetPickerModalNetwork should use passed in network as default when ne
                   class="mm-box multichain-network-list-item__selected-indicator mm-box--background-color-primary-default mm-box--rounded-pill"
                 />
                 <div
-                  class="mm-box mm-text mm-avatar-base mm-avatar-base--size-md mm-avatar-network mm-text--body-sm mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-md mm-box--border-color-background-default mm-box--border-width-1 box--border-style-solid"
+                  class="mm-box mm-text mm-avatar-base mm-avatar-base--size-sm mm-avatar-network mm-text--body-sm mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-md mm-box--border-color-background-default mm-box--border-width-1 box--border-style-solid"
                 >
                   <img
-                    alt="Network name 3 logo"
+                    alt="Ethereum logo"
                     class="mm-avatar-network__network-image"
                     src="./images/eth_logo.svg"
                   />
@@ -337,14 +356,25 @@ exports[`AssetPickerModalNetwork should use passed in network as default when ne
                 >
                   <div
                     class="mm-box mm-box--display-flex mm-box--align-items-center mm-box--width-full"
-                    data-testid="Network name 3"
+                    data-testid="Ethereum"
                   >
-                    <p
-                      class="mm-box mm-text mm-text--body-md mm-text--ellipsis mm-box--color-text-default mm-box--background-color-transparent"
-                      tabindex="0"
+                    <div
+                      class="multichain-network-list-item__tooltip"
                     >
-                      Network name 3
-                    </p>
+                      <div
+                        class=""
+                        style="display: inline;"
+                        tabindex="0"
+                        title=""
+                      >
+                        <p
+                          class="mm-box mm-text mm-text--body-md-medium mm-text--ellipsis mm-box--color-text-default mm-box--background-color-transparent"
+                          tabindex="0"
+                        >
+                          Ethereum
+                        </p>
+                      </div>
+                    </div>
                   </div>
                 </div>
               </div>
@@ -352,10 +382,10 @@ exports[`AssetPickerModalNetwork should use passed in network as default when ne
                 class="mm-box multichain-network-list-item mm-box--padding-top-4 mm-box--padding-right-4 mm-box--padding-bottom-4 mm-box--padding-left-4 mm-box--display-flex mm-box--gap-4 mm-box--justify-content-space-between mm-box--align-items-center mm-box--width-full mm-box--background-color-transparent"
               >
                 <div
-                  class="mm-box mm-text mm-avatar-base mm-avatar-base--size-md mm-avatar-network mm-text--body-sm mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-md mm-box--border-color-background-default mm-box--border-width-1 box--border-style-solid"
+                  class="mm-box mm-text mm-avatar-base mm-avatar-base--size-sm mm-avatar-network mm-text--body-sm mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-md mm-box--border-color-background-default mm-box--border-width-1 box--border-style-solid"
                 >
                   <img
-                    alt="Network name 4 logo"
+                    alt="OP Mainnet logo"
                     class="mm-avatar-network__network-image"
                     src="./images/optimism.svg"
                   />
@@ -366,14 +396,25 @@ exports[`AssetPickerModalNetwork should use passed in network as default when ne
                 >
                   <div
                     class="mm-box mm-box--display-flex mm-box--align-items-center mm-box--width-full"
-                    data-testid="Network name 4"
+                    data-testid="OP Mainnet"
                   >
-                    <p
-                      class="mm-box mm-text mm-text--body-md mm-text--ellipsis mm-box--color-text-default mm-box--background-color-transparent"
-                      tabindex="0"
+                    <div
+                      class="multichain-network-list-item__tooltip"
                     >
-                      Network name 4
-                    </p>
+                      <div
+                        class=""
+                        style="display: inline;"
+                        tabindex="0"
+                        title=""
+                      >
+                        <p
+                          class="mm-box mm-text mm-text--body-md-medium mm-text--ellipsis mm-box--color-text-default mm-box--background-color-transparent"
+                          tabindex="0"
+                        >
+                          OP Mainnet
+                        </p>
+                      </div>
+                    </div>
                   </div>
                 </div>
               </div>
diff --git a/ui/components/multichain/asset-picker-amount/asset-picker-modal/asset-picker-modal-network.test.tsx b/ui/components/multichain/asset-picker-amount/asset-picker-modal/asset-picker-modal-network.test.tsx
index 3fc1e8cf7952..a9246874943e 100644
--- a/ui/components/multichain/asset-picker-amount/asset-picker-modal/asset-picker-modal-network.test.tsx
+++ b/ui/components/multichain/asset-picker-amount/asset-picker-modal/asset-picker-modal-network.test.tsx
@@ -3,8 +3,10 @@ import configureStore from 'redux-mock-store';
 import thunk from 'redux-thunk';
 import { screen, fireEvent } from '@testing-library/react';
 import { RpcEndpointType } from '@metamask/network-controller';
+import { CHAIN_IDS } from '@metamask/transaction-controller';
 import { renderWithProvider } from '../../../../../test/lib/render-helpers';
 import mockState from '../../../../../test/data/mock-send-state.json';
+import { NETWORK_TO_SHORT_NETWORK_NAME_MAP } from '../../../../../shared/constants/bridge';
 import { AssetPickerModalNetwork } from './asset-picker-modal-network';
 
 const mockOnClose = jest.fn();
@@ -26,7 +28,7 @@ describe('AssetPickerModalNetwork', () => {
 
   const networkProps = {
     network: {
-      chainId: '0x1',
+      chainId: CHAIN_IDS.MAINNET,
       nativeCurrency: 'ETH',
       defaultBlockExplorerUrlIndex: 0,
       blockExplorerUrls: ['https://explorerurl'],
@@ -43,7 +45,7 @@ describe('AssetPickerModalNetwork', () => {
     } as any,
     networks: [
       {
-        chainId: '0x1',
+        chainId: CHAIN_IDS.MAINNET,
         nativeCurrency: 'ETH',
         defaultBlockExplorerUrlIndex: 0,
         blockExplorerUrls: ['https://explorerurl'],
@@ -58,7 +60,7 @@ describe('AssetPickerModalNetwork', () => {
         name: 'Network name 3',
       },
       {
-        chainId: '0xa',
+        chainId: CHAIN_IDS.OPTIMISM,
         nativeCurrency: 'ETH',
         defaultBlockExplorerUrlIndex: 0,
         blockExplorerUrls: ['https://explorerurl'],
@@ -110,7 +112,10 @@ describe('AssetPickerModalNetwork', () => {
   });
 
   it('should call onClose and onBack when header buttons are clicked', () => {
-    renderWithProvider(<AssetPickerModalNetwork {...defaultProps} />, store);
+    renderWithProvider(
+      <AssetPickerModalNetwork {...defaultProps} {...networkProps} />,
+      store,
+    );
 
     fireEvent.click(screen.getByLabelText('Close'));
     expect(mockOnClose).toHaveBeenCalledTimes(1);
@@ -125,7 +130,9 @@ describe('AssetPickerModalNetwork', () => {
       store,
     );
 
-    fireEvent.click(screen.getByText('Network name 3'));
+    fireEvent.click(
+      screen.getByText(NETWORK_TO_SHORT_NETWORK_NAME_MAP[CHAIN_IDS.MAINNET]),
+    );
     expect(mockOnBack).toHaveBeenCalledTimes(1);
     expect(mockOnNetworkChange).toHaveBeenCalledTimes(1);
   });
diff --git a/ui/components/multichain/asset-picker-amount/asset-picker-modal/asset-picker-modal-network.tsx b/ui/components/multichain/asset-picker-amount/asset-picker-modal/asset-picker-modal-network.tsx
index f64209543557..7d6963240619 100644
--- a/ui/components/multichain/asset-picker-amount/asset-picker-modal/asset-picker-modal-network.tsx
+++ b/ui/components/multichain/asset-picker-amount/asset-picker-modal/asset-picker-modal-network.tsx
@@ -1,11 +1,19 @@
-import React from 'react';
+import React, { useEffect, useMemo, useState } from 'react';
 
 import { useSelector } from 'react-redux';
-import { NetworkConfiguration } from '@metamask/network-controller';
+import {
+  AddNetworkFields,
+  NetworkConfiguration,
+} from '@metamask/network-controller';
+import { IconName } from '@metamask/snaps-sdk/jsx';
 import {
   Display,
   FlexDirection,
   BlockSize,
+  AlignItems,
+  TextVariant,
+  IconColor,
+  BackgroundColor,
 } from '../../../../helpers/constants/design-system';
 import {
   ModalOverlay,
@@ -13,27 +21,37 @@ import {
   ModalHeader,
   Modal,
   Box,
+  ButtonLink,
+  Checkbox,
+  Text,
+  AvatarNetworkSize,
 } from '../../../component-library';
 import { CHAIN_ID_TO_NETWORK_IMAGE_URL_MAP } from '../../../../../shared/constants/network';
 ///: BEGIN:ONLY_INCLUDE_IF(build-main,build-beta,build-flask)
 import { useI18nContext } from '../../../../hooks/useI18nContext';
 ///: END:ONLY_INCLUDE_IF
 import { NetworkListItem } from '../../network-list-item';
-import {
-  getNetworkConfigurationsByChainId,
-  getProviderConfig,
-} from '../../../../../shared/modules/selectors/networks';
+import { getNetworkConfigurationsByChainId } from '../../../../../shared/modules/selectors/networks';
+import { getCurrentCurrency } from '../../../../selectors';
+import { formatCurrency } from '../../../../helpers/utils/confirm-tx.util';
+import { useMultichainBalances } from '../../../../hooks/useMultichainBalances';
+import { NETWORK_TO_SHORT_NETWORK_NAME_MAP } from '../../../../../shared/constants/bridge';
 
 /**
  * AssetPickerModalNetwork component displays a modal for selecting a network in the asset picker.
  *
  * @param props
  * @param props.isOpen - Determines whether the modal is open or not.
- * @param props.network - The currently selected network, not necessarily the active wallet network.
+ * @param props.network - The currently selected network, not necessarily the active wallet network, and possibly not imported yet.
  * @param props.networks - The list of selectable networks.
  * @param props.onNetworkChange - The callback function to handle network change.
  * @param props.onClose - The callback function to handle modal close.
  * @param props.onBack - The callback function to handle going back in the modal.
+ * @param props.shouldDisableNetwork - The callback function to determine if a network should be disabled.
+ * @param props.header - A custom header for the modal.
+ * @param props.onMultiselectSubmit - The callback function to run when multiple networks are selected.
+ * @param props.selectedChainIds - A list of selected chainIds.
+ * @param props.isMultiselectEnabled - Determines whether selecting multiple networks is enabled.
  * @returns A modal with a list of selectable networks.
  */
 export const AssetPickerModalNetwork = ({
@@ -43,26 +61,95 @@ export const AssetPickerModalNetwork = ({
   network,
   networks,
   onNetworkChange,
+  shouldDisableNetwork,
+  header,
+  isMultiselectEnabled,
+  onMultiselectSubmit,
+  selectedChainIds,
 }: {
   isOpen: boolean;
-  network?: NetworkConfiguration;
-  networks?: NetworkConfiguration[];
-  onNetworkChange: (network: NetworkConfiguration) => void;
+  network?: NetworkConfiguration | AddNetworkFields;
+  networks?: (NetworkConfiguration | AddNetworkFields)[];
+  onNetworkChange: (network: NetworkConfiguration | AddNetworkFields) => void;
+  shouldDisableNetwork?: (
+    network: NetworkConfiguration | AddNetworkFields,
+  ) => boolean;
   onClose: () => void;
   onBack: () => void;
+  header?: JSX.Element | string | null;
+  isMultiselectEnabled?: boolean;
+  selectedChainIds?: string[];
+  onMultiselectSubmit?: (selectedChainIds: string[]) => void;
 }) => {
   ///: BEGIN:ONLY_INCLUDE_IF(build-main,build-beta,build-flask)
   const t = useI18nContext();
   ///: END:ONLY_INCLUDE_IF
 
-  const currentNetwork = useSelector(getProviderConfig);
+  const { balanceByChainId } = useMultichainBalances();
+
   const allNetworks = useSelector(getNetworkConfigurationsByChainId);
+  const currency = useSelector(getCurrentCurrency);
+  // Use the networks prop if it is provided, otherwise use all available networks
+  // Sort the networks by balance in descending order
+  const networksList = useMemo(
+    () =>
+      (networks ?? Object.values(allNetworks) ?? []).sort(
+        (a, b) => balanceByChainId[b.chainId] - balanceByChainId[a.chainId],
+      ),
+    [],
+  );
+
+  // Tracks the selection/checked state of each network
+  // Initialized with the selectedChainIds if provided
+  const [checkedChainIds, setCheckedChainIds] = useState<
+    Record<string, boolean>
+  >(
+    networksList?.reduce(
+      (acc, { chainId }) => ({
+        ...acc,
+        [chainId]: selectedChainIds
+          ? selectedChainIds.includes(chainId)
+          : false,
+      }),
+      {},
+    ) ?? {},
+  );
 
-  const selectedNetwork =
-    network ?? (currentNetwork?.chainId && allNetworks[currentNetwork.chainId]);
+  // Reset checkedChainIds if selectedChainIds change in parent component
+  useEffect(() => {
+    networksList &&
+      setCheckedChainIds(
+        networksList.reduce(
+          (acc, { chainId }) => ({
+            ...acc,
+            [chainId]: selectedChainIds
+              ? selectedChainIds.includes(chainId)
+              : false,
+          }),
+          {},
+        ),
+      );
+  }, [networksList, selectedChainIds]);
 
-  const networksList: NetworkConfiguration[] =
-    networks ?? Object.values(allNetworks) ?? [];
+  const handleToggleNetwork = (chainId: string) => {
+    setCheckedChainIds((prev) => ({
+      ...prev,
+      [chainId]: !prev[chainId],
+    }));
+  };
+
+  // Toggles all networks to be checked or unchecked
+  const handleToggleAllNetworks = () => {
+    setCheckedChainIds(
+      Object.keys(checkedChainIds)?.reduce(
+        (agg, chainId) => ({
+          ...agg,
+          [chainId]: !Object.values(checkedChainIds).every((v) => v),
+        }),
+        {},
+      ),
+    );
+  };
 
   return (
     <Modal
@@ -72,27 +159,88 @@ export const AssetPickerModalNetwork = ({
     >
       <ModalOverlay />
       <ModalContent modalDialogProps={{ padding: 0 }}>
-        <ModalHeader onBack={onBack} onClose={onClose}>
-          {t('bridgeSelectNetwork')}
+        <ModalHeader
+          onBack={onBack}
+          onClose={isMultiselectEnabled ? undefined : onClose}
+          endAccessory={
+            isMultiselectEnabled && selectedChainIds ? (
+              <ButtonLink
+                variant={TextVariant.bodyMdMedium}
+                disabled={Object.values(checkedChainIds).every((v) => !v)}
+                onClick={() => {
+                  onMultiselectSubmit?.(
+                    Object.keys(checkedChainIds).filter(
+                      (chainId) => checkedChainIds[chainId],
+                    ),
+                  );
+                  onBack();
+                }}
+              >
+                {t('apply')}
+              </ButtonLink>
+            ) : undefined
+          }
+        >
+          {header ?? t('bridgeSelectNetwork')}
         </ModalHeader>
-        <Box className="multichain-asset-picker__network-list">
+        {isMultiselectEnabled && (
+          <Box display={Display.Flex} padding={4}>
+            <Checkbox
+              isIndeterminate={Object.values(checkedChainIds).every((v) => v)}
+              iconProps={{
+                name: Object.values(checkedChainIds).some((v) => !v)
+                  ? IconName.MinusBold
+                  : IconName.Add,
+                color: IconColor.primaryInverse,
+                backgroundColor: BackgroundColor.primaryDefault,
+              }}
+              isChecked
+              onChange={() => {
+                handleToggleAllNetworks();
+              }}
+            />
+            <ButtonLink
+              variant={TextVariant.bodyMdMedium}
+              onClick={() => {
+                handleToggleAllNetworks();
+              }}
+              style={{
+                alignSelf: AlignItems.flexStart,
+                paddingInline: 16,
+              }}
+            >
+              {t('selectAll')}
+            </ButtonLink>
+          </Box>
+        )}
+        <Box
+          className="multichain-asset-picker__network-list"
+          display={Display.Flex}
+        >
           <Box
-            style={{
-              gridColumnStart: 1,
-              gridColumnEnd: 3,
-            }}
             display={Display.Flex}
             flexDirection={FlexDirection.Column}
-            height={BlockSize.Full}
+            width={BlockSize.Full}
           >
             {networksList.map((networkConfig) => {
               const { name, chainId } = networkConfig;
               return (
                 <NetworkListItem
                   key={chainId}
-                  name={name}
-                  selected={selectedNetwork?.chainId === chainId}
+                  name={
+                    NETWORK_TO_SHORT_NETWORK_NAME_MAP[
+                      chainId as keyof typeof NETWORK_TO_SHORT_NETWORK_NAME_MAP
+                    ] ?? name
+                  }
+                  selected={
+                    // If multiselect is enabled, the checkbox indicates selection
+                    isMultiselectEnabled ? false : network?.chainId === chainId
+                  }
                   onClick={() => {
+                    if (isMultiselectEnabled) {
+                      handleToggleNetwork(chainId);
+                      return;
+                    }
                     onNetworkChange(networkConfig);
                     onBack();
                   }}
@@ -101,7 +249,29 @@ export const AssetPickerModalNetwork = ({
                       chainId as keyof typeof CHAIN_ID_TO_NETWORK_IMAGE_URL_MAP
                     ]
                   }
+                  iconSize={AvatarNetworkSize.Sm}
                   focus={false}
+                  disabled={shouldDisableNetwork?.(networkConfig)}
+                  startAccessory={
+                    isMultiselectEnabled ? (
+                      <Checkbox
+                        isChecked={checkedChainIds[chainId]}
+                        name={chainId}
+                      />
+                    ) : undefined
+                  }
+                  showEndAccessory={isMultiselectEnabled}
+                  variant={TextVariant.bodyMdMedium}
+                  endAccessory={
+                    isMultiselectEnabled ? (
+                      <Text variant={TextVariant.bodyMdMedium}>
+                        {formatCurrency(
+                          balanceByChainId[chainId]?.toString(),
+                          currency,
+                        )}
+                      </Text>
+                    ) : undefined
+                  }
                 />
               );
             })}
diff --git a/ui/components/multichain/asset-picker-amount/asset-picker-modal/asset-picker-modal-search.tsx b/ui/components/multichain/asset-picker-amount/asset-picker-modal/asset-picker-modal-search.tsx
index c7c0d699793e..9299f508e1d8 100644
--- a/ui/components/multichain/asset-picker-amount/asset-picker-modal/asset-picker-modal-search.tsx
+++ b/ui/components/multichain/asset-picker-amount/asset-picker-modal/asset-picker-modal-search.tsx
@@ -19,6 +19,8 @@ import { useI18nContext } from '../../../../hooks/useI18nContext';
  * @param props.onChange - The function to handle search query changes.
  * @param props.isNFTSearch - Indicates if the search is for NFTs.
  * @param props.props - Additional props for the containing Box component.
+ * @param props.placeholder - A custom placeholder for the search input.
+ * @param props.autoFocus
  * @returns The rendered search component.
  */
 export const Search = ({
@@ -26,11 +28,15 @@ export const Search = ({
   onChange,
   isNFTSearch = false,
   props,
+  placeholder,
+  autoFocus = true,
 }: {
   searchQuery: string;
   onChange: (value: string) => void;
   isNFTSearch?: boolean;
   props?: React.ComponentProps<typeof Box>;
+  placeholder?: JSX.Element | string | null;
+  autoFocus?: boolean;
 }) => {
   const t = useI18nContext();
 
@@ -38,21 +44,26 @@ export const Search = ({
     <Box padding={4} {...props}>
       <TextFieldSearch
         borderRadius={BorderRadius.LG}
-        placeholder={t(isNFTSearch ? 'searchNfts' : 'searchTokens')}
+        placeholder={
+          placeholder ??
+          t(isNFTSearch ? 'searchNfts' : 'searchTokensByNameOrAddress')
+        }
         value={searchQuery}
         onChange={(e) => onChange(e.target.value)}
         error={false}
-        autoFocus
+        autoFocus={autoFocus}
         autoComplete={false}
         width={BlockSize.Full}
         clearButtonOnClick={() => onChange('')}
         clearButtonProps={{
           size: ButtonIconSize.Sm,
         }}
+        style={{ paddingInline: 8 }}
         showClearButton
         className="asset-picker-modal__search-list"
         inputProps={{
           'data-testid': 'asset-picker-modal-search-input',
+          marginRight: 0,
         }}
         endAccessory={null}
         size={TextFieldSearchSize.Lg}
diff --git a/ui/components/multichain/asset-picker-amount/asset-picker-modal/asset-picker-modal.test.tsx b/ui/components/multichain/asset-picker-amount/asset-picker-modal/asset-picker-modal.test.tsx
index fc4796073c74..724cba8a1ec6 100644
--- a/ui/components/multichain/asset-picker-amount/asset-picker-modal/asset-picker-modal.test.tsx
+++ b/ui/components/multichain/asset-picker-amount/asset-picker-modal/asset-picker-modal.test.tsx
@@ -29,7 +29,10 @@ import { getTopAssets } from '../../../../ducks/swaps/swaps';
 import { getRenderableTokenData } from '../../../../hooks/useTokensToSearch';
 import * as actions from '../../../../store/actions';
 import { getSwapsBlockedTokens } from '../../../../ducks/send';
-import { getCurrentChainId } from '../../../../../shared/modules/selectors/networks';
+import {
+  getCurrentChainId,
+  getNetworkConfigurationsByChainId,
+} from '../../../../../shared/modules/selectors/networks';
 import { AssetPickerModal } from './asset-picker-modal';
 import AssetList from './AssetList';
 import { ERC20Asset } from './types';
@@ -57,6 +60,11 @@ jest.mock('../../../../hooks/useTokensToSearch', () => ({
   getRenderableTokenData: jest.fn(),
 }));
 
+const mockUseMultichainBalances = jest.fn();
+jest.mock('../../../../hooks/useMultichainBalances', () => ({
+  useMultichainBalances: () => mockUseMultichainBalances(),
+}));
+
 describe('AssetPickerModal', () => {
   const useSelectorMock = useSelector as jest.Mock;
   const useI18nContextMock = useI18nContext as jest.Mock;
@@ -88,8 +96,11 @@ describe('AssetPickerModal', () => {
 
   beforeEach(() => {
     useSelectorMock.mockImplementation((selector) => {
+      if (selector === getNetworkConfigurationsByChainId) {
+        return { '0x1': { chainId: '0x1' } };
+      }
       if (selector === getCurrentChainId) {
-        return '1';
+        return '0x1';
       }
       if (selector === getCurrentCurrency) {
         return 'USD';
@@ -151,6 +162,7 @@ describe('AssetPickerModal', () => {
       tokensWithBalances: [],
     });
     (getRenderableTokenData as jest.Mock).mockReturnValue({});
+    mockUseMultichainBalances.mockReturnValue({});
   });
 
   afterEach(() => {
@@ -162,7 +174,9 @@ describe('AssetPickerModal', () => {
     renderWithProvider(<AssetPickerModal {...defaultProps} />, store);
 
     expect(screen.getByTestId('asset-picker-modal')).toBeInTheDocument();
-    expect(screen.getByPlaceholderText('searchTokens')).toBeInTheDocument();
+    expect(
+      screen.getByPlaceholderText('searchTokensByNameOrAddress'),
+    ).toBeInTheDocument();
   });
 
   it('calls onClose when modal is closed', () => {
@@ -195,17 +209,23 @@ describe('AssetPickerModal', () => {
   it('filters tokens based on search query', () => {
     renderWithProvider(<AssetPickerModal {...defaultProps} />, store);
 
-    fireEvent.change(screen.getByPlaceholderText('searchTokens'), {
-      target: { value: 'TO' },
-    });
+    fireEvent.change(
+      screen.getByPlaceholderText('searchTokensByNameOrAddress'),
+      {
+        target: { value: 'TO' },
+      },
+    );
 
     expect(
       (AssetList as jest.Mock).mock.calls.slice(-1)[0][0].tokenList.length,
     ).toBe(2);
 
-    fireEvent.change(screen.getByPlaceholderText('searchTokens'), {
-      target: { value: 'UNAVAILABLE TOKEN' },
-    });
+    fireEvent.change(
+      screen.getByPlaceholderText('searchTokensByNameOrAddress'),
+      {
+        target: { value: 'UNAVAILABLE TOKEN' },
+      },
+    );
 
     expect((AssetList as jest.Mock).mock.calls[1][0]).not.toEqual(
       expect.objectContaining({
@@ -245,7 +265,9 @@ describe('AssetPickerModal', () => {
       store,
     );
     const modalTitle = getByText('sendSelectReceiveAsset');
-    const searchPlaceholder = getByPlaceholderText('searchTokens');
+    const searchPlaceholder = getByPlaceholderText(
+      'searchTokensByNameOrAddress',
+    );
 
     expect(modalTitle).toBeInTheDocument();
     expect(searchPlaceholder).toBeInTheDocument();
@@ -260,17 +282,23 @@ describe('AssetPickerModal', () => {
       store,
     );
 
-    fireEvent.change(screen.getByPlaceholderText('searchTokens'), {
-      target: { value: 'TO' },
-    });
+    fireEvent.change(
+      screen.getByPlaceholderText('searchTokensByNameOrAddress'),
+      {
+        target: { value: 'TO' },
+      },
+    );
 
     expect(
       (AssetList as jest.Mock).mock.calls.slice(-1)[0][0].tokenList.length,
     ).toBe(2);
 
-    fireEvent.change(screen.getByPlaceholderText('searchTokens'), {
-      target: { value: 'TOKEN1' },
-    });
+    fireEvent.change(
+      screen.getByPlaceholderText('searchTokensByNameOrAddress'),
+      {
+        target: { value: 'TOKEN1' },
+      },
+    );
 
     expect((AssetList as jest.Mock).mock.calls[1][0]).not.toEqual(
       expect.objectContaining({
@@ -322,7 +350,7 @@ describe('AssetPickerModal', () => {
     expect(modalTitle).toBeInTheDocument();
 
     expect(getAllByRole('img')).toHaveLength(2);
-    const modalContent = getByText('Network name');
+    const modalContent = getByText('Ethereum Mainnet');
     expect(modalContent).toBeInTheDocument();
   });
 
diff --git a/ui/components/multichain/asset-picker-amount/asset-picker-modal/asset-picker-modal.tsx b/ui/components/multichain/asset-picker-amount/asset-picker-modal/asset-picker-modal.tsx
index 48c56c5106ec..d0b9b32988df 100644
--- a/ui/components/multichain/asset-picker-amount/asset-picker-modal/asset-picker-modal.tsx
+++ b/ui/components/multichain/asset-picker-amount/asset-picker-modal/asset-picker-modal.tsx
@@ -8,6 +8,7 @@ import {
   TokenListToken,
 } from '@metamask/assets-controllers';
 import { Hex } from '@metamask/utils';
+import { zeroAddress } from 'ethereumjs-util';
 import {
   Modal,
   ModalContent,
@@ -29,7 +30,10 @@ import {
 import { useI18nContext } from '../../../../hooks/useI18nContext';
 
 import { AssetType } from '../../../../../shared/constants/transaction';
-import { getCurrentChainId } from '../../../../../shared/modules/selectors/networks';
+import {
+  getCurrentChainId,
+  getNetworkConfigurationsByChainId,
+} from '../../../../../shared/modules/selectors/networks';
 import {
   getAllTokens,
   getCurrentCurrency,
@@ -49,7 +53,13 @@ import { getTopAssets } from '../../../../ducks/swaps/swaps';
 import { getRenderableTokenData } from '../../../../hooks/useTokensToSearch';
 import { getSwapsBlockedTokens } from '../../../../ducks/send';
 import { isEqualCaseInsensitive } from '../../../../../shared/modules/string-utils';
-import { CHAIN_ID_TO_NETWORK_IMAGE_URL_MAP } from '../../../../../shared/constants/network';
+import {
+  CHAIN_ID_TO_NETWORK_IMAGE_URL_MAP,
+  NETWORK_TO_NAME_MAP,
+} from '../../../../../shared/constants/network';
+import { useMultichainBalances } from '../../../../hooks/useMultichainBalances';
+import { AvatarType } from '../../avatar-group/avatar-group.types';
+import { NETWORK_TO_SHORT_NETWORK_NAME_MAP } from '../../../../../shared/constants/bridge';
 import {
   ERC20Asset,
   NativeAsset,
@@ -68,6 +78,7 @@ type AssetPickerModalProps = {
   isOpen: boolean;
   onClose: () => void;
   action?: 'send' | 'receive';
+  onBack?: () => void;
   asset?: ERC20Asset | NativeAsset | Pick<NFT, 'type' | 'tokenId' | 'image'>;
   onAssetChange: (
     asset: AssetWithDisplayData<ERC20Asset> | AssetWithDisplayData<NativeAsset>,
@@ -82,15 +93,23 @@ type AssetPickerModalProps = {
    * by a custom order.
    */
   customTokenListGenerator?: (
-    filterPredicate: (symbol: string, address?: string) => boolean,
+    filterPredicate: (
+      symbol: string,
+      address?: null | string,
+      chainId?: string,
+    ) => boolean,
   ) => Generator<
     AssetWithDisplayData<NativeAsset> | AssetWithDisplayData<ERC20Asset>
   >;
+  isTokenListLoading?: boolean;
 } & Pick<
   React.ComponentProps<typeof AssetPickerModalTabs>,
   'visibleTabs' | 'defaultActiveTabKey'
 > &
-  Pick<React.ComponentProps<typeof AssetPickerModalNetwork>, 'network'>;
+  Pick<
+    React.ComponentProps<typeof AssetPickerModalNetwork>,
+    'network' | 'networks' | 'isMultiselectEnabled' | 'selectedChainIds'
+  >;
 
 const MAX_UNOWNED_TOKENS_RENDERED = 30;
 
@@ -98,13 +117,18 @@ export function AssetPickerModal({
   header,
   isOpen,
   onClose,
+  onBack,
   asset,
   onAssetChange,
   sendingAsset,
   network,
+  networks,
   action,
   onNetworkPickerClick,
   customTokenListGenerator,
+  isTokenListLoading = false,
+  isMultiselectEnabled,
+  selectedChainIds,
   ...tabProps
 }: AssetPickerModalProps) {
   const t = useI18nContext();
@@ -118,7 +142,13 @@ export function AssetPickerModal({
 
   const handleAssetChange = useCallback(onAssetChange, [onAssetChange]);
 
-  const chainId = useSelector(getCurrentChainId);
+  const currentChainId = useSelector(getCurrentChainId);
+  const allNetworks = useSelector(getNetworkConfigurationsByChainId);
+  const selectedNetwork =
+    network ?? (currentChainId && allNetworks[currentChainId]);
+  const allNetworksToUse = networks ?? Object.values(allNetworks ?? {});
+  // This indicates whether tokens in the wallet's active network are displayed
+  const isSelectedNetworkActive = selectedNetwork.chainId === currentChainId;
 
   const nativeCurrencyImage = useSelector(getNativeCurrencyImage);
   const nativeCurrency = useSelector(getNativeCurrency);
@@ -136,7 +166,7 @@ export function AssetPickerModal({
   const detectedTokens: Record<Hex, Record<string, Token[]>> = useSelector(
     getAllTokens,
   );
-  const tokens = detectedTokens?.[chainId]?.[selectedAddress] ?? [];
+  const tokens = detectedTokens?.[currentChainId]?.[selectedAddress] ?? [];
 
   const { tokensWithBalances }: { tokensWithBalances: TokenWithBalance[] } =
     useTokenTracker({
@@ -145,6 +175,9 @@ export function AssetPickerModal({
       hideZeroBalanceTokens: Boolean(shouldHideZeroBalanceTokens),
     });
 
+  const { assetsWithBalance: multichainTokensWithBalance } =
+    useMultichainBalances();
+
   // Swaps token list
   const tokenList = useSelector(getTokenList) as TokenListMap;
   const topTokens = useSelector(getTopAssets, isEqual);
@@ -176,10 +209,15 @@ export function AssetPickerModal({
 
   const tokenListGenerator = useCallback(
     function* (
-      shouldAddToken: (symbol: string, address?: null | string) => boolean,
+      shouldAddToken: (
+        symbol: string,
+        address?: null | string,
+        tokenChainId?: string,
+      ) => boolean,
     ): Generator<
       | AssetWithDisplayData<NativeAsset>
       | ((Token | TokenListToken) & {
+          chainId: string;
           balance?: string;
           string?: string;
         })
@@ -191,42 +229,61 @@ export function AssetPickerModal({
         image: nativeCurrencyImage,
         balance: balanceValue,
         string: undefined,
+        chainId: currentChainId,
         type: AssetType.native,
       };
 
-      if (shouldAddToken(nativeToken.symbol, nativeToken.address)) {
+      if (
+        shouldAddToken(
+          nativeToken.symbol,
+          nativeToken.address,
+          nativeToken.chainId,
+        )
+      ) {
         yield nativeToken;
       }
 
       const blockedTokens = [];
 
+      // Yield multichain tokens with balances
+      if (isMultiselectEnabled) {
+        for (const token of multichainTokensWithBalance) {
+          if (shouldAddToken(token.symbol, token.address, token.chainId)) {
+            yield token;
+          }
+        }
+      }
+
       for (const token of memoizedUsersTokens) {
-        if (shouldAddToken(token.symbol, token.address)) {
-          yield token;
+        if (shouldAddToken(token.symbol, token.address, currentChainId)) {
+          yield { ...token, chainId: currentChainId };
         }
       }
 
       // topTokens should already be sorted by popularity
       for (const address of Object.keys(topTokens)) {
         const token = tokenList?.[address];
-        if (token && shouldAddToken(token.symbol, token.address)) {
+        if (
+          token &&
+          shouldAddToken(token.symbol, token.address, currentChainId)
+        ) {
           if (getIsDisabled(token)) {
             blockedTokens.push(token);
             continue;
           } else {
-            yield token;
+            yield { ...token, chainId: currentChainId };
           }
         }
       }
 
       for (const token of Object.values(tokenList)) {
-        if (shouldAddToken(token.symbol, token.address)) {
-          yield token;
+        if (shouldAddToken(token.symbol, token.address, currentChainId)) {
+          yield { ...token, chainId: currentChainId };
         }
       }
 
       for (const token of blockedTokens) {
-        yield token;
+        yield { ...token, chainId: currentChainId };
       }
     },
     [
@@ -237,6 +294,8 @@ export function AssetPickerModal({
       topTokens,
       tokenList,
       getIsDisabled,
+      isMultiselectEnabled,
+      multichainTokensWithBalance,
     ],
   );
 
@@ -245,16 +304,33 @@ export function AssetPickerModal({
       | AssetWithDisplayData<ERC20Asset>
       | AssetWithDisplayData<NativeAsset>
     )[] = [];
-    // undefined would be the native token address
+    // List of token identifiers formatted like `chainId:address`
     const filteredTokensAddresses = new Set<string | undefined>();
+    const getTokenKey = (address?: string | null, tokenChainId?: string) =>
+      `${address?.toLowerCase() ?? zeroAddress()}:${
+        tokenChainId ?? currentChainId
+      }`;
 
     // Default filter predicate for whether a token should be included in displayed list
-    const shouldAddToken = (symbol: string, address?: string | null) => {
-      const trimmedSearchQuery = searchQuery.trim();
-      return (
-        (!trimmedSearchQuery ||
-          symbol?.toLowerCase().includes(trimmedSearchQuery.toLowerCase())) &&
-        !filteredTokensAddresses.has(address?.toLowerCase())
+    const shouldAddToken = (
+      symbol: string,
+      address?: string | null,
+      tokenChainId?: string,
+    ) => {
+      const trimmedSearchQuery = searchQuery.trim().toLowerCase();
+      const isMatchedBySearchQuery = Boolean(
+        !trimmedSearchQuery ||
+          symbol?.toLowerCase().includes(trimmedSearchQuery) ||
+          address?.toLowerCase().includes(trimmedSearchQuery),
+      );
+      const isTokenInSelectedChain = isMultiselectEnabled
+        ? tokenChainId && selectedChainIds?.includes(tokenChainId)
+        : selectedNetwork?.chainId === tokenChainId;
+
+      return Boolean(
+        isTokenInSelectedChain &&
+          isMatchedBySearchQuery &&
+          !filteredTokensAddresses.has(getTokenKey(address, tokenChainId)),
       );
     };
 
@@ -267,7 +343,7 @@ export function AssetPickerModal({
         continue;
       }
 
-      filteredTokensAddresses.add(token.address?.toLowerCase());
+      filteredTokensAddresses.add(getTokenKey(token.address, token.chainId));
       filteredTokens.push(
         customTokenListGenerator
           ? token
@@ -282,7 +358,7 @@ export function AssetPickerModal({
               tokenConversionRates,
               conversionRate,
               currentCurrency,
-              chainId,
+              token.chainId,
               tokenList,
             ),
       );
@@ -298,11 +374,43 @@ export function AssetPickerModal({
     tokenConversionRates,
     conversionRate,
     currentCurrency,
-    chainId,
+    currentChainId,
     tokenListGenerator,
     customTokenListGenerator,
+    isMultiselectEnabled,
+    selectedChainIds,
+    isMultiselectEnabled,
+    selectedNetwork,
   ]);
 
+  const getNetworkImageUrl = (networkChainId: string) =>
+    CHAIN_ID_TO_NETWORK_IMAGE_URL_MAP[
+      networkChainId as keyof typeof CHAIN_ID_TO_NETWORK_IMAGE_URL_MAP
+    ];
+
+  const getNetworkPickerLabel = () => {
+    if (!isMultiselectEnabled) {
+      return (
+        (selectedNetwork?.chainId &&
+          NETWORK_TO_NAME_MAP[
+            selectedNetwork.chainId as keyof typeof NETWORK_TO_NAME_MAP
+          ]) ??
+        selectedNetwork?.name ??
+        t('bridgeSelectNetwork')
+      );
+    }
+    switch (selectedChainIds?.length) {
+      case allNetworksToUse.length:
+        return t('allNetworks');
+      case 1:
+        return t('singleNetwork');
+      case 0:
+        return t('bridgeSelectNetwork');
+      default:
+        return t('someNetworks', [selectedChainIds?.length]);
+    }
+  };
+
   return (
     <Modal
       className="asset-picker-modal"
@@ -312,7 +420,7 @@ export function AssetPickerModal({
     >
       <ModalOverlay />
       <ModalContent modalDialogProps={{ padding: 0 }}>
-        <ModalHeader onClose={onClose}>
+        <ModalHeader onClose={onClose} onBack={asset ? undefined : onBack}>
           <Text variant={TextVariant.headingSm} textAlign={TextAlign.Center}>
             {header}
           </Text>
@@ -337,12 +445,26 @@ export function AssetPickerModal({
         {onNetworkPickerClick && (
           <Box className="network-picker">
             <PickerNetwork
-              label={network?.name ?? 'Select network'}
+              label={getNetworkPickerLabel()}
               src={
-                network?.chainId &&
-                CHAIN_ID_TO_NETWORK_IMAGE_URL_MAP[
-                  network.chainId as keyof typeof CHAIN_ID_TO_NETWORK_IMAGE_URL_MAP
-                ]
+                selectedNetwork?.chainId
+                  ? getNetworkImageUrl(selectedNetwork.chainId)
+                  : undefined
+              }
+              avatarGroupProps={
+                isMultiselectEnabled && selectedChainIds
+                  ? {
+                      limit: 2,
+                      members: selectedChainIds.map((c) => ({
+                        avatarValue: getNetworkImageUrl(c),
+                        symbol:
+                          NETWORK_TO_SHORT_NETWORK_NAME_MAP[
+                            c as keyof typeof NETWORK_TO_SHORT_NETWORK_NAME_MAP
+                          ],
+                      })),
+                      avatarType: AvatarType.NETWORK,
+                    }
+                  : undefined
               }
               onClick={onNetworkPickerClick}
               data-testid="multichain-asset-picker__network"
@@ -355,12 +477,23 @@ export function AssetPickerModal({
               <Search
                 searchQuery={searchQuery}
                 onChange={(value) => setSearchQuery(value)}
+                autoFocus={!isMultiselectEnabled}
               />
               <AssetList
+                network={network}
                 handleAssetChange={handleAssetChange}
                 asset={asset?.type === AssetType.NFT ? undefined : asset}
                 tokenList={filteredTokenList}
                 isTokenDisabled={getIsDisabled}
+                isTokenListLoading={isTokenListLoading}
+                assetItemProps={{
+                  isTitleNetworkName:
+                    // For src cross-chain swaps assets
+                    isMultiselectEnabled,
+                  isTitleHidden:
+                    // For dest cross-chain swaps assets
+                    !isSelectedNetworkActive,
+                }}
               />
             </React.Fragment>
             <AssetPickerModalNftTab
diff --git a/ui/components/multichain/asset-picker-amount/asset-picker-modal/index.scss b/ui/components/multichain/asset-picker-amount/asset-picker-modal/index.scss
index be1e27dc1416..3d493c371a34 100644
--- a/ui/components/multichain/asset-picker-amount/asset-picker-modal/index.scss
+++ b/ui/components/multichain/asset-picker-amount/asset-picker-modal/index.scss
@@ -1,10 +1,12 @@
 @use "design-system";
 
 .multichain-asset-picker__network-modal {
-  overflow-y: auto;
-
   .mm-modal-content__dialog {
-    overflow-y: scroll;
+    overflow: hidden;
+  }
+
+  .multichain-asset-picker__network-list {
+    overflow-y: auto;
   }
 }
 
@@ -30,6 +32,7 @@
     cursor: pointer;
     overflow-y: auto;
     max-height: 50vh;
+    white-space: nowrap;
 
     &:not(.multichain-asset-picker-list-item--selected) {
       &:hover,
@@ -66,9 +69,10 @@
 
   .network-picker {
     display: flex;
-    justify-content: center;
+    justify-content: flex-start;
     align-items: center;
     padding-top: 4px;
+    padding-left: 16px;
 
     button: {
       background: var(--color-background-alternative);
diff --git a/ui/components/multichain/asset-picker-amount/asset-picker-modal/types.ts b/ui/components/multichain/asset-picker-amount/asset-picker-modal/types.ts
index 2e54b918b124..ca8ab5bceb39 100644
--- a/ui/components/multichain/asset-picker-amount/asset-picker-modal/types.ts
+++ b/ui/components/multichain/asset-picker-amount/asset-picker-modal/types.ts
@@ -1,5 +1,4 @@
 import { Token, TokenListToken } from '@metamask/assets-controllers';
-import { Hex } from '@metamask/utils';
 import type {
   AssetType,
   TokenStandard,
@@ -9,6 +8,7 @@ import {
   CHAIN_ID_TO_CURRENCY_SYMBOL_MAP,
   CHAIN_ID_TOKEN_IMAGE_MAP,
 } from '../../../../../shared/constants/network';
+import { TokenWithFiatAmount } from '../../../app/assets/token-list/token-list';
 
 export type NFT = {
   address: string;
@@ -29,28 +29,32 @@ export type NFT = {
  * Since token interfaces can vary between experiences (i.e. send vs bridge,
  * these fields need to be set before passing an asset to the AssetPicker
  */
-export type ERC20Asset = Pick<TokenListToken, 'address' | 'symbol'> & {
+export type ERC20Asset = {
   type: AssetType.token;
   image: string;
-};
+} & Pick<TokenListToken, 'address' | 'symbol'> &
+  Pick<TokenWithFiatAmount, 'chainId'>;
+
 export type NativeAsset = {
   type: AssetType.native;
-  address?: null;
+  address?: null | string;
   image: typeof CHAIN_ID_TOKEN_IMAGE_MAP extends Record<string, infer V>
     ? V
     : never; // only allow wallet's hardcoded images
   symbol: typeof CHAIN_ID_TO_CURRENCY_SYMBOL_MAP extends Record<string, infer V>
     ? V
     : never; // only allow wallet's hardcoded symbols
-};
+} & Pick<TokenWithFiatAmount, 'chainId'>;
 
 /**
  * ERC20Asset or NativeAsset, plus additional fields for display purposes in the Asset component
  */
 export type AssetWithDisplayData<T extends ERC20Asset | NativeAsset> = T & {
-  balance: T['type'] extends AssetType.token ? string : Hex; // raw balance
+  balance: string; // raw balance
   string: string | undefined; // normalized balance as a stringified number
-} & Pick<TokenListToken, 'decimals'>;
+} & Pick<TokenListToken, 'decimals'> & {
+    tokenFiatAmount?: TokenWithFiatAmount['tokenFiatAmount'];
+  };
 
 export type Collection = {
   collectionName: string;
diff --git a/ui/components/multichain/asset-picker-amount/asset-picker/asset-picker.stories.tsx b/ui/components/multichain/asset-picker-amount/asset-picker/asset-picker.stories.tsx
index 0572e2d237c2..e25780561ccb 100644
--- a/ui/components/multichain/asset-picker-amount/asset-picker/asset-picker.stories.tsx
+++ b/ui/components/multichain/asset-picker-amount/asset-picker/asset-picker.stories.tsx
@@ -25,6 +25,7 @@ const props = {
     address: '0xaddress1',
     image: CHAIN_ID_TOKEN_IMAGE_MAP['0x1'],
     type: AssetType.token,
+    chainId: '0x1',
   } as ERC20Asset,
 };
 export const DefaultStory = () => {
@@ -65,6 +66,7 @@ export const SendDestStory = () => {
         symbol: 'ETH',
         image: CHAIN_ID_TOKEN_IMAGE_MAP['0x1'],
         type: AssetType.native,
+        chainId: '0x1',
       }}
       sendingAsset={{
         image: CHAIN_ID_TOKEN_IMAGE_MAP['0x1'],
@@ -93,8 +95,70 @@ SendDestStory.decorators = [
 
 SendDestStory.storyName = 'With Sending Asset';
 
-export const NetworksStory = ({ isOpen }: { isOpen: boolean }) => {
-  const t = useI18nContext();
+const networkProps = {
+  network: {
+    chainId: '0x1',
+    name: 'Mainnet',
+    blockExplorerUrls: [],
+    defaultRpcEndpointIndex: 0,
+    rpcEndpoints: [
+      {
+        networkClientId: 'test1',
+        url: 'https://mainnet.infura.io/v3/',
+        type: RpcEndpointType.Custom,
+      },
+    ],
+    nativeCurrency: 'ETH',
+  },
+  networks: [
+    {
+      chainId: '0x1',
+      name: 'Mainnet Name That Is Very Long',
+      blockExplorerUrls: [],
+      defaultRpcEndpointIndex: 0,
+      rpcEndpoints: [
+        {
+          networkClientId: 'test1',
+          url: 'https://mainnet.infura.io/v3/',
+          type: RpcEndpointType.Custom,
+        },
+      ],
+      nativeCurrency: 'ETH',
+    },
+    {
+      chainId: '0x10',
+      name: 'Optimism',
+      blockExplorerUrls: [],
+      defaultRpcEndpointIndex: 0,
+      rpcEndpoints: [
+        {
+          networkClientId: 'test2',
+          url: 'https://optimism.infura.io/v3/',
+          type: RpcEndpointType.Custom,
+        },
+      ],
+      nativeCurrency: 'ETH',
+    },
+    {
+      chainId: CHAIN_IDS.LINEA_MAINNET,
+      name: 'Linea Mainnet Test Name',
+      blockExplorerUrls: [],
+      defaultRpcEndpointIndex: 0,
+      rpcEndpoints: [
+        {
+          networkClientId: 'test3',
+          url: 'https://linea.infura.io/v3/',
+          type: RpcEndpointType.Custom,
+        },
+      ],
+      nativeCurrency: 'ETH',
+    },
+  ],
+  shouldDisableNetwork: (networkConfig) =>
+    networkConfig.chainId === CHAIN_IDS.LINEA_MAINNET,
+  onNetworkChange: () => ({}),
+};
+export const NetworksStory = () => {
   return (
     <AssetPicker
       header={'Bridge from'}
@@ -104,54 +168,9 @@ export const NetworksStory = ({ isOpen }: { isOpen: boolean }) => {
         symbol: 'ETH',
         image: CHAIN_ID_TOKEN_IMAGE_MAP['0x1'],
         type: AssetType.native,
+        chainId: '0x1',
       }}
-      networkProps={{
-        network: {
-          chainId: '0x1',
-          name: 'Mainnet',
-          blockExplorerUrls: [],
-          defaultRpcEndpointIndex: 0,
-          rpcEndpoints: [
-            {
-              networkClientId: 'test1',
-              url: 'https://mainnet.infura.io/v3/',
-              type: RpcEndpointType.Custom,
-            },
-          ],
-          nativeCurrency: 'ETH',
-        },
-        networks: [
-          {
-            chainId: '0x1',
-            name: 'Mainnet',
-            blockExplorerUrls: [],
-            defaultRpcEndpointIndex: 0,
-            rpcEndpoints: [
-              {
-                networkClientId: 'test1',
-                url: 'https://mainnet.infura.io/v3/',
-                type: RpcEndpointType.Custom,
-              },
-            ],
-            nativeCurrency: 'ETH',
-          },
-          {
-            chainId: '0x10',
-            name: 'Optimism',
-            blockExplorerUrls: [],
-            defaultRpcEndpointIndex: 0,
-            rpcEndpoints: [
-              {
-                networkClientId: 'test2',
-                url: 'https://optimism.infura.io/v3/',
-                type: RpcEndpointType.Custom,
-              },
-            ],
-            nativeCurrency: 'ETH',
-          },
-        ],
-        onNetworkChange: () => ({}),
-      }}
+      networkProps={networkProps as never}
       visibleTabs={[TabName.TOKENS]}
     />
   );
@@ -163,4 +182,29 @@ NetworksStory.decorators = [
 
 NetworksStory.storyName = 'With Network Picker';
 
+export const MultichainNetworksStory = () => {
+  return (
+    <AssetPicker
+      header={'Bridge from'}
+      onAssetChange={() => ({})}
+      {...props}
+      asset={{
+        symbol: 'ETH',
+        image: CHAIN_ID_TOKEN_IMAGE_MAP['0x1'],
+        type: AssetType.native,
+        chainId: '0x1',
+      }}
+      isMultiselectEnabled={true}
+      networkProps={networkProps as never}
+      visibleTabs={[TabName.TOKENS]}
+    />
+  );
+};
+
+MultichainNetworksStory.decorators = [
+  (story) => <Provider store={store()}>{story()}</Provider>,
+];
+
+MultichainNetworksStory.storyName = 'With Multichain Network Picker';
+
 export default storybook;
diff --git a/ui/components/multichain/asset-picker-amount/asset-picker/asset-picker.tsx b/ui/components/multichain/asset-picker-amount/asset-picker/asset-picker.tsx
index cf87ee3ba7f1..1388a8bf5b92 100644
--- a/ui/components/multichain/asset-picker-amount/asset-picker/asset-picker.tsx
+++ b/ui/components/multichain/asset-picker-amount/asset-picker/asset-picker.tsx
@@ -1,4 +1,4 @@
-import React, { useState } from 'react';
+import React, { useEffect, useState } from 'react';
 import { useSelector } from 'react-redux';
 import {
   AvatarTokenSize,
@@ -24,8 +24,10 @@ import {
 } from '../../../../helpers/constants/design-system';
 import { AssetType } from '../../../../../shared/constants/transaction';
 import { AssetPickerModal } from '../asset-picker-modal/asset-picker-modal';
-import { getNetworkConfigurationsByChainId } from '../../../../../shared/modules/selectors/networks';
-import { getCurrentNetwork } from '../../../../selectors';
+import {
+  getCurrentChainId,
+  getNetworkConfigurationsByChainId,
+} from '../../../../../shared/modules/selectors/networks';
 import Tooltip from '../../../ui/tooltip';
 import { LARGE_SYMBOL_LENGTH } from '../constants';
 ///: BEGIN:ONLY_INCLUDE_IF(build-main,build-beta,build-flask)
@@ -45,10 +47,15 @@ import {
   GOERLI_DISPLAY_NAME,
   SEPOLIA_DISPLAY_NAME,
 } from '../../../../../shared/constants/network';
+import { useMultichainBalances } from '../../../../hooks/useMultichainBalances';
 
 const ELLIPSIFY_LENGTH = 13; // 6 (start) + 4 (end) + 3 (...)
 
 export type AssetPickerProps = {
+  children?: (
+    onClick: () => void,
+    networkImageSrc?: string,
+  ) => React.ReactElement; // Overrides default button
   asset?:
     | ERC20Asset
     | NativeAsset
@@ -65,17 +72,27 @@ export type AssetPickerProps = {
   onClick?: () => void;
   isDisabled?: boolean;
   action?: 'send' | 'receive';
+  isMultiselectEnabled?: boolean;
   networkProps?: Pick<
     React.ComponentProps<typeof AssetPickerModalNetwork>,
-    'network' | 'networks' | 'onNetworkChange'
+    | 'network'
+    | 'networks'
+    | 'onNetworkChange'
+    | 'shouldDisableNetwork'
+    | 'header'
   >;
 } & Pick<
   React.ComponentProps<typeof AssetPickerModal>,
-  'visibleTabs' | 'header' | 'sendingAsset' | 'customTokenListGenerator'
+  | 'visibleTabs'
+  | 'header'
+  | 'sendingAsset'
+  | 'customTokenListGenerator'
+  | 'isTokenListLoading'
 >;
 
 // A component that lets the user pick from a list of assets.
 export function AssetPicker({
+  children,
   header,
   asset,
   onAssetChange,
@@ -86,6 +103,8 @@ export function AssetPicker({
   isDisabled = false,
   visibleTabs,
   customTokenListGenerator,
+  isTokenListLoading = false,
+  isMultiselectEnabled = false,
 }: AssetPickerProps) {
   ///: BEGIN:ONLY_INCLUDE_IF(build-main,build-beta,build-flask)
   const t = useI18nContext();
@@ -106,12 +125,32 @@ export function AssetPicker({
       : symbol;
 
   // Badge details
-  const currentNetwork = useSelector(getCurrentNetwork);
+  const currentChainId = useSelector(getCurrentChainId);
   const allNetworks = useSelector(getNetworkConfigurationsByChainId);
+  const currentNetwork = allNetworks[currentChainId];
   const selectedNetwork =
     networkProps?.network ??
     (currentNetwork?.chainId && allNetworks[currentNetwork.chainId]);
 
+  const allNetworksToUse = networkProps?.networks ?? Object.values(allNetworks);
+  const { balanceByChainId } = useMultichainBalances();
+  // This is used to determine which tokens to display when isMultiselectEnabled=true
+  const [selectedChainIds, setSelectedChainIds] = useState<string[]>(
+    isMultiselectEnabled
+      ? allNetworksToUse
+          ?.map(({ chainId }) => chainId)
+          .sort((a, b) => balanceByChainId[b] - balanceByChainId[a]) ?? []
+      : [],
+  );
+  const [isSelectingNetwork, setIsSelectingNetwork] = useState(false);
+
+  useEffect(() => {
+    const newChainId = networkProps?.network?.chainId;
+    newChainId &&
+      !selectedChainIds.includes(newChainId) &&
+      setSelectedChainIds((c) => [...c, newChainId]);
+  }, [networkProps?.network?.chainId]);
+
   const handleAssetPickerTitle = (): string | undefined => {
     ///: BEGIN:ONLY_INCLUDE_IF(build-main,build-beta,build-flask)
     if (isDisabled) {
@@ -122,20 +161,47 @@ export function AssetPicker({
     return undefined;
   };
 
-  const [isSelectingNetwork, setIsSelectingNetwork] = useState(false);
+  const networkImageSrc =
+    selectedNetwork?.chainId &&
+    CHAIN_ID_TO_NETWORK_IMAGE_URL_MAP[
+      selectedNetwork.chainId as keyof typeof CHAIN_ID_TO_NETWORK_IMAGE_URL_MAP
+    ];
+
+  const handleButtonClick = () => {
+    if (networkProps && !networkProps.network) {
+      setIsSelectingNetwork(true);
+    } else {
+      setShowAssetPickerModal(true);
+    }
+    onClick?.();
+  };
 
   return (
     <>
       {networkProps && (
         <AssetPickerModalNetwork
           isOpen={isSelectingNetwork}
-          onClose={() => {
-            setIsSelectingNetwork(false);
-          }}
+          onClose={() => setIsSelectingNetwork(false)}
           onBack={() => {
             setIsSelectingNetwork(false);
             setShowAssetPickerModal(true);
           }}
+          isMultiselectEnabled={isMultiselectEnabled}
+          onMultiselectSubmit={(chainIds: string[]) => {
+            setSelectedChainIds(chainIds);
+            // If there is only 1 selected network switch to that network to populate tokens
+            if (
+              chainIds.length === 1 &&
+              chainIds[0] !== currentNetwork?.chainId
+            ) {
+              if (networkProps?.onNetworkChange) {
+                networkProps.onNetworkChange(
+                  allNetworks[chainIds[0] as keyof typeof allNetworks],
+                );
+              }
+            }
+          }}
+          selectedChainIds={selectedChainIds}
           {...networkProps}
         />
       )}
@@ -152,11 +218,23 @@ export function AssetPicker({
             | AssetWithDisplayData<ERC20Asset>
             | AssetWithDisplayData<NativeAsset>,
         ) => {
+          // If isMultiselectEnabled=true, update the network when a token is selected
+          if (isMultiselectEnabled && networkProps?.onNetworkChange) {
+            const networkFromToken = token.chainId
+              ? allNetworks[token.chainId as keyof typeof allNetworks]
+              : undefined;
+            if (networkFromToken) {
+              networkProps.onNetworkChange(networkFromToken);
+            }
+          }
           onAssetChange(token);
           setShowAssetPickerModal(false);
         }}
+        isMultiselectEnabled={isMultiselectEnabled}
         sendingAsset={sendingAsset}
-        network={networkProps?.network ? networkProps.network : undefined}
+        network={networkProps?.network}
+        networks={networkProps?.networks}
+        selectedChainIds={selectedChainIds}
         onNetworkPickerClick={
           networkProps
             ? () => {
@@ -169,37 +247,32 @@ export function AssetPicker({
           asset?.type === AssetType.NFT ? TabName.NFTS : TabName.TOKENS
         }
         customTokenListGenerator={customTokenListGenerator}
+        isTokenListLoading={isTokenListLoading}
       />
 
-      <ButtonBase
-        data-testid="asset-picker-button"
-        className="asset-picker"
-        disabled={isDisabled}
-        display={Display.Flex}
-        alignItems={AlignItems.center}
-        gap={2}
-        padding={2}
-        paddingLeft={2}
-        paddingRight={2}
-        justifyContent={isNFT ? JustifyContent.spaceBetween : undefined}
-        backgroundColor={BackgroundColor.transparent}
-        onClick={() => {
-          if (networkProps && !networkProps.network) {
-            setIsSelectingNetwork(true);
-          } else {
-            setShowAssetPickerModal(true);
-          }
-          onClick?.();
-        }}
-        endIconName={IconName.ArrowDown}
-        endIconProps={{
-          color: IconColor.iconDefault,
-          marginInlineStart: 0,
-          display: isDisabled ? Display.None : Display.InlineBlock,
-        }}
-        title={handleAssetPickerTitle()}
-      >
-        {asset ? (
+      {/** If a child prop is passed in, use it as the trigger button instead of the default */}
+      {children?.(handleButtonClick, networkImageSrc) || (
+        <ButtonBase
+          data-testid="asset-picker-button"
+          className="asset-picker"
+          disabled={isDisabled}
+          display={Display.Flex}
+          alignItems={AlignItems.center}
+          gap={2}
+          padding={2}
+          paddingLeft={2}
+          paddingRight={2}
+          justifyContent={isNFT ? JustifyContent.spaceBetween : undefined}
+          backgroundColor={BackgroundColor.transparent}
+          onClick={handleButtonClick}
+          endIconName={IconName.ArrowDown}
+          endIconProps={{
+            color: IconColor.iconDefault,
+            marginInlineStart: 0,
+            display: isDisabled ? Display.None : Display.InlineBlock,
+          }}
+          title={handleAssetPickerTitle()}
+        >
           <Box display={Display.Flex} alignItems={AlignItems.center} gap={3}>
             <Box display={Display.Flex}>
               <BadgeWrapper
@@ -207,12 +280,7 @@ export function AssetPicker({
                   <AvatarNetwork
                     size={AvatarNetworkSize.Xs}
                     name={selectedNetwork?.name ?? ''}
-                    src={
-                      selectedNetwork?.chainId &&
-                      CHAIN_ID_TO_NETWORK_IMAGE_URL_MAP[
-                        selectedNetwork.chainId as keyof typeof CHAIN_ID_TO_NETWORK_IMAGE_URL_MAP
-                      ]
-                    }
+                    src={networkImageSrc}
                     backgroundColor={
                       Object.entries({
                         [GOERLI_DISPLAY_NAME]: BackgroundColor.goerli,
@@ -269,12 +337,8 @@ export function AssetPicker({
               )}
             </Tooltip>
           </Box>
-        ) : (
-          <Text className="asset-picker__fallback" variant={TextVariant.bodyMd}>
-            {t('swapSelectToken')}
-          </Text>
-        )}
-      </ButtonBase>
+        </ButtonBase>
+      )}
     </>
   );
 }
diff --git a/ui/components/multichain/asset-picker-amount/asset-picker/index.scss b/ui/components/multichain/asset-picker-amount/asset-picker/index.scss
index 6cfaf877efbd..d30ce8c016d7 100644
--- a/ui/components/multichain/asset-picker-amount/asset-picker/index.scss
+++ b/ui/components/multichain/asset-picker-amount/asset-picker/index.scss
@@ -25,9 +25,4 @@
     opacity: 1;
     cursor: not-allowed;
   }
-
-  &__fallback {
-    text-wrap: nowrap;
-    padding-left: 8px;
-  }
 }
diff --git a/ui/components/multichain/avatar-group/__snapshots__/avatar-group.test.tsx.snap b/ui/components/multichain/avatar-group/__snapshots__/avatar-group.test.tsx.snap
index ff4c6a297c38..4e08ceaf5177 100644
--- a/ui/components/multichain/avatar-group/__snapshots__/avatar-group.test.tsx.snap
+++ b/ui/components/multichain/avatar-group/__snapshots__/avatar-group.test.tsx.snap
@@ -7,7 +7,7 @@ exports[`AvatarGroup should render AvatarGroup component 1`] = `
     data-testid="avatar-group"
   >
     <div
-      class="mm-box mm-box--display-flex"
+      class="mm-box mm-box--display-flex mm-box--align-items-center"
     >
       <div
         class="mm-box mm-box--rounded-full"
diff --git a/ui/components/multichain/avatar-group/avatar-group.stories.tsx b/ui/components/multichain/avatar-group/avatar-group.stories.tsx
index b0b9bbc7601e..f0f7c27f318e 100644
--- a/ui/components/multichain/avatar-group/avatar-group.stories.tsx
+++ b/ui/components/multichain/avatar-group/avatar-group.stories.tsx
@@ -1,6 +1,7 @@
 import React from 'react';
 import { StoryFn, Meta } from '@storybook/react';
 import { AvatarGroup } from '.';
+import { AvatarType } from './avatar-group.types';
 
 export default {
   title: 'Components/Multichain/AvatarGroup',
@@ -55,3 +56,28 @@ TokenWithOutSrc.args = {
   ],
   limit: 2,
 };
+
+export const NetworksWithTag: StoryFn<typeof AvatarGroup> = () => (
+  <AvatarGroup
+    avatarType={AvatarType.NETWORK}
+    limit={2}
+    members={[
+      { avatarValue: './images/eth_logo.svg', symbol: 'Ethereum' },
+      { avatarValue: './images/arbitrum.svg', symbol: 'Arbitrum' },
+      { avatarValue: './images/bnb.svg', symbol: 'Binance' },
+    ]}
+  />
+);
+
+export const NetworksWithOverlayTag: StoryFn<typeof AvatarGroup> = () => (
+  <AvatarGroup
+    avatarType={AvatarType.NETWORK}
+    limit={2}
+    members={[
+      { avatarValue: './images/eth_logo.svg', symbol: 'Ethereum' },
+      { avatarValue: './images/arbitrum.svg', symbol: 'Arbitrum' },
+      { avatarValue: './images/bnb.svg', symbol: 'Binance' },
+    ]}
+    isTagOverlay={true}
+  />
+);
diff --git a/ui/components/multichain/avatar-group/avatar-group.tsx b/ui/components/multichain/avatar-group/avatar-group.tsx
index 0de7cf5638eb..39af437980d9 100644
--- a/ui/components/multichain/avatar-group/avatar-group.tsx
+++ b/ui/components/multichain/avatar-group/avatar-group.tsx
@@ -10,9 +10,15 @@ import {
   AvatarAccount,
   AvatarAccountSize,
   AvatarAccountVariant,
+  AvatarNetwork,
+  AvatarNetworkSize,
+  AvatarBase,
+  AvatarBaseSize,
 } from '../../component-library';
 import {
   AlignItems,
+  BackgroundColor,
+  BorderColor,
   BorderRadius,
   Display,
   TextColor,
@@ -27,6 +33,7 @@ export const AvatarGroup: React.FC<AvatarGroupProps> = ({
   size = AvatarTokenSize.Xs,
   avatarType = AvatarType.TOKEN,
   borderColor,
+  isTagOverlay = false,
 }): JSX.Element => {
   const membersCount = members.length;
   const visibleMembers = members.slice(0, limit).reverse();
@@ -50,7 +57,7 @@ export const AvatarGroup: React.FC<AvatarGroupProps> = ({
       data-testid="avatar-group"
       gap={1}
     >
-      <Box display={Display.Flex}>
+      <Box display={Display.Flex} alignItems={AlignItems.center}>
         {visibleMembers.map((member, i) => {
           return (
             <Box
@@ -58,14 +65,15 @@ export const AvatarGroup: React.FC<AvatarGroupProps> = ({
               key={i}
               style={{ marginLeft: i === 0 ? '0' : marginLeftValue }}
             >
-              {avatarType === AvatarType.TOKEN ? (
+              {avatarType === AvatarType.TOKEN && (
                 <AvatarToken
                   src={member.avatarValue}
                   name={member.symbol}
                   size={size}
                   borderColor={borderColor}
                 />
-              ) : (
+              )}
+              {avatarType === AvatarType.ACCOUNT && (
                 <AvatarAccount
                   size={AvatarAccountSize.Xs}
                   address={member.avatarValue}
@@ -77,11 +85,30 @@ export const AvatarGroup: React.FC<AvatarGroupProps> = ({
                   borderColor={borderColor}
                 />
               )}
+              {avatarType === AvatarType.NETWORK && (
+                <AvatarNetwork
+                  src={member.avatarValue}
+                  name={member.symbol ?? ''}
+                  size={AvatarNetworkSize.Xs}
+                />
+              )}
             </Box>
           );
         })}
+        {showTag && isTagOverlay && (
+          <AvatarBase
+            backgroundColor={BackgroundColor.overlayAlternative}
+            style={{ marginLeft: marginLeftValue, fontSize: 8 }}
+            size={AvatarBaseSize.Xs}
+            borderColor={BorderColor.backgroundDefault}
+            borderRadius={BorderRadius.MD}
+            color={TextColor.overlayInverse}
+          >
+            {tagValue}
+          </AvatarBase>
+        )}
       </Box>
-      {showTag ? (
+      {showTag && !isTagOverlay ? (
         <Box>
           <Text variant={TextVariant.bodySm} color={TextColor.textAlternative}>
             {tagValue}
diff --git a/ui/components/multichain/avatar-group/avatar-group.types.tsx b/ui/components/multichain/avatar-group/avatar-group.types.tsx
index 6737b64eeea7..b5c52b1ed9f5 100644
--- a/ui/components/multichain/avatar-group/avatar-group.types.tsx
+++ b/ui/components/multichain/avatar-group/avatar-group.types.tsx
@@ -2,9 +2,7 @@ import { BorderColor } from '../../../helpers/constants/design-system';
 import { AvatarTokenSize } from '../../component-library';
 import type { StyleUtilityProps } from '../../component-library/box';
 
-// TODO: Convert to a `type` in a future major version.
-// eslint-disable-next-line @typescript-eslint/consistent-type-definitions
-export interface AvatarGroupProps extends StyleUtilityProps {
+export type AvatarGroupProps = StyleUtilityProps & {
   /** * Additional class name for the AvatarGroup component */
   className?: string;
   /** * Limit to show only a certain number of tokens and extras in Text */
@@ -22,9 +20,12 @@ export interface AvatarGroupProps extends StyleUtilityProps {
   size?: AvatarTokenSize;
   /** * Border Color of Avatar Tokens */
   borderColor?: BorderColor;
-}
+  /** * Whether the tag should be displayed as separate text or within an overlay avatar */
+  isTagOverlay?: boolean;
+};
 
 export enum AvatarType {
   TOKEN = 'TOKEN',
   ACCOUNT = 'ACCOUNT',
+  NETWORK = 'NETWORK',
 }
diff --git a/ui/components/multichain/network-list-item/__snapshots__/network-list-item.test.js.snap b/ui/components/multichain/network-list-item/__snapshots__/network-list-item.test.js.snap
index 38f44e767f77..08590b29ee88 100644
--- a/ui/components/multichain/network-list-item/__snapshots__/network-list-item.test.js.snap
+++ b/ui/components/multichain/network-list-item/__snapshots__/network-list-item.test.js.snap
@@ -22,12 +22,23 @@ exports[`NetworkListItem renders properly 1`] = `
         class="mm-box mm-box--display-flex mm-box--align-items-center mm-box--width-full"
         data-testid="Polygon"
       >
-        <p
-          class="mm-box mm-text mm-text--body-md mm-text--ellipsis mm-box--color-text-default mm-box--background-color-transparent"
-          tabindex="0"
+        <div
+          class="multichain-network-list-item__tooltip"
         >
-          Polygon
-        </p>
+          <div
+            class=""
+            style="display: inline;"
+            tabindex="0"
+            title=""
+          >
+            <p
+              class="mm-box mm-text mm-text--body-md mm-text--ellipsis mm-box--color-text-default mm-box--background-color-transparent"
+              tabindex="0"
+            >
+              Polygon
+            </p>
+          </div>
+        </div>
       </div>
     </div>
     <button
diff --git a/ui/components/multichain/network-list-item/index.scss b/ui/components/multichain/network-list-item/index.scss
index cfbe80f2ce48..116f2c678b6f 100644
--- a/ui/components/multichain/network-list-item/index.scss
+++ b/ui/components/multichain/network-list-item/index.scss
@@ -2,13 +2,21 @@
   position: relative;
   cursor: pointer;
 
-  &:not(.multichain-network-list-item--selected) {
+  &:not(.multichain-network-list-item--selected, .multichain-network-list-item--disabled) {
     &:hover,
     &:focus-within {
       background: var(--color-background-default-hover);
     }
   }
 
+  &--disabled {
+    opacity: 0.4;
+
+    .mm-avatar-network {
+      filter: grayscale(1);
+    }
+  }
+
   a:hover,
   a:focus {
     color: inherit;
diff --git a/ui/components/multichain/network-list-item/network-list-item.tsx b/ui/components/multichain/network-list-item/network-list-item.tsx
index 204ad7a5861f..d88964c0482c 100644
--- a/ui/components/multichain/network-list-item/network-list-item.tsx
+++ b/ui/components/multichain/network-list-item/network-list-item.tsx
@@ -47,7 +47,10 @@ export const NetworkListItem = ({
   onEditClick,
   onRpcEndpointClick,
   startAccessory,
+  endAccessory,
   showEndAccessory = true,
+  disabled = false,
+  variant,
 }: {
   name: string;
   iconSrc?: string;
@@ -61,7 +64,10 @@ export const NetworkListItem = ({
   onEditClick?: () => void;
   focus?: boolean;
   startAccessory?: ReactNode;
+  endAccessory?: ReactNode;
   showEndAccessory?: boolean;
+  disabled?: boolean;
+  variant?: TextVariant;
 }) => {
   const t = useI18nContext();
   const networkRef = useRef<HTMLInputElement>(null);
@@ -116,12 +122,13 @@ export const NetworkListItem = ({
       }
       className={classnames('multichain-network-list-item', {
         'multichain-network-list-item--selected': selected,
+        'multichain-network-list-item--disabled': disabled,
       })}
       display={Display.Flex}
       alignItems={AlignItems.center}
       justifyContent={JustifyContent.spaceBetween}
       width={BlockSize.Full}
-      onClick={onClick}
+      onClick={disabled ? undefined : onClick}
     >
       {startAccessory ? <Box marginTop={1}>{startAccessory}</Box> : null}
       {selected && (
@@ -152,26 +159,24 @@ export const NetworkListItem = ({
           alignItems={AlignItems.center}
           data-testid={name}
         >
-          <Text
-            ref={networkRef}
-            color={TextColor.textDefault}
-            backgroundColor={BackgroundColor.transparent}
-            ellipsis
-            onKeyDown={handleKeyPress}
-            tabIndex={0} // Enable keyboard focus
+          <Tooltip
+            title={name}
+            position="bottom"
+            wrapperClassName="multichain-network-list-item__tooltip"
+            disabled={name?.length <= MAXIMUM_CHARACTERS_WITHOUT_TOOLTIP}
           >
-            {name?.length > MAXIMUM_CHARACTERS_WITHOUT_TOOLTIP ? (
-              <Tooltip
-                title={name}
-                position="bottom"
-                wrapperClassName="multichain-network-list-item__tooltip"
-              >
-                {name}
-              </Tooltip>
-            ) : (
-              name
-            )}
-          </Text>
+            <Text
+              ref={networkRef}
+              color={TextColor.textDefault}
+              backgroundColor={BackgroundColor.transparent}
+              variant={variant ?? TextVariant.bodyMd}
+              ellipsis
+              onKeyDown={handleKeyPress}
+              tabIndex={0} // Enable keyboard focus
+            >
+              {name}
+            </Text>
+          </Tooltip>
         </Box>
         {rpcEndpoint && (
           <Box
@@ -205,15 +210,17 @@ export const NetworkListItem = ({
       </Box>
 
       {renderButton()}
-      {showEndAccessory ? (
-        <NetworkListItemMenu
-          anchorElement={networkListItemMenuElement}
-          isOpen={networkOptionsMenuOpen}
-          onDeleteClick={onDeleteClick}
-          onEditClick={onEditClick}
-          onClose={() => setNetworkOptionsMenuOpen(false)}
-        />
-      ) : null}
+      {showEndAccessory
+        ? endAccessory ?? (
+            <NetworkListItemMenu
+              anchorElement={networkListItemMenuElement}
+              isOpen={networkOptionsMenuOpen}
+              onDeleteClick={onDeleteClick}
+              onEditClick={onEditClick}
+              onClose={() => setNetworkOptionsMenuOpen(false)}
+            />
+          )
+        : null}
     </Box>
   );
 };
@@ -256,7 +263,11 @@ NetworkListItem.propTypes = {
    */
   startAccessory: PropTypes.node,
   /**
-   * Represents if we need to show menu option
+   * Represents end accessory
+   */
+  endAccessory: PropTypes.node,
+  /**
+   * Represents if we need to show menu option or endAccessory
    */
   showEndAccessory: PropTypes.bool,
 };
diff --git a/ui/components/multichain/network-list-menu/__snapshots__/network-list-menu.test.js.snap b/ui/components/multichain/network-list-menu/__snapshots__/network-list-menu.test.js.snap
index f2042c2385bd..095c2c16509d 100644
--- a/ui/components/multichain/network-list-menu/__snapshots__/network-list-menu.test.js.snap
+++ b/ui/components/multichain/network-list-menu/__snapshots__/network-list-menu.test.js.snap
@@ -132,12 +132,23 @@ exports[`NetworkListMenu renders properly 1`] = `
                         class="mm-box mm-box--display-flex mm-box--align-items-center mm-box--width-full"
                         data-testid="Ethereum Mainnet"
                       >
-                        <p
-                          class="mm-box mm-text mm-text--body-md mm-text--ellipsis mm-box--color-text-default mm-box--background-color-transparent"
-                          tabindex="0"
+                        <div
+                          class="multichain-network-list-item__tooltip"
                         >
-                          Ethereum Mainnet
-                        </p>
+                          <div
+                            class=""
+                            style="display: inline;"
+                            tabindex="0"
+                            title=""
+                          >
+                            <p
+                              class="mm-box mm-text mm-text--body-md mm-text--ellipsis mm-box--color-text-default mm-box--background-color-transparent"
+                              tabindex="0"
+                            >
+                              Ethereum Mainnet
+                            </p>
+                          </div>
+                        </div>
                       </div>
                     </div>
                     <button
@@ -183,12 +194,23 @@ exports[`NetworkListMenu renders properly 1`] = `
                         class="mm-box mm-box--display-flex mm-box--align-items-center mm-box--width-full"
                         data-testid="Linea Mainnet"
                       >
-                        <p
-                          class="mm-box mm-text mm-text--body-md mm-text--ellipsis mm-box--color-text-default mm-box--background-color-transparent"
-                          tabindex="0"
+                        <div
+                          class="multichain-network-list-item__tooltip"
                         >
-                          Linea Mainnet
-                        </p>
+                          <div
+                            class=""
+                            style="display: inline;"
+                            tabindex="0"
+                            title=""
+                          >
+                            <p
+                              class="mm-box mm-text mm-text--body-md mm-text--ellipsis mm-box--color-text-default mm-box--background-color-transparent"
+                              tabindex="0"
+                            >
+                              Linea Mainnet
+                            </p>
+                          </div>
+                        </div>
                       </div>
                     </div>
                     <button
@@ -234,12 +256,23 @@ exports[`NetworkListMenu renders properly 1`] = `
                         class="mm-box mm-box--display-flex mm-box--align-items-center mm-box--width-full"
                         data-testid="BNB Chain"
                       >
-                        <p
-                          class="mm-box mm-text mm-text--body-md mm-text--ellipsis mm-box--color-text-default mm-box--background-color-transparent"
-                          tabindex="0"
+                        <div
+                          class="multichain-network-list-item__tooltip"
                         >
-                          BNB Chain
-                        </p>
+                          <div
+                            class=""
+                            style="display: inline;"
+                            tabindex="0"
+                            title=""
+                          >
+                            <p
+                              class="mm-box mm-text mm-text--body-md mm-text--ellipsis mm-box--color-text-default mm-box--background-color-transparent"
+                              tabindex="0"
+                            >
+                              BNB Chain
+                            </p>
+                          </div>
+                        </div>
                       </div>
                     </div>
                     <button
@@ -281,12 +314,23 @@ exports[`NetworkListMenu renders properly 1`] = `
                         class="mm-box mm-box--display-flex mm-box--align-items-center mm-box--width-full"
                         data-testid="Chain 5"
                       >
-                        <p
-                          class="mm-box mm-text mm-text--body-md mm-text--ellipsis mm-box--color-text-default mm-box--background-color-transparent"
-                          tabindex="0"
+                        <div
+                          class="multichain-network-list-item__tooltip"
                         >
-                          Chain 5
-                        </p>
+                          <div
+                            class=""
+                            style="display: inline;"
+                            tabindex="0"
+                            title=""
+                          >
+                            <p
+                              class="mm-box mm-text mm-text--body-md mm-text--ellipsis mm-box--color-text-default mm-box--background-color-transparent"
+                              tabindex="0"
+                            >
+                              Chain 5
+                            </p>
+                          </div>
+                        </div>
                       </div>
                     </div>
                     <button
diff --git a/ui/components/multichain/pages/review-permissions-page/site-cell/__snapshots__/site-cell-tooltip.test.js.snap b/ui/components/multichain/pages/review-permissions-page/site-cell/__snapshots__/site-cell-tooltip.test.js.snap
index bafd3fea4948..7548daa68121 100644
--- a/ui/components/multichain/pages/review-permissions-page/site-cell/__snapshots__/site-cell-tooltip.test.js.snap
+++ b/ui/components/multichain/pages/review-permissions-page/site-cell/__snapshots__/site-cell-tooltip.test.js.snap
@@ -14,7 +14,7 @@ exports[`SiteCellTooltip should render correctly 1`] = `
       data-testid="avatar-group"
     >
       <div
-        class="mm-box mm-box--display-flex"
+        class="mm-box mm-box--display-flex mm-box--align-items-center"
       >
         <div
           class="mm-box mm-box--rounded-full"
@@ -167,7 +167,7 @@ exports[`SiteCellTooltip should render correctly 1`] = `
       data-testid="avatar-group"
     >
       <div
-        class="mm-box mm-box--display-flex"
+        class="mm-box mm-box--display-flex mm-box--align-items-center"
       >
         <div
           class="mm-box mm-box--rounded-full"
diff --git a/ui/components/multichain/pages/send/components/__snapshots__/network-picker.test.tsx.snap b/ui/components/multichain/pages/send/components/__snapshots__/network-picker.test.tsx.snap
index 3428358159e1..e4f6f39230ef 100644
--- a/ui/components/multichain/pages/send/components/__snapshots__/network-picker.test.tsx.snap
+++ b/ui/components/multichain/pages/send/components/__snapshots__/network-picker.test.tsx.snap
@@ -14,11 +14,11 @@ exports[`SendPageNetworkPicker render renders correctly 1`] = `
       >
         G
       </div>
-      <span
+      <p
         class="mm-box mm-text mm-text--body-sm mm-text--ellipsis mm-box--color-text-default"
       >
         Goerli
-      </span>
+      </p>
       <span
         class="mm-box mm-picker-network__arrow-down-icon mm-icon mm-icon--size-xs mm-box--margin-left-auto mm-box--display-inline-block mm-box--color-icon-default"
         style="mask-image: url('./images/icons/arrow-down.svg');"
diff --git a/ui/components/multichain/pages/send/send.test.js b/ui/components/multichain/pages/send/send.test.js
index bc8db6adf3b6..2eb37dc164c4 100644
--- a/ui/components/multichain/pages/send/send.test.js
+++ b/ui/components/multichain/pages/send/send.test.js
@@ -99,7 +99,11 @@ const baseStore = {
         },
       },
     ],
-
+    tokenBalances: {
+      '0x0dcd5d886577d5081b0c52e242ef29e70be3e7bc': {
+        '0x5': {},
+      },
+    },
     currencyRates: {
       ETH: {
         conversionDate: 1620710825.03,
diff --git a/ui/components/multichain/token-list-item/__snapshots__/token-list-item.test.tsx.snap b/ui/components/multichain/token-list-item/__snapshots__/token-list-item.test.tsx.snap
index dbf89d4d4132..2359a5d9a5a0 100644
--- a/ui/components/multichain/token-list-item/__snapshots__/token-list-item.test.tsx.snap
+++ b/ui/components/multichain/token-list-item/__snapshots__/token-list-item.test.tsx.snap
@@ -1,15 +1,16 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`TokenListItem should render correctly 1`] = `
+exports[`TokenListItem handles clicking staking opens tab 1`] = `
 <div>
   <div
-    class="mm-box multichain-token-list-item mm-box--display-flex mm-box--gap-4 mm-box--flex-direction-column"
+    class="mm-box multichain-token-list-item mm-box--display-flex mm-box--gap-4 mm-box--flex-direction-row mm-box--width-full mm-box--height-full"
     data-testid="multichain-token-list-item"
   >
     <a
-      class="mm-box multichain-token-list-item__container-cell multichain-token-list-item__container-cell--clickable mm-box--padding-top-2 mm-box--padding-right-4 mm-box--padding-bottom-2 mm-box--padding-left-4 mm-box--display-flex mm-box--flex-direction-row"
+      class="mm-box multichain-token-list-item__container-cell multichain-token-list-item__container-cell--clickable mm-box--padding-top-2 mm-box--padding-right-4 mm-box--padding-bottom-2 mm-box--padding-left-4 mm-box--display-flex mm-box--flex-direction-row mm-box--width-full"
       data-testid="multichain-token-list-button"
       href="#"
+      style="height: 62px;"
     >
       <div
         class="mm-box mm-badge-wrapper multichain-token-list-item__badge mm-box--margin-right-4 mm-box--display-inline-block"
@@ -34,43 +35,412 @@ exports[`TokenListItem should render correctly 1`] = `
         </div>
       </div>
       <div
-        class="mm-box multichain-token-list-item__container-cell--text-container mm-box--display-flex mm-box--flex-direction-column mm-box--width-full"
+        class="mm-box multichain-token-list-item__container-cell--text-container mm-box--display-flex mm-box--flex-direction-column mm-box--justify-content-center mm-box--width-full"
         style="flex-grow: 1; overflow: hidden;"
       >
         <div
-          class="mm-box mm-box--display-flex mm-box--gap-1 mm-box--flex-direction-row mm-box--justify-content-space-between"
+          class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-space-between"
+        >
+          <p
+            class="mm-box mm-text mm-text--body-md mm-text--font-weight-medium mm-text--ellipsis mm-box--color-text-default"
+          >
+            <button
+              class="mm-box mm-box--padding-inline-0 mm-box--padding-inline-start-1 mm-box--padding-inline-end-1 mm-box--gap-1 mm-box--background-color-transparent"
+              data-testid="staking-entrypoint-0x1"
+              tabindex="0"
+            >
+              <span
+                class="mm-box mm-text mm-text--body-md mm-box--color-text-default"
+              >
+                •
+              </span>
+              <span
+                class="mm-box mm-text mm-text--body-md mm-text--font-weight-medium mm-box--padding-inline-start-1 mm-box--padding-inline-end-1 mm-box--color-primary-default"
+              >
+                Stake
+              </span>
+              <span
+                class="mm-box mm-icon mm-icon--size-sm mm-box--display-inline-block mm-box--color-primary-default"
+                style="mask-image: url('./images/icons/stake.svg');"
+              />
+            </button>
+          </p>
+          <p
+            class="mm-box mm-text mm-text--body-md mm-text--font-weight-medium mm-text--ellipsis mm-text--text-align-end mm-box--color-text-default"
+            data-testid="multichain-token-list-item-secondary-value"
+          />
+        </div>
+        <div
+          class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-space-between"
+        >
+          <p
+            class="mm-box mm-text mm-text--body-sm-medium mm-text--ellipsis mm-box--color-text-alternative"
+            data-testid="multichain-token-list-item-token-name"
+          />
+          <p
+            class="mm-box mm-text mm-text--body-sm-medium mm-text--text-align-end mm-box--color-text-alternative"
+            data-testid="multichain-token-list-item-value"
+          >
+             
+          </p>
+        </div>
+      </div>
+    </a>
+  </div>
+</div>
+`;
+
+exports[`TokenListItem should display warning scam modal 1`] = `
+<div>
+  <div
+    class="mm-box multichain-token-list-item mm-box--display-flex mm-box--gap-4 mm-box--flex-direction-row mm-box--width-full mm-box--height-full"
+    data-testid="multichain-token-list-item"
+  >
+    <div
+      class="mm-box multichain-token-list-item__container-cell mm-box--padding-top-2 mm-box--padding-right-4 mm-box--padding-bottom-2 mm-box--padding-left-4 mm-box--display-flex mm-box--flex-direction-row mm-box--width-full"
+      data-testid="multichain-token-list-button"
+      style="height: 62px;"
+    >
+      <div
+        class="mm-box mm-badge-wrapper multichain-token-list-item__badge mm-box--margin-right-4 mm-box--display-inline-block"
+      >
+        <div
+          class="mm-box mm-text mm-avatar-base mm-avatar-base--size-md mm-avatar-token mm-text--body-sm mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full"
+        >
+          S
+        </div>
+        <div
+          class="mm-box mm-badge-wrapper__badge-container mm-badge-wrapper__badge-container--rectangular-bottom-right"
         >
           <div
-            class="mm-box mm-box--display-inline-block mm-box--width-1/3"
+            class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-network multichain-token-list-item__badge__avatar-network mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-md mm-box--border-color-background-default mm-box--border-width-1 box--border-style-solid"
+          >
+            ?
+          </div>
+        </div>
+      </div>
+      <div
+        class="mm-box multichain-token-list-item__container-cell--text-container mm-box--display-flex mm-box--flex-direction-column mm-box--justify-content-center mm-box--width-full"
+        style="flex-grow: 1; overflow: hidden;"
+      >
+        <div
+          class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-space-between"
+        >
+          <p
+            class="mm-box mm-text mm-text--body-md mm-text--font-weight-medium mm-text--ellipsis mm-box--color-text-default"
+          >
+            
+          </p>
+          <button
+            aria-label=""
+            class="mm-box mm-button-icon mm-button-icon--size-md mm-box--display-inline-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-error-default mm-box--background-color-transparent mm-box--rounded-lg"
+            data-testid="scam-warning"
           >
             <span
-              class="mm-box mm-text mm-text--body-md mm-text--font-weight-medium mm-text--ellipsis mm-box--color-text-default"
+              class="mm-box mm-icon mm-icon--size-md mm-box--display-inline-block mm-box--color-inherit"
+              style="mask-image: url('./images/icons/danger.svg');"
             />
+          </button>
+        </div>
+        <div
+          class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-space-between"
+        >
+          <div
+            class="mm-box mm-box--display-flex"
+          >
             <p
-              class="mm-box mm-text mm-text--body-md mm-text--ellipsis mm-box--color-text-alternative"
-              data-testid="multichain-token-list-item-token-name"
+              class="mm-box mm-text mm-text--body-sm-medium mm-text--ellipsis mm-box--color-text-default"
+              data-testid="token-increase-decrease-percentage-0x0000000000000000000000000000000000000000"
             />
           </div>
+          <p
+            class="mm-box mm-text mm-text--body-md mm-text--text-align-end mm-box--color-text-alternative"
+            data-testid="multichain-token-list-item-value"
+          >
+            11.9751 ETH
+             
+            SCAM_TOKEN
+          </p>
+        </div>
+      </div>
+    </div>
+  </div>
+</div>
+`;
+
+exports[`TokenListItem should display warning scam modal fallback when safechains fails to resolve correctly 1`] = `
+<div>
+  <div
+    class="mm-box multichain-token-list-item mm-box--display-flex mm-box--gap-4 mm-box--flex-direction-row mm-box--width-full mm-box--height-full"
+    data-testid="multichain-token-list-item"
+  >
+    <div
+      class="mm-box multichain-token-list-item__container-cell mm-box--padding-top-2 mm-box--padding-right-4 mm-box--padding-bottom-2 mm-box--padding-left-4 mm-box--display-flex mm-box--flex-direction-row mm-box--width-full"
+      data-testid="multichain-token-list-button"
+      style="height: 62px;"
+    >
+      <div
+        class="mm-box mm-badge-wrapper multichain-token-list-item__badge mm-box--margin-right-4 mm-box--display-inline-block"
+      >
+        <div
+          class="mm-box mm-text mm-avatar-base mm-avatar-base--size-md mm-avatar-token mm-text--body-sm mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full"
+        >
+          S
+        </div>
+        <div
+          class="mm-box mm-badge-wrapper__badge-container mm-badge-wrapper__badge-container--rectangular-bottom-right"
+        >
+          <div
+            class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-network multichain-token-list-item__badge__avatar-network mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-md mm-box--border-color-background-default mm-box--border-width-1 box--border-style-solid"
+          >
+            ?
+          </div>
+        </div>
+      </div>
+      <div
+        class="mm-box multichain-token-list-item__container-cell--text-container mm-box--display-flex mm-box--flex-direction-column mm-box--justify-content-center mm-box--width-full"
+        style="flex-grow: 1; overflow: hidden;"
+      >
+        <div
+          class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-space-between"
+        >
+          <p
+            class="mm-box mm-text mm-text--body-md mm-text--font-weight-medium mm-text--ellipsis mm-box--color-text-default"
+          >
+            
+          </p>
+          <button
+            aria-label=""
+            class="mm-box mm-button-icon mm-button-icon--size-md mm-box--display-inline-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-error-default mm-box--background-color-transparent mm-box--rounded-lg"
+            data-testid="scam-warning"
+          >
+            <span
+              class="mm-box mm-icon mm-icon--size-md mm-box--display-inline-block mm-box--color-inherit"
+              style="mask-image: url('./images/icons/danger.svg');"
+            />
+          </button>
+        </div>
+        <div
+          class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-space-between"
+        >
           <div
-            class="mm-box mm-box--display-flex mm-box--flex-direction-column mm-box--align-items-flex-end mm-box--width-2/3"
+            class="mm-box mm-box--display-flex"
           >
             <p
-              class="mm-box mm-text mm-text--body-md mm-text--font-weight-medium mm-text--text-align-end mm-box--width-2/3 mm-box--color-text-default"
-              data-testid="multichain-token-list-item-secondary-value"
+              class="mm-box mm-text mm-text--body-sm-medium mm-text--ellipsis mm-box--color-text-default"
+              data-testid="token-increase-decrease-percentage-0x0000000000000000000000000000000000000000"
             />
-            <p
-              class="mm-box mm-text mm-text--body-sm-medium mm-text--text-align-end mm-box--color-text-alternative"
-              data-testid="multichain-token-list-item-value"
-            >
-               
-            </p>
           </div>
+          <p
+            class="mm-box mm-text mm-text--body-md mm-text--text-align-end mm-box--color-text-alternative"
+            data-testid="multichain-token-list-item-value"
+          >
+            11.9751 ETH
+             
+            SCAM_TOKEN
+          </p>
         </div>
+      </div>
+    </div>
+  </div>
+</div>
+`;
+
+exports[`TokenListItem should render correctly 1`] = `
+<div>
+  <div
+    class="mm-box multichain-token-list-item mm-box--display-flex mm-box--gap-4 mm-box--flex-direction-row mm-box--width-full mm-box--height-full"
+    data-testid="multichain-token-list-item"
+  >
+    <a
+      class="mm-box multichain-token-list-item__container-cell multichain-token-list-item__container-cell--clickable mm-box--padding-top-2 mm-box--padding-right-4 mm-box--padding-bottom-2 mm-box--padding-left-4 mm-box--display-flex mm-box--flex-direction-row mm-box--width-full"
+      data-testid="multichain-token-list-button"
+      href="#"
+      style="height: 62px;"
+    >
+      <div
+        class="mm-box mm-badge-wrapper multichain-token-list-item__badge mm-box--margin-right-4 mm-box--display-inline-block"
+      >
         <div
-          class="mm-box mm-box--display-flex mm-box--gap-1 mm-box--flex-direction-row mm-box--justify-content-space-between"
-        />
+          class="mm-box mm-text mm-avatar-base mm-avatar-base--size-md mm-avatar-token mm-text--body-sm mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full"
+        >
+          ?
+        </div>
+        <div
+          class="mm-box mm-badge-wrapper__badge-container mm-badge-wrapper__badge-container--rectangular-bottom-right"
+        >
+          <div
+            class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-network multichain-token-list-item__badge__avatar-network mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-md mm-box--border-color-background-default mm-box--border-width-1 box--border-style-solid"
+          >
+            <img
+              alt="network logo"
+              class="mm-avatar-network__network-image"
+              src="./eth-logo.png"
+            />
+          </div>
+        </div>
+      </div>
+      <div
+        class="mm-box multichain-token-list-item__container-cell--text-container mm-box--display-flex mm-box--flex-direction-column mm-box--justify-content-center mm-box--width-full"
+        style="flex-grow: 1; overflow: hidden;"
+      >
+        <div
+          class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-space-between"
+        >
+          <p
+            class="mm-box mm-text mm-text--body-md mm-text--font-weight-medium mm-text--ellipsis mm-box--color-text-default"
+          />
+          <p
+            class="mm-box mm-text mm-text--body-md mm-text--font-weight-medium mm-text--text-align-end mm-box--color-text-default"
+            data-testid="multichain-token-list-item-secondary-value"
+          />
+        </div>
+        <div
+          class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-space-between"
+        >
+          <p
+            class="mm-box mm-text mm-text--body-sm-medium mm-text--ellipsis mm-box--color-text-alternative"
+            data-testid="multichain-token-list-item-token-name"
+          />
+          <p
+            class="mm-box mm-text mm-text--body-sm-medium mm-text--text-align-end mm-box--color-text-alternative"
+            data-testid="multichain-token-list-item-value"
+          >
+             
+          </p>
+        </div>
       </div>
     </a>
   </div>
 </div>
 `;
+
+exports[`TokenListItem should render crypto balance 1`] = `
+<div>
+  <div
+    class="mm-box multichain-token-list-item mm-box--display-flex mm-box--gap-4 mm-box--flex-direction-row mm-box--width-full mm-box--height-full"
+    data-testid="multichain-token-list-item"
+  >
+    <div
+      class="mm-box multichain-token-list-item__container-cell mm-box--padding-top-2 mm-box--padding-right-4 mm-box--padding-bottom-2 mm-box--padding-left-4 mm-box--display-flex mm-box--flex-direction-row mm-box--width-full"
+      data-testid="multichain-token-list-button"
+      style="height: 62px;"
+    >
+      <div
+        class="mm-box mm-badge-wrapper multichain-token-list-item__badge mm-box--margin-right-4 mm-box--display-inline-block"
+      >
+        <div
+          class="mm-box mm-text mm-avatar-base mm-avatar-base--size-md mm-avatar-token mm-text--body-sm mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full"
+        >
+          ?
+        </div>
+        <div
+          class="mm-box mm-badge-wrapper__badge-container mm-badge-wrapper__badge-container--rectangular-bottom-right"
+        >
+          <div
+            class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-network multichain-token-list-item__badge__avatar-network mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-md mm-box--border-color-background-default mm-box--border-width-1 box--border-style-solid"
+          >
+            ?
+          </div>
+        </div>
+      </div>
+      <div
+        class="mm-box multichain-token-list-item__container-cell--text-container mm-box--display-flex mm-box--flex-direction-column mm-box--justify-content-center mm-box--width-full"
+        style="flex-grow: 1; overflow: hidden;"
+      >
+        <div
+          class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-space-between"
+        >
+          <p
+            class="mm-box mm-text mm-text--body-md mm-text--font-weight-medium mm-text--ellipsis mm-box--color-text-default"
+          />
+          <p
+            class="mm-box mm-text mm-text--body-md mm-text--font-weight-medium mm-text--text-align-end mm-box--color-text-default"
+            data-testid="multichain-token-list-item-secondary-value"
+          />
+        </div>
+        <div
+          class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-space-between"
+        >
+          <p
+            class="mm-box mm-text mm-text--body-sm-medium mm-text--ellipsis mm-box--color-text-alternative"
+            data-testid="multichain-token-list-item-token-name"
+          />
+          <p
+            class="mm-box mm-text mm-text--body-sm-medium mm-text--text-align-end mm-box--color-text-alternative"
+            data-testid="multichain-token-list-item-value"
+          >
+            11.9751 ETH
+             
+          </p>
+        </div>
+      </div>
+    </div>
+  </div>
+</div>
+`;
+
+exports[`TokenListItem should render crypto balance with warning scam 1`] = `
+<div>
+  <div
+    class="mm-box multichain-token-list-item mm-box--display-flex mm-box--gap-4 mm-box--flex-direction-row mm-box--width-full mm-box--height-full"
+    data-testid="multichain-token-list-item"
+  >
+    <div
+      class="mm-box multichain-token-list-item__container-cell mm-box--padding-top-2 mm-box--padding-right-4 mm-box--padding-bottom-2 mm-box--padding-left-4 mm-box--display-flex mm-box--flex-direction-row mm-box--width-full"
+      data-testid="multichain-token-list-button"
+      style="height: 62px;"
+    >
+      <div
+        class="mm-box mm-badge-wrapper multichain-token-list-item__badge mm-box--margin-right-4 mm-box--display-inline-block"
+      >
+        <div
+          class="mm-box mm-text mm-avatar-base mm-avatar-base--size-md mm-avatar-token mm-text--body-sm mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full"
+        >
+          ?
+        </div>
+        <div
+          class="mm-box mm-badge-wrapper__badge-container mm-badge-wrapper__badge-container--rectangular-bottom-right"
+        >
+          <div
+            class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-network multichain-token-list-item__badge__avatar-network mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-md mm-box--border-color-background-default mm-box--border-width-1 box--border-style-solid"
+          >
+            ?
+          </div>
+        </div>
+      </div>
+      <div
+        class="mm-box multichain-token-list-item__container-cell--text-container mm-box--display-flex mm-box--flex-direction-column mm-box--justify-content-center mm-box--width-full"
+        style="flex-grow: 1; overflow: hidden;"
+      >
+        <div
+          class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-space-between"
+        >
+          <p
+            class="mm-box mm-text mm-text--body-md mm-text--font-weight-medium mm-text--ellipsis mm-box--color-text-default"
+          />
+          <p
+            class="mm-box mm-text mm-text--body-md mm-text--font-weight-medium mm-text--text-align-end mm-box--color-text-default"
+            data-testid="multichain-token-list-item-secondary-value"
+          />
+        </div>
+        <div
+          class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-space-between"
+        >
+          <p
+            class="mm-box mm-text mm-text--body-sm-medium mm-text--ellipsis mm-box--color-text-alternative"
+            data-testid="multichain-token-list-item-token-name"
+          />
+          <p
+            class="mm-box mm-text mm-text--body-sm-medium mm-text--text-align-end mm-box--color-text-alternative"
+            data-testid="multichain-token-list-item-value"
+          >
+            11.9751 ETH
+             
+          </p>
+        </div>
+      </div>
+    </div>
+  </div>
+</div>
+`;
diff --git a/ui/components/multichain/token-list-item/token-list-item.stories.js b/ui/components/multichain/token-list-item/token-list-item.stories.js
index bd5d7849bbec..d78535fd23e2 100644
--- a/ui/components/multichain/token-list-item/token-list-item.stories.js
+++ b/ui/components/multichain/token-list-item/token-list-item.stories.js
@@ -93,3 +93,33 @@ export const NoImagesStory = Template.bind({});
 NoImagesStory.args = {
   tokenImage: '',
 };
+
+export const CrossChainTokenStory = (args) => (
+  <div
+    style={{ width: '336px', border: '1px solid var(--color-border-muted)' }}
+  >
+    <TokenListItem {...args} />
+  </div>
+);
+CrossChainTokenStory.decorators = [
+  (Story) => (
+    <Provider
+      store={configureStore({
+        metamask: {
+          ...testData.metamask,
+          ...mockNetworkState({ chainId: CHAIN_IDS.MAINNET }),
+        },
+      })}
+    >
+      <Story />
+    </Provider>
+  ),
+];
+
+CrossChainTokenStory.args = {
+  title: 'USDC',
+  secondary: '$94556756776.80 USD',
+  primary: '34449765768526.00',
+  isTitleNetworkName: true,
+  chainId: CHAIN_IDS.LINEA_SEPOLIA,
+};
diff --git a/ui/components/multichain/token-list-item/token-list-item.test.tsx b/ui/components/multichain/token-list-item/token-list-item.test.tsx
index 6f08f276a302..e32397dfa1a8 100644
--- a/ui/components/multichain/token-list-item/token-list-item.test.tsx
+++ b/ui/components/multichain/token-list-item/token-list-item.test.tsx
@@ -124,11 +124,12 @@ describe('TokenListItem', () => {
       title: '',
       chainId: '0x1',
     };
-    const { getByText } = renderWithProvider(
+    const { getByText, container } = renderWithProvider(
       <TokenListItem {...propsToUse} />,
       store,
     );
     expect(getByText('11.9751 ETH')).toBeInTheDocument();
+    expect(container).toMatchSnapshot();
   });
 
   it('should display warning scam modal', () => {
@@ -152,10 +153,11 @@ describe('TokenListItem', () => {
       tokenSymbol: 'SCAM_TOKEN',
       chainId: '0x1',
     };
-    const { getByTestId, getByText } = renderWithProvider(
+    const { getByTestId, getByText, container } = renderWithProvider(
       <TokenListItem {...propsToUse} />,
       store,
     );
+    expect(container).toMatchSnapshot();
 
     const warningScamModal = getByTestId('scam-warning');
     fireEvent.click(warningScamModal);
@@ -180,11 +182,12 @@ describe('TokenListItem', () => {
       tokenSymbol: 'SCAM_TOKEN',
       chainId: '0x1',
     };
-    const { getByTestId, getByText } = renderWithProvider(
+    const { getByTestId, getByText, container } = renderWithProvider(
       <TokenListItem {...propsToUse} />,
       store,
     );
 
+    expect(container).toMatchSnapshot();
     const warningScamModal = getByTestId('scam-warning');
     fireEvent.click(warningScamModal);
 
@@ -209,11 +212,12 @@ describe('TokenListItem', () => {
       chainId: '0x1',
     };
 
-    const { getByText } = renderWithProvider(
+    const { getByText, container } = renderWithProvider(
       <TokenListItem {...propsToUse} />,
       store,
     );
     expect(getByText('11.9751 ETH')).toBeInTheDocument();
+    expect(container).toMatchSnapshot();
   });
 
   it('handles click action and fires onClick', () => {
@@ -232,7 +236,7 @@ describe('TokenListItem', () => {
 
   it('handles clicking staking opens tab', async () => {
     const store = configureMockStore()(state);
-    const { queryByTestId } = renderWithProvider(
+    const { queryByTestId, container } = renderWithProvider(
       <TokenListItem isStakeable {...props} />,
       store,
     );
@@ -243,6 +247,7 @@ describe('TokenListItem', () => {
 
     expect(stakeButton).toBeInTheDocument();
     expect(stakeButton).not.toBeDisabled();
+    expect(container).toMatchSnapshot();
 
     stakeButton && fireEvent.click(stakeButton);
     expect(openTabSpy).toHaveBeenCalledTimes(1);
diff --git a/ui/components/multichain/token-list-item/token-list-item.tsx b/ui/components/multichain/token-list-item/token-list-item.tsx
index 5ee4c19c8c52..76152770dbc9 100644
--- a/ui/components/multichain/token-list-item/token-list-item.tsx
+++ b/ui/components/multichain/token-list-item/token-list-item.tsx
@@ -5,7 +5,6 @@ import classnames from 'classnames';
 import { getNativeTokenAddress } from '@metamask/assets-controllers';
 import { Hex } from '@metamask/utils';
 import {
-  AlignItems,
   BackgroundColor,
   BlockSize,
   Display,
@@ -69,6 +68,7 @@ import {
   SafeChain,
   useSafeChains,
 } from '../../../pages/settings/networks-tab/networks-form/use-safe-chains';
+import { NETWORK_TO_SHORT_NETWORK_NAME_MAP } from '../../../../shared/constants/bridge';
 import { PercentageChange } from './price/percentage-change/percentage-change';
 
 type TokenListItemProps = {
@@ -82,6 +82,8 @@ type TokenListItemProps = {
   tooltipText?: string;
   isNativeCurrency?: boolean;
   isStakeable?: boolean;
+  isTitleNetworkName?: boolean;
+  isTitleHidden?: boolean;
   tokenChainImage?: string;
   chainId: string;
   address?: string | null;
@@ -104,6 +106,8 @@ export const TokenListItem = ({
   isPrimaryTokenSymbolHidden = false,
   isNativeCurrency = false,
   isStakeable = false,
+  isTitleNetworkName = false,
+  isTitleHidden = false,
   address = null,
   showPercentage = false,
   privacyMode = false,
@@ -141,6 +145,14 @@ export const TokenListItem = ({
   const history = useHistory();
 
   const getTokenTitle = () => {
+    if (isTitleNetworkName) {
+      return NETWORK_TO_SHORT_NETWORK_NAME_MAP[
+        chainId as keyof typeof NETWORK_TO_SHORT_NETWORK_NAME_MAP
+      ];
+    }
+    if (isTitleHidden) {
+      return undefined;
+    }
     switch (title) {
       case CURRENCY_SYMBOLS.ETH:
         return t('networkNameEthereum');
@@ -160,9 +172,8 @@ export const TokenListItem = ({
     : null;
 
   const tokenTitle = getTokenTitle();
-  const tokenMainTitleToDisplay = shouldShowPercentage
-    ? tokenTitle
-    : tokenSymbol;
+  const tokenMainTitleToDisplay =
+    shouldShowPercentage && !isTitleNetworkName ? tokenTitle : tokenSymbol;
 
   const stakeableTitle = (
     <Box
@@ -225,7 +236,9 @@ export const TokenListItem = ({
     <Box
       className={classnames('multichain-token-list-item', className || {})}
       display={Display.Flex}
-      flexDirection={FlexDirection.Column}
+      flexDirection={FlexDirection.Row}
+      width={BlockSize.Full}
+      height={BlockSize.Full}
       gap={4}
       data-testid="multichain-token-list-item"
       title={tooltipText ? t(tooltipText) : undefined}
@@ -241,6 +254,8 @@ export const TokenListItem = ({
         paddingBottom={2}
         paddingLeft={4}
         paddingRight={4}
+        width={BlockSize.Full}
+        style={{ height: 62 }}
         data-testid="multichain-token-list-button"
         {...(onClick && {
           as: 'a',
@@ -287,156 +302,127 @@ export const TokenListItem = ({
           flexDirection={FlexDirection.Column}
           width={BlockSize.Full}
           style={{ flexGrow: 1, overflow: 'hidden' }}
+          justifyContent={JustifyContent.center}
         >
           <Box
             display={Display.Flex}
             flexDirection={FlexDirection.Row}
             justifyContent={JustifyContent.spaceBetween}
-            gap={1}
           >
-            <Box
-              width={isStakeable ? BlockSize.Half : BlockSize.OneThird}
-              display={Display.InlineBlock}
-            >
-              {title?.length > 12 ? (
-                <Tooltip
-                  position="bottom"
-                  html={title}
-                  tooltipInnerClassName="multichain-token-list-item__tooltip"
-                >
-                  <Text
-                    as="span"
-                    fontWeight={FontWeight.Medium}
-                    variant={TextVariant.bodyMd}
-                    display={Display.Block}
-                    ellipsis
-                  >
-                    {isStakeable ? (
-                      <>
-                        {tokenMainTitleToDisplay} {stakeableTitle}
-                      </>
-                    ) : (
-                      tokenMainTitleToDisplay
-                    )}
-                  </Text>
-                </Tooltip>
-              ) : (
+            {title?.length > 12 ? (
+              <Tooltip
+                position="bottom"
+                html={title}
+                tooltipInnerClassName="multichain-token-list-item__tooltip"
+              >
                 <Text
                   as="span"
                   fontWeight={FontWeight.Medium}
                   variant={TextVariant.bodyMd}
+                  display={Display.Block}
                   ellipsis
                 >
-                  {isStakeable ? (
-                    <Box display={Display.InlineBlock}>
-                      {tokenMainTitleToDisplay}
-                      {stakeableTitle}
-                    </Box>
-                  ) : (
-                    tokenMainTitleToDisplay
-                  )}
+                  {tokenMainTitleToDisplay}
+                  {isStakeable && stakeableTitle}
                 </Text>
-              )}
-
-              {shouldShowPercentage ? (
-                <PercentageChange
-                  value={
-                    isNativeCurrency
-                      ? multiChainMarketData?.[chainId]?.[
-                          getNativeTokenAddress(chainId as Hex)
-                        ]?.pricePercentChange1d
-                      : tokenPercentageChange
-                  }
-                  address={
-                    isNativeCurrency
-                      ? getNativeTokenAddress(chainId as Hex)
-                      : (address as `0x${string}`)
-                  }
-                />
-              ) : (
-                <Text
-                  variant={TextVariant.bodyMd}
-                  color={TextColor.textAlternative}
-                  data-testid="multichain-token-list-item-token-name"
-                  ellipsis
-                >
-                  {tokenTitle}
-                </Text>
-              )}
-            </Box>
-
-            {showScamWarning ? (
-              <Box
-                display={Display.Flex}
-                flexDirection={FlexDirection.Column}
-                width={isStakeable ? BlockSize.Half : BlockSize.TwoThirds}
-                alignItems={AlignItems.flexEnd}
+              </Tooltip>
+            ) : (
+              <Text
+                fontWeight={FontWeight.Medium}
+                variant={TextVariant.bodyMd}
+                ellipsis
               >
-                <ButtonIcon
-                  iconName={IconName.Danger}
-                  onClick={(
-                    e: React.MouseEvent<HTMLButtonElement, MouseEvent>,
-                  ) => {
-                    e.preventDefault();
-                    e.stopPropagation();
-                    setShowScamWarningModal(true);
-                  }}
-                  color={IconColor.errorDefault}
-                  size={ButtonIconSize.Md}
-                  backgroundColor={BackgroundColor.transparent}
-                  data-testid="scam-warning"
-                  ariaLabel={''}
-                />
+                {tokenMainTitleToDisplay}
+                {isStakeable && stakeableTitle}
+              </Text>
+            )}
 
-                <SensitiveText
-                  data-testid="multichain-token-list-item-value"
-                  color={TextColor.textAlternative}
-                  variant={TextVariant.bodyMd}
-                  textAlign={TextAlign.End}
-                  isHidden={privacyMode}
-                  length={SensitiveTextLength.Short}
-                >
-                  {primary} {isPrimaryTokenSymbolHidden ? '' : tokenSymbol}
-                </SensitiveText>
-              </Box>
+            {showScamWarning ? (
+              <ButtonIcon
+                iconName={IconName.Danger}
+                onClick={(
+                  e: React.MouseEvent<HTMLButtonElement, MouseEvent>,
+                ) => {
+                  e.preventDefault();
+                  e.stopPropagation();
+                  setShowScamWarningModal(true);
+                }}
+                color={IconColor.errorDefault}
+                size={ButtonIconSize.Md}
+                backgroundColor={BackgroundColor.transparent}
+                data-testid="scam-warning"
+                ariaLabel={''}
+              />
             ) : (
-              <Box
-                display={Display.Flex}
-                flexDirection={FlexDirection.Column}
-                width={isStakeable ? BlockSize.Half : BlockSize.TwoThirds}
-                alignItems={AlignItems.flexEnd}
+              <SensitiveText
+                fontWeight={FontWeight.Medium}
+                variant={TextVariant.bodyMd}
+                textAlign={TextAlign.End}
+                data-testid="multichain-token-list-item-secondary-value"
+                ellipsis={isStakeable}
+                isHidden={privacyMode}
+                length={SensitiveTextLength.Medium}
               >
-                <SensitiveText
-                  fontWeight={FontWeight.Medium}
-                  variant={TextVariant.bodyMd}
-                  width={isStakeable ? BlockSize.Half : BlockSize.TwoThirds}
-                  textAlign={TextAlign.End}
-                  data-testid="multichain-token-list-item-secondary-value"
-                  ellipsis={isStakeable}
-                  isHidden={privacyMode}
-                  length={SensitiveTextLength.Medium}
-                >
-                  {secondary}
-                </SensitiveText>
-                <SensitiveText
-                  data-testid="multichain-token-list-item-value"
-                  color={TextColor.textAlternative}
-                  variant={TextVariant.bodySmMedium}
-                  textAlign={TextAlign.End}
-                  isHidden={privacyMode}
-                  length={SensitiveTextLength.Short}
-                >
-                  {primary} {isPrimaryTokenSymbolHidden ? '' : tokenSymbol}
-                </SensitiveText>
-              </Box>
+                {secondary}
+              </SensitiveText>
             )}
           </Box>
+
           <Box
             display={Display.Flex}
             flexDirection={FlexDirection.Row}
             justifyContent={JustifyContent.spaceBetween}
-            gap={1}
-          ></Box>
+          >
+            {shouldShowPercentage ? (
+              <PercentageChange
+                value={
+                  isNativeCurrency
+                    ? multiChainMarketData?.[chainId]?.[
+                        getNativeTokenAddress(chainId as Hex)
+                      ]?.pricePercentChange1d
+                    : tokenPercentageChange
+                }
+                address={
+                  isNativeCurrency
+                    ? getNativeTokenAddress(chainId as Hex)
+                    : (address as `0x${string}`)
+                }
+              />
+            ) : (
+              <Text
+                variant={TextVariant.bodySmMedium}
+                color={TextColor.textAlternative}
+                data-testid="multichain-token-list-item-token-name"
+                ellipsis
+              >
+                {tokenTitle}
+              </Text>
+            )}
+
+            {showScamWarning ? (
+              <SensitiveText
+                data-testid="multichain-token-list-item-value"
+                color={TextColor.textAlternative}
+                variant={TextVariant.bodyMd}
+                textAlign={TextAlign.End}
+                isHidden={privacyMode}
+                length={SensitiveTextLength.Short}
+              >
+                {primary} {isPrimaryTokenSymbolHidden ? '' : tokenSymbol}
+              </SensitiveText>
+            ) : (
+              <SensitiveText
+                data-testid="multichain-token-list-item-value"
+                color={TextColor.textAlternative}
+                variant={TextVariant.bodySmMedium}
+                textAlign={TextAlign.End}
+                isHidden={privacyMode}
+                length={SensitiveTextLength.Short}
+              >
+                {primary} {isPrimaryTokenSymbolHidden ? '' : tokenSymbol}
+              </SensitiveText>
+            )}
+          </Box>
         </Box>
       </Box>
       {isEvm && showScamWarningModal ? (
diff --git a/ui/ducks/bridge/utils.ts b/ui/ducks/bridge/utils.ts
index 1ddd7871d4df..638ba92e9ae8 100644
--- a/ui/ducks/bridge/utils.ts
+++ b/ui/ducks/bridge/utils.ts
@@ -2,6 +2,10 @@ import { Hex } from '@metamask/utils';
 import { BigNumber } from 'bignumber.js';
 import { getAddress } from 'ethers/lib/utils';
 import { ContractMarketData } from '@metamask/assets-controllers';
+import {
+  AddNetworkFields,
+  NetworkConfiguration,
+} from '@metamask/network-controller';
 import { decGWEIToHexWEI } from '../../../shared/modules/conversion.utils';
 import { Numeric } from '../../../shared/modules/Numeric';
 import { TxData } from '../../pages/bridge/types';
@@ -133,3 +137,8 @@ export const exchangeRatesFromNativeAndCurrencyRates = (
         : null,
   };
 };
+
+export const isNetworkAdded = (
+  v: NetworkConfiguration | AddNetworkFields | undefined,
+): v is NetworkConfiguration =>
+  !v || 'networkClientId' in v.rpcEndpoints[v.defaultRpcEndpointIndex];
diff --git a/ui/hooks/useMultichainBalances.test.ts b/ui/hooks/useMultichainBalances.test.ts
new file mode 100644
index 000000000000..7bcdc74e8418
--- /dev/null
+++ b/ui/hooks/useMultichainBalances.test.ts
@@ -0,0 +1,121 @@
+import { createBridgeMockStore } from '../../test/jest/mock-store';
+import { renderHookWithProvider } from '../../test/lib/render-helpers';
+import { useMultichainBalances } from './useMultichainBalances';
+
+describe('useMultichainBalances', () => {
+  it('should return the native token of each imported network when no token balances are cached', () => {
+    const mockStore = createBridgeMockStore({
+      metamaskStateOverrides: {
+        allTokens: {},
+      },
+    });
+    const { result } = renderHookWithProvider(
+      () => useMultichainBalances(),
+      mockStore,
+    );
+
+    expect(result.current.assetsWithBalance).toHaveLength(2);
+    expect(result.current.assetsWithBalance).toStrictEqual(
+      expect.objectContaining([
+        {
+          balance: '0.000000000000000014',
+          chainId: '0xe708',
+          decimals: 18,
+          image: './images/eth_logo.svg',
+          string: '0.000000000000000014',
+          symbol: 'ETH',
+          tokenFiatAmount: 3.53395e-14,
+          type: 'NATIVE',
+        },
+        {
+          balance: '0.00000000000000001',
+          chainId: '0x1',
+          decimals: 18,
+          image: './images/eth_logo.svg',
+          string: '0.00000000000000001',
+          symbol: 'ETH',
+          tokenFiatAmount: 2.5242500000000003e-14,
+          type: 'NATIVE',
+        },
+      ]),
+    );
+  });
+
+  it('should return a list of assets with balances', () => {
+    const mockStore = createBridgeMockStore();
+    const { result } = renderHookWithProvider(
+      () => useMultichainBalances(),
+      mockStore,
+    );
+
+    expect(result.current.assetsWithBalance).toHaveLength(5);
+    expect(result.current.assetsWithBalance).toStrictEqual(
+      expect.objectContaining([
+        {
+          address: '0x1f9840a85d5af5bf1d1762f925bdaddc4201f984',
+          balance: '0.00184',
+          chainId: '0x1',
+          decimals: 6,
+          image: undefined,
+          isNative: false,
+          string: '0.00184',
+          tokenFiatAmount: 0.004232,
+          type: 'TOKEN',
+        },
+        {
+          balance: '0.000000000000000014',
+          chainId: '0xe708',
+          decimals: 18,
+          image: './images/eth_logo.svg',
+          string: '0.000000000000000014',
+          symbol: 'ETH',
+          tokenFiatAmount: 3.53395e-14,
+          type: 'NATIVE',
+        },
+        {
+          balance: '0.00000000000000001',
+          chainId: '0x1',
+          decimals: 18,
+          image: './images/eth_logo.svg',
+          string: '0.00000000000000001',
+          symbol: 'ETH',
+          tokenFiatAmount: 2.5242500000000003e-14,
+          type: 'NATIVE',
+        },
+        {
+          address: '0x514910771af9ca656af840dff83e8264ecf986ca',
+          balance: '1',
+          chainId: '0x1',
+          image: undefined,
+          isNative: false,
+          string: '1',
+          tokenFiatAmount: null,
+          type: 'TOKEN',
+        },
+        {
+          address: '0x1f9840a85d5af5bf1d1762f925bdaddc4201f984',
+          balance: '0',
+          chainId: '0xe708',
+          image: undefined,
+          isNative: false,
+          string: '0',
+          tokenFiatAmount: null,
+          type: 'TOKEN',
+        },
+      ]),
+    );
+  });
+
+  it('should return a mapping of chainId to balance', () => {
+    const mockStore = createBridgeMockStore();
+    const { result } = renderHookWithProvider(
+      () => useMultichainBalances(),
+      mockStore,
+    );
+
+    expect(result.current.balanceByChainId).toStrictEqual({
+      '0x1': 0.0042320000000252425,
+      '0xe708': 3.53395e-14,
+    });
+  });
+});
diff --git a/ui/hooks/useMultichainBalances.ts b/ui/hooks/useMultichainBalances.ts
new file mode 100644
index 000000000000..b953043f7851
--- /dev/null
+++ b/ui/hooks/useMultichainBalances.ts
@@ -0,0 +1,154 @@
+import { useMemo } from 'react';
+import { useSelector } from 'react-redux';
+import { Hex } from '@metamask/utils';
+import {
+  getCurrencyRates,
+  getMarketData,
+  getSelectedAccount,
+  getSelectedAccountNativeTokenCachedBalanceByChainId,
+  getSelectedAccountTokensAcrossChains,
+  selectERC20TokensByChain,
+} from '../selectors';
+import {
+  ChainAddressMarketData,
+  Token,
+} from '../components/app/assets/token-list/token-list';
+import { calculateTokenFiatAmount } from '../components/app/assets/util/calculateTokenFiatAmount';
+import { calculateTokenBalance } from '../components/app/assets/util/calculateTokenBalance';
+import {
+  CHAIN_ID_TO_CURRENCY_SYMBOL_MAP,
+  CHAIN_ID_TOKEN_IMAGE_MAP,
+  TEST_CHAINS,
+} from '../../shared/constants/network';
+import {
+  AssetWithDisplayData,
+  ERC20Asset,
+  NativeAsset,
+} from '../components/multichain/asset-picker-amount/asset-picker-modal/types';
+import { AssetType } from '../../shared/constants/transaction';
+import { useTokenBalances } from './useTokenBalances';
+
+const useFilteredAccountTokens = () => {
+  const selectedAccountTokensChains: Record<string, Token[]> = useSelector(
+    getSelectedAccountTokensAcrossChains,
+  ) as Record<string, Token[]>;
+
+  const filteredAccountTokensChains = useMemo(() => {
+    return Object.fromEntries(
+      Object.entries(selectedAccountTokensChains).filter(
+        ([chainId]) => !(TEST_CHAINS as string[]).includes(chainId),
+      ),
+    );
+  }, [selectedAccountTokensChains, TEST_CHAINS]);
+
+  return filteredAccountTokensChains;
+};
+
+// This hook is used to get the balances of all tokens across all chains
+// native balances are included, with fields isNative=true and address=''
+export const useMultichainBalances = () => {
+  const selectedAccountTokensChains = useFilteredAccountTokens();
+  const selectedAccount = useSelector(getSelectedAccount);
+
+  const { tokenBalances } = useTokenBalances();
+  const selectedAccountTokenBalancesAcrossChains =
+    tokenBalances[selectedAccount.address];
+
+  const marketData: ChainAddressMarketData = useSelector(
+    getMarketData,
+  ) as ChainAddressMarketData;
+
+  const currencyRates = useSelector(getCurrencyRates);
+  const nativeBalances: Record<Hex, Hex> = useSelector(
+    getSelectedAccountNativeTokenCachedBalanceByChainId,
+  ) as Record<Hex, Hex>;
+
+  const erc20TokensByChain = useSelector(selectERC20TokensByChain);
+
+  const assetsWithBalance = useMemo(() => {
+    const tokensWithBalance: AssetWithDisplayData<ERC20Asset | NativeAsset>[] =
+      [];
+
+    Object.entries(selectedAccountTokensChains).forEach(
+      ([stringChainKey, tokens]) => {
+        const chainId = stringChainKey as Hex;
+        tokens.forEach((token: Token) => {
+          const { isNative, address, decimals } = token;
+          const balance =
+            calculateTokenBalance({
+              isNative,
+              chainId,
+              address,
+              decimals,
+              nativeBalances,
+              selectedAccountTokenBalancesAcrossChains,
+            }) || '';
+
+          const tokenFiatAmount = calculateTokenFiatAmount({
+            token,
+            chainId,
+            balance,
+            marketData,
+            currencyRates,
+          });
+
+          // Append processed token with balance and fiat amount
+          const sharedFields = {
+            balance,
+            tokenFiatAmount,
+            chainId,
+            string: String(balance),
+          };
+          if (token.isNative) {
+            tokensWithBalance.push({
+              ...sharedFields,
+              type: AssetType.native,
+              image:
+                CHAIN_ID_TOKEN_IMAGE_MAP[
+                  chainId as keyof typeof CHAIN_ID_TOKEN_IMAGE_MAP
+                ],
+              symbol:
+                CHAIN_ID_TO_CURRENCY_SYMBOL_MAP[
+                  chainId as keyof typeof CHAIN_ID_TO_CURRENCY_SYMBOL_MAP
+                ],
+              decimals: token.decimals,
+            });
+          } else {
+            tokensWithBalance.push({
+              ...token,
+              ...sharedFields,
+              image:
+                token.image ||
+                erc20TokensByChain?.[chainId]?.data?.[
+                  token.address.toLowerCase()
+                ]?.iconUrl,
+              address: token.address,
+              type: AssetType.token,
+            });
+          }
+        });
+      },
+    );
+
+    return tokensWithBalance.sort(
+      (a, b) => (b.tokenFiatAmount ?? 0) - (a.tokenFiatAmount ?? 0),
+    );
+  }, [JSON.stringify(selectedAccountTokensChains)]);
+
+  const balanceByChainId = useMemo(() => {
+    return assetsWithBalance.reduce(
+      (acc: Record<`0x${string}`, number>, { chainId, tokenFiatAmount }) => {
+        if (!acc[chainId]) {
+          acc[chainId] = 0;
+        }
+        if (tokenFiatAmount) {
+          acc[chainId] += tokenFiatAmount;
+        }
+        return acc;
+      },
+      {},
+    );
+  }, [assetsWithBalance]);
+
+  return { assetsWithBalance, balanceByChainId };
+};
diff --git a/ui/hooks/useTokensWithFiltering.test.ts b/ui/hooks/useTokensWithFiltering.test.ts
index f5ea05e02b8d..0a523b69bd74 100644
--- a/ui/hooks/useTokensWithFiltering.test.ts
+++ b/ui/hooks/useTokensWithFiltering.test.ts
@@ -61,6 +61,7 @@ describe('useTokensWithFiltering should return token list generator', () => {
       name: 'Ether',
       primaryLabel: 'ETH',
       rawFiat: '',
+      chainId: '0x1',
       rightPrimaryLabel: undefined,
       rightSecondaryLabel: '',
       secondaryLabel: 'Ether',
@@ -74,6 +75,7 @@ describe('useTokensWithFiltering should return token list generator', () => {
       decimals: 18,
       erc20: true,
       erc721: false,
+      chainId: '0x1',
       iconUrl:
         'https://static.cx.metamask.io/api/v1/tokenIcons/1/0x6b3595068778dd592e39a122f4f5a5cf09c90fe2.png',
       identiconAddress: null,
@@ -121,6 +123,7 @@ describe('useTokensWithFiltering should return token list generator', () => {
       identiconAddress: null,
       image: './images/eth_logo.svg',
       name: 'Ether',
+      chainId: '0x1',
       primaryLabel: 'ETH',
       rawFiat: '0',
       rightPrimaryLabel: '0 ETH',
@@ -141,6 +144,7 @@ describe('useTokensWithFiltering should return token list generator', () => {
       identiconAddress: null,
       image: 'images/contract/usdt.svg',
       name: 'Tether USD',
+      chainId: '0x1',
       primaryLabel: 'USDT',
       rawFiat: '',
       rightPrimaryLabel: undefined,
diff --git a/ui/hooks/useTokensWithFiltering.ts b/ui/hooks/useTokensWithFiltering.ts
index d729ce3c1fdc..ef155eb9ca1c 100644
--- a/ui/hooks/useTokensWithFiltering.ts
+++ b/ui/hooks/useTokensWithFiltering.ts
@@ -75,14 +75,20 @@ export const useTokensWithFiltering = (
   );
 
   const filteredTokenListGenerator = useCallback(
-    (shouldAddToken: (symbol: string, address?: string) => boolean) => {
+    (
+      shouldAddToken: (
+        symbol: string,
+        address?: string,
+        tokenChainId?: string,
+      ) => boolean,
+    ) => {
       const buildTokenData = (
         token: SwapsTokenObject,
       ):
         | AssetWithDisplayData<NativeAsset>
         | AssetWithDisplayData<ERC20Asset>
         | undefined => {
-        if (chainId && shouldAddToken(token.symbol, token.address)) {
+        if (chainId && shouldAddToken(token.symbol, token.address, chainId)) {
           return getRenderableTokenData(
             {
               ...token,
@@ -90,6 +96,7 @@ export const useTokensWithFiltering = (
                 ? AssetType.native
                 : AssetType.token,
               image: token.iconUrl,
+              chainId,
             },
             tokenConversionRates,
             conversionRate,
@@ -114,6 +121,7 @@ export const useTokensWithFiltering = (
                   numberOfDecimals: 4,
                   toDenomination: EtherDenomination.ETH,
                 }),
+                chainId,
               }
             : {};
         const nativeToken = buildTokenData({
diff --git a/ui/pages/asset/components/__snapshots__/asset-page.test.tsx.snap b/ui/pages/asset/components/__snapshots__/asset-page.test.tsx.snap
index d6e4c675f8e1..dc3cf4c408de 100644
--- a/ui/pages/asset/components/__snapshots__/asset-page.test.tsx.snap
+++ b/ui/pages/asset/components/__snapshots__/asset-page.test.tsx.snap
@@ -177,13 +177,14 @@ exports[`AssetPage should render a native asset 1`] = `
         Your balance
       </h3>
       <div
-        class="mm-box multichain-token-list-item mm-box--display-flex mm-box--gap-4 mm-box--flex-direction-column"
+        class="mm-box multichain-token-list-item mm-box--display-flex mm-box--gap-4 mm-box--flex-direction-row mm-box--width-full mm-box--height-full"
         data-testid="multichain-token-list-item"
       >
         <a
-          class="mm-box multichain-token-list-item__container-cell multichain-token-list-item__container-cell--clickable mm-box--padding-top-2 mm-box--padding-right-4 mm-box--padding-bottom-2 mm-box--padding-left-4 mm-box--display-flex mm-box--flex-direction-row"
+          class="mm-box multichain-token-list-item__container-cell multichain-token-list-item__container-cell--clickable mm-box--padding-top-2 mm-box--padding-right-4 mm-box--padding-bottom-2 mm-box--padding-left-4 mm-box--display-flex mm-box--flex-direction-row mm-box--width-full"
           data-testid="multichain-token-list-button"
           href="#"
+          style="height: 62px;"
         >
           <div
             class="mm-box mm-badge-wrapper multichain-token-list-item__badge mm-box--margin-right-4 mm-box--display-inline-block"
@@ -208,51 +209,44 @@ exports[`AssetPage should render a native asset 1`] = `
             </div>
           </div>
           <div
-            class="mm-box multichain-token-list-item__container-cell--text-container mm-box--display-flex mm-box--flex-direction-column mm-box--width-full"
+            class="mm-box multichain-token-list-item__container-cell--text-container mm-box--display-flex mm-box--flex-direction-column mm-box--justify-content-center mm-box--width-full"
             style="flex-grow: 1; overflow: hidden;"
           >
             <div
-              class="mm-box mm-box--display-flex mm-box--gap-1 mm-box--flex-direction-row mm-box--justify-content-space-between"
+              class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-space-between"
             >
-              <div
-                class="mm-box mm-box--display-inline-block mm-box--width-1/3"
+              <p
+                class="mm-box mm-text mm-text--body-md mm-text--font-weight-medium mm-text--ellipsis mm-box--color-text-default"
               >
-                <span
-                  class="mm-box mm-text mm-text--body-md mm-text--font-weight-medium mm-text--ellipsis mm-box--color-text-default"
-                >
-                  TEST
-                </span>
-                <div
-                  class="mm-box mm-box--display-flex"
-                >
-                  <p
-                    class="mm-box mm-text mm-text--body-sm-medium mm-text--ellipsis mm-box--color-text-default"
-                    data-testid="token-increase-decrease-percentage-0x0000000000000000000000000000000000000000"
-                  />
-                </div>
-              </div>
+                TEST
+              </p>
+              <p
+                class="mm-box mm-text mm-text--body-md mm-text--font-weight-medium mm-text--text-align-end mm-box--color-text-default"
+                data-testid="multichain-token-list-item-secondary-value"
+              >
+                $0.00
+              </p>
+            </div>
+            <div
+              class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-space-between"
+            >
               <div
-                class="mm-box mm-box--display-flex mm-box--flex-direction-column mm-box--align-items-flex-end mm-box--width-2/3"
+                class="mm-box mm-box--display-flex"
               >
                 <p
-                  class="mm-box mm-text mm-text--body-md mm-text--font-weight-medium mm-text--text-align-end mm-box--width-2/3 mm-box--color-text-default"
-                  data-testid="multichain-token-list-item-secondary-value"
-                >
-                  $0.00
-                </p>
-                <p
-                  class="mm-box mm-text mm-text--body-sm-medium mm-text--text-align-end mm-box--color-text-alternative"
-                  data-testid="multichain-token-list-item-value"
-                >
-                  0
-                   
-                  TEST
-                </p>
+                  class="mm-box mm-text mm-text--body-sm-medium mm-text--ellipsis mm-box--color-text-default"
+                  data-testid="token-increase-decrease-percentage-0x0000000000000000000000000000000000000000"
+                />
               </div>
+              <p
+                class="mm-box mm-text mm-text--body-sm-medium mm-text--text-align-end mm-box--color-text-alternative"
+                data-testid="multichain-token-list-item-value"
+              >
+                0
+                 
+                TEST
+              </p>
             </div>
-            <div
-              class="mm-box mm-box--display-flex mm-box--gap-1 mm-box--flex-direction-row mm-box--justify-content-space-between"
-            />
           </div>
         </a>
       </div>
@@ -502,13 +496,14 @@ exports[`AssetPage should render an ERC20 asset without prices 1`] = `
         Your balance
       </h3>
       <div
-        class="mm-box multichain-token-list-item mm-box--display-flex mm-box--gap-4 mm-box--flex-direction-column"
+        class="mm-box multichain-token-list-item mm-box--display-flex mm-box--gap-4 mm-box--flex-direction-row mm-box--width-full mm-box--height-full"
         data-testid="multichain-token-list-item"
       >
         <a
-          class="mm-box multichain-token-list-item__container-cell multichain-token-list-item__container-cell--clickable mm-box--padding-top-2 mm-box--padding-right-4 mm-box--padding-bottom-2 mm-box--padding-left-4 mm-box--display-flex mm-box--flex-direction-row"
+          class="mm-box multichain-token-list-item__container-cell multichain-token-list-item__container-cell--clickable mm-box--padding-top-2 mm-box--padding-right-4 mm-box--padding-bottom-2 mm-box--padding-left-4 mm-box--display-flex mm-box--flex-direction-row mm-box--width-full"
           data-testid="multichain-token-list-button"
           href="#"
+          style="height: 62px;"
         >
           <div
             class="mm-box mm-badge-wrapper multichain-token-list-item__badge mm-box--margin-right-4 mm-box--display-inline-block"
@@ -533,51 +528,44 @@ exports[`AssetPage should render an ERC20 asset without prices 1`] = `
             </div>
           </div>
           <div
-            class="mm-box multichain-token-list-item__container-cell--text-container mm-box--display-flex mm-box--flex-direction-column mm-box--width-full"
+            class="mm-box multichain-token-list-item__container-cell--text-container mm-box--display-flex mm-box--flex-direction-column mm-box--justify-content-center mm-box--width-full"
             style="flex-grow: 1; overflow: hidden;"
           >
             <div
-              class="mm-box mm-box--display-flex mm-box--gap-1 mm-box--flex-direction-row mm-box--justify-content-space-between"
+              class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-space-between"
             >
-              <div
-                class="mm-box mm-box--display-inline-block mm-box--width-1/3"
+              <p
+                class="mm-box mm-text mm-text--body-md mm-text--font-weight-medium mm-text--ellipsis mm-box--color-text-default"
               >
-                <span
-                  class="mm-box mm-text mm-text--body-md mm-text--font-weight-medium mm-text--ellipsis mm-box--color-text-default"
-                >
-                  TEST
-                </span>
-                <div
-                  class="mm-box mm-box--display-flex"
-                >
-                  <p
-                    class="mm-box mm-text mm-text--body-sm-medium mm-text--ellipsis mm-box--color-text-default"
-                    data-testid="token-increase-decrease-percentage-0x309375769E79382beFDEc5bdab51063AeBDC4936"
-                  />
-                </div>
-              </div>
+                TEST
+              </p>
+              <p
+                class="mm-box mm-text mm-text--body-md mm-text--font-weight-medium mm-text--text-align-end mm-box--color-text-default"
+                data-testid="multichain-token-list-item-secondary-value"
+              >
+                $0.00
+              </p>
+            </div>
+            <div
+              class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-space-between"
+            >
               <div
-                class="mm-box mm-box--display-flex mm-box--flex-direction-column mm-box--align-items-flex-end mm-box--width-2/3"
+                class="mm-box mm-box--display-flex"
               >
                 <p
-                  class="mm-box mm-text mm-text--body-md mm-text--font-weight-medium mm-text--text-align-end mm-box--width-2/3 mm-box--color-text-default"
-                  data-testid="multichain-token-list-item-secondary-value"
-                >
-                  $0.00
-                </p>
-                <p
-                  class="mm-box mm-text mm-text--body-sm-medium mm-text--text-align-end mm-box--color-text-alternative"
-                  data-testid="multichain-token-list-item-value"
-                >
-                  0
-                   
-                  TEST
-                </p>
+                  class="mm-box mm-text mm-text--body-sm-medium mm-text--ellipsis mm-box--color-text-default"
+                  data-testid="token-increase-decrease-percentage-0x309375769E79382beFDEc5bdab51063AeBDC4936"
+                />
               </div>
+              <p
+                class="mm-box mm-text mm-text--body-sm-medium mm-text--text-align-end mm-box--color-text-alternative"
+                data-testid="multichain-token-list-item-value"
+              >
+                0
+                 
+                TEST
+              </p>
             </div>
-            <div
-              class="mm-box mm-box--display-flex mm-box--gap-1 mm-box--flex-direction-row mm-box--justify-content-space-between"
-            />
           </div>
         </a>
       </div>
@@ -1013,13 +1001,14 @@ exports[`AssetPage should render an ERC20 token with prices 1`] = `
         Your balance
       </h3>
       <div
-        class="mm-box multichain-token-list-item mm-box--display-flex mm-box--gap-4 mm-box--flex-direction-column"
+        class="mm-box multichain-token-list-item mm-box--display-flex mm-box--gap-4 mm-box--flex-direction-row mm-box--width-full mm-box--height-full"
         data-testid="multichain-token-list-item"
       >
         <a
-          class="mm-box multichain-token-list-item__container-cell multichain-token-list-item__container-cell--clickable mm-box--padding-top-2 mm-box--padding-right-4 mm-box--padding-bottom-2 mm-box--padding-left-4 mm-box--display-flex mm-box--flex-direction-row"
+          class="mm-box multichain-token-list-item__container-cell multichain-token-list-item__container-cell--clickable mm-box--padding-top-2 mm-box--padding-right-4 mm-box--padding-bottom-2 mm-box--padding-left-4 mm-box--display-flex mm-box--flex-direction-row mm-box--width-full"
           data-testid="multichain-token-list-button"
           href="#"
+          style="height: 62px;"
         >
           <div
             class="mm-box mm-badge-wrapper multichain-token-list-item__badge mm-box--margin-right-4 mm-box--display-inline-block"
@@ -1044,51 +1033,44 @@ exports[`AssetPage should render an ERC20 token with prices 1`] = `
             </div>
           </div>
           <div
-            class="mm-box multichain-token-list-item__container-cell--text-container mm-box--display-flex mm-box--flex-direction-column mm-box--width-full"
+            class="mm-box multichain-token-list-item__container-cell--text-container mm-box--display-flex mm-box--flex-direction-column mm-box--justify-content-center mm-box--width-full"
             style="flex-grow: 1; overflow: hidden;"
           >
             <div
-              class="mm-box mm-box--display-flex mm-box--gap-1 mm-box--flex-direction-row mm-box--justify-content-space-between"
+              class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-space-between"
             >
-              <div
-                class="mm-box mm-box--display-inline-block mm-box--width-1/3"
+              <p
+                class="mm-box mm-text mm-text--body-md mm-text--font-weight-medium mm-text--ellipsis mm-box--color-text-default"
               >
-                <span
-                  class="mm-box mm-text mm-text--body-md mm-text--font-weight-medium mm-text--ellipsis mm-box--color-text-default"
-                >
-                  TEST
-                </span>
-                <div
-                  class="mm-box mm-box--display-flex"
-                >
-                  <p
-                    class="mm-box mm-text mm-text--body-sm-medium mm-text--ellipsis mm-box--color-text-default"
-                    data-testid="token-increase-decrease-percentage-0xe4246B1Ac0Ba6839d9efA41a8A30AE3007185f55"
-                  />
-                </div>
-              </div>
+                TEST
+              </p>
+              <p
+                class="mm-box mm-text mm-text--body-md mm-text--font-weight-medium mm-text--text-align-end mm-box--color-text-default"
+                data-testid="multichain-token-list-item-secondary-value"
+              >
+                $0.00
+              </p>
+            </div>
+            <div
+              class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-space-between"
+            >
               <div
-                class="mm-box mm-box--display-flex mm-box--flex-direction-column mm-box--align-items-flex-end mm-box--width-2/3"
+                class="mm-box mm-box--display-flex"
               >
                 <p
-                  class="mm-box mm-text mm-text--body-md mm-text--font-weight-medium mm-text--text-align-end mm-box--width-2/3 mm-box--color-text-default"
-                  data-testid="multichain-token-list-item-secondary-value"
-                >
-                  $0.00
-                </p>
-                <p
-                  class="mm-box mm-text mm-text--body-sm-medium mm-text--text-align-end mm-box--color-text-alternative"
-                  data-testid="multichain-token-list-item-value"
-                >
-                  0
-                   
-                  TEST
-                </p>
+                  class="mm-box mm-text mm-text--body-sm-medium mm-text--ellipsis mm-box--color-text-default"
+                  data-testid="token-increase-decrease-percentage-0xe4246B1Ac0Ba6839d9efA41a8A30AE3007185f55"
+                />
               </div>
+              <p
+                class="mm-box mm-text mm-text--body-sm-medium mm-text--text-align-end mm-box--color-text-alternative"
+                data-testid="multichain-token-list-item-value"
+              >
+                0
+                 
+                TEST
+              </p>
             </div>
-            <div
-              class="mm-box mm-box--display-flex mm-box--gap-1 mm-box--flex-direction-row mm-box--justify-content-space-between"
-            />
           </div>
         </a>
       </div>
diff --git a/ui/pages/bridge/prepare/__snapshots__/prepare-bridge-page.test.tsx.snap b/ui/pages/bridge/prepare/__snapshots__/prepare-bridge-page.test.tsx.snap
index 8c73ba3c82b2..b4873c7e1c89 100644
--- a/ui/pages/bridge/prepare/__snapshots__/prepare-bridge-page.test.tsx.snap
+++ b/ui/pages/bridge/prepare/__snapshots__/prepare-bridge-page.test.tsx.snap
@@ -142,11 +142,43 @@ exports[`PrepareBridgePage should render the component, with initial state 1`] =
             <span
               class="mm-box mm-text mm-text--inherit mm-box--color-text-default"
             >
-              <p
-                class="mm-box mm-text asset-picker__fallback mm-text--body-md mm-box--color-text-default"
+              <div
+                class="mm-box mm-box--display-flex mm-box--gap-3 mm-box--align-items-center"
               >
-                Select token
-              </p>
+                <div
+                  class="mm-box mm-box--display-flex"
+                >
+                  <div
+                    class="mm-box mm-badge-wrapper mm-box--display-inline-block"
+                  >
+                    <div
+                      class="mm-box mm-text mm-avatar-base mm-avatar-base--size-md mm-avatar-token mm-text--body-sm mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full"
+                    >
+                      ?
+                    </div>
+                    <div
+                      class="mm-box mm-badge-wrapper__badge-container mm-badge-wrapper__badge-container--rectangular-bottom-right"
+                    >
+                      <div
+                        class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-network mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-md mm-box--border-color-border-default mm-box--border-width-1 box--border-style-solid"
+                      >
+                        <img
+                          alt="Ethereum Mainnet logo"
+                          class="mm-avatar-network__network-image"
+                          src="./images/eth_logo.svg"
+                        />
+                      </div>
+                    </div>
+                  </div>
+                </div>
+                <div
+                  class="mm-box"
+                >
+                  <p
+                    class="mm-box mm-text asset-picker__symbol mm-text--body-md mm-box--color-text-default"
+                  />
+                </div>
+              </div>
             </span>
             <span
               class="mm-box mm-icon mm-icon--size-sm mm-box--margin-inline-start-0 mm-box--display-inline-block mm-box--color-icon-default"
@@ -314,13 +346,13 @@ exports[`PrepareBridgePage should render the component, with inputs set 1`] = `
           </p>
           <div
             class="mm-box currency-display-component mm-box--display-flex mm-box--flex-wrap-wrap mm-box--align-items-center"
-            title="$0.00"
+            title="$5,805.77"
           >
             <span
               class="mm-box mm-text currency-display-component__text mm-text--inherit mm-text--ellipsis mm-box--color-text-default"
               data-testid="account-value-and-suffix"
             >
-              $0.00
+              $5,805.77
             </span>
           </div>
         </div>
diff --git a/ui/pages/bridge/prepare/bridge-input-group.tsx b/ui/pages/bridge/prepare/bridge-input-group.tsx
index 2627b9e04102..2f8ea8fda1c9 100644
--- a/ui/pages/bridge/prepare/bridge-input-group.tsx
+++ b/ui/pages/bridge/prepare/bridge-input-group.tsx
@@ -44,6 +44,7 @@ const generateAssetFromToken = (
       image: tokenDetails.iconUrl,
       symbol: tokenDetails.symbol,
       address: tokenDetails.address,
+      chainId,
     };
   }
 
@@ -57,6 +58,7 @@ const generateAssetFromToken = (
       CHAIN_ID_TO_CURRENCY_SYMBOL_MAP[
         chainId as keyof typeof CHAIN_ID_TO_CURRENCY_SYMBOL_MAP
       ],
+    chainId,
   };
 };
 
@@ -68,6 +70,7 @@ export const BridgeInputGroup = ({
   onAmountChange,
   networkProps,
   customTokenListGenerator,
+  isMultiselectEnabled,
   amountFieldProps = {},
 }: {
   className: string;
@@ -79,7 +82,11 @@ export const BridgeInputGroup = ({
   >;
 } & Pick<
   React.ComponentProps<typeof AssetPicker>,
-  'networkProps' | 'header' | 'customTokenListGenerator' | 'onAssetChange'
+  | 'networkProps'
+  | 'header'
+  | 'customTokenListGenerator'
+  | 'onAssetChange'
+  | 'isMultiselectEnabled'
 >) => {
   const t = useI18nContext();
 
@@ -123,6 +130,7 @@ export const BridgeInputGroup = ({
           onAssetChange={onAssetChange}
           networkProps={networkProps}
           customTokenListGenerator={customTokenListGenerator}
+          isMultiselectEnabled={isMultiselectEnabled}
         />
         <Tooltip
           containerClassName="amount-tooltip"
diff --git a/ui/pages/bridge/prepare/prepare-bridge-page.test.tsx b/ui/pages/bridge/prepare/prepare-bridge-page.test.tsx
index 1e77461d2464..6803deb301aa 100644
--- a/ui/pages/bridge/prepare/prepare-bridge-page.test.tsx
+++ b/ui/pages/bridge/prepare/prepare-bridge-page.test.tsx
@@ -51,7 +51,6 @@ describe('PrepareBridgePage', () => {
     expect(container).toMatchSnapshot();
 
     expect(getByRole('button', { name: /ETH/u })).toBeInTheDocument();
-    expect(getByRole('button', { name: /Select token/u })).toBeInTheDocument();
 
     expect(getByTestId('from-amount')).toBeInTheDocument();
     expect(getByTestId('from-amount').closest('input')).not.toBeDisabled();
@@ -167,6 +166,7 @@ describe('PrepareBridgePage', () => {
           iconUrl: 'http://url',
           symbol: 'UNI',
           address: '0x1f9840a85d5af5bf1d1762f925bdaddc4201f984',
+          decimals: 6,
         },
         toChainId: CHAIN_IDS.LINEA_MAINNET,
       },
diff --git a/ui/pages/bridge/prepare/prepare-bridge-page.tsx b/ui/pages/bridge/prepare/prepare-bridge-page.tsx
index 2cf97891189f..1533fc1a9c20 100644
--- a/ui/pages/bridge/prepare/prepare-bridge-page.tsx
+++ b/ui/pages/bridge/prepare/prepare-bridge-page.tsx
@@ -50,6 +50,7 @@ import {
 } from '../../../hooks/bridge/useCrossChainSwapsEventTracker';
 import { useRequestProperties } from '../../../hooks/bridge/events/useRequestProperties';
 import { MetaMetricsEventName } from '../../../../shared/constants/metametrics';
+import { isNetworkAdded } from '../../../ducks/bridge/utils';
 import { BridgeInputGroup } from './bridge-input-group';
 
 const PrepareBridgePage = () => {
@@ -194,7 +195,7 @@ const PrepareBridgePage = () => {
       <Box className="prepare-bridge-page__content">
         <BridgeInputGroup
           className="bridge-box"
-          header={t('bridgeFrom')}
+          header={t('swapSelectToken')}
           token={fromToken}
           onAmountChange={(e) => {
             dispatch(setFromTokenInputValue(e));
@@ -219,17 +220,20 @@ const PrepareBridgePage = () => {
               if (networkConfig.chainId === toChain?.chainId) {
                 dispatch(setToChainId(null));
               }
-              dispatch(
-                setActiveNetwork(
-                  networkConfig.rpcEndpoints[
-                    networkConfig.defaultRpcEndpointIndex
-                  ].networkClientId,
-                ),
-              );
+              if (isNetworkAdded(networkConfig)) {
+                dispatch(
+                  setActiveNetwork(
+                    networkConfig.rpcEndpoints[
+                      networkConfig.defaultRpcEndpointIndex
+                    ].networkClientId,
+                  ),
+                );
+              }
               dispatch(setFromChain(networkConfig.chainId));
               dispatch(setFromToken(null));
               dispatch(setFromTokenInputValue(null));
             },
+            header: t('bridgeFrom'),
           }}
           customTokenListGenerator={
             fromTokens && fromTopAssets ? fromTokenListGenerator : undefined
@@ -239,6 +243,7 @@ const PrepareBridgePage = () => {
             autoFocus: true,
             value: fromAmount || undefined,
           }}
+          isMultiselectEnabled={true}
         />
 
         <Box className="prepare-bridge-page__switch-tokens">
@@ -279,7 +284,7 @@ const PrepareBridgePage = () => {
 
         <BridgeInputGroup
           className="bridge-box"
-          header={t('bridgeTo')}
+          header={t('swapSelectToken')}
           token={toToken}
           onAssetChange={(token) => {
             token?.address &&
@@ -300,6 +305,7 @@ const PrepareBridgePage = () => {
               dispatch(setToChainId(networkConfig.chainId));
               dispatch(setToChain(networkConfig.chainId));
             },
+            header: t('bridgeTo'),
           }}
           customTokenListGenerator={
             toChain && toTokens && toTopAssets
diff --git a/ui/pages/confirmations/components/confirm-page-container/confirm-page-container-header/__snapshots__/confirm-page-container-header.component.test.js.snap b/ui/pages/confirmations/components/confirm-page-container/confirm-page-container-header/__snapshots__/confirm-page-container-header.component.test.js.snap
index 98fe98ec4138..78aa89d2bba3 100644
--- a/ui/pages/confirmations/components/confirm-page-container/confirm-page-container-header/__snapshots__/confirm-page-container-header.component.test.js.snap
+++ b/ui/pages/confirmations/components/confirm-page-container/confirm-page-container-header/__snapshots__/confirm-page-container-header.component.test.js.snap
@@ -32,12 +32,12 @@ exports[`Confirm Detail Row Component should match snapshot 1`] = `
         >
           G
         </div>
-        <span
+        <p
           class="mm-box mm-text mm-text--body-sm mm-text--ellipsis mm-box--color-text-default"
           data-testid="network-display"
         >
           Goerli
-        </span>
+        </p>
         <span
           class="mm-box mm-picker-network__arrow-down-icon mm-icon mm-icon--size-xs mm-box--margin-left-auto mm-box--display-none mm-box--color-icon-default"
           style="mask-image: url('./images/icons/arrow-down.svg');"
diff --git a/ui/pages/confirmations/components/signature-request/signature-request-header/__snapshots__/signature-request-header.component.test.js.snap b/ui/pages/confirmations/components/signature-request/signature-request-header/__snapshots__/signature-request-header.component.test.js.snap
index 5cb275d146e1..0dacc3d49c8c 100644
--- a/ui/pages/confirmations/components/signature-request/signature-request-header/__snapshots__/signature-request-header.component.test.js.snap
+++ b/ui/pages/confirmations/components/signature-request/signature-request-header/__snapshots__/signature-request-header.component.test.js.snap
@@ -78,12 +78,12 @@ exports[`SignatureRequestHeader renders correctly with fromAccount 1`] = `
         >
           G
         </div>
-        <span
+        <p
           class="mm-box mm-text mm-text--body-sm mm-text--ellipsis mm-box--color-text-default"
           data-testid="network-display"
         >
           Goerli
-        </span>
+        </p>
         <span
           class="mm-box mm-picker-network__arrow-down-icon mm-icon mm-icon--size-xs mm-box--margin-left-auto mm-box--display-none mm-box--color-icon-default"
           style="mask-image: url('./images/icons/arrow-down.svg');"
@@ -113,12 +113,12 @@ exports[`SignatureRequestHeader renders correctly without fromAccount 1`] = `
         >
           G
         </div>
-        <span
+        <p
           class="mm-box mm-text mm-text--body-sm mm-text--ellipsis mm-box--color-text-default"
           data-testid="network-display"
         >
           Goerli
-        </span>
+        </p>
         <span
           class="mm-box mm-picker-network__arrow-down-icon mm-icon mm-icon--size-xs mm-box--margin-left-auto mm-box--display-none mm-box--color-icon-default"
           style="mask-image: url('./images/icons/arrow-down.svg');"
diff --git a/ui/pages/confirmations/confirm-send-ether/__snapshots__/confirm-send-ether.test.js.snap b/ui/pages/confirmations/confirm-send-ether/__snapshots__/confirm-send-ether.test.js.snap
index 792a9e86e51c..3058b6fac001 100644
--- a/ui/pages/confirmations/confirm-send-ether/__snapshots__/confirm-send-ether.test.js.snap
+++ b/ui/pages/confirmations/confirm-send-ether/__snapshots__/confirm-send-ether.test.js.snap
@@ -87,12 +87,12 @@ exports[`ConfirmSendEther should render correct information for for confirm send
           >
             G
           </div>
-          <span
+          <p
             class="mm-box mm-text mm-text--body-sm mm-text--ellipsis mm-box--color-text-default"
             data-testid="network-display"
           >
             Goerli
-          </span>
+          </p>
           <span
             class="mm-box mm-picker-network__arrow-down-icon mm-icon mm-icon--size-xs mm-box--margin-left-auto mm-box--display-none mm-box--color-icon-default"
             style="mask-image: url('./images/icons/arrow-down.svg');"
diff --git a/ui/pages/permissions-connect/connect-page/__snapshots__/connect-page.test.tsx.snap b/ui/pages/permissions-connect/connect-page/__snapshots__/connect-page.test.tsx.snap
index bd156c765969..3c02fa78f20d 100644
--- a/ui/pages/permissions-connect/connect-page/__snapshots__/connect-page.test.tsx.snap
+++ b/ui/pages/permissions-connect/connect-page/__snapshots__/connect-page.test.tsx.snap
@@ -160,7 +160,7 @@ exports[`ConnectPage should render correctly 1`] = `
                     data-testid="avatar-group"
                   >
                     <div
-                      class="mm-box mm-box--display-flex"
+                      class="mm-box mm-box--display-flex mm-box--align-items-center"
                     >
                       <div
                         class="mm-box mm-box--rounded-full"
@@ -410,7 +410,7 @@ exports[`ConnectPage should render with defaults from the requested permissions
                     data-testid="avatar-group"
                   >
                     <div
-                      class="mm-box mm-box--display-flex"
+                      class="mm-box mm-box--display-flex mm-box--align-items-center"
                     >
                       <div
                         class="mm-box mm-box--rounded-full"

From 25d1b62fa30d5da4c5bb43cb29c79c734db36b21 Mon Sep 17 00:00:00 2001
From: Jony Bursztyn <jony.bursztyn@consensys.net>
Date: Wed, 11 Dec 2024 22:21:17 +0000
Subject: [PATCH 092/175] feat: carousel component (#28956)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## **Description**

This PR introduces a carousel component for the homepage that displays
banners about new changes. It leverages the existing
`react-responsive-carousel` library to handle carousel functionality and
the `BannerBase` component for rendering banner content and images. The
carousel component has been integrated into the
`account-overview-layout.tsx` file.

Key features:
- Skeleton is displayed during app startup or if there is no connection.
- Implements banner-specific behaviors based on user interaction (e.g.,
navigation dots, horizontal drag, close button).
- Supports up to 5 banners with no auto-forwarding or loop
functionality.
- Non-dismissible 'Fund your wallet' banner remains in the first
position when applicable.

## **Related issues**

Fixes: https://github.com/MetaMask/MetaMask-planning/issues/3758

## **Manual testing steps**

1. Start the app and navigate to the homepage.
2. Verify that the carousel skeleton appears during app initialization
or when there’s no connection.
3. Test navigation between banners using dots, horizontal drag, and
clicking edges.
4. Verify that banners behave as expected when interacting with the
close button:
   - For last banners, ensure the container is removed.
- For 'Fund your wallet' banner, ensure it remains in place when others
are closed.
5. Confirm URLs open correctly when clicking Bridge, Funds, Sell, and
Card banners.
6. Test with more than 5 banners to ensure only the first 5 are
displayed.
7. Verify no auto-forwarding or loop behavior.

## **Screenshots/Recordings**

### **Before**

<!-- Add screenshots or recordings here if applicable -->

### **After**

<img width="356" alt="Screenshot 2024-12-09 at 22 38 04"
src="https://github.com/user-attachments/assets/103aefff-a7e4-4293-a19a-19f8b0830e67">


## **Pre-merge author checklist**

- [ ] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension Coding
Standards](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/CODING_GUIDELINES.md).
- [ ] I've completed the PR template to the best of my ability.
- [ ] I’ve included tests for the carousel component and its behaviors.
- [ ] I’ve documented my code using [JSDoc](https://jsdoc.app/) format
where applicable.
- [ ] I’ve applied the appropriate labels as per the [labeling
guidelines](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/LABELING_GUIDELINES.md).

## **Pre-merge reviewer checklist**

- [ ] I’ve manually tested the PR by pulling the branch, running the
app, and verifying functionality.
- [ ] I confirm that this PR meets all acceptance criteria from the
ticket.
- [ ] I’ve reviewed and approved the testing evidence provided
(screenshots/recordings).

---------

Co-authored-by: MetaMask Bot <metamaskbot@users.noreply.github.com>
Co-authored-by: Nidhi Kumari <nidhi.kumari@consensys.net>
Co-authored-by: NidhiKJha <menidhikjha@gmail.com>
Co-authored-by: georgewrmarshall <george.marshall@consensys.net>
---
 .storybook/test-data.js                       |   1 +
 app/_locales/en/messages.json                 |  24 ++
 app/images/slide-bridge-icon.svg              |  17 ++
 app/images/slide-card-icon.svg                |  16 ++
 app/images/slide-fund-icon.svg                |  20 ++
 app/images/slide-sell-icon.svg                |  11 +
 app/scripts/constants/sentry-state.ts         |   1 +
 .../controllers/app-state-controller.ts       |  60 ++++-
 app/scripts/metamask-controller.js            |   2 +
 lavamoat/browserify/mmi/policy.json           |  26 ++-
 package.json                                  |   2 +-
 shared/constants/app-state.ts                 |  10 +
 test/e2e/flask/create-watch-account.spec.ts   |   6 +-
 .../page-objects/pages/account-list-page.ts   |   3 +-
 .../account/incremental-security.spec.js      |   2 +-
 test/e2e/tests/carousel/carousel.spec.ts      | 115 +++++++++
 ...rs-after-init-opt-in-background-state.json |  14 +-
 .../errors-after-init-opt-in-ui-state.json    |  11 +-
 test/e2e/tests/tokens/token-details.spec.ts   |   6 +
 .../data/integration-init-state.json          |   1 +
 .../data/onboarding-completion-route.json     |   1 +
 .../incoming-transaction-toggle.test.js.snap  |   4 +-
 .../banner-base/banner-base.types.ts          |   2 +-
 .../account-overview-eth.test.tsx             |   2 +
 .../account-overview-layout.tsx               |  99 +++++++-
 .../account-overview-non-evm.test.tsx         |   2 +
 .../multichain/account-overview/constants.ts  |  34 +++
 .../multichain/carousel/carousel.stories.tsx  |  66 ++++++
 .../multichain/carousel/carousel.test.tsx     | 219 ++++++++++++++++++
 .../multichain/carousel/carousel.tsx          | 201 ++++++++++++++++
 .../multichain/carousel/carousel.types.ts     |   8 +
 .../multichain/carousel/constants.ts          |  18 ++
 ui/components/multichain/carousel/helpers.ts  |  30 +++
 ui/components/multichain/carousel/index.scss  |  71 ++++++
 ui/components/multichain/carousel/index.ts    |   1 +
 ui/components/multichain/index.js             |   1 +
 .../multichain/multichain-components.scss     |   1 +
 .../network-list-menu.test.js.snap            |   2 +-
 .../advanced-tab.component.test.js.snap       |  10 +-
 .../developer-options-tab.test.tsx.snap       |   2 +-
 .../__snapshots__/security-tab.test.js.snap   |  20 +-
 ui/selectors/selectors.js                     |   4 +
 ui/store/actionConstants.ts                   |   1 +
 ui/store/actions.ts                           |  33 +++
 yarn.lock                                     |  10 +-
 45 files changed, 1144 insertions(+), 46 deletions(-)
 create mode 100644 app/images/slide-bridge-icon.svg
 create mode 100644 app/images/slide-card-icon.svg
 create mode 100644 app/images/slide-fund-icon.svg
 create mode 100644 app/images/slide-sell-icon.svg
 create mode 100644 test/e2e/tests/carousel/carousel.spec.ts
 create mode 100644 ui/components/multichain/account-overview/constants.ts
 create mode 100644 ui/components/multichain/carousel/carousel.stories.tsx
 create mode 100644 ui/components/multichain/carousel/carousel.test.tsx
 create mode 100644 ui/components/multichain/carousel/carousel.tsx
 create mode 100644 ui/components/multichain/carousel/carousel.types.ts
 create mode 100644 ui/components/multichain/carousel/constants.ts
 create mode 100644 ui/components/multichain/carousel/helpers.ts
 create mode 100644 ui/components/multichain/carousel/index.scss
 create mode 100644 ui/components/multichain/carousel/index.ts

diff --git a/.storybook/test-data.js b/.storybook/test-data.js
index bce6d082e086..6e4eb2265b98 100644
--- a/.storybook/test-data.js
+++ b/.storybook/test-data.js
@@ -703,6 +703,7 @@ const state = {
     useBlockie: false,
     featureFlags: {},
     welcomeScreenSeen: false,
+    slides: [],
     currentLocale: 'en',
     preferences: {
       showNativeTokenAsMainBalance: true,
diff --git a/app/_locales/en/messages.json b/app/_locales/en/messages.json
index c6fce85a2190..f42a539277d1 100644
--- a/app/_locales/en/messages.json
+++ b/app/_locales/en/messages.json
@@ -5230,6 +5230,30 @@
   "skipAccountSecurityDetails": {
     "message": "I understand that until I back up my Secret Recovery Phrase, I may lose my accounts and all of their assets."
   },
+  "slideBridgeDescription": {
+    "message": "Move across 9 chains, all within your wallet"
+  },
+  "slideBridgeTitle": {
+    "message": "Ready to bridge?"
+  },
+  "slideCashOutDescription": {
+    "message": "Sell your crypto for cash"
+  },
+  "slideCashOutTitle": {
+    "message": "Cash out with MetaMask"
+  },
+  "slideDebitCardDescription": {
+    "message": "Available in selected regions"
+  },
+  "slideDebitCardTitle": {
+    "message": "MetaMask debit card"
+  },
+  "slideFundWalletDescription": {
+    "message": "Get started by adding funds"
+  },
+  "slideFundWalletTitle": {
+    "message": "Fund your wallet"
+  },
   "smartContracts": {
     "message": "Smart contracts"
   },
diff --git a/app/images/slide-bridge-icon.svg b/app/images/slide-bridge-icon.svg
new file mode 100644
index 000000000000..de2be9745504
--- /dev/null
+++ b/app/images/slide-bridge-icon.svg
@@ -0,0 +1,17 @@
+<svg width="60" height="59" viewBox="0 0 60 59" fill="none" xmlns="http://www.w3.org/2000/svg"
+  xmlns:xlink="http://www.w3.org/1999/xlink">
+  <g clip-path="url(#clip0_127_7274)">
+    <rect x="1" y="7.40137" width="47.9158" height="56.5563" transform="rotate(-15 1 7.40137)"
+      fill="url(#pattern0_127_7274)" />
+  </g>
+  <defs>
+    <pattern id="pattern0_127_7274" patternContentUnits="objectBoundingBox" width="1" height="1">
+      <use xlink:href="#image0_127_7274" transform="matrix(0.00424578 0 0 0.00359712 -0.00524829 0)" />
+    </pattern>
+    <clipPath id="clip0_127_7274">
+      <rect width="60" height="59" fill="white" />
+    </clipPath>
+    <image id="image0_127_7274" width="238" height="278"
+      xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAO4AAAEWCAYAAABhWKviAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAMMISURBVHgB7P0HgGXZVR6Mrn3OuTlUrs45TZ7pmdFIGhRGIEAaZYSQkADJ4N/4YWPg58Hjt7E92PwGI8AYsA2YIGwLY0AgJBAC5ZwmaUYTezqn6sp16+Zw9ltr7XD2Ofd2T+rqru6+a+b2TeeeVPvba61vhS1gKANFSul9BL5UyIC/Lwfemz3w3tCG3vYedMe7EHoNaIimbItmrwVd2QN8DUHoQRd64AsfUuCD7wWQlxnI+TkY80r4Og8bvHHIQBqKkMd/07h1j3/Tge5CBlJfWYTlI3isrwD4D9Vh+dhe2NsWQkgYylAcETAUKwhW8T/hb7Z5AO/GG3ObAPHqJrQn671G0ECArjarUG83odlpQqfbxUcHZCghlCH91u4Hgabe4//CE/w+8HwIghRk0mkYSRVhPDsGE5lR2C42whZvA4xCGQqQgzb+R3vCR4hHmvHA/xLu4XMCel+bhMlHcF9tGMo1L0PgovyZ/DN/BcQrUfv9AN6St7XC9vhqqworCNRavQaNVhN63R6CSTIgCZMERnGBu2eALBIb0efmM3rOZXNQzKImzk3BjuxG2BFshR2wGcZhhHQ2tBDIIevlsIXTw8MeiA8J8D87IgrfgKFcs3LNApe06+/AX001oXpvCOE7e73ed642a36ltgqV6irgewjDEBT+GKmAoGHwCvN8AeQKZ1u1B2mOG23h/NwTHgS+D9lsFraUNsLu/Da4wd8D22AjQrgEDWiySR0yjLtNNNufakHrL1vQ+5/XiZ1HYSjXlFyTwP1N+b/KCILfwMebG63GxFJlBSqrFTZ/jUalO0M3R2nX6LcKkAQ0s4H63AW0KwxuvT/QmwsJF5wA6L2PIB4rjMC+8g64IbsXDsAumIAxnjwIvk3UxST4XEXN/BEJ3f8yDuNfGfrD14ZcU8D9D/IPpyDsvhdh81Mr1dqm5ZVl0Wg2UbP2AKyGjIsBlTFxk+BU/qx5148ZAXGA2wM4YI5tnfiezelMFvaO7oDbCtfDQXE9esMl+9M20lp0PmgboO8rP4+e9y+NwMhnhgC+uuWaAO5/lH9Q6oW9H+3J3k9XVmsblhCwrVaLSSUWjTzP8/pIJiNSb0ffh/hgU5rekzmNX4X6mbcBdWPp97RPfubXPpvDxj+2vq7W4jHFK415rVDv428z6QzsG98BL8vdCrd51yMvnWPgkh/soy7usC7uNZD1/qMetN6/ETYeHwL46pSrGrjvQNLpxubst+FV/odas3n3ysqKqDcaiC0CrABXGRoIgTVhgUHYRUD2el1od7oMzla3Dc12B9nlFoO30cFADj430cymH3VRe9NeCKAhMs65dEqBLhUgs+xBAbVnOpWCYi4HqSCwDz66cOxpgMi8dggtmggKSGbdNLof7snfBXthO5NY5P+iz2s8aQQw1HEq+dUQ2r82ISYqMJSrSq5a4P6i/G9bWs3uf2i32+9Zrqz4tVqNgWTMT43MmNaj/2kbAmIbAdnutKHRbgOCHpZrGArCz2r4voMADijMIwU/034w9mpnAal1JWlko3lDwzKD0r7pwEcTOAMlJKMmihgKymUR3ClI4YPA6YoBrnr27DlPlcfh28deBq8I7uBQEk4hfDx6JhJL2QPhN/AXP12C0peH2vfqkasPuDi272v85ku7Uv5JZXV11+LKsmaHZaRVtaY1YCVMkZ/b6nQZsPVmAxYRqHNIWFVRu9JOAwRMBrUoPQLfY+1JTLABmfJ/I+0dGpOaoCNVrLfb06/xM9bk2qymcysigMu5PEyPjEC5UGBQB37gmM9JAkt9lsLY8I3je+F1hVfCfm8nX1OXkzoUB03PKKsYH/5ttBV+bavYugBDueLlqgLuj8vfzBSr4fs67dYvLywvj7bbLaX1TEIEaDYYIsJJadc2grYDi5UKnFtdgeVGE0iRZhE4OdSABFYyZwmkCrCCNZ/nCQt+l8TiZ/VGaVrtG3d1eInYazKpO3jsrgGxBjLtO4+gnSyVYbJcZhCTb6vobbDhJdDANRPGRGEM3jL1HXCXdzOg3mbACs1Aa+1LJvXjNWh//7goPgJDuaLlqgHufbXf2twOO/8Vyac3LlWWfdJqJNEFukSTAmwHwVpFn3cew0Fn8RGiRswgQAvpNGQRsIGvyCTfEkwevyaJaVohIrJYQox1lhq0lsByiC0kzNTE0VPPfE6koXU2lsBjTCF4N46OwSgCOZ0K9HGjBA7219FkpwytDGrfV06+BN6Uvwd55yKnbZjQUQTg8HS91/6X2/2N/xt/34GhXJFyVQD355Z+7SAyxh9cWV29vlavM0CsdkpcYberzOFqow5nl5ZgvlolIgfKCFYCLBFHKQarBqzVsIYZ9nQyhtKqnJQhjCaP/FrLBzvmsAWwBm7IZrQyoVkD07khEUbAbnV7rIUZ6PggAG+bnIKRYon9YGMqu8LxXzy/Gyf2w7tLb4BpjPwCqImkp7UuQRmlh1fwuxlI/Vv8zTwM5YqTKxq4lP30L1d/9WW1ZvsDK5XKfgrxxMgmiLInCCTKf23CuWUC7CoDo4RmKJmmaWMOkwmstaxPRJA2h+PP8UkhZr7KRAqG896a0RrEPQ1eyaYymdJo4HZ7DGIy3duUD91TJrVJ3Ng0Pg5bp6aQzMqxD+wey5BuZMJvG9kM7xq9Fw54u/g7yryi0BHfC/yPqDUksT40BeM/hr+bg6FcUXLFApdA+7OL7/++Zrv1B0uVlQJpUpI4cIE1GodxkA2eW1mBmeVFaCIJNYJkUAEfKTaHAzaJSZt6WsN6jqY1+xNeZKIattgAyg3d2HO0/8TNZ8s8m7iwNo2ZtOr12IRmwOI1EYAVeEkTK3IrjSbx5okJ2IIaOIOTjgKsOgmViaXOeDI/Bj8w9Wa4yd/PloEylcG+RiijsSAfQ478nSWReRyGcsXIlQlcBO3/vfAf31Nv1H+7Uq2OUIWOSR2MzFRhfUgK55xdmMeQTg0HfYDsbU6FXoKU0qzWLBYxsKq0Rue1Fjdc42pbC1oJUUKFVJNHOVuGSrPCGt1sa9IrTXWR9YENgDV4CbQtDeKuJrRouwk0n3dt3AwlJLCEPW8nFxr/K+bz8LaJ74RXpe7kkBUlayBXzpwz2heQwf/wF4+gRv4XG2Hy88OQ0ZUhVxxwSdP+xNwvvb7ZaPxJtV4bMSQUiZvpRERTu6uZYvRlyfykkEsOTeM0J0P4MS1r0hkNeA34RYwxdnKUwSkkSGg8850B5Ei6DO/Y8Tr44PGPIgBbzsVEmtiA1vq+hmnG6yDgdvHRRKuBzOc2s9Lqe7qGPZu3wDQSWIFO5HDvB/1HKZM/OP0WuCt1szov/I/M5lWocxmhJrFW8Ex+ZDds/csheNe/BHCFyU/O/+Kb6rXG/6jVGyPJhH4DBGMazywuwALGYtOpNIZL8kw8pbWWZYbY74/D2vcAfckZYgDhxRpU7YDBq2grdR6KuPJgA5q1ryzcCZ8e+SqcWDytf2n2o8sEfZ1gwSEhD0IR4rngQ/RUGIr8bvLDUev6nBzSVT4xXuuhU6eYbNu5cRNfoxvuopeNdhP+ZO6jkJoO4LbgOv6uiqAd0cxzgIEiPO8RBPSv4x07iV9/HYayruWK0rg/fvrfv7beanyo1qiXk/WuJlbb06A9MXuOn7PIFJOWzejwDpvFfkLDOv6r2VeUXQWxbCvhVAXFkyOk86wUMJnqEyNjsGd0O7xp9DVwonEWPnDkQ04mlMG7jLHOxu9lFpjLC00CR9fJ6urYdEvlF4cwOTIKuzdvRrIt656cnnDQLE6n4J9v+gG4wd/LcV7SvHOwiBBusQamrh245eE85N6zTWz8Ggxl3coVA9wf/Ob7C+ny0iP1emO3KQ5IMsg0eJcxvEOallBBA5gGqyGffNcsNsBNJPwbifnLNk4rYmCNvo+fKwGPfNMi+p7FXAFuHtsHNxT2wp5wB/zH478Hc/XFeBUQxMkq0GY2iTGZpWM6U8ioyz6vypvm9+zPoy+dL8DeLVuglC8kLASdJpkbh3+64V2wy9uq9g+Rq0Fm8xIa0HgGh0qQfWNZlJ+GoaxL8eAKkPvkfdkgP/8BjNHu7nEJnpIoS0n5hgTaswsLrEFLuTynDWaCNId5Ak9p23i1jn4ILwJx4tlzGGTXtzVg9xymGaRJnwwhTXFhPAc6t2KmgFqtAT2vC6+YupPP2KRLcnjJEzbBw3xmkz4MeaZN5QD984xugZPNUCgrzUkjKU+lYlbqNXjixHFYrVUdDR7dr/nGIvzu/P+Bc1JlPnZ1ksY8QraG54i0HZnQ+/CKfucZeXobDGVdyhUB3GOHm+9qdtpvc+OgrntLpuQihnrOoabNBD5qmzwPagKsH2gSivxZ30uU2nmRRjIaUDimsvkARNSuxvq7cYCbTSmTid6XC0U+zxSlTXpZDsTMIDxuzOyFfCoXkViOqR8BWNhkCgau9sU5k4t7V6mYMwE4q+PQGZ04ksJtm60mPH78OKzgRGZFRuGr2eoC/I+lD+Nk0oQ0G8gePzfQZEbuHY7BKTgNs69ZhMWPflJ+cgMMZd3Jugfu+576f67DgfjL6Ov5LoNMYvzaleoqzC4vcaiHtBz5taxlfaVpLVhBxTA9DTYGjwDHZNaaWGtXYwaL8xBTMh6dZa1P/mYJQWsmh8DDcxABa7UFBMWm1BTcMnbAFj2YY7rX5D6b8/EtA65eBzphhAGM5BuBN4vPNFHQZ1R++NSpk6h5a5akUietzviplaPwp6t/yxrXU3cENsAEbINNcB3s5nLB2+GGW+6Be35lVs4WYSjrStY1q/yPHvx/phqd5h+gv7chdAvcNYAIyBUcmOeWFlnjUNgjHQSWhHI1GDgmrxt7VZ9Fx4z8ZlAldOaN3S4OLGMFmOL6Amr7FDO76ruRTNFmaJBRegbOwUvKt8DX5x6JHZNTKDUrHivgl1G4iRlsjw+G1oMTVxaO344PiveSNNstOHLmNOzbug3yGLsW+j4w+YX/fWXhYdiR3gzfkXk5lJFhXkVj+Shq2wq+KkCeTw1Zgh9ACmwef/Mz+Pv4zDmUyybrVuNSvLaRafwihjzuttpJfWH9SyoQOLMwrzRt1iRVBEo7+V7M7PQc39XsLDJzI7PYkFH8zvkqSV4lzpVBS2En0vjK11WALgcFfjYVOmdgFnaktsC20iZbOWSOTYfwnInFmvPCIdFA+dXKlNZ+L5nOFOrCBxVHsM+Ln6dR+66gz3vo9EmugIq5GLrI4UNzfw9He6d4vwTem2A/vALuxH93ot7djjp41BuB0o+fhrPvAXnlkJlXu6xb4L7rsZ94J2raHzLMrR1zRqtgqGcWNW0OzWJqb8pZUG5CBYgYg2xDOq5/mlCnDv8U9z1dU9Y5RzdlkQd+sRhFhUCdeCHI65cq0Z/8yJ7Xg2+buMMyyPrw1iY3E1MsH9pMQF7k+9JrE9+lZ4pRk9lMrgKRchz3RVCTVULhMQKq7TapT5G0858u/S0sS9UkgyqJKMZLZBVpXs6+gkJqAsZ/8QScuBOGsi5kXQL33Y//9A5UuL+JgMjGE/aVRqIBTyEfel3MqcQKYlR9NwPKmsEu6IQ1O6MADziAFecFbLQT0WfKUuhmpFSyQJN6/z6TSOmYJ0yvyRy9NXs9jOdGYkBydb85ufg5JHtYeZbEMg/KnmIAYxgszWSWIrXofs0tLcVyqU2d8JHVE/DR2mf5HKiTBpFVNMGcxSjvY3AIHoWn4BPwpe1Pwck//ri8fxMM5bLLuvNxMfQTPPHE8q8jGKZigwzFAJMGIZmmBFoiY/wEW2x9WeuvxkmlCKlxqLgElElnTIp0WtCYhA8yj0m7SZCxuCwRYwU/a5P7fT1PUq5wwcvATSMH4IvnvqH9bzXZhDorQzhVRdzEjrS6554HWM1stjHhKAikzSBT59IF6Ek4fm6G3Ymx8kjsdlCV0teWHoY7cjdwcgY1odsPu2wxQk9VE1GF0fV4Jb+I1/1/Df3dyyvrTuM+8a2l14W93r0yQUYxQ4vgqNbrQDW3eSaiUipUIpyqnhiARcI8NlB1AJ1w3GwihJNzLAa4dqYQgHzqXDbbd66cI4ygpXOz+cg62YGY3NNIUt1duh0nHkVkiYgvO7+l4IjnOX67uW5fhY4CXfFE98fGsPEzmuwOnz2DbkbLuh1GkASEDy19gmO5JGQmz6DG/Qp8Ex6Ex1HnHsUznqd49Pcfh1Ovg6FcVllXwH3Hl38qh5r2P5CJnPyOBiCVt5G5pwoF0io2O6Cqx4gLPvVei1XAjpkqIK6hnW2TmteYx3Tsko7Xusc0wM+nsrrzhLShI/Ma46SwJZiGDfkpCOUAzQ4QLyt0XhvCCkQULvJE1KGDzisKFaWYvPP15EYx3pOzs5AMrdHxTlRPw2ebKk2Z1jLK4n9TMM65zIsYyjqJUP4GfCt3Pzz+y1+W3xqHoVw2WVemsl/o/eu2DG8yZqgdqL7SpgvLy8ygUlZSoD/j73kgO2auiP+eQyzSIXoSx3Xx7qY68m9tOCYCpUo97KHJORoLC9mJQzuspWyRYesljkhHIBJoVdTgFUhS/e/KR+0UKoTqrWF/YQt+nTNP5GnzawKsVNW2njazyd+VOhXUVB9J6cEMknrj5TJMjIzwPs3EQ9t9evmrcP30HtjtbQW8y8gsb7FxXrP6Ak5GN3Z5nSX4TRjKZZF1o3Hf/cjPjXUg/BFKPEo2JSfNUcPQT6PV4kwh07jtgn4snN/MfTaRzm/NJGBAa8ruysUSm6RRfnHEMhsfOeOlrY8YaV1pfd4jqMNuTV8H4/lRR2vL2FPcEjBmtOewzDq7yin8t0QVE1MqwyqW9onbHDt7lgsVohUa+AJgpVGBT9S/yOdItbpU+vcFeAA+DJ+Cz8DX4XPyfiKrvKfl0Z95SB4dhaFcFlk3wG2G1R9AQEzTaxe4FI9kbbuyYuO0UQ8oLypMT5jFNjPKaK8ozmO1aR/wHelfpEsJgTbDpnoqSpZQh4nlBJOvWUjl9L4gYTCr98sIizT6uAeKuzTZ5RzI0d7xhcKieK7rqwv3nniRyWxYZeXv6uoo3I5K/WYW5uPHE+ocHll+Gh7rPcNkGq3jSzHdO+BG2EBrCIoCn/dZmN96Ojz280gmXhFps1ebPH91tAbynkM/Xq7Xup+GUNxhtBUJDX5qzUI5t8uVChNSkbZ1O1GIPnMXom+cLwyZLKzmgoT/6uYoCwExbUqmJH1bLpZtcYH6Mv6SflfI5OD2jTdZaHn2obtE6uftsAm8tgf/5fj/4vramJmvTW51CjFUq+6OxhrQnTTos2QhPj13dIM8VU3U1l01Qm5yd9uefUyuJS2X68f3wI+P/AAvwr2CQC1z7W7c7MejnluC+qunRPkpGMollXXh49ar4WswbntHpGSUL8XN0Kjqp7LCZBT5tyqNUfl0JElCyh3wkfaFuDYz6ILIV0xqVgEQL2TQgBgplWO5xSaJwmh1800hk7d7ImMZDVhQC5/EV/U7g8zt3anbYHtxMxxeOaEnoKhWFyC6FtecFlo7RhNTFEby1KwWCydxMoZMKf8cQ0s+bkflgCfnzsHeLdv4e9pHqGPQhzG2+1jpEBz0bmDN+wQchsfkM+iZd6GA3GFB5DHmm91Ql41/jj/8cRjKJZXLb+bgOAklEh0J3e/pZALStjSQ0o5fawoGkskJen+OWQzajAaIMpGMdpZ9BJQLYOuRak1L9a/5bI7NThAQq501+7KfUcZUpmD9WQVe3dXY8XXpP1rvZ0mswEtGbnG0LcRtISljFySTWSlJa8NYFKCA7dvKIuXzksns6T5bC2jJUIjNtN4xE1+73YFPV7/GJBrlLe9Ckuql4lZ4ubgFdnlboIzAbYkOmebv+JJ8dA8M5ZLKZde4b//mP7sBTbB7o64QKpmeTGIKuVB1C9We+naVu8HWfaQ/zftoO8/1a+0G0ULVsf0ktClX/CBoSeNTqaB0sq70VvbZlP7RPjO+ypgik9h4tlwfwECOKpXov+PoMd6Y2QcTuVFYaCzxMT2HrYaY5RABVWFMaVleekGvZcbH8Ywxro7HExBpXda4vjajPda61EiPyhBd14DkSOUEPF08Brd4B6CNmnYzBofoeQuftccFgaEIN6AW/j7c/JdgKJdMLjtwMTb7QzhI8ww8aW1c1raUaEGf89KU1luEBKHkqlhHROzJNSitGSwH9USTUXTXdF6k46mi+Ei/RmwzxL0+UBleuSDjfBJNJC5BpQxnYB/S9wXcNXoL/F3jcxDdC72VBWoUDhIgomMLiDS1uU8yIt+EwzaHWvtSOKtLec44OS5VUes2atw1w14JXjf5w5+tfwOuL+7BgRLACZxgPhd+gyfULPq+NMFMiDHa/J/+vvz47/5j8bpFGMolkctqKr/5yZ8tIWi/m17HmOQg4IG2isA1xQMmO8hljTWKrUlsfUfN8trtHDHkVNK8tMfXXxkTmZ4p9GNynCPz2u4tMpP1F7waH7LFbhgIYoyydFIJ1ftTMAPX5/dC2ktbqMfPOzpHETt/d2KI7o3nxe0Cc/+4IMELrOlMLDM1nJtZXOTrVZegwlUE3sPVE3BMnuFCe0rK+G7vFfAq/yVwi38d3BwcgFEPaSsvv20/TL0XfzjYHBrKRZfLqnFFa/kG1E+3umAgzolCLW2c7ak5Ws40/Ha0zvnMZQNe97U0ub/udtIJkkpXg/KX/JVZaY/yoRV77YSHhJ4iNJtrdmUOXMgWHGtA6UVXt6u9ubpXIkW1BC/zt8PNE/vhG7OPatY6xk4lCfDoskW8LSzlNavPPbagybJgd4GASqEqTVb5qHXZ/8XtqKZ58+QUF+TrI/Iea/UafLnzAOxMb+bPR6FEpX78mtbl1acmcBJ6F27/2wJguB7RJZDLayp3vXcmjU3V2SGlsqR8/7yFAyznsZJjGwjXyI78xCgbCtx/nFK9kEvkKEsrOpQezjLRy8mciH6ihAdXu2pKyclAisJB5rhEAi0iSXVr4Xp4WDwBPdmzhJoEGdPw9oiuaZyYhNSlK/PZFODzdbHWReCGqg1OV7d/7XQ7MIfg3bZhQzQRSJVN9XTtBMymF2AEQUuVTY8iu9yVqlsVgTgtUpCD7A3nessvw1P5AgxlzeWymcrveOzHijgu7nU/o0FGoCVNS/W2vuvbioTTqrc/nxbS+HIYWRkLC5lsKE3CRj+TYJfm5KL42AlCXI+6JrrJmMJHIV2wxrH6WQRAI2HMbFbfHMfg0J7UNphwMqni5JneqxwwX0lH40JkUrtZVsKLF2MwgHV+Mz3P4WTZ7XTtBRrTf6G6BI+Gh9hcpoXEbhfXwU3eXiatyqLAuczoJRdHvey9MJRLIpdN4zab4V04+A5EhqQaXKlUwKQICJGor438WyMxJeSIzas1bLKEBGPqaC6tJY1fS8QLtUAdLZedzdQOTCeO2PH1K+GY4/l0FlxzwAWwXnCLzUwTrzaanDKSCFwvH78dPlz7RPyaRH+s2WhYe01CRsSVkPq6hYp99xRY+egWwLoRXahCbM1OG1abDRin1jvOPSG35ZH2U3B39lYkpTKwCeFLiRnq72KnE+iJ8Ltw+38jhst3rrlcRlNZ/oCmQwF0kUDAbWcoL3lFg9azWiz6GTgsqgaGS9qAYy6Cy7qCHYyRRCxtqE1kKtWjpSzd9YGM5rETAcQ1m1XlWrORie3snXUq6LCQgAjAZC6HbEKrrejzo3ASbsLQ0CdTX4Jqp658XRk3LKy5ryc0x9IHA2A3MUPYa9cgDp18ZrRqOtrXpd7MFDcfLZVUqMxmjYUwX1+EZzInYY/YxpbBglyG2c4SjIoSZEWaY71Iet0gvd4r8SefhqGsqVwWU/kHv/mDaEuK16t3StvQIFFhH+AZ3ve8JPmr3UgHpLIftKxl4l5t9HuZfOH4taD8OWo4x2vwSAC3gMBsbhIspLHFHcDQW2qjo2K35ifGprAGNrjlBvHQkIRZWIDxYBT2j+1SrWa0XZwMK7mElEGuQ2VF9rz+jYkLW8bZJLIIlc/sa4tmfmUZenrlw+h4AuqoiZ+Wx9lSoEyqFVGFXroLM/4sHPFOUrkffLn3YPb+7uPDWt1LIJdF4y63sneCJzcqk06NLwIqscnNlloUy4SAIEFIWU3iaBH3vRnkrsYBGTmnLsnkas0eax2f83b7TFKIa1hD3AhXhetnykwy24T2lIRziursJButvmWYzSTT5WVBFuCu0i3w6PxTTAJFu3dcAMfiMArfJaws0KUxm+MxXVWgIRi0XVthJHhVQGrCNxpE10E/b7U7cKo9AyvZVW7huhU28gTV9NTfq+eFSCd30IBOf8cd8v7UneLOobm8hnJZNK4U/mv4GSINpoq/U5wMb5hku72Mm8Es1sqNv3f9YNcHhZipHAHQxGtJqLXqgLM1NoF7mOhcHLKLVghMB2mr7Iy2Da1mlY7mBXBTH12tfJjM5dR+2Fba7CR56Bzt84TCRJI9h8SEp3/rae0bNZyLSgJ9nUq6tLoK8VtH2WMdWG5XeK2hBQxdcYWQxHfhClRlXZUByjSthLBnK2zdCkNZU7ksGleE4avArE6n0WT8rUarGUviB+UC94mbX8z7dExQ93uZ2IdRzNL6tcB+7SgVD3iJA2kVJhMfuRKiOUvLedKEQ1U3ppfzxvI0xkdV4r4ly2wSotRJj8b7BUebg17DdhVuG7keDi8fd7Ryv08vpYydGN0O29yizyqRmjOITGXTOcOEhuhzWsaEJjNf3zRzjHqrgVPKOdS4G+FxOAL3h49xRVOPEjZ6Klbclp2Role4GTc/CkNZM7nkwP2OT/7jDciN7POsa6dGF2VLdXllujAy6QBgkIIZZMomfUD9YeTwRXako/PIRO5ykgVXIoGM/dCCxfiZ0gBDQkeXyXUwfBILv+B/c5UFZGersG1sE5TTJXA1LIDJkY4ArPOUrFlNEVIigG5K74NPZb8MK61Vh6SSiftg7AHpfKbfCYjNNJad10yzYZNt+x9dv0vXRTwD99Iy8wJec4MWCO/NQtvvoqm8AUb8IjT8Jm/S0asQ0WukGG/Hp4/AUNZMLjlwC1Op0V6rO61wZJIR0Nfi+K1aUjIIojpb9RQN2mdLwJAxDecSOQAg3cGtNC01Eqea33i8tD/0whVCHRVfJg3L2UmJY9sMK6lWETg6dxLGCyOweWQjai/fbh5a89s160N75vQvrTO0L9gBN4zshS/OPIDaTHeR7JvIZCLMFU1gMmEfCMMsg4iB2JrOugi/gedOi2fnokPwvgjMS2EFmn6L3++GbfwlZ1DRPdIuQRe6r8Bzwt0OO0GulVxy4Hbard3oVaXdz0ibkMalGd2A0/XpRNLkMzLY3YM+P5j/iQa3aWJOA7XoJNYnY0YcwyTtQ+vRIjnjrhSYPBcTjTVtWllz4vazq4uwQtp3fDOMsvY1oIKECRxVK6nBD9yc7WDxengw+Ba0wk6seN9N5YxMZhfAENe2JuAKxlyGyFx2Gqyb1QGpifpIoRi7nxTjrlPnjNQcxnGzcErOwGOtZ6CN5nJeZCl7iiegslc6MJupUzC7DkNZEwke+hl5G/79/goukTz41a9kP/TSP+LXxg81BEkHzVZTaxuJ6NeqUpXqDdS4CU1pmV9jJuvCARqEY6UREH3aVSrNSt0ikOHm7d39ae1tSDWzf3fC0bux50b7Ojx7HCaL47CpPMW9qKSGrgeuf27PmN9xC9f0QdhS2sS+rozZv4OuX+txATHW2d4XoTwTA/bIJdGTDiVkMHlF/myLfVfP4RBosqPWrov5CtwiNsIpcRbK2RKna/oSTWyJk5voQl22J0qd3C34s6/CUNZEgoPvFw8//DPyGL6+By6BrOZWYgNclZv5HDslzaaiGdFgGTRIzcA2oBvEtLopki4w2bfEAUj1p2ZVPkIEZUvRoKSGdNy6dMCkwL93SK9kmIobl7umuozHWudWF6DSXIUd41u076vEZFORXenrRA0CNAGCQkM3F/fBicpp9iEjTzmhXe3VRcayOV+QfTcnKvujt160RpGK8Xpq0pKu168Me2rvSgURKfzvZXCr/TuGVGYglNncFO1c3ssOG8mtobAziRPrf4ZLJLUsrVEjYoywb9qsJGOTIKEvR9ng2OYaiygpIsE02+3NS50ZRaQLMdjEKtcbdViqVGBxZRmq9YYKDckLX4Nlw6NR3a9xIZpcrL8plfY9NHsMji+fhmbY1sSUHvxgOmZIm8N8Cmbhlvx1rNlML2R7BIfxjnKw3aPH/Xz1HO/JbHxc4bmLiXl21XtIaG3KsqqHTQwKLcET8ihnUNHjXLiEmrbFDdXJ/69D63YYypoJ+7gHf018GLXuMgCs+Sw5V5oBxwvlgeUn2pxa4y0BVv2lekqAxPwOIqLVmrC8C13xQ90OaSzSmrqmPWlsD3Gruf8czHNsbtBrBXl+nyUQY4EdLTyPvi8xzztR+46my1ZLKu2rvF0yW9FDhhv8PXDH2I3w8ernQAjTawvsRBdZHdJ6FpK1qgR3fhH6HyGdMJprLjtsPrkt7mqCZh9URVQJq8wsV0UNHuk9BdVujc+LKproHnMYTIhhLHcNxZJT+Lf8zzho/y2sofS8LiwUZiOixPHFVLMyzcwawElFULkgEQN8W2uaOmmQSVDzinr4PVUeUax4UMGBGdjgkGHGN0xOHDHTXYPAxIGT5rudhJzf0Pk2Oy148twRmCqNw7byFvR9Ax0iknbdHvKCT8JZ2JXZCiO5Mqy2qrFGeYpPUxOOS+EKc0Xar+X7w2sQhYqYkuD4t0IVHuhsKiaq8LNmq8310Nbcxt9Rkgndw26qB/tgB2zxN0DP7/HxKBiUwiFFGVRZyEz9KxjKWknEKrfhN/CurzlwTdVKTHPiQKGUQ8fK099LbqoQWcsxJzcGJtZkUjrsKThJ8tImXNBxIEbyqOMYEFjwgp48nGPHwitGwYkIlLHCBEcbxrYF6Jt45iqLUG3WkXnexNoXIJ60eRZDQ3dnDsKO4hb4ZuMJlVfsaFq+Nvf+2GuC2PHjLoCajRS7DNbXNaYzg1RGU4HalzaXkeGmhctIw24SU7xIWKgtBIK87uwxPQwJrZ1Y4B78DbGM5vJnYQ1JKr+XgkpuGZJZQKY+1I2NWovUHYvne63fG1PZgNcMauMPm2U4hNVHQmt9vQtnMnGzukBGn4PsPwdrNXhxayA2kQiIm88yPhnU2w14+txRmC5NwM6RrVobqokAA1II3ll4yejN8NTiEU52MBJ3xxPvZHSa8W+c6xUiWk8YonWI6FdmZXvpXC+XPVI/KjynKvqzj/cOw6nWLNfqErMcIk7zXo40++RPFH5oCNo1klgcF//Qv4B/s3tgjST0Qsh2clANKvYzT/tUoSGbpLbjQKmCZPneIAY5Jq621BqCfFkKb5i2LEmNHe0/tovomAZgjvY336nTFNbHNROBcMCrXrg2tnOOiWOdq8zDcqMCe8d3wGimrMEreJGwHd4mGMuPwrnqHEgPrD8ammtw/VE7WTjXMwDBlryiSafnvAfQE1102kaDE2lFjPc2DAn10NfN5rPg4fURq0wlgMQs4/mkPiYPZe4V+1owlIsuMeAe/FXx2bXUuh2/HWlGABtWMYoN9GuTWHBBSZibfZ9rv67b7UEVmeNj8/NQQDZ55+RUP/MMxg81Az96ToacZIIQMmfKjKxeo1ZtFze7DXd0/sknQhUxz4/PPgObSlOsfVMigFXka6kI4+VTB+FDlb/D46Xscfp9fgNembwlkUsgpLMQWpTIYf4+9LIbhiBd3x+iF2QOBzip3ArXub2n9PzEjHgWA2wwlLWRvswp/KP+9Vpp3Uw3C/VUfQDgInLKJUKsjnIHu8Pq9iVbiHj8lEy6drcNsysVmFle4i5mlEB//ZZtkE2rDg5k+rkmcWQ+O+AVEfmVDK8YjWvSHV3Ky5rEIp7k0VdDDGD1nMuCn61gxLRZgesmdkExVYAzqHX3pbcjoKdhtr5gVynk7UMZu2fKQheWmAJHIxtHQRXcq6Na0LrgVSdizQczGdAz0lNwQp6DlJyHWrfJRBrFoAMR8Da+H0wd9ueH6wqtkfSnPHbhA5qkuuihoSaCNtPNQCugxZOV72lKyZSv68UIkediGidBAWrPYMrs6s0WjJdLNLLhqaOH4HS7xbHbm3bshnI+r3xrl4l2NItwTMvkeZjsrbjbrcGrrGqngABsOqNwQRC7kP6JiO8Znu+js4dgA/q+YUnCLn8rXD+6B87V5q1NzFaBkJFWdU5SOvfSPVbMsTehIe2emNCQ+lsY5jr6LZnQXSSmSiLPjePqXsO24iEJeDFvWByBKconbcBQLrr0AZdIqod+Rv4x/n1+Ai6ykH/rSS8yz6Rek0eq1e34UwcMbqzRiuMq2nANxAFscpEpiYAKAqrNBuzejPHSQhG+9sCXUIvV4RsI3jv33wClQkEtK+KM65hpnDgsRO53zHLw9dIkCvCuqQ32tbvv2DQgB/m7YE13ypE+szILy81VGB8dgTtKN8LXUt+EFloTyuwHa2VYTIrI77UmciidC1JxXto+toC2Q6R5IMAxRvgfAq3pbz0GZbjLu5H949CujKR+h1RVkVqqw1DWRAabMhI+DGsgxDgycI04aLAZPdYUHgDaaHOIhWoGkFiq6VuP45a04SyayhPlEXjFbXdDqrIEzeUF+Orjj8KJ2XNcoucey2WPHYVkz9n4g4q0Sp6aSz455qXW6tFzBKJ4qR5EKLGfqW2pHvaTc1+GaqcBByZ2x6wTM2mYf40VExN3sukzgd3rM1rX3GuIAZ5XA8T/ToYz1PGCu2FMIow3ykluJDcuR6kbZGcLbBl2wVgjGVgdtHYklYAgNKRKpCkpT5iEOzy2+gmNmH8LEWnUJw4oeHBJPSHgV6R1SeOOjI3Du97wXvibT38IlubPwpOokamf0t7N2yCTTrGvyqmFA3Yfq7BJCPu4Uvb5rRF35NCzzs5jySIRliBphJPQRLTYWIbfX/4zeNfeN8Kj3pPOfpzzitzZmKkcWSSgDhTGgS8sSaXe08Jg0dkbk9+zCSArGBB6qnOM64VpiRLKpSbNz0udgJxrNQrrYjXIq1HOe2PXIjSUwjiuMW/dGCebV5qRdVypfukfyzEt6SZa0L5oeJmStbDThVU0j4OijwOuAT/05h+Bv/z4/4aT507B0bALNfzuxl17IacXGDPaUegB7TLNXEyAZqd0uimqBbZFApYQ01QAEXDUpUf7jDCX9KVV2xhimqkWmFhy6rrxmw98ECZGSrzmUEJdxvxXYUxliLQrmfJ8/uBMoObn0cyhCUOX1HL4BPx4QozgnWzhhFhSC5VpT55qjPB+pH+48LYqwI/AUC6+nBe4Wute1PxlGujjq1OwWKCV0M1AUpU5pOVI43LrGnDM0UQYBgAGEEUJU1PvVzg9lWjQrdTrMJovILvchqcrJ+B7Xvf98M2Hvw6fffSzMIvApZUBD+6/jtuzBhyTdX3V+LE57ukc1zdpiOY89LOIuQNR3ayU0YQQkWKRyR8yI97h4nWKQ9P7WrMJJ+fnoILnunNqAwKnGL8PZgKQ0eu4j+1aCurog8g9/laqBQBdQ15qLoInLp58MBzk7bfnH1U2MVH1jJ2fhnLR5YKmzMXOXyYzqthSrVxczULtY0g8P346coCvN8jntfHgUMaILXrt63YsAQ446mC4guGgUeqbjN89tXIcbr/jbpga3wh/9YW/gAZq3/vxXG7YvQ82jU+ojo2aqAHHhE3W7xo2NqZuZZRGGSnCBAHlmLbqJ8ovVyvI08rxPfZj59A/Pzo3C3UE8XSxDPs2bkamvBw1jDfnaP3WiKSKQrWONSCV1g2dw0fg1H8TfJFNZaK7rycDQ3RRo5rHus/ANtjAJCCtZtCSLfAFLXbWhZzIdO5M3zQE7RrJhX2QNchfHqtNWcbUgNekItKCy7E4rh3QbhxXAiTBqwFuBlZELMVXqKMWorQC4FipbM3HJ5aOwE179sE/H/tx+IOP/z6snjkBj3RasLptN+zDeG8Q+H1N5AREbK2RQLPiUbzU1b0RaNzTp884ZEThFQIsalZK4OeUQvT1Z1eW4Pi8sk5GslnYiv45ZX8VsznI53KRP2rOSohEggg4BFncigZwTfq4XjRhOlK5ySonT3MGPdFDkAbwJPq4TJJJPVlKVdvre+KsEGII3DWSCwJ3LfKXR+pkeevBrIkZs+I7NSOPaVSrrVwyx3yhxAwq6ZqIYEDr2QZoBKwuLeSMx6khKIqZjGV8H1t4BnaPboX/94d+Ee77P78Ei7MzcBj9yDqa7Tfs3M1+rwteBoCIkhuEjQ1JsO6qAxphkzmiazDHbuL5EFhJyxKAKzixnESme666CukggAk07UsIVF7nBy0AarWTTaU43OV7zgwACWLMaHuIJkJpn03+tvoslLp9bERp84SXcpJioiou5XqQxt3iT8Fmf5KvvKsTMOhvRQteI1l1CoayZvKsrN/FJqmmqhv7SB/ycan+M48DVGhTL2qnJpLKi8X1fc2XMdNTgm2Cxh02eFlJ0rwSliorkDepj3qHR1dOQbPYgt/6gffDf/jor8DjJx+Ds50es9EH9+6HAp5byg8ccEit7YRNxDBgNFONFP0+L2jyjLQrxWfVyvDKHCb/dQlNeTrWppFRBigdr5DPcftYMvGrCOyl1QqM0/VQCxwZL2e0Ykxm0xDdHt6ZRGTiXjoPuoJAAxcAYiQccQd12YAUhn82ignIiDS3lKVQH00BVDVU8HIPwlDWTJ4VuBc7NDRSm4RsNwvtdMtqK5rxiYQpYbgmk87woBZunNEx19yqoiiWGmlZ4Wgfzl4SagAGoVrIOcTXTW6t2uG0R/4dKLydWZ2FT/a+Bu9/9y/BH33uA/AXX/oQrKLZ/JV2C27etQ+mEUxkzlu2FSCqa9UEGDjmfcyWllJbFh3uIsErvuM5nJ47BzMrK0w8jaA23VQehQx1nsTHOMadx/BR1I3aFxDctPxouVDoW7PXkmH6X2aNpYxMaRkVS7jMcFJMKC2XSfd9x2BGK4CO3eq14Zvtp+Ah9MPbYYdTHTu06kLIM2ZLeP45GMqayXOKs8mLmL9cbpYh1y4ycNW+1YCi/sQEAFqGhHo/eSKIfQ8ybjKrL+PPijjR1IwetAwo9tlUXytKnCctvISmKBFQAPE629nGAvyfY38H/+Q7/jHs3LgbfutTvw/NmTPwCP5u19YdsGt6A6Slijkb0squvBDz6JTGUwtk93g9HqNdCaSHz5yGM0sLeL0ZNttH0X+liYWsjo0TEwxYuhfmHqygliXg5vB7aierWGxtnSQskWjOc69NWF80Ojv3JoI1nekFTaAx3157A2Z9JyLukD5DX1eqtZZQqAke+7fCX5rMTj4OQ1kzeW4B8ouYv+yHAUxXN8BKccF+xt0g2io7Lp/LQgVBRRrDNF+L5fhKNx1Rxp7NYKRnznuGMFoL1vi6CGAiVmqNBh8zx1pXmGgMy3xzEX7nyT+FH73hXbB/cjf8zId+AZYRaIdQW1K894ZtOxSZllK3z3SmjFxKyRqVzH8u3Adgd+Dc4jwcmTkLC2juUqXSRGkEcrgPqvoZLRYRsFNQzOVswQVo/5OOObMwj8RUFoGdtaEnsJZGdH+lw2ZL17+FeC2wzeACx+c1oSr8t5DN2H0aTW1i4nTAlAxgd34bFxtkQd3DlF4SDP3d498v7q3CUNZMnlP1BpFU+Mf8Y7hIsm1hj13+wwgN8BbVzNJi0nqAxVL6XH8sZoI6L6VDFBlSS8eCzRInROgQMIhkWdRr5LjstZFmtwV//MyHMVS0AT74I7+DIaIbAVBDnjl1HL5++GmothqcEBEaBhbUYUm7UiiHigPI5KfHY0cOwSce+gY8ePQwdPEQm1CbTqJZPIaPnRjauXXfATiwYxfGj4sRaEFBiHpNz8zNofZNQwFBTf2nPZFoGA/CassIiNEm/XFaF8BR+qXRz3Q/culM7DzMZGgmqZVmBartOvRaPZhvLMFifRmO187AM7UTcLZx7gEYyprKc09Jo/xlcXEKD7Yu7oyHLUD1gqrjIB0fGWH/rpPsMAj9tbEshsw15rI2X/UCdTo8Qf4um3B2PVgahNzsHI+TDgL3Ou1+l1sr8MHDH4Ef3v+98Dvf92vwbz7+S/DFJ78KlbOn4Oto2t+0fSdMFMkvTzMrTtdAbC+ZxNQ18pkzp+D0IprDaN6WUFsWcLscXhv5rFumNvQB1WhHc18oJHQGCStabYGXSWHQaj/aknj0FJ/gpPV0E9Z74iJdf9cCX6o00XQ63fcLxWyrVRTp73OkfsIC3+0Zhvf2UzCUNZXnDNyLSVJtWtnGlUKdTCtm0lHWVOCPI2mUUWvyWC2rf6jjLLFYqEO0aMwCOGl+nODE5JFqP8oxXXz02JTtwUqtBlM4Weif2TRGc8hGr4Vm8/+Gd+15I/z29/4K/OfP/w588Mt/AfWzJ+FBBOpu1Jg34CCnfVIs9sTZM3AUw0kryEZnMnmciMaggMAj03gD+tRT6MuWNNkUdccA60PyW1qbCM3yM3OzDFTye8ksd+tvjUlufuS4uRBx8mBJKesLy34wu+Yy3Zcix4j7mSvya03Sx2ixzCs10AmpRuoe/+cL0Wp1kLUayprK80oCv1ihoWKrDBO1KTibPgmWYMF/W602kjghFJA1XUYzlpuXgdGmWo2Ceu0m5ydJUjcH2mgwU+we6NAQr1OEP6TC+lEq7QsCJz+PBrHOSCINKkL408N/A50d3w0/9aofg+3T2+DXP/G7UF2YhUMUGkGTeQr38czpkyCDNFsMU+UxyCOgx1CrTiNYCbS+Lh80pmkshcNxBWgFAWKbyX0grZxOBTE/Op6mGIFfOgyy7LNKyBAO4y1XrZksrfYl35x4hiRu6ZiGUSZLYCw7AiXIc2GBR/HxsMN/D3z/eD49fhSGsqbyvIB7sfKX6Q+9c2E/nB07qS0+hRjyB4mImR4ZhzPnzqmQhqdMQ7cPmxnAThZtRMgMsA1NBpXUecuUWNDTWpdkFYkqApjJepLCKaLXxA6B6c+QbW70mvCe674X9k3sgX/3978Op5ZnYBY3IzO/gFqojJq1iI8pDB1NjI6idi3Yc3DBGgOtPi4JmaBn5s6xxVEuKDM88qF10ofjZoAOR8W7Z4qYv++GplzW3aAzlFFxBt0RiiOrvUQkILHyKQ1cYsYPLRzlggcmrfQkwT2V/dQDv7X554drBq2xPO+yq4uVv7xzYS98Zc+nIsZThysqtSpsHd0IZQRSpVoFzzECXVNwUNGBTd4wP3G0MhccSMOM+rb4gB4reMwRio1qzWxMTPtrR3v9zcnP8gB/28bvhP1v/2347UN/Ag+cepT0DkyV0JIYG+P4qxtfVrvrtxCcL/WkE8Issse0+jtp2kwqbVlc13Q14TGuxRFx0zjm1zqssVuVFc1wEtwaYZqccnqiiLXzEWpRNrJUTIiIQlK5bGTJqM+FxG3+HIay5iKe5/bw0E/KUZGCJXiR0kjX4P3f9a+glYtPzlkcELdsv457Kh07dUqTIRBPK9QyqODATUYwfZjcGl2TXkkJGE0qlaNkDPQnp8qjDN7zHcM+gxqo37X5FfCu6TfA8c5peP+RP+DV7Cnu2tNr/JrfKJDGCTUzMZj9mYnoHIK2iqY7JaJkdXmhSIA2si4kxPOiZb/v6vjQ5hhhaLSruhek2cmfJpKOUjwpj3tC+/ymg4bK3irASLnM4B3JoZEscny8jEjx0SlbKt8shDf+2uu/kKqmBtg9Q7lYctv7xWuet8a9WPnLuXYBds/vh8e2PhSRQfgPlbBVaquwBbXu6XMzPLiEMHp3AKCSmg3A8QUhpplNORprW2JIe56O7/qckKGA2z/mkrFjCvn8/ekvQK3TgFw5AyMlta5PVy9ybc6Ja1RF1NMKEmyv3Q5/S2mYlM5YQPaYQev5sWNG3UGsJ584P+deSIhfh2XeXTYZ7MqF9Kkp9CASzWpovQ++R5rRpklvcXUFznXn1aoGsgcmjXP/E7d5CNpXw1DWXF5QFz4iqeAiyO0n7gbR8+wgp8FEA+jsKoZAvICzh9w4oxJjbppE+TjQ+oa1MF0dRERSCdUDOaVZUk6a71FectP+Wjj+X3Th4HBBEr48/yB8c+lJ1SLHORcLHgl9yQ2uGC24jJPGIgKXFiMji8Msw2L9UoiLjJFLYEm1WK62q6kH6D/j05J5biwR8qdNtpZ7UMPEGzO51Wlx6ItGD5nQFDoi5nvf0RthKJdGXhBwiaTCp8/Ci5QDMzdBsVG2782AJNay1WzD9MSU/sJsIfqelQ8X7TMyqcGCFsBtQAeswY2Pq5IyVHySfN0wNBCQsSP1TRISbIM7o+Dss95W2C8FuMUJ7n6oeH+5UuHKqJxOZRTW15Z2v/b4STZZJHDpfO0C2WZJQWQqm/CPKivsIkFXtsd27ydldpm0RionHCPibXwcyTf055GAG8f3G8Um2HJkNwzl0sgL7nuLf/O/hhcplP74qkPfxQNHAUp9TubykaUTsDO/GYoF0+VBxh+a+dXKJSbGJ3bBqp4TWtdXWpeLECisgxMGdZ2w+9GAixXPm33pNWXtR8L1NKOLsQCGaPowzxS3nlta5ONTKqNhbc3luhqz39MdYF0M+hIg5vdHt1JbOBrE6hwyfbwBWyaohWlCocw2CtnR8+pqFVZwwllaXoF5vIbJz+9g62kol0Ze+J2m/GWAZXiRcuPZg5Br6YQE5/MqaqJuuwc7pzdHYHDFmKx9ZmDSp3RgoxlQt1aXNa9epY4W01quVp1DROZ4ckBLzVDbU7GWsHUoNZiFxnG8bxVnRc3OMiAolTHw/QSBFf0XqW7RP0vFjt9vE0cEldRgdbWtMvE7HC8uqWVCY24JsKYl4NK1knZeWlnhYoeVagVqzTpPPmFLwp7HboKhXDp5wcC9WPnLY/VJuPXkXaojo7b7ON2PGoEvPA17RnZw/nLkJyoxxJM7yiJzNrIXY1yOlFZDq+QO3a3B1yYzPqo4EJu8bi7ECKWYlarF8yKyyWpiiDQ1OJ+7BBcRPFRwQL8nNjqmaQFiTLZbK2vPI3oZXTtEprA5XjS5OXdFRr2sjW9Lk5YpHXRLE7mYHkFr/Fs2k0dHYBLN5OmJSTSTxzj8ddPMHVCujMNQLp28ONvmIvVfvvvod0C64yzIBWo922VkL722B9snN2nN4/i2DopCF9QyzjDHwaZ8YjZxpQKe8W8NSRXgMaqNhmODR1oymiyU8CJf8d1rnzOKjZq5xZjbBBSq9Ol1e9zNIqO1md2FSHrlECG0n6WKnY/5navZXXLM1bYGvJTwUcbzCDy/b/+kbSmPm+6L23vahNTIpWnXO7Dt4f0JR3soay0vCrgXi6TasLoZDpy5mRlO6bC2ZE4+Mv8k3DSxn2ObMgHKQW/cz8X5Dij0Il1C5S+bNMiU0bpoAhLLLGJ70rpURFZBMjEiDiIZJYRAtDzl2blZHvCk4dJI+qgeTpEvLZxD2mQJJ5xj00JczSsTKyZIGHivYnFcrW1Jypw15lwqGFIqrVNBBf8t5hcXYX5hARbweWFpiWuE88+MwuZDQ1LqUsuLZhMuVmjo259+IwTtTDRgQQ32Mysz4GGUZt/GXbarw6Dp3RIwCQ07wCUcEB5S7W3oQa9pX7TCn3Tt04TZzbm7SGy52jVpCSS14TwOdnIBiIhKc4KFLsBPgsa81YxdzFiWkd9rrwFE8rKTN8eSUVJPIDQxUTeO0VKp33JACZiUCqzvTedbxm0pCWMUH2QuT46Mwx1PvgqGcunlRQNXa90XTVJtrGyB3bMHMKhPhedRrJaK3b8w8wDcXroBpkbHwVVCMbFZPn1fxDZRz9GAVwSVboKmG6ERWUXdIJm8cfch3cMZuJxXrzvHlxynpawoKoaP5R875qw4HwFnrw8GTE4Ajlsa/50BK0AUszXalkobEZTUBqcvFk7aFs8xpbUtgdy8NjeSPhs/sRG2PrUXhnLp5aLw95S/DC9SaNC+4bF3ACfi6BHK+cs4yGYr83B0+STcseVml2uNk1X8T3zgC8vGWmszehbCLl7laa1rTGZOyNBdHtUetAUAUTKIYqejvk8XEorVUuiEyhWzJlbr6NFY3DZ+U9yn+OeJyUsCgFsU4CaoRBaMMpWNmUxrKcVitvr3pIHTmk0mxnkVmXYyjRfxQazy0soyVJfqcNvfv5oLRoZy6eXi3HXqv3wRZKI+BbeceoleHiNKVKDZ/euzD8MGbxyu27anjzF1VVPcyzTi+JAiroE9bY4qc1m1cVVxXZ9bpbr+o+t/MnA8Fzp9W7GQyU1xTjI1KcHCDfsIx7IYhP8oRdFcj4wdTsrkdrLPt5W667lJtKDlS4iQohAUTSKx89B+OWdQ6Za0NEDIZKasrjKayJTeOVIqw22nXwqT8xthKJdHLgpwKTSETy+aYaaEjNc9+T2QbmasRjUPyuP94uwD8IrJO2Akr1ZDUOIMfhsKUd+YQRtpWfVORAyMLrDXMV0/XjVEA7yu0yAt4PW+3WVBzRdGw5vjUwHD/OICZx4xaAM/CvE41gDEriR6LaJcRrupm1jS78uCvReG2DK50EbL0jXRZ+TbRv5xdB48aelKIPoNkXWU1UVADjyVMx40U3D7p14DYqhtL5tctDuPY+RFm8skE7VpeNXTr7MVNgbA1J3xxOIZOFU5C6/YfieAaxaCAwHtBMY0MeHEMsFgE/L5K20ys59rSCoHwLRkSYxkMjFOuyB3BDI3u4pSCGcRtLRdzsmKGlTRlKCfrMlvI1KDXV9zc2KMs6ulbZ2tNo95tQR8UKqiIeFcoftAva0IpHSeNZwsKdliDllkMpGJXFvG5+s+cxdkGlkYyuWTiwbcixUaInnlse+EzXPbbbcGY0pSGOVLZx+ALcEGuGv7rX3mpR2y2vx1tXE02COz0k10sOB1umTQ4KZV8lRCRpw8sot8iX4TlUByZm6On7ntjCZ2rEksnYnDcWRFtENHROzqktcgzbVA9LvQjdvycqNG23aY0abYsRvrNUI+LT/InKeGA/iakl+KSGCRaU3P+xZuhFsffxkM5fLKRbV15EXIXybJdLNoMr8dwk5oQyJGi1aQ6PnY2c/BK8fvgF0btlnAxBSTBogYRLVqcTVuLDTkRaV+imX2ub0NSWhNcWnL7iK/We2PtBppWmJtqUROtZ0RMYCCiIPOzXaymhMGG9I2C8rxvcHZj92HDp3ZIgI0kWkyIhM5dlf0/aNrZm1LqydQXjKy+XaFBtyG3suagJd/+nXgd4fL3l5uubhOykXKXybZN38DvOapN3A/YpfEIbPv9MJZ+PtzX4Q3b/p2mCyOqe/sLzUyBCT8ZMf3NZvZX8Q1r6/rdTkhA7UuLUPCXSfNPiToNXQjBtzI8moFOjjIqSsj5/gKL34c2X+t9nN3ptHHcTVjch4KnTCSSaww12y0bGj9WuDOHOY+mn2YiSeVUuEfZpLRwmAGmYoI0DQmVrnXCuH2L70KRpcmYCiXXy4qcC9m/2Vah+bbD78Btszv5PijEXrdRTA/du4QPLT8JLxx12sgn8718TSG+zFhEqMUQ2uuyhjJYzKYDFEVmKohXyVm0KLYhoDyvL6IK39HbXeoOCLDmjYVtVI1JxRTkS77G2nLmOmcsJINKO33jp9v/jUF8dwmtqfWJiIXYww1rTuJgMPt0TUSk0ztaKTmFijJgrK7SsUi51PfdPxOuP2xV3C726FcflkLm+cDOBjeAhdBMr0svOfBH4Vfveff7JC5nrC+HYKXSsu+dOp+KO98Nbxn/5vgj5/4MLS7beDV1nkjtQ9mTQ2tDFGRgYEIPbjAgdhlRrbuwezpZUv8HgTInlJoiJq3MbOqSwJN7jLtiZIrFjC+Sd0rMkFgUyrdpH19QjGVb039AbHcAcoZTM6zYYMtGSWlQ0bp0A+ReqhtJ0dHmSl2Jwbj4/sM2gwDl76nmDMBnlrZmAZ9mxa2wUu/9NohaNeRXBF/iVd89t3vQELlD1J+UIq0pAIFNVV7447XQAs68PHDn4NWtx377cB0QBODdUxLEqOtyDwnU7PDval0Xyp8UMdGWiqETOkNE5O6FY7k787MnoMsmptZE/ZxAGsrfKSzsh4kXoMTJpJgf8vlg0JYS8H1h82zcQVMAUFXa1oyeUtIKHFXC71PtT+leckdINBS1Q9tQ5rZrM5gwkGZVg7e9JH3wvS5zTCU9SG3vV+IKyIQ98V7/uTPO83Ov0MTuWuXLtHOJmmIjx7/NC849cZ938ExU1esRRi5vqocTxoj2rVmtZbUiRWe7pBhiu3r6OuqFqQ+75DOhQb73MI8M7UuaA0wXaPaMMsxMioyDSJyCWTMlA4TCRZuJpSUkU8bI6MYtKq9q+uGG61O94PuFZnHFP6hjprk01I3jgr66USwVVfrcNenXjsE7TqUKyaC7n3hzG+0260/DokutdpIaRlKzvjY8c9CgH7xW/a+llMLwYJG+38a7DE/0XweC8lE7LItPtA5zAQU6pJhVmUngJzDAU4sLCUp+IFv9hqBNPFQhJA5XATq/uwp0adVo23BCZWF1kQmS6HHxQM9Dt1w2MeJXdt7SaEeAm1aWQhdbVHQhET+LIWAJpD0e83jb4Cbjt4JQ1l/csUA97P3fbabbfs/0Wp3Ph7GVgMDHSaqwoePfhJqvQa8Y9+9UMoWnAwG3qo/RiqEzXZKuqGeje16tmaX3q/UqwxUAu3i8jIndlBWlOd7ifBM/Dk6BWEJM5n0YkX0Azfma96HtiujtD5t6IR91IJjXRgpFdn0TTLe6pLVesGkabNIolGSxQqxxugW0AS4XFmBlcoqbP/G9XDwwVcO/dp1KldUzto/fPf/rNUqhe9tdJqfiJq6KeF1Z3HgffLYl+FcfR7ed+B7YLw4CiarCRwz1Y5lhxgCJxXRjenGwEvtW1CjUWketVOl/lSUFcWgtmZAtG+TveUywXIg5WR+Ii3Y+uKy0rDGDoBN2EdrWTrM9MS4XYBLGl/ZIeoCTUaRpqX9UKiHlxxFX57CQdQe9q6ZV8AbH3onBL1hvHa9yhU5nd7zmXdsBC/zh2gKvt5zOjcokHpsAu6b3gGvnLwTvrTwIDw1c4QHuNtq1faC0u/delqj0G0DdUoVRJA2qVEaaiZarX20UELQJooGhBv7iR/LAHZQyqNLHJltDOEEMX8YouQKcDQtnh+xxrRYV+iY125+tdALnlGSBZFRFPahJTyJgGvztbX4PO965lXwXQ++ff2C1otPSELCNSdETl2xdtBLP/aecqYo/jCbSn2P75TpmCwmIom2jW+C1266G461z8BXTjzIISSDhQhj0eBOhlcIIDZdsNfVWk3yxFDSvaJAx4jNYPLcWcSJvwqHYU7mCEcbOW/1icqEX25Aa8I9nFZJS3D6ntbE/cfiksVAgdZUBJ1GFjzKmlLpnS87eg98x5ffetnN4zCL5zWB50W5HhsxLJcX0Msj0z2C9zqF7wO+0RyuglUkCQnMDWTTT+D9oPcV3McMXn9FKGBfZeC+ooFL8tKvIngb8vcwdvpOYfoR8zdKlZJpS7nCL998ELYWN8Anz34Zzs7POWoWXJVrzWkXxMqHNNpaMEAyuuQtpmmNOSrU8YUTztHfwHO529HEAdBXOCDjaYxKy+ZVc/KEuMw2EVHpdIrXIqLfUpII1RpT5RPtJy1TcM8T98K3H3oj+KEPl1q6CEZvB96c3RJS2/FaJ/HDgLLB1H3odiXUOsALkvHfBv8mTfwym/IYvAI3SqcEpPE3OXrGwELGF9BdlNA5ib8/BdB5DPe3cnVo6CseuCTf9fc/WGgE7V9MZTI/imGbXKRIPQsiyhfePr4F7t5wOxyvn4YHzz7GbUVZnJiqKQN0wcLvNWgpjOR2ZIxSJcESTsb8NtrOfbYmsdpp7Do4bRFM9lTCNO7zc0OOz5KZ3tYFEAAAydJDoc+XNC1NNgTaUzNn+XPqxMHghzS89sG3wh1PftslLdOTWQQTRpm8W/GatqE2zSugNjoIyi5q2J669q6+OymtYe29BWLHo3m3xbF3xbarxd0A8inqJwYwVcbrxR+3FgF6TwJUn8AfnMI73oMrUq4K4JK848/e4Z+c8P+vbDr4zUyQtoFchVt1ib4ur7t1w/Wwd3QHPDj/GBydP8kJFq6PKQcAiuBi2riqHGW1jef6tNZffm6a1djS1rc2PjDEq3tsnJaaxuPgo1AXXUcbz7vX69l9RbnM0fGJWTaxWvJliYiqNmq80BcBfrK1Ad76yHvgpnMH4VJJdwQfdLjrUSsW8TVeX60tkTtAIEtKCsH4snfhpkDGC/HNSi2JDT2IWFcKkbXoNqHVlM0ImMjTMqI4qa9IWP08gvlhVO7tKwsGVw1wtYi7PvGOe9FsJvDuTpqsxoymJHrKgLp9w02sdb41fwjOLp3jgc01wI4GNhKxy76eDAYc3JjpsVpaAa6za7kmpVKt5o2I6LiWt2mMIfnVqsSOSDKzVlEUWooUuBDKZ+XWqvgb0rbUjZFCPuyfcxaVgB1Lu+F13/g+2LiwFS6FtDYCtF8CkN2rwNlAoNYQqZ2QzldE6x97/bfXpfzs3RSRBiZJgtdsa0As9fNqO+S2RGRSbx7DyRy1e+N+gOaXcetVuCLkagMuy8v+5m3Xi3z6N3PpzLf7wvdc4JpnbvSNA3u8NAo3TO5DLZaFQ0tH4fjcadZGBpzW9BWqyN5wYG4KY3LfrnAyh0mtjGJQfVzJQAZZquQSSvQnDUupiO12hz9zz8tl2+jovKwK+7Rprm6izDJqn0NN92hiIvLs1uMvhbc//F5I99KwlkJgak2j6ftKvH84P6QROXVUsXXKSvWok2T/8IvVZTg8H12iJyIQmjpoW3ooosnLvb/0Gx8gwfOjpg/Jb0Y23pOwcdRDt9qDla8ggL+C+1vny3JflcAlufHP3pFOlzo/W8zm/2/UwGNJzWueDdtKYZTdY9tgvDAGs7UFODJ/gkMloWZkOUXSxHk1UAaBVL+IHWeQxMxxDVDzOX1D/Zap4N3HyaWFMWOaTNz0SOFodbMnGsCqgbkCLcnR06f4d1T4QCTb2Ook3Put74Xrz94K3hqTUJ0C+pK34P27HUGbIg2rzOGA7hQeuqdBOOgusabEf8KehFlUzaggMc6s7lEPf9jokj+rdCqZyzluc9tjdrmUJndGQh6fRzO+reTyIZbPEpMG7nu13YW90wGM4f6X/gEJwAfWb4rDVQtcFinFnZ/83tvwT/rfcpncS1Jo79p+Twk/1ICTBvxEYRS2jG0A6QH7gzOVefYnu9o8ddljE3pxGVwjfVVB9rRMZQ+/s2AlxjenywFJu1KSB/uwF3D23BazJtxDwKVlO8mno8QKXl8YB/nNJ++Aex95J4w0R2EtpYsabPVmAe3b0SweASaZVtGHJU3P2s9T2lEkbg+97uDksohApU6fHQIoMslZL8Df4z6QS1wlP7inJgCMzEHIlhAT0LxfIqKIxMpQaN8n1plM4hAmkLKcyntQzvox90I4B6e/Za1Lk0MPtk/gJPikgMrfkS+8/iBydQNXyx33/5NUb37+vdkg+PdoPm+MOldAbORE3SwUkUV9hUdyRWQkJ8DzVfLCUr3C5XukjRnIhgV2/NvnckN9P0Bz1keyJGvrf6mSR+1X8ah2knBN4sTOVTaXb0FLx59fXuJzZNMe32+qboXXfevtsG/mBm7Gt5ZSxVjrwiuR/Nmn2FwK4bRR0zLZpM+dI98avOxFhARsSnChvmL03kfwCji7SiDGSaAloYp+aQ2RShREj+Lqwtwbyb+nW5WmjDD8O+XQ6qDnND4CtkIANS+SekGIpFQXNhQk7BgNoJyJLI6YGY1vZmttmCgBbEv7CF4BnW/ivQxh3cg1AVwt4ua/+Z5dgS9/Ip/OvA9DI+Wo2VvkHyZL8di31cRUEKjqn5FCURUxgAIzs7sUyOHV2UOye3FwRU3dTc2rKZMjzU6JHF2dG8wZXbqM0M3kiPw75SfH6naNlqVMqDQtypVisNL+qYKJSah2Hl772Jvg9uMvh2wnD2spqxiH/dqeDkzdEaC14nFYpoKAS9N5exFJZOYe5IWgjefYQMDi//idDwtNASeR6Z2vIlA7wCDOoCqlfaR0clygbWudSarXPyItjL40vqAJoNLCCbAX8gZZvEdjGdVDS/29AN8LBK2EqUIXrpsSCGRVOx0COEwXnh/uY7nZhf0bMG7/tICVj+GPK7Au5FoCrpVb//r1BzHc+6+y2dS9yLDmhK70ASd5IwkaIwbsJL5uJsf9qTBOTH9s0qISTCaVqQZSHSoNExyGTra0BOhXpur3g8xucz5sETBrnOGVH2bm52zhQ7qXgZcdvgde+cx3Qak5As/NBnjh8vB4F44dDOHWXWko58gXRQIK2WICnfEpmdnVp0H3oN4J+bNuz4fTCIazNYCVJm2nfoeKjkFKZrCuoFTElHDYc71vHXoHwipNAl0GMWr/lvKP5+stfI8kH/5txqnFLKWo4m+y6HeP4/nuGAuRoBSwseiz3y0dqoKORab7BJr803UPqn+L8eXDlx8y1yRwtYgbP/KmOzOZ4F8g8/yObCqdMYUExixV4Ik6OdofOsQQOESXSxe5rLMptveE6CNG3IQNJ78qQaRFQPY0YImEojgs1dByeAclWyvAncdfAQeP3Q3jlck1T1tsBBL+ZnMHxA0e3Lk1gGKWwCdZc6W86KLYJAYFwpYmmCSySDPohp9eVSGhbKC0KlVFGl/Vd8DqnYfIcsmmnlQgJnO6KxWIUWGyn1xBH/skOsqL+IZ070Qmjea00sI0SUwVCMA9eMlmH0o5r4/EaqGpvoJhuJdvScPpv8BvHr68xNW1DFwliLGb/uEtW0VP/mxK+G9HUGzK8OrrfsznBQdgRtyQTJSkIZxdRwkafQx0UpvqQ9inBGvs61appC06enlLCvMQETWxOg13Hvs2uOX0S2CiPg1rLSGe1GPlLnxoUw/2bw/g7h0+FHDumK2HHBv1kkNKEEElOfySR1QuYqjlxIoClQFrYMDqae2sn/3oVjCQY7uOeEIGrNDP5KQQiPmBIG6SBu5pAKNWn6n34PiKWtBtCgFcRGupg2jPIYIn0aO4ZUMP7tgS8GzhRPB433ONNlw3iZbNFwU0P+dftvTJIXAjEXs/9vpSEHpvy3jBW3Dw3Yux0Aytn0NtWiMTWcTSG12TNhmiseb3ABPcHtT+Rmtora2Fk+1lG7OjdqVYLPW8KtTLsH12L7zkzCvguqUbuTfXpZAOIukvN7bhW1PocmwK4OBmPBd09xcQtPmU12c9EPha6KwqQHpwchnQb9SA1Qwwa1Yv0sqGbWYNq7UtOKAV9p9IDI8XKs+EtS7pdvKTe/qZHpT0QTHkCj5mqj2M3dfZvdhayEEeZ5A2or2MGncnEu93bw9hQzGwprhJ+phB4mr/NLpH3/Cg/g+Xh7Qi4A4LLpXIP//6xzxownEZdk9WUqutB8e/nrl/4qvwzNgTEGZotTqPM6cCDSYSAzIGWigH+6bqBZxvijQdKkg8TWRRmh5l91AMl8x1Am1heQzuWrgbDs7fBdtrO6HYKcGllBUkoP5oRwdOlwRcNy7gNgItatqZ1R4ztDJhkdBIpwSHcgZ9w5ZiiUN0IkfTOlVRaA3rgDXQr62Vr2cBk01lQOwSXXworREN2ezrDcgMJq3b9dQzvc/hiM9nKN7rw3S+BEcrLdTADRhFzUtEVgWZ7EeaxCz78PJtPbhx2rfnR8fZkE/DkzMt2H6bhBE8YO3jl0fzXtMa96H75CiC9TaM3b8X374VH7EgJ/09KqllOFI8hCTMA3CqcBxOlI5CO9W0hfVqXV0vBmJPRIX4PNYcUgs4fKS2pzCOr31get/WaZdNNMkyjTxsre+AAws3wO6F62BTbTOCtQyXQ04VQviT7V04i4P+1g0+3Im+4Dgq+fkGhlgynp2YNK4QJBhrRdJsLBOgX4laVvWTZwCS+et5ke9K2/vmhxq0bpzVANsluFytHKWLKvB29XPPIbFAm80d8yAfmLQvPqqofedqEh5fqEMNP9xSyHIYibYbR5S/ZDPAXdtU5ZGxJuixgrb+tnFkvjFUVPubS+vzXpOmsgbrWzVYb4MEWC8kXdGF1aACM5kZeKb0FJzMnoCFwizUsitQySwjK4lhnqDLwX+zeBYPML0kJw9SvYxnIFRDdb+WhlQ1C+nVPGzqbIbrKjfAaG0Stq/uhFxvbcM4z0UOF3rwwR1dWEL/dVPBg2/fGcDmIhJL1S6M5TQX4OQXM2uOj0LagyUEbaURgVWI6OHrH0gXjA74k69Bv3YrgmQCwFKbyKE2kZms0s+gNXLXATCxzxRKovDTMp7nkeUOHEbzeQop53H0f4n9LqBm3jMu4Q0H0JdPR34vPS+g3b0ZrY88ms2tT166cshrBrgM1iq8T6h+z88LrM8mITo5bdFm//QcAppeVzOr0ErVwZc+NP0mZPG/HkV7cWSlRQrK3VFIdzMwXp3CwRfiexW2WW/9nY6PhPCBrV1YRgZ5A2qfb9vmww68c+dqHRijeIrnAEuoulmqXR5FQC+glm22IkAaP5akJyJf1dWevvu53tbU4BptSw1P0gEx0URs4QSBE8pClVhkYQHKUdww8nutJgad7aYBa7Qvk1dd5fueQ6b7/nMVTqPclMugRu5CPh3AjhEJb74ugPG8Z/1d2tcMquwD6PN2P4KfP3ppNO9VDdwEWO+BoTwvOZlD0O7CkFMWGW18f/eWFNyApHWtRQX8VKQRkXEck9UxaxrYDNp2XFvajVFQwdlwjykA8JIElBYC12w1hFOVEE1WH27aqLReT39HhQtUw7tQUeat0bCGqDJxX8s0gzKbhQkdae3bDhXTTemV88h8PzxTR43bhq3FPH7e45UtJnMSfugggleHjEJ9fccxCP3SzQFU/9CH8PTaQ+qqI6ce+jm5E7poBhNYawjWa8KeuPhSR6R+aFcIc6jRMkiSXTeRRnMRQdCjzhMSRv24ZqFQDz02lj3WfpS1aQiiGG8jI/PWAJ7E06YzVVIXkASrNAVrREqZPLIE8GePL8Hu0RKcRl90Ehmxbhhp0Cye49YRAUtUx0vaU+9X6GOZqiE2zw14PaVp6SSYDO/p80mBzad+yZY8PHrOg2OrNdiO4O3gfZipevA/HurAu29JwVRRnT3te8dIFr4124Yb3onn/N/RBVpd+4F3xQOXwOqF8F68gffgdDoE64sUKhL4480dOK4Z2RHULvswdpnBUX+21sNYZxCr/e1x14ou7BhLwTJqKnwZsbAAbmZJxOxIlRRBgBsvqKIAChEpsoqYZwmPzQo0yQEePNeFE9UmbC7nYaHhAxLAnPVk/s7NnmDTGXRNry8jTRgOOLQ5bzKXKSucNDAnfgAtrI67CSIf/LaNCMg5D46s1GBXWfENp1H7/8kjXfjB25CF1mYz3Y8SEnGPo5lx/XsEVD+Avn8T1lSuSOAiWO9BsL4a79f78M7vvExx8KtS/mFLD54oCa7UoUTjm6bTMF2k8Aj5rmq4WOBKSm/swa6RFCC2MHwVJUIks4+kNkvnEHh/90wFv0vDzgkf/ukdKWZ3MUTNVT/02+vGaL/I3KL6PIcvqLNmg+PBPseMN5U9RTaBAhkVKFBtL5X1BaEyxS0zLePhJXpP4GaSS58kTT4pP06Q+Rq8t0yleaNnVqqwp1SEAp7DXF3C/0Lw/sjtAeTSSvOmUU0X8ZpOeR3Y9d0Clv96bf3dKwa4GqxvwUFDYB0dgvXiy+dG2vC3ZSR8iA1Hv27naADbR4CT7dOBB7G6d0lsLIZERgL2EWtaw5jyChPbJJAbHxJDpvD4vIQHZ1fh+qkxOL3iw5FFqp2N/GUGvj6EKt8LOf+72u5AOZ3mNMmNZWUO03ae9lVJ69a7wg7otohCQa54zkGsf+6pScV38iqNvy1R0d46nUHTPcSYbxV2jxTYZSCz+a+f6MLbb0xZf5/Au9rEiMHteMbfRKLu2NqZf+sauEOwXjqpoYP4mU0hlJBBrXQ6rFlu3oBaJE0ssiKdSIwma3ZVDJeSGmYrEJE1Mh5bbeuwCxE/iwjuk5UuaucOxkGbOEGk4GxVwp6xqHUN7yckc5j8ZsGgJfVI208XCqjtQvRTPZu/TMdcbQk2txtCpWSS2Uv1Wx1lNLAwhMJoUjD9mX3NMlNIq2veD7g/t29US7mSz7sLNe9KqwWPz2WgeKgLb74+pa4dH6Nox3/9VBPuemsa5n4XP2usDXjXFXD7EiKGYL0kQvf445u6MI9aNUQt6qG9un8i4OT7E2ivbi5nLFtL5iMxyFTCSNr2zJICZ6j9RrNDBq1UYZeuBm4VNe4CgpY2q6JdHRYxhIbA3TsWV4xLCMTpguRjUViGTN1V1LhUiztXUyw3iYEE7XfLqEqnNIvTkCbOiIjE4rZ6nvrcaPVAPwsTCNZ+L7fV0R9l9PUIvBe3bchB/Qwy3NUG7CwX8FpacP+ZDBJVHXjpNnVWtL+RTAqe7HVg67enoPm3VylwnYSIVyMT3Je9NJS1l7PZED5TwtgogoTiob7fhV2TpAJ7PAhD6ZiOQPm+6Neif8rxUz3YvV5c03a179jVpjIBuM2F8mhCorpsYnyUMqwWGjKWwkjP1PWxnFbdLQqpgDOZKE+bsrEWW1oz6mPRhNEiggqZJV6O1NfgDZVGTul9ShMKElGpofWD9fuU1sL0e9LoafNeVW1yh8g7NhbgUydWYL7RxPBQBhZwAvrU4RTsHQ9hoqDUezZFTRdCEDdLSD0mobMGJvNlAW4se6l2cRMihvL8pINj7fObKaHBQ581hDaqx5unA5jOIaBXO7BtNGuTIGiEU0eLjXkf8ujXzVU0QBPmZVdGnxttZ1IQA08xx3XUoBRiIabYiAESTR7FfMiFCZRgkUazvYHIbyBwM10fw0VElEWmO+87FCrJQyowExLZ39YamCYeChfRgKeJJtTbGQrJaOG03rajLHT+De2I+mTR99OoeV++sQSfObXE3TaozncFJ7K/PyTh7TenufMGyTiGrR5ZaMBdr8rA4nFx0fOZLxlwYwkRtWFCxHqRh8s9+EKuh7FXATmqPMoCXD+eYgCXs4HKNtLbGhb5wFQAp5dpRQWVreR2UTRphsIJ/ZiOFbRNWlcYtJD8oibm5J82EeXpQFjWlwHsKb+V2tBQfW8N1WAF/dyRVIZLA0dz6px8DcAW7iOP6rWJ++6GTtGBF2VRmXPiFEx9eh2I5zyT0KlITVhRqIh/1qOYMe4Xj7G55MEN4yV4amEV9o8W8fchPDkP8BiGrm7bnLIaPhABNLaGkNqN53SRC/DXFLh9YF07km0oL0DId/zbsTaGQlJIRnmo1TqwGTXZFJqEcxij2T6WBsdtZa23HUMxjTZpXsGaK9BfGh/YaFa3HM6EbUjbZgLVmI8qoBpdZIpTWZjH8MrmstJK5nekuCbQz81VBJus1HVufnUVpvMFjCf7nBDCtb6gAHl8RcB1GwTHYem6zPIl1Bms1hJsKTQ7gsv6CISkiY2/29ExX9a+2pQO9HmYUBG/7amYc4kmtwlkuKsZmGm0YEcxjyRbHT7xTBZ2joVQ1NbAZDEFj55rwMtf78H8b69z4MYSIoZgXdfymbEWLJdUzWkFTVcayHvGUhiCkVBE9ZIsNe0geMgEPLFM5JRgbScdsMW0s/MwL8iHLCAKMohial1cQWZ2OpdH1lqgFgObA0wvVjGeQymGBJrJnA+FUgpGS2m2CKaR4SbA+o7vTW1bnzwH3ByOROrwDpm76bTKbd6I8Wh6bqGaPbOKQG4pxJI5bJIxaBKwbXY0S80mtKeuM02Tga80/h0b8/C3RxdhjFZvzKa5z9bnjnThTTek2ZdmXxxt7OUyxqB34++OXLzY7kUBrk2IkMwE3zZkgte/sG87ocxUKn6gblmbigEP7iOrLbh5UhXnm78llbxdN5FijUUg8WREQpGQZrKJDvozfutFCQ/cA5l7SnlQJ9MXtVSnXMbQilNZo39L+cK3b0GgI0C+5/oJBP0k/546WvR6kU/qAo272YaR2d7lB2r3ptKmpo1rDtG3HTV8FeNFM6uCs72CMJHkpfdLVkLokFVc5wuqrpeqpW6ZKKG2r8GBkSKy4W14dDYN37arx5VTdD8mcbJ5fL4JL31FCpaOwEWTFwxcG2NVYZudQ7BeWfLwSA9mU8BkChUcVlENTaAmyyASpjEWKc3oBzVoqTPjeEHAU3PKHLaldKCZV5O4oPdvTGQPojY0BJwM+a7kOKK2bXTaPNhzQSYGGhKaCE4hqMZyKpTU0T2keDtHcRnf1cSB3XxocPbJHTE0Y7yKsdXHGwDlnICd4xJOLQuuZCIGuqX34Tnms681L51/qJlm0roFRPB14xl4BoG7hKx3Hs2DOlLnn3gmhO+7WRXY0z5yXgrmN0kIppFRn704JujzAu4wIeLqEMoU+sxoh3tW1VDdhPhfPu3DBtQgS4iODWWtAfUfmFqVjmQFd04kQsqTUamcdDRVMkuJ34aR9qK+dpT19Oa9JRg7UEBtlOVQ0b4JP1bnanBJvjR1jTRdL9xJwQW6qb3l1QpE/EtDRPX0x11nMqIif2oqt2UkhJPLaH53lN9rVllwixU6GrwmJZImMtK6Y8gHXD9WgCeQqLppvIxavImTW5qZ73JWXQmVOZ6utOG6VyGw/wIuijxn4BJoMXzzmSFYr3x5LN+Fp1BbSPRrc77K+6XicbKOT6yGsGk0ALMOIA29SqsLt29KwZFFYfs7mWZsdr0eGeGF/cpA+bTkoxLba/pMeZztkGPAdnV8txfGMW+ykDy9X4PFWOtU+l6rRANk4/eaIgOQDuAdRWfOnz6qoy99DsNaGxG8ZxY8BiTo7wn0VEnkaVOZs7JIs/uK4GKfHa9zP5J4TyHwF9F6GEmnoY4X9oWjbXjD9crdoAwualYX7JHMSnudF6R1l/Fe/Ge0/T9Ab4Y9p65BeWQMzURuFE4+bhdWGl04MJ5lzTqhK17M0KIBW8oKzhtmU1UDlsFmitVBabxzCPpvzbXgtk1peO0enwd6V2dOcbtU3ejc+JBGjInrJnnEFKejjoUGkDm2dH5ntC+DWurKH9CMtjOxcNE/RGBfRpKqhEQY9aKiLCy/pyaJrj62aZtj+mGZMkQ2/RHEI3mBWrcI38TA9sGJETynLjxyTsBr9oRchEDHGcfZ6xk0ITYcCEB+6zl3y0AaEP4Yd/Dhg78qPut+MQTuNSYt/Is/XpIcQ6WlPTLC4x7DU0UBZ2rUfjTtrIlEA7kHN02lYLEpoy6KUhehg3pN2vNsFeCjz6zyUiDLiNb9kx7HX3uOxrRF9QnNaUQkQCgTz3Z7/QGfp4S+gn0DSANkT0JsSU569iECOT1mMOy0e1zVAHuaHnfPz4C3gwf09XXRZEBWRB7v6d7RFDw8r1IzfZ8ILx8Oz/fgxs3KXKbqpXN4jP0vEbD8LXg2+Sxe219DET5w8D6xPGiDIXCvMXm00INFqZb2yKI920SSKIsjewRN56P1DqQ0UWQIJ2KcaSHoU/PCVvrQ6nmmtxPlI9MqBM8shtwtcWOe1uVJcw7yplLcJHRXITDx0tj3EAevEWM6m40INKS9KTeZLIGlhuT3xDgL3AGFajZheGlL2YsVP5iWOFKbwZ7WqkxchYKbAQS+SuDw9HF0jYMKL4FaaCyUUbM7bgDA4SEBu8o5Xjlhz2gJztbr8JVTGQRudG3U3qixUYIo46tKn7msTOEi/Mb5wOrKELjXmDyBlGIJnbMek0tK6+5H55YKB8aJTXb8RtI8hZTKX+6FTt9iUAOeeCPq1UQAorrZRq/LABK40ckK+sqlKC0xJklV6nzMz9qsNcyuASllTJk63RUkf2jpzSVELj2WOx2eSGhAj6IbMJbNYWirB/fswpBMwbea1xBWoA+dggi8dAwMF+O+InLK+MumzU6ozWVfh4kCYzLjgQ/gjPHRxSpsQveDJsZzaIXMV1UOM+1nEmnok3gB2/Z50HqAT+G8pvCzyRC415BQWvDTyIIutJqW6cmmUxxzXEV0TBRU0gVlFVHK3zLGbm+c8hEwtOaRsK1PTYYUDVyKgZLWq7R6/Ntau8P7nanH/ViSmA/rqFHXJGWAQaQZyRQ9isP78TnJy5XQOrvUuJzqY3lZF7YePEijyT/facECLeC91OHWsHsmx9HET8O7bvQ49GPLDo3ZrIFsKoFQWaLL4JyXUGSXMfMt06zNdJMbzVoXX08XPbyXKZxUkKTKEknVg4dOC/iOfWm7wwW0RLbf2JuR9wf/8UKm8LPJELjXkMynQziNMY9CKs2VQBS/XWzUoYim7XKjB9dNZaNsKQYlhjTQDnxmWZmH0qYRKk3UCaN+xWplB4Hg6jColhra5NQmMYGcQEdkTk5TtwY8QvSzyub70QyVFlKHTB+KacGr7RkzlbeVKk+53s3AQiMNT2NM9YykJTpb4C8ugT8xDn9zSML335K2oabQ+MigtTBo0itUPazoS9KuHT2jJMk6S3wJFToyRBViFnaX8xwa2pDPQkV24NCiB9/uHI8mQH8XeH/9fvjN+8QLXwdhCNxrSGazZA6n0TTEgd7rQRs1QgE1LpErnZSwIDJEEC3GJT3qk6y+MyasWebDMMy0bQ5NaioM6EjBOcj1TooT70lLVhDEZIautCX7oJPIwr5ih4CpnLDaiyWhgRlYiLQDSHSdWxXuJpak6rHfLaDY8/F80T/HHdIym4t4bYuVVRgvFSBY9WAOTdbJYuTz+gN8aSra75mFiISjnWU8buwJpzxQm9BkOtOktBPJggfOdfn+ksuwWBMwW+3BVEkZ6GW0BM4sd6f/SQEO3IeeC7xAGQL3GpLHUhj6aQOzomla1BLNSwIc5Qks6VxBk/xAA3IsR2EgYZlkAxYDKpOjTNsW0KbNI6NcDXw0m9sYE87DN053YA5N8CU0HSkJv4um92g+DdvGyhiCScMb93m8Urwhq2xnRkfFIdENe8eF7UfFhK8ziXAiCLWu6aoYcSdMw9ZGFpbrDQS1hNVqlWOrTy90Ebhpmw1lOmVYTa+B7C5lwqclIMayC+PremrS8s2zUGb9RA7NcpwMqR9zKa3yvqnrBwGX9klFFvM1CbeG4avgRQD34mU9D2Xdy2kM+VA/qTyqsQwvlh2i+ekhudOD6Xzg8kRM/EwicGutCCQmndCSSKAGMiUikEk9lcuiNs2DF6RhFZ3fVdxHgGDK81q+aejgKJ+t1TFMMoeAbsMXTvXi+05oXhIyr4klpiQOfgTqkdMPIoWorSt1fqQ2O6NZmgwykOHubx40mi1oh10u2DeWBIeJpM78cq6F/u24k1TidAxwhUiYzl7EMNN5bC/l8J62IOcHGHbr8mJn7s4oA63Tg4PwImSoca8RqaNtOIc+Iq25QCYckyyoIWkhaVrJfVs5PodXcGRRy9GZqnpvtKzJZLJMq15IaxqZ07v8Mvt+Gb2KPG1PCRgV3H8ONc1jGEeqyR6azi3USG04XvFZk9Jgt5h1wjYkIc4UVBSQ86M0y55jslNxAJm9HT2SiykCb4DscAoaQMxzmxNLyLc0LLER0yDAEE9UAFHTLSItQQbRC+GQWqYE0ISv6PCkfWkS21rKoJ+7ghOGWsScyLUwVOtDcfoktfLpydvgRcgQuNeIHMt0YAUHUQrpYlX3Ss3YUOOib9toqxY1RthnpSR6JIbaK9HSHgZcZlDzItRU7I4/HRHAXTGM32eA1eF6VgzHyDRsaGbgKLG+ANxylRY7W8CwzqaUF4vTCmcfJGQKFzMqbZBCVGYZTSbJ/Og3oe7PTFZEEbX8rG6TQ/sxHTMSbq3tFMnscgqZ67boTwyJTs2eW+g8myIEmkAIuGS9BJ7Str5P9cserwI4klN7IuZ5vhbehtefRTC/oA7MQ1P5GpE6jmiqXiHNV8LnMdRKPq0YyDHbcEDSg1BlcgnQkkgRaSmOYZKpmlZAp4oZ0qCkhbP6QctxlhFMFCcO2Lb0mRij3882ZJQNBZHf6mpGSpcs6dpcSnbw9cr1FIIhTo0fvgINfU+fZ+kNThICzfbJbAb2jPr98WR7rcCtaXp4YWEYMc0kxrqIvQc3tCVjFgg98mnFI1DjAeqXRYTXqdWuTQ2lgo7ZephB7m47vEAZAvcakRUqJucUIAFNHJ01nTTMIQ0pYkUCNBApxGK0JkBkIrttXljjavMw46vCAgIxFxgEShun9PcUAhpB0zsbqKUCmhjvJY17otKzZJAb9w2dMEwL4zJUnRQ4xwt0kbyvgRvoWGrAgBYcuwrwOm/cOA13bszB9hEx8L4Y0NE5N7WZbIoZTKKGyx67vzMxXc99gJpEJjDE1kLXIIuzDC2dSisXmn3Rjykxo93pvBJeoAxN5WtEzqGN2UC7tROGerASEHxQUaCwTxuNZPs1nwGW9RU1ISP1h6bczw3xSG0+kt9Lq76T77na8rljI+mgSjvKrhLuCwNmQfm/1NeZFLXyEU25HW0Qap+RTqiniSIi3UL0pe+97QDcsa0I+yfAxlEHwZcmma7eh0rzVJ/7wmGyE79hwJKvq4PQJr7Lk4BPPn8aDi3V+B63ww7GyT1733hVQkFdPMSN8AJlCNxrRGY9YnADJKMC0MttI3HU4wFJmtgQNZ4erJQo3+hYezBG0oCIkhAMMWN8TmNK9szA1p0vSAtRJ8kioQQHbbPb5tzgmXpPdaDwI8ZaJMBPNcA+fmhWrAfdRsYEZQONCH7qqWbqP3zLJNcXI0+klhcBeykRSyxUAzih9ye9aAO+VKmurQ3RZ9ZElQqAquWrVIuZO5lUm9Epf2xulScn1rB1ES+UwGtqSfGCu5sOgXutCI5u6jxB+cmUlxwiOdSm12EKTUTVFNnTo9KUsHV1QFU6I86NZ5r3oL82FTemFE4Kh7jRmoiAS4O801Opi9TGZrGFoSeM53oOqmIaWL8mK1t2dYvVXlTYziAKqBE5YLyU/Gs/ApiAmCnuZmlR07ftY6o4gVhfLqzv6OvtRZOQZ7Su3pez60iDiyhURPePsqiIze7p7nlUEmmKFuipiiq+2/E2wwv9c8JQrglpU7GADDkpIUUNRXF0FYOUqpTR9q4pMKCSv9GUNkElDCR13IwiYzaaBav5oTWPW7+a1uZyCmeIFqiukiPoC9KyIpOFiG4xWtdVk1RcQEx3Vxewk0/qazKKlThEhfntrkqK8IQTvoJIi4J+TbnJ1GaWCSUGvQRaaYWKGRbrwvawovI920xOxM9NaHNZyrjPW0KHO53y2QnhXlldnbihL4nCU/h6J/r56LU8/67LQ+BeA0KjohkosomYZNaOvp9QGRGDTEkIgYjMulg5njNoOfVPA4PMTBFCbIUA0IMYPKNxBWtDImxa1A62hfAtFHgleG31Wj/RjGSzP2pSt3VEwkpLnZjJniKgmiL/rmmTAxAL6SSJLyMEzOWaOthiTZ2wjzGdDQjg3ROS0yxX6up4vozqd42rwPcTIjB6jjmd4Q4gnl22RfZU+mc2re5/PkUWhig9A9x7rgXPU4bAvQaEuzmIyENThTlSre/TowHn0rnAy4S08KNsKKxvF/Nz9ZMZsObXQh/L6E4zaPmhGV9KsaQVAFa4j3OX48lnVkNL3LirC1jACSrjEzBWkKx5GawdpX3tmQuIdcOQ7okBDMhL1s8yshDoBXWwPLMs4OwKwPXTIZ/zos6TtiazvdiIgebvRZSYYZhvIv6o3DEt1LrCdM4qUYPTOHOPPv7489a2fCwYyjUhBEZaNKsVdtGn66GW67JJzFlIelQbvoe0smJMZayG1Zqw5xlqZmpwLFz1ufb9VKsXNNEpR9HzeA1eKtRf4iZ0EMuBNsAzpBlp08NzAhar1KVRaVkuLZSRpWD8xxBihkQ0ASTO2zLfMPi7x88hmZaRkElLm6MMEIHGTX00YvgB5X1IzaoTo0w53KHTh1rQ6hGpfHFLAV6ADIF7DQiBr9BVq99RIQAlYExk08zU0uCn5UbMuKYHL7KlF4u2DKuI+4oA8UHrgtUNnxgf1/i5BNwSkUc4mOvo4xKzTPHTRkdGJwAQe20SF9xjDRq4po0NuMCX2heX0VIpid1HQBwwIR1bELCROlZ45zkmOK6C+UxrXmrjw8DVKl0vo8tJHtqVyNQpfe0FyNBUvkbEx1FDoDXDS6UjKk233ApjAzm0Wlja7dk0HqBhXF/SfSOctyYRXyVHAHfgCPCDtvCh3u2g6Zxic3nPhNJpBvwkpl+UMYVdU90CRZugqx3Vxma1TWvmStRwNAEJzhmmEFgG/fyJnIRdGITZNhIh0VQMxYoc9LG6aDrTot05DDE1eq4dHhfXtzZhNV0piWEihWo6B+NitHDGxHvspbOyjG9X4HnKELjXiARE4Oi4Lecq40Tf6qrQkJ9wAIn9pZX7Up4fQ6BZa8d9hC6YZKQNmWGWEfQN48ppi4jgrCDgetwxYyIrefkOd6qwkwjoY0NEXtF35JvPNQigAJWmhCV8rOKj0g51ZVIPVvBBC3DXurSkJzqUeF0b8zmYLuS4KOIt+33Ip0V0HOe63LAULZGyHYmx0y244Kp7MX9bGJMf7y+ePVkxXfZ4tTtC/m9Xtk6cfP6gJRkC9xqR8dCDM4HKoaV2L9Tjwe/4rHWJkU2CZQW1MGUqeSKuPY3Ws9u7r21KlRLXtLTVRIJCQh7nTVfaAoHX5tRH6iIJEDdh3fcG0LT7b5xGK4EaxDEoia1VYS7SaDTpTOTSMJ5TxRENVMXLyGSdqjdgodGE+flFmKymYP/UOPzpkyl4z/UBZFIi8scl9K2E0NWZJZxgEYLtOQ2J87QWBqhrpewwUqeBpxKgqRLLmPxU7O/7QXfj7vGhqTyU80u+J9k8NWSOAR23nulJ9jWpg4UdfDIqzSMxBe5JhWPAZMQumKU3NOEc24vYU75fgVKlEMSUpEClerN1afc/qMujYX9pAesjSyF32iB/mZrZjWV93rfrS5vftHoeTHQC7jxxBI97YlXCAgZwT69WcbsyfPWsgFdtD2K+r+2H5ZxHO4RYUgc4xJa5/p7+zlg1vqdb1OIngXa8zf1L4SyAbkP7xnMqMev5yhC414j0cOQtNkIGJ2k4zlXGUdZE0DYZvCGX3xnz1tc5h7Sd8d0siePs1/U7XTE+MZm2XQ0CwyxTSxwq6CeCqok+LnnYtQ71IkazMiVivqYLKJJiRsC2UmD35XuRaSucg5s4LwGOjpfyVb/oVWTTF9CUnq/UYBLN5seQqX75Zh+CQNhJxsaTAewauxRHpkQP0xQenG2lNonZh9XfEddGEyKZyORjj9LyoiLiC4j4w9/O3HIjdOAFyBC414iMhT6X2qkVR4QdZKTxxnNZXo1vNBXVv1BBggwj39QCwwGpKe8b5PYJ/b0FgCaomLTBZ1rJHacJHNQhnkMPsl6K/dTJQETm+IBJgXKPxwtSm/vQR23HKoyoyD6MwN0tpGBLIwuL9Ro0mk2odNqotdPcHWO6KKKlSyAKS/GEJRVwS6nECSXteogIPNVETzVPz2IMl9I1yYwPtSlOGRnS92vwAteqH4aDrhGZbpswhQDD3Uq0CUnjUhriqWonlvhAmrnZljZB34APIM7mng+0JDYFUD+bxa1J2/A6ub7S5ZVmiwE914ibk0mhz5vIem0pqU4X+VTUwoZrf/3odUanQqb1+xzXBAuYwh+lGEAh1NG/7iGAzlSVscuZUTJuJRu/njpxmNRKCf2+d7Sxekm9pjiDylealiac0DHhKT/al94SvEAZAvcakdGu4IWpO1K1USEyRyU9SBzwAczU4hzJWCYFc/Ueg8MFratkBlrJjgZOAsD4oFzmhwjOUXiKMqiI9UUgzdWl/Z10D6Kf6RxobZ/JQtRvintO6QJ7rgPWhfSmoD6lAUygpl5Vo/iDPH1ApBwCl/K3OzKMh49lBGAjbTaRReyaI2ZdMidgRapeWapRurq+bCBjvaxG0lxg/xC8QBmayteIbGj56Ee2IcQQCS+/4VGpHNvNDGJaRsQNx9CAO7rchJeXA0VaaVwnfc5BYkxYsy+b56u1rspbViV+c9ROlVYhwHOYqUXhJQNew9Kak6P2NQTcjK97T0nVcdHWzert6DUlAZtuFiEBvKe6UZZTGVgOJU9kBMW05w++LgelNMFxphaIQTkiyjy2Ti919uhw61uaWHJ+Cq9X2u3p/lMKKhoPC/ACZQjca0TyOGg34Qhv5H3t46oaUgqpUDLAakcRVIHvVOkgI0vLSHqOuesWHMTWorU/6n/paX/VhIQCXd1DGpcKyqsYy6UC/1rbV61jtKttokvuIQig2Yz6fUf3n3JXpTfA5/pgT1X2GFB2fVVhRKsUQofa2pS5U8VGjOm6JX8xE1j7pHTObisfkNHEwmWLYdwSOVej9qxpjpdT6IvWMjJKmbgDtDGQyQ9OwguUoal8Dcku7tgomOkMhCKoKI+W2tiQ+biClKkhVxQwPU599L0oBzdmGssBmtfxgw0b7T58XSlEHTEoJERZRUSQUQtV0rqciCHBpilas9loV36N5+7JqH2N3qcJBZl2NinznRf1paIMsgB3Tu1bb5qehFs3pNHvFZF5LKPrMpMGHZP2ReskWdzK6LVZ3S90frOCTixp91qvy2Er6ihi7h0tTbKlEHSf7MBn4QXKELjXkGxrCFjBUEgFTdOltlooqxn2oIEadzKbhZNIUAkZla9RJc/JCvq5OsneDbsYv1c8yzHNNiYpwZjKvCg0gictFPp4zSFeOkRNBVZbyygsYwBF1UHU2yrQ+/EMgEUcyARWMpcD/RlrVKaKQ7j31gNwz7Y83DYtLABdHzRBVrOGr3dUMzljltsCB4iDmSqXKDGkkPa4SXuId3Qi59v7QOG4XNpbHFmGBrxAGQL3GpJ9aIqmQBUbZNEepdzllPBZ41GtLC2NaaxfNkkxhnF8qcdLSAovyhl2ZcBHkdaV/UQVA1eXtVEDOc6fpjWH2qpTGyViuJqLCthjah1f1zBsRM3jDFjTOgeacjoCs/K977TNAbWdCtCG8Lb9E/Da3VnUuIrcciV0TGHLIPPko1csBIitpKCuzQE/PhabIfeaKugMFlpyxY3hNtDmxq+PPXQAavACZejjXkOyDQmqEdkBye1jPFtfKjjZn9IOgX1NIq3MoCUyiExLAholUpiV3M1vzycGzCYJyRaci6g+l0IlGdU5jSuFFEkWodQtzzNN6EiqqPm25gCWvXj+sg1naV/cnGuoj0cr8e0d98G0kHZ90kHnbJhsIsKoL7Lphmn6a7m+sJns6MUc2tQjpKIF+rkYJ57MScsH0P7yvMyp/Ph9wntB6Y4kQ+BeQ5LGYXJTxYOv+F1V5qYzK2hQVdGELqbScAKZ5F1jeTUg8fMcxlXOoblcQNXU6uquF84+zeB1xQx6fi11/FJGg9wsW5LlHs8BnMVPqxRTxUmDcpZ5GSPv/Puk2txA91Y27y1RZo6rTWWK4U6k1DIltDkvC9pz/OfYAZzXIkoAof13u3GT2jyMadBzfPBTqyEy19QUXbkYG0vRxTNj71NG1wsPBZEMgft8xVODStKsnY7eW1uwo58b6rXswbqSm2se3D8RqoEeSq2pPGaWN2HQ9thKC4GrtqXvqOv+N8814HX7AliuR1rP4CpRV2B/5zLQMRERu0yZREWcGDyds0zxzhSGTogQy+mqHYONWHUQZ3QpVlxqv1b1zqIJAePSiFjjA9NeCKiNjnpAGJ2fJeGgH7fm2N1utGavMd3NEihkIQiIqGh6Ugt7+9xDq8OdL3pIfgVqgpBUvNGDfeNBfbUrHoAXIUPgPotQh3tJPYbRNONSD3wN1OMXQxJoBUGQUv6UCCItQQMpxD9g2MYHmp9hBR+L+MConSRAv2AD6cXLTasBZHtNaKHKCkxDKFCZPJQ0cHq1Fw1crUnaPdWtgqpb2rpSxmqsmNqKfjdIrEkqooIDylkmzU+M8nKriYROBubRLN2WFrHfuW1ySBPSKoK5jDoH03g90AFf0pDEACPXxkDqhdFvPXenIn5yblUQAbbRVn9T4wfTbrqxi1GdQroyKj9cqCND7wdovWCITXowmg85Zm7JNjz50IevffdG8YJDQSRD4A4QSYk1GHfrYaA/HMGbjQBNIXCzCFyM3UOQ02aacEw6Q8hoDWA+F1ob9KiZWQufEcStU6iMjytAX2oQp/B4u+YlfHGkySvp0YOyqSg8Q83Jx3M51LpoLmP8wozt0VwAj8624fqJDPd8EmEEAuMPJv1FkOc/B1fjko9LxQ6UlN9AlIXFELUS+uNm28TujH+9jBPgvkmAVZwYW6HSpkttyYClvlHSMZndExzUDMAkeGgjBCpNtb+sp8xaU4rXda7X5DGbMBDHZvFxuhpCEZHe7LWhHKRhvNCL+dBkuodCfhxepAyBq0VS608EZA/B2S0qsGYQuCMTONhRy3pkGhtwepH5xv6YGQlaE1Gg3vRq4uQAT2lm2g+MAhRxVHZvxwE3hwPkcQTxGfzdC1r66YXJqxtpeGTKV+YmsaVk8lFIphPC7pEMfGu2wsDl+wLUYNyHkytteMnmkOO+bS/y75Ip8jKM3wtXDIbMa5NBxS1duhia6qhEjFIQkVlmXnQ9DvqczPan5xTA2rEObvZMoifdS1aabdzZQGgw4z6WWtS4XJ1XKYiKE+hae8INFykTmZIumAvX4K3gxNEKPdiBY2ihSS1fe7CtlLITYB3NlfEi+dneJ+FFyjUNXPp7tvGuNzG00MYbmkHtmkawjk3hawJvEIHSAtSZva0W0OC0InRGj9bI5jWzipxvqDR4ajuailvxHJYwxPEEmnX4kC+oyOv5yYGaDzsxGDqDKkVyBYvHjCl15K8hCuodH597kE2r2CMNynIqBU/Nd5GZTUNzRa9UAPFOF+DcnkGN2ATEw0IqI4kSQUIQzSZ446MYIvJVpY5mYN3S2OQxSOsqHDrMT3RU57xkn0lgspjIEiKQzVaVW1BOq4KEQIeTjFY1rWnUSvSC0zgNYE14iIoVyinqp9WFcXSyS9kuh9S0CwxVtL93pNPffNVmeFHEFMm1B1w9wy61qdFPDzITGEscRZIETePyRqVljZkr9agRhpnQvzesp8t+uq1BeTPhfA4RIWLIEXBM6Qxq9ewrUQPvx3P6MgL5DKypkKY4gD738Q0hJz+Sj0nnRABe7hCZkoX7z9bhlTtK6hwlMKv89FwDzWUJc1XlRxrQGvbVVbBmsLqveaCH8UWlCSQHNxRgw/Z9UMznYM9YoAobhPM7vR8X+Ga/6t6KWGWTedFnres/BJ0DmeNzNfVMHS7yvK6uWlkw7UdJHOZnpsulaY5OFpXVtlIRYKhJMWarro/84u20QqCeT3hpEvwHJ8e/wz/6BRyJ5ybXFHCpIHoZb/A5DPIXNiBYixgkH1WAzdIY9RIawiFh7MfOaBSOX2sAbVjTvtEG0czs7lc6x8lswFjjW1D7Poaz8zdxgLygbkTPTV5dScFnJ5vQ9lVDNE4wABqM3HsfTlZCa6ua6/dQezyz1EONSN8Lmyfs3iDpPLu3wSxITXkWJysdmELE3j6NQEGnL+WP6TYz2izV9yYWEdLHoFMyIOJjuBOmTGycrDuUKpHk5JKEI0vAvn0xoA4a0fKgKT9aCdD+6dxrBL1Wkoyyp+ix0CDwC9xPD6pt6nxBC4On+Dvy51faXdg2km4vNTp/BBdBrgng0irsy11abgLNvxFk+rahlqGCbPQ1S1MOkIzmcMHlaFgzEMOuMrGqszjToolVR4C1VtVMTtv2iMAJFJFVmlTm9+gm/MOO4+ucPo5jA7rHo/fFm3EgHQBY/BwO5mdgTQissbaA62sCHi4DL77MIJGq9GwRKebpQgEeOleF2zcV7difwJH9wEwd3n1jjleq73pgVy8wbqYzvqOeyFIxu8TSPjLXgWcWqrB7vAwZvD835XxeBZ60Xix2K6MlPwCcSQ7iWtjZ3AKtK2Wsv7O7FXV6PFWVHIaiFejNGr5q5QGwC4v5+qB2/nUmZWsig/p7N2hFhJZEjS04b5kAPJYXERPO80cIQRB84nt2ZA7BRZCrG7h4k5fRpju80OHewdM70lAoeZDDOOXETrz4dMLEdbWkI9wChQC6jIMaGeF2nVrBRGl1BFKzL4rb0gJURFDRdmeekAzkTkOFj4o4UWy+XsAkHr8wCVZzu+fBr3HbidfioNiL1/B53F8VLrrcs5CCx8pdbq3CKxuQz4noqSPKpvBkvznXhVs3qvY1RsazaXh8povAQ9N5XtjicE+7AG7YxtxO0qCU+DCDgHlobhXvR5sLzal74q4yWBLPRb5r8vJHDoA9Z/9C3y9aQGy+oXzVU5Uet6u5e7vHJrARIuLKGKbZmPdt2xvOY/ajNXZ9/Wya5Bn/VjqvQ4gSLujz5SY1IxAwkqYqK3S9UjTx+fZ8aeyN4jEbYe+/42B50WYyydUJXEGmSw/OVntwbrEF+ZIPm3ZnkdX1YATJoJFNYMM0QvSbr3amxb/QKsZel07gwGsqQAZoVgUjECXY+xDr+yt70R+ZNHOXEtO1hiYAt3FwHfoiwBOfllBG03j7bQI2Xa/2K5MmOj7ndqGWRoAvIXibx2GA4/bCZXfDg+twoD9eDFm7+VworpjmBdS6W0sleBA17MFNBWu2UhXRA3N12DLqIfmCpFZNsM/nAsrkGgutaXs6AWK+QasWdKAgQi6cb/e09ygjs9e4DqDvoWv1WlIL7J+ZJ5s5vIYvn6QYdBNOLVe5Pnf7aBm2jqTgusloeWr6HWnWiRzECgrYn4WotY7vnINtz6NnJDfVkfZB1gLFlImEr3VpwvBhLOfFYrdkJo+XUg/du018BC6SXH3A9SiW1oUjsyqFbnJTFkanAzRRBUyj9sqNqM0MS+yGLMwfiwC2imZwdU59n0LCIZ3XJlRGgZASLHxNoggdtzXtWbpt9buuzqKiIm6PKlrQj85S1cgobSNYgz/68RAex+DArpcI2H4QTbeRhOmM4uPvJr4LZ3YkrmrfgosmKRyVr53z4eF8V8ciJbKpquSvjipyFLXr04sh3DAVolkZ2bFThQx88UQHXr8fQ0dtdb0916GFCHOsnUJF3tRatLB2D1o4u9Ggr3dkbFvLRCcAazQyg0VEkwQ9k3Y8hoHXRxe7cLJWh3qjDqM+BbqKnHoYAVdBt4u/Gs9KzncOtZWg06VtYoglHAFi5Xvm8kxVED1TX+c8WVIYIK/1KMTWw/sW2GuiZTbHcIJrQvjfLpa2JbmqgEuF0oeXunBuuY1xV/zTIQEyMpli0G26TsVRGRRhNJO6szppRgJsbUklWTBhJRRACawEdnpdQF81V1KmL4BDwojB50W/qyGLW0dSZHWeYsRoTqHfG2RoX/hHRY1x6MshHPpSCDd+p48AjvZtROBxx16N14Cm5crXgdeJvRiyvx7AHXjPvjGqei7TYOwwoSJgrt6FDYU8fP1UDV69s2TNeupRtYThoqdnu6jZAji0IJQ5LOM+qBncYaiK3qkOlbOPdOscap1q75H7QqjSPSp6WKzTomCSfeBbNwokeER8YS/8dw/GcHYWU9x07jiyX12p/liLzdgu+bGK4a4pJNe6q3rRMDMxmAnBtbwAYlVA7nnS35RWTKAZpJQJMdQj2UfeUPQji4BnGgwRlYNPnt4OH4CLKFcNcBt4u55ZoNm8g6YxDq5iBnL5AAroz07vUzFZFsfOsn4lPjdrimyiz3MIDqGpSwIsAb5UVs8xJjmxy5i4mtxXJFhpUvC5dHCWXsGQT4WORyVqBYFhKI+Jrkf+LoSj9wPc9maPyTPelWNCF25TGnjpcyqd8mLIuxez8OhYE8kmj5uoedqxpPxlXqKk6cF8rYt+W2CvbRTVzNfONuAHcWIcz6sQEZvIoRr0vow0U08/+Br0svNdWjped2o0TDIRPAt1FaJZQLN6ttbG2GgdFmsN2IIx3lovC99XDnhbU9tLWVPbRyiU48NEMw2ncVKpN1s8MdCylgROz1cJE6RxaUkSWjnB1y0zTFaU9WnV5anzlQNIMD0RUdIHpYmWKfUVf1lMUQZaB9JBypr91Iw9CEJoeP7/+6NCXNQI/RUPXE6iQGbk6UobKviHblQ7MDaVgzSxhgi2yb0RCLktihf3p+if1TmVjkgsMNedppQvmh/TIPYSxJHxZ0NHyYrzKty+VcxpApjcjSbnbtLuqNkO43E89XkaX1RRM3/+93uw7+UeXP9dwiZ3GADn9iqNu/SZyPd6MVJCzfHaOQ/+YaOqGKK8ZKFBNY/O6bZSDj5zogbfe6CoEvtBmcDb0bH72KEW3Ls/DTUyl1tRYkaorRpX+1JDdooVd/ELYn5JCz+zTF0v1DIitHoCLX1Sw9liodmB2XoTtRruuNWAyV4Rlik5pI1EUEZZBuxT4/kQeChxopxGl4gyu/DM690ulGQaf48TYy76y4QI3DRarJ4nLPHlWvnWPJbRe0h8x3Hgjor9pnDs9ULqnImkVzEVmfm8DzpX/w8f+QP4PFxkuaKBSwPj0EITZtBmoQGfoVmXQZtic3b6gAZqgso3pAYNfjKL6V6TH8tscFcxxKXpOJuZZH3NV8ZENgxkH3pF3AwUjr9GI4/OszCB2h5N6PnDkicJagqeQRby8Nd7MHdMwEve6bHlYHeDP85dpwodFj5+ccD7poU0PFZswcmCaiSXId8cD9TGQbnURFY0nYUvnlyFV1E+H+gYK26HIQ749LEmmtI5ePis8v2tRgyj+6T8R9wvUvEtkVadJHDf30Jzu95Tr2lVgpEMxlVxuzH8G1KdwdNo/nbxNz38w5D/OVOTsDstLDnE95cskTSFeHAMoMarUaP1Tpe7MlJHDQtcYcgz1fbGLITt/Hn4Xg6qdgLzHT4qPZXDXEpR6MnjNjrptPrjmiGwgiTceMF/qNbyfv6++8RFD+h5cIUKJVPMoAlUocYgSHbMn6tBB9k7H9UlxU2n9ug0RGPymKmfRBNIBFoK6aTSynelz8tTmsByf+P+cROvzTYyjLSw+hLAqqZBtrSI75vivbteJvC8BU4iIYN5crvPvvFn/lsI80eSNwB98F3IkN+t/N8XK2Ta/vBMCnxkkai8jvzRnlRZVfNN5Aw8WusnA8eWGrFLoLRIMqVPIDl0/aS0WUd20tOPDPmCSNJsymdhf7mEIE3zyvT5VAq2FlKcMbUFQ3Wbih6v+0OEzngmrXovE3ARiB7e4CpqXeOPGpC0QuqXDAz8Ek4kAv+YtIoATZCUGMHWFkRLnHTQLAh0T5yYyxPGWWNXCxuzvxEqAms0DbyIlwonSS6ON5fbQ4sBJ5EFhPS7f/AGcRbWQPznuuE/fcV9O/FGvA/WgZCZ9cjpBpxdajLwiiMZKOFjdKzIYZVttyitGfvDmGcPorhqoJlhTyVGEGBFwizlnya0qBDwnMTmNg/4bWwfjgancyhNCwSsip9mcBDTJPPM13pQmvD6LAHKtmJf7xS8aCmhGbml68GDJTX7UMiGBnITgUxm7UZkk59abMCOkYCLAwzbm6N0SIyVby97UM7TwtPCNhd3+zLRKn3TuTSCM4WkF4VNKPZJy4o4Tcx1qiFpS/Ih5xstjisHkvKkC1x8v2vEi90Dyics4o+OV4Tyk9G89ns9XpXPw/PcN05eu/pjUHYWLSOS9wWHcdwYrZljbajIdXrx0dLXQywyrS3M2WaoNMpZP9oeX1Twfk3lgp972wHxMVgjueI0LsftcIbzxwI26RYxpnjy8CKEbdVic+N+BcY+Jac/INCSP0tkFbG6rLlKKuk/KYPiifxWwnlrTiHhH8mExh2gxO0+Q621aRLZdRf6bptwRkciZWQKX4/78PU/68LRr/b7XaU7EDx74KLIbRUfvmchUA3TyeQlPy1QhNAZdGSnMbb7qaM1m4hgZBM6mh99ugFZHNC7J5TmJW2U0n2gKH5KIJ1Ca2gyp/KCS2mqoFGN32z2kq+bmnMrVY+PTW12OqFqqzNrVjvQIKGnRluFeKhJOi2aXcIZuSXV5FHVOckn0Lp6CHXfw2eoqgh5hJaIWtDICKz8pxb9f8uufk25zFlfse4dSZ1BvOg+4PdzaJ1MZVN/+aZ98NuwhnJl+bjk88zWMUZbgzTesNGpLIwg2xiIFC8RMbkritO6jKBw/Fub8RSo99nRft/VSCwxQ/afS7KwwI1D2tXRtV9l45Hu/hMmX+wchMqwypaQsX1GQomakuNJP/gRdAdSAWy/I37eFCqiEEdnFl60vG4uBUdzITxSCLl6qheqbhO9jgfZBmp+9EU+dawCr8EQUeipYnKKr+6aKMCfPVmDt+zNoZZDK2FBrU8kdZUV9yYOI3DYJTydHHHqa0VmO4GXOllQaxu1OJhKoGhg/JXY7pS+eJsYklaAGsd/CLxVqtPEcyfwf+uc5CYB9PstaBVMF1S4CZy/L/en0umbrjYzxfPcPI8nFMnaux722Dym+2L+drS4/EQmONLJwI+htSRhDeWKMpVXfGQb8YaP4gDJZjJQW0EzEmfOFP5xR9CEnExoHetiCTU4KE5LgPXV35QrgWRi+/OZtuAAEZ7rn0Q45yFiH8UdKOjfzkiujCxokcgr1GLIGFFf4CMPdKGIGpiKI+x+SVvhJNQ4BM/9/C5w2jdXfXi4iP5uyuNO/75aXQ7Jqh6atNTIPMA4bxN2IJ0rHXdkLJuCB8824daJFEwUyHSFiJQTOs3Qj/odezrzzBSzW8uINSytn4t/cyR6WkhOUdUS+8S0dlBazYiU2EF+LPXDWmoKJtOop3EOtwuoiyUehFZiIJ95Q1H5wlx9JJ0iAVDjwV242whNSIRxXqMoraZYCjMV8Pi+Hy1L2uHlQuU59Pnf9e794klYY7ligFvBWfaZuRA6eNNo8GZxMJcw+B/gAKJkha23xOtnzUDhBwG1p1PaVIYdm6OuGFAOKs2LiRzgN0P/ezdt8Xw+8SDf2Wpfx57O5AXXB1MxA2U20QoDRx/owaYDnkoS0b+l+C41AGiehBctAaLxIIL3a/kuVHxVfEC1s5TLTEtVEkBrLQJmHUmljAUv+eXUp+oryEFsRKDsGUdWuqV8Sc/5m/gDnt3LVvnHqmJoCUNDtKof5QNP5jKsjanH8Qm8H6crylRuhsLetyIy0pvRcd5aCrjZ+WROhYzIl6bFwlIiAqip9fAcnsE8k/an73nRsLTyu1faIWvawBexSXi106uNZIKffvcN4qNwCeSKAC4xyIvUMgZn8C6yi6srTTh3ugqtmgc5HCSUFZVDbeMCzzybxAv+46SUH5nKOiaq85dKgt4e3/4DkRZ9DuB1TeOBE4KECxNdxpQWCrypvEQmHM1EHDhkPRxGwmr7rR4Tcma/KTRR2+dUi5wXK1kEw1011LxIVjV8NXBpkawuPkjrTKDqanR8jK02kWxKx0z/Eda8DQb7Szd7vPo8madsior4I3av9Q7o79TVGrWKbBLFZ8nXpUW7oOejtgfW5tQ2ljRpTkcFyBwvIjJHCKRpVa6X0yV7+SCqtdW3V+Ul64etKBJqzNGXZILTgxI5qMMF9d3yRbTEJ6c9drqtsWzws++5UfweXCJZ/+QU3pzD8w341qNL8PiD81BdbUGu6MPGzaNQLuU1C9uPH9Z2PkQN3ALVvC2dgZi/GsuPTXzuhnuiL+Lf99va0WsB/cexv4XBx41fhLOdoOwrD7bcSKYzEVaK1X3gr8IoFEUb43WWXwYX7S87iprt54+nYbTexbBLl1dXpwWwSc7g34Jen6gE8MCZqjll+0w+76HFEP7qySYcRPZ757hkgPFSICIykWluNSAOtIVE4KIm55QjTZPAOLJYG9FUzviqK18Zv9yG4aMtRVWaR78jUGaJpcaJLEcPTXxl9Gp9hrHmdkLOLRLOBBlqwNJ6tgR+Ol9aqY8SOdK+sigMoUW+/zJaA+VU8O/ecyP8F7iEsu41Ls30p9BnGRnLwiSyChQaqa5gTA8yGCrBP95tKvRj/UMHLYGOb9I4Iw0VmJRF1yxKaNA+8xUc8/U82rVPaZ5nX32fDTjWeTW4fk6j1dGqh5wBFKCzOHesy5pocqew1+VRQQSl5V2kCGIaNe9Layn4FmreZkroxt/qYMs4qicQIZS3u1hrwtZy2k5a9KDOGR1ExINn23AA/fKdY6r7Yjd0TRCwi3aZe20mAAJkCYG7Gelcykya4BivYqiZkU6rMJJZYoSrezRIaYLIOKsbpHUVkK8nDEuQeUrDeuY3gdLWdCKU1VVrq5avUv/xOBEPr7/Zk92s7/3y+271fgHgF+BSyrrWuFQA//RsG307CRUM8K8ut6E4irPvZAHSeIdJ03LhQBj5RUZM5Q6bM2EE7kGkkPte6mL4vpQ315xL7GNQosb5xNXkJlT0bFo3ue/N1/uQQbY5i5p3bEMAj36yA0snFVhNbKJwkyo/vFgyghPFvzmehRsxvtzCOCWF4ojtpaYxJzHmItAPqbbT8LXT9VjyhWDgBbCxnIU/f6IO3zzbg5tR+14/JdmM5TVsTTmdiFY54EWpU2oF+g04EZGvOk5hJO2rUhG+0aQGtL7eV9p5sOYW6mH2L7RdzFl1geI9SDOTSY1Knf1hykWm9XoppZoK7k3Ih35KmrZCPbk87//3w7d5/xoug6xr4FLnFi/vweZdOZjalIEsOimL5+rQaQqeVSnX12pZHYIxuaImE8pLAC4Wg00AIgyjWKrJhrLbQeK1C1qIktVdoJ0v1htTqgnTW4bnAbL7Ge5g843UxSOEApI/VG/84Ed6nK5pJidB7VhuhosqGRzE/2I2By+pCIxXtmC23kLyKORrP15poCntI6Obgs8eRf6hE8/yIzP0uukiLDYE/MnDNZxkBNyxWcLW0ZC1W8bEfbW5zMALlEYlMBWyCrA5nayRD9SSmYEfgT4QZsX76JHRwE3p7zgXPdC/CxTDnNXau5RVwOeC/FpoV2Ho6ntPYKGi+OVmr5ORwc+89zbx62g6X/R0xuci69ZUbpFvi+zD6koLTjyzBLNnV6FCbf0wPpfP5WFyB2qBjQkTV09D6WzEJtNg9gM4L1sc08L2A4jFU91jJE25QazxIJP32bKtzATk7vt8++KJKVA5zURW0QJT86e63N1jbIuwMeMAiarmsYtXRURC7OtLa2nYhc7gl7IUpgm5gFyFZkIOFWWR5n8Y/15bigFnOrmug4/vR1G1fetcA1nhLhyYCJB5VrOu1FUJQpuyZjW+lKNJjQnMQPXjXSvMCn0G+EbDBk4fKZrwSZOT78o9plJqQqBTpBLCmYpkoKY8z/7RjEldR3ZttSPnC17wfT96l/gfcBllfQKXQLvQgjPnajxDTm0qwTQ+JqZLGJzPoe8qYOvNTqmeMzDI7KGMKAZZCLGwUN9hhMMYy/i+zMvz+b4DTzs5IQx4c6H9iAu8H/S7bAlZXjLnOgRWD4481IFdd/gq3RN0bSlcnHTI5Hltbfnw0lYKHi12oUEVMhS+0eAl2FG64bdm62zCTFG6kbGK9ARV4EZqHjyEvu+pVQl7MbS3b0IgiFSCg/mTmBX3jAZNaw1qtHPKMa/N6gi+A1Kzgh9pVaO1Mzq8k9PthhZrEs4gYKlLRybwbAUUCKMLaPnPHrXf+WbaC970z14qvgKXWdYlcKm+epHS3dCGooKp5aUGLKH9soBAzueLrGnHt0KfNiRhbavjtZwlFVwALNo87QvtDPJnRaT9Bu3O/lTEPxTQv8++7c73uft7h1Czhd4EgDGMk54NmaCqLfe41nfTfs+eNydlHMHftOCiy2jXY9JqJejBTCrqqEf9n8iE3ojgna0LmKk2ODeZmtK594PK/EZyVArnIcjb8MRCj0M5uyeRdCxLNF0la0TqH2W0LveDcrSuBag2f+nznDZ9i+gbj+SVCcxsc1pyaIdCVNR94+SyhPmqRPNXcKJGoP0qAdGkTTW1yw3ZLaSCX5fC+7GfeJk4ButA1mXK47H5Jjx9sgIULQvwr1VEfr+If/h2Q03bE9uj8im3GF74EVDZRDbLKTq2Z1981pUBJrP7nRunHPRTcz72ODL6PLlP23khuR93IpFxk5zjmwAxppuukSayZRyIIxMpOPJAC65/tc8JG6DDQ/n9GM64H9ZEJjoe/PhsEb4724UPjDfgMPrd1P2x3upyccJmVHNCFOATh5vIKEu4eTofnyDJLEUtt6GsgtHPLPYwtNSAMeQ29o4jmzyCPnwgVdphqAr7KR5scoel3hlrWdBssUN20TOlw1JIp4qx5HOrIay2etwAPmvAKuztBufWwxKGwLqhdwrP759804NP/t5dF7cY/sWIeK4bPvRz8h7Rg8/AGgvR8o+j7xMKH4yb0cJwEMVvRZjGwRnA3ruF1bbug1IDqUSP0v+ow6KXsCdiOckDQBPTvCIijIwJ7oab3H0Z7RfbBwwws53fw/mO/Syfud/Z88HHoS/1oLnsw5nDaC4f9OGW1yuty6meNSRc/hIuySoJJ9I9+ORICz5UaHbSQqTSqA4n0Zmkcr4QKdpar4mschp2mlRJqa8H4t4K9QtbQfBXW11eY2gcgTyBk/eWso+sr+AUROorblrAslvQU7+m0jvqKjmPBNNMTRXfc7M+SYxxYDWrkVBzIyY5BMknWiOpkff9/97KwS/+y9vFHKwzWXcadw5vWgWDgq1GlxttcSsVCjsgKZXBPxi1N42tLGBE6Bapnirm9gY4Aa42NOAdKPhdYxng5COoUXaA9RlNJwxPp9swmDWgKWbMGt93tgsglvpoHbeEOZw8N/d8RUI7ud/RW09/PrnTg7NPSCiO+HDkwTbsfmkW8qPqO6+Akxq6Fq2jsOayve3DD8/l4dWV9F//2PTS09ITPzLf6mxoopocQYqY+jV/c6YDT8xW4TYE8MaSurnun5MuicihSbR5J3JpdYtCMm27cHSxw37uSlu1YBUgtJaVbHpTR0nSyim9aDate5Sl0FUG7L1WXngk6l5KXpu3gZZLWnif7wnx4z/9beIRWKeyvoArgLstBBjEK47muECZ/KIezphzMy0GxdgmoWZWLz7+fb1WLW1Dfp4bJkoCNFbFMwAoS6cBTj+ieiDzgl+DmACpSgRBa7F2DeKhJvfc/AjstjOkBj19ZxrDuROBSAJaX0efKa0JOLovC8fRRxz1MWSG7OjTIey+y1PhJfw+fz0C9xjAc4k1XwzZ0wq+9+Mnpw7+6I7Tv/6UTP2jlPD+ea7d3rHYSsMUOpyldB6+ea4HDyOBtR1Jtusms6qdDIBZo0tdN+giAPxuJJeyn5Vz/fOfO8fxfhLvbecRoSc9oBpb9HPrPa46Qnh/xgu9f/nz3ym+Cutc1hVwKQQkkW0soE/TboXIUPagTWZLvY0zaAbyI4JbzLhii7RzStNJ3eSXx7n5yyWn8wvIHBI5M08i8bIZfcfNYPsvDzpmzCz2Lrxrs/BXpxnfj03EAGefUmtrE3fUjdc97bOTBaAz/1RNsQZ6eYOAHnXUn8zAk19qw847sjZMlprGbakt7BJcMsFD/6ev//Otr8GXv/r6jx36rc8cLn1bpdZ7+2yz/YbpZmY7mtBiMpPlxbs+faQJk0WMFmBMekMhFfn3GsR8W4R+yAHcQHRM9/ix780cToA9ixRyrUVlgl4FtftH0Un+z7/2WvENuEJEPNcNL4WPe3i5AycXlAqjkE8647OZXK92eXBvvzENG/YoI8esAm9MV85X9lRnC5v84Ey9bgw2+dflWR21+JnH0L9BbUt1vdQ6RqxReop4znfdMesdMZ0UM7bFK/AHZAE88xX0I+d8OH20Aa/+oSzGu4W1CxvfAqg9CJdUEGg/dfBXxG+4n93xuzL1VOPsy4upzJtGAu/d4+nUxulcxivh33u12UXyqclle7vG0jCJfm0h8M2+LDln/phJo8px++17Esp0OlPDfXepkZwgc/gbqMU/2Kh5f/U/vk+cgCtM1g1w6Y/yVFX137VEEFBT8RBmz9a5Adz135aJmqZp0BK4qHsFDV56TUtAGlDbrCSAGLNrwau/INCSaUzdHqlXVW70+YHrUohIqI+WNs037ItysOm6jz+EZt+iDycfb8P223y4+bu0nS+Utl3+W7hk5rKWZVlAvuw+sTzoy70fk5nq0Zm7fT/1lrIXvHEkk9q1IZP2RjI+ryfbRFYpzZMz+cg+lIjnYHLK48qgAj430f9V9bA0qYXQRraJukTKUBXgV9sU7w0qKd+/Hx2tv18Nvf/zl28Xx+EKlnVjKlOnv1pDrd4tkZSSPbCd5knrkgamGtxYuqImqUxtLbUH9XSRfF/KoesXOh9RG5sj2qPZfAP0meLrRaxfTotMVRRQN98YdfJgwXu2Ya8Px+8PoYShlMP3N+GG1+Ss3+yXVc3uxSj5ex4yKurwR/j8tkFfPnOvoAgzKYTP3P1n8qc/MnNy55ifPTiZSr+0nAqux7/9TWPp1ERGporkh5LGPL0Ssv0scJBQxRKFiShjq8srMXjUJq4Z+NnT7V64iHh+bLnZ/PSxxuzfnfj/bF++GEtcrgdZN8BdQkYv7HqqtItTYdTnjWabKzFK457qJeXedv3aED68NEg42LxMElEkLQwZHfua6qc8vkuvGL+OhVdEWFJJJhsOaMLLsSpoJqJVGzJU6lZAfxe1zeIpCeM7hN0utfmSA5eO/daH/r/ynoO/Kj57oc3+/PsE0Y6HZ9TjL/THYu9vnp0MSlCAbnliPCV2ImeZQqC2S4E/EnbxPxGuVMIQvVZvNmi05xa7+bkHfnRAzPXH4KqRdQPcVk9wDqkibELVB6iLZk+7y1R9riRiPaCMeF5E5FDpnv1+AFvhmsxkUpOmpUSFsR1ac2m22sh6MpcpxEWgpTautNJgH/Oin1izZiWnQ6YyGCI61IPxbYEFdrARn9e8sUq/4Hn90UP3yYPnM5kvIPKZf7GJ4qj0OIaPB2Ao6wO4NKgWK22oNbvck5ZGGIGXipYNWPOjOms0wej6Oi+Z0hvNvgZSjPpzM7hNOIYSNc4+HsVfzURgcp5J6NnXWVk8SfiK1QUv8i1dudiA7+ke0JzquS1+PYNCXWVq7zonoVBKwZmn2nDDPYE6V/zOJ9KNSiEvYuHBc5SdUIefxOf7YCgvWtYFcBmqiIRcNlDAoY6GDFoJS8s19nFJ4xpxgRGkIJ5Q8Rw8GNMo7sCrwXan5yUx9cpzdEIUCyZQk9CaPgQeXvhL+86s3U0dqL6LBuBC92vmh54EuKuCDufwpEEvnoN2J5ackkGINCOmO5bMAQOe8bviOLE5IZrLHiyf6rJLQCY0J43QuaGV0b30wKWJ498iyfmBg7+8PvJ9r2RZF8CtoS9GZjFJC5nEsNdTy1+01TqVlK/sJ7r1G7DafGSnf3Hf4LY/il7a1jZ+1Kgs4zLOznFckRrkZvV5IrdMbJaATktr8jIc+KBV+BggQv+mp7ZztTudvxdEz7yygpPl024q0oxzj51zH3QvhMOUE5HXrgk8F487RI5vF3Zyo0wqmIfLIujF/hE+vQaG8qJkXQC33gqhXm9F6Y1CNQbLpH0EchuyeU8t3DVA2HQFBQyWJHhdGWBaJr+3jbbPsx2v7ZMGu/ixWTfXhpkA+oKIpqtGT58jAb3XiR6k5Qn05GNTmGdV90bOYehrx+1Kk58vv9pcqzl/I0FWse3ZnA8LJ0M0sZWa58luA25wHC6X3PPQz8qfTMZ2h/L8ZF0AtynRFM7nwGl4yWZyu91mXzeVjQ9Xt9Qu0EuI9LWagQuAV/82uT9bFPBs+xj0nYxn+rhxYjapfZX5ZMBujjfQHT+fxtf7G5S5FTsffC6hWb1yFkm9YgALpzqwjxuEq997eXjObsVaCJvM96HJ/PyJqqFoWaPcoOchOICWqh3odLqsXVutFgO20+kwm0wAphguiZsLbCpfTLJFaFNq4iLPMzhJ65GZG3YT28qI4HKPdb799e3f1X70SLSiifWcktF2fZ+fRy4EWvf46Tw1T8f4Jmrc2kqPNbs5nleENcsKe44y6tXh38JQXrCsD1aZC6wVi6xoWmDty4sgs48LCgCmKshoMWcfF1zwIWki4/tTj6jQClXQhGY5SNNADHTvXREdyzRTJzG+6PkWCItpUeEot4T2HgRQW8crI0si5q+L8//WVAzRJmSlmEmvtqy+sMuN0v2kwoYGXDbBU/tJjO3+9bPFdocyWC47cHkA9jy1JKb1CaX+TjIiPcMehc5vhFM2B3rR6qQf7JivMdAISsgHmD0EsGG/Aq9r2nqJfTCxBI4G7kWa0TDLJixkcqcZ/D7YpBEuDaTz8+wpJE81nk8NEBUfeIkNLyAuUUWrHHSqwG1tmjW1SLfVuuj/9i4jcPW5/hE+7YKhPG+57MClsblSWYVGq8tAJTbZ0wijRZNpkBGrHBOjlYwGcb4ylSNWI3n939E/FA/t4GA+97RKHTR+p5sSGTukcHzgABx0Rd/ba9LsMRVzk0nOWDEmsy4GtbFkiEr+TAdCE0s2mVwyjF+3tQTcE0xaFaD3R2w1LSlZk5xRpQ0adQ2XX3YiUXUfElX3wVCel1x+H5eKBDJ5KBVLMDIyAmOjo1Aul2GkPAIBBkEJzN3O4A6YZsBLN80x6SMm/EZrceL20/uVFiLN23mWuGbSB3X7L3NcN+x/qANFWpg7M2Z06Ee3FRX6/Dk3m9btrau4Mb3vJvtExdRxwq8dQDZx+Z+v4uKyJ6J7QZtnYF0IGlQ/gbHdnTCU5yWXHbiknQybHPZC6FEMF0d9D7/o6viJF4g4aZPwKUPHhJaQGL/uB84XtC2BZ/vtSsPNHdKF8RdRpLww4C8EdhOLDbv9v49dh9MMXiaOyaGrDHDqY3UxBJcIE+snL3tUx3aH8jzksgOXusI3Ww2oNxvQaDah2Wzph85cgMjn5dcyejYmqZ+OPhcAg0O1DnjdnGca3FtvUzHWheMQK2q/HGLA2ayomC7FYgcx2bEVF1xAO/cnSKs7QctBkuViWWzaNgXrSSi2+1YYynOWyw5cwUtZ+Got01RgH1R/6yG1SyEh6obR9ztjItv9PDtja8atq73pN5T+SGsQ1RcBFk/CBcMxl0roHGqLKvWSWpSGPThvuCj23rkHVB1kzHTO6Ar1erASdGO19SNoMlMRwigM5TnJZQcu8U6FfB6KhSI+F6BYLKC/i8+FAmQQvGRGDxpkJseYBmoyHdLVykl/N/nafE+r/m2+CYmy0wDV2XUE3gW9NCix0mH8u754MEDkx7I2FprsUiV+fM96aj9ifWlckmFs93nIOjCV0SREU7lWr0MdH41GE6q1Oj8oKYOk3Q5hENVLgI61KR0gA7OeEqA1QtU3m24AmD+G4J1TqYhcWBAO1nSXQuj41XlNZhEZp2rI++5HzJJITFDCiUGD1rhhG9ad6NjuPTCUZ5XLHhTgNV3IB6Mu14g+IqcAlE8mTGf8hoxCORCNSxqAZAKm0yr1sasHo1uzaxMYEiIB4r2R9evx7SpvmPxdam5iG7YFTrWPfqQ0M0s+tue2ZtXN3cwJv9gyP7qulXNqYmH223ERbBqkGHQcDK+FJhHDiydzrEPgkuD5/Sd8OghDuaBcduCS9ihx79xULAArdUC102kjkHpKu6Ygrk1CxQTTzyj0wcBNhEWea6GBC96N16lQEYVmuKtGNyoIaDeUuUllflSMT0LHpc/o4XlxsHNdr26/Son/bl0vTwa6CQDopTTUSfefO4WGavOqZSyRVslMMQFx0o1vj2MtBOl4PfM68ATOJ7cNixCeXdZFGD6P4YpmR4GVUx2tJlQjkZhnAo1nEh8c8IWq8s/2VVK/iwbwQI2bHLUDNC8BMF24gLYU/fuj33O1TzMysUlDtnWGEk0E7mRAQCfQe9ph8Zy6XqPBWZsHyqKoLyFocV8jm1SsN7bmr5sg4sS0zesgrVfDM99f5qypC4mu2/3wsG73/LI+cpXR3l2tKttNiGhw8TOZz91QsavUFM4BLQ1I0j5UqkraTA7opRSrVbUfgiVxYtU80K+13Gwr97fueZicZcPgDupdlfTD7f7DSIO7db2s4bWPTWBvaNN28TjATB5gAk36sa39Jr8rvY5QlkBITZrU8pumLzGsm1VwBsrosG73wrIugEtLH1I1kJvGZ/xbAjINvHqlB/lRbUs6oGHzWGqTE+KD97za0mwjErsz/uIA4gcknLf0LuY7XuiQTgjKPKhwwtf+MuUWu+eevBajRYll9oP4vkXshRLmBkLFylMPKpsiSsUL69THdeSe59Jg7lqVy5/yiEJLS4yOlDkEVKBHvsAhInpQTJdGW70yODOCtBRplSDRAdJGR+SzANjRfOdlZt3NZeIAznH6QjSDjuVuEybey/h5J/fPIpwWtMn9A8SSMjxtCohARvugB/F/XVj3ohvMDWO7A+S5a9werFnRc4bylQPSJGaVAmFN0hQisiXa0KhpdioxYMlXpL5MpLEoFtvQhNEFy/yS4oCRehYvn0LCbINu+wqOKexWAvlx9thUB8V2ez7tb0CWMNPNdzLxm+QmyWO4xfxmw+aq4gx6XcH9umLmNIF2nSVgnEd26tjuT8FQYvKcNe7B94uHZQHG8O/+j/CP/8f40UUDMhnAgehgDLfBj2qtBjWM49bxNRXXUzublfmO7eQYL8RVfi5JKgvnjev2acEBSKDY7YkH1O9pXzb040dxUJNjzL2maio1kdjlxpJKlqAHZWDVl9UkQiSSeZDvSr46L/nYc7TjecTV/oM0eij7tzXr7ND5UX/qbkdCYcyLWyNUxLC+fVwrHNv9GXkbDCUmz8vH1a1GPqAf8NBPy7fiKHkrappX4+DaCS9CNpQDWK5yEAg86bI/koFL8d3GqlQdDF2RCjxys1OaB/0+ovnM/Z0rS6hlzz2lCJ/yJr2JjD+7vxeJuloxyOcFsLnPfEVd9cLmQ/PFRpca0+haq5P4QcSau2smObcodjL0lhrV8aTW6MHGbX7sGtYzozxI8JQptvsaGIoVARdJdMbL+14oiFdxUD92NuR63GQstt2hljZt2HVDETbu8fs0Lg3mbbcq1pkW7TLsrKutLpQEQTW5lKM8tRtN5Cm4iHdFn6J49s9jk4OMzyumoICE48LZKBkkmaNtrI2zT6GZ3BYwe6wL170yUE3tTMeOx1Fbn4MrSgYtHnYty0UeokpeCIipXPSrx9sqMd5TCxabZyrxI7N5bDIDB+7K2kJ0V2iFPVoWs76izFU3tno+tpdIrZMPKxOWF/sqwxrdkecv5wM7nSt9R4kYNnkjsT2Z4ucOSb6p82e7cMOrg9h24deuPK0Lz7J42LUmaxIO0hQ+PUD7J+/DAfOWC4HYx3E2WQjh+KyJ5/K/9nvqitGshRz+If8zqUXJp6SUQAIf+aqxZAR6kQAv+ZonH1Lg3Xggahi+XmSQ70uN0cl3ndzd36bH3A96VGYx/JMXsDoPUBgV8RAX3j/ZgitRLrh42LUml3SoMogl3IOD6734to9wWOmEcP+Rus2Yko6vS35uiCjbd7AIY5ucNXK1cF3trapxeOWc8nuNuFpXap+Y1sKlrCQyj4N10g3ifEKTC4GWzpd88KSvbQk5/kAVSRCRt3RWwuQOmtBEdK/w3sin4IoV/Pu9ZhjbvYw6htuVdJHYIk2MwXb6jMIjD5yhNq1qG+nkLVNXDPJzx6czsO/OjPVtjdCmY1tQG+1RKYdLJ+Osq0nOINLm6FfVGriTO5W/aLdZRxrXiFnsiyakkU3R5y57nux3NX9EP58KYf/dnl0UjeVJvA+zcCXLMTSZD17rJvO6GKoM4h5qYoD3nq337nnyTJszpjzd2cwkEjRbLW43esPL8rbxGYt+JhN66y0KjAvHIpJKOMwtpQzSIl/c+0kPaJPsb4sBMokiAN/xJ0W/mbpWgKf1fnmFvmmnE6VzTNui1vl85azKJiPXgVJFt96kNxKawP7qlRMKOp/gBP8L13qDuXWnY/70x1rXHz9e+1Kn0x2z+QRCmco+IoYIqx0HCrBxtx9pG+cqpvehM7RZJVLQIDZiyWoZ5QGTv0hlgbwGUFslcpBwBVBXabtQh2/ovUm2MMUANFHEigGcZwKVmQhioRwtzwb2bkOBdnRrPBXS/HaQtiWZOwpcNbWMDP3kbg/DZw6BhcSdfBSuCpE+ElXXcBHC+mjS6ci7/mvmif/2ntbHOy35/dRrKuS1cpWpTELhormTbdiwU620niSpls8oxpU0FFXT2O6NZhYQeu2flFp93i0qGFi3q/1jU7Znqn84AamhJwGz0l8rWu7TVACReH4E3tgqfkEU3iExn/OE0lJmvwF/7Jz0szAJGhrANFnR/ji5Az8ojOrvdRdMXmH2KpFrvQhhHXp1AH/0o83vXJ2Tf89KUoAu9VOn2sKYLgF6/x0FGN0QqTBXmxHhNLZNhU4osSLZAE46iQtuRpXLRCe3d8F9QbDr/Rqwk3SaibretlqFzyznaTS9WQWwOKF6PXtu/2Zwzs0cA6Lv6XNyDwj81UXVIdL4xFy1RPfggSvfTHblWo7trkvgfuxjMvPU71cfw8G+h94TaG25H1C7mxBGJtOw94409yYGx2yk8ZzORqvczZ9Q6YbuWGdJhFsulHqozuFZMrHsh4nvJJz3Lid/bxrC+RewgwYtos2ZUhU1AZCmXjwlYdtBYet8STxi2R+Dq02u2djuuqgOSsq994pWOiP+3Oc1hUD1WUYUd9Eh7XSVyqgstNEUNjEeiJXLkoajTCjSXsQ0E5DBBVL0MysvZBGsgVVAyR2DE46S5/m9ye7y4jnRg/YV26fzNRUVkJCVUZwUsUYCvO+TcDXKNdtgbl0Cl2TrTYXfyGRSJ1OpFGQzGXxkIZ/Lc8kflfrRYDxzuGPNXh7/TrNwjuWuKnMzPwHQlyaZJHY0cPrioubrC2jk2HfmfBKgtth1gOp+N2h/pswvtm0Y/54rmpaVL0zmeAOveXRL/Dcerb1bhatS5DXaYG7dAvct/0qcy+R7/77Vaslmu4WatsuPLj4EJ2QIqC53YWUujGtR/UxkETV8I7+RiCrqnWxNanCyqRxW2lrdA9IIzyeDQO6WCca07QBNP/iD/mOcb3syr6lDhtQAJkY9lqCBD4/yki9zo/e1lGuxbnfdApdk9yuz/xM1yVc7rTbUalWoVlehslqBVXwmAPd6Icwc6SgSKEHWkFQX0GQ+oV4TWZXSDK11O13zGeK/d7XvheS5msuxz2X8t2YSieVVu4TZBXxkapoe5KKQFq1ib6uEyIpAv1fOw9UuO6EOPwnXkKxLcsqVD/6zxqvmzsIncfjZFt68nEYoVVsbfL11X1bFdUkcDUhjn4ieLbcAFCYVm0sJGETiWFwlQBsDtD0e9Jm35xXxAm5qgiV2zyEG3MTk1K5FrXtWzqgii1Qhvlv/KP5zZWdKPVdZxtjuwWsltruuNS7Je/5L7vNBofs7q6urqHVrvK5Qr9tzTFwJM8fa0KxFqOJXGsCkjWeeUKAllpk6W5yPDR4EWvORm/QwSIRjbj8XGchwO+cw0AR3hFwAYpCJzDKN9GidIXs+FLulBgNXv7Y1ck0tHrbugUuSL7XfnytkH6fUR+qzTKby0tISPhah0+5Au92F0091YwtfuSYsscwzj6tMKGpvQ9lIXpKsAsfvTZqsjvbzEoByATYwgQMGi3CPLRyzfBBY3fPRJ0rZXWltIlMoqLxRm8ZmpQMUH2PYV7NvO0Dueehn5PvgGpB1byob+YMfa7ymek78NYaGSjRChTAr0KnFsEl2XJeH6Z1Oa4oEoKiyZsN1SkutziHzfFaFjM6naVnk4O+e76p+A5M2BmhVN15szivZu4pa9ZALQMkcVMJH5FtM29IEg76vOAzXolwTsd0rQuOS/Mh/zX0mk+v+a9S4YbuDWhYfoQZwECj/9uyxFtRWEtStM+gpi4qyiwgI5Q0qs2hQYsVzEeFqSm+AKZ3QniJJenkX1twmsSJ5bgRarkcOVU8rqj8276ON8A97Gq5VuSZiu1cMcEm2v7vwO6WR1AckjlLqw0xMM7HMlUoF/d4utBpdOPFY264hRNKXhP+MepCmJX93fIeTqeSC3TVPzyei/731hyEBbLMsyXnuuEwyzQOOzaDN6CbpTZXemM73x3v9GXzdhGtWroXY7hUFXMqouu7O/E+jhv1GEASQy+WhVCrDSHkEstksx3ZXV9pw9JG2Ta5nSSRIkNalFejJ5y1MqGR+XiXB0ZaG4BqUcWW2cX1pCQO+dz9zgOnKs5FQRmgyoioh+jkXISAwM24Ddb0vn1IbF+CaF6EWD7tq5YoCLslrfkos73pp8JZOt/kYxXVXUeNWUfO22i1bjLC80IbTT3dVSZ55hBHAiGmeQ//v7BOKnSVAUDkgFdd7UVQpLgbE59HEsa8SxJf7nNxvssAhKaakkBJI6DWXHOKEky1Df6yXSg+PwZXSM3mthRYPuw+uUrliyKmk/OGPr96weKz7p51ueDMlYlD7VjKhfbR78/kc0BIm2w5kFVllCKYk0YSvi2MAm29RHSboPfWrqswo4odFnj/m69b4Gp+Uv7rAXRUwUHFH4pwjAdULopUIKf5MsVtTBmgvibQ2gjV1FN+vwFAiuWpju1ecxjXyw79VenxkQ/6dOGiPkYmcyaTZdCaTmYY0sc0nn27CzOFef0aSg5Qaco/H71e5zQQU6jZBzDM1njMdL6wIiGleC7oEEZU0zWOSYLr7lLeeEMgXJkuAfFqyECjkQyYy1RKbdq1uIYJ/bgjaAXLVxnavWI1r5HffV7nuzInVL/S6vUlewBl9XypMSKXSQNVFPr7fvCcNG3b6cU3ossBay03sUOviUqIGgbZVB1g5rYoVwkFr7TgEthCJ9wDP/+7SDz2l/bkgXq/JS6skXIj5Ti1qFnloIg8UKeBtB39FfBiuIrnigUvya2+vHawuV/7A87yDoV69i1IiA6osYtLKg827M7Bpj+PAOprPjbESS7v5ZtUY3bSoISJoZUZrPWKsQ4gXKcBgYIlBWlgMNpe9lPJjTZUPa9lVVUssB/jV5ngBmc5H4FpLtHi+ctU1mLsqgEty33efHG9V27/V7Ybv9FHS6TRk0hkEQoqbzRFpNb0tC1v2B7yyH0uC+RVepD3zY6rfMrHOZikQ7lzRUIn9rdUoTzhZ1hdzpUX8cxLO2vKUZqdOFZ5eXMz41XQM7qHcVm1ovEEJILizAE3jgOpsh5r2WQX/pr9x66+Iq2bxsKsGuEZ+4TvO/ESj3vp1BKGnwCKBQFwoFNH89GFkLAU7b8pEZX4kGmmxdq+6T1NhSrVxNSsHuMQREUUENtKKnbZeiFo3nzP7JF+VYsakSb20Wg400D2v6Hi0velnRfuzgO3CBVvqCDSfU2geiytgucz1IldTT+Z11yzuxYrsPfVfqvXpii/kLyPbPE3+LhUlkMbN5nJQQWA8fb+EbdenYXQ6al3K2lbGM5xIavPqQSY0lQZSTnAmr8xo8kXpN9kRfWypQjUuiW3emAW/CMRh6LzG7Zs1teJfWzefG1SdZMksBLiPzHdqBobyPAXv4b8FvcLGlS5XncY18pMve2Jn2Aj/TRj23otaF5Wtj5o3A+Pj45BCDRwgcTW5KQ2b9gVqeU4P+nKC1Qv97GhlygsujCsGOl3QZJaTSBHLgjJ1/j0FXtbMLaWlyYelDChuEavNXav1B/1lJCyGVfhP+WOwF79+0SskXotytTSYu2qBq0SKn7/n1HevLq38UqfbvY20bgp93iKazaVyCRnoFOTyAZJWKV7WRPgD2OAB+cZJIW3M5q82gT3dQN0A16QocpdHXY6XlJg53B9ekhjDfQbjtz/w8h+Cb+B18NTAaX1CrwYxBPFzlasitnuVA1fJr7/jZO74oZV/VKs3fl6G4SYCb6lYhJHRMYz/ZjiENDaVgqkdAbdGFc8TuOeVJHNtPhvkszoa3j0MAr6LQP/vqNl/8RU/Is7AecQurkaaeMC6TENxRMCHb/sVcUUvHnZNANfIT95x/6aVlc67uu3uezDmezCTzXiFQgHN5wkolUpcZTQ+nYbJHR6Xyg3qmfxcWtn0mdnQ/9n59mM+p+L4ZhUeQ036U9/10/Ap1LLPOeDjrMv0XhiCeKBc6UTVNQVcI/fd+Fj6aH35nkaj+XO+Jw5mMtnRMfR9JycnIYcEVgoBXBwNYGKLh/FcweYvy7OA7oLiJnycZx9kVrdqIJFdfhrDQL+zcQp+784fFXV4EeKuywR6cbWhsFzRsd1rEriu/JP990/OzM68WUhxbyaTfsPYxER2amoKxsbG2ITOZH0Y24hAHhNQGIP4ynfPUwYRTyas1FjFKNAqPI0f/cb2HHzwzvteHGAHyRDEcbmSFw+75oHryuv3HsqEpx6/O5tLfX82k3nN9NT01snpqezISJkXHMvmfMiPeAhgofKIcyqX+LlqYA4X6WVGKPzTqmPotwYz7SZ8xJPwNyUJn33z7118wA4SB8S0zOlb4RoV/JMcPPh+8TBcYTIE7vnF+/bsB7cVM7m7xiYmv71cHt88Njp2MJ/PTeWyuWyQopxoAq7HSRXpnOAHadD/f3t3j4IwDMUBPGlfOogU/AqEQkcXl17Jm3R38R56D6GTd+ggiiDxAzXNh8/oBZykNL8lS9aXhPxDnj9af4Nc/7jCfvJZzGmtfpq9UrZ2mq5xxmanoSpXVJE/8n8S37B4303HI3+51R24WBYLOictEwr3BzNSJvkw4+M0zzgXIu0PJjEkUwxnaMyYwHEUQSwZQA/z44e19mKcOUUAtWmao5Syul/Ph+W2wP2WOhIEQRB0xwuO/b5svEPEZgAAAABJRU5ErkJggg==" />
+  </defs>
+</svg>
diff --git a/app/images/slide-card-icon.svg b/app/images/slide-card-icon.svg
new file mode 100644
index 000000000000..32dd386ea6ce
--- /dev/null
+++ b/app/images/slide-card-icon.svg
@@ -0,0 +1,16 @@
+<svg width="60" height="59" viewBox="0 0 60 59" fill="none" xmlns="http://www.w3.org/2000/svg"
+  xmlns:xlink="http://www.w3.org/1999/xlink">
+  <g clip-path="url(#clip0_127_7275)">
+    <rect x="10" width="52" height="59" fill="url(#pattern0_127_7275)" />
+  </g>
+  <defs>
+    <pattern id="pattern0_127_7275" patternContentUnits="objectBoundingBox" width="1" height="1">
+      <use xlink:href="#image0_127_7275" transform="matrix(0.00236407 0 0 0.00208358 0 -0.149036)" />
+    </pattern>
+    <clipPath id="clip0_127_7275">
+      <rect width="60" height="59" fill="white" />
+    </clipPath>
+    <image id="image0_127_7275" width="423" height="623"
+      xlink:href="data:image/png;base64,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" />
+  </defs>
+</svg>
diff --git a/app/images/slide-fund-icon.svg b/app/images/slide-fund-icon.svg
new file mode 100644
index 000000000000..80f8e3b42e79
--- /dev/null
+++ b/app/images/slide-fund-icon.svg
@@ -0,0 +1,20 @@
+<svg width="60" height="59" viewBox="0 0 60 59" fill="none" xmlns="http://www.w3.org/2000/svg"
+  xmlns:xlink="http://www.w3.org/1999/xlink">
+  <g clip-path="url(#clip0_127_7276)">
+    <path fill-rule="evenodd" clip-rule="evenodd"
+      d="M62.7968 26.1149L54.9203 34.7417L47.0208 26.5463L47.0199 26.5473L54.9194 34.7426L47.0428 43.3694L47.0175 43.3432L39.0654 52.0528L39.0907 52.079L39.041 52.0795L39.0163 52.1066L38.9907 52.08L23.5642 52.2372L23.5405 52.2631L31.4906 60.5111L31.3901 60.5133L23.5388 69.1125L15.6392 60.917L15.5634 60.8383L7.66394 52.643L7.66379 52.6428L7.66394 52.6427L7.56628 35.9576L7.46457 35.8521L7.56502 35.742L15.2664 27.3071L15.3411 27.2253L20.8791 21.1598L3.45676 15.0698L21.1408 -4.29867L38.8246 1.50329L38.8028 1.52874L38.8462 1.48119L46.8215 9.75526L54.797 18.0294L47.0958 26.4641L62.7968 26.1149Z"
+      fill="#59AAF1" />
+    <rect width="38.7801" height="41.9974" transform="matrix(0.943365 0.331757 -0.277786 0.960643 21.6499 2.38623)"
+      fill="url(#pattern0_127_7276)" />
+  </g>
+  <defs>
+    <pattern id="pattern0_127_7276" patternContentUnits="objectBoundingBox" width="1" height="1">
+      <use xlink:href="#image0_127_7276" transform="matrix(0.00188014 0 0 0.00173611 -0.0414812 0)" />
+    </pattern>
+    <clipPath id="clip0_127_7276">
+      <rect width="60" height="59" fill="white" />
+    </clipPath>
+    <image id="image0_127_7276" width="576" height="576"
+      xlink:href="data:image/png;base64,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" />
+  </defs>
+</svg>
diff --git a/app/images/slide-sell-icon.svg b/app/images/slide-sell-icon.svg
new file mode 100644
index 000000000000..daed4190a05a
--- /dev/null
+++ b/app/images/slide-sell-icon.svg
@@ -0,0 +1,11 @@
+<svg width="60" height="59" viewBox="0 0 60 59" fill="none" xmlns="http://www.w3.org/2000/svg"
+  xmlns:xlink="http://www.w3.org/1999/xlink">
+  <rect x="12" y="2" width="48" height="57" fill="url(#pattern0_168_8432)" />
+  <defs>
+    <pattern id="pattern0_168_8432" patternContentUnits="objectBoundingBox" width="1" height="1">
+      <use xlink:href="#image0_168_8432" transform="matrix(0.00260417 0 0 0.00219298 0 -0.00438596)" />
+    </pattern>
+    <image id="image0_168_8432" width="384" height="460"
+      xlink:href="data:image/png;base64,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" />
+  </defs>
+</svg>
diff --git a/app/scripts/constants/sentry-state.ts b/app/scripts/constants/sentry-state.ts
index 52fae4d7909a..c0b075c2b28b 100644
--- a/app/scripts/constants/sentry-state.ts
+++ b/app/scripts/constants/sentry-state.ts
@@ -431,6 +431,7 @@ export const SENTRY_UI_STATE = {
     nextNonce: true,
     pendingTokens: false,
     welcomeScreenSeen: true,
+    slides: false,
     confirmationExchangeRates: true,
     useSafeChainsListValidation: true,
     watchEthereumAccountEnabled: false,
diff --git a/app/scripts/controllers/app-state-controller.ts b/app/scripts/controllers/app-state-controller.ts
index 612f328eb82d..828b2249c6c2 100644
--- a/app/scripts/controllers/app-state-controller.ts
+++ b/app/scripts/controllers/app-state-controller.ts
@@ -28,7 +28,10 @@ import {
 import { DEFAULT_AUTO_LOCK_TIME_LIMIT } from '../../../shared/constants/preferences';
 import { LastInteractedConfirmationInfo } from '../../../shared/types/confirm';
 import { SecurityAlertResponse } from '../lib/ppom/types';
-import { AccountOverviewTabKey } from '../../../shared/constants/app-state';
+import {
+  AccountOverviewTabKey,
+  CarouselSlide,
+} from '../../../shared/constants/app-state';
 import type {
   Preferences,
   PreferencesControllerGetStateAction,
@@ -76,6 +79,7 @@ export type AppStateControllerState = {
   interactiveReplacementToken?: { url: string; oldRefreshToken: string };
   noteToTraderMessage?: string;
   custodianDeepLink?: { fromAddress: string; custodyId: string };
+  slides: CarouselSlide[];
 };
 
 const controllerName = 'AppStateController';
@@ -186,6 +190,7 @@ const getDefaultAppStateControllerState = (): AppStateControllerState => ({
   hadAdvancedGasFeesSetPriorToMigration92_3: false,
   surveyLinkLastClickedOrClosed: null,
   switchedNetworkNeverShowMessage: false,
+  slides: [],
   ...getInitialStateOverrides(),
 });
 
@@ -344,6 +349,10 @@ const controllerMetadata = {
     persist: true,
     anonymous: true,
   },
+  slides: {
+    persist: true,
+    anonymous: true,
+  },
 };
 
 export class AppStateController extends BaseController<
@@ -531,6 +540,55 @@ export class AppStateController extends BaseController<
     });
   }
 
+  /**
+   * Updates slides by adding new slides that don't already exist in state
+   *
+   * @param slides - Array of new slides to add
+   */
+  updateSlides(slides: CarouselSlide[]): void {
+    this.update((state) => {
+      const currentSlides = state.slides || [];
+
+      // Updates the undismissable property for slides that already exist in state
+      const updatedCurrentSlides = currentSlides.map((currentSlide) => {
+        const matchingNewSlide = slides.find((s) => s.id === currentSlide.id);
+        if (matchingNewSlide) {
+          return {
+            ...currentSlide,
+            undismissable: matchingNewSlide.undismissable,
+          };
+        }
+        return currentSlide;
+      });
+
+      // Adds new slides that don't already exist in state
+      const newSlides = slides.filter((newSlide) => {
+        return !currentSlides.some(
+          (currentSlide) => currentSlide.id === newSlide.id,
+        );
+      });
+
+      state.slides = [...updatedCurrentSlides, ...newSlides];
+    });
+  }
+
+  /**
+   * Marks a slide as dismissed by ID
+   *
+   * @param id - ID of the slide to dismiss
+   */
+  removeSlide(id: string): void {
+    this.update((state) => {
+      const slides = state.slides || [];
+      state.slides = slides.map((slide) => {
+        if (slide.id === id) {
+          return { ...slide, dismissed: true };
+        }
+        return slide;
+      });
+    });
+  }
+
   /**
    * Record the timestamp of the last time the user has seen the recovery phrase reminder
    *
diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
index f7ac1ce266d6..5b29b843f859 100644
--- a/app/scripts/metamask-controller.js
+++ b/app/scripts/metamask-controller.js
@@ -3802,6 +3802,8 @@ export default class MetamaskController extends EventEmitter {
         appStateController.setLastInteractedConfirmationInfo.bind(
           appStateController,
         ),
+      updateSlides: appStateController.updateSlides.bind(appStateController),
+      removeSlide: appStateController.removeSlide.bind(appStateController),
 
       // EnsController
       tryReverseResolveAddress:
diff --git a/lavamoat/browserify/mmi/policy.json b/lavamoat/browserify/mmi/policy.json
index 99635e6aa997..08a75ac8612b 100644
--- a/lavamoat/browserify/mmi/policy.json
+++ b/lavamoat/browserify/mmi/policy.json
@@ -4962,8 +4962,32 @@
     },
     "react-responsive-carousel": {
       "globals": {
+        "HTMLElement": true,
         "addEventListener": true,
-        "removeEventListener": 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": {
diff --git a/package.json b/package.json
index ee392c924ad0..223372f5dcc5 100644
--- a/package.json
+++ b/package.json
@@ -293,7 +293,7 @@
     "@metamask/browser-passworder": "^4.3.0",
     "@metamask/contract-metadata": "^2.5.0",
     "@metamask/controller-utils": "^11.4.0",
-    "@metamask/design-tokens": "^4.0.0",
+    "@metamask/design-tokens": "^4.2.0",
     "@metamask/ens-controller": "^15.0.0",
     "@metamask/ens-resolver-snap": "^0.1.2",
     "@metamask/eth-json-rpc-filters": "^9.0.0",
diff --git a/shared/constants/app-state.ts b/shared/constants/app-state.ts
index 82424edfe57f..b66dd153cb54 100644
--- a/shared/constants/app-state.ts
+++ b/shared/constants/app-state.ts
@@ -18,3 +18,13 @@ export const ACCOUNT_OVERVIEW_TAB_KEY_TO_TRACE_NAME_MAP = {
   [AccountOverviewTabKey.Nfts]: TraceName.AccountOverviewNftsTab,
   [AccountOverviewTabKey.Activity]: TraceName.AccountOverviewActivityTab,
 } as const;
+
+export type CarouselSlide = {
+  id: string;
+  title: string;
+  description: string;
+  image: string;
+  dismissed?: boolean;
+  href?: string;
+  undismissable?: boolean;
+};
diff --git a/test/e2e/flask/create-watch-account.spec.ts b/test/e2e/flask/create-watch-account.spec.ts
index 71d47327536c..f25f38f0b2ce 100644
--- a/test/e2e/flask/create-watch-account.spec.ts
+++ b/test/e2e/flask/create-watch-account.spec.ts
@@ -374,7 +374,9 @@ describe('Account-watcher snap', function (this: Suite) {
 
     const toggleWatchAccountOptionAndCloseSettings = async (driver: Driver) => {
       await driver.clickElement('[data-testid="watch-account-toggle-div"]');
-      await driver.clickElement('button[aria-label="Close"]');
+      await driver.clickElement(
+        '.settings-page__header__title-container__close-button',
+      );
     };
 
     const verifyWatchAccountOptionAndCloseMenu = async (
@@ -396,7 +398,7 @@ describe('Account-watcher snap', function (this: Suite) {
           tag: 'button',
         });
       }
-      await driver.clickElement('button[aria-label="Close"]');
+      await driver.clickElement('header button[aria-label="Close"]');
     };
 
     it("will show the 'Watch an Ethereum account (Beta)' option when setting is enabled", async function () {
diff --git a/test/e2e/page-objects/pages/account-list-page.ts b/test/e2e/page-objects/pages/account-list-page.ts
index 5660dc616279..955dd5111fe1 100644
--- a/test/e2e/page-objects/pages/account-list-page.ts
+++ b/test/e2e/page-objects/pages/account-list-page.ts
@@ -48,7 +48,8 @@ class AccountListPage {
     tag: 'button',
   };
 
-  private readonly closeAccountModalButton = 'button[aria-label="Close"]';
+  private readonly closeAccountModalButton =
+    'header button[aria-label="Close"]';
 
   private readonly createAccountButton =
     '[data-testid="multichain-account-menu-popover-action-button"]';
diff --git a/test/e2e/tests/account/incremental-security.spec.js b/test/e2e/tests/account/incremental-security.spec.js
index f16fb5350b91..e8295de765ec 100644
--- a/test/e2e/tests/account/incremental-security.spec.js
+++ b/test/e2e/tests/account/incremental-security.spec.js
@@ -82,7 +82,7 @@ describe('Incremental Security', function () {
         await driver.findVisibleElement(
           '[data-testid="account-details-modal"]',
         );
-        await driver.clickElement('button[aria-label="Close"]');
+        await driver.clickElement('header button[aria-label="Close"]');
 
         // wait for account modal to be removed from DOM
         await driver.assertElementNotPresent(
diff --git a/test/e2e/tests/carousel/carousel.spec.ts b/test/e2e/tests/carousel/carousel.spec.ts
new file mode 100644
index 000000000000..833fbd5ed00c
--- /dev/null
+++ b/test/e2e/tests/carousel/carousel.spec.ts
@@ -0,0 +1,115 @@
+import { strict as assert } from 'assert';
+import { withFixtures } from '../../helpers';
+import FixtureBuilder from '../../fixture-builder';
+import { loginWithBalanceValidation } from '../../page-objects/flows/login.flow';
+
+describe('Carousel component e2e tests', () => {
+  it('should display correct slides with expected content', async function () {
+    await withFixtures(
+      {
+        fixtures: new FixtureBuilder().build(),
+        title: this.test?.fullTitle(),
+      },
+      async ({ driver }) => {
+        await loginWithBalanceValidation(driver);
+
+        await driver.waitForSelector(
+          '[data-testid="eth-overview__primary-currency"]',
+        );
+
+        await driver.waitForSelector('.mm-carousel');
+        await driver.waitForSelector('.mm-carousel-slide');
+
+        const slides = await driver.findElements('.mm-carousel-slide');
+        assert.ok(slides.length > 0, 'Carousel should have slides');
+
+        const slideIds = ['bridge', 'card', 'fund', 'cash'];
+
+        const firstSlideSelector = `[data-testid="slide-${slideIds[0]}"]`;
+        await driver.waitForSelector(firstSlideSelector);
+
+        for (let i = 0; i < slideIds.length; i++) {
+          if (i > 0) {
+            const dots = await driver.findElements('.dot');
+            await dots[i].click();
+            await driver.waitForSelector(
+              `[data-testid="slide-${slideIds[i]}"]`,
+            );
+          }
+
+          const slideSelector = `[data-testid="slide-${slideIds[i]}"]`;
+          const currentSlide = await driver.waitForSelector(slideSelector);
+          assert.ok(
+            currentSlide,
+            `Slide with data-testid="slide-${slideIds[i]}" should exist`,
+          );
+
+          const hasTitle = await driver.isElementPresent(
+            `${slideSelector} .mm-text--body-sm-medium`,
+          );
+          const hasDescription = await driver.isElementPresent(
+            `${slideSelector} .mm-text--body-xs`,
+          );
+
+          assert.ok(hasTitle, `Slide ${slideIds[i]} should have a title`);
+          assert.ok(
+            hasDescription,
+            `Slide ${slideIds[i]} should have a description`,
+          );
+        }
+      },
+    );
+  });
+
+  it('should handle slide dismissal', async function () {
+    await withFixtures(
+      {
+        fixtures: new FixtureBuilder().build(),
+        title: this.test?.fullTitle(),
+      },
+      async ({ driver }) => {
+        await loginWithBalanceValidation(driver);
+        await driver.waitForSelector('.mm-carousel');
+        await driver.waitForSelector('.mm-carousel-slide');
+
+        const initialSlides = await driver.findElements('.mm-carousel-slide');
+        assert.equal(initialSlides.length, 4);
+
+        for (let i = 0; i < 4; i++) {
+          const currentSlides = await driver.findElements('.mm-carousel-slide');
+          assert.equal(
+            currentSlides.length,
+            4 - i,
+            `Expected ${4 - i} slides remaining`,
+          );
+
+          const dismissButton = await driver.findElement(
+            '.mm-carousel-slide:first-child .mm-carousel-slide__close-button',
+          );
+          await dismissButton.click();
+
+          if (i < 3) {
+            await driver.wait(async () => {
+              const remainingSlides = await driver.findElements(
+                '.mm-carousel-slide',
+              );
+              return remainingSlides.length === 3 - i;
+            }, 5e3);
+          }
+        }
+
+        await driver.wait(async () => {
+          const carouselExists = await driver.isElementPresent('.mm-carousel');
+          return !carouselExists;
+        }, 5e3);
+
+        const carouselExists = await driver.isElementPresent('.mm-carousel');
+        assert.equal(
+          carouselExists,
+          false,
+          'Carousel should no longer be visible',
+        );
+      },
+    );
+  });
+});
diff --git a/test/e2e/tests/metrics/state-snapshots/errors-after-init-opt-in-background-state.json b/test/e2e/tests/metrics/state-snapshots/errors-after-init-opt-in-background-state.json
index c28cd91f5815..cae1a6ae8951 100644
--- a/test/e2e/tests/metrics/state-snapshots/errors-after-init-opt-in-background-state.json
+++ b/test/e2e/tests/metrics/state-snapshots/errors-after-init-opt-in-background-state.json
@@ -42,15 +42,16 @@
     "newPrivacyPolicyToastClickedOrClosed": "boolean",
     "newPrivacyPolicyToastShownDate": "number",
     "hadAdvancedGasFeesSetPriorToMigration92_3": false,
-    "nftsDropdownState": {},
-    "termsOfUseLastAgreed": "number",
-    "qrHardware": {},
-    "snapsInstallPrivacyWarningShown": true,
     "surveyLinkLastClickedOrClosed": "object",
+    "switchedNetworkNeverShowMessage": "boolean",
+    "slides": "object",
+    "qrHardware": {},
+    "nftsDropdownState": {},
     "signatureSecurityAlertResponses": "object",
     "switchedNetworkDetails": null,
-    "switchedNetworkNeverShowMessage": "boolean",
-    "currentExtensionPopupId": "number"
+    "currentExtensionPopupId": "number",
+    "termsOfUseLastAgreed": "number",
+    "snapsInstallPrivacyWarningShown": true
   },
   "ApprovalController": {
     "pendingApprovals": "object",
@@ -344,7 +345,6 @@
     "allDetectedTokens": {}
   },
   "TxController": {
-    "lastFetchedBlockNumbers": "object",
     "methodData": "object",
     "transactions": "object",
     "lastFetchedBlockNumbers": "object",
diff --git a/test/e2e/tests/metrics/state-snapshots/errors-after-init-opt-in-ui-state.json b/test/e2e/tests/metrics/state-snapshots/errors-after-init-opt-in-ui-state.json
index 079934c65eec..a306c63c70b6 100644
--- a/test/e2e/tests/metrics/state-snapshots/errors-after-init-opt-in-ui-state.json
+++ b/test/e2e/tests/metrics/state-snapshots/errors-after-init-opt-in-ui-state.json
@@ -88,15 +88,16 @@
     "newPrivacyPolicyToastClickedOrClosed": "boolean",
     "newPrivacyPolicyToastShownDate": "number",
     "hadAdvancedGasFeesSetPriorToMigration92_3": false,
-    "nftsDropdownState": {},
-    "termsOfUseLastAgreed": "number",
-    "qrHardware": {},
-    "snapsInstallPrivacyWarningShown": true,
     "surveyLinkLastClickedOrClosed": "object",
+    "switchedNetworkNeverShowMessage": "boolean",
+    "slides": "object",
+    "qrHardware": {},
+    "nftsDropdownState": {},
     "signatureSecurityAlertResponses": "object",
     "switchedNetworkDetails": null,
-    "switchedNetworkNeverShowMessage": "boolean",
     "currentExtensionPopupId": "number",
+    "termsOfUseLastAgreed": "number",
+    "snapsInstallPrivacyWarningShown": true,
     "currentAppVersion": "string",
     "previousAppVersion": "",
     "previousMigrationVersion": 0,
diff --git a/test/e2e/tests/tokens/token-details.spec.ts b/test/e2e/tests/tokens/token-details.spec.ts
index c882c7c8b4b4..5424f1d02367 100644
--- a/test/e2e/tests/tokens/token-details.spec.ts
+++ b/test/e2e/tests/tokens/token-details.spec.ts
@@ -102,6 +102,9 @@ describe('Token Details', function () {
       async ({ driver }: { driver: Driver }) => {
         await unlockWallet(driver);
         await importToken(driver);
+        await driver.clickElement(
+          '.actionable-message__message button[aria-label="Close"]',
+        );
         await openTokenDetails(driver);
         await verifyToken(driver);
       },
@@ -157,6 +160,9 @@ describe('Token Details', function () {
       async ({ driver }: { driver: Driver }) => {
         await unlockWallet(driver);
         await importToken(driver);
+        await driver.clickElement(
+          '.actionable-message__message button[aria-label="Close"]',
+        );
         await openTokenDetails(driver);
         await verifyToken(driver);
 
diff --git a/test/integration/data/integration-init-state.json b/test/integration/data/integration-init-state.json
index ac58306adca8..3d3580dc12ca 100644
--- a/test/integration/data/integration-init-state.json
+++ b/test/integration/data/integration-init-state.json
@@ -801,6 +801,7 @@
   "showProductTour": false,
   "showTestnetMessageInDropdown": true,
   "signatureSecurityAlertResponses": {},
+  "slides": [],
   "smartTransactionsState": {
     "fees": {},
     "liveness": true,
diff --git a/test/integration/data/onboarding-completion-route.json b/test/integration/data/onboarding-completion-route.json
index 3e470b1494e6..9d3df88dbeae 100644
--- a/test/integration/data/onboarding-completion-route.json
+++ b/test/integration/data/onboarding-completion-route.json
@@ -287,6 +287,7 @@
   "showPermissionsTour": true,
   "showTestnetMessageInDropdown": true,
   "signatureSecurityAlertResponses": {},
+  "slides": [],
   "smartTransactionsState": {
     "smartTransactions": { "0x1": [] },
     "fees": {},
diff --git a/ui/components/app/incoming-trasaction-toggle/__snapshots__/incoming-transaction-toggle.test.js.snap b/ui/components/app/incoming-trasaction-toggle/__snapshots__/incoming-transaction-toggle.test.js.snap
index 20b0b6bf5d7f..e3a848a72d6d 100644
--- a/ui/components/app/incoming-trasaction-toggle/__snapshots__/incoming-transaction-toggle.test.js.snap
+++ b/ui/components/app/incoming-trasaction-toggle/__snapshots__/incoming-transaction-toggle.test.js.snap
@@ -150,7 +150,7 @@ exports[`IncomingTransactionToggle should render existing incoming transaction p
             style="display: flex; width: 52px; align-items: center; justify-content: flex-start; position: relative; cursor: pointer; background-color: transparent; border: 0px; padding: 0px; user-select: none;"
           >
             <div
-              style="width: 40px; height: 24px; padding: 0px; border-radius: 26px; display: flex; align-items: center; justify-content: center; background-color: rgb(132, 140, 150);"
+              style="width: 40px; height: 24px; padding: 0px; border-radius: 26px; display: flex; align-items: center; justify-content: center; background-color: rgb(106, 115, 125);"
             >
               <div
                 style="font-size: 11px; display: flex; align-items: center; justify-content: center; font-family: 'Helvetica Neue', Helvetica, sans-serif; position: relative; color: rgb(250, 250, 250); margin-top: auto; margin-bottom: auto; line-height: 0; opacity: 0; width: 26px; height: 20px; left: 4px;"
@@ -320,7 +320,7 @@ exports[`IncomingTransactionToggle should render existing incoming transaction p
             style="display: flex; width: 52px; align-items: center; justify-content: flex-start; position: relative; cursor: pointer; background-color: transparent; border: 0px; padding: 0px; user-select: none;"
           >
             <div
-              style="width: 40px; height: 24px; padding: 0px; border-radius: 26px; display: flex; align-items: center; justify-content: center; background-color: rgb(132, 140, 150);"
+              style="width: 40px; height: 24px; padding: 0px; border-radius: 26px; display: flex; align-items: center; justify-content: center; background-color: rgb(106, 115, 125);"
             >
               <div
                 style="font-size: 11px; display: flex; align-items: center; justify-content: center; font-family: 'Helvetica Neue', Helvetica, sans-serif; position: relative; color: rgb(250, 250, 250); margin-top: auto; margin-bottom: auto; line-height: 0; opacity: 0; width: 26px; height: 20px; left: 4px;"
diff --git a/ui/components/component-library/banner-base/banner-base.types.ts b/ui/components/component-library/banner-base/banner-base.types.ts
index 61e7c6085e07..706d5d42f0df 100644
--- a/ui/components/component-library/banner-base/banner-base.types.ts
+++ b/ui/components/component-library/banner-base/banner-base.types.ts
@@ -64,7 +64,7 @@ export interface BannerBaseStyleUtilityProps extends StyleUtilityProps {
    * The onClick handler for the close button
    * When passed this will allow for the close button to show
    */
-  onClose?: () => void;
+  onClose?: (e: React.MouseEvent<HTMLElement>) => void;
   /**
    * The props to pass to the close button
    */
diff --git a/ui/components/multichain/account-overview/account-overview-eth.test.tsx b/ui/components/multichain/account-overview/account-overview-eth.test.tsx
index a886608ec169..cfca7b93dddf 100644
--- a/ui/components/multichain/account-overview/account-overview-eth.test.tsx
+++ b/ui/components/multichain/account-overview/account-overview-eth.test.tsx
@@ -13,6 +13,8 @@ jest.mock('../../../store/actions', () => ({
   tokenBalancesStartPolling: jest.fn().mockResolvedValue('pollingToken'),
   tokenBalancesStopPollingByPollingToken: jest.fn(),
   setTokenNetworkFilter: jest.fn(),
+  updateSlides: jest.fn(),
+  removeSlide: jest.fn(),
 }));
 
 // Mock the dispatch function
diff --git a/ui/components/multichain/account-overview/account-overview-layout.tsx b/ui/components/multichain/account-overview/account-overview-layout.tsx
index fdebd69c60b4..6006cabf810f 100644
--- a/ui/components/multichain/account-overview/account-overview-layout.tsx
+++ b/ui/components/multichain/account-overview/account-overview-layout.tsx
@@ -1,8 +1,34 @@
-import React from 'react';
+import React, { useEffect } from 'react';
+import { useDispatch, useSelector } from 'react-redux';
+import { removeSlide, updateSlides } from '../../../store/actions';
+import { Carousel } from '..';
+import {
+  ///: BEGIN:ONLY_INCLUDE_IF(build-main,build-beta,build-flask)
+  getSwapsDefaultToken,
+  getMetaMetricsId,
+  getParticipateInMetaMetrics,
+  getDataCollectionForMarketing,
+  ///: END:ONLY_INCLUDE_IF
+  getSelectedAccountCachedBalance,
+  getAppIsLoading,
+  getSlides,
+} from '../../../selectors';
+///: BEGIN:ONLY_INCLUDE_IF(build-main,build-beta,build-flask)
+import { getPortfolioUrl } from '../../../helpers/utils/portfolio';
+///: END:ONLY_INCLUDE_IF
 import {
   AccountOverviewTabsProps,
   AccountOverviewTabs,
 } from './account-overview-tabs';
+import {
+  FUND_SLIDE,
+  ///: BEGIN:ONLY_INCLUDE_IF(build-main,build-beta,build-flask)
+  BRIDGE_SLIDE,
+  ///: END:ONLY_INCLUDE_IF
+  CARD_SLIDE,
+  CASH_SLIDE,
+  ZERO_BALANCE,
+} from './constants';
 
 export type AccountOverviewLayoutProps = AccountOverviewTabsProps & {
   children: React.ReactElement;
@@ -12,10 +38,79 @@ export const AccountOverviewLayout = ({
   children,
   ...tabsProps
 }: AccountOverviewLayoutProps) => {
+  const dispatch = useDispatch();
+  const slides = useSelector(getSlides);
+  const totalBalance = useSelector(getSelectedAccountCachedBalance);
+  const isLoading = useSelector(getAppIsLoading);
+
+  const hasZeroBalance = totalBalance === ZERO_BALANCE;
+
+  ///: BEGIN:ONLY_INCLUDE_IF(build-main,build-beta,build-flask)
+  const defaultSwapsToken = useSelector(getSwapsDefaultToken);
+  const metaMetricsId = useSelector(getMetaMetricsId);
+  const isMetaMetricsEnabled = useSelector(getParticipateInMetaMetrics);
+  const isMarketingEnabled = useSelector(getDataCollectionForMarketing);
+  ///: END:ONLY_INCLUDE_IF
+
+  useEffect(() => {
+    const fundSlide = {
+      ...FUND_SLIDE,
+      undismissable: hasZeroBalance,
+    };
+
+    const defaultSlides = [
+      ///: BEGIN:ONLY_INCLUDE_IF(build-main,build-beta,build-flask)
+      BRIDGE_SLIDE,
+      ///: END:ONLY_INCLUDE_IF
+      CARD_SLIDE,
+      CASH_SLIDE,
+    ];
+
+    if (hasZeroBalance) {
+      defaultSlides.unshift(fundSlide);
+    } else {
+      defaultSlides.splice(2, 0, fundSlide);
+    }
+
+    dispatch(updateSlides(defaultSlides));
+  }, [hasZeroBalance]);
+
+  ///: BEGIN:ONLY_INCLUDE_IF(build-main,build-beta,build-flask)
+  const handleCarouselClick = (id: string) => {
+    if (id === 'bridge') {
+      const portfolioUrl = getPortfolioUrl(
+        'bridge',
+        'ext_bridge_prepare_swap_link',
+        metaMetricsId,
+        isMetaMetricsEnabled,
+        isMarketingEnabled,
+      );
+
+      global.platform.openTab({
+        url: `${portfolioUrl}&token=${defaultSwapsToken}`,
+      });
+    }
+  };
+  ///: END:ONLY_INCLUDE_IF
+
+  const handleRemoveSlide = (id: string) => {
+    if (id === 'fund' && hasZeroBalance) {
+      return;
+    }
+    dispatch(removeSlide(id));
+  };
+
   return (
     <>
       <div className="account-overview__balance-wrapper">{children}</div>
-
+      <Carousel
+        slides={slides}
+        isLoading={isLoading}
+        ///: BEGIN:ONLY_INCLUDE_IF(build-main,build-beta,build-flask)
+        onClick={handleCarouselClick}
+        ///: END:ONLY_INCLUDE_IF
+        onClose={handleRemoveSlide}
+      />
       <AccountOverviewTabs {...tabsProps}></AccountOverviewTabs>
     </>
   );
diff --git a/ui/components/multichain/account-overview/account-overview-non-evm.test.tsx b/ui/components/multichain/account-overview/account-overview-non-evm.test.tsx
index 17989cbf31a6..df7c2ef56d69 100644
--- a/ui/components/multichain/account-overview/account-overview-non-evm.test.tsx
+++ b/ui/components/multichain/account-overview/account-overview-non-evm.test.tsx
@@ -13,6 +13,8 @@ jest.mock('../../../store/actions', () => ({
   tokenBalancesStartPolling: jest.fn().mockResolvedValue('pollingToken'),
   tokenBalancesStopPollingByPollingToken: jest.fn(),
   setTokenNetworkFilter: jest.fn(),
+  updateSlides: jest.fn(),
+  removeSlide: jest.fn(),
 }));
 
 // Mock the dispatch function
diff --git a/ui/components/multichain/account-overview/constants.ts b/ui/components/multichain/account-overview/constants.ts
new file mode 100644
index 000000000000..bd007677457a
--- /dev/null
+++ b/ui/components/multichain/account-overview/constants.ts
@@ -0,0 +1,34 @@
+export const FUND_SLIDE = {
+  id: 'fund',
+  title: 'slideFundWalletTitle',
+  description: 'slideFundWalletDescription',
+  image: './images/slide-fund-icon.svg',
+  href: 'https://portfolio.metamask.io/buy/build-quote',
+};
+
+///: BEGIN:ONLY_INCLUDE_IF(build-main,build-beta,build-flask)
+export const BRIDGE_SLIDE = {
+  id: 'bridge',
+  title: 'slideBridgeTitle',
+  description: 'slideBridgeDescription',
+  image: './images/slide-bridge-icon.svg',
+};
+///: END:ONLY_INCLUDE_IF
+
+export const CARD_SLIDE = {
+  id: 'card',
+  title: 'slideDebitCardTitle',
+  description: 'slideDebitCardDescription',
+  image: './images/slide-card-icon.svg',
+  href: 'https://portfolio.metamask.io/card',
+};
+
+export const CASH_SLIDE = {
+  id: 'cash',
+  title: 'slideCashOutTitle',
+  description: 'slideCashOutDescription',
+  image: './images/slide-sell-icon.svg',
+  href: 'https://portfolio.metamask.io/sell',
+};
+
+export const ZERO_BALANCE = '0x00';
diff --git a/ui/components/multichain/carousel/carousel.stories.tsx b/ui/components/multichain/carousel/carousel.stories.tsx
new file mode 100644
index 000000000000..e2318a641381
--- /dev/null
+++ b/ui/components/multichain/carousel/carousel.stories.tsx
@@ -0,0 +1,66 @@
+import React from 'react';
+import type { Meta, StoryObj } from '@storybook/react';
+import { Carousel } from './carousel';
+
+export default {
+  title: 'Components/ComponentLibrary/Carousel',
+  component: Carousel,
+  argTypes: {
+    slides: {
+      control: 'object',
+    },
+    onClose: {
+      control: 'function',
+    },
+  },
+} as Meta<typeof Carousel>;
+
+const mockSlides = [
+  {
+    id: '1',
+    title: 'First Slide',
+    description: 'This is the first slide description',
+    image: './images/sample-image-1.png',
+  },
+  {
+    id: '2',
+    title: 'Second Slide',
+    description: 'This is the second slide description',
+    image: './images/sample-image-2.png',
+  },
+  {
+    id: '3',
+    title: 'Third Slide',
+    description: 'This is the third slide description',
+    image: './images/sample-image-3.png',
+  },
+];
+
+type Story = StoryObj<typeof Carousel>;
+
+const Template: Story = {
+  render: (args) => <Carousel {...args} slides={args.slides || mockSlides} />,
+};
+
+export const DefaultStory: Story = {
+  ...Template,
+  args: {
+    slides: mockSlides,
+  },
+};
+
+export const WithCloseButton: Story = {
+  ...Template,
+  args: {
+    ...DefaultStory.args,
+    onClose: (id: string) => console.log(`Closing slide with id: ${id}`),
+  },
+};
+
+export const SingleSlide: Story = {
+  ...Template,
+  args: {
+    ...DefaultStory.args,
+    slides: [mockSlides[0]],
+  },
+};
diff --git a/ui/components/multichain/carousel/carousel.test.tsx b/ui/components/multichain/carousel/carousel.test.tsx
new file mode 100644
index 000000000000..71b9e4f4faa8
--- /dev/null
+++ b/ui/components/multichain/carousel/carousel.test.tsx
@@ -0,0 +1,219 @@
+import React from 'react';
+import { render, fireEvent } from '@testing-library/react';
+import { Carousel } from './carousel';
+import { MARGIN_VALUES, WIDTH_VALUES } from './constants';
+
+jest.mock('../../../hooks/useI18nContext', () => ({
+  useI18nContext: () => (key: string) => key,
+}));
+
+describe('Carousel', () => {
+  const mockSlides = [
+    {
+      id: '1',
+      title: 'Slide 1',
+      description: 'Description 1',
+      image: 'image1.jpg',
+    },
+    {
+      id: '2',
+      title: 'Slide 2',
+      description: 'Description 2',
+      image: 'image2.jpg',
+    },
+  ];
+
+  it('should render correctly with slides', () => {
+    const { container } = render(<Carousel slides={mockSlides} />);
+
+    const slides = container.querySelectorAll('.mm-carousel-slide');
+    expect(slides).toHaveLength(2);
+
+    const images = container.querySelectorAll('.mm-carousel-slide__accessory');
+    expect(images[0]).toHaveAttribute('src', 'image1.jpg');
+    expect(images[1]).toHaveAttribute('src', 'image2.jpg');
+  });
+
+  it('should handle slide removal', async () => {
+    const mockOnClose = jest.fn();
+    const { container, rerender } = render(
+      <Carousel slides={mockSlides} onClose={mockOnClose} />,
+    );
+
+    const closeButtons = container.querySelectorAll(
+      '.mm-carousel-slide__close-button',
+    );
+    expect(closeButtons).toHaveLength(2);
+
+    fireEvent.click(closeButtons[0]);
+    expect(mockOnClose).toHaveBeenCalledWith('1');
+
+    const remainingSlides = mockSlides.filter((slide) => slide.id !== '1');
+    rerender(<Carousel slides={remainingSlides} onClose={mockOnClose} />);
+
+    const updatedSlides = container.querySelectorAll('.mm-carousel-slide');
+    expect(updatedSlides).toHaveLength(1);
+  });
+
+  it('should handle slide navigation', () => {
+    const { container } = render(<Carousel slides={mockSlides} />);
+
+    const dots = container.querySelectorAll('.dot');
+    if (!dots || dots.length === 0) {
+      throw new Error('Carousel dots not found');
+    }
+    fireEvent.click(dots[1]);
+
+    const slides = container.querySelectorAll('.mm-carousel-slide');
+    expect(slides[1].parentElement).toHaveClass('selected');
+  });
+
+  it('should return null when no slides are present', () => {
+    const { container } = render(<Carousel slides={[]} />);
+    expect(container.firstChild).toBeNull();
+  });
+
+  it('should apply correct margin and width for single slide', () => {
+    const singleSlide = [mockSlides[0]];
+    const { container } = render(<Carousel slides={singleSlide} />);
+
+    const slide = container.querySelector('.mm-carousel-slide');
+    expect(slide).toHaveStyle({
+      margin: `${MARGIN_VALUES.ZERO} ${MARGIN_VALUES.CONTAINER_SIDE}`,
+      width: 'calc(100% - 32px)',
+    });
+  });
+
+  it('should apply correct margin and width for multiple slides', () => {
+    const { container } = render(<Carousel slides={mockSlides} />);
+
+    const slides = container.querySelectorAll('.mm-carousel-slide');
+    expect(slides[0]).toHaveStyle({
+      width: 'calc(98% - 16px)',
+    });
+
+    expect(slides[1]).toHaveStyle({
+      width: WIDTH_VALUES.STANDARD_SLIDE,
+    });
+
+    // Check margins for first slide
+    expect(slides[0]).toHaveStyle({
+      margin: `${MARGIN_VALUES.ZERO} ${MARGIN_VALUES.ZERO} ${MARGIN_VALUES.SLIDE_BOTTOM} 16px`,
+    });
+
+    // Check margins for subsequent slides
+    expect(slides[1]).toHaveStyle({
+      margin: `${MARGIN_VALUES.ZERO} ${MARGIN_VALUES.ZERO} ${MARGIN_VALUES.SLIDE_BOTTOM} ${MARGIN_VALUES.ZERO}`,
+    });
+  });
+
+  it('should render loading state correctly', () => {
+    const { container } = render(<Carousel slides={mockSlides} isLoading />);
+
+    const loadingCarousel = container.querySelector('.mm-carousel__loading');
+    expect(loadingCarousel).toBeDefined();
+
+    const skeletonSlides = container.querySelectorAll('.mm-carousel-slide');
+    expect(skeletonSlides).toHaveLength(3);
+  });
+
+  it('should handle slide click with href', () => {
+    const mockOpenTab = jest.fn();
+    global.platform = {
+      openTab: mockOpenTab,
+      closeCurrentWindow: jest.fn(),
+    };
+
+    const slidesWithHref = [
+      {
+        ...mockSlides[0],
+        href: 'https://example.com',
+      },
+    ];
+
+    const { container } = render(<Carousel slides={slidesWithHref} />);
+
+    const slide = container.querySelector('.mm-carousel-slide');
+    if (!slide) {
+      throw new Error('Slide not found');
+    }
+    fireEvent.click(slide);
+
+    expect(mockOpenTab).toHaveBeenCalledWith({ url: 'https://example.com' });
+  });
+
+  it('should handle slide click with onClick', () => {
+    const mockOnClick = jest.fn();
+    const slidesWithClick = [
+      {
+        ...mockSlides[0],
+      },
+    ];
+
+    const { container } = render(
+      <Carousel slides={slidesWithClick} onClick={mockOnClick} />,
+    );
+
+    const slide = container.querySelector('.mm-carousel-slide');
+    if (!slide) {
+      throw new Error('Slide not found');
+    }
+    fireEvent.click(slide);
+
+    expect(mockOnClick).toHaveBeenCalledWith('1');
+  });
+
+  it('should not show close button for undismissable slides', () => {
+    const undismissableSlides = [
+      {
+        ...mockSlides[0],
+        undismissable: true,
+      },
+      mockSlides[1],
+    ];
+
+    const { container } = render(
+      <Carousel slides={undismissableSlides} onClose={() => undefined} />,
+    );
+
+    const closeButtons = container.querySelectorAll(
+      '.mm-carousel-slide__close-button',
+    );
+    expect(closeButtons).toHaveLength(1);
+  });
+
+  it('should limit the number of slides to MAX_SLIDES', () => {
+    const manySlides = [
+      ...mockSlides,
+      {
+        id: '3',
+        title: 'Slide 3',
+        description: 'Description 3',
+        image: 'image3.jpg',
+      },
+      {
+        id: '4',
+        title: 'Slide 4',
+        description: 'Description 4',
+        image: 'image4.jpg',
+      },
+      {
+        id: '5',
+        title: 'Slide 5',
+        description: 'Description 5',
+        image: 'image5.jpg',
+      },
+      {
+        id: '6',
+        title: 'Slide 6',
+        description: 'Description 6',
+        image: 'image6.jpg',
+      },
+    ];
+
+    const { container } = render(<Carousel slides={manySlides} />);
+
+    const visibleSlides = container.querySelectorAll('.mm-carousel-slide');
+    expect(visibleSlides).toHaveLength(5);
+  });
+});
diff --git a/ui/components/multichain/carousel/carousel.tsx b/ui/components/multichain/carousel/carousel.tsx
new file mode 100644
index 000000000000..3fbbe955a8eb
--- /dev/null
+++ b/ui/components/multichain/carousel/carousel.tsx
@@ -0,0 +1,201 @@
+import React, { useState } from 'react';
+import { Carousel as ResponsiveCarousel } from 'react-responsive-carousel';
+import { useI18nContext } from '../../../hooks/useI18nContext';
+import { Box, BoxProps, BannerBase } from '../../component-library';
+import {
+  TextAlign,
+  AlignItems,
+  TextVariant,
+  FontWeight,
+  BorderColor,
+} from '../../../helpers/constants/design-system';
+import type { CarouselProps } from './carousel.types';
+import { BANNER_STYLES, MAX_SLIDES } from './constants';
+import {
+  getCenterSlidePercentage,
+  getSlideMargin,
+  getSlideWidth,
+} from './helpers';
+
+export const Carousel = React.forwardRef(
+  (
+    {
+      slides = [],
+      isLoading = false,
+      onClose,
+      onClick,
+      ...props
+    }: CarouselProps,
+    ref: React.Ref<HTMLDivElement>,
+  ) => {
+    const [selectedIndex, setSelectedIndex] = useState(0);
+    const t = useI18nContext();
+
+    const visibleSlides = slides
+      .filter((slide) => !slide.dismissed || slide.undismissable)
+      .sort((a, b) => {
+        if (a.undismissable && !b.undismissable) {
+          return -1;
+        }
+        if (!a.undismissable && b.undismissable) {
+          return 1;
+        }
+        return 0;
+      })
+      .slice(0, MAX_SLIDES);
+
+    const handleClose = (e: React.MouseEvent<HTMLElement>, slideId: string) => {
+      e.preventDefault();
+      e.stopPropagation();
+
+      const currentSlideIndex = visibleSlides.findIndex(
+        (slide) => slide.id === slideId,
+      );
+
+      let newSelectedIndex = selectedIndex;
+      if (
+        currentSlideIndex === visibleSlides.length - 1 &&
+        visibleSlides.length > 1
+      ) {
+        newSelectedIndex = currentSlideIndex - 1;
+      } else if (currentSlideIndex < selectedIndex) {
+        newSelectedIndex = selectedIndex - 1;
+      }
+
+      setSelectedIndex(newSelectedIndex);
+
+      if (onClose) {
+        onClose(slideId);
+      }
+    };
+
+    const handleChange = (index: number) => {
+      setSelectedIndex(index);
+    };
+
+    if (isLoading) {
+      return (
+        <Box className="mm-carousel" ref={ref} {...(props as BoxProps<'div'>)}>
+          <ResponsiveCarousel
+            showArrows={false}
+            className="mm-carousel__carousel mm-carousel__loading"
+            showStatus={false}
+            autoPlay={false}
+            swipeScrollTolerance={5}
+            centerSlidePercentage={getCenterSlidePercentage(3)}
+            axis={'horizontal'}
+            preventMovementUntilSwipeScrollTolerance
+            emulateTouch
+            centerMode
+            swipeable={false}
+          >
+            {[...Array(3)].map((_, index) => (
+              <BannerBase
+                key={`skeleton-${index}`}
+                className="mm-carousel-slide"
+                textAlign={TextAlign.Left}
+                alignItems={AlignItems.center}
+                borderColor={BorderColor.borderMuted}
+                paddingLeft={0}
+                paddingRight={0}
+                style={{
+                  height: BANNER_STYLES.HEIGHT,
+                  margin: getSlideMargin(index, 3),
+                  width: getSlideWidth(index, 3),
+                }}
+              />
+            ))}
+          </ResponsiveCarousel>
+        </Box>
+      );
+    }
+
+    if (visibleSlides.length === 0) {
+      return null;
+    }
+
+    return (
+      <Box
+        className={`mm-carousel ${
+          visibleSlides.length === 1 ? 'mm-carousel--single-slide' : ''
+        }`}
+        ref={ref}
+        {...(props as BoxProps<'div'>)}
+      >
+        <ResponsiveCarousel
+          selectedItem={selectedIndex}
+          showArrows={false}
+          onClickItem={(index) => handleChange(index)}
+          onChange={(index) => handleChange(index)}
+          className="mm-carousel__carousel"
+          showStatus={false}
+          autoPlay={false}
+          showThumbs={false}
+          swipeScrollTolerance={5}
+          swipeable={visibleSlides.length > 1}
+          centerSlidePercentage={getCenterSlidePercentage(visibleSlides.length)}
+          axis="horizontal"
+          preventMovementUntilSwipeScrollTolerance
+          emulateTouch
+          centerMode
+        >
+          {visibleSlides.map((slide, index) => (
+            <BannerBase
+              data-testid={`slide-${slide.id}`}
+              onClick={() => {
+                if (index !== selectedIndex) {
+                  return;
+                }
+                if (slide.href) {
+                  global.platform.openTab({ url: slide.href });
+                }
+                onClick?.(slide.id);
+              }}
+              key={slide.id}
+              className="mm-carousel-slide"
+              startAccessory={
+                <img
+                  className="mm-carousel-slide__accessory"
+                  src={slide.image}
+                />
+              }
+              textAlign={TextAlign.Left}
+              alignItems={AlignItems.center}
+              title={t(slide.title)}
+              description={t(slide.description)}
+              titleProps={{
+                variant: TextVariant.bodySmMedium,
+                fontWeight: FontWeight.Medium,
+                marginLeft: 2,
+              }}
+              borderColor={BorderColor.borderMuted}
+              descriptionProps={{
+                variant: TextVariant.bodyXs,
+                fontWeight: FontWeight.Normal,
+                marginLeft: 2,
+              }}
+              onClose={
+                Boolean(handleClose) && !slide.undismissable
+                  ? (e: React.MouseEvent<HTMLElement>) =>
+                      handleClose(e, slide.id)
+                  : undefined
+              }
+              closeButtonProps={{
+                className: 'mm-carousel-slide__close-button',
+              }}
+              style={{
+                height: BANNER_STYLES.HEIGHT,
+                margin: getSlideMargin(index, visibleSlides.length),
+                width: getSlideWidth(index, visibleSlides.length),
+                position: 'relative',
+              }}
+              padding={0}
+              paddingLeft={3}
+              paddingRight={3}
+            />
+          ))}
+        </ResponsiveCarousel>
+      </Box>
+    );
+  },
+);
diff --git a/ui/components/multichain/carousel/carousel.types.ts b/ui/components/multichain/carousel/carousel.types.ts
new file mode 100644
index 000000000000..a8aef8df4839
--- /dev/null
+++ b/ui/components/multichain/carousel/carousel.types.ts
@@ -0,0 +1,8 @@
+import { CarouselSlide } from '../../../../shared/constants/app-state';
+
+export type CarouselProps = {
+  slides: CarouselSlide[];
+  isLoading?: boolean;
+  onClose?: (id: string) => void;
+  onClick?: (id: string) => void;
+};
diff --git a/ui/components/multichain/carousel/constants.ts b/ui/components/multichain/carousel/constants.ts
new file mode 100644
index 000000000000..9a33c53a34e7
--- /dev/null
+++ b/ui/components/multichain/carousel/constants.ts
@@ -0,0 +1,18 @@
+export const MARGIN_VALUES = {
+  SLIDE_BOTTOM: '40px',
+  CONTAINER_SIDE: '16px',
+  SLIDE_GAP: '2%',
+  ZERO: '0',
+};
+
+export const WIDTH_VALUES = {
+  FULL_WIDTH: '100%',
+  STANDARD_SLIDE: '98%',
+  FIRST_SLIDE: '94%',
+};
+
+export const BANNER_STYLES = {
+  HEIGHT: '59px',
+};
+
+export const MAX_SLIDES = 5;
diff --git a/ui/components/multichain/carousel/helpers.ts b/ui/components/multichain/carousel/helpers.ts
new file mode 100644
index 000000000000..4bb5ab13fe6f
--- /dev/null
+++ b/ui/components/multichain/carousel/helpers.ts
@@ -0,0 +1,30 @@
+import { MARGIN_VALUES, WIDTH_VALUES } from './constants';
+
+export function getSlideMargin(index: number, totalSlides: number) {
+  // Single slide case
+  if (totalSlides === 1) {
+    return `${MARGIN_VALUES.ZERO} ${MARGIN_VALUES.CONTAINER_SIDE}`;
+  }
+
+  // Three or more slides case
+  if (index === 0) {
+    return `${MARGIN_VALUES.ZERO} ${MARGIN_VALUES.ZERO} ${MARGIN_VALUES.SLIDE_BOTTOM} ${MARGIN_VALUES.CONTAINER_SIDE}`;
+  }
+  return `${MARGIN_VALUES.ZERO} ${MARGIN_VALUES.ZERO} ${MARGIN_VALUES.SLIDE_BOTTOM} ${MARGIN_VALUES.ZERO}`;
+}
+
+export function getSlideWidth(index: number, totalSlides: number) {
+  if (totalSlides === 1) {
+    return `calc(${WIDTH_VALUES.FULL_WIDTH} - 32px)`;
+  }
+
+  if (index === 0) {
+    return `calc(${WIDTH_VALUES.STANDARD_SLIDE} - ${MARGIN_VALUES.CONTAINER_SIDE})`;
+  }
+
+  return WIDTH_VALUES.STANDARD_SLIDE;
+}
+
+export function getCenterSlidePercentage(totalSlides: number) {
+  return totalSlides === 1 ? 100 : 90;
+}
diff --git a/ui/components/multichain/carousel/index.scss b/ui/components/multichain/carousel/index.scss
new file mode 100644
index 000000000000..6d940e5e1748
--- /dev/null
+++ b/ui/components/multichain/carousel/index.scss
@@ -0,0 +1,71 @@
+.mm-carousel {
+  height: 100px;
+}
+
+.mm-carousel--single-slide {
+  height: 70px;
+
+  .control-dots {
+    display: none !important;
+  }
+}
+
+.mm-carousel-slide {
+  position: relative;
+  cursor: pointer;
+
+  /* !important needed to override react-responsive-carousel default padding */
+  padding: 0 !important;
+  background-color: var(--color-background-muted);
+
+  &:hover {
+    background-color: var(--color-background-muted-hover);
+  }
+
+  &:active,
+  &.active {
+    background-color: var(--color-background-muted-pressed);
+  }
+}
+
+.mm-carousel__loading {
+  cursor: default;
+}
+
+.mm-carousel-slide__accessory {
+  background-size: cover;
+  background-position: center;
+  height: 100%;
+
+  /* !important needed to override react-responsive-carousel default width */
+  width: 60px !important;
+}
+
+.mm-carousel-slide__close-button {
+  position: absolute;
+  top: 8px;
+  right: 6px;
+}
+
+.control-dots {
+  display: flex;
+  flex-direction: row;
+  justify-content: center;
+  height: 40px;
+  align-items: center;
+  gap: 8px;
+
+  /* !important needed to override react-responsive-carousel default margin */
+  margin: 0 !important;
+}
+
+.dot {
+  /* !important rules needed to override react-responsive-carousel default styles */
+  margin: 0 !important;
+  background: var(--color-icon-muted) !important;
+  box-shadow: none !important;
+
+  &.selected {
+    background: var(--color-icon-default) !important;
+  }
+}
diff --git a/ui/components/multichain/carousel/index.ts b/ui/components/multichain/carousel/index.ts
new file mode 100644
index 000000000000..46b782e954fc
--- /dev/null
+++ b/ui/components/multichain/carousel/index.ts
@@ -0,0 +1 @@
+export { Carousel } from './carousel';
diff --git a/ui/components/multichain/index.js b/ui/components/multichain/index.js
index 10b0a61b3eef..04b917160799 100644
--- a/ui/components/multichain/index.js
+++ b/ui/components/multichain/index.js
@@ -50,3 +50,4 @@ export { PermissionDetailsModal } from './permission-details-modal';
 export { ReceiveModal } from './receive-modal';
 export { EditNetworksModal } from './edit-networks-modal';
 export { EditAccountsModal } from './edit-accounts-modal';
+export { Carousel } from './carousel';
diff --git a/ui/components/multichain/multichain-components.scss b/ui/components/multichain/multichain-components.scss
index bf3191c7e994..514ad89eb9f1 100644
--- a/ui/components/multichain/multichain-components.scss
+++ b/ui/components/multichain/multichain-components.scss
@@ -25,6 +25,7 @@
 @import 'network-list-item';
 @import 'network-list-item-menu';
 @import 'network-list-menu';
+@import 'carousel';
 @import 'network-list-menu/add-rpc-url-modal';
 @import 'network-list-menu/add-block-explorer-modal';
 @import 'network-list-menu/select-rpc-url-modal';
diff --git a/ui/components/multichain/network-list-menu/__snapshots__/network-list-menu.test.js.snap b/ui/components/multichain/network-list-menu/__snapshots__/network-list-menu.test.js.snap
index 095c2c16509d..fc4aa996b915 100644
--- a/ui/components/multichain/network-list-menu/__snapshots__/network-list-menu.test.js.snap
+++ b/ui/components/multichain/network-list-menu/__snapshots__/network-list-menu.test.js.snap
@@ -619,7 +619,7 @@ exports[`NetworkListMenu renders properly 1`] = `
                     style="display: flex; width: 52px; align-items: center; justify-content: flex-start; position: relative; cursor: pointer; background-color: transparent; border: 0px; padding: 0px; user-select: none;"
                   >
                     <div
-                      style="width: 40px; height: 24px; padding: 0px; border-radius: 26px; display: flex; align-items: center; justify-content: center; background-color: rgb(132, 140, 150);"
+                      style="width: 40px; height: 24px; padding: 0px; border-radius: 26px; display: flex; align-items: center; justify-content: center; background-color: rgb(106, 115, 125);"
                     >
                       <div
                         style="font-size: 11px; display: flex; align-items: center; justify-content: center; font-family: 'Helvetica Neue', Helvetica, sans-serif; position: relative; color: rgb(250, 250, 250); margin-top: auto; margin-bottom: auto; line-height: 0; opacity: 0; width: 26px; height: 20px; left: 4px;"
diff --git a/ui/pages/settings/advanced-tab/__snapshots__/advanced-tab.component.test.js.snap b/ui/pages/settings/advanced-tab/__snapshots__/advanced-tab.component.test.js.snap
index 1bbfe6d81743..5b6825dc1533 100644
--- a/ui/pages/settings/advanced-tab/__snapshots__/advanced-tab.component.test.js.snap
+++ b/ui/pages/settings/advanced-tab/__snapshots__/advanced-tab.component.test.js.snap
@@ -173,7 +173,7 @@ exports[`AdvancedTab Component should match snapshot 1`] = `
             style="display: flex; width: 52px; align-items: center; justify-content: flex-start; position: relative; cursor: pointer; background-color: transparent; border: 0px; padding: 0px; user-select: none;"
           >
             <div
-              style="width: 40px; height: 24px; padding: 0px; border-radius: 26px; display: flex; align-items: center; justify-content: center; background-color: rgb(132, 140, 150);"
+              style="width: 40px; height: 24px; padding: 0px; border-radius: 26px; display: flex; align-items: center; justify-content: center; background-color: rgb(106, 115, 125);"
             >
               <div
                 style="font-size: 11px; display: flex; align-items: center; justify-content: center; font-family: 'Helvetica Neue', Helvetica, sans-serif; position: relative; color: rgb(250, 250, 250); margin-top: auto; margin-bottom: auto; line-height: 0; opacity: 0; width: 26px; height: 20px; left: 4px;"
@@ -239,7 +239,7 @@ exports[`AdvancedTab Component should match snapshot 1`] = `
             style="display: flex; width: 52px; align-items: center; justify-content: flex-start; position: relative; cursor: pointer; background-color: transparent; border: 0px; padding: 0px; user-select: none;"
           >
             <div
-              style="width: 40px; height: 24px; padding: 0px; border-radius: 26px; display: flex; align-items: center; justify-content: center; background-color: rgb(132, 140, 150);"
+              style="width: 40px; height: 24px; padding: 0px; border-radius: 26px; display: flex; align-items: center; justify-content: center; background-color: rgb(106, 115, 125);"
             >
               <div
                 style="font-size: 11px; display: flex; align-items: center; justify-content: center; font-family: 'Helvetica Neue', Helvetica, sans-serif; position: relative; color: rgb(250, 250, 250); margin-top: auto; margin-bottom: auto; line-height: 0; opacity: 0; width: 26px; height: 20px; left: 4px;"
@@ -371,7 +371,7 @@ exports[`AdvancedTab Component should match snapshot 1`] = `
             style="display: flex; width: 52px; align-items: center; justify-content: flex-start; position: relative; cursor: pointer; background-color: transparent; border: 0px; padding: 0px; user-select: none;"
           >
             <div
-              style="width: 40px; height: 24px; padding: 0px; border-radius: 26px; display: flex; align-items: center; justify-content: center; background-color: rgb(132, 140, 150);"
+              style="width: 40px; height: 24px; padding: 0px; border-radius: 26px; display: flex; align-items: center; justify-content: center; background-color: rgb(106, 115, 125);"
             >
               <div
                 style="font-size: 11px; display: flex; align-items: center; justify-content: center; font-family: 'Helvetica Neue', Helvetica, sans-serif; position: relative; color: rgb(250, 250, 250); margin-top: auto; margin-bottom: auto; line-height: 0; opacity: 0; width: 26px; height: 20px; left: 4px;"
@@ -437,7 +437,7 @@ exports[`AdvancedTab Component should match snapshot 1`] = `
             style="display: flex; width: 52px; align-items: center; justify-content: flex-start; position: relative; cursor: pointer; background-color: transparent; border: 0px; padding: 0px; user-select: none;"
           >
             <div
-              style="width: 40px; height: 24px; padding: 0px; border-radius: 26px; display: flex; align-items: center; justify-content: center; background-color: rgb(132, 140, 150);"
+              style="width: 40px; height: 24px; padding: 0px; border-radius: 26px; display: flex; align-items: center; justify-content: center; background-color: rgb(106, 115, 125);"
             >
               <div
                 style="font-size: 11px; display: flex; align-items: center; justify-content: center; font-family: 'Helvetica Neue', Helvetica, sans-serif; position: relative; color: rgb(250, 250, 250); margin-top: auto; margin-bottom: auto; line-height: 0; opacity: 0; width: 26px; height: 20px; left: 4px;"
@@ -585,7 +585,7 @@ exports[`AdvancedTab Component should match snapshot 1`] = `
             style="display: flex; width: 52px; align-items: center; justify-content: flex-start; position: relative; cursor: pointer; background-color: transparent; border: 0px; padding: 0px; user-select: none;"
           >
             <div
-              style="width: 40px; height: 24px; padding: 0px; border-radius: 26px; display: flex; align-items: center; justify-content: center; background-color: rgb(132, 140, 150);"
+              style="width: 40px; height: 24px; padding: 0px; border-radius: 26px; display: flex; align-items: center; justify-content: center; background-color: rgb(106, 115, 125);"
             >
               <div
                 style="font-size: 11px; display: flex; align-items: center; justify-content: center; font-family: 'Helvetica Neue', Helvetica, sans-serif; position: relative; color: rgb(250, 250, 250); margin-top: auto; margin-bottom: auto; line-height: 0; opacity: 0; width: 26px; height: 20px; left: 4px;"
diff --git a/ui/pages/settings/developer-options-tab/__snapshots__/developer-options-tab.test.tsx.snap b/ui/pages/settings/developer-options-tab/__snapshots__/developer-options-tab.test.tsx.snap
index 17899d68724f..6c1fae43d5e8 100644
--- a/ui/pages/settings/developer-options-tab/__snapshots__/developer-options-tab.test.tsx.snap
+++ b/ui/pages/settings/developer-options-tab/__snapshots__/developer-options-tab.test.tsx.snap
@@ -199,7 +199,7 @@ exports[`Develop options tab should match snapshot 1`] = `
               style="display: flex; width: 52px; align-items: center; justify-content: flex-start; position: relative; cursor: pointer; background-color: transparent; border: 0px; padding: 0px; user-select: none;"
             >
               <div
-                style="width: 40px; height: 24px; padding: 0px; border-radius: 26px; display: flex; align-items: center; justify-content: center; background-color: rgb(132, 140, 150);"
+                style="width: 40px; height: 24px; padding: 0px; border-radius: 26px; display: flex; align-items: center; justify-content: center; background-color: rgb(106, 115, 125);"
               >
                 <div
                   style="font-size: 11px; display: flex; align-items: center; justify-content: center; font-family: 'Helvetica Neue', Helvetica, sans-serif; position: relative; color: rgb(250, 250, 250); margin-top: auto; margin-bottom: auto; line-height: 0; opacity: 0; width: 26px; height: 20px; left: 4px;"
diff --git a/ui/pages/settings/security-tab/__snapshots__/security-tab.test.js.snap b/ui/pages/settings/security-tab/__snapshots__/security-tab.test.js.snap
index 43d8a4de1914..1d5b622b6b46 100644
--- a/ui/pages/settings/security-tab/__snapshots__/security-tab.test.js.snap
+++ b/ui/pages/settings/security-tab/__snapshots__/security-tab.test.js.snap
@@ -44,7 +44,7 @@ exports[`Security Tab should match snapshot 1`] = `
             style="display: flex; width: 52px; align-items: center; justify-content: flex-start; position: relative; cursor: pointer; background-color: transparent; border: 0px; padding: 0px; user-select: none;"
           >
             <div
-              style="width: 40px; height: 24px; padding: 0px; border-radius: 26px; display: flex; align-items: center; justify-content: center; background-color: rgb(132, 140, 150);"
+              style="width: 40px; height: 24px; padding: 0px; border-radius: 26px; display: flex; align-items: center; justify-content: center; background-color: rgb(106, 115, 125);"
             >
               <div
                 style="font-size: 11px; display: flex; align-items: center; justify-content: center; font-family: 'Helvetica Neue', Helvetica, sans-serif; position: relative; color: rgb(250, 250, 250); margin-top: auto; margin-bottom: auto; line-height: 0; opacity: 0; width: 26px; height: 20px; left: 4px;"
@@ -151,7 +151,7 @@ exports[`Security Tab should match snapshot 1`] = `
               style="display: flex; width: 52px; align-items: center; justify-content: flex-start; position: relative; cursor: pointer; background-color: transparent; border: 0px; padding: 0px; user-select: none;"
             >
               <div
-                style="width: 40px; height: 24px; padding: 0px; border-radius: 26px; display: flex; align-items: center; justify-content: center; background-color: rgb(132, 140, 150);"
+                style="width: 40px; height: 24px; padding: 0px; border-radius: 26px; display: flex; align-items: center; justify-content: center; background-color: rgb(106, 115, 125);"
               >
                 <div
                   style="font-size: 11px; display: flex; align-items: center; justify-content: center; font-family: 'Helvetica Neue', Helvetica, sans-serif; position: relative; color: rgb(250, 250, 250); margin-top: auto; margin-bottom: auto; line-height: 0; opacity: 0; width: 26px; height: 20px; left: 4px;"
@@ -244,7 +244,7 @@ exports[`Security Tab should match snapshot 1`] = `
                 style="display: flex; width: 52px; align-items: center; justify-content: flex-start; position: relative; cursor: pointer; background-color: transparent; border: 0px; padding: 0px; user-select: none;"
               >
                 <div
-                  style="width: 40px; height: 24px; padding: 0px; border-radius: 26px; display: flex; align-items: center; justify-content: center; background-color: rgb(132, 140, 150);"
+                  style="width: 40px; height: 24px; padding: 0px; border-radius: 26px; display: flex; align-items: center; justify-content: center; background-color: rgb(106, 115, 125);"
                 >
                   <div
                     style="font-size: 11px; display: flex; align-items: center; justify-content: center; font-family: 'Helvetica Neue', Helvetica, sans-serif; position: relative; color: rgb(250, 250, 250); margin-top: auto; margin-bottom: auto; line-height: 0; opacity: 0; width: 26px; height: 20px; left: 4px;"
@@ -686,7 +686,7 @@ exports[`Security Tab should match snapshot 1`] = `
                 style="display: flex; width: 52px; align-items: center; justify-content: flex-start; position: relative; cursor: pointer; background-color: transparent; border: 0px; padding: 0px; user-select: none;"
               >
                 <div
-                  style="width: 40px; height: 24px; padding: 0px; border-radius: 26px; display: flex; align-items: center; justify-content: center; background-color: rgb(132, 140, 150);"
+                  style="width: 40px; height: 24px; padding: 0px; border-radius: 26px; display: flex; align-items: center; justify-content: center; background-color: rgb(106, 115, 125);"
                 >
                   <div
                     style="font-size: 11px; display: flex; align-items: center; justify-content: center; font-family: 'Helvetica Neue', Helvetica, sans-serif; position: relative; color: rgb(250, 250, 250); margin-top: auto; margin-bottom: auto; line-height: 0; opacity: 0; width: 26px; height: 20px; left: 4px;"
@@ -765,7 +765,7 @@ exports[`Security Tab should match snapshot 1`] = `
               style="display: flex; width: 52px; align-items: center; justify-content: flex-start; position: relative; cursor: pointer; background-color: transparent; border: 0px; padding: 0px; user-select: none;"
             >
               <div
-                style="width: 40px; height: 24px; padding: 0px; border-radius: 26px; display: flex; align-items: center; justify-content: center; background-color: rgb(132, 140, 150);"
+                style="width: 40px; height: 24px; padding: 0px; border-radius: 26px; display: flex; align-items: center; justify-content: center; background-color: rgb(106, 115, 125);"
               >
                 <div
                   style="font-size: 11px; display: flex; align-items: center; justify-content: center; font-family: 'Helvetica Neue', Helvetica, sans-serif; position: relative; color: rgb(250, 250, 250); margin-top: auto; margin-bottom: auto; line-height: 0; opacity: 0; width: 26px; height: 20px; left: 4px;"
@@ -892,7 +892,7 @@ exports[`Security Tab should match snapshot 1`] = `
                 style="display: flex; width: 52px; align-items: center; justify-content: flex-start; position: relative; cursor: pointer; background-color: transparent; border: 0px; padding: 0px; user-select: none;"
               >
                 <div
-                  style="width: 40px; height: 24px; padding: 0px; border-radius: 26px; display: flex; align-items: center; justify-content: center; background-color: rgb(132, 140, 150);"
+                  style="width: 40px; height: 24px; padding: 0px; border-radius: 26px; display: flex; align-items: center; justify-content: center; background-color: rgb(106, 115, 125);"
                 >
                   <div
                     style="font-size: 11px; display: flex; align-items: center; justify-content: center; font-family: 'Helvetica Neue', Helvetica, sans-serif; position: relative; color: rgb(250, 250, 250); margin-top: auto; margin-bottom: auto; line-height: 0; opacity: 0; width: 26px; height: 20px; left: 4px;"
@@ -1077,7 +1077,7 @@ exports[`Security Tab should match snapshot 1`] = `
                 style="display: flex; width: 52px; align-items: center; justify-content: flex-start; position: relative; cursor: pointer; background-color: transparent; border: 0px; padding: 0px; user-select: none;"
               >
                 <div
-                  style="width: 40px; height: 24px; padding: 0px; border-radius: 26px; display: flex; align-items: center; justify-content: center; background-color: rgb(132, 140, 150);"
+                  style="width: 40px; height: 24px; padding: 0px; border-radius: 26px; display: flex; align-items: center; justify-content: center; background-color: rgb(106, 115, 125);"
                 >
                   <div
                     style="font-size: 11px; display: flex; align-items: center; justify-content: center; font-family: 'Helvetica Neue', Helvetica, sans-serif; position: relative; color: rgb(250, 250, 250); margin-top: auto; margin-bottom: auto; line-height: 0; opacity: 0; width: 26px; height: 20px; left: 4px;"
@@ -1233,7 +1233,7 @@ exports[`Security Tab should match snapshot 1`] = `
               style="display: flex; width: 52px; align-items: center; justify-content: flex-start; position: relative; cursor: pointer; background-color: transparent; border: 0px; padding: 0px; user-select: none;"
             >
               <div
-                style="width: 40px; height: 24px; padding: 0px; border-radius: 26px; display: flex; align-items: center; justify-content: center; background-color: rgb(132, 140, 150);"
+                style="width: 40px; height: 24px; padding: 0px; border-radius: 26px; display: flex; align-items: center; justify-content: center; background-color: rgb(106, 115, 125);"
               >
                 <div
                   style="font-size: 11px; display: flex; align-items: center; justify-content: center; font-family: 'Helvetica Neue', Helvetica, sans-serif; position: relative; color: rgb(250, 250, 250); margin-top: auto; margin-bottom: auto; line-height: 0; opacity: 0; width: 26px; height: 20px; left: 4px;"
@@ -1447,7 +1447,7 @@ exports[`Security Tab should match snapshot 1`] = `
                 style="display: flex; width: 52px; align-items: center; justify-content: flex-start; position: relative; cursor: pointer; background-color: transparent; border: 0px; padding: 0px; user-select: none;"
               >
                 <div
-                  style="width: 40px; height: 24px; padding: 0px; border-radius: 26px; display: flex; align-items: center; justify-content: center; background-color: rgb(132, 140, 150);"
+                  style="width: 40px; height: 24px; padding: 0px; border-radius: 26px; display: flex; align-items: center; justify-content: center; background-color: rgb(106, 115, 125);"
                 >
                   <div
                     style="font-size: 11px; display: flex; align-items: center; justify-content: center; font-family: 'Helvetica Neue', Helvetica, sans-serif; position: relative; color: rgb(250, 250, 250); margin-top: auto; margin-bottom: auto; line-height: 0; opacity: 0; width: 26px; height: 20px; left: 4px;"
@@ -1517,7 +1517,7 @@ exports[`Security Tab should match snapshot 1`] = `
               style="display: flex; width: 52px; align-items: center; justify-content: flex-start; position: relative; cursor: pointer; background-color: transparent; border: 0px; padding: 0px; user-select: none;"
             >
               <div
-                style="width: 40px; height: 24px; padding: 0px; border-radius: 26px; display: flex; align-items: center; justify-content: center; background-color: rgb(132, 140, 150);"
+                style="width: 40px; height: 24px; padding: 0px; border-radius: 26px; display: flex; align-items: center; justify-content: center; background-color: rgb(106, 115, 125);"
               >
                 <div
                   style="font-size: 11px; display: flex; align-items: center; justify-content: center; font-family: 'Helvetica Neue', Helvetica, sans-serif; position: relative; color: rgb(250, 250, 250); margin-top: auto; margin-bottom: auto; line-height: 0; opacity: 0; width: 26px; height: 20px; left: 4px;"
diff --git a/ui/selectors/selectors.js b/ui/selectors/selectors.js
index eb24d1e76350..a68ba58f3619 100644
--- a/ui/selectors/selectors.js
+++ b/ui/selectors/selectors.js
@@ -969,6 +969,10 @@ export function getQueuedRequestCount(state) {
   return state.metamask.queuedRequestCount ?? 0;
 }
 
+export function getSlides(state) {
+  return state.metamask.slides || [];
+}
+
 export function getTotalUnapprovedMessagesCount(state) {
   const {
     unapprovedPersonalMsgCount = 0,
diff --git a/ui/store/actionConstants.ts b/ui/store/actionConstants.ts
index 2e31c6c7dd7f..2d09d680c3c8 100644
--- a/ui/store/actionConstants.ts
+++ b/ui/store/actionConstants.ts
@@ -178,3 +178,4 @@ export const SET_SHOW_NFT_AUTO_DETECT_MODAL_UPGRADE =
   'SET_SHOW_NFT_AUTO_DETECT_MODAL_UPGRADE';
 
 export const TOKEN_SORT_CRITERIA = 'TOKEN_SORT_CRITERIA';
+export const SET_SLIDES = 'SET_SLIDES';
diff --git a/ui/store/actions.ts b/ui/store/actions.ts
index 3cd104ed38ff..75de201c76b7 100644
--- a/ui/store/actions.ts
+++ b/ui/store/actions.ts
@@ -921,6 +921,32 @@ export async function restoreUserData(jsonString: Json): Promise<true> {
   return true;
 }
 
+export function updateSlides(
+  slides,
+): ThunkAction<void, MetaMaskReduxState, unknown, AnyAction> {
+  return async () => {
+    try {
+      await submitRequestToBackground('updateSlides', [slides]);
+    } catch (error) {
+      logErrorWithMessage(error);
+      throw error;
+    }
+  };
+}
+
+export function removeSlide(
+  id: string,
+): ThunkAction<Promise<void>, MetaMaskReduxState, unknown, AnyAction> {
+  return async () => {
+    try {
+      await submitRequestToBackground('removeSlide', [id]);
+    } catch (error) {
+      logErrorWithMessage(error);
+      throw error;
+    }
+  };
+}
+
 // TODO: Not a thunk, but rather a wrapper around a background call
 export function updateTransactionGasFees(
   txId: string,
@@ -2856,6 +2882,13 @@ export function hideLoadingIndication(): Action {
   };
 }
 
+export function setSlides(slides): Action {
+  return {
+    type: actionConstants.SET_SLIDES,
+    slides,
+  };
+}
+
 export function hideNftStillFetchingIndication(): Action {
   return {
     type: actionConstants.HIDE_NFT_STILL_FETCHING_INDICATION,
diff --git a/yarn.lock b/yarn.lock
index 8ae140c6d516..f925a60fee76 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5068,10 +5068,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/design-tokens@npm:^4.0.0":
-  version: 4.0.0
-  resolution: "@metamask/design-tokens@npm:4.0.0"
-  checksum: 10/337968d86bf963ccdf7ab416cc8f87ec1d35d9fb56f686dea954964edd6f5cb0067a920cb2c1f9008150d3decac51cb1b392b3e67dc1d46ca308b503ffe7eabd
+"@metamask/design-tokens@npm:^4.0.0, @metamask/design-tokens@npm:^4.2.0":
+  version: 4.2.0
+  resolution: "@metamask/design-tokens@npm:4.2.0"
+  checksum: 10/aa92b20f8860a59b2b272e7a8a704d7e426a94030081c69c42b87ea81985c5d6585122def5906ce5a5751cb99f070efed77fabecc751ae0a7d84738f0e0ae522
   languageName: node
   linkType: hard
 
@@ -26421,7 +26421,7 @@ __metadata:
     "@metamask/build-utils": "npm:^3.0.0"
     "@metamask/contract-metadata": "npm:^2.5.0"
     "@metamask/controller-utils": "npm:^11.4.0"
-    "@metamask/design-tokens": "npm:^4.0.0"
+    "@metamask/design-tokens": "npm:^4.2.0"
     "@metamask/ens-controller": "npm:^15.0.0"
     "@metamask/ens-resolver-snap": "npm:^0.1.2"
     "@metamask/eslint-config": "npm:^9.0.0"

From 4f970df0acec3e3bc80da08373aa3b16f23aae41 Mon Sep 17 00:00:00 2001
From: Nick Gambino <35090461+gambinish@users.noreply.github.com>
Date: Wed, 11 Dec 2024 14:33:21 -0800
Subject: [PATCH 093/175] fix: Specify popular network icons in token network
 filter (#29112)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## **Description**

Popular Networks are now only showing data from 9 popular networks, only
show icons for those networks. Also show tooltip to specify which
networks these are.

[![Open in GitHub
Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/29112?quickstart=1)

## **Related issues**

Fixes:

## **Manual testing steps**

1. Go to this page...
2.
3.

## **Screenshots/Recordings**


https://github.com/user-attachments/assets/9787102b-f07a-4a64-b59b-194d01b105c7

## **Pre-merge author checklist**

- [x] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension Coding
Standards](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/CODING_GUIDELINES.md).
- [x] I've completed the PR template to the best of my ability
- [x] I’ve included tests if applicable
- [x] I’ve documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [x] I’ve applied the right labels on the PR (see [labeling
guidelines](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.

## **Pre-merge reviewer checklist**

- [ ] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed).
- [ ] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.
---
 .../network-filter/network-filter.tsx         | 36 ++++++++++---------
 1 file changed, 19 insertions(+), 17 deletions(-)

diff --git a/ui/components/app/assets/asset-list/network-filter/network-filter.tsx b/ui/components/app/assets/asset-list/network-filter/network-filter.tsx
index 2c50824702b1..d08d01f933ee 100644
--- a/ui/components/app/assets/asset-list/network-filter/network-filter.tsx
+++ b/ui/components/app/assets/asset-list/network-filter/network-filter.tsx
@@ -1,4 +1,4 @@
-import React, { useEffect, useState } from 'react';
+import React from 'react';
 import { useDispatch, useSelector } from 'react-redux';
 import { setTokenNetworkFilter } from '../../../../../store/actions';
 import {
@@ -32,10 +32,11 @@ import {
 import UserPreferencedCurrencyDisplay from '../../../user-preferenced-currency-display';
 import {
   CHAIN_ID_TO_NETWORK_IMAGE_URL_MAP,
-  TEST_CHAINS,
+  FEATURED_NETWORK_CHAIN_IDS,
 } from '../../../../../../shared/constants/network';
 import { useGetFormattedTokensPerChain } from '../../../../../hooks/useGetFormattedTokensPerChain';
 import { useAccountTotalCrossChainFiatBalance } from '../../../../../hooks/useAccountTotalCrossChainFiatBalance';
+import InfoTooltip from '../../../../ui/info-tooltip';
 
 type SortControlProps = {
   handleClose: () => void;
@@ -48,7 +49,6 @@ const NetworkFilter = ({ handleClose }: SortControlProps) => {
   const currentNetwork = useSelector(getCurrentNetwork);
   const selectedAccount = useSelector(getSelectedAccount);
   const allNetworks = useSelector(getNetworkConfigurationsByChainId);
-  const [chainsToShow, setChainsToShow] = useState<string[]>([]);
   const tokenNetworkFilter = useSelector(getTokenNetworkFilter);
   const isTokenNetworkFilterEqualCurrentNetwork = useSelector(
     getIsTokenNetworkFilterEqualCurrentNetwork,
@@ -90,19 +90,17 @@ const NetworkFilter = ({ handleClose }: SortControlProps) => {
     handleClose();
   };
 
-  useEffect(() => {
-    const testnetChains: string[] = TEST_CHAINS;
-    const mainnetChainIds = Object.keys(allNetworks || {}).filter(
-      (chain) => !testnetChains.includes(chain),
-    );
-    setChainsToShow(mainnetChainIds);
-  }, []);
-
   const allOpts: Record<string, boolean> = {};
   Object.keys(allNetworks || {}).forEach((chain) => {
     allOpts[chain] = true;
   });
 
+  const allAddedPopularNetworks = FEATURED_NETWORK_CHAIN_IDS.filter(
+    (chain) => allOpts[chain],
+  ).map((chain) => {
+    return allNetworks[chain].name;
+  });
+
   return (
     <>
       <SelectableListItem
@@ -139,17 +137,20 @@ const NetworkFilter = ({ handleClose }: SortControlProps) => {
             </Text>
           </Box>
           <Box display={Display.Flex} alignItems={AlignItems.center}>
-            {chainsToShow
-              .slice(0, 5) // only show a max of 5 icons overlapping
-              .map((chain, index) => {
+            <InfoTooltip
+              position="bottom"
+              contentText={allAddedPopularNetworks.join(', ')}
+            />
+            {FEATURED_NETWORK_CHAIN_IDS.filter((chain) => allOpts[chain]).map(
+              (chain, index) => {
                 const networkImageUrl =
                   CHAIN_ID_TO_NETWORK_IMAGE_URL_MAP[
                     chain as keyof typeof CHAIN_ID_TO_NETWORK_IMAGE_URL_MAP
                   ];
                 return (
                   <AvatarNetwork
-                    key={chainId}
-                    name="All"
+                    key={networkImageUrl}
+                    name={networkImageUrl}
                     src={networkImageUrl ?? undefined}
                     size={AvatarNetworkSize.Sm}
                     // overlap the icons
@@ -159,7 +160,8 @@ const NetworkFilter = ({ handleClose }: SortControlProps) => {
                     }}
                   />
                 );
-              })}
+              },
+            )}
           </Box>
         </Box>
       </SelectableListItem>

From 7ac49996258d26b508e96137067e3780bb77766d Mon Sep 17 00:00:00 2001
From: micaelae <100321200+micaelae@users.noreply.github.com>
Date: Wed, 11 Dec 2024 15:34:22 -0800
Subject: [PATCH 094/175] chore: add autofocus prop to AssetPicker (#29118)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<!--
Please submit this PR as a draft initially.
Do not mark it as "Ready for review" until the template has been
completely filled out, and PR status checks have passed at least once.
-->

## **Description**

Adds an autofocus prop to the AssetPicker, which sets the focus of the
Search bar when the asset-picker is open

<!--
Write a short description of the changes included in this pull request,
also include relevant motivation and context. Have in mind the following
questions:
1. What is the reason for the change?
2. What is the improvement/solution?
-->

[![Open in GitHub
Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/29118?quickstart=1)

## **Related issues**

Fixes: N/A

## **Manual testing steps**

There should be no changes to the Send page, the only experience that
uses this component

## **Screenshots/Recordings**

<!-- If applicable, add screenshots and/or recordings to visualize the
before and after of your change. -->

### **Before**

N/A

### **After**

N/A

## **Pre-merge author checklist**

- [X] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension Coding
Standards](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/CODING_GUIDELINES.md).
- [X] I've completed the PR template to the best of my ability
- [X] I’ve included tests if applicable
- [X] I’ve documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [X] I’ve applied the right labels on the PR (see [labeling
guidelines](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.

## **Pre-merge reviewer checklist**

- [ ] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed).
- [ ] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.
---
 .../asset-picker-modal/asset-picker-modal.test.tsx            | 1 +
 .../asset-picker-modal/asset-picker-modal.tsx                 | 4 +++-
 .../asset-picker-amount/asset-picker/asset-picker.tsx         | 3 +++
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/ui/components/multichain/asset-picker-amount/asset-picker-modal/asset-picker-modal.test.tsx b/ui/components/multichain/asset-picker-amount/asset-picker-modal/asset-picker-modal.test.tsx
index 724cba8a1ec6..8fb933ed2fbb 100644
--- a/ui/components/multichain/asset-picker-amount/asset-picker-modal/asset-picker-modal.test.tsx
+++ b/ui/components/multichain/asset-picker-amount/asset-picker-modal/asset-picker-modal.test.tsx
@@ -92,6 +92,7 @@ describe('AssetPickerModal', () => {
       image: 'image.png',
       symbol: 'SYMB',
     },
+    autoFocus: true,
   };
 
   beforeEach(() => {
diff --git a/ui/components/multichain/asset-picker-amount/asset-picker-modal/asset-picker-modal.tsx b/ui/components/multichain/asset-picker-amount/asset-picker-modal/asset-picker-modal.tsx
index d0b9b32988df..b8bf0a70d7f5 100644
--- a/ui/components/multichain/asset-picker-amount/asset-picker-modal/asset-picker-modal.tsx
+++ b/ui/components/multichain/asset-picker-amount/asset-picker-modal/asset-picker-modal.tsx
@@ -102,6 +102,7 @@ type AssetPickerModalProps = {
     AssetWithDisplayData<NativeAsset> | AssetWithDisplayData<ERC20Asset>
   >;
   isTokenListLoading?: boolean;
+  autoFocus: boolean;
 } & Pick<
   React.ComponentProps<typeof AssetPickerModalTabs>,
   'visibleTabs' | 'defaultActiveTabKey'
@@ -129,6 +130,7 @@ export function AssetPickerModal({
   isTokenListLoading = false,
   isMultiselectEnabled,
   selectedChainIds,
+  autoFocus,
   ...tabProps
 }: AssetPickerModalProps) {
   const t = useI18nContext();
@@ -477,7 +479,7 @@ export function AssetPickerModal({
               <Search
                 searchQuery={searchQuery}
                 onChange={(value) => setSearchQuery(value)}
-                autoFocus={!isMultiselectEnabled}
+                autoFocus={autoFocus}
               />
               <AssetList
                 network={network}
diff --git a/ui/components/multichain/asset-picker-amount/asset-picker/asset-picker.tsx b/ui/components/multichain/asset-picker-amount/asset-picker/asset-picker.tsx
index 1388a8bf5b92..3fbec8d6c910 100644
--- a/ui/components/multichain/asset-picker-amount/asset-picker/asset-picker.tsx
+++ b/ui/components/multichain/asset-picker-amount/asset-picker/asset-picker.tsx
@@ -73,6 +73,7 @@ export type AssetPickerProps = {
   isDisabled?: boolean;
   action?: 'send' | 'receive';
   isMultiselectEnabled?: boolean;
+  autoFocus?: boolean;
   networkProps?: Pick<
     React.ComponentProps<typeof AssetPickerModalNetwork>,
     | 'network'
@@ -105,6 +106,7 @@ export function AssetPicker({
   customTokenListGenerator,
   isTokenListLoading = false,
   isMultiselectEnabled = false,
+  autoFocus = true,
 }: AssetPickerProps) {
   ///: BEGIN:ONLY_INCLUDE_IF(build-main,build-beta,build-flask)
   const t = useI18nContext();
@@ -248,6 +250,7 @@ export function AssetPicker({
         }
         customTokenListGenerator={customTokenListGenerator}
         isTokenListLoading={isTokenListLoading}
+        autoFocus={autoFocus}
       />
 
       {/** If a child prop is passed in, use it as the trigger button instead of the default */}

From 0a790f54a0531fc36c38dbd75607b00b395b9f52 Mon Sep 17 00:00:00 2001
From: hunty <ghgoodreau@protonmail.com>
Date: Wed, 11 Dec 2024 20:58:08 -0600
Subject: [PATCH 095/175] fix: (MMS-1789) bridge api called when external
 services disabled (#29077)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<!--
Please submit this PR as a draft initially.
Do not mark it as "Ready for review" until the template has been
completely filled out, and PR status checks have passed at least once.
-->

## **Description**

<!--
Write a short description of the changes included in this pull request,
also include relevant motivation and context. Have in mind the following
questions:
1. What is the reason for the change?
2. What is the improvement/solution?
-->

Bridge API gets called even when all privacy toggles are disabled:

https://bridge.api.cx.metamask.io/getAllFeatureFlags

[![Open in GitHub
Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/29077?quickstart=1)

## **Related issues**

Fixes: checks if external services are enabled (Basic Functionality
toggle) before calling this API in the useBridging hook.

## **Manual testing steps**

1. Start onboarding through the MetaMask wallet.
2. During onboarding, toggle the security feature 'Basic Functionality'
OFF.
3. Observe network calls to ensure this endpoint is not hit.

## **Screenshots/Recordings**

<!-- If applicable, add screenshots and/or recordings to visualize the
before and after of your change. -->

### **Before**

<!-- [screenshots/recordings] -->

### **After**

<!-- [screenshots/recordings] -->

## **Pre-merge author checklist**

- [x] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension Coding
Standards](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/CODING_GUIDELINES.md).
- [x] I've completed the PR template to the best of my ability
- [ ] I’ve included tests if applicable
- [ ] I’ve documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [ ] I’ve applied the right labels on the PR (see [labeling
guidelines](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.

## **Pre-merge reviewer checklist**

- [ ] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed).
- [ ] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.
---
 ui/hooks/bridge/useBridging.ts | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/ui/hooks/bridge/useBridging.ts b/ui/hooks/bridge/useBridging.ts
index a8307658e285..2b7ffb0083c9 100644
--- a/ui/hooks/bridge/useBridging.ts
+++ b/ui/hooks/bridge/useBridging.ts
@@ -10,6 +10,7 @@ import {
   getIsBridgeEnabled,
   getMetaMetricsId,
   getParticipateInMetaMetrics,
+  getUseExternalServices,
   SwapsEthToken,
   ///: END:ONLY_INCLUDE_IF
 } from '../../selectors';
@@ -45,6 +46,7 @@ const useBridging = () => {
   const isMarketingEnabled = useSelector(getDataCollectionForMarketing);
   const providerConfig = useSelector(getProviderConfig);
   const keyring = useSelector(getCurrentKeyring);
+  const isExternalServicesEnabled = useSelector(getUseExternalServices);
   // @ts-expect-error keyring type is wrong maybe?
   const usingHardwareWallet = isHardwareKeyring(keyring.type);
 
@@ -52,7 +54,9 @@ const useBridging = () => {
   const isBridgeChain = useSelector(getIsBridgeChain);
 
   useEffect(() => {
-    dispatch(setBridgeFeatureFlags());
+    if (isExternalServicesEnabled) {
+      dispatch(setBridgeFeatureFlags());
+    }
   }, [dispatch, setBridgeFeatureFlags]);
 
   const openBridgeExperience = useCallback(

From 1e3af312f6e7866468acd02208569a5e323bbe5a Mon Sep 17 00:00:00 2001
From: Dan J Miller <danjm.com@gmail.com>
Date: Thu, 12 Dec 2024 06:55:04 -0330
Subject: [PATCH 096/175] chore: Revert "feat: add websocket support for c2
 detection (#28782)" (#29122)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit e0f6575a6dc80913532f33202b1d3e91b31137b4, which is
causing failing e2e tests on main


<!--
Please submit this PR as a draft initially.
Do not mark it as "Ready for review" until the template has been
completely filled out, and PR status checks have passed at least once.
-->

## **Description**

<!--
Write a short description of the changes included in this pull request,
also include relevant motivation and context. Have in mind the following
questions:
1. What is the reason for the change?
2. What is the improvement/solution?
-->

[![Open in GitHub
Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/29122?quickstart=1)

## **Related issues**

Fixes:

## **Manual testing steps**

1. Go to this page...
2.
3.

## **Screenshots/Recordings**

<!-- If applicable, add screenshots and/or recordings to visualize the
before and after of your change. -->

### **Before**

<!-- [screenshots/recordings] -->

### **After**

<!-- [screenshots/recordings] -->

## **Pre-merge author checklist**

- [ ] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension Coding
Standards](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/CODING_GUIDELINES.md).
- [ ] I've completed the PR template to the best of my ability
- [ ] I’ve included tests if applicable
- [ ] I’ve documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [ ] I’ve applied the right labels on the PR (see [labeling
guidelines](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.

## **Pre-merge reviewer checklist**

- [ ] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed).
- [ ] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.
---
 app/manifest/v2/_base.json                    |  2 -
 app/manifest/v3/_base.json                    |  4 +-
 app/scripts/background.js                     |  2 +-
 privacy-snapshot.json                         |  3 +-
 test/e2e/helpers.js                           | 44 -----------
 test/e2e/tests/phishing-controller/mocks.js   | 19 ++---
 .../phishing-detection.spec.js                | 76 +------------------
 7 files changed, 14 insertions(+), 136 deletions(-)

diff --git a/app/manifest/v2/_base.json b/app/manifest/v2/_base.json
index 2f41a7e987fa..f29b7458a9e5 100644
--- a/app/manifest/v2/_base.json
+++ b/app/manifest/v2/_base.json
@@ -66,8 +66,6 @@
     "clipboardWrite",
     "http://*/*",
     "https://*/*",
-    "ws://*/*",
-    "wss://*/*",
     "activeTab",
     "webRequest",
     "webRequestBlocking",
diff --git a/app/manifest/v3/_base.json b/app/manifest/v3/_base.json
index 89758033f33a..4d6ee38437d3 100644
--- a/app/manifest/v3/_base.json
+++ b/app/manifest/v3/_base.json
@@ -50,9 +50,7 @@
     "http://localhost:8545/",
     "file://*/*",
     "http://*/*",
-    "https://*/*",
-    "ws://*/*",
-    "wss://*/*"
+    "https://*/*"
   ],
   "icons": {
     "16": "images/icon-16.png",
diff --git a/app/scripts/background.js b/app/scripts/background.js
index 3571be9022fa..e9aaf2cab20b 100644
--- a/app/scripts/background.js
+++ b/app/scripts/background.js
@@ -323,7 +323,7 @@ function maybeDetectPhishing(theController) {
       return {};
     },
     {
-      urls: ['http://*/*', 'https://*/*', 'ws://*/*', 'wss://*/*'],
+      urls: ['http://*/*', 'https://*/*'],
     },
     isManifestV2 ? ['blocking'] : [],
   );
diff --git a/privacy-snapshot.json b/privacy-snapshot.json
index 230634421d52..49eedf275364 100644
--- a/privacy-snapshot.json
+++ b/privacy-snapshot.json
@@ -72,6 +72,5 @@
   "unresponsive-rpc.test",
   "unresponsive-rpc.url",
   "user-storage.api.cx.metamask.io",
-  "www.4byte.directory",
-  "verify.walletconnect.com"
+  "www.4byte.directory"
 ]
diff --git a/test/e2e/helpers.js b/test/e2e/helpers.js
index 4ade3f2e48ba..b06c29b17acf 100644
--- a/test/e2e/helpers.js
+++ b/test/e2e/helpers.js
@@ -4,7 +4,6 @@ const BigNumber = require('bignumber.js');
 const mockttp = require('mockttp');
 const detectPort = require('detect-port');
 const { difference } = require('lodash');
-const WebSocket = require('ws');
 const createStaticServer = require('../../development/create-static-server');
 const { setupMocking } = require('./mock-e2e');
 const { Ganache } = require('./seeder/ganache');
@@ -641,48 +640,6 @@ async function unlockWallet(
   }
 }
 
-/**
- * Simulates a WebSocket connection by executing a script in the browser context.
- *
- * @param {WebDriver} driver - The WebDriver instance.
- * @param {string} hostname - The hostname to connect to.
- */
-async function createWebSocketConnection(driver, hostname) {
-  try {
-    await driver.executeScript(async (wsHostname) => {
-      const url = `ws://${wsHostname}:8000`;
-
-      const socket = new WebSocket(url);
-
-      socket.onopen = () => {
-        console.log('WebSocket connection opened');
-        socket.send('Hello, server!');
-      };
-
-      socket.onerror = (error) => {
-        console.error(
-          'WebSocket error:',
-          error.message || 'Connection blocked',
-        );
-      };
-
-      socket.onmessage = (event) => {
-        console.log('Message received from server:', event.data);
-      };
-
-      socket.onclose = () => {
-        console.log('WebSocket connection closed');
-      };
-    }, hostname);
-  } catch (error) {
-    console.error(
-      `Failed to execute WebSocket connection script for ws://${hostname}:8081`,
-      error,
-    );
-    throw error;
-  }
-}
-
 const logInWithBalanceValidation = async (driver, ganacheServer) => {
   await unlockWallet(driver);
   // Wait for balance to load
@@ -1018,5 +975,4 @@ module.exports = {
   tempToggleSettingRedesignedTransactionConfirmations,
   openMenuSafe,
   sentryRegEx,
-  createWebSocketConnection,
 };
diff --git a/test/e2e/tests/phishing-controller/mocks.js b/test/e2e/tests/phishing-controller/mocks.js
index 3165847740bf..fe11118c6fd2 100644
--- a/test/e2e/tests/phishing-controller/mocks.js
+++ b/test/e2e/tests/phishing-controller/mocks.js
@@ -10,9 +10,7 @@ const {
 const lastUpdated = 1;
 const defaultHotlist = { data: [] };
 const defaultC2DomainBlocklist = {
-  recentlyAdded: [
-    '33c8e026e76cea2df82322428554c932961cd80080fa379454350d7f13371f36', // hash for malicious.localhost
-  ],
+  recentlyAdded: [],
   recentlyRemoved: [],
   lastFetchedAt: '2024-08-27T15:30:45Z',
 };
@@ -97,12 +95,15 @@ async function setupPhishingDetectionMocks(
       };
     });
 
-  await mockServer.forGet(C2_DOMAIN_BLOCKLIST_URL).thenCallback(() => {
-    return {
-      statusCode: 200,
-      json: defaultC2DomainBlocklist,
-    };
-  });
+  await mockServer
+    .forGet(C2_DOMAIN_BLOCKLIST_URL)
+    .withQuery({ timestamp: '2024-08-27T15:30:45Z' })
+    .thenCallback(() => {
+      return {
+        statusCode: 200,
+        json: defaultC2DomainBlocklist,
+      };
+    });
 
   await mockServer
     .forGet('https://github.com/MetaMask/eth-phishing-detect/issues/new')
diff --git a/test/e2e/tests/phishing-controller/phishing-detection.spec.js b/test/e2e/tests/phishing-controller/phishing-detection.spec.js
index 98184b85224e..ad199cea1e70 100644
--- a/test/e2e/tests/phishing-controller/phishing-detection.spec.js
+++ b/test/e2e/tests/phishing-controller/phishing-detection.spec.js
@@ -2,13 +2,13 @@ const { strict: assert } = require('assert');
 const { createServer } = require('node:http');
 const { createDeferredPromise } = require('@metamask/utils');
 const { until } = require('selenium-webdriver');
+
 const {
   defaultGanacheOptions,
   withFixtures,
   openDapp,
   unlockWallet,
   WINDOW_TITLES,
-  createWebSocketConnection,
 } = require('../../helpers');
 const FixtureBuilder = require('../../fixture-builder');
 const {
@@ -315,80 +315,6 @@ describe('Phishing Detection', function () {
     );
   });
 
-  it('should block a website that makes a websocket connection to a malicious command and control server', async function () {
-    const testPageURL = 'http://localhost:8080';
-    await withFixtures(
-      {
-        fixtures: new FixtureBuilder().build(),
-        ganacheOptions: defaultGanacheOptions,
-        title: this.test.fullTitle(),
-        testSpecificMock: async (mockServer) => {
-          await mockServer.forAnyWebSocket().thenEcho();
-          await setupPhishingDetectionMocks(mockServer, {
-            blockProvider: BlockProvider.MetaMask,
-          });
-        },
-        dapp: true,
-      },
-      async ({ driver }) => {
-        await unlockWallet(driver);
-
-        await driver.openNewPage(testPageURL);
-
-        await createWebSocketConnection(driver, 'malicious.localhost');
-
-        await driver.switchToWindowWithTitle(
-          'MetaMask Phishing Detection',
-          10000,
-        );
-
-        await driver.waitForSelector({
-          testId: 'unsafe-continue-loaded',
-        });
-
-        await driver.clickElement({
-          text: 'Back to safety',
-        });
-
-        const currentUrl = await driver.getCurrentUrl();
-        const expectedPortfolioUrl = `https://portfolio.metamask.io/?metamaskEntry=phishing_page_portfolio_button`;
-
-        assert.equal(currentUrl, expectedPortfolioUrl);
-      },
-    );
-  });
-
-  it('should not block a website that makes a safe WebSocket connection', async function () {
-    const testPageURL = 'http://localhost:8080/';
-    await withFixtures(
-      {
-        fixtures: new FixtureBuilder().build(),
-        ganacheOptions: defaultGanacheOptions,
-        title: this.test.fullTitle(),
-        testSpecificMock: async (mockServer) => {
-          await mockServer.forAnyWebSocket().thenEcho();
-          await setupPhishingDetectionMocks(mockServer, {
-            blockProvider: BlockProvider.MetaMask,
-          });
-        },
-        dapp: true,
-      },
-      async ({ driver }) => {
-        await unlockWallet(driver);
-
-        await driver.openNewPage(testPageURL);
-
-        await createWebSocketConnection(driver, 'safe.localhost');
-
-        await driver.wait(until.titleIs(WINDOW_TITLES.TestDApp), 10000);
-
-        const currentUrl = await driver.getCurrentUrl();
-
-        assert.equal(currentUrl, testPageURL);
-      },
-    );
-  });
-
   describe('Phishing redirect protections', function () {
     /**
      * Status codes 305 (via Location header) and 306 (Set-Proxy) header do not

From b8f6ba7395c95a9333ab93025d07951c637ecaf3 Mon Sep 17 00:00:00 2001
From: infiniteflower <139582705+infiniteflower@users.noreply.github.com>
Date: Thu, 12 Dec 2024 04:52:26 -0500
Subject: [PATCH 097/175] fix: send up requestId for squid (#29042)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<!--
Please submit this PR as a draft initially.
Do not mark it as "Ready for review" until the template has been
completely filled out, and PR status checks have passed at least once.
-->

## **Description**

<!--
Write a short description of the changes included in this pull request,
also include relevant motivation and context. Have in mind the following
questions:
1. What is the reason for the change?
2. What is the improvement/solution?
-->

[![Open in GitHub
Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/29042?quickstart=1)

This PR fixes issues with calling the Bridge API for `getTxStatus` for
bridges that expect a `requestId`.

## **Related issues**

Fixes:

## **Manual testing steps**

1. Get a bridge quote
2. Select Axelar/Squid
3. Execute the bridge
4. See your status update correctly

## **Screenshots/Recordings**

<!-- If applicable, add screenshots and/or recordings to visualize the
before and after of your change. -->

### **Before**

<!-- [screenshots/recordings] -->

### **After**

<!-- [screenshots/recordings] -->

## **Pre-merge author checklist**

- [x] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension Coding
Standards](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/CODING_GUIDELINES.md).
- [x] I've completed the PR template to the best of my ability
- [ ] I’ve included tests if applicable
- [ ] I’ve documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [x] I’ve applied the right labels on the PR (see [labeling
guidelines](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.

## **Pre-merge reviewer checklist**

- [ ] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed).
- [ ] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.
---
 .../controllers/bridge-status/utils.ts        | 25 +++++++++++++++----
 shared/types/bridge-status.ts                 | 10 ++++++++
 2 files changed, 30 insertions(+), 5 deletions(-)

diff --git a/app/scripts/controllers/bridge-status/utils.ts b/app/scripts/controllers/bridge-status/utils.ts
index 33af3c09cb03..d8dbac9e1590 100644
--- a/app/scripts/controllers/bridge-status/utils.ts
+++ b/app/scripts/controllers/bridge-status/utils.ts
@@ -6,6 +6,7 @@ import fetchWithCache from '../../../../shared/lib/fetch-with-cache';
 import {
   StatusResponse,
   StatusRequestWithSrcTxHash,
+  StatusRequestDto,
 } from '../../../../shared/types/bridge-status';
 // TODO fix this
 // eslint-disable-next-line import/no-restricted-paths
@@ -16,18 +17,32 @@ const CLIENT_ID_HEADER = { 'X-Client-Id': BRIDGE_CLIENT_ID };
 
 export const BRIDGE_STATUS_BASE_URL = `${BRIDGE_API_BASE_URL}/getTxStatus`;
 
-export const fetchBridgeTxStatus = async (
+export const getStatusRequestDto = (
   statusRequest: StatusRequestWithSrcTxHash,
-) => {
-  // Assemble params
+): StatusRequestDto => {
   const { quote, ...statusRequestNoQuote } = statusRequest;
+
   const statusRequestNoQuoteFormatted = Object.fromEntries(
     Object.entries(statusRequestNoQuote).map(([key, value]) => [
       key,
       value.toString(),
     ]),
-  );
-  const params = new URLSearchParams(statusRequestNoQuoteFormatted);
+  ) as unknown as Omit<StatusRequestDto, 'requestId'>;
+
+  const requestId: { requestId: string } | Record<string, never> =
+    quote?.requestId ? { requestId: quote.requestId } : {};
+
+  return {
+    ...statusRequestNoQuoteFormatted,
+    ...requestId,
+  };
+};
+
+export const fetchBridgeTxStatus = async (
+  statusRequest: StatusRequestWithSrcTxHash,
+) => {
+  const statusRequestDto = getStatusRequestDto(statusRequest);
+  const params = new URLSearchParams(statusRequestDto);
 
   // Fetch
   const url = `${BRIDGE_STATUS_BASE_URL}?${params.toString()}`;
diff --git a/shared/types/bridge-status.ts b/shared/types/bridge-status.ts
index 4c3f79bcd672..fc9357ef968a 100644
--- a/shared/types/bridge-status.ts
+++ b/shared/types/bridge-status.ts
@@ -28,6 +28,16 @@ export type StatusRequest = {
   refuel?: boolean; // lifi
 };
 
+export type StatusRequestDto = Omit<
+  StatusRequest,
+  'quote' | 'srcChainId' | 'destChainId' | 'refuel'
+> & {
+  srcChainId: string; // lifi, socket, squid
+  destChainId: string; // lifi, socket, squid
+  requestId?: string;
+  refuel?: string; // lifi
+};
+
 export type StatusRequestWithSrcTxHash = StatusRequest & {
   srcTxHash: string;
 };

From 09b4c80d46cf040ef77dc01c7d279f9bd7db7d30 Mon Sep 17 00:00:00 2001
From: Pedro Figueiredo <pedro.figueiredo@consensys.net>
Date: Thu, 12 Dec 2024 10:06:40 +0000
Subject: [PATCH 098/175] feat: Add link to pending transaction alert (#28721)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<!--
Please submit this PR as a draft initially.
Do not mark it as "Ready for review" until the template has been
completely filled out, and PR status checks have passed at least once.
-->

## **Description**

This PR substitutes a purely text based alert for pending transactions
with one that includes a hyperlink to the docs.

<!--
Write a short description of the changes included in this pull request,
also include relevant motivation and context. Have in mind the following
questions:
1. What is the reason for the change?
2. What is the improvement/solution?
-->

[![Open in GitHub
Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/28721?quickstart=1)

## **Related issues**

Fixes: https://github.com/MetaMask/metamask-extension/issues/28308

## **Manual testing steps**

1. Go to this page...
2.
3.

## **Screenshots/Recordings**

<!-- If applicable, add screenshots and/or recordings to visualize the
before and after of your change. -->

### **Before**

<!-- [screenshots/recordings] -->

### **After**

<!-- [screenshots/recordings] -->

![Screenshot 2024-12-02 at 11 13
58](https://github.com/user-attachments/assets/146b353d-a515-40db-95cd-5e091700cf18)


## **Pre-merge author checklist**

- [ ] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension Coding
Standards](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/CODING_GUIDELINES.md).
- [ ] I've completed the PR template to the best of my ability
- [ ] I’ve included tests if applicable
- [ ] I’ve documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [ ] I’ve applied the right labels on the PR (see [labeling
guidelines](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.

## **Pre-merge reviewer checklist**

- [ ] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed).
- [ ] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.
---
 app/_locales/de/messages.json                 |  3 -
 app/_locales/el/messages.json                 |  3 -
 app/_locales/en/messages.json                 | 14 +++--
 app/_locales/en_GB/messages.json              |  3 -
 app/_locales/es/messages.json                 |  3 -
 app/_locales/fr/messages.json                 |  3 -
 app/_locales/hi/messages.json                 |  3 -
 app/_locales/id/messages.json                 |  3 -
 app/_locales/ja/messages.json                 |  3 -
 app/_locales/ko/messages.json                 |  3 -
 app/_locales/pt/messages.json                 |  3 -
 app/_locales/ru/messages.json                 |  3 -
 app/_locales/tl/messages.json                 |  3 -
 app/_locales/tr/messages.json                 |  3 -
 app/_locales/vi/messages.json                 |  3 -
 app/_locales/zh_CN/messages.json              |  3 -
 jest.integration.config.js                    |  3 +-
 .../transactions/alerts.test.tsx              |  2 +-
 .../alert-system/alert-modal/alert-modal.tsx  | 15 +++--
 .../general-alert/general-alert.tsx           |  4 +-
 ui/ducks/confirm-alerts/confirm-alerts.ts     | 32 ++++++++--
 .../components/confirm/title/title.tsx        |  1 +
 .../PendingTransactionAlertMessage.tsx        | 32 ++++++++++
 .../usePendingTransactionAlerts.test.ts       | 58 +++++++++++++++++--
 .../usePendingTransactionAlerts.ts            | 12 ++--
 25 files changed, 141 insertions(+), 77 deletions(-)
 create mode 100644 ui/pages/confirmations/hooks/alerts/transactions/PendingTransactionAlertMessage.tsx

diff --git a/app/_locales/de/messages.json b/app/_locales/de/messages.json
index 6d0878b57d5c..06d2f690716d 100644
--- a/app/_locales/de/messages.json
+++ b/app/_locales/de/messages.json
@@ -437,9 +437,6 @@
   "alertMessageNoGasPrice": {
     "message": "Wir können mit dieser Transaktion nicht fortfahren, bis Sie die Gebühr manuell aktualisieren."
   },
-  "alertMessagePendingTransactions": {
-    "message": "Diese Transaktion wird erst dann durchgeführt, wenn eine vorherige Transaktion abgeschlossen ist. Erfahren Sie, wie Sie eine Transaktion abbrechen oder beschleunigen können."
-  },
   "alertMessageSignInDomainMismatch": {
     "message": "Die Website, die die Anfrage stellt, ist nicht die Website, bei der Sie sich anmelden. Dies könnte ein Versuch sein, Ihre Anmeldedaten zu stehlen."
   },
diff --git a/app/_locales/el/messages.json b/app/_locales/el/messages.json
index 58045c5b0578..8d09e2c6658f 100644
--- a/app/_locales/el/messages.json
+++ b/app/_locales/el/messages.json
@@ -437,9 +437,6 @@
   "alertMessageNoGasPrice": {
     "message": "Δεν μπορούμε να συνεχίσουμε με αυτή τη συναλλαγή μέχρι να ενημερώσετε τα τέλη μη αυτόματα."
   },
-  "alertMessagePendingTransactions": {
-    "message": "Αυτή η συναλλαγή δεν θα πραγματοποιηθεί μέχρι να ολοκληρωθεί μια προηγούμενη συναλλαγή. Μάθετε πώς να ακυρώσετε ή να επισπεύσετε μια συναλλαγή."
-  },
   "alertMessageSignInDomainMismatch": {
     "message": "Ο ιστότοπος που υποβάλλει το αίτημα δεν είναι ο ιστότοπος στον οποίο έχετε συνδεθεί. Αυτό θα μπορούσε να είναι μια απόπειρα κλοπής των στοιχείων σύνδεσής σας."
   },
diff --git a/app/_locales/en/messages.json b/app/_locales/en/messages.json
index f42a539277d1..9d63e212d88c 100644
--- a/app/_locales/en/messages.json
+++ b/app/_locales/en/messages.json
@@ -440,9 +440,6 @@
   "alertMessageNoGasPrice": {
     "message": "We can’t move forward with this transaction until you manually update the fee."
   },
-  "alertMessagePendingTransactions": {
-    "message": "This transaction won’t go through until a previous transaction is complete. Learn how to cancel or speed up a transaction."
-  },
   "alertMessageSignInDomainMismatch": {
     "message": "The site making the request is not the site you’re signing into. This could be an attempt to steal your login credentials."
   },
@@ -750,8 +747,7 @@
     "message": "Beta"
   },
   "betaHeaderText": {
-    "message": "This is a beta version. Please report bugs $1",
-    "description": "$1 represents the word 'here' in a hyperlink"
+    "message": "This is a beta version. Please report bugs $1"
   },
   "betaMetamaskInstitutionalVersion": {
     "message": "MetaMask Institutional Beta Version"
@@ -3994,6 +3990,14 @@
   "pending": {
     "message": "Pending"
   },
+  "pendingTransactionAlertMessage": {
+    "message": "This transaction won't go through until a previous transaction is complete. $1",
+    "description": "$1 represents the words 'how to cancel or speed up a transaction' in a hyperlink"
+  },
+  "pendingTransactionAlertMessageHyperlink": {
+    "message": "Learn how to cancel or speed up a transaction.",
+    "description": "The text for the hyperlink in the pending transaction alert message"
+  },
   "pendingTransactionInfo": {
     "message": "This transaction will not process until that one is complete."
   },
diff --git a/app/_locales/en_GB/messages.json b/app/_locales/en_GB/messages.json
index 2addf34f3c26..c72cccd973d9 100644
--- a/app/_locales/en_GB/messages.json
+++ b/app/_locales/en_GB/messages.json
@@ -421,9 +421,6 @@
   "alertMessageNoGasPrice": {
     "message": "We can’t move forward with this transaction until you manually update the fee."
   },
-  "alertMessagePendingTransactions": {
-    "message": "This transaction won’t go through until a previous transaction is complete. Learn how to cancel or speed up a transaction."
-  },
   "alertMessageSignInDomainMismatch": {
     "message": "The site making the request is not the site you’re signing into. This could be an attempt to steal your login credentials."
   },
diff --git a/app/_locales/es/messages.json b/app/_locales/es/messages.json
index f5bec514637e..2861d508743d 100644
--- a/app/_locales/es/messages.json
+++ b/app/_locales/es/messages.json
@@ -437,9 +437,6 @@
   "alertMessageNoGasPrice": {
     "message": "No podemos seguir adelante con esta transacción hasta que actualice manualmente la tarifa."
   },
-  "alertMessagePendingTransactions": {
-    "message": "Esta transacción no se realizará hasta que se complete una transacción anterior. Aprenda cómo cancelar o acelerar una transacción."
-  },
   "alertMessageSignInDomainMismatch": {
     "message": "El sitio que realiza la solicitud no es el sitio en el que está iniciando sesión. Esto podría ser un intento de robar sus credenciales de inicio de sesión."
   },
diff --git a/app/_locales/fr/messages.json b/app/_locales/fr/messages.json
index 4d5e59b25c52..5ae9377d8a69 100644
--- a/app/_locales/fr/messages.json
+++ b/app/_locales/fr/messages.json
@@ -437,9 +437,6 @@
   "alertMessageNoGasPrice": {
     "message": "Nous ne pouvons pas valider cette transaction tant que vous n’avez pas mis à jour manuellement les frais."
   },
-  "alertMessagePendingTransactions": {
-    "message": "La transaction précédente doit être finalisée avant que celle-ci ne soit traitée. Découvrez comment vous pouvez annuler ou accélérer une transaction."
-  },
   "alertMessageSignInDomainMismatch": {
     "message": "Le site auquel vous êtes en train de vous connecter n’est pas le site à l’origine de la demande. Il pourrait s’agir d’une tentative de vol de vos identifiants de connexion."
   },
diff --git a/app/_locales/hi/messages.json b/app/_locales/hi/messages.json
index 2d4bcc52b891..a036aef959ce 100644
--- a/app/_locales/hi/messages.json
+++ b/app/_locales/hi/messages.json
@@ -437,9 +437,6 @@
   "alertMessageNoGasPrice": {
     "message": "जब तक आप शुल्क को मैन्युअल रूप से अपडेट नहीं करते, हम इस ट्रांसेक्शन को आगे नहीं बढ़ा सकते।"
   },
-  "alertMessagePendingTransactions": {
-    "message": "यह ट्रांसेक्शन तब तक नहीं होगा जब तक पिछला ट्रांसेक्शन पूरा न हो जाए। किसी ट्रांसेक्शन को रद्द करने या तेज़ करने का तरीका जानें।"
-  },
   "alertMessageSignInDomainMismatch": {
     "message": "अनुरोध करने वाली साइट वह साइट नहीं है जिस पर आप साइन इन कर रहे हैं। यह आपके लॉगिन क्रेडेंशियल चुराने का प्रयास हो सकता है।"
   },
diff --git a/app/_locales/id/messages.json b/app/_locales/id/messages.json
index 9135a2e56bcf..5777f05c2322 100644
--- a/app/_locales/id/messages.json
+++ b/app/_locales/id/messages.json
@@ -437,9 +437,6 @@
   "alertMessageNoGasPrice": {
     "message": "Kami tidak dapat melanjutkan transaksi ini hingga Anda memperbarui biayanya secara manual."
   },
-  "alertMessagePendingTransactions": {
-    "message": "Transaksi ini tidak akan dilanjutkan hingga transaksi sebelumnya selesai. Pelajari cara membatalkan atau mempercepat transaksi."
-  },
   "alertMessageSignInDomainMismatch": {
     "message": "Situs yang membuat permintaan bukanlah situs yang Anda masuki. Ini dapat merupakan upaya untuk mencuri kredensial login Anda."
   },
diff --git a/app/_locales/ja/messages.json b/app/_locales/ja/messages.json
index 8404c4eb3af4..561411606feb 100644
--- a/app/_locales/ja/messages.json
+++ b/app/_locales/ja/messages.json
@@ -437,9 +437,6 @@
   "alertMessageNoGasPrice": {
     "message": "手数料を手動で更新するまでこのトランザクションを進めることができません。"
   },
-  "alertMessagePendingTransactions": {
-    "message": "前のトランザクションが完了するまでこのトランザクションを実行できません。トランザクションをキャンセルするか加速させる方法をご覧ください。"
-  },
   "alertMessageSignInDomainMismatch": {
     "message": "要求元のサイトはサインインしようとしているサイトではありません。ログイン情報を盗もうとしている可能性があります。"
   },
diff --git a/app/_locales/ko/messages.json b/app/_locales/ko/messages.json
index cbd48592c7d0..941010db2abe 100644
--- a/app/_locales/ko/messages.json
+++ b/app/_locales/ko/messages.json
@@ -437,9 +437,6 @@
   "alertMessageNoGasPrice": {
     "message": "수수료를 직접 업데이트할 때까지는 이 트랜잭션을 진행할 수 없습니다."
   },
-  "alertMessagePendingTransactions": {
-    "message": "이 트랜잭션은 이전 트랜잭션이 완료될 때까지 진행되지 않습니다. 트랜잭션을 취소하거나 속도를 올리는 법을 알아보세요."
-  },
   "alertMessageSignInDomainMismatch": {
     "message": "요청을 보낸 사이트에 로그인되어 있지 않습니다. 이는 로그인 정보를 도용하려는 시도일 수 있습니다."
   },
diff --git a/app/_locales/pt/messages.json b/app/_locales/pt/messages.json
index 3a01b378c686..553b0ad31508 100644
--- a/app/_locales/pt/messages.json
+++ b/app/_locales/pt/messages.json
@@ -437,9 +437,6 @@
   "alertMessageNoGasPrice": {
     "message": "Não podemos prosseguir com essa transação até você atualizar manualmente a taxa."
   },
-  "alertMessagePendingTransactions": {
-    "message": "Essa transação não será processada até que a transação anterior seja concluída. Saiba como cancelar ou acelerar uma transação."
-  },
   "alertMessageSignInDomainMismatch": {
     "message": "O site solicitante não é o mesmo em que você está entrando. Isso pode se tratar de uma tentativa de roubar suas credenciais de login."
   },
diff --git a/app/_locales/ru/messages.json b/app/_locales/ru/messages.json
index 385670721c1f..1403b6084d27 100644
--- a/app/_locales/ru/messages.json
+++ b/app/_locales/ru/messages.json
@@ -437,9 +437,6 @@
   "alertMessageNoGasPrice": {
     "message": "Мы не сможем продолжить эту транзакцию, пока вы не обновите комиссию вручную."
   },
-  "alertMessagePendingTransactions": {
-    "message": "Эта транзакция не будет выполнена, пока не завершится предыдущая транзакция. Узнайте, как отменить или ускорить транзакцию."
-  },
   "alertMessageSignInDomainMismatch": {
     "message": "Сайт, отправляющий запрос, не является сайтом, на который вы входите. Это может быть попыткой украсть ваши учетные данные."
   },
diff --git a/app/_locales/tl/messages.json b/app/_locales/tl/messages.json
index a13c9c6d3006..60855b61765d 100644
--- a/app/_locales/tl/messages.json
+++ b/app/_locales/tl/messages.json
@@ -437,9 +437,6 @@
   "alertMessageNoGasPrice": {
     "message": "Hindi tayo makakapagpatuloy sa transaksyong ito hanggang sa manwal mong i-update ang bayad."
   },
-  "alertMessagePendingTransactions": {
-    "message": "Hindi magpapatuloy ang transaksyong ito hanggang makumpleto ang naunang transaksyon. Alamin kung paano kanselahin o pabilisin ang transaksyon."
-  },
   "alertMessageSignInDomainMismatch": {
     "message": "Ang site na humihiling ay hindi ang site kung saan ka nagsa-signin. Ito ay maaring isang pagtatangka para nakawin ang iyong mga kredensiyal sa pag-login."
   },
diff --git a/app/_locales/tr/messages.json b/app/_locales/tr/messages.json
index 8f761e554caa..6bcd1b8a61fc 100644
--- a/app/_locales/tr/messages.json
+++ b/app/_locales/tr/messages.json
@@ -437,9 +437,6 @@
   "alertMessageNoGasPrice": {
     "message": "Siz ücreti manuel olarak güncelleyene dek bu işleme devam edemiyoruz."
   },
-  "alertMessagePendingTransactions": {
-    "message": "Önceki bir işlem tamamlanana dek bu işlem gerçekleşmeyecektir. Bir işlemi nasıl iptal edeceğinizi veya hızlandıracağınızı öğrenin."
-  },
   "alertMessageSignInDomainMismatch": {
     "message": "Talepte bulunan site giriş yaptığınız site değil. Bu durum oturum açma bilgilerinizi çalma teşebbüsü olabilir."
   },
diff --git a/app/_locales/vi/messages.json b/app/_locales/vi/messages.json
index 883f08f49a7e..3901eed1fc07 100644
--- a/app/_locales/vi/messages.json
+++ b/app/_locales/vi/messages.json
@@ -437,9 +437,6 @@
   "alertMessageNoGasPrice": {
     "message": "Chúng tôi không thể tiếp tục giao dịch này cho đến khi bạn cập nhật phí thủ công."
   },
-  "alertMessagePendingTransactions": {
-    "message": "Giao dịch này sẽ không được thực hiện cho đến khi giao dịch trước đó hoàn tất. Tìm hiểu cách hủy hoặc đẩy nhanh giao dịch."
-  },
   "alertMessageSignInDomainMismatch": {
     "message": "Trang web đưa ra yêu cầu không phải là trang web bạn đang đăng nhập. Đây có thể là một nỗ lực đánh cắp thông tin đăng nhập của bạn."
   },
diff --git a/app/_locales/zh_CN/messages.json b/app/_locales/zh_CN/messages.json
index fb7ed008d6f6..4d548221769f 100644
--- a/app/_locales/zh_CN/messages.json
+++ b/app/_locales/zh_CN/messages.json
@@ -437,9 +437,6 @@
   "alertMessageNoGasPrice": {
     "message": "您手动更新费用后，我们才能继续进行此交易。"
   },
-  "alertMessagePendingTransactions": {
-    "message": "上一笔交易完成后，此交易才能继续进行。了解如何取消或加快交易。"
-  },
   "alertMessageSignInDomainMismatch": {
     "message": "提出请求的网站不是您正在登录的网站。这可能试图窃取您的登录凭据。"
   },
diff --git a/jest.integration.config.js b/jest.integration.config.js
index 685080330fb3..5a110d7a5632 100644
--- a/jest.integration.config.js
+++ b/jest.integration.config.js
@@ -25,8 +25,7 @@ module.exports = {
   setupFilesAfterEnv: ['<rootDir>/test/integration/config/setupAfter.js'],
   testMatch: ['<rootDir>/test/integration/**/*.test.(js|ts|tsx)'],
   testPathIgnorePatterns: ['<rootDir>/test/integration/config/*'],
-  // This was increased from 5500 to 10000 to when lazy loading was introduced
-  testTimeout: 10000,
+  testTimeout: 15000,
   // We have to specify the environment we are running in, which is jsdom. The
   // default is 'node'. This can be modified *per file* using a comment at the
   // head of the file. So it may be worthwhile to switch to 'node' in any
diff --git a/test/integration/confirmations/transactions/alerts.test.tsx b/test/integration/confirmations/transactions/alerts.test.tsx
index ffbad48b352b..72acf02efc60 100644
--- a/test/integration/confirmations/transactions/alerts.test.tsx
+++ b/test/integration/confirmations/transactions/alerts.test.tsx
@@ -362,7 +362,7 @@ describe('Contract Interaction Confirmation Alerts', () => {
     expect(
       await screen.findByTestId('alert-modal__selected-alert'),
     ).toHaveTextContent(
-      'This transaction won’t go through until a previous transaction is complete. Learn how to cancel or speed up a transaction.',
+      "This transaction won't go through until a previous transaction is complete. Learn how to cancel or speed up a transaction.",
     );
   });
 
diff --git a/ui/components/app/alert-system/alert-modal/alert-modal.tsx b/ui/components/app/alert-system/alert-modal/alert-modal.tsx
index 10f5d90c3e77..2eb78fba44c1 100644
--- a/ui/components/app/alert-system/alert-modal/alert-modal.tsx
+++ b/ui/components/app/alert-system/alert-modal/alert-modal.tsx
@@ -164,12 +164,15 @@ function AlertDetails({
     >
       {customDetails ?? (
         <Box>
-          <Text
-            variant={TextVariant.bodyMd}
-            data-testid="alert-modal__selected-alert"
-          >
-            {selectedAlert.message}
-          </Text>
+          {Boolean(selectedAlert.content) && selectedAlert.content}
+          {Boolean(selectedAlert.message) && (
+            <Text
+              variant={TextVariant.bodyMd}
+              data-testid="alert-modal__selected-alert"
+            >
+              {selectedAlert.message}
+            </Text>
+          )}
           {selectedAlert.alertDetails?.length ? (
             <Text variant={TextVariant.bodyMdBold} marginTop={1}>
               {t('alertModalDetails')}
diff --git a/ui/components/app/alert-system/general-alert/general-alert.tsx b/ui/components/app/alert-system/general-alert/general-alert.tsx
index 5ac2b2a335fb..5c222902b3ab 100644
--- a/ui/components/app/alert-system/general-alert/general-alert.tsx
+++ b/ui/components/app/alert-system/general-alert/general-alert.tsx
@@ -21,13 +21,14 @@ import { AlertProvider } from '../alert-provider';
 import { AlertSeverity } from '../../../../ducks/confirm-alerts/confirm-alerts';
 
 export type GeneralAlertProps = {
-  description: string;
+  description?: string;
   details?: React.ReactNode | string[];
   onClickSupportLink?: () => void;
   provider?: SecurityProvider;
   reportUrl?: string;
   severity: AlertSeverity;
   title?: string;
+  children?: React.ReactNode;
 };
 
 function ReportLink({
@@ -119,6 +120,7 @@ function GeneralAlert({
       description={description}
       {...props}
     >
+      {props.children}
       <AlertDetails
         details={details}
         reportUrl={reportUrl}
diff --git a/ui/ducks/confirm-alerts/confirm-alerts.ts b/ui/ducks/confirm-alerts/confirm-alerts.ts
index f28cb7b83acc..586ed181977b 100644
--- a/ui/ducks/confirm-alerts/confirm-alerts.ts
+++ b/ui/ducks/confirm-alerts/confirm-alerts.ts
@@ -1,3 +1,4 @@
+import { ReactNode } from 'react';
 import { SecurityProvider } from '../../../shared/constants/security-provider';
 import { Severity } from '../../helpers/constants/design-system';
 
@@ -33,11 +34,6 @@ export type Alert = {
    */
   isBlocking?: boolean;
 
-  /**
-   * The message is a summary of the alert details.
-   */
-  message: string;
-
   /**
    * The security provider associated with the alert.
    */
@@ -57,7 +53,31 @@ export type Alert = {
    * URL to report issue.
    */
   reportUrl?: string;
-};
+} & MessageOrContent;
+
+type MessageOrContent =
+  | {
+      /**
+       * The message is a summary of the alert details.
+       */
+      message: string;
+
+      /**
+       * Alert summary components can be used as an alternative to a message.
+       */
+      content?: ReactNode;
+    }
+  | {
+      /**
+       * The message is a summary of the alert details.
+       */
+      message?: string;
+
+      /**
+       * Alert summary components can be used as an alternative to a message.
+       */
+      content: ReactNode;
+    };
 
 /**
  * Represents the state of confirm alerts in the application.
diff --git a/ui/pages/confirmations/components/confirm/title/title.tsx b/ui/pages/confirmations/components/confirm/title/title.tsx
index 83efc26406bf..e8148912cac1 100644
--- a/ui/pages/confirmations/components/confirm/title/title.tsx
+++ b/ui/pages/confirmations/components/confirm/title/title.tsx
@@ -43,6 +43,7 @@ function ConfirmBannerAlert({ ownerId }: { ownerId: string }) {
             provider={alert.provider}
             details={alert.alertDetails}
             reportUrl={alert.reportUrl}
+            children={alert.content}
           />
         </Box>
       ))}
diff --git a/ui/pages/confirmations/hooks/alerts/transactions/PendingTransactionAlertMessage.tsx b/ui/pages/confirmations/hooks/alerts/transactions/PendingTransactionAlertMessage.tsx
new file mode 100644
index 000000000000..472567ddb093
--- /dev/null
+++ b/ui/pages/confirmations/hooks/alerts/transactions/PendingTransactionAlertMessage.tsx
@@ -0,0 +1,32 @@
+import React from 'react';
+import { ButtonLink, Text } from '../../../../../components/component-library';
+import {
+  TextColor,
+  TextVariant,
+} from '../../../../../helpers/constants/design-system';
+import ZENDESK_URLS from '../../../../../helpers/constants/zendesk-url';
+import { useI18nContext } from '../../../../../hooks/useI18nContext';
+
+export const PendingTransactionAlertMessage = () => {
+  const t = useI18nContext();
+
+  return (
+    <Text
+      variant={TextVariant.bodyMd}
+      color={TextColor.textDefault}
+      data-testid="alert-modal__selected-alert"
+    >
+      {t('pendingTransactionAlertMessage', [
+        <ButtonLink
+          href={ZENDESK_URLS.SPEEDUP_CANCEL}
+          key="link"
+          target="_blank"
+          rel="noreferrer noopener"
+          color={TextColor.primaryDefault}
+        >
+          {t('pendingTransactionAlertMessageHyperlink')}
+        </ButtonLink>,
+      ])}
+    </Text>
+  );
+};
diff --git a/ui/pages/confirmations/hooks/alerts/transactions/usePendingTransactionAlerts.test.ts b/ui/pages/confirmations/hooks/alerts/transactions/usePendingTransactionAlerts.test.ts
index b9b3d12dc7d0..f7be0f93e2c1 100644
--- a/ui/pages/confirmations/hooks/alerts/transactions/usePendingTransactionAlerts.test.ts
+++ b/ui/pages/confirmations/hooks/alerts/transactions/usePendingTransactionAlerts.test.ts
@@ -4,14 +4,34 @@ import {
   TransactionStatus,
   TransactionType,
 } from '@metamask/transaction-controller';
-
-import { getMockConfirmState } from '../../../../../../test/data/confirmations/helper';
+import { useSelector } from 'react-redux';
+import { useParams } from 'react-router-dom';
 import { genUnapprovedContractInteractionConfirmation } from '../../../../../../test/data/confirmations/contract-interaction';
+import { getMockConfirmState } from '../../../../../../test/data/confirmations/helper';
 import { renderHookWithConfirmContextProvider } from '../../../../../../test/lib/confirmations/render-helpers';
-import { Severity } from '../../../../../helpers/constants/design-system';
 import { RowAlertKey } from '../../../../../components/app/confirm/info/row/constants';
+import { Severity } from '../../../../../helpers/constants/design-system';
+import {
+  getRedesignedTransactionsEnabled,
+  submittedPendingTransactionsSelector,
+} from '../../../../../selectors';
+import { PendingTransactionAlertMessage } from './PendingTransactionAlertMessage';
 import { usePendingTransactionAlerts } from './usePendingTransactionAlerts';
 
+jest.mock('react-redux', () => ({
+  ...jest.requireActual('react-redux'),
+  useSelector: jest.fn(),
+}));
+
+jest.mock('./PendingTransactionAlertMessage', () => ({
+  PendingTransactionAlertMessage: () => 'PendingTransactionAlertMessage',
+}));
+
+jest.mock('react-router-dom', () => ({
+  ...jest.requireActual('react-router-dom'),
+  useParams: jest.fn().mockReturnValue({ id: 'mock-transaction-id' }),
+}));
+
 const ACCOUNT_ADDRESS = '0x0dcd5d886577d5081b0c52e242ef29e70be3e7bc';
 const TRANSACTION_ID_MOCK = '123-456';
 
@@ -63,8 +83,19 @@ function runHook({
 }
 
 describe('usePendingTransactionAlerts', () => {
+  const useSelectorMock = useSelector as jest.Mock;
+
   beforeEach(() => {
     jest.resetAllMocks();
+
+    (useParams as jest.Mock).mockReturnValue({ id: 'mock-transaction-id' });
+
+    useSelectorMock.mockImplementation((selector) => {
+      if (selector.toString().includes('pendingApprovalsSortedSelector')) {
+        return [];
+      }
+      return undefined;
+    });
   });
 
   it('returns no alerts if no confirmation', () => {
@@ -121,6 +152,24 @@ describe('usePendingTransactionAlerts', () => {
   });
 
   it('returns alert if submitted transaction', () => {
+    useSelectorMock.mockImplementation((selector) => {
+      if (selector === submittedPendingTransactionsSelector) {
+        return [
+          { name: 'first transaction', id: '1' },
+          { name: 'second transaction', id: '2' },
+        ];
+      } else if (selector === getRedesignedTransactionsEnabled) {
+        return true;
+      } else if (selector.toString().includes('getUnapprovedTransaction')) {
+        return { type: TransactionType.contractInteraction };
+      } else if (
+        selector.toString().includes('pendingApprovalsSortedSelector')
+      ) {
+        return [];
+      }
+      return undefined;
+    });
+
     const alerts = runHook({
       currentConfirmation: CONFIRMATION_MOCK,
       transactions: [TRANSACTION_META_MOCK],
@@ -130,8 +179,7 @@ describe('usePendingTransactionAlerts', () => {
       {
         field: RowAlertKey.Speed,
         key: 'pendingTransactions',
-        message:
-          'This transaction won’t go through until a previous transaction is complete. Learn how to cancel or speed up a transaction.',
+        content: PendingTransactionAlertMessage(),
         reason: 'Pending transaction',
         severity: Severity.Warning,
       },
diff --git a/ui/pages/confirmations/hooks/alerts/transactions/usePendingTransactionAlerts.ts b/ui/pages/confirmations/hooks/alerts/transactions/usePendingTransactionAlerts.ts
index 5753b5329ea8..6ef15b5ff41f 100644
--- a/ui/pages/confirmations/hooks/alerts/transactions/usePendingTransactionAlerts.ts
+++ b/ui/pages/confirmations/hooks/alerts/transactions/usePendingTransactionAlerts.ts
@@ -1,14 +1,14 @@
 import { TransactionMeta } from '@metamask/transaction-controller';
 import { useMemo } from 'react';
 import { useSelector } from 'react-redux';
-
-import { submittedPendingTransactionsSelector } from '../../../../../selectors';
-import { useI18nContext } from '../../../../../hooks/useI18nContext';
+import { isCorrectDeveloperTransactionType } from '../../../../../../shared/lib/confirmation.utils';
+import { RowAlertKey } from '../../../../../components/app/confirm/info/row/constants';
 import { Alert } from '../../../../../ducks/confirm-alerts/confirm-alerts';
 import { Severity } from '../../../../../helpers/constants/design-system';
-import { RowAlertKey } from '../../../../../components/app/confirm/info/row/constants';
+import { useI18nContext } from '../../../../../hooks/useI18nContext';
+import { submittedPendingTransactionsSelector } from '../../../../../selectors';
 import { useConfirmContext } from '../../../context/confirm';
-import { isCorrectDeveloperTransactionType } from '../../../../../../shared/lib/confirmation.utils';
+import { PendingTransactionAlertMessage } from './PendingTransactionAlertMessage';
 
 export function usePendingTransactionAlerts(): Alert[] {
   const t = useI18nContext();
@@ -30,7 +30,7 @@ export function usePendingTransactionAlerts(): Alert[] {
       {
         field: RowAlertKey.Speed,
         key: 'pendingTransactions',
-        message: t('alertMessagePendingTransactions'),
+        content: PendingTransactionAlertMessage(),
         reason: t('alertReasonPendingTransactions'),
         severity: Severity.Warning,
       },

From 714fa10bd5f1a78e20d46965802eae087ad6fa33 Mon Sep 17 00:00:00 2001
From: Alejandro Garcia Anglada <aganglada@gmail.com>
Date: Thu, 12 Dec 2024 11:51:28 +0100
Subject: [PATCH 099/175] fix: solana balance on accounts selector (#29054)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<img width="358" alt="Screenshot 2024-12-10 at 15 45 14"
src="https://github.com/user-attachments/assets/fb669839-8739-48b5-bcd6-9339eb274ace">
<!--
Please submit this PR as a draft initially.
Do not mark it as "Ready for review" until the template has been
completely filled out, and PR status checks have passed at least once.
-->

## **Description**

<!--
Write a short description of the changes included in this pull request,
also include relevant motivation and context. Have in mind the following
questions:
1. What is the reason for the change?
2. What is the improvement/solution?
-->

Solana native balance weren't showing before

[![Open in GitHub
Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/29054?quickstart=1)

## **Related issues**

Fixes:

## **Manual testing steps**

As of right now, manually testing is a bit complex, it needs to run the
snap manually and the extension, since we 1st need to publish a new
release to npm with more up to date work. The snap version we have in
npm is outdated and won't support this flow. That said, if you want to
go ahead and run locally the steps are the following:

1. Clone the [ Solana Snap
monorepo](https://github.com/MetaMask/snap-solana-wallet) and run it
locally with `yarn` and then `yarn start`
2. In the extension, at this branch, apply the following changes and run
the extension as flask:
```
At builds.yml add the solana feature to the flask build:

     features:
       - build-flask
       - keyring-snaps
+      - solana

At shared/lib/accounts/solana-wallet-snap.ts point the snap ID to the snap localhost:

-export const SOLANA_WALLET_SNAP_ID: SnapId = SolanaWalletSnap.snapId as SnapId;
+//export const SOLANA_WALLET_SNAP_ID: SnapId = SolanaWalletSnap.snapId as SnapId;
+export const SOLANA_WALLET_SNAP_ID: SnapId = "local:http://localhost:8080/";
```
3. Manually install the snap via the snap dapp at http://localhost:3000
4. Enable the Solana account via Settings > Experimental > Enable Solana
account
5. Create a Solana account from the account-list menu and see the
account balance on it
## **Screenshots/Recordings**

<!-- If applicable, add screenshots and/or recordings to visualize the
before and after of your change. -->

### **Before**

<!-- [screenshots/recordings] -->

### **After**

<!-- [screenshots/recordings] -->

## **Pre-merge author checklist**

- [x] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension Coding
Standards](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/CODING_GUIDELINES.md).
- [x] I've completed the PR template to the best of my ability
- [x] I’ve included tests if applicable
- [ ] I’ve documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [x] I’ve applied the right labels on the PR (see [labeling
guidelines](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.

## **Pre-merge reviewer checklist**

- [x] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed).
- [x] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.
---
 package.json                                  |  2 +-
 .../account-list-item.test.js.snap            | 37 ++++++++++++-------
 .../account-list-item/account-list-item.js    |  5 +--
 .../account-list-item.test.js                 |  6 +--
 yarn.lock                                     | 31 +++-------------
 5 files changed, 35 insertions(+), 46 deletions(-)

diff --git a/package.json b/package.json
index 223372f5dcc5..601400f80f7a 100644
--- a/package.json
+++ b/package.json
@@ -347,7 +347,7 @@
     "@metamask/snaps-rpc-methods": "^11.7.0",
     "@metamask/snaps-sdk": "^6.13.0",
     "@metamask/snaps-utils": "^8.6.1",
-    "@metamask/solana-wallet-snap": "^0.1.9",
+    "@metamask/solana-wallet-snap": "^1.0.3",
     "@metamask/transaction-controller": "^42.0.0",
     "@metamask/user-operation-controller": "^19.0.0",
     "@metamask/utils": "^10.0.1",
diff --git a/ui/components/multichain/account-list-item/__snapshots__/account-list-item.test.js.snap b/ui/components/multichain/account-list-item/__snapshots__/account-list-item.test.js.snap
index ab9bc540fe7a..fb3bed6fd34b 100644
--- a/ui/components/multichain/account-list-item/__snapshots__/account-list-item.test.js.snap
+++ b/ui/components/multichain/account-list-item/__snapshots__/account-list-item.test.js.snap
@@ -269,25 +269,36 @@ exports[`AccountListItem renders AccountListItem component and shows account nam
           </p>
         </div>
         <div
-          class="mm-box multichain-avatar-group mm-box--display-flex mm-box--gap-1 mm-box--align-items-center"
-          data-testid="avatar-group"
+          class="mm-box multichain-account-list-item__avatar-currency mm-box--display-flex mm-box--gap-1 mm-box--justify-content-center mm-box--align-items-center"
         >
           <div
-            class="mm-box mm-box--display-flex mm-box--align-items-center"
+            class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-token mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-border-default box--border-style-solid box--border-width-1"
+          >
+            <img
+              alt="BTC logo"
+              class="mm-avatar-token__token-image"
+              src="./images/bitcoin-logo.svg"
+            />
+          </div>
+          <div
+            class="mm-box mm-text mm-text--body-sm mm-text--text-align-end mm-box--color-text-alternative"
           >
             <div
-              class="mm-box mm-box--rounded-full"
-              style="margin-left: 0px;"
+              class="mm-box currency-display-component mm-box--display-flex mm-box--flex-wrap-wrap mm-box--align-items-center"
+              data-testid="second-currency-display"
+              title="1 BTC"
             >
-              <div
-                class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-token mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full"
+              <span
+                class="mm-box mm-text currency-display-component__text mm-text--inherit mm-text--ellipsis mm-box--color-text-default"
+                data-testid="account-value-and-suffix"
               >
-                <img
-                  alt="undefined logo"
-                  class="mm-avatar-token__token-image"
-                  src="./images/bitcoin-logo.svg"
-                />
-              </div>
+                1
+              </span>
+              <span
+                class="mm-box mm-text currency-display-component__suffix mm-text--inherit mm-box--margin-inline-start-1 mm-box--color-text-default"
+              >
+                BTC
+              </span>
             </div>
           </div>
         </div>
diff --git a/ui/components/multichain/account-list-item/account-list-item.js b/ui/components/multichain/account-list-item/account-list-item.js
index 365d09de8ecf..3ab048597f40 100644
--- a/ui/components/multichain/account-list-item/account-list-item.js
+++ b/ui/components/multichain/account-list-item/account-list-item.js
@@ -367,8 +367,7 @@ const AccountListItem = ({
               {shortenAddress(normalizeSafeAddress(account.address))}
             </Text>
           </Box>
-          {/* For non-EVM networks we always want to show tokens */}
-          {mappedOrderedTokenList.length > 1 || !isEvmNetwork ? (
+          {mappedOrderedTokenList.length > 1 ? (
             <AvatarGroup members={mappedOrderedTokenList} limit={4} />
           ) : (
             <Box
@@ -393,7 +392,7 @@ const AccountListItem = ({
                 <UserPreferencedCurrencyDisplay
                   account={account}
                   ethNumberOfDecimals={MAXIMUM_CURRENCY_DECIMALS}
-                  value={account.balance}
+                  value={isEvmNetwork ? account.balance : balanceToTranslate}
                   type={SECONDARY}
                   showNative
                   data-testid="second-currency-display"
diff --git a/ui/components/multichain/account-list-item/account-list-item.test.js b/ui/components/multichain/account-list-item/account-list-item.test.js
index 09febefb3d83..6069ce4df530 100644
--- a/ui/components/multichain/account-list-item/account-list-item.test.js
+++ b/ui/components/multichain/account-list-item/account-list-item.test.js
@@ -277,7 +277,7 @@ describe('AccountListItem', () => {
         expect(avatarGroup).not.toBeInTheDocument();
       });
 
-      it('renders fiat for non-EVM account', () => {
+      it('renders fiat and native balance for non-EVM account', () => {
         const { container } = render(
           {
             account: mockNonEvmAccount,
@@ -308,8 +308,8 @@ describe('AccountListItem', () => {
           expectedBalance,
         );
         expect(firstCurrencyDisplay.lastChild.textContent).toContain('USD');
-        expect(secondCurrencyDisplay).not.toBeInTheDocument();
-        expect(avatarGroup).toBeInTheDocument();
+        expect(secondCurrencyDisplay.textContent).toContain('1BTC');
+        expect(avatarGroup).not.toBeInTheDocument();
       });
     });
   });
diff --git a/yarn.lock b/yarn.lock
index f925a60fee76..e61b6efeef05 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5605,23 +5605,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/keyring-api@npm:^9.0.0":
-  version: 9.0.0
-  resolution: "@metamask/keyring-api@npm:9.0.0"
-  dependencies:
-    "@metamask/snaps-sdk": "npm:^6.7.0"
-    "@metamask/superstruct": "npm:^3.1.0"
-    "@metamask/utils": "npm:^9.2.1"
-    "@types/uuid": "npm:^9.0.8"
-    bech32: "npm:^2.0.0"
-    uuid: "npm:^9.0.1"
-    webextension-polyfill: "npm:^0.12.0"
-  peerDependencies:
-    "@metamask/providers": ^17.2.0
-  checksum: 10/ff552c04a4d06c7b1a43d52809a9c141d38772586388f0ab96123bce445f148aa7f7e8165d03fa92ac391351de252c4b299fc2c16e690193f669b5329941fe75
-  languageName: node
-  linkType: hard
-
 "@metamask/keyring-controller@npm:^19.0.0, @metamask/keyring-controller@npm:^19.0.1":
   version: 19.0.1
   resolution: "@metamask/keyring-controller@npm:19.0.1"
@@ -6296,14 +6279,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/solana-wallet-snap@npm:^0.1.9":
-  version: 0.1.9
-  resolution: "@metamask/solana-wallet-snap@npm:0.1.9"
-  dependencies:
-    "@metamask/keyring-api": "npm:^9.0.0"
-    "@metamask/snaps-sdk": "npm:^6.9.0"
-    buffer: "npm:^6.0.3"
-  checksum: 10/ec540948e1b5c693b0a31a32521d84c5d3796a5d62d1dfa0986cae47483040a0381c30419af4a86b2402efa5e95283b45a5d17bb705c11a181d0c6fa70b5be60
+"@metamask/solana-wallet-snap@npm:^1.0.3":
+  version: 1.0.3
+  resolution: "@metamask/solana-wallet-snap@npm:1.0.3"
+  checksum: 10/4c7c0f05676e7bb84140226c1a3bd716493a6f3582142de83575df682e8351c7583fc5db6209fbde1b43f376fd4eda4d2063f0e651d8209e92001514fc8caf81
   languageName: node
   linkType: hard
 
@@ -26485,7 +26464,7 @@ __metadata:
     "@metamask/snaps-rpc-methods": "npm:^11.7.0"
     "@metamask/snaps-sdk": "npm:^6.13.0"
     "@metamask/snaps-utils": "npm:^8.6.1"
-    "@metamask/solana-wallet-snap": "npm:^0.1.9"
+    "@metamask/solana-wallet-snap": "npm:^1.0.3"
     "@metamask/test-bundler": "npm:^1.0.0"
     "@metamask/test-dapp": "npm:8.13.0"
     "@metamask/transaction-controller": "npm:^42.0.0"

From 2e8ef02370f72febe0fa40370db62b7d61b641f0 Mon Sep 17 00:00:00 2001
From: Dan J Miller <danjm.com@gmail.com>
Date: Thu, 12 Dec 2024 07:46:55 -0330
Subject: [PATCH 100/175] fix: Revert gridplus sdk version bumps (#29125)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## **Description**

This PR reverts #27973 and #28008, and then forces an secp256k1
resolution to deal with a yarn audit failure. This is necessary to fix
typed message signing with the lattice gridplus hardware wallet.

All of this had been done on release branches and master in the past,
when it should have been done directly on develop.

We do want to restore the #27973 and #28008 changes soon, but that
requires getting to root of why those changes result in typed message
signing failure with lattice griduplus

[![Open in GitHub
Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/29125?quickstart=1)

## **Related issues**

Fixes:

## **Manual testing steps**

Test "Sign Typed Message" v4 in the test dapp with a gridplus hardware
wallet. It should succeed without error

## **Screenshots/Recordings**

<!-- If applicable, add screenshots and/or recordings to visualize the
before and after of your change. -->

### **Before**

<!-- [screenshots/recordings] -->

### **After**

<!-- [screenshots/recordings] -->

## **Pre-merge author checklist**

- [ ] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension Coding
Standards](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/CODING_GUIDELINES.md).
- [ ] I've completed the PR template to the best of my ability
- [ ] I’ve included tests if applicable
- [ ] I’ve documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [ ] I’ve applied the right labels on the PR (see [labeling
guidelines](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.

## **Pre-merge reviewer checklist**

- [ ] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed).
- [ ] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.

---------

Co-authored-by: Charly Chevalier <charly.chevalier@consensys.net>
Co-authored-by: MetaMask Bot <metamaskbot@users.noreply.github.com>
---
 lavamoat/browserify/beta/policy.json  | 238 +++++++++-------
 lavamoat/browserify/flask/policy.json | 238 +++++++++-------
 lavamoat/browserify/main/policy.json  | 238 +++++++++-------
 lavamoat/browserify/mmi/policy.json   | 238 +++++++++-------
 package.json                          |  24 +-
 yarn.lock                             | 380 ++++++++++++++++----------
 6 files changed, 820 insertions(+), 536 deletions(-)

diff --git a/lavamoat/browserify/beta/policy.json b/lavamoat/browserify/beta/policy.json
index 79058c8c6954..4212ef454eea 100644
--- a/lavamoat/browserify/beta/policy.json
+++ b/lavamoat/browserify/beta/policy.json
@@ -150,7 +150,7 @@
         "console.warn": true
       },
       "packages": {
-        "@ethereumjs/tx>@ethereumjs/util>@ethereumjs/rlp": true,
+        "@ethereumjs/tx>@ethereumjs/rlp": true,
         "@ethereumjs/tx>@ethereumjs/util>micro-ftch": true,
         "@ethereumjs/tx>ethereum-cryptography": true,
         "browserify>buffer": true,
@@ -158,11 +158,6 @@
         "webpack>events": true
       }
     },
-    "@ethereumjs/tx>@ethereumjs/util>@ethereumjs/rlp": {
-      "globals": {
-        "TextEncoder": true
-      }
-    },
     "@ethereumjs/tx>@ethereumjs/util>micro-ftch": {
       "globals": {
         "Headers": true,
@@ -188,8 +183,8 @@
       },
       "packages": {
         "@ethereumjs/tx>ethereum-cryptography>@noble/curves": true,
-        "@ethereumjs/tx>ethereum-cryptography>@noble/hashes": true,
-        "@ethereumjs/tx>ethereum-cryptography>@scure/bip32": true
+        "@ethereumjs/tx>ethereum-cryptography>@scure/bip32": true,
+        "@noble/hashes": true
       }
     },
     "@ethereumjs/tx>ethereum-cryptography>@noble/curves": {
@@ -197,32 +192,14 @@
         "TextEncoder": true
       },
       "packages": {
-        "@ethereumjs/tx>ethereum-cryptography>@noble/curves>@noble/hashes": true
-      }
-    },
-    "@ethereumjs/tx>ethereum-cryptography>@noble/curves>@noble/hashes": {
-      "globals": {
-        "TextEncoder": true,
-        "crypto": true
-      }
-    },
-    "@ethereumjs/tx>ethereum-cryptography>@noble/hashes": {
-      "globals": {
-        "TextEncoder": true,
-        "crypto": true
+        "@noble/hashes": true
       }
     },
     "@ethereumjs/tx>ethereum-cryptography>@scure/bip32": {
       "packages": {
         "@ethereumjs/tx>ethereum-cryptography>@noble/curves": true,
-        "@ethereumjs/tx>ethereum-cryptography>@scure/bip32>@noble/hashes": true,
-        "@metamask/utils>@scure/base": true
-      }
-    },
-    "@ethereumjs/tx>ethereum-cryptography>@scure/bip32>@noble/hashes": {
-      "globals": {
-        "TextEncoder": true,
-        "crypto": true
+        "@metamask/utils>@scure/base": true,
+        "@noble/hashes": true
       }
     },
     "@ethersproject/abi": {
@@ -389,9 +366,9 @@
         "@ethereumjs/tx": true,
         "@keystonehq/bc-ur-registry-eth": true,
         "@keystonehq/metamask-airgapped-keyring>@keystonehq/base-eth-keyring": true,
+        "@keystonehq/metamask-airgapped-keyring>rlp": true,
         "@metamask/obs-store": true,
         "browserify>buffer": true,
-        "ethereumjs-util>rlp": true,
         "uuid": true,
         "webpack>events": true
       }
@@ -401,15 +378,16 @@
         "@ethereumjs/tx": true,
         "@ethereumjs/tx>@ethereumjs/util": true,
         "@keystonehq/bc-ur-registry-eth": true,
-        "@keystonehq/metamask-airgapped-keyring>@keystonehq/base-eth-keyring>rlp": true,
         "@metamask/eth-trezor-keyring>hdkey": true,
         "browserify>buffer": true,
+        "eth-lattice-keyring>rlp": true,
         "uuid": true
       }
     },
-    "@keystonehq/metamask-airgapped-keyring>@keystonehq/base-eth-keyring>rlp": {
-      "globals": {
-        "TextEncoder": true
+    "@keystonehq/metamask-airgapped-keyring>rlp": {
+      "packages": {
+        "bn.js": true,
+        "browserify>buffer": true
       }
     },
     "@lavamoat/lavadome-react": {
@@ -1608,12 +1586,18 @@
     "@metamask/keyring-controller>ethereumjs-wallet>ethereumjs-util": {
       "packages": {
         "@metamask/keyring-controller>ethereumjs-wallet>ethereum-cryptography": true,
+        "@metamask/keyring-controller>ethereumjs-wallet>ethereumjs-util>rlp": true,
         "bn.js": true,
         "browserify>assert": true,
         "browserify>buffer": true,
         "browserify>insert-module-globals>is-buffer": true,
-        "ethereumjs-util>create-hash": true,
-        "ethereumjs-util>rlp": true
+        "ethereumjs-util>create-hash": true
+      }
+    },
+    "@metamask/keyring-controller>ethereumjs-wallet>ethereumjs-util>rlp": {
+      "packages": {
+        "bn.js": true,
+        "browserify>buffer": true
       }
     },
     "@metamask/logging-controller": {
@@ -2364,9 +2348,20 @@
     "@metamask/smart-transactions-controller>@ethereumjs/tx": {
       "packages": {
         "@ethereumjs/tx>ethereum-cryptography": true,
-        "@metamask/eth-ledger-bridge-keyring>@ethereumjs/rlp": true,
+        "@metamask/smart-transactions-controller>@ethereumjs/tx>@ethereumjs/common": true,
+        "@metamask/smart-transactions-controller>@ethereumjs/tx>@ethereumjs/rlp": true,
+        "@metamask/smart-transactions-controller>@ethereumjs/util": true
+      }
+    },
+    "@metamask/smart-transactions-controller>@ethereumjs/tx>@ethereumjs/common": {
+      "packages": {
         "@metamask/smart-transactions-controller>@ethereumjs/util": true,
-        "@trezor/connect-web>@trezor/connect>@ethereumjs/common": true
+        "webpack>events": true
+      }
+    },
+    "@metamask/smart-transactions-controller>@ethereumjs/tx>@ethereumjs/rlp": {
+      "globals": {
+        "TextEncoder": true
       }
     },
     "@metamask/smart-transactions-controller>@ethereumjs/util": {
@@ -2376,7 +2371,7 @@
       },
       "packages": {
         "@ethereumjs/tx>ethereum-cryptography": true,
-        "@metamask/eth-ledger-bridge-keyring>@ethereumjs/rlp": true,
+        "@metamask/smart-transactions-controller>@ethereumjs/tx>@ethereumjs/rlp": true,
         "webpack>events": true
       }
     },
@@ -2615,6 +2610,7 @@
       },
       "packages": {
         "@ethereumjs/tx": true,
+        "@ethereumjs/tx>@ethereumjs/common": true,
         "@ethereumjs/tx>@ethereumjs/util": true,
         "@ethersproject/abi": true,
         "@ethersproject/contracts": true,
@@ -2627,7 +2623,6 @@
         "@metamask/name-controller>async-mutex": true,
         "@metamask/network-controller": true,
         "@metamask/rpc-errors": true,
-        "@metamask/transaction-controller>@ethereumjs/common": true,
         "@metamask/transaction-controller>@metamask/nonce-tracker": true,
         "@metamask/utils": true,
         "bn.js": true,
@@ -2639,14 +2634,6 @@
         "webpack>events": true
       }
     },
-    "@metamask/transaction-controller>@ethereumjs/common": {
-      "packages": {
-        "@ethereumjs/tx>@ethereumjs/common>crc-32": true,
-        "@ethereumjs/tx>@ethereumjs/util": true,
-        "browserify>buffer": true,
-        "webpack>events": true
-      }
-    },
     "@metamask/transaction-controller>@metamask/nonce-tracker": {
       "packages": {
         "@ethersproject/providers": true,
@@ -3101,23 +3088,6 @@
         "define": true
       }
     },
-    "@trezor/connect-web>@trezor/connect>@ethereumjs/common": {
-      "packages": {
-        "@trezor/connect-web>@trezor/connect>@ethereumjs/common>@ethereumjs/util": true,
-        "webpack>events": true
-      }
-    },
-    "@trezor/connect-web>@trezor/connect>@ethereumjs/common>@ethereumjs/util": {
-      "globals": {
-        "console.warn": true,
-        "fetch": true
-      },
-      "packages": {
-        "@ethereumjs/tx>ethereum-cryptography": true,
-        "@metamask/eth-ledger-bridge-keyring>@ethereumjs/rlp": true,
-        "webpack>events": true
-      }
-    },
     "@trezor/connect-web>@trezor/connect>@trezor/protobuf": {
       "packages": {
         "@swc/helpers>tslib": true,
@@ -3749,16 +3719,59 @@
         "setInterval": true
       },
       "packages": {
-        "@ethereumjs/tx": true,
         "@ethereumjs/tx>@ethereumjs/util": true,
         "bn.js": true,
         "browserify>buffer": true,
         "crypto-browserify": true,
+        "eth-lattice-keyring>@ethereumjs/tx": true,
         "eth-lattice-keyring>gridplus-sdk": true,
         "eth-lattice-keyring>rlp": true,
         "webpack>events": true
       }
     },
+    "eth-lattice-keyring>@ethereumjs/tx": {
+      "packages": {
+        "@ethereumjs/tx>@ethereumjs/common": true,
+        "@ethereumjs/tx>@ethereumjs/rlp": true,
+        "@ethereumjs/tx>@ethereumjs/util": true,
+        "@ethersproject/providers": true,
+        "browserify>buffer": true,
+        "browserify>insert-module-globals>is-buffer": true,
+        "eth-lattice-keyring>@ethereumjs/tx>@chainsafe/ssz": true,
+        "eth-lattice-keyring>@ethereumjs/tx>ethereum-cryptography": true
+      }
+    },
+    "eth-lattice-keyring>@ethereumjs/tx>@chainsafe/ssz": {
+      "packages": {
+        "browserify": true,
+        "browserify>buffer": true,
+        "eth-lattice-keyring>@ethereumjs/tx>@chainsafe/ssz>@chainsafe/persistent-merkle-tree": true,
+        "eth-lattice-keyring>@ethereumjs/tx>@chainsafe/ssz>case": true
+      }
+    },
+    "eth-lattice-keyring>@ethereumjs/tx>@chainsafe/ssz>@chainsafe/persistent-merkle-tree": {
+      "globals": {
+        "WeakRef": true
+      },
+      "packages": {
+        "browserify": true
+      }
+    },
+    "eth-lattice-keyring>@ethereumjs/tx>ethereum-cryptography": {
+      "globals": {
+        "TextDecoder": true,
+        "crypto": true
+      },
+      "packages": {
+        "eth-lattice-keyring>@ethereumjs/tx>ethereum-cryptography>@noble/hashes": true
+      }
+    },
+    "eth-lattice-keyring>@ethereumjs/tx>ethereum-cryptography>@noble/hashes": {
+      "globals": {
+        "TextEncoder": true,
+        "crypto": true
+      }
+    },
     "eth-lattice-keyring>gridplus-sdk": {
       "globals": {
         "AbortController": true,
@@ -3776,54 +3789,67 @@
       "packages": {
         "@ethereumjs/tx>@ethereumjs/common>crc-32": true,
         "@ethersproject/abi": true,
-        "@metamask/eth-ledger-bridge-keyring>@ethereumjs/rlp": true,
-        "@metamask/eth-sig-util": true,
         "@metamask/ethjs>js-sha3": true,
         "@metamask/keyring-api>bech32": true,
-        "@metamask/ppom-validator>elliptic": true,
         "bn.js": true,
         "browserify>buffer": true,
         "eth-lattice-keyring>gridplus-sdk>@ethereumjs/common": true,
         "eth-lattice-keyring>gridplus-sdk>@ethereumjs/tx": true,
         "eth-lattice-keyring>gridplus-sdk>aes-js": 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>bs58check": true,
-        "eth-lattice-keyring>gridplus-sdk>secp256k1": true,
+        "eth-lattice-keyring>gridplus-sdk>elliptic": true,
+        "eth-lattice-keyring>gridplus-sdk>eth-eip712-util-browser": true,
         "eth-lattice-keyring>gridplus-sdk>uuid": true,
+        "eth-lattice-keyring>rlp": true,
+        "ethereumjs-util>ethereum-cryptography>bs58check": true,
         "ethers>@ethersproject/sha2>hash.js": true,
+        "ganache>secp256k1": true,
         "lodash": true
       }
     },
     "eth-lattice-keyring>gridplus-sdk>@ethereumjs/common": {
       "packages": {
-        "eth-lattice-keyring>gridplus-sdk>@ethereumjs/tx>@ethereumjs/util": true,
+        "@ethereumjs/tx>@ethereumjs/common>crc-32": true,
+        "@ethereumjs/tx>@ethereumjs/util": true,
+        "browserify>buffer": true,
         "webpack>events": true
       }
     },
     "eth-lattice-keyring>gridplus-sdk>@ethereumjs/tx": {
       "packages": {
-        "@ethereumjs/tx>ethereum-cryptography": true,
-        "@metamask/eth-ledger-bridge-keyring>@ethereumjs/rlp": true,
+        "@ethereumjs/tx>@ethereumjs/rlp": true,
+        "@ethereumjs/tx>@ethereumjs/util": true,
+        "@ethersproject/providers": true,
+        "browserify>buffer": true,
+        "browserify>insert-module-globals>is-buffer": true,
+        "eth-lattice-keyring>@ethereumjs/tx>@chainsafe/ssz": true,
         "eth-lattice-keyring>gridplus-sdk>@ethereumjs/tx>@ethereumjs/common": true,
-        "eth-lattice-keyring>gridplus-sdk>@ethereumjs/tx>@ethereumjs/util": true
+        "eth-lattice-keyring>gridplus-sdk>@ethereumjs/tx>ethereum-cryptography": true
       }
     },
     "eth-lattice-keyring>gridplus-sdk>@ethereumjs/tx>@ethereumjs/common": {
       "packages": {
-        "eth-lattice-keyring>gridplus-sdk>@ethereumjs/tx>@ethereumjs/util": true,
+        "@ethereumjs/tx>@ethereumjs/common>crc-32": true,
+        "@ethereumjs/tx>@ethereumjs/util": true,
+        "browserify>buffer": true,
         "webpack>events": true
       }
     },
-    "eth-lattice-keyring>gridplus-sdk>@ethereumjs/tx>@ethereumjs/util": {
+    "eth-lattice-keyring>gridplus-sdk>@ethereumjs/tx>ethereum-cryptography": {
       "globals": {
-        "console.warn": true,
-        "fetch": true
+        "TextDecoder": true,
+        "crypto": true
       },
       "packages": {
-        "@ethereumjs/tx>ethereum-cryptography": true,
-        "@metamask/eth-ledger-bridge-keyring>@ethereumjs/rlp": true,
-        "webpack>events": true
+        "eth-lattice-keyring>gridplus-sdk>@ethereumjs/tx>ethereum-cryptography>@noble/hashes": true
+      }
+    },
+    "eth-lattice-keyring>gridplus-sdk>@ethereumjs/tx>ethereum-cryptography>@noble/hashes": {
+      "globals": {
+        "TextEncoder": true,
+        "crypto": true
       }
     },
     "eth-lattice-keyring>gridplus-sdk>aes-js": {
@@ -3837,6 +3863,11 @@
         "define": true
       }
     },
+    "eth-lattice-keyring>gridplus-sdk>bitwise": {
+      "packages": {
+        "browserify>buffer": true
+      }
+    },
     "eth-lattice-keyring>gridplus-sdk>borc": {
       "globals": {
         "console": true
@@ -3858,24 +3889,28 @@
       "globals": {
         "URL": true,
         "URLSearchParams": true,
-        "location": true,
-        "navigator": true
-      }
-    },
-    "eth-lattice-keyring>gridplus-sdk>bs58check": {
-      "packages": {
-        "@noble/hashes": true,
-        "eth-lattice-keyring>gridplus-sdk>bs58check>bs58": true
+        "location": true
       }
     },
-    "eth-lattice-keyring>gridplus-sdk>bs58check>bs58": {
+    "eth-lattice-keyring>gridplus-sdk>elliptic": {
       "packages": {
-        "eth-lattice-keyring>gridplus-sdk>bs58check>bs58>base-x": true
+        "@metamask/ppom-validator>elliptic>brorand": true,
+        "@metamask/ppom-validator>elliptic>hmac-drbg": true,
+        "@metamask/ppom-validator>elliptic>minimalistic-assert": true,
+        "@metamask/ppom-validator>elliptic>minimalistic-crypto-utils": true,
+        "bn.js": true,
+        "ethers>@ethersproject/sha2>hash.js": true,
+        "pumpify>inherits": true
       }
     },
-    "eth-lattice-keyring>gridplus-sdk>secp256k1": {
+    "eth-lattice-keyring>gridplus-sdk>eth-eip712-util-browser": {
+      "globals": {
+        "intToBuffer": true
+      },
       "packages": {
-        "@metamask/ppom-validator>elliptic": true
+        "@metamask/ethjs>js-sha3": true,
+        "bn.js": true,
+        "buffer": true
       }
     },
     "eth-lattice-keyring>gridplus-sdk>uuid": {
@@ -4199,9 +4234,20 @@
     "ethers>@ethersproject/signing-key": {
       "packages": {
         "@ethersproject/bytes": true,
-        "@metamask/ppom-validator>elliptic": true,
         "ethers>@ethersproject/logger": true,
-        "ethers>@ethersproject/properties": true
+        "ethers>@ethersproject/properties": true,
+        "ethers>@ethersproject/signing-key>elliptic": true
+      }
+    },
+    "ethers>@ethersproject/signing-key>elliptic": {
+      "packages": {
+        "@metamask/ppom-validator>elliptic>brorand": true,
+        "@metamask/ppom-validator>elliptic>hmac-drbg": true,
+        "@metamask/ppom-validator>elliptic>minimalistic-assert": true,
+        "@metamask/ppom-validator>elliptic>minimalistic-crypto-utils": true,
+        "bn.js": true,
+        "ethers>@ethersproject/sha2>hash.js": true,
+        "pumpify>inherits": true
       }
     },
     "ethers>@ethersproject/solidity": {
diff --git a/lavamoat/browserify/flask/policy.json b/lavamoat/browserify/flask/policy.json
index 79058c8c6954..4212ef454eea 100644
--- a/lavamoat/browserify/flask/policy.json
+++ b/lavamoat/browserify/flask/policy.json
@@ -150,7 +150,7 @@
         "console.warn": true
       },
       "packages": {
-        "@ethereumjs/tx>@ethereumjs/util>@ethereumjs/rlp": true,
+        "@ethereumjs/tx>@ethereumjs/rlp": true,
         "@ethereumjs/tx>@ethereumjs/util>micro-ftch": true,
         "@ethereumjs/tx>ethereum-cryptography": true,
         "browserify>buffer": true,
@@ -158,11 +158,6 @@
         "webpack>events": true
       }
     },
-    "@ethereumjs/tx>@ethereumjs/util>@ethereumjs/rlp": {
-      "globals": {
-        "TextEncoder": true
-      }
-    },
     "@ethereumjs/tx>@ethereumjs/util>micro-ftch": {
       "globals": {
         "Headers": true,
@@ -188,8 +183,8 @@
       },
       "packages": {
         "@ethereumjs/tx>ethereum-cryptography>@noble/curves": true,
-        "@ethereumjs/tx>ethereum-cryptography>@noble/hashes": true,
-        "@ethereumjs/tx>ethereum-cryptography>@scure/bip32": true
+        "@ethereumjs/tx>ethereum-cryptography>@scure/bip32": true,
+        "@noble/hashes": true
       }
     },
     "@ethereumjs/tx>ethereum-cryptography>@noble/curves": {
@@ -197,32 +192,14 @@
         "TextEncoder": true
       },
       "packages": {
-        "@ethereumjs/tx>ethereum-cryptography>@noble/curves>@noble/hashes": true
-      }
-    },
-    "@ethereumjs/tx>ethereum-cryptography>@noble/curves>@noble/hashes": {
-      "globals": {
-        "TextEncoder": true,
-        "crypto": true
-      }
-    },
-    "@ethereumjs/tx>ethereum-cryptography>@noble/hashes": {
-      "globals": {
-        "TextEncoder": true,
-        "crypto": true
+        "@noble/hashes": true
       }
     },
     "@ethereumjs/tx>ethereum-cryptography>@scure/bip32": {
       "packages": {
         "@ethereumjs/tx>ethereum-cryptography>@noble/curves": true,
-        "@ethereumjs/tx>ethereum-cryptography>@scure/bip32>@noble/hashes": true,
-        "@metamask/utils>@scure/base": true
-      }
-    },
-    "@ethereumjs/tx>ethereum-cryptography>@scure/bip32>@noble/hashes": {
-      "globals": {
-        "TextEncoder": true,
-        "crypto": true
+        "@metamask/utils>@scure/base": true,
+        "@noble/hashes": true
       }
     },
     "@ethersproject/abi": {
@@ -389,9 +366,9 @@
         "@ethereumjs/tx": true,
         "@keystonehq/bc-ur-registry-eth": true,
         "@keystonehq/metamask-airgapped-keyring>@keystonehq/base-eth-keyring": true,
+        "@keystonehq/metamask-airgapped-keyring>rlp": true,
         "@metamask/obs-store": true,
         "browserify>buffer": true,
-        "ethereumjs-util>rlp": true,
         "uuid": true,
         "webpack>events": true
       }
@@ -401,15 +378,16 @@
         "@ethereumjs/tx": true,
         "@ethereumjs/tx>@ethereumjs/util": true,
         "@keystonehq/bc-ur-registry-eth": true,
-        "@keystonehq/metamask-airgapped-keyring>@keystonehq/base-eth-keyring>rlp": true,
         "@metamask/eth-trezor-keyring>hdkey": true,
         "browserify>buffer": true,
+        "eth-lattice-keyring>rlp": true,
         "uuid": true
       }
     },
-    "@keystonehq/metamask-airgapped-keyring>@keystonehq/base-eth-keyring>rlp": {
-      "globals": {
-        "TextEncoder": true
+    "@keystonehq/metamask-airgapped-keyring>rlp": {
+      "packages": {
+        "bn.js": true,
+        "browserify>buffer": true
       }
     },
     "@lavamoat/lavadome-react": {
@@ -1608,12 +1586,18 @@
     "@metamask/keyring-controller>ethereumjs-wallet>ethereumjs-util": {
       "packages": {
         "@metamask/keyring-controller>ethereumjs-wallet>ethereum-cryptography": true,
+        "@metamask/keyring-controller>ethereumjs-wallet>ethereumjs-util>rlp": true,
         "bn.js": true,
         "browserify>assert": true,
         "browserify>buffer": true,
         "browserify>insert-module-globals>is-buffer": true,
-        "ethereumjs-util>create-hash": true,
-        "ethereumjs-util>rlp": true
+        "ethereumjs-util>create-hash": true
+      }
+    },
+    "@metamask/keyring-controller>ethereumjs-wallet>ethereumjs-util>rlp": {
+      "packages": {
+        "bn.js": true,
+        "browserify>buffer": true
       }
     },
     "@metamask/logging-controller": {
@@ -2364,9 +2348,20 @@
     "@metamask/smart-transactions-controller>@ethereumjs/tx": {
       "packages": {
         "@ethereumjs/tx>ethereum-cryptography": true,
-        "@metamask/eth-ledger-bridge-keyring>@ethereumjs/rlp": true,
+        "@metamask/smart-transactions-controller>@ethereumjs/tx>@ethereumjs/common": true,
+        "@metamask/smart-transactions-controller>@ethereumjs/tx>@ethereumjs/rlp": true,
+        "@metamask/smart-transactions-controller>@ethereumjs/util": true
+      }
+    },
+    "@metamask/smart-transactions-controller>@ethereumjs/tx>@ethereumjs/common": {
+      "packages": {
         "@metamask/smart-transactions-controller>@ethereumjs/util": true,
-        "@trezor/connect-web>@trezor/connect>@ethereumjs/common": true
+        "webpack>events": true
+      }
+    },
+    "@metamask/smart-transactions-controller>@ethereumjs/tx>@ethereumjs/rlp": {
+      "globals": {
+        "TextEncoder": true
       }
     },
     "@metamask/smart-transactions-controller>@ethereumjs/util": {
@@ -2376,7 +2371,7 @@
       },
       "packages": {
         "@ethereumjs/tx>ethereum-cryptography": true,
-        "@metamask/eth-ledger-bridge-keyring>@ethereumjs/rlp": true,
+        "@metamask/smart-transactions-controller>@ethereumjs/tx>@ethereumjs/rlp": true,
         "webpack>events": true
       }
     },
@@ -2615,6 +2610,7 @@
       },
       "packages": {
         "@ethereumjs/tx": true,
+        "@ethereumjs/tx>@ethereumjs/common": true,
         "@ethereumjs/tx>@ethereumjs/util": true,
         "@ethersproject/abi": true,
         "@ethersproject/contracts": true,
@@ -2627,7 +2623,6 @@
         "@metamask/name-controller>async-mutex": true,
         "@metamask/network-controller": true,
         "@metamask/rpc-errors": true,
-        "@metamask/transaction-controller>@ethereumjs/common": true,
         "@metamask/transaction-controller>@metamask/nonce-tracker": true,
         "@metamask/utils": true,
         "bn.js": true,
@@ -2639,14 +2634,6 @@
         "webpack>events": true
       }
     },
-    "@metamask/transaction-controller>@ethereumjs/common": {
-      "packages": {
-        "@ethereumjs/tx>@ethereumjs/common>crc-32": true,
-        "@ethereumjs/tx>@ethereumjs/util": true,
-        "browserify>buffer": true,
-        "webpack>events": true
-      }
-    },
     "@metamask/transaction-controller>@metamask/nonce-tracker": {
       "packages": {
         "@ethersproject/providers": true,
@@ -3101,23 +3088,6 @@
         "define": true
       }
     },
-    "@trezor/connect-web>@trezor/connect>@ethereumjs/common": {
-      "packages": {
-        "@trezor/connect-web>@trezor/connect>@ethereumjs/common>@ethereumjs/util": true,
-        "webpack>events": true
-      }
-    },
-    "@trezor/connect-web>@trezor/connect>@ethereumjs/common>@ethereumjs/util": {
-      "globals": {
-        "console.warn": true,
-        "fetch": true
-      },
-      "packages": {
-        "@ethereumjs/tx>ethereum-cryptography": true,
-        "@metamask/eth-ledger-bridge-keyring>@ethereumjs/rlp": true,
-        "webpack>events": true
-      }
-    },
     "@trezor/connect-web>@trezor/connect>@trezor/protobuf": {
       "packages": {
         "@swc/helpers>tslib": true,
@@ -3749,16 +3719,59 @@
         "setInterval": true
       },
       "packages": {
-        "@ethereumjs/tx": true,
         "@ethereumjs/tx>@ethereumjs/util": true,
         "bn.js": true,
         "browserify>buffer": true,
         "crypto-browserify": true,
+        "eth-lattice-keyring>@ethereumjs/tx": true,
         "eth-lattice-keyring>gridplus-sdk": true,
         "eth-lattice-keyring>rlp": true,
         "webpack>events": true
       }
     },
+    "eth-lattice-keyring>@ethereumjs/tx": {
+      "packages": {
+        "@ethereumjs/tx>@ethereumjs/common": true,
+        "@ethereumjs/tx>@ethereumjs/rlp": true,
+        "@ethereumjs/tx>@ethereumjs/util": true,
+        "@ethersproject/providers": true,
+        "browserify>buffer": true,
+        "browserify>insert-module-globals>is-buffer": true,
+        "eth-lattice-keyring>@ethereumjs/tx>@chainsafe/ssz": true,
+        "eth-lattice-keyring>@ethereumjs/tx>ethereum-cryptography": true
+      }
+    },
+    "eth-lattice-keyring>@ethereumjs/tx>@chainsafe/ssz": {
+      "packages": {
+        "browserify": true,
+        "browserify>buffer": true,
+        "eth-lattice-keyring>@ethereumjs/tx>@chainsafe/ssz>@chainsafe/persistent-merkle-tree": true,
+        "eth-lattice-keyring>@ethereumjs/tx>@chainsafe/ssz>case": true
+      }
+    },
+    "eth-lattice-keyring>@ethereumjs/tx>@chainsafe/ssz>@chainsafe/persistent-merkle-tree": {
+      "globals": {
+        "WeakRef": true
+      },
+      "packages": {
+        "browserify": true
+      }
+    },
+    "eth-lattice-keyring>@ethereumjs/tx>ethereum-cryptography": {
+      "globals": {
+        "TextDecoder": true,
+        "crypto": true
+      },
+      "packages": {
+        "eth-lattice-keyring>@ethereumjs/tx>ethereum-cryptography>@noble/hashes": true
+      }
+    },
+    "eth-lattice-keyring>@ethereumjs/tx>ethereum-cryptography>@noble/hashes": {
+      "globals": {
+        "TextEncoder": true,
+        "crypto": true
+      }
+    },
     "eth-lattice-keyring>gridplus-sdk": {
       "globals": {
         "AbortController": true,
@@ -3776,54 +3789,67 @@
       "packages": {
         "@ethereumjs/tx>@ethereumjs/common>crc-32": true,
         "@ethersproject/abi": true,
-        "@metamask/eth-ledger-bridge-keyring>@ethereumjs/rlp": true,
-        "@metamask/eth-sig-util": true,
         "@metamask/ethjs>js-sha3": true,
         "@metamask/keyring-api>bech32": true,
-        "@metamask/ppom-validator>elliptic": true,
         "bn.js": true,
         "browserify>buffer": true,
         "eth-lattice-keyring>gridplus-sdk>@ethereumjs/common": true,
         "eth-lattice-keyring>gridplus-sdk>@ethereumjs/tx": true,
         "eth-lattice-keyring>gridplus-sdk>aes-js": 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>bs58check": true,
-        "eth-lattice-keyring>gridplus-sdk>secp256k1": true,
+        "eth-lattice-keyring>gridplus-sdk>elliptic": true,
+        "eth-lattice-keyring>gridplus-sdk>eth-eip712-util-browser": true,
         "eth-lattice-keyring>gridplus-sdk>uuid": true,
+        "eth-lattice-keyring>rlp": true,
+        "ethereumjs-util>ethereum-cryptography>bs58check": true,
         "ethers>@ethersproject/sha2>hash.js": true,
+        "ganache>secp256k1": true,
         "lodash": true
       }
     },
     "eth-lattice-keyring>gridplus-sdk>@ethereumjs/common": {
       "packages": {
-        "eth-lattice-keyring>gridplus-sdk>@ethereumjs/tx>@ethereumjs/util": true,
+        "@ethereumjs/tx>@ethereumjs/common>crc-32": true,
+        "@ethereumjs/tx>@ethereumjs/util": true,
+        "browserify>buffer": true,
         "webpack>events": true
       }
     },
     "eth-lattice-keyring>gridplus-sdk>@ethereumjs/tx": {
       "packages": {
-        "@ethereumjs/tx>ethereum-cryptography": true,
-        "@metamask/eth-ledger-bridge-keyring>@ethereumjs/rlp": true,
+        "@ethereumjs/tx>@ethereumjs/rlp": true,
+        "@ethereumjs/tx>@ethereumjs/util": true,
+        "@ethersproject/providers": true,
+        "browserify>buffer": true,
+        "browserify>insert-module-globals>is-buffer": true,
+        "eth-lattice-keyring>@ethereumjs/tx>@chainsafe/ssz": true,
         "eth-lattice-keyring>gridplus-sdk>@ethereumjs/tx>@ethereumjs/common": true,
-        "eth-lattice-keyring>gridplus-sdk>@ethereumjs/tx>@ethereumjs/util": true
+        "eth-lattice-keyring>gridplus-sdk>@ethereumjs/tx>ethereum-cryptography": true
       }
     },
     "eth-lattice-keyring>gridplus-sdk>@ethereumjs/tx>@ethereumjs/common": {
       "packages": {
-        "eth-lattice-keyring>gridplus-sdk>@ethereumjs/tx>@ethereumjs/util": true,
+        "@ethereumjs/tx>@ethereumjs/common>crc-32": true,
+        "@ethereumjs/tx>@ethereumjs/util": true,
+        "browserify>buffer": true,
         "webpack>events": true
       }
     },
-    "eth-lattice-keyring>gridplus-sdk>@ethereumjs/tx>@ethereumjs/util": {
+    "eth-lattice-keyring>gridplus-sdk>@ethereumjs/tx>ethereum-cryptography": {
       "globals": {
-        "console.warn": true,
-        "fetch": true
+        "TextDecoder": true,
+        "crypto": true
       },
       "packages": {
-        "@ethereumjs/tx>ethereum-cryptography": true,
-        "@metamask/eth-ledger-bridge-keyring>@ethereumjs/rlp": true,
-        "webpack>events": true
+        "eth-lattice-keyring>gridplus-sdk>@ethereumjs/tx>ethereum-cryptography>@noble/hashes": true
+      }
+    },
+    "eth-lattice-keyring>gridplus-sdk>@ethereumjs/tx>ethereum-cryptography>@noble/hashes": {
+      "globals": {
+        "TextEncoder": true,
+        "crypto": true
       }
     },
     "eth-lattice-keyring>gridplus-sdk>aes-js": {
@@ -3837,6 +3863,11 @@
         "define": true
       }
     },
+    "eth-lattice-keyring>gridplus-sdk>bitwise": {
+      "packages": {
+        "browserify>buffer": true
+      }
+    },
     "eth-lattice-keyring>gridplus-sdk>borc": {
       "globals": {
         "console": true
@@ -3858,24 +3889,28 @@
       "globals": {
         "URL": true,
         "URLSearchParams": true,
-        "location": true,
-        "navigator": true
-      }
-    },
-    "eth-lattice-keyring>gridplus-sdk>bs58check": {
-      "packages": {
-        "@noble/hashes": true,
-        "eth-lattice-keyring>gridplus-sdk>bs58check>bs58": true
+        "location": true
       }
     },
-    "eth-lattice-keyring>gridplus-sdk>bs58check>bs58": {
+    "eth-lattice-keyring>gridplus-sdk>elliptic": {
       "packages": {
-        "eth-lattice-keyring>gridplus-sdk>bs58check>bs58>base-x": true
+        "@metamask/ppom-validator>elliptic>brorand": true,
+        "@metamask/ppom-validator>elliptic>hmac-drbg": true,
+        "@metamask/ppom-validator>elliptic>minimalistic-assert": true,
+        "@metamask/ppom-validator>elliptic>minimalistic-crypto-utils": true,
+        "bn.js": true,
+        "ethers>@ethersproject/sha2>hash.js": true,
+        "pumpify>inherits": true
       }
     },
-    "eth-lattice-keyring>gridplus-sdk>secp256k1": {
+    "eth-lattice-keyring>gridplus-sdk>eth-eip712-util-browser": {
+      "globals": {
+        "intToBuffer": true
+      },
       "packages": {
-        "@metamask/ppom-validator>elliptic": true
+        "@metamask/ethjs>js-sha3": true,
+        "bn.js": true,
+        "buffer": true
       }
     },
     "eth-lattice-keyring>gridplus-sdk>uuid": {
@@ -4199,9 +4234,20 @@
     "ethers>@ethersproject/signing-key": {
       "packages": {
         "@ethersproject/bytes": true,
-        "@metamask/ppom-validator>elliptic": true,
         "ethers>@ethersproject/logger": true,
-        "ethers>@ethersproject/properties": true
+        "ethers>@ethersproject/properties": true,
+        "ethers>@ethersproject/signing-key>elliptic": true
+      }
+    },
+    "ethers>@ethersproject/signing-key>elliptic": {
+      "packages": {
+        "@metamask/ppom-validator>elliptic>brorand": true,
+        "@metamask/ppom-validator>elliptic>hmac-drbg": true,
+        "@metamask/ppom-validator>elliptic>minimalistic-assert": true,
+        "@metamask/ppom-validator>elliptic>minimalistic-crypto-utils": true,
+        "bn.js": true,
+        "ethers>@ethersproject/sha2>hash.js": true,
+        "pumpify>inherits": true
       }
     },
     "ethers>@ethersproject/solidity": {
diff --git a/lavamoat/browserify/main/policy.json b/lavamoat/browserify/main/policy.json
index 79058c8c6954..4212ef454eea 100644
--- a/lavamoat/browserify/main/policy.json
+++ b/lavamoat/browserify/main/policy.json
@@ -150,7 +150,7 @@
         "console.warn": true
       },
       "packages": {
-        "@ethereumjs/tx>@ethereumjs/util>@ethereumjs/rlp": true,
+        "@ethereumjs/tx>@ethereumjs/rlp": true,
         "@ethereumjs/tx>@ethereumjs/util>micro-ftch": true,
         "@ethereumjs/tx>ethereum-cryptography": true,
         "browserify>buffer": true,
@@ -158,11 +158,6 @@
         "webpack>events": true
       }
     },
-    "@ethereumjs/tx>@ethereumjs/util>@ethereumjs/rlp": {
-      "globals": {
-        "TextEncoder": true
-      }
-    },
     "@ethereumjs/tx>@ethereumjs/util>micro-ftch": {
       "globals": {
         "Headers": true,
@@ -188,8 +183,8 @@
       },
       "packages": {
         "@ethereumjs/tx>ethereum-cryptography>@noble/curves": true,
-        "@ethereumjs/tx>ethereum-cryptography>@noble/hashes": true,
-        "@ethereumjs/tx>ethereum-cryptography>@scure/bip32": true
+        "@ethereumjs/tx>ethereum-cryptography>@scure/bip32": true,
+        "@noble/hashes": true
       }
     },
     "@ethereumjs/tx>ethereum-cryptography>@noble/curves": {
@@ -197,32 +192,14 @@
         "TextEncoder": true
       },
       "packages": {
-        "@ethereumjs/tx>ethereum-cryptography>@noble/curves>@noble/hashes": true
-      }
-    },
-    "@ethereumjs/tx>ethereum-cryptography>@noble/curves>@noble/hashes": {
-      "globals": {
-        "TextEncoder": true,
-        "crypto": true
-      }
-    },
-    "@ethereumjs/tx>ethereum-cryptography>@noble/hashes": {
-      "globals": {
-        "TextEncoder": true,
-        "crypto": true
+        "@noble/hashes": true
       }
     },
     "@ethereumjs/tx>ethereum-cryptography>@scure/bip32": {
       "packages": {
         "@ethereumjs/tx>ethereum-cryptography>@noble/curves": true,
-        "@ethereumjs/tx>ethereum-cryptography>@scure/bip32>@noble/hashes": true,
-        "@metamask/utils>@scure/base": true
-      }
-    },
-    "@ethereumjs/tx>ethereum-cryptography>@scure/bip32>@noble/hashes": {
-      "globals": {
-        "TextEncoder": true,
-        "crypto": true
+        "@metamask/utils>@scure/base": true,
+        "@noble/hashes": true
       }
     },
     "@ethersproject/abi": {
@@ -389,9 +366,9 @@
         "@ethereumjs/tx": true,
         "@keystonehq/bc-ur-registry-eth": true,
         "@keystonehq/metamask-airgapped-keyring>@keystonehq/base-eth-keyring": true,
+        "@keystonehq/metamask-airgapped-keyring>rlp": true,
         "@metamask/obs-store": true,
         "browserify>buffer": true,
-        "ethereumjs-util>rlp": true,
         "uuid": true,
         "webpack>events": true
       }
@@ -401,15 +378,16 @@
         "@ethereumjs/tx": true,
         "@ethereumjs/tx>@ethereumjs/util": true,
         "@keystonehq/bc-ur-registry-eth": true,
-        "@keystonehq/metamask-airgapped-keyring>@keystonehq/base-eth-keyring>rlp": true,
         "@metamask/eth-trezor-keyring>hdkey": true,
         "browserify>buffer": true,
+        "eth-lattice-keyring>rlp": true,
         "uuid": true
       }
     },
-    "@keystonehq/metamask-airgapped-keyring>@keystonehq/base-eth-keyring>rlp": {
-      "globals": {
-        "TextEncoder": true
+    "@keystonehq/metamask-airgapped-keyring>rlp": {
+      "packages": {
+        "bn.js": true,
+        "browserify>buffer": true
       }
     },
     "@lavamoat/lavadome-react": {
@@ -1608,12 +1586,18 @@
     "@metamask/keyring-controller>ethereumjs-wallet>ethereumjs-util": {
       "packages": {
         "@metamask/keyring-controller>ethereumjs-wallet>ethereum-cryptography": true,
+        "@metamask/keyring-controller>ethereumjs-wallet>ethereumjs-util>rlp": true,
         "bn.js": true,
         "browserify>assert": true,
         "browserify>buffer": true,
         "browserify>insert-module-globals>is-buffer": true,
-        "ethereumjs-util>create-hash": true,
-        "ethereumjs-util>rlp": true
+        "ethereumjs-util>create-hash": true
+      }
+    },
+    "@metamask/keyring-controller>ethereumjs-wallet>ethereumjs-util>rlp": {
+      "packages": {
+        "bn.js": true,
+        "browserify>buffer": true
       }
     },
     "@metamask/logging-controller": {
@@ -2364,9 +2348,20 @@
     "@metamask/smart-transactions-controller>@ethereumjs/tx": {
       "packages": {
         "@ethereumjs/tx>ethereum-cryptography": true,
-        "@metamask/eth-ledger-bridge-keyring>@ethereumjs/rlp": true,
+        "@metamask/smart-transactions-controller>@ethereumjs/tx>@ethereumjs/common": true,
+        "@metamask/smart-transactions-controller>@ethereumjs/tx>@ethereumjs/rlp": true,
+        "@metamask/smart-transactions-controller>@ethereumjs/util": true
+      }
+    },
+    "@metamask/smart-transactions-controller>@ethereumjs/tx>@ethereumjs/common": {
+      "packages": {
         "@metamask/smart-transactions-controller>@ethereumjs/util": true,
-        "@trezor/connect-web>@trezor/connect>@ethereumjs/common": true
+        "webpack>events": true
+      }
+    },
+    "@metamask/smart-transactions-controller>@ethereumjs/tx>@ethereumjs/rlp": {
+      "globals": {
+        "TextEncoder": true
       }
     },
     "@metamask/smart-transactions-controller>@ethereumjs/util": {
@@ -2376,7 +2371,7 @@
       },
       "packages": {
         "@ethereumjs/tx>ethereum-cryptography": true,
-        "@metamask/eth-ledger-bridge-keyring>@ethereumjs/rlp": true,
+        "@metamask/smart-transactions-controller>@ethereumjs/tx>@ethereumjs/rlp": true,
         "webpack>events": true
       }
     },
@@ -2615,6 +2610,7 @@
       },
       "packages": {
         "@ethereumjs/tx": true,
+        "@ethereumjs/tx>@ethereumjs/common": true,
         "@ethereumjs/tx>@ethereumjs/util": true,
         "@ethersproject/abi": true,
         "@ethersproject/contracts": true,
@@ -2627,7 +2623,6 @@
         "@metamask/name-controller>async-mutex": true,
         "@metamask/network-controller": true,
         "@metamask/rpc-errors": true,
-        "@metamask/transaction-controller>@ethereumjs/common": true,
         "@metamask/transaction-controller>@metamask/nonce-tracker": true,
         "@metamask/utils": true,
         "bn.js": true,
@@ -2639,14 +2634,6 @@
         "webpack>events": true
       }
     },
-    "@metamask/transaction-controller>@ethereumjs/common": {
-      "packages": {
-        "@ethereumjs/tx>@ethereumjs/common>crc-32": true,
-        "@ethereumjs/tx>@ethereumjs/util": true,
-        "browserify>buffer": true,
-        "webpack>events": true
-      }
-    },
     "@metamask/transaction-controller>@metamask/nonce-tracker": {
       "packages": {
         "@ethersproject/providers": true,
@@ -3101,23 +3088,6 @@
         "define": true
       }
     },
-    "@trezor/connect-web>@trezor/connect>@ethereumjs/common": {
-      "packages": {
-        "@trezor/connect-web>@trezor/connect>@ethereumjs/common>@ethereumjs/util": true,
-        "webpack>events": true
-      }
-    },
-    "@trezor/connect-web>@trezor/connect>@ethereumjs/common>@ethereumjs/util": {
-      "globals": {
-        "console.warn": true,
-        "fetch": true
-      },
-      "packages": {
-        "@ethereumjs/tx>ethereum-cryptography": true,
-        "@metamask/eth-ledger-bridge-keyring>@ethereumjs/rlp": true,
-        "webpack>events": true
-      }
-    },
     "@trezor/connect-web>@trezor/connect>@trezor/protobuf": {
       "packages": {
         "@swc/helpers>tslib": true,
@@ -3749,16 +3719,59 @@
         "setInterval": true
       },
       "packages": {
-        "@ethereumjs/tx": true,
         "@ethereumjs/tx>@ethereumjs/util": true,
         "bn.js": true,
         "browserify>buffer": true,
         "crypto-browserify": true,
+        "eth-lattice-keyring>@ethereumjs/tx": true,
         "eth-lattice-keyring>gridplus-sdk": true,
         "eth-lattice-keyring>rlp": true,
         "webpack>events": true
       }
     },
+    "eth-lattice-keyring>@ethereumjs/tx": {
+      "packages": {
+        "@ethereumjs/tx>@ethereumjs/common": true,
+        "@ethereumjs/tx>@ethereumjs/rlp": true,
+        "@ethereumjs/tx>@ethereumjs/util": true,
+        "@ethersproject/providers": true,
+        "browserify>buffer": true,
+        "browserify>insert-module-globals>is-buffer": true,
+        "eth-lattice-keyring>@ethereumjs/tx>@chainsafe/ssz": true,
+        "eth-lattice-keyring>@ethereumjs/tx>ethereum-cryptography": true
+      }
+    },
+    "eth-lattice-keyring>@ethereumjs/tx>@chainsafe/ssz": {
+      "packages": {
+        "browserify": true,
+        "browserify>buffer": true,
+        "eth-lattice-keyring>@ethereumjs/tx>@chainsafe/ssz>@chainsafe/persistent-merkle-tree": true,
+        "eth-lattice-keyring>@ethereumjs/tx>@chainsafe/ssz>case": true
+      }
+    },
+    "eth-lattice-keyring>@ethereumjs/tx>@chainsafe/ssz>@chainsafe/persistent-merkle-tree": {
+      "globals": {
+        "WeakRef": true
+      },
+      "packages": {
+        "browserify": true
+      }
+    },
+    "eth-lattice-keyring>@ethereumjs/tx>ethereum-cryptography": {
+      "globals": {
+        "TextDecoder": true,
+        "crypto": true
+      },
+      "packages": {
+        "eth-lattice-keyring>@ethereumjs/tx>ethereum-cryptography>@noble/hashes": true
+      }
+    },
+    "eth-lattice-keyring>@ethereumjs/tx>ethereum-cryptography>@noble/hashes": {
+      "globals": {
+        "TextEncoder": true,
+        "crypto": true
+      }
+    },
     "eth-lattice-keyring>gridplus-sdk": {
       "globals": {
         "AbortController": true,
@@ -3776,54 +3789,67 @@
       "packages": {
         "@ethereumjs/tx>@ethereumjs/common>crc-32": true,
         "@ethersproject/abi": true,
-        "@metamask/eth-ledger-bridge-keyring>@ethereumjs/rlp": true,
-        "@metamask/eth-sig-util": true,
         "@metamask/ethjs>js-sha3": true,
         "@metamask/keyring-api>bech32": true,
-        "@metamask/ppom-validator>elliptic": true,
         "bn.js": true,
         "browserify>buffer": true,
         "eth-lattice-keyring>gridplus-sdk>@ethereumjs/common": true,
         "eth-lattice-keyring>gridplus-sdk>@ethereumjs/tx": true,
         "eth-lattice-keyring>gridplus-sdk>aes-js": 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>bs58check": true,
-        "eth-lattice-keyring>gridplus-sdk>secp256k1": true,
+        "eth-lattice-keyring>gridplus-sdk>elliptic": true,
+        "eth-lattice-keyring>gridplus-sdk>eth-eip712-util-browser": true,
         "eth-lattice-keyring>gridplus-sdk>uuid": true,
+        "eth-lattice-keyring>rlp": true,
+        "ethereumjs-util>ethereum-cryptography>bs58check": true,
         "ethers>@ethersproject/sha2>hash.js": true,
+        "ganache>secp256k1": true,
         "lodash": true
       }
     },
     "eth-lattice-keyring>gridplus-sdk>@ethereumjs/common": {
       "packages": {
-        "eth-lattice-keyring>gridplus-sdk>@ethereumjs/tx>@ethereumjs/util": true,
+        "@ethereumjs/tx>@ethereumjs/common>crc-32": true,
+        "@ethereumjs/tx>@ethereumjs/util": true,
+        "browserify>buffer": true,
         "webpack>events": true
       }
     },
     "eth-lattice-keyring>gridplus-sdk>@ethereumjs/tx": {
       "packages": {
-        "@ethereumjs/tx>ethereum-cryptography": true,
-        "@metamask/eth-ledger-bridge-keyring>@ethereumjs/rlp": true,
+        "@ethereumjs/tx>@ethereumjs/rlp": true,
+        "@ethereumjs/tx>@ethereumjs/util": true,
+        "@ethersproject/providers": true,
+        "browserify>buffer": true,
+        "browserify>insert-module-globals>is-buffer": true,
+        "eth-lattice-keyring>@ethereumjs/tx>@chainsafe/ssz": true,
         "eth-lattice-keyring>gridplus-sdk>@ethereumjs/tx>@ethereumjs/common": true,
-        "eth-lattice-keyring>gridplus-sdk>@ethereumjs/tx>@ethereumjs/util": true
+        "eth-lattice-keyring>gridplus-sdk>@ethereumjs/tx>ethereum-cryptography": true
       }
     },
     "eth-lattice-keyring>gridplus-sdk>@ethereumjs/tx>@ethereumjs/common": {
       "packages": {
-        "eth-lattice-keyring>gridplus-sdk>@ethereumjs/tx>@ethereumjs/util": true,
+        "@ethereumjs/tx>@ethereumjs/common>crc-32": true,
+        "@ethereumjs/tx>@ethereumjs/util": true,
+        "browserify>buffer": true,
         "webpack>events": true
       }
     },
-    "eth-lattice-keyring>gridplus-sdk>@ethereumjs/tx>@ethereumjs/util": {
+    "eth-lattice-keyring>gridplus-sdk>@ethereumjs/tx>ethereum-cryptography": {
       "globals": {
-        "console.warn": true,
-        "fetch": true
+        "TextDecoder": true,
+        "crypto": true
       },
       "packages": {
-        "@ethereumjs/tx>ethereum-cryptography": true,
-        "@metamask/eth-ledger-bridge-keyring>@ethereumjs/rlp": true,
-        "webpack>events": true
+        "eth-lattice-keyring>gridplus-sdk>@ethereumjs/tx>ethereum-cryptography>@noble/hashes": true
+      }
+    },
+    "eth-lattice-keyring>gridplus-sdk>@ethereumjs/tx>ethereum-cryptography>@noble/hashes": {
+      "globals": {
+        "TextEncoder": true,
+        "crypto": true
       }
     },
     "eth-lattice-keyring>gridplus-sdk>aes-js": {
@@ -3837,6 +3863,11 @@
         "define": true
       }
     },
+    "eth-lattice-keyring>gridplus-sdk>bitwise": {
+      "packages": {
+        "browserify>buffer": true
+      }
+    },
     "eth-lattice-keyring>gridplus-sdk>borc": {
       "globals": {
         "console": true
@@ -3858,24 +3889,28 @@
       "globals": {
         "URL": true,
         "URLSearchParams": true,
-        "location": true,
-        "navigator": true
-      }
-    },
-    "eth-lattice-keyring>gridplus-sdk>bs58check": {
-      "packages": {
-        "@noble/hashes": true,
-        "eth-lattice-keyring>gridplus-sdk>bs58check>bs58": true
+        "location": true
       }
     },
-    "eth-lattice-keyring>gridplus-sdk>bs58check>bs58": {
+    "eth-lattice-keyring>gridplus-sdk>elliptic": {
       "packages": {
-        "eth-lattice-keyring>gridplus-sdk>bs58check>bs58>base-x": true
+        "@metamask/ppom-validator>elliptic>brorand": true,
+        "@metamask/ppom-validator>elliptic>hmac-drbg": true,
+        "@metamask/ppom-validator>elliptic>minimalistic-assert": true,
+        "@metamask/ppom-validator>elliptic>minimalistic-crypto-utils": true,
+        "bn.js": true,
+        "ethers>@ethersproject/sha2>hash.js": true,
+        "pumpify>inherits": true
       }
     },
-    "eth-lattice-keyring>gridplus-sdk>secp256k1": {
+    "eth-lattice-keyring>gridplus-sdk>eth-eip712-util-browser": {
+      "globals": {
+        "intToBuffer": true
+      },
       "packages": {
-        "@metamask/ppom-validator>elliptic": true
+        "@metamask/ethjs>js-sha3": true,
+        "bn.js": true,
+        "buffer": true
       }
     },
     "eth-lattice-keyring>gridplus-sdk>uuid": {
@@ -4199,9 +4234,20 @@
     "ethers>@ethersproject/signing-key": {
       "packages": {
         "@ethersproject/bytes": true,
-        "@metamask/ppom-validator>elliptic": true,
         "ethers>@ethersproject/logger": true,
-        "ethers>@ethersproject/properties": true
+        "ethers>@ethersproject/properties": true,
+        "ethers>@ethersproject/signing-key>elliptic": true
+      }
+    },
+    "ethers>@ethersproject/signing-key>elliptic": {
+      "packages": {
+        "@metamask/ppom-validator>elliptic>brorand": true,
+        "@metamask/ppom-validator>elliptic>hmac-drbg": true,
+        "@metamask/ppom-validator>elliptic>minimalistic-assert": true,
+        "@metamask/ppom-validator>elliptic>minimalistic-crypto-utils": true,
+        "bn.js": true,
+        "ethers>@ethersproject/sha2>hash.js": true,
+        "pumpify>inherits": true
       }
     },
     "ethers>@ethersproject/solidity": {
diff --git a/lavamoat/browserify/mmi/policy.json b/lavamoat/browserify/mmi/policy.json
index 08a75ac8612b..5234fe8d6fbb 100644
--- a/lavamoat/browserify/mmi/policy.json
+++ b/lavamoat/browserify/mmi/policy.json
@@ -150,7 +150,7 @@
         "console.warn": true
       },
       "packages": {
-        "@ethereumjs/tx>@ethereumjs/util>@ethereumjs/rlp": true,
+        "@ethereumjs/tx>@ethereumjs/rlp": true,
         "@ethereumjs/tx>@ethereumjs/util>micro-ftch": true,
         "@ethereumjs/tx>ethereum-cryptography": true,
         "browserify>buffer": true,
@@ -158,11 +158,6 @@
         "webpack>events": true
       }
     },
-    "@ethereumjs/tx>@ethereumjs/util>@ethereumjs/rlp": {
-      "globals": {
-        "TextEncoder": true
-      }
-    },
     "@ethereumjs/tx>@ethereumjs/util>micro-ftch": {
       "globals": {
         "Headers": true,
@@ -188,8 +183,8 @@
       },
       "packages": {
         "@ethereumjs/tx>ethereum-cryptography>@noble/curves": true,
-        "@ethereumjs/tx>ethereum-cryptography>@noble/hashes": true,
-        "@ethereumjs/tx>ethereum-cryptography>@scure/bip32": true
+        "@ethereumjs/tx>ethereum-cryptography>@scure/bip32": true,
+        "@noble/hashes": true
       }
     },
     "@ethereumjs/tx>ethereum-cryptography>@noble/curves": {
@@ -197,32 +192,14 @@
         "TextEncoder": true
       },
       "packages": {
-        "@ethereumjs/tx>ethereum-cryptography>@noble/curves>@noble/hashes": true
-      }
-    },
-    "@ethereumjs/tx>ethereum-cryptography>@noble/curves>@noble/hashes": {
-      "globals": {
-        "TextEncoder": true,
-        "crypto": true
-      }
-    },
-    "@ethereumjs/tx>ethereum-cryptography>@noble/hashes": {
-      "globals": {
-        "TextEncoder": true,
-        "crypto": true
+        "@noble/hashes": true
       }
     },
     "@ethereumjs/tx>ethereum-cryptography>@scure/bip32": {
       "packages": {
         "@ethereumjs/tx>ethereum-cryptography>@noble/curves": true,
-        "@ethereumjs/tx>ethereum-cryptography>@scure/bip32>@noble/hashes": true,
-        "@metamask/utils>@scure/base": true
-      }
-    },
-    "@ethereumjs/tx>ethereum-cryptography>@scure/bip32>@noble/hashes": {
-      "globals": {
-        "TextEncoder": true,
-        "crypto": true
+        "@metamask/utils>@scure/base": true,
+        "@noble/hashes": true
       }
     },
     "@ethersproject/abi": {
@@ -389,9 +366,9 @@
         "@ethereumjs/tx": true,
         "@keystonehq/bc-ur-registry-eth": true,
         "@keystonehq/metamask-airgapped-keyring>@keystonehq/base-eth-keyring": true,
+        "@keystonehq/metamask-airgapped-keyring>rlp": true,
         "@metamask/obs-store": true,
         "browserify>buffer": true,
-        "ethereumjs-util>rlp": true,
         "uuid": true,
         "webpack>events": true
       }
@@ -401,15 +378,16 @@
         "@ethereumjs/tx": true,
         "@ethereumjs/tx>@ethereumjs/util": true,
         "@keystonehq/bc-ur-registry-eth": true,
-        "@keystonehq/metamask-airgapped-keyring>@keystonehq/base-eth-keyring>rlp": true,
         "@metamask/eth-trezor-keyring>hdkey": true,
         "browserify>buffer": true,
+        "eth-lattice-keyring>rlp": true,
         "uuid": true
       }
     },
-    "@keystonehq/metamask-airgapped-keyring>@keystonehq/base-eth-keyring>rlp": {
-      "globals": {
-        "TextEncoder": true
+    "@keystonehq/metamask-airgapped-keyring>rlp": {
+      "packages": {
+        "bn.js": true,
+        "browserify>buffer": true
       }
     },
     "@lavamoat/lavadome-react": {
@@ -1700,12 +1678,18 @@
     "@metamask/keyring-controller>ethereumjs-wallet>ethereumjs-util": {
       "packages": {
         "@metamask/keyring-controller>ethereumjs-wallet>ethereum-cryptography": true,
+        "@metamask/keyring-controller>ethereumjs-wallet>ethereumjs-util>rlp": true,
         "bn.js": true,
         "browserify>assert": true,
         "browserify>buffer": true,
         "browserify>insert-module-globals>is-buffer": true,
-        "ethereumjs-util>create-hash": true,
-        "ethereumjs-util>rlp": true
+        "ethereumjs-util>create-hash": true
+      }
+    },
+    "@metamask/keyring-controller>ethereumjs-wallet>ethereumjs-util>rlp": {
+      "packages": {
+        "bn.js": true,
+        "browserify>buffer": true
       }
     },
     "@metamask/logging-controller": {
@@ -2456,9 +2440,20 @@
     "@metamask/smart-transactions-controller>@ethereumjs/tx": {
       "packages": {
         "@ethereumjs/tx>ethereum-cryptography": true,
-        "@metamask/eth-ledger-bridge-keyring>@ethereumjs/rlp": true,
+        "@metamask/smart-transactions-controller>@ethereumjs/tx>@ethereumjs/common": true,
+        "@metamask/smart-transactions-controller>@ethereumjs/tx>@ethereumjs/rlp": true,
+        "@metamask/smart-transactions-controller>@ethereumjs/util": true
+      }
+    },
+    "@metamask/smart-transactions-controller>@ethereumjs/tx>@ethereumjs/common": {
+      "packages": {
         "@metamask/smart-transactions-controller>@ethereumjs/util": true,
-        "@trezor/connect-web>@trezor/connect>@ethereumjs/common": true
+        "webpack>events": true
+      }
+    },
+    "@metamask/smart-transactions-controller>@ethereumjs/tx>@ethereumjs/rlp": {
+      "globals": {
+        "TextEncoder": true
       }
     },
     "@metamask/smart-transactions-controller>@ethereumjs/util": {
@@ -2468,7 +2463,7 @@
       },
       "packages": {
         "@ethereumjs/tx>ethereum-cryptography": true,
-        "@metamask/eth-ledger-bridge-keyring>@ethereumjs/rlp": true,
+        "@metamask/smart-transactions-controller>@ethereumjs/tx>@ethereumjs/rlp": true,
         "webpack>events": true
       }
     },
@@ -2707,6 +2702,7 @@
       },
       "packages": {
         "@ethereumjs/tx": true,
+        "@ethereumjs/tx>@ethereumjs/common": true,
         "@ethereumjs/tx>@ethereumjs/util": true,
         "@ethersproject/abi": true,
         "@ethersproject/contracts": true,
@@ -2719,7 +2715,6 @@
         "@metamask/name-controller>async-mutex": true,
         "@metamask/network-controller": true,
         "@metamask/rpc-errors": true,
-        "@metamask/transaction-controller>@ethereumjs/common": true,
         "@metamask/transaction-controller>@metamask/nonce-tracker": true,
         "@metamask/utils": true,
         "bn.js": true,
@@ -2731,14 +2726,6 @@
         "webpack>events": true
       }
     },
-    "@metamask/transaction-controller>@ethereumjs/common": {
-      "packages": {
-        "@ethereumjs/tx>@ethereumjs/common>crc-32": true,
-        "@ethereumjs/tx>@ethereumjs/util": true,
-        "browserify>buffer": true,
-        "webpack>events": true
-      }
-    },
     "@metamask/transaction-controller>@metamask/nonce-tracker": {
       "packages": {
         "@ethersproject/providers": true,
@@ -3193,23 +3180,6 @@
         "define": true
       }
     },
-    "@trezor/connect-web>@trezor/connect>@ethereumjs/common": {
-      "packages": {
-        "@trezor/connect-web>@trezor/connect>@ethereumjs/common>@ethereumjs/util": true,
-        "webpack>events": true
-      }
-    },
-    "@trezor/connect-web>@trezor/connect>@ethereumjs/common>@ethereumjs/util": {
-      "globals": {
-        "console.warn": true,
-        "fetch": true
-      },
-      "packages": {
-        "@ethereumjs/tx>ethereum-cryptography": true,
-        "@metamask/eth-ledger-bridge-keyring>@ethereumjs/rlp": true,
-        "webpack>events": true
-      }
-    },
     "@trezor/connect-web>@trezor/connect>@trezor/protobuf": {
       "packages": {
         "@swc/helpers>tslib": true,
@@ -3841,16 +3811,59 @@
         "setInterval": true
       },
       "packages": {
-        "@ethereumjs/tx": true,
         "@ethereumjs/tx>@ethereumjs/util": true,
         "bn.js": true,
         "browserify>buffer": true,
         "crypto-browserify": true,
+        "eth-lattice-keyring>@ethereumjs/tx": true,
         "eth-lattice-keyring>gridplus-sdk": true,
         "eth-lattice-keyring>rlp": true,
         "webpack>events": true
       }
     },
+    "eth-lattice-keyring>@ethereumjs/tx": {
+      "packages": {
+        "@ethereumjs/tx>@ethereumjs/common": true,
+        "@ethereumjs/tx>@ethereumjs/rlp": true,
+        "@ethereumjs/tx>@ethereumjs/util": true,
+        "@ethersproject/providers": true,
+        "browserify>buffer": true,
+        "browserify>insert-module-globals>is-buffer": true,
+        "eth-lattice-keyring>@ethereumjs/tx>@chainsafe/ssz": true,
+        "eth-lattice-keyring>@ethereumjs/tx>ethereum-cryptography": true
+      }
+    },
+    "eth-lattice-keyring>@ethereumjs/tx>@chainsafe/ssz": {
+      "packages": {
+        "browserify": true,
+        "browserify>buffer": true,
+        "eth-lattice-keyring>@ethereumjs/tx>@chainsafe/ssz>@chainsafe/persistent-merkle-tree": true,
+        "eth-lattice-keyring>@ethereumjs/tx>@chainsafe/ssz>case": true
+      }
+    },
+    "eth-lattice-keyring>@ethereumjs/tx>@chainsafe/ssz>@chainsafe/persistent-merkle-tree": {
+      "globals": {
+        "WeakRef": true
+      },
+      "packages": {
+        "browserify": true
+      }
+    },
+    "eth-lattice-keyring>@ethereumjs/tx>ethereum-cryptography": {
+      "globals": {
+        "TextDecoder": true,
+        "crypto": true
+      },
+      "packages": {
+        "eth-lattice-keyring>@ethereumjs/tx>ethereum-cryptography>@noble/hashes": true
+      }
+    },
+    "eth-lattice-keyring>@ethereumjs/tx>ethereum-cryptography>@noble/hashes": {
+      "globals": {
+        "TextEncoder": true,
+        "crypto": true
+      }
+    },
     "eth-lattice-keyring>gridplus-sdk": {
       "globals": {
         "AbortController": true,
@@ -3868,54 +3881,67 @@
       "packages": {
         "@ethereumjs/tx>@ethereumjs/common>crc-32": true,
         "@ethersproject/abi": true,
-        "@metamask/eth-ledger-bridge-keyring>@ethereumjs/rlp": true,
-        "@metamask/eth-sig-util": true,
         "@metamask/ethjs>js-sha3": true,
         "@metamask/keyring-api>bech32": true,
-        "@metamask/ppom-validator>elliptic": true,
         "bn.js": true,
         "browserify>buffer": true,
         "eth-lattice-keyring>gridplus-sdk>@ethereumjs/common": true,
         "eth-lattice-keyring>gridplus-sdk>@ethereumjs/tx": true,
         "eth-lattice-keyring>gridplus-sdk>aes-js": 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>bs58check": true,
-        "eth-lattice-keyring>gridplus-sdk>secp256k1": true,
+        "eth-lattice-keyring>gridplus-sdk>elliptic": true,
+        "eth-lattice-keyring>gridplus-sdk>eth-eip712-util-browser": true,
         "eth-lattice-keyring>gridplus-sdk>uuid": true,
+        "eth-lattice-keyring>rlp": true,
+        "ethereumjs-util>ethereum-cryptography>bs58check": true,
         "ethers>@ethersproject/sha2>hash.js": true,
+        "ganache>secp256k1": true,
         "lodash": true
       }
     },
     "eth-lattice-keyring>gridplus-sdk>@ethereumjs/common": {
       "packages": {
-        "eth-lattice-keyring>gridplus-sdk>@ethereumjs/tx>@ethereumjs/util": true,
+        "@ethereumjs/tx>@ethereumjs/common>crc-32": true,
+        "@ethereumjs/tx>@ethereumjs/util": true,
+        "browserify>buffer": true,
         "webpack>events": true
       }
     },
     "eth-lattice-keyring>gridplus-sdk>@ethereumjs/tx": {
       "packages": {
-        "@ethereumjs/tx>ethereum-cryptography": true,
-        "@metamask/eth-ledger-bridge-keyring>@ethereumjs/rlp": true,
+        "@ethereumjs/tx>@ethereumjs/rlp": true,
+        "@ethereumjs/tx>@ethereumjs/util": true,
+        "@ethersproject/providers": true,
+        "browserify>buffer": true,
+        "browserify>insert-module-globals>is-buffer": true,
+        "eth-lattice-keyring>@ethereumjs/tx>@chainsafe/ssz": true,
         "eth-lattice-keyring>gridplus-sdk>@ethereumjs/tx>@ethereumjs/common": true,
-        "eth-lattice-keyring>gridplus-sdk>@ethereumjs/tx>@ethereumjs/util": true
+        "eth-lattice-keyring>gridplus-sdk>@ethereumjs/tx>ethereum-cryptography": true
       }
     },
     "eth-lattice-keyring>gridplus-sdk>@ethereumjs/tx>@ethereumjs/common": {
       "packages": {
-        "eth-lattice-keyring>gridplus-sdk>@ethereumjs/tx>@ethereumjs/util": true,
+        "@ethereumjs/tx>@ethereumjs/common>crc-32": true,
+        "@ethereumjs/tx>@ethereumjs/util": true,
+        "browserify>buffer": true,
         "webpack>events": true
       }
     },
-    "eth-lattice-keyring>gridplus-sdk>@ethereumjs/tx>@ethereumjs/util": {
+    "eth-lattice-keyring>gridplus-sdk>@ethereumjs/tx>ethereum-cryptography": {
       "globals": {
-        "console.warn": true,
-        "fetch": true
+        "TextDecoder": true,
+        "crypto": true
       },
       "packages": {
-        "@ethereumjs/tx>ethereum-cryptography": true,
-        "@metamask/eth-ledger-bridge-keyring>@ethereumjs/rlp": true,
-        "webpack>events": true
+        "eth-lattice-keyring>gridplus-sdk>@ethereumjs/tx>ethereum-cryptography>@noble/hashes": true
+      }
+    },
+    "eth-lattice-keyring>gridplus-sdk>@ethereumjs/tx>ethereum-cryptography>@noble/hashes": {
+      "globals": {
+        "TextEncoder": true,
+        "crypto": true
       }
     },
     "eth-lattice-keyring>gridplus-sdk>aes-js": {
@@ -3929,6 +3955,11 @@
         "define": true
       }
     },
+    "eth-lattice-keyring>gridplus-sdk>bitwise": {
+      "packages": {
+        "browserify>buffer": true
+      }
+    },
     "eth-lattice-keyring>gridplus-sdk>borc": {
       "globals": {
         "console": true
@@ -3950,24 +3981,28 @@
       "globals": {
         "URL": true,
         "URLSearchParams": true,
-        "location": true,
-        "navigator": true
-      }
-    },
-    "eth-lattice-keyring>gridplus-sdk>bs58check": {
-      "packages": {
-        "@noble/hashes": true,
-        "eth-lattice-keyring>gridplus-sdk>bs58check>bs58": true
+        "location": true
       }
     },
-    "eth-lattice-keyring>gridplus-sdk>bs58check>bs58": {
+    "eth-lattice-keyring>gridplus-sdk>elliptic": {
       "packages": {
-        "eth-lattice-keyring>gridplus-sdk>bs58check>bs58>base-x": true
+        "@metamask/ppom-validator>elliptic>brorand": true,
+        "@metamask/ppom-validator>elliptic>hmac-drbg": true,
+        "@metamask/ppom-validator>elliptic>minimalistic-assert": true,
+        "@metamask/ppom-validator>elliptic>minimalistic-crypto-utils": true,
+        "bn.js": true,
+        "ethers>@ethersproject/sha2>hash.js": true,
+        "pumpify>inherits": true
       }
     },
-    "eth-lattice-keyring>gridplus-sdk>secp256k1": {
+    "eth-lattice-keyring>gridplus-sdk>eth-eip712-util-browser": {
+      "globals": {
+        "intToBuffer": true
+      },
       "packages": {
-        "@metamask/ppom-validator>elliptic": true
+        "@metamask/ethjs>js-sha3": true,
+        "bn.js": true,
+        "buffer": true
       }
     },
     "eth-lattice-keyring>gridplus-sdk>uuid": {
@@ -4291,9 +4326,20 @@
     "ethers>@ethersproject/signing-key": {
       "packages": {
         "@ethersproject/bytes": true,
-        "@metamask/ppom-validator>elliptic": true,
         "ethers>@ethersproject/logger": true,
-        "ethers>@ethersproject/properties": true
+        "ethers>@ethersproject/properties": true,
+        "ethers>@ethersproject/signing-key>elliptic": true
+      }
+    },
+    "ethers>@ethersproject/signing-key>elliptic": {
+      "packages": {
+        "@metamask/ppom-validator>elliptic>brorand": true,
+        "@metamask/ppom-validator>elliptic>hmac-drbg": true,
+        "@metamask/ppom-validator>elliptic>minimalistic-assert": true,
+        "@metamask/ppom-validator>elliptic>minimalistic-crypto-utils": true,
+        "bn.js": true,
+        "ethers>@ethersproject/sha2>hash.js": true,
+        "pumpify>inherits": true
       }
     },
     "ethers>@ethersproject/solidity": {
diff --git a/package.json b/package.json
index 601400f80f7a..8533cd4b4e16 100644
--- a/package.json
+++ b/package.json
@@ -134,11 +134,6 @@
   },
   "resolutions": {
     "chokidar": "^3.6.0",
-    "gridplus-sdk/elliptic": "^6.5.7",
-    "gridplus-sdk/secp256k1": "^5.0.1",
-    "eth-lattice-keyring/@ethereumjs/tx": "^4.2.0",
-    "@ethersproject/signing-key/elliptic": "^6.5.7",
-    "ganache/secp256k1": "^4.0.4",
     "simple-update-notifier@^1.0.0": "^2.0.0",
     "@types/react": "^16.9.53",
     "analytics-node/axios": "^0.21.2",
@@ -251,7 +246,11 @@
     "@ledgerhq/hw-app-eth@npm:^6.39.0": "patch:@ledgerhq/hw-app-eth@npm%3A6.39.0#~/.yarn/patches/@ledgerhq-hw-app-eth-npm-6.39.0-866309bbbe.patch",
     "@ledgerhq/evm-tools@npm:^1.2.3": "patch:@ledgerhq/evm-tools@npm%3A1.2.3#~/.yarn/patches/@ledgerhq-evm-tools-npm-1.2.3-414f44baa9.patch",
     "cross-spawn@npm:^5.0.1": "^7.0.6",
-    "@solana/web3.js@npm:^1.95.0": "^1.95.8"
+    "@solana/web3.js@npm:^1.95.0": "^1.95.8",
+    "secp256k1@npm:^4.0.0": "4.0.4",
+    "secp256k1@npm:^4.0.1": "4.0.4",
+    "secp256k1@npm:4.0.2": "4.0.4",
+    "secp256k1@npm:4.0.3": "4.0.4"
   },
   "dependencies": {
     "@babel/runtime": "patch:@babel/runtime@npm%3A7.25.9#~/.yarn/patches/@babel-runtime-npm-7.25.9-fe8c62510a.patch",
@@ -692,10 +691,17 @@
       "@eth-optimism/contracts>@ethersproject/hardware-wallets>@ledgerhq/hw-transport-node-hid>@ledgerhq/hw-transport-node-hid-noevents>node-hid": false,
       "@eth-optimism/contracts>@ethersproject/hardware-wallets>@ledgerhq/hw-transport-node-hid>node-hid": false,
       "@eth-optimism/contracts>@ethersproject/hardware-wallets>@ledgerhq/hw-transport-node-hid>usb": false,
+      "@metamask/controllers>web3-provider-engine>ethereumjs-util>keccak": false,
+      "@metamask/controllers>web3-provider-engine>ethereumjs-util>secp256k1": false,
+      "@metamask/controllers>web3-provider-engine>ethereumjs-vm>merkle-patricia-tree>ethereumjs-util>keccak": false,
+      "@metamask/controllers>web3-provider-engine>ethereumjs-vm>merkle-patricia-tree>ethereumjs-util>secp256k1": false,
+      "@metamask/eth-ledger-bridge-keyring>hdkey>secp256k1": false,
       "@storybook/api>core-js": false,
       "@storybook/core>@storybook/core-client>@storybook/ui>core-js-pure": false,
       "@storybook/test-runner>@storybook/core-common>esbuild": false,
-      "eth-lattice-keyring>gridplus-sdk": true,
+      "eth-json-rpc-filters>eth-json-rpc-middleware>ethereumjs-util>keccak": false,
+      "eth-json-rpc-filters>eth-json-rpc-middleware>ethereumjs-util>secp256k1": false,
+      "eth-lattice-keyring>gridplus-sdk": false,
       "ethereumjs-util>ethereum-cryptography>keccak": false,
       "ganache>@trufflesuite/bigint-buffer": false,
       "ganache>@trufflesuite/uws-js-unofficial>bufferutil": false,
@@ -705,10 +711,13 @@
       "ganache>leveldown": false,
       "ganache>secp256k1": false,
       "ganache>utf-8-validate": false,
+      "ethereumjs-util>ethereum-cryptography>secp256k1": false,
       "gulp-watch>chokidar>fsevents": false,
       "gulp>glob-watcher>chokidar>fsevents": false,
       "webpack>watchpack>watchpack-chokidar2>chokidar>fsevents": false,
+      "@keystonehq/bc-ur-registry-eth>hdkey>secp256k1": false,
       "eth-lattice-keyring>gridplus-sdk>secp256k1": false,
+      "eth-lattice-keyring>secp256k1": false,
       "@storybook/react>@pmmmwh/react-refresh-webpack-plugin>core-js-pure": false,
       "@testing-library/jest-dom>aria-query>@babel/runtime-corejs3>core-js-pure": false,
       "web3": false,
@@ -717,6 +726,7 @@
       "web3>web3-core>web3-core-requestmanager>web3-providers-ws>websocket>es5-ext": false,
       "web3>web3-core>web3-core-requestmanager>web3-providers-ws>websocket>utf-8-validate": false,
       "web3>web3-shh": false,
+      "@keystonehq/metamask-airgapped-keyring>@keystonehq/base-eth-keyring>hdkey>secp256k1": false,
       "@metamask/base-controller>simple-git-hooks": false,
       "@storybook/core>@storybook/core-server>webpack>watchpack>watchpack-chokidar2>chokidar>fsevents": false,
       "resolve-url-loader>es6-iterator>es5-ext": false,
diff --git a/yarn.lock b/yarn.lock
index e61b6efeef05..a4163ea118e5 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1684,6 +1684,33 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@chainsafe/as-sha256@npm:^0.3.1":
+  version: 0.3.1
+  resolution: "@chainsafe/as-sha256@npm:0.3.1"
+  checksum: 10/3bae7b4bc6e307baa3cf1f9d2c75827874cd0fb458bc592656d741d374b48e71c042fe21616a506cb821487a5abfc6b92181e4b7fbf49b7370cee4df0b67d95a
+  languageName: node
+  linkType: hard
+
+"@chainsafe/persistent-merkle-tree@npm:^0.4.2":
+  version: 0.4.2
+  resolution: "@chainsafe/persistent-merkle-tree@npm:0.4.2"
+  dependencies:
+    "@chainsafe/as-sha256": "npm:^0.3.1"
+  checksum: 10/a7e59f80be3ce0a86fe452a3c003bd159a1719ed22cae22e9841668f0eda8c35412fa16b3b150d96f583a24f430a5cc2a1bfcabafc1b9cf6e1fdb227e98c4dc7
+  languageName: node
+  linkType: hard
+
+"@chainsafe/ssz@npm:0.9.4":
+  version: 0.9.4
+  resolution: "@chainsafe/ssz@npm:0.9.4"
+  dependencies:
+    "@chainsafe/as-sha256": "npm:^0.3.1"
+    "@chainsafe/persistent-merkle-tree": "npm:^0.4.2"
+    case: "npm:^1.6.3"
+  checksum: 10/2fe83d0b3ef131e14b51b88bb3343b14e7a02185fa9fd3da84b4726dbd857daaa4f7f6f4840fe3772fc1380352b1675a13b5f6153c4211c0f00ffa542b62bf2f
+  languageName: node
+  linkType: hard
+
 "@colors/colors@npm:1.5.0":
   version: 1.5.0
   resolution: "@colors/colors@npm:1.5.0"
@@ -2295,16 +2322,17 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@ethereumjs/common@npm:4.3.0":
-  version: 4.3.0
-  resolution: "@ethereumjs/common@npm:4.3.0"
+"@ethereumjs/common@npm:3.1.1":
+  version: 3.1.1
+  resolution: "@ethereumjs/common@npm:3.1.1"
   dependencies:
-    "@ethereumjs/util": "npm:^9.0.3"
-  checksum: 10/90f7fe1ba6827b65cd25e9bb4adf07a117ea554a950bb364d5fd9873cb770d383addb0ad34839a91fbec22ebc25516c6fb7e70ae0198c78f933920bf39797a94
+    "@ethereumjs/util": "npm:^8.0.5"
+    crc-32: "npm:^1.2.0"
+  checksum: 10/dcc3dd9ec23e8817ec0bf5bb2217619a8db08ea937603258831a906702e79c6f6e93b47d6edde551c7f46ce4a0268febacc23cefcb4ca2865be3b5c0bf5ec670
   languageName: node
   linkType: hard
 
-"@ethereumjs/common@npm:^3.2.0":
+"@ethereumjs/common@npm:^3.1.1, @ethereumjs/common@npm:^3.2.0":
   version: 3.2.0
   resolution: "@ethereumjs/common@npm:3.2.0"
   dependencies:
@@ -2341,15 +2369,22 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@ethereumjs/tx@npm:5.3.0":
-  version: 5.3.0
-  resolution: "@ethereumjs/tx@npm:5.3.0"
+"@ethereumjs/tx@npm:4.1.1":
+  version: 4.1.1
+  resolution: "@ethereumjs/tx@npm:4.1.1"
   dependencies:
-    "@ethereumjs/common": "npm:^4.3.0"
-    "@ethereumjs/rlp": "npm:^5.0.2"
-    "@ethereumjs/util": "npm:^9.0.3"
-    ethereum-cryptography: "npm:^2.1.3"
-  checksum: 10/4eb48e763d81ea0978648367d61c568c8d10f769c1ea7d32307ebe02299d4fa9fe5d7bf794ec1ee22e92edef6bfe1f459d5816e1c62d3f93602d931807ca488b
+    "@chainsafe/ssz": "npm:0.9.4"
+    "@ethereumjs/common": "npm:^3.1.1"
+    "@ethereumjs/rlp": "npm:^4.0.1"
+    "@ethereumjs/util": "npm:^8.0.5"
+    "@ethersproject/providers": "npm:^5.7.2"
+    ethereum-cryptography: "npm:^1.1.2"
+  peerDependencies:
+    c-kzg: ^1.0.8
+  peerDependenciesMeta:
+    c-kzg:
+      optional: true
+  checksum: 10/3074e198e0a550dd47dc359d16aa3bb9336fc52b14681fb0b1bcc8d4bdac62cc384962a13347819488da18bedf9578d4d5f2491e3609cb7fa7b2f6cafeb18b23
   languageName: node
   linkType: hard
 
@@ -2388,7 +2423,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@ethereumjs/util@npm:^9.0.2, @ethereumjs/util@npm:^9.0.3, @ethereumjs/util@npm:^9.1.0":
+"@ethereumjs/util@npm:^9.0.2, @ethereumjs/util@npm:^9.1.0":
   version: 9.1.0
   resolution: "@ethereumjs/util@npm:9.1.0"
   dependencies:
@@ -6514,6 +6549,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@noble/hashes@npm:1.1.2":
+  version: 1.1.2
+  resolution: "@noble/hashes@npm:1.1.2"
+  checksum: 10/2826c94ea30b8d2447fda549f4ffa97a637a480eeef5c96702a2f932c305038465f7436caf5b2bad41eb43c08c270b921e101488b18165feebe3854091b56d91
+  languageName: node
+  linkType: hard
+
 "@noble/hashes@npm:1.3.2":
   version: 1.3.2
   resolution: "@noble/hashes@npm:1.3.2"
@@ -6521,17 +6563,17 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@noble/hashes@npm:1.4.0, @noble/hashes@npm:~1.4.0":
+"@noble/hashes@npm:1.4.0, @noble/hashes@npm:^1.1.2, @noble/hashes@npm:^1.2.0, @noble/hashes@npm:^1.3.1, @noble/hashes@npm:^1.3.2, @noble/hashes@npm:^1.3.3, @noble/hashes@npm:^1.4.0, @noble/hashes@npm:~1.4.0":
   version: 1.4.0
   resolution: "@noble/hashes@npm:1.4.0"
   checksum: 10/e156e65794c473794c52fa9d06baf1eb20903d0d96719530f523cc4450f6c721a957c544796e6efd0197b2296e7cd70efeb312f861465e17940a3e3c7e0febc6
   languageName: node
   linkType: hard
 
-"@noble/hashes@npm:^1.1.2, @noble/hashes@npm:^1.2.0, @noble/hashes@npm:^1.3.1, @noble/hashes@npm:^1.3.2, @noble/hashes@npm:^1.3.3, @noble/hashes@npm:^1.4.0":
-  version: 1.5.0
-  resolution: "@noble/hashes@npm:1.5.0"
-  checksum: 10/da7fc7af52af7afcf59810a7eea6155075464ff462ffda2572dc6d57d53e2669b1ea2ec774e814f6273f1697e567f28d36823776c9bf7068cba2a2855140f26e
+"@noble/hashes@npm:~1.1.1":
+  version: 1.1.3
+  resolution: "@noble/hashes@npm:1.1.3"
+  checksum: 10/42e9883649abd85e6a65cfa528e72b2a81ebb601b44db1d71b6ba927cede0627d7d8c649df159a7f84a949dfe17fe268d4b664c5a36c7e0b2a3d4198bc19f5e4
   languageName: node
   linkType: hard
 
@@ -6542,6 +6584,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@noble/secp256k1@npm:1.6.3, @noble/secp256k1@npm:~1.6.0":
+  version: 1.6.3
+  resolution: "@noble/secp256k1@npm:1.6.3"
+  checksum: 10/e4f4b0cfa1c5d23fb1b9938fa3cce1a1160a76a89eb91f6dde98075bbdf328709d51771c85b6b4b118f8ce5a6c6554da6c9af7de7716aba56cef30f61a715bd7
+  languageName: node
+  linkType: hard
+
 "@noble/secp256k1@npm:^1.7.0":
   version: 1.7.1
   resolution: "@noble/secp256k1@npm:1.7.1"
@@ -7666,10 +7715,21 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@scure/base@npm:^1.0.0, @scure/base@npm:^1.1.1, @scure/base@npm:^1.1.3, @scure/base@npm:~1.1.3, @scure/base@npm:~1.1.6":
-  version: 1.1.9
-  resolution: "@scure/base@npm:1.1.9"
-  checksum: 10/f0ab7f687bbcdee2a01377fe3cd808bf63977999672751295b6a92625d5322f4754a96d40f6bd579bc367aad48ecf8a4e6d0390e70296e6ded1076f52adb16bb
+"@scure/base@npm:^1.0.0, @scure/base@npm:^1.1.1, @scure/base@npm:^1.1.3, @scure/base@npm:~1.1.0, @scure/base@npm:~1.1.3, @scure/base@npm:~1.1.6":
+  version: 1.1.7
+  resolution: "@scure/base@npm:1.1.7"
+  checksum: 10/fc50ffaab36cb46ff9fa4dc5052a06089ab6a6707f63d596bb34aaaec76173c9a564ac312a0b981b5e7a5349d60097b8878673c75d6cbfc4da7012b63a82099b
+  languageName: node
+  linkType: hard
+
+"@scure/bip32@npm:1.1.0":
+  version: 1.1.0
+  resolution: "@scure/bip32@npm:1.1.0"
+  dependencies:
+    "@noble/hashes": "npm:~1.1.1"
+    "@noble/secp256k1": "npm:~1.6.0"
+    "@scure/base": "npm:~1.1.0"
+  checksum: 10/e58660fc96dc5c87d0047bf41150fa3b424617e6289ba522cc81bdeecaf1a26e34f01dcd9d76f3e5c2c570ced608a527733cc375abfce4dc9b8e2365719ea5d3
   languageName: node
   linkType: hard
 
@@ -7684,6 +7744,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@scure/bip39@npm:1.1.0":
+  version: 1.1.0
+  resolution: "@scure/bip39@npm:1.1.0"
+  dependencies:
+    "@noble/hashes": "npm:~1.1.1"
+    "@scure/base": "npm:~1.1.0"
+  checksum: 10/d843be225dda4b6b2c0f90e52e00eef708df3cecbc944902298d487c669a6d219bd41877b20adaf72ba84aec2f0cb1e4567dafc6ce7295d9f132bdb0dcb375b3
+  languageName: node
+  linkType: hard
+
 "@scure/bip39@npm:1.3.0":
   version: 1.3.0
   resolution: "@scure/bip39@npm:1.3.0"
@@ -8037,13 +8107,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@sovpro/delimited-stream@npm:^1.1.0":
-  version: 1.1.0
-  resolution: "@sovpro/delimited-stream@npm:1.1.0"
-  checksum: 10/e78fc97a8509c07b55483df2253137de07b10f14db15d230526a6dd95c86e99d8f54c7af8697806bd16522eec2c50e44e5b4e0294bed80da833a2185f17f3ab6
-  languageName: node
-  linkType: hard
-
 "@spruceid/siwe-parser@npm:2.1.0":
   version: 2.1.0
   resolution: "@spruceid/siwe-parser@npm:2.1.0"
@@ -11118,13 +11181,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/uuid@npm:^10.0.0":
-  version: 10.0.0
-  resolution: "@types/uuid@npm:10.0.0"
-  checksum: 10/e3958f8b0fe551c86c14431f5940c3470127293280830684154b91dc7eb3514aeb79fe3216968833cf79d4d1c67f580f054b5be2cd562bebf4f728913e73e944
-  languageName: node
-  linkType: hard
-
 "@types/uuid@npm:^8.3.0":
   version: 8.3.0
   resolution: "@types/uuid@npm:8.3.0"
@@ -11132,7 +11188,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/uuid@npm:^9.0.1, @types/uuid@npm:^9.0.8":
+"@types/uuid@npm:^9.0.0, @types/uuid@npm:^9.0.1, @types/uuid@npm:^9.0.8":
   version: 9.0.8
   resolution: "@types/uuid@npm:9.0.8"
   checksum: 10/b8c60b7ba8250356b5088302583d1704a4e1a13558d143c549c408bf8920535602ffc12394ede77f8a8083511b023704bc66d1345792714002bfa261b17c5275
@@ -12175,7 +12231,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"aes-js@npm:^3.1.2":
+"aes-js@npm:^3.1.1, aes-js@npm:^3.1.2":
   version: 3.1.2
   resolution: "aes-js@npm:3.1.2"
   checksum: 10/b65916767034a51375a3ac5aad62af452d89a386c1ae7b607bb9145d0bb8b8823bf2f3eba85bdfa52d61c65d5aed90ba90f677b8c826bfa1a8b7ae2fa3b54d91
@@ -13370,13 +13426,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"base-x@npm:^5.0.0":
-  version: 5.0.0
-  resolution: "base-x@npm:5.0.0"
-  checksum: 10/fa82bc9a963f7a765a3287ba632661669fe553d06ee0d4d4e282640335bff30ec685e3c3b1714e265f697b234facd02a310f1e2465db88f4f1a448e6267fbc65
-  languageName: node
-  linkType: hard
-
 "base32-encode@npm:^1.2.0":
   version: 1.2.0
   resolution: "base32-encode@npm:1.2.0"
@@ -13595,10 +13644,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"bitwise@npm:^2.2.1":
-  version: 2.2.1
-  resolution: "bitwise@npm:2.2.1"
-  checksum: 10/517aea40f326847935a8ae4367d6beca596982ad55db1d0288a4055c9eba78c6b3ccd10d9ad423df356d946d9a898b36c0d5c06673fba4fb98fb1b58df74788e
+"bitwise@npm:^2.0.4":
+  version: 2.1.0
+  resolution: "bitwise@npm:2.1.0"
+  checksum: 10/d075220e8b8d1e41d0e60c7081811eef108024a094c4e7f5c2ad67235f3bcac9f6ffd218884900591d602fbd61aff9a6c1d650cd5a0e0e34f12e11623aab5da1
   languageName: node
   linkType: hard
 
@@ -13726,23 +13775,33 @@ __metadata:
   languageName: node
   linkType: hard
 
-"borc@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "borc@npm:3.0.0"
+"borc@npm:2.1.2":
+  version: 2.1.2
+  resolution: "borc@npm:2.1.2"
   dependencies:
     bignumber.js: "npm:^9.0.0"
-    buffer: "npm:^6.0.3"
+    buffer: "npm:^5.5.0"
     commander: "npm:^2.15.0"
     ieee754: "npm:^1.1.13"
-    iso-url: "npm:^1.1.5"
-    json-text-sequence: "npm:~0.3.0"
+    iso-url: "npm:~0.4.7"
+    json-text-sequence: "npm:~0.1.0"
     readable-stream: "npm:^3.6.0"
-  bin:
-    cbor2comment: bin/cbor2comment.js
-    cbor2diag: bin/cbor2diag.js
-    cbor2json: bin/cbor2json.js
-    json2cbor: bin/json2cbor.js
-  checksum: 10/fc9eaae0a544a300d0eaa4173d523649c9b85ed13f46156d802b5514c75aa4ec80c7ff183afd2bb4067a3166a7561f1a362edeb1673a7760d401b801b688477e
+  checksum: 10/a506aec97c3de0a015bf43729a82fe7e7c1ca1f3af72151dacda5d901a673719bfa6e4241d9e09d4b0abdfaf090f5f0645c3397d28e4d4d637f6e3e36e1ed268
+  languageName: node
+  linkType: hard
+
+"borc@patch:borc@npm%3A2.1.2#./.yarn/patches/borc-npm-2.1.2-8ffcc2dd81.patch::locator=metamask-crx%40workspace%3A.":
+  version: 2.1.2
+  resolution: "borc@patch:borc@npm%3A2.1.2#./.yarn/patches/borc-npm-2.1.2-8ffcc2dd81.patch::version=2.1.2&hash=3e0a96&locator=metamask-crx%40workspace%3A."
+  dependencies:
+    bignumber.js: "npm:^9.0.0"
+    buffer: "npm:^5.5.0"
+    commander: "npm:^2.15.0"
+    ieee754: "npm:^1.1.13"
+    iso-url: "npm:~0.4.7"
+    json-text-sequence: "npm:~0.1.0"
+    readable-stream: "npm:^3.6.0"
+  checksum: 10/f72b4bb1cef3422a817acbf45201904b36fc00d03613506a3b36d63e6b14713b35970cf1bb8f25721c38d8ac12bbf9ca6098430a1c6b39666d60722641ea8bd3
   languageName: node
   linkType: hard
 
@@ -14102,15 +14161,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"bs58@npm:^6.0.0":
-  version: 6.0.0
-  resolution: "bs58@npm:6.0.0"
-  dependencies:
-    base-x: "npm:^5.0.0"
-  checksum: 10/7c9bb2b2d93d997a8c652de3510d89772007ac64ee913dc4e16ba7ff47624caad3128dcc7f360763eb6308760c300b3e9fd91b8bcbd489acd1a13278e7949c4e
-  languageName: node
-  linkType: hard
-
 "bs58check@npm:2.1.2, bs58check@npm:^2.1.2":
   version: 2.1.2
   resolution: "bs58check@npm:2.1.2"
@@ -14132,16 +14182,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"bs58check@npm:^4.0.0":
-  version: 4.0.0
-  resolution: "bs58check@npm:4.0.0"
-  dependencies:
-    "@noble/hashes": "npm:^1.2.0"
-    bs58: "npm:^6.0.0"
-  checksum: 10/cf5691bdfdf317574f722582360a834f01a36e8f6c850bd5791f04e040b334a0800b7c322ad24c77979c3ed6ef6cf31a6373366b4018223e3005278d491d8799
-  languageName: node
-  linkType: hard
-
 "bser@npm:2.1.1":
   version: 2.1.1
   resolution: "bser@npm:2.1.1"
@@ -14541,6 +14581,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"case@npm:^1.6.3":
+  version: 1.6.3
+  resolution: "case@npm:1.6.3"
+  checksum: 10/2fc1df75bbb4118339e06141b9a54aba95cc62460ac92730290144fbec6b6a04f5bf7abf6a6486a1338f5821bd184402f216cec8cea0472451759c27e20fc332
+  languageName: node
+  linkType: hard
+
 "cashaddrjs@npm:0.4.4":
   version: 0.4.4
   resolution: "cashaddrjs@npm:0.4.4"
@@ -15718,12 +15765,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"crc-32@npm:^1.2.0, crc-32@npm:^1.2.2":
-  version: 1.2.2
-  resolution: "crc-32@npm:1.2.2"
+"crc-32@npm:^1.2.0":
+  version: 1.2.0
+  resolution: "crc-32@npm:1.2.0"
+  dependencies:
+    exit-on-epipe: "npm:~1.0.1"
+    printj: "npm:~1.1.0"
   bin:
-    crc32: bin/crc32.njs
-  checksum: 10/824f696a5baaf617809aa9cd033313c8f94f12d15ebffa69f10202480396be44aef9831d900ab291638a8022ed91c360696dd5b1ba691eb3f34e60be8835b7c3
+    crc32: ./bin/crc32.njs
+  checksum: 10/10c648c986b005ed0ea8393bb0d1ccb99e7a102505b136d313dee6abe204aa682d9bb9bc6fd180f9cd98ef92aa029964f1cc96a2a85eb50507dedd9ead1a262f
   languageName: node
   linkType: hard
 
@@ -16625,6 +16675,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"delimit-stream@npm:0.1.0":
+  version: 0.1.0
+  resolution: "delimit-stream@npm:0.1.0"
+  checksum: 10/9d179cfb91dfbb0702909dfab33bd837fec67c49f0c81495215af578fb08f262d509d76de7431eb11e64e6e71794b9bfe642e372fd33fabbfaf7e060cf5c044f
+  languageName: node
+  linkType: hard
+
 "depcheck@npm:^1.4.3":
   version: 1.4.3
   resolution: "depcheck@npm:1.4.3"
@@ -17395,9 +17452,24 @@ __metadata:
   languageName: node
   linkType: hard
 
+"elliptic@npm:6.5.4":
+  version: 6.5.4
+  resolution: "elliptic@npm:6.5.4"
+  dependencies:
+    bn.js: "npm:^4.11.9"
+    brorand: "npm:^1.1.0"
+    hash.js: "npm:^1.0.0"
+    hmac-drbg: "npm:^1.0.1"
+    inherits: "npm:^2.0.4"
+    minimalistic-assert: "npm:^1.0.1"
+    minimalistic-crypto-utils: "npm:^1.0.1"
+  checksum: 10/2cd7ff4b69720dbb2ca1ca650b2cf889d1df60c96d4a99d331931e4fe21e45a7f3b8074e86618ca7e56366c4b6258007f234f9d61d9b0c87bbbc8ea990b99e94
+  languageName: node
+  linkType: hard
+
 "elliptic@npm:^6.0.0, elliptic@npm:^6.4.0, elliptic@npm:^6.5.4, elliptic@npm:^6.5.7":
-  version: 6.5.7
-  resolution: "elliptic@npm:6.5.7"
+  version: 6.6.1
+  resolution: "elliptic@npm:6.6.1"
   dependencies:
     bn.js: "npm:^4.11.9"
     brorand: "npm:^1.1.0"
@@ -17406,7 +17478,7 @@ __metadata:
     inherits: "npm:^2.0.4"
     minimalistic-assert: "npm:^1.0.1"
     minimalistic-crypto-utils: "npm:^1.0.1"
-  checksum: 10/fbad1fad0a5cc07df83f80cc1f7a784247ef59075194d3e340eaeb2f4dd594825ee24c7e9b0cf279c9f1982efe610503bb3139737926428c4821d4fca1bcf348
+  checksum: 10/dc678c9febd89a219c4008ba3a9abb82237be853d9fd171cd602c8fb5ec39927e65c6b5e7a1b2a4ea82ee8e0ded72275e7932bb2da04a5790c2638b818e4e1c5
   languageName: node
   linkType: hard
 
@@ -18589,9 +18661,20 @@ __metadata:
   linkType: hard
 
 "eth-chainlist@npm:~0.0.498":
-  version: 0.0.519
-  resolution: "eth-chainlist@npm:0.0.519"
-  checksum: 10/c9767c64e58d140d04e6fcca9589c50edab48a5c57a62f2c749279574a9ab3e13784b05ab4c05c7b020fe8421769bc4119bd7a904df040fbb076827aaac3de23
+  version: 0.0.498
+  resolution: "eth-chainlist@npm:0.0.498"
+  checksum: 10/a414c0e1f0a877f9ab8bf1cf775556308ddbb66618e368666d4dea9a0b949febedf8ca5440cf57419413404e7661f1e3d040802faf532d0e1618c40ecd334cbf
+  languageName: node
+  linkType: hard
+
+"eth-eip712-util-browser@npm:^0.0.3":
+  version: 0.0.3
+  resolution: "eth-eip712-util-browser@npm:0.0.3"
+  dependencies:
+    bn.js: "npm:>4.0.0"
+    buffer: "npm:^6.0.3"
+    js-sha3: "npm:^0.8.0"
+  checksum: 10/f953e553da8326cc7eacffd7edc4c5ca4ba66ddf27546412cbed961900d50bbd8196b44665bd9e8f7d63c3b64df0793a6a8a60cc2f15b340763a78e84c4e7bd4
   languageName: node
   linkType: hard
 
@@ -18663,7 +18746,19 @@ __metadata:
   languageName: node
   linkType: hard
 
-"ethereum-cryptography@npm:^2.0.0, ethereum-cryptography@npm:^2.1.2, ethereum-cryptography@npm:^2.1.3, ethereum-cryptography@npm:^2.2.1":
+"ethereum-cryptography@npm:^1.1.2":
+  version: 1.1.2
+  resolution: "ethereum-cryptography@npm:1.1.2"
+  dependencies:
+    "@noble/hashes": "npm:1.1.2"
+    "@noble/secp256k1": "npm:1.6.3"
+    "@scure/bip32": "npm:1.1.0"
+    "@scure/bip39": "npm:1.1.0"
+  checksum: 10/abf9288086002a697e0ee0077d77d001c8e1306fa53ea8d7901f9744786f47d073caa6c266bd5b25a283a5c0fbc8beed9fa9cd90d842dc51339e6748aa1ab46a
+  languageName: node
+  linkType: hard
+
+"ethereum-cryptography@npm:^2.0.0, ethereum-cryptography@npm:^2.1.2, ethereum-cryptography@npm:^2.2.1":
   version: 2.2.1
   resolution: "ethereum-cryptography@npm:2.2.1"
   dependencies:
@@ -18955,6 +19050,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"exit-on-epipe@npm:~1.0.1":
+  version: 1.0.1
+  resolution: "exit-on-epipe@npm:1.0.1"
+  checksum: 10/b180aa277aec5bef2609b34e5876061f421a1f81bf343beb213c4d60b382ddcb6b83012833f0ba329d6bc38042685c8d89b1c52ea495b9b6327948ea80627398
+  languageName: node
+  linkType: hard
+
 "exit@npm:^0.1.2":
   version: 0.1.2
   resolution: "exit@npm:0.1.2"
@@ -20981,29 +21083,29 @@ __metadata:
   linkType: hard
 
 "gridplus-sdk@npm:^2.5.1":
-  version: 2.7.1
-  resolution: "gridplus-sdk@npm:2.7.1"
+  version: 2.5.1
+  resolution: "gridplus-sdk@npm:2.5.1"
   dependencies:
-    "@ethereumjs/common": "npm:4.3.0"
-    "@ethereumjs/rlp": "npm:^5.0.2"
-    "@ethereumjs/tx": "npm:5.3.0"
-    "@ethersproject/abi": "npm:^5.7.0"
-    "@metamask/eth-sig-util": "npm:^7.0.3"
-    "@types/uuid": "npm:^10.0.0"
-    aes-js: "npm:^3.1.2"
+    "@ethereumjs/common": "npm:3.1.1"
+    "@ethereumjs/tx": "npm:4.1.1"
+    "@ethersproject/abi": "npm:^5.5.0"
+    "@types/uuid": "npm:^9.0.0"
+    aes-js: "npm:^3.1.1"
     bech32: "npm:^2.0.0"
-    bignumber.js: "npm:^9.1.2"
-    bitwise: "npm:^2.2.1"
-    borc: "npm:^3.0.0"
-    bs58check: "npm:^4.0.0"
-    buffer: "npm:^6.0.3"
-    crc-32: "npm:^1.2.2"
-    elliptic: "npm:6.5.6"
+    bignumber.js: "npm:^9.0.1"
+    bitwise: "npm:^2.0.4"
+    borc: "npm:^2.1.2"
+    bs58check: "npm:^2.1.2"
+    buffer: "npm:^5.6.0"
+    crc-32: "npm:^1.2.0"
+    elliptic: "npm:6.5.4"
+    eth-eip712-util-browser: "npm:^0.0.3"
     hash.js: "npm:^1.1.7"
-    js-sha3: "npm:^0.9.3"
-    secp256k1: "npm:5.0.0"
-    uuid: "npm:^10.0.0"
-  checksum: 10/0d81908f69d2972350f4fc6fb721b12f62de643b48dce1d25f4ee2e085899e0cc64605d6cc63590ba870cea72d53f970c05d0fd74979d2c07ad102f3e15b7f82
+    js-sha3: "npm:^0.8.0"
+    rlp: "npm:^3.0.0"
+    secp256k1: "npm:4.0.2"
+    uuid: "npm:^9.0.0"
+  checksum: 10/57deeae78fc5f904309e689054baabaed8b078b896ecfd5d724889c6ea424a113db64c3fd79d4dca7cc5f558167d7af754506df5c0692ee76087822ae60c3873
   languageName: node
   linkType: hard
 
@@ -23303,10 +23405,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"iso-url@npm:^1.1.5":
-  version: 1.2.1
-  resolution: "iso-url@npm:1.2.1"
-  checksum: 10/87455fd79166c7b269df7711ea0bee896338330fb46164dd3e6d73ba09c294326ae356b60032dc3217c1455b66f57216a44b95ded8fb2c1c2f9e490396060ef9
+"iso-url@npm:~0.4.7":
+  version: 0.4.7
+  resolution: "iso-url@npm:0.4.7"
+  checksum: 10/355574598d46947f48a63518517bfacf443aae5914991484cdc51c1ebe3f4487d4936ecd0b73a297784d20bf1a4eda3f47975b0fff8022ae20af76b6655e014a
   languageName: node
   linkType: hard
 
@@ -24553,12 +24655,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"json-text-sequence@npm:~0.3.0":
-  version: 0.3.0
-  resolution: "json-text-sequence@npm:0.3.0"
+"json-text-sequence@npm:~0.1.0":
+  version: 0.1.1
+  resolution: "json-text-sequence@npm:0.1.1"
   dependencies:
-    "@sovpro/delimited-stream": "npm:^1.1.0"
-  checksum: 10/e5dc050aadd626938514363399cf14c409f878628914922c5d470530c3f3473d6b0e16a10338dd7d863aab0291bb0e5e15d71526d14733c22e30cba771b03297
+    delimit-stream: "npm:0.1.0"
+  checksum: 10/540973055e03e3caf55e5e06adf88a5d1a4fbefdee44e4c67bbeb614f0d1edd6ea9207f8f9027b6aa86eb6ed4fca3f0dd1f40c4be13f7396efbc0d2f5c5f1e73
   languageName: node
   linkType: hard
 
@@ -30143,6 +30245,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"printj@npm:~1.1.0":
+  version: 1.1.2
+  resolution: "printj@npm:1.1.2"
+  bin:
+    printj: ./bin/printj.njs
+  checksum: 10/45376a5ee7ef2e0d7ff0b4fecc893d73995a332e63d7e0622a544fe662c8213d22f0c9750e627c6d732a7d7a543266be960e6cd51cf19485cce87cf80468bb41
+  languageName: node
+  linkType: hard
+
 "prismjs@npm:^1.27.0":
   version: 1.29.0
   resolution: "prismjs@npm:1.29.0"
@@ -33054,7 +33165,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"secp256k1@npm:^4.0.0, secp256k1@npm:^4.0.1, secp256k1@npm:^4.0.4":
+"secp256k1@npm:4.0.4":
   version: 4.0.4
   resolution: "secp256k1@npm:4.0.4"
   dependencies:
@@ -33066,18 +33177,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"secp256k1@npm:^5.0.1":
-  version: 5.0.1
-  resolution: "secp256k1@npm:5.0.1"
-  dependencies:
-    elliptic: "npm:^6.5.7"
-    node-addon-api: "npm:^5.0.0"
-    node-gyp: "npm:latest"
-    node-gyp-build: "npm:^4.2.0"
-  checksum: 10/63fbd35624be4fd9cf3d39e5f79c5471b4a8aea6944453b2bea7b100bb1c77a25c55e6e08e2210cdabdf478c4c62d34c408b34214f2afd9367e19a52a3a4236c
-  languageName: node
-  linkType: hard
-
 "select-hose@npm:^2.0.0":
   version: 2.0.0
   resolution: "select-hose@npm:2.0.0"
@@ -36648,15 +36747,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"uuid@npm:^10.0.0":
-  version: 10.0.0
-  resolution: "uuid@npm:10.0.0"
-  bin:
-    uuid: dist/bin/uuid
-  checksum: 10/35aa60614811a201ff90f8ca5e9ecb7076a75c3821e17f0f5ff72d44e36c2d35fcbc2ceee9c4ac7317f4cc41895da30e74f3885e30313bee48fda6338f250538
-  languageName: node
-  linkType: hard
-
 "uuid@npm:^3.3.3":
   version: 3.4.0
   resolution: "uuid@npm:3.4.0"

From acdf7c6579e2d1ac06e2ab4f2a0917d616df0403 Mon Sep 17 00:00:00 2001
From: OGPoyraz <omergoktugpoyraz@gmail.com>
Date: Thu, 12 Dec 2024 13:57:45 +0100
Subject: [PATCH 101/175] fix:  Change visibility of `AmountRow` in contract
 interaction (#29131)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<!--
Please submit this PR as a draft initially.
Do not mark it as "Ready for review" until the template has been
completely filled out, and PR status checks have passed at least once.
-->

## **Description**

<!--
Write a short description of the changes included in this pull request,
also include relevant motivation and context. Have in mind the following
questions:
1. What is the reason for the change?
2. What is the improvement/solution?
-->

This PR makes two visibility change on `AmountRow` in transaction
details.

- Regardless of the amount or simulated value, if transaction details is
toggled, it must show `AmountRow`
- Whenever the Amount being sent doesn't match with a 5% buffer what
we're displaying in the "You send" row of simulations UI for contract
interactions, `AmountRow` must be visible.

[![Open in GitHub
Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/29131?quickstart=1)

## **Related issues**

Fixes: https://github.com/MetaMask/MetaMask-planning/issues/3783

## **Manual testing steps**

### Scenario I
1. Trigger a contract interaction
2. Enable advanced view
3. With this change, you should now see the Amount row on the advanced
view displaying the native asset value that is being sent along with the
transaction.

### Scenario II
1. Trigger a contract interaction with the below payload (this payload
should make the amount being sent don't match "You send" value within
simulations)
2. With this change, you should now see the Amount row on the default
view displaying the native asset value that is being sent along with the
transaction.
`{
to: "0x4805a248c9611c22a43ce956489c9aadb6108433",
value: "0xDE0B6B3A7640000",
data: "0x3158952e",
}`


## **Screenshots/Recordings**

<!-- If applicable, add screenshots and/or recordings to visualize the
before and after of your change. -->

### **Before**

<!-- [screenshots/recordings] -->

### **After**

<!-- [screenshots/recordings] -->

## **Pre-merge author checklist**

- [X] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension Coding
Standards](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/CODING_GUIDELINES.md).
- [X] I've completed the PR template to the best of my ability
- [x] I’ve included tests if applicable
- [X] I’ve documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [X] I’ve applied the right labels on the PR (see [labeling
guidelines](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.

## **Pre-merge reviewer checklist**

- [ ] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed).
- [ ] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.
---
 .../transaction-details.test.tsx              | 116 +++++++++++++++---
 .../transaction-details.tsx                   |  15 ++-
 .../components/confirm/info/utils.test.ts     | 107 +++++++++++++++-
 .../components/confirm/info/utils.ts          |  83 +++++++++++++
 4 files changed, 300 insertions(+), 21 deletions(-)

diff --git a/ui/pages/confirmations/components/confirm/info/shared/transaction-details/transaction-details.test.tsx b/ui/pages/confirmations/components/confirm/info/shared/transaction-details/transaction-details.test.tsx
index 1263acf08397..f283ee6c4530 100644
--- a/ui/pages/confirmations/components/confirm/info/shared/transaction-details/transaction-details.test.tsx
+++ b/ui/pages/confirmations/components/confirm/info/shared/transaction-details/transaction-details.test.tsx
@@ -1,7 +1,8 @@
 import React from 'react';
 import configureMockStore from 'redux-mock-store';
 import thunk from 'redux-thunk';
-import { SimulationErrorCode } from '@metamask/transaction-controller';
+import { Hex } from '@metamask/utils';
+import { toHex } from '@metamask/controller-utils';
 import {
   getMockConfirmState,
   getMockConfirmStateForTransaction,
@@ -44,21 +45,104 @@ describe('<TransactionDetails />', () => {
     expect(container).toMatchSnapshot();
   });
 
-  it('renders component for transaction details with amount', () => {
-    const simulationDataMock = {
-      error: { code: SimulationErrorCode.Disabled },
-      tokenBalanceChanges: [],
-    };
-    const contractInteraction = genUnapprovedContractInteractionConfirmation({
-      simulationData: simulationDataMock,
-      chainId: CHAIN_IDS.GOERLI,
+  describe('AmountRow', () => {
+    describe('should be in the document', () => {
+      it('when showAdvancedDetails is true', () => {
+        const contractInteraction =
+          genUnapprovedContractInteractionConfirmation({
+            chainId: CHAIN_IDS.GOERLI,
+          });
+        const state = getMockConfirmStateForTransaction(contractInteraction, {
+          metamask: {
+            preferences: {
+              showConfirmationAdvancedDetails: true,
+            },
+          },
+        });
+        const mockStore = configureMockStore(middleware)(state);
+        const { getByTestId } = renderWithConfirmContextProvider(
+          <TransactionDetails />,
+          mockStore,
+        );
+        expect(
+          getByTestId('transaction-details-amount-row'),
+        ).toBeInTheDocument();
+      });
+
+      it('when value and simulated native balance mismatch', () => {
+        // Transaction value is set to 0x3782dace9d900000 below mock
+        const simulationDataMock = {
+          tokenBalanceChanges: [],
+          nativeBalanceChange: {
+            difference: '0x1' as Hex,
+            isDecrease: false,
+            previousBalance: '0x2' as Hex,
+            newBalance: '0x1' as Hex,
+          },
+        };
+        const contractInteraction =
+          genUnapprovedContractInteractionConfirmation({
+            simulationData: simulationDataMock,
+            chainId: CHAIN_IDS.GOERLI,
+          });
+        const state = getMockConfirmStateForTransaction(contractInteraction, {
+          metamask: {
+            preferences: {
+              // Intentionally setting to false to test the condition
+              showConfirmationAdvancedDetails: false,
+            },
+          },
+        });
+        const mockStore = configureMockStore(middleware)(state);
+        const { getByTestId } = renderWithConfirmContextProvider(
+          <TransactionDetails />,
+          mockStore,
+        );
+        expect(
+          getByTestId('transaction-details-amount-row'),
+        ).toBeInTheDocument();
+      });
+    });
+
+    it('should not be in the document when value and simulated native balance mismatch is within threshold', () => {
+      // Transaction value is set to 0x3782dace9d900000 below mock
+      const transactionValueInDecimal = 4000000000000000000;
+      const transactionValueInHex = toHex(transactionValueInDecimal);
+      const newBalanceInDecimal = 1;
+      const newBalanceInHex = toHex(newBalanceInDecimal);
+      const previousBalanceInDecimal =
+        transactionValueInDecimal + newBalanceInDecimal;
+      const previousBalanceInHex = toHex(previousBalanceInDecimal);
+
+      const simulationDataMock = {
+        tokenBalanceChanges: [],
+        nativeBalanceChange: {
+          difference: transactionValueInHex,
+          isDecrease: true,
+          previousBalance: previousBalanceInHex,
+          newBalance: newBalanceInHex,
+        },
+      };
+      const contractInteraction = genUnapprovedContractInteractionConfirmation({
+        simulationData: simulationDataMock,
+        chainId: CHAIN_IDS.GOERLI,
+      });
+      const state = getMockConfirmStateForTransaction(contractInteraction, {
+        metamask: {
+          preferences: {
+            // Intentionally setting to false to test the condition
+            showConfirmationAdvancedDetails: false,
+          },
+        },
+      });
+      const mockStore = configureMockStore(middleware)(state);
+      const { queryByTestId } = renderWithConfirmContextProvider(
+        <TransactionDetails />,
+        mockStore,
+      );
+      expect(
+        queryByTestId('transaction-details-amount-row'),
+      ).not.toBeInTheDocument();
     });
-    const state = getMockConfirmStateForTransaction(contractInteraction);
-    const mockStore = configureMockStore(middleware)(state);
-    const { getByTestId } = renderWithConfirmContextProvider(
-      <TransactionDetails />,
-      mockStore,
-    );
-    expect(getByTestId('transaction-details-amount-row')).toBeInTheDocument();
   });
 });
diff --git a/ui/pages/confirmations/components/confirm/info/shared/transaction-details/transaction-details.tsx b/ui/pages/confirmations/components/confirm/info/shared/transaction-details/transaction-details.tsx
index 79cea5963c45..2cf6426f1975 100644
--- a/ui/pages/confirmations/components/confirm/info/shared/transaction-details/transaction-details.tsx
+++ b/ui/pages/confirmations/components/confirm/info/shared/transaction-details/transaction-details.tsx
@@ -1,6 +1,6 @@
 import { TransactionMeta } from '@metamask/transaction-controller';
 import { isValidAddress } from 'ethereumjs-util';
-import React from 'react';
+import React, { useMemo } from 'react';
 import { useSelector } from 'react-redux';
 import {
   ConfirmInfoRow,
@@ -20,6 +20,7 @@ import { ConfirmInfoRowCurrency } from '../../../../../../../components/app/conf
 import { PRIMARY } from '../../../../../../../helpers/constants/common';
 import { useUserPreferencedCurrency } from '../../../../../../../hooks/useUserPreferencedCurrency';
 import { HEX_ZERO } from '../constants';
+import { hasValueAndNativeBalanceMismatch as checkValueAndNativeBalanceMismatch } from '../../utils';
 import { SigningInWithRow } from '../sign-in-with-row/sign-in-with-row';
 
 export const OriginRow = () => {
@@ -99,9 +100,8 @@ const AmountRow = () => {
   const { currency } = useUserPreferencedCurrency(PRIMARY);
 
   const value = currentConfirmation?.txParams?.value;
-  const simulationData = currentConfirmation?.simulationData;
 
-  if (!value || value === HEX_ZERO || !simulationData?.error) {
+  if (!value || value === HEX_ZERO) {
     return null;
   }
 
@@ -150,6 +150,11 @@ export const TransactionDetails = () => {
   const showAdvancedDetails = useSelector(
     selectConfirmationAdvancedDetailsOpen,
   );
+  const { currentConfirmation } = useConfirmContext<TransactionMeta>();
+  const hasValueAndNativeBalanceMismatch = useMemo(
+    () => checkValueAndNativeBalanceMismatch(currentConfirmation),
+    [currentConfirmation],
+  );
 
   return (
     <>
@@ -159,7 +164,9 @@ export const TransactionDetails = () => {
         {showAdvancedDetails && <MethodDataRow />}
         <SigningInWithRow />
       </ConfirmInfoSection>
-      <AmountRow />
+      {(showAdvancedDetails || hasValueAndNativeBalanceMismatch) && (
+        <AmountRow />
+      )}
       <PaymasterRow />
     </>
   );
diff --git a/ui/pages/confirmations/components/confirm/info/utils.test.ts b/ui/pages/confirmations/components/confirm/info/utils.test.ts
index e78d06d87622..9c12b9127811 100644
--- a/ui/pages/confirmations/components/confirm/info/utils.test.ts
+++ b/ui/pages/confirmations/components/confirm/info/utils.test.ts
@@ -1,5 +1,10 @@
+import { TransactionMeta } from '@metamask/transaction-controller';
+import { toHex } from '@metamask/controller-utils';
 import { DecodedTransactionDataSource } from '../../../../../../shared/types/transaction-decode';
-import { getIsRevokeSetApprovalForAll } from './utils';
+import {
+  getIsRevokeSetApprovalForAll,
+  hasValueAndNativeBalanceMismatch,
+} from './utils';
 
 describe('getIsRevokeSetApprovalForAll', () => {
   it('returns false if no data is passed as an argument', () => {
@@ -36,3 +41,103 @@ describe('getIsRevokeSetApprovalForAll', () => {
     expect(actual).toEqual(true);
   });
 });
+
+describe('hasValueAndNativeBalanceMismatch', () => {
+  it('returns false when transaction value matches simulated balance change', () => {
+    const transactionValueInDecimal = 10000000000000000;
+    const transactionValueInHex = toHex(transactionValueInDecimal);
+
+    const transaction = {
+      txParams: {
+        value: transactionValueInHex,
+      },
+      simulationData: {
+        nativeBalanceChange: {
+          difference: transactionValueInHex,
+          isDecrease: true,
+        },
+      },
+    } as unknown as TransactionMeta;
+
+    expect(hasValueAndNativeBalanceMismatch(transaction)).toBe(false);
+  });
+
+  it('returns false when values differ within threshold', () => {
+    const transactionValueInDecimal = 10000000000000000;
+    const transactionValueInHex = toHex(transactionValueInDecimal);
+
+    const differenceInDecimal = 10400000000000000;
+    const differenceInHex = toHex(differenceInDecimal);
+
+    const transaction = {
+      txParams: {
+        value: transactionValueInHex,
+      },
+      simulationData: {
+        nativeBalanceChange: {
+          difference: differenceInHex,
+          isDecrease: true,
+        },
+      },
+    } as unknown as TransactionMeta;
+
+    expect(hasValueAndNativeBalanceMismatch(transaction)).toBe(false);
+  });
+
+  it('returns true when values differ beyond threshold', () => {
+    const transactionValueInDecimal = 10000000000000000;
+    const transactionValueInHex = toHex(transactionValueInDecimal);
+
+    const differenceInDecimal = 1000000000;
+    const muchSmallerDifferenceInHex = toHex(differenceInDecimal);
+
+    const transaction = {
+      txParams: {
+        value: transactionValueInHex,
+      },
+      simulationData: {
+        nativeBalanceChange: {
+          difference: muchSmallerDifferenceInHex,
+          isDecrease: true,
+        },
+      },
+    } as unknown as TransactionMeta;
+
+    expect(hasValueAndNativeBalanceMismatch(transaction)).toBe(true);
+  });
+
+  it('returns true when no simulation data is present', () => {
+    const transactionValueInDecimal = 10000000000000000;
+    const transactionValueInHex = toHex(transactionValueInDecimal);
+
+    const transaction = {
+      txParams: {
+        value: transactionValueInHex,
+      },
+    } as unknown as TransactionMeta;
+
+    expect(hasValueAndNativeBalanceMismatch(transaction)).toBe(true);
+  });
+
+  it('handles case when value is increased in simulation', () => {
+    const transactionValueInDecimal = 10000000000000000;
+    const transactionValueInHex = toHex(transactionValueInDecimal);
+
+    const differenceInDecimal = 10000000000000000;
+    const differenceInHex = toHex(differenceInDecimal);
+
+    const transaction = {
+      txParams: {
+        value: transactionValueInHex,
+      },
+      simulationData: {
+        nativeBalanceChange: {
+          difference: differenceInHex,
+          isDecrease: false,
+        },
+      },
+    } as unknown as TransactionMeta;
+
+    expect(hasValueAndNativeBalanceMismatch(transaction)).toBe(true);
+  });
+});
diff --git a/ui/pages/confirmations/components/confirm/info/utils.ts b/ui/pages/confirmations/components/confirm/info/utils.ts
index 0ad8479ac7b9..1af918aea74e 100644
--- a/ui/pages/confirmations/components/confirm/info/utils.ts
+++ b/ui/pages/confirmations/components/confirm/info/utils.ts
@@ -1,9 +1,15 @@
+import { TransactionMeta } from '@metamask/transaction-controller';
+import type { Hex } from '@metamask/utils';
+import { remove0x } from '@metamask/utils';
+import { BN } from 'bn.js';
 import { DecodedTransactionDataResponse } from '../../../../../../shared/types/transaction-decode';
 import {
   BackgroundColor,
   TextColor,
 } from '../../../../../helpers/constants/design-system';
 
+const VALUE_COMPARISON_PERCENT_THRESHOLD = 5;
+
 export function getIsRevokeSetApprovalForAll(
   value: DecodedTransactionDataResponse | undefined,
 ): boolean {
@@ -27,3 +33,80 @@ export const getAmountColors = (credit?: boolean, debit?: boolean) => {
   }
   return { color, backgroundColor };
 };
+
+/**
+ * Calculate the absolute percentage change between two values.
+ *
+ * @param originalValue - The first value.
+ * @param newValue - The second value.
+ * @returns The percentage change from the first value to the second value.
+ * If the original value is zero and the new value is not, returns 100.
+ */
+export function getPercentageChange(
+  originalValue: InstanceType<typeof BN>,
+  newValue: InstanceType<typeof BN>,
+): number {
+  const precisionFactor = new BN(10).pow(new BN(18));
+  const originalValuePrecision = originalValue.mul(precisionFactor);
+  const newValuePrecision = newValue.mul(precisionFactor);
+
+  const difference = newValuePrecision.sub(originalValuePrecision);
+
+  if (difference.isZero()) {
+    return 0;
+  }
+
+  if (originalValuePrecision.isZero() && !newValuePrecision.isZero()) {
+    return 100;
+  }
+
+  return difference.muln(100).div(originalValuePrecision).abs().toNumber();
+}
+
+/**
+ * Determine if the percentage change between two values is within a threshold.
+ *
+ * @param originalValue - The original value.
+ * @param newValue - The new value.
+ * @param newNegative - Whether the new value is negative.
+ * @returns Whether the percentage change between the two values is within a threshold.
+ */
+function percentageChangeWithinThreshold(
+  originalValue: Hex,
+  newValue: Hex,
+  newNegative?: boolean,
+): boolean {
+  const originalValueBN = new BN(remove0x(originalValue), 'hex');
+  let newValueBN = new BN(remove0x(newValue), 'hex');
+
+  if (newNegative) {
+    newValueBN = newValueBN.neg();
+  }
+
+  return (
+    getPercentageChange(originalValueBN, newValueBN) <=
+    VALUE_COMPARISON_PERCENT_THRESHOLD
+  );
+}
+
+/**
+ * Determine if a transaction has a value and simulation native balance mismatch.
+ *
+ * @param transactionMeta - The transaction metadata.
+ * @returns Whether the transaction has a value and simulation native balance mismatch.
+ */
+export function hasValueAndNativeBalanceMismatch(
+  transactionMeta: TransactionMeta,
+): boolean {
+  const value = transactionMeta?.txParams?.value ?? '0x0';
+  const nativeBalanceChange =
+    transactionMeta?.simulationData?.nativeBalanceChange;
+  const simulatedNativeBalanceDifference =
+    nativeBalanceChange?.difference ?? '0x0';
+
+  return !percentageChangeWithinThreshold(
+    value as Hex,
+    simulatedNativeBalanceDifference,
+    nativeBalanceChange?.isDecrease === false,
+  );
+}

From 717cd8780db00fe953958988d6ccfa6e2a9fb15a Mon Sep 17 00:00:00 2001
From: Jyoti Puri <jyotipuri@gmail.com>
Date: Thu, 12 Dec 2024 18:32:28 +0530
Subject: [PATCH 102/175] fix: Fix in label displayed for state change in
 signature decoding section (#29020)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## **Description**

We currently displaying multiple "You list" and "Spending cap" for
multiple assets. We should be displaying the copy only once similar to
how we do it for simulations.

## **Related issues**

Fixes: https://github.com/MetaMask/metamask-extension/issues/28944

## **Manual testing steps**

1. Submit a typed sign v4 request with multiple NFT listed
2. Check simulation section on page displayed

## **Screenshots/Recordings**
<img width="359" alt="Screenshot 2024-12-09 at 6 05 46 PM"
src="https://github.com/user-attachments/assets/d847f04b-be71-49c2-a3f3-77fdc23bdddd">

## **Pre-merge author checklist**

- [X] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension Coding
Standards](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/CODING_GUIDELINES.md).
- [X] I've completed the PR template to the best of my ability
- [X] I’ve included tests if applicable
- [X] I’ve documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [X] I’ve applied the right labels on the PR (see [labeling
guidelines](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.

## **Pre-merge reviewer checklist**

- [ ] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed).
- [ ] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.
---
 .../decoded-simulation.test.tsx               | 25 ++++++++++-
 .../decoded-simulation/decoded-simulation.tsx | 42 ++++++++++++-------
 2 files changed, 51 insertions(+), 16 deletions(-)

diff --git a/ui/pages/confirmations/components/confirm/info/typed-sign/typed-sign-v4-simulation/decoded-simulation/decoded-simulation.test.tsx b/ui/pages/confirmations/components/confirm/info/typed-sign/typed-sign-v4-simulation/decoded-simulation/decoded-simulation.test.tsx
index 26b4c46f26cd..c06cf906e870 100644
--- a/ui/pages/confirmations/components/confirm/info/typed-sign/typed-sign-v4-simulation/decoded-simulation/decoded-simulation.test.tsx
+++ b/ui/pages/confirmations/components/confirm/info/typed-sign/typed-sign-v4-simulation/decoded-simulation/decoded-simulation.test.tsx
@@ -1,7 +1,6 @@
 import React from 'react';
 import configureMockStore from 'redux-mock-store';
 import {
-  DecodingData,
   DecodingDataChangeType,
   DecodingDataStateChanges,
 } from '@metamask/signature-controller';
@@ -11,7 +10,7 @@ import { renderWithConfirmContextProvider } from '../../../../../../../../../tes
 import { permitSignatureMsg } from '../../../../../../../../../test/data/confirmations/typed_sign';
 import PermitSimulation, { getStateChangeToolip } from './decoded-simulation';
 
-const decodingData: DecodingData = {
+const decodingData = {
   stateChanges: [
     {
       assetType: 'ERC20',
@@ -165,4 +164,26 @@ describe('DecodedSimulation', () => {
     );
     expect(tooltip).toBe('signature_decoding_bid_nft_tooltip');
   });
+
+  it('renders label only once if there are multiple state changes of same changeType', async () => {
+    const state = getMockTypedSignConfirmStateForRequest({
+      ...permitSignatureMsg,
+      decodingLoading: false,
+      decodingData: {
+        stateChanges: [
+          decodingData.stateChanges[0],
+          decodingData.stateChanges[0],
+          decodingData.stateChanges[0],
+        ],
+      },
+    });
+    const mockStore = configureMockStore([])(state);
+
+    const { findAllByText } = renderWithConfirmContextProvider(
+      <PermitSimulation />,
+      mockStore,
+    );
+
+    expect(await findAllByText('Spending cap')).toHaveLength(1);
+  });
 });
diff --git a/ui/pages/confirmations/components/confirm/info/typed-sign/typed-sign-v4-simulation/decoded-simulation/decoded-simulation.tsx b/ui/pages/confirmations/components/confirm/info/typed-sign/typed-sign-v4-simulation/decoded-simulation/decoded-simulation.tsx
index ec07ae253405..fe2be9d76261 100644
--- a/ui/pages/confirmations/components/confirm/info/typed-sign/typed-sign-v4-simulation/decoded-simulation/decoded-simulation.tsx
+++ b/ui/pages/confirmations/components/confirm/info/typed-sign/typed-sign-v4-simulation/decoded-simulation/decoded-simulation.tsx
@@ -60,10 +60,12 @@ const StateChangeRow = ({
   stateChangeList,
   stateChange,
   chainId,
+  shouldDisplayLabel,
 }: {
   stateChangeList: DecodingDataStateChanges | null;
   stateChange: DecodingDataStateChange;
   chainId: Hex;
+  shouldDisplayLabel: boolean;
 }) => {
   const t = useI18nContext();
   const { assetType, changeType, amount, contractAddress, tokenID } =
@@ -71,7 +73,7 @@ const StateChangeRow = ({
   const tooltip = getStateChangeToolip(stateChangeList, stateChange, t);
   return (
     <ConfirmInfoRow
-      label={getStateChangeLabelMap(t, changeType)}
+      label={shouldDisplayLabel ? getStateChangeLabelMap(t, changeType) : ''}
       tooltip={tooltip}
     >
       {(assetType === TokenStandard.ERC20 ||
@@ -104,19 +106,31 @@ const DecodedSimulation: React.FC<object> = () => {
   const chainId = currentConfirmation.chainId as Hex;
   const { decodingLoading, decodingData } = currentConfirmation;
 
-  const stateChangeFragment = useMemo(
-    () =>
-      (decodingData?.stateChanges ?? []).map(
-        (change: DecodingDataStateChange) => (
-          <StateChangeRow
-            stateChangeList={decodingData?.stateChanges ?? []}
-            stateChange={change}
-            chainId={chainId}
-          />
-        ),
-      ),
-    [decodingData?.stateChanges],
-  );
+  const stateChangeFragment = useMemo(() => {
+    const stateChangesGrouped: Record<string, DecodingDataStateChange[]> = (
+      decodingData?.stateChanges ?? []
+    ).reduce<Record<string, DecodingDataStateChange[]>>(
+      (result, stateChange) => {
+        result[stateChange.changeType] = [
+          ...(result[stateChange.changeType] ?? []),
+          stateChange,
+        ];
+        return result;
+      },
+      {},
+    );
+
+    return Object.entries(stateChangesGrouped).flatMap(([_, changeList]) =>
+      changeList.map((change: DecodingDataStateChange, index: number) => (
+        <StateChangeRow
+          stateChangeList={decodingData?.stateChanges ?? []}
+          stateChange={change}
+          chainId={chainId}
+          shouldDisplayLabel={index === 0}
+        />
+      )),
+    );
+  }, [decodingData?.stateChanges]);
 
   return (
     <StaticSimulation

From 5c1c4b2107ecaace1dbe5330f0476143126f30be Mon Sep 17 00:00:00 2001
From: Nidhi Kumari <nidhi.kumari@consensys.net>
Date: Thu, 12 Dec 2024 13:46:34 +0000
Subject: [PATCH 103/175] feat: Permission page tour removal (#28966)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This PR is to remove product tour from Permissions Page

## **Related issues**

Fixes:
[https://github.com/MetaMask/MetaMask-planning/issues/3755](https://github.com/MetaMask/MetaMask-planning/issues/3755)

## **Manual testing steps**

1. Run extension with `yarn start`
2. Install a fresh version
3. Go to Permissions Page, check there is no Product Tour

## **Screenshots/Recordings**


### **Before**
![Screenshot 2024-12-05 at 3 53
47 PM](https://github.com/user-attachments/assets/a020cd59-492c-43df-af41-0f7a5ec7f142)



### **After**

![Screenshot 2024-12-05 at 3 54
50 PM](https://github.com/user-attachments/assets/e77251f3-c3c9-433b-bef8-218dceba2bf5)

## **Pre-merge author checklist**

- [ ] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension Coding
Standards](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/CODING_GUIDELINES.md).
- [ ] I've completed the PR template to the best of my ability
- [ ] I’ve included tests if applicable
- [ ] I’ve documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [ ] I’ve applied the right labels on the PR (see [labeling
guidelines](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.

## **Pre-merge reviewer checklist**

- [ ] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed).
- [ ] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.
---
 app/_locales/de/messages.json                 |  6 -----
 app/_locales/el/messages.json                 |  6 -----
 app/_locales/en/messages.json                 |  6 -----
 app/_locales/es/messages.json                 |  6 -----
 app/_locales/fr/messages.json                 |  6 -----
 app/_locales/hi/messages.json                 |  6 -----
 app/_locales/id/messages.json                 |  6 -----
 app/_locales/ja/messages.json                 |  6 -----
 app/_locales/ko/messages.json                 |  6 -----
 app/_locales/pt/messages.json                 |  6 -----
 app/_locales/ru/messages.json                 |  6 -----
 app/_locales/tl/messages.json                 |  6 -----
 app/_locales/tr/messages.json                 |  6 -----
 app/_locales/vi/messages.json                 |  6 -----
 app/_locales/zh_CN/messages.json              |  6 -----
 .../connections/connect-with-metamask.spec.js |  4 ---
 .../connections/edit-account-flow.spec.js     |  4 ---
 .../connections/edit-networks-flow.spec.js    |  4 ---
 .../review-permissions-page.spec.js           |  8 ------
 .../dapp-interactions.spec.js                 |  5 ----
 .../dapp-interactions/permissions.spec.js     |  4 ---
 test/e2e/tests/metrics/dapp-viewed.spec.js    |  4 ---
 .../multichain/all-permissions-page.spec.js   |  8 ------
 .../tests/multichain/permission-page.spec.js  |  8 ------
 .../permissions-page/permissions-page.js      | 25 +------------------
 25 files changed, 1 insertion(+), 163 deletions(-)

diff --git a/app/_locales/de/messages.json b/app/_locales/de/messages.json
index 06d2f690716d..ec9779e4d1af 100644
--- a/app/_locales/de/messages.json
+++ b/app/_locales/de/messages.json
@@ -4105,12 +4105,6 @@
   "permissionsPageEmptySubContent": {
     "message": "Hier können Sie die Genehmigungen sehen, die Sie installierten Snaps oder verbundenen Websites gegeben haben."
   },
-  "permissionsPageTourDescription": {
-    "message": "Dies ist Ihr Kontrollfeld zum Verwalten der Genehmigungen für verbundene Websites und installierte Snaps."
-  },
-  "permissionsPageTourTitle": {
-    "message": "Verbundene Websites sind nun Genehmigungen"
-  },
   "permitSimulationDetailInfo": {
     "message": "Sie erteilen dem Spender die Genehmigung, diese Menge an Tokens von Ihrem Konto auszugeben."
   },
diff --git a/app/_locales/el/messages.json b/app/_locales/el/messages.json
index 8d09e2c6658f..42d08fa2f602 100644
--- a/app/_locales/el/messages.json
+++ b/app/_locales/el/messages.json
@@ -4105,12 +4105,6 @@
   "permissionsPageEmptySubContent": {
     "message": "Εδώ μπορείτε να δείτε τις άδειες χρήσης που έχετε δώσει στα εγκατεστημένα Snaps ή στους συνδεδεμένους ιστότοπους."
   },
-  "permissionsPageTourDescription": {
-    "message": "Αυτός είναι ο πίνακας ελέγχου για τη διαχείριση των αδειών χρήσης που έχετε δώσει στους συνδεδεμένους ιστότοπους και στα εγκατεστημένα Snaps."
-  },
-  "permissionsPageTourTitle": {
-    "message": "Οι συνδεδεμένοι ιστότοποι είναι τώρα με άδειες χρήσης"
-  },
   "permitSimulationDetailInfo": {
     "message": "Δίνετε στον διαθέτη την άδεια να δαπανήσει τα tokens από τον λογαριασμό σας."
   },
diff --git a/app/_locales/en/messages.json b/app/_locales/en/messages.json
index 9d63e212d88c..34afdaab62ed 100644
--- a/app/_locales/en/messages.json
+++ b/app/_locales/en/messages.json
@@ -4255,12 +4255,6 @@
   "permissionsPageEmptySubContent": {
     "message": "This is where you can see the permissions you've given to installed Snaps or connected sites."
   },
-  "permissionsPageTourDescription": {
-    "message": "This is your control panel for managing permissions given to connected sites and installed Snaps."
-  },
-  "permissionsPageTourTitle": {
-    "message": "Connected sites are now permissions"
-  },
   "permitSimulationChange_approve": {
     "message": "Spending cap"
   },
diff --git a/app/_locales/es/messages.json b/app/_locales/es/messages.json
index 2861d508743d..9d3b9028c734 100644
--- a/app/_locales/es/messages.json
+++ b/app/_locales/es/messages.json
@@ -4105,12 +4105,6 @@
   "permissionsPageEmptySubContent": {
     "message": "Aquí es donde puedes ver los permisos que has otorgado a los Snaps instalados o a los sitios conectados."
   },
-  "permissionsPageTourDescription": {
-    "message": "Este es su panel de control para administrar los permisos otorgados a los sitios conectados y los Snaps instalados."
-  },
-  "permissionsPageTourTitle": {
-    "message": "Los sitios conectados ahora tienen permisos"
-  },
   "permitSimulationDetailInfo": {
     "message": "Le está dando permiso al gastador para gastar esta cantidad de tokens de su cuenta."
   },
diff --git a/app/_locales/fr/messages.json b/app/_locales/fr/messages.json
index 5ae9377d8a69..6b9f60d35678 100644
--- a/app/_locales/fr/messages.json
+++ b/app/_locales/fr/messages.json
@@ -4105,12 +4105,6 @@
   "permissionsPageEmptySubContent": {
     "message": "Ici, vous pouvez voir les autorisations que vous avez accordées aux Snaps installés ou aux sites connectés."
   },
-  "permissionsPageTourDescription": {
-    "message": "C’’est votre panneau de configuration pour gérer les autorisations accordées aux sites connectés et aux Snaps installés."
-  },
-  "permissionsPageTourTitle": {
-    "message": "Les sites connectés sont maintenant des autorisations"
-  },
   "permitSimulationDetailInfo": {
     "message": "Vous autorisez la dépenseur à dépenser ce nombre de jetons de votre compte."
   },
diff --git a/app/_locales/hi/messages.json b/app/_locales/hi/messages.json
index a036aef959ce..7e4df895fbd8 100644
--- a/app/_locales/hi/messages.json
+++ b/app/_locales/hi/messages.json
@@ -4105,12 +4105,6 @@
   "permissionsPageEmptySubContent": {
     "message": "यहां पर आप इंस्टॉल किए गए Snaps या कनेक्टेड साइटों को दी गई अनुमतियां देख सकते हैं।"
   },
-  "permissionsPageTourDescription": {
-    "message": "कनेक्टेड साइटों और इंस्टॉल किए गए Snaps को दी गई अनुमतियों को मैनेज करने के लिए यह आपका कंट्रोल पैनल है।"
-  },
-  "permissionsPageTourTitle": {
-    "message": "कनेक्टेड साइटें अब अनुमतियां हैं"
-  },
   "permitSimulationDetailInfo": {
     "message": "आप खर्च करने वाले को अपने अकाउंट से इतने सारे टोकन खर्च करने की अनुमति दे रहे हैं।"
   },
diff --git a/app/_locales/id/messages.json b/app/_locales/id/messages.json
index 5777f05c2322..9cc407f17b1c 100644
--- a/app/_locales/id/messages.json
+++ b/app/_locales/id/messages.json
@@ -4105,12 +4105,6 @@
   "permissionsPageEmptySubContent": {
     "message": "Di sinilah Anda dapat melihat izin yang Anda berikan untuk Snap yang terinstal atau situs yang terhubung."
   },
-  "permissionsPageTourDescription": {
-    "message": "Ini merupakan panel kontrol Anda untuk mengelola izin yang diberikan ke situs yang terhubung dan Snap yang terinstal."
-  },
-  "permissionsPageTourTitle": {
-    "message": "Situs yang terhubung kini memiliki izin"
-  },
   "permitSimulationDetailInfo": {
     "message": "Anda memberikan izin kepada pengguna untuk menggunakan token sebanyak ini dari akun."
   },
diff --git a/app/_locales/ja/messages.json b/app/_locales/ja/messages.json
index 561411606feb..08b8022108d1 100644
--- a/app/_locales/ja/messages.json
+++ b/app/_locales/ja/messages.json
@@ -4105,12 +4105,6 @@
   "permissionsPageEmptySubContent": {
     "message": "ここには、インストールされたSnapや接続されたサイトに付与したアクセス許可が表示されます。"
   },
-  "permissionsPageTourDescription": {
-    "message": "これは、接続されたサイトやインストールされたSnapに付与したアクセス許可を管理するための、コントロールパネルです。"
-  },
-  "permissionsPageTourTitle": {
-    "message": "「接続済みのサイト」が「アクセス許可」に変更されました"
-  },
   "permitSimulationDetailInfo": {
     "message": "この数量のトークンをアカウントから転送する権限を使用者に付与しようとしています。"
   },
diff --git a/app/_locales/ko/messages.json b/app/_locales/ko/messages.json
index 941010db2abe..11c9e64de010 100644
--- a/app/_locales/ko/messages.json
+++ b/app/_locales/ko/messages.json
@@ -4105,12 +4105,6 @@
   "permissionsPageEmptySubContent": {
     "message": "여기에서 설치된 Snap 또는 연결된 사이트의 권한을 확인할 수 있습니다."
   },
-  "permissionsPageTourDescription": {
-    "message": "연결된 사이트 또는 설치된 Snap의 권한을 관리하기 위한 제어판입니다."
-  },
-  "permissionsPageTourTitle": {
-    "message": "이제 연결된 사이트에 권한이 부여됩니다"
-  },
   "permitSimulationDetailInfo": {
     "message": "내 계정에서 이만큼의 토큰을 사용할 수 있도록 승인합니다."
   },
diff --git a/app/_locales/pt/messages.json b/app/_locales/pt/messages.json
index 553b0ad31508..af31962e7066 100644
--- a/app/_locales/pt/messages.json
+++ b/app/_locales/pt/messages.json
@@ -4105,12 +4105,6 @@
   "permissionsPageEmptySubContent": {
     "message": "Aqui você pode ver as permissões que deu aos snaps instalados ou sites conectados."
   },
-  "permissionsPageTourDescription": {
-    "message": "Este é o seu painel de controle para gerenciar as permissões dadas aos sites conectados e snaps instalados."
-  },
-  "permissionsPageTourTitle": {
-    "message": "Sites conectados agora são permissões"
-  },
   "permitSimulationDetailInfo": {
     "message": "Você está autorizando o consumidor a gastar esta quantidade de tokens de sua conta."
   },
diff --git a/app/_locales/ru/messages.json b/app/_locales/ru/messages.json
index 1403b6084d27..c8c54df2d25d 100644
--- a/app/_locales/ru/messages.json
+++ b/app/_locales/ru/messages.json
@@ -4105,12 +4105,6 @@
   "permissionsPageEmptySubContent": {
     "message": "Здесь вы можете увидеть разрешения, которые вы предоставили установленным Snaps или подключенным сайтам."
   },
-  "permissionsPageTourDescription": {
-    "message": "Это ваша панель управления для управления разрешениями, предоставленными подключенным сайтам и установленным Snaps."
-  },
-  "permissionsPageTourTitle": {
-    "message": "Подключенные сайты теперь имеют разрешения"
-  },
   "permitSimulationDetailInfo": {
     "message": "Вы даёте расходующему лицу разрешение потратить именно столько токенов из вашего аккаунта"
   },
diff --git a/app/_locales/tl/messages.json b/app/_locales/tl/messages.json
index 60855b61765d..34f248e7ec8c 100644
--- a/app/_locales/tl/messages.json
+++ b/app/_locales/tl/messages.json
@@ -4105,12 +4105,6 @@
   "permissionsPageEmptySubContent": {
     "message": "Dito mo makikita ang mga pahintulot na iyong binigay sa mga naka-install na Snap o konektadong site."
   },
-  "permissionsPageTourDescription": {
-    "message": "Ito ang iyong control panel para pamahalaan ang mga permiso na ibinigay sa mga konektadong Snap."
-  },
-  "permissionsPageTourTitle": {
-    "message": "Ang mga konektadong site ay pahintulot na ngayon"
-  },
   "permitSimulationDetailInfo": {
     "message": "Binibigyan mo ang gumagastos ng permiso upang gumastos ng ganito karaming token mula sa iyong account."
   },
diff --git a/app/_locales/tr/messages.json b/app/_locales/tr/messages.json
index 6bcd1b8a61fc..3bfcbe9812c1 100644
--- a/app/_locales/tr/messages.json
+++ b/app/_locales/tr/messages.json
@@ -4105,12 +4105,6 @@
   "permissionsPageEmptySubContent": {
     "message": "Burada, yüklü Snap'lere veya bağlı sitelere verdiğiniz izinleri görebilirsiniz."
   },
-  "permissionsPageTourDescription": {
-    "message": "Burası, bağlı sitelere ve yüklü Snap'lere verilen izinleri yönetebileceğiniz kontrol panelinizdir."
-  },
-  "permissionsPageTourTitle": {
-    "message": "Bağlı siteler şimdi izinler oldu"
-  },
   "permitSimulationDetailInfo": {
     "message": "Harcama yapan tarafa hesabınızdan bu kadar çok token'i harcama izni veriyorsunuz."
   },
diff --git a/app/_locales/vi/messages.json b/app/_locales/vi/messages.json
index 3901eed1fc07..47ca7fad8568 100644
--- a/app/_locales/vi/messages.json
+++ b/app/_locales/vi/messages.json
@@ -4105,12 +4105,6 @@
   "permissionsPageEmptySubContent": {
     "message": "Đây là nơi bạn có thể xem các quyền mà bạn đã cấp cho các Snap đã cài đặt hoặc các trang web đã kết nối."
   },
-  "permissionsPageTourDescription": {
-    "message": "Đây là bảng điều khiển để bạn quản lý các quyền được cấp cho các trang web đã kết nối và các Snap đã cài đặt."
-  },
-  "permissionsPageTourTitle": {
-    "message": "Các trang web đã kết nối hiện đã được cấp quyền"
-  },
   "permitSimulationDetailInfo": {
     "message": "Bạn đang cấp cho người chi tiêu quyền chi tiêu số lượng token này từ tài khoản của bạn."
   },
diff --git a/app/_locales/zh_CN/messages.json b/app/_locales/zh_CN/messages.json
index 4d548221769f..2e8a8ee3a052 100644
--- a/app/_locales/zh_CN/messages.json
+++ b/app/_locales/zh_CN/messages.json
@@ -4105,12 +4105,6 @@
   "permissionsPageEmptySubContent": {
     "message": "您可以在此处查看您授予已安装 Snap 或已连接站点的许可。"
   },
-  "permissionsPageTourDescription": {
-    "message": "这是您的控制面板，用于管理授予已连接站点和已安装 Snap 的许可。"
-  },
-  "permissionsPageTourTitle": {
-    "message": "已连接的站点现已获得许可"
-  },
   "permitSimulationDetailInfo": {
     "message": "您将授予该消费者许可从您的账户中支出这些代币。"
   },
diff --git a/test/e2e/tests/connections/connect-with-metamask.spec.js b/test/e2e/tests/connections/connect-with-metamask.spec.js
index 5611b40346db..b46fc8730d84 100644
--- a/test/e2e/tests/connections/connect-with-metamask.spec.js
+++ b/test/e2e/tests/connections/connect-with-metamask.spec.js
@@ -55,10 +55,6 @@ describe('Connections page', function () {
           '[data-testid ="account-options-menu-button"]',
         );
         await driver.clickElement({ text: 'All Permissions', tag: 'div' });
-        await driver.clickElementAndWaitToDisappear({
-          text: 'Got it',
-          tag: 'button',
-        });
         await driver.clickElement({
           text: '127.0.0.1:8080',
           tag: 'p',
diff --git a/test/e2e/tests/connections/edit-account-flow.spec.js b/test/e2e/tests/connections/edit-account-flow.spec.js
index 7b05f439714c..1c4899ed8328 100644
--- a/test/e2e/tests/connections/edit-account-flow.spec.js
+++ b/test/e2e/tests/connections/edit-account-flow.spec.js
@@ -58,10 +58,6 @@ describe('Edit Accounts Flow', function () {
           '[data-testid ="account-options-menu-button"]',
         );
         await driver.clickElement({ text: 'All Permissions', tag: 'div' });
-        await driver.clickElementAndWaitToDisappear({
-          text: 'Got it',
-          tag: 'button',
-        });
         await driver.clickElement({
           text: '127.0.0.1:8080',
           tag: 'p',
diff --git a/test/e2e/tests/connections/edit-networks-flow.spec.js b/test/e2e/tests/connections/edit-networks-flow.spec.js
index 1db224f0ac0a..95a091f7e504 100644
--- a/test/e2e/tests/connections/edit-networks-flow.spec.js
+++ b/test/e2e/tests/connections/edit-networks-flow.spec.js
@@ -43,10 +43,6 @@ describe('Edit Networks Flow', function () {
           '[data-testid ="account-options-menu-button"]',
         );
         await driver.clickElement({ text: 'All Permissions', tag: 'div' });
-        await driver.clickElementAndWaitToDisappear({
-          text: 'Got it',
-          tag: 'button',
-        });
         await driver.clickElement({
           text: '127.0.0.1:8080',
           tag: 'p',
diff --git a/test/e2e/tests/connections/review-permissions-page.spec.js b/test/e2e/tests/connections/review-permissions-page.spec.js
index d411a343b2c9..60b7df8de4e0 100644
--- a/test/e2e/tests/connections/review-permissions-page.spec.js
+++ b/test/e2e/tests/connections/review-permissions-page.spec.js
@@ -36,10 +36,6 @@ describe('Review Permissions page', function () {
           '[data-testid ="account-options-menu-button"]',
         );
         await driver.clickElement({ text: 'All Permissions', tag: 'div' });
-        await driver.clickElementAndWaitToDisappear({
-          text: 'Got it',
-          tag: 'button',
-        });
         await driver.clickElement({
           text: '127.0.0.1:8080',
           tag: 'p',
@@ -90,10 +86,6 @@ describe('Review Permissions page', function () {
           '[data-testid ="account-options-menu-button"]',
         );
         await driver.clickElement({ text: 'All Permissions', tag: 'div' });
-        await driver.clickElementAndWaitToDisappear({
-          text: 'Got it',
-          tag: 'button',
-        });
         await driver.clickElement({
           text: '127.0.0.1:8080',
           tag: 'p',
diff --git a/test/e2e/tests/dapp-interactions/dapp-interactions.spec.js b/test/e2e/tests/dapp-interactions/dapp-interactions.spec.js
index 584408134f1a..05d9528ce6b4 100644
--- a/test/e2e/tests/dapp-interactions/dapp-interactions.spec.js
+++ b/test/e2e/tests/dapp-interactions/dapp-interactions.spec.js
@@ -83,11 +83,6 @@ describe('Dapp interactions', function () {
         );
 
         await driver.clickElement({ text: 'All Permissions', tag: 'div' });
-        await driver.clickElementAndWaitToDisappear({
-          text: 'Got it',
-          tag: 'button',
-        });
-
         const connectedDapp1 = await driver.isElementPresent({
           text: '127.0.0.1:8080',
           tag: 'p',
diff --git a/test/e2e/tests/dapp-interactions/permissions.spec.js b/test/e2e/tests/dapp-interactions/permissions.spec.js
index 4b6c210f0a98..b8da733d3160 100644
--- a/test/e2e/tests/dapp-interactions/permissions.spec.js
+++ b/test/e2e/tests/dapp-interactions/permissions.spec.js
@@ -46,10 +46,6 @@ describe('Permissions', function () {
           text: 'All Permissions',
           tag: 'div',
         });
-        await driver.clickElementAndWaitToDisappear({
-          text: 'Got it',
-          tag: 'button',
-        });
         await driver.waitForSelector({
           text: '127.0.0.1:8080',
           tag: 'p',
diff --git a/test/e2e/tests/metrics/dapp-viewed.spec.js b/test/e2e/tests/metrics/dapp-viewed.spec.js
index 668f93e65dc5..a747ea658937 100644
--- a/test/e2e/tests/metrics/dapp-viewed.spec.js
+++ b/test/e2e/tests/metrics/dapp-viewed.spec.js
@@ -297,10 +297,6 @@ describe('Dapp viewed Event @no-mmi', function () {
           text: 'All Permissions',
           tag: 'div',
         });
-        await driver.clickElementAndWaitToDisappear({
-          text: 'Got it',
-          tag: 'button',
-        });
         await driver.clickElement({
           text: '127.0.0.1:8080',
           tag: 'p',
diff --git a/test/e2e/tests/multichain/all-permissions-page.spec.js b/test/e2e/tests/multichain/all-permissions-page.spec.js
index 5bb718bd8d20..47601c58bb2f 100644
--- a/test/e2e/tests/multichain/all-permissions-page.spec.js
+++ b/test/e2e/tests/multichain/all-permissions-page.spec.js
@@ -32,10 +32,6 @@ describe('Permissions Page', function () {
           '[data-testid ="account-options-menu-button"]',
         );
         await driver.clickElement({ text: 'All Permissions', tag: 'div' });
-        await driver.clickElementAndWaitToDisappear({
-          text: 'Got it',
-          tag: 'button',
-        });
         const connectedDapp = await driver.isElementPresent({
           text: '127.0.0.1:8080',
           tag: 'p',
@@ -83,10 +79,6 @@ describe('Permissions Page', function () {
           '[data-testid ="account-options-menu-button"]',
         );
         await driver.clickElement({ text: 'All Permissions', tag: 'div' });
-        await driver.clickElementAndWaitToDisappear({
-          text: 'Got it',
-          tag: 'button',
-        });
         const connectedDapp = await driver.isElementPresent({
           text: '127.0.0.1:8080',
           tag: 'p',
diff --git a/test/e2e/tests/multichain/permission-page.spec.js b/test/e2e/tests/multichain/permission-page.spec.js
index 5ae3f71b6046..e2b7208045e0 100644
--- a/test/e2e/tests/multichain/permission-page.spec.js
+++ b/test/e2e/tests/multichain/permission-page.spec.js
@@ -32,10 +32,6 @@ describe('Permissions Page', function () {
           '[data-testid ="account-options-menu-button"]',
         );
         await driver.clickElement({ text: 'All Permissions', tag: 'div' });
-        await driver.clickElementAndWaitToDisappear({
-          text: 'Got it',
-          tag: 'button',
-        });
         const connectedDapp = await driver.isElementPresent({
           text: '127.0.0.1:8080',
           tag: 'p',
@@ -68,10 +64,6 @@ describe('Permissions Page', function () {
           '[data-testid ="account-options-menu-button"]',
         );
         await driver.clickElement({ text: 'All Permissions', tag: 'div' });
-        await driver.clickElementAndWaitToDisappear({
-          text: 'Got it',
-          tag: 'button',
-        });
         await driver.clickElement({
           text: '127.0.0.1:8080',
           tag: 'p',
diff --git a/ui/components/multichain/pages/permissions-page/permissions-page.js b/ui/components/multichain/pages/permissions-page/permissions-page.js
index 8cdeae0ed57d..3f4680bf0350 100644
--- a/ui/components/multichain/pages/permissions-page/permissions-page.js
+++ b/ui/components/multichain/pages/permissions-page/permissions-page.js
@@ -1,4 +1,3 @@
-import classnames from 'classnames';
 import React, { useEffect, useRef, useState } from 'react';
 import { useHistory } from 'react-router-dom';
 import { useSelector } from 'react-redux';
@@ -26,13 +25,7 @@ import {
   DEFAULT_ROUTE,
   REVIEW_PERMISSIONS,
 } from '../../../../helpers/constants/routes';
-import {
-  getOnboardedInThisUISession,
-  getShowPermissionsTour,
-  getConnectedSitesListWithNetworkInfo,
-} from '../../../../selectors';
-import { ProductTour } from '../../product-tour-popover';
-import { hidePermissionsTour } from '../../../../store/actions';
+import { getConnectedSitesListWithNetworkInfo } from '../../../../selectors';
 import { isSnapId } from '../../../../helpers/utils/snaps';
 import { ConnectionListItem } from './connection-list-item';
 
@@ -44,8 +37,6 @@ export const PermissionsPage = () => {
   const sitesConnectionsList = useSelector(
     getConnectedSitesListWithNetworkInfo,
   );
-  const showPermissionsTour = useSelector(getShowPermissionsTour);
-  const onboardedInThisUISession = useSelector(getOnboardedInThisUISession);
 
   useEffect(() => {
     setTotalConnections(Object.keys(sitesConnectionsList).length);
@@ -94,20 +85,6 @@ export const PermissionsPage = () => {
           {t('permissions')}
         </Text>
       </Header>
-      {showPermissionsTour && !onboardedInThisUISession ? (
-        <ProductTour
-          closeMenu={hidePermissionsTour}
-          className={classnames(
-            'multichain-product-tour-menu__permissions-page-tour',
-          )}
-          data-testid="permissions-page-product-tour"
-          anchorElement={headerRef.current}
-          title={t('permissionsPageTourTitle')}
-          description={t('permissionsPageTourDescription')}
-          onClick={hidePermissionsTour}
-          positionObj="44%"
-        />
-      ) : null}
       <Content padding={0}>
         <Box ref={headerRef}></Box>
         {totalConnections > 0 ? (

From 49a7c825a2c723a1bf9250066d24567cf43fde54 Mon Sep 17 00:00:00 2001
From: Jyoti Puri <jyotipuri@gmail.com>
Date: Thu, 12 Dec 2024 19:27:24 +0530
Subject: [PATCH 104/175] fix: design related fixes in confirmation pages
 (#29137)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## **Description**

Small design related fixes in re-designed confirmation pages

## **Related issues**

Fixes: https://github.com/MetaMask/MetaMask-planning/issues/3478

## **Manual testing steps**

1. Go to test dapp
2. Submit transaction pages and check design fixes

## **Screenshots/Recordings**
<img width="345" alt="Screenshot 2024-12-12 at 6 52 03 PM"
src="https://github.com/user-attachments/assets/36065b32-42eb-4a55-9a67-21d04bdde8e5"
/>

## **Pre-merge author checklist**

- [X] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension Coding
Standards](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/CODING_GUIDELINES.md).
- [X] I've completed the PR template to the best of my ability
- [X] I’ve included tests if applicable
- [X] I’ve documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [X] I’ve applied the right labels on the PR (see [labeling
guidelines](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.

## **Pre-merge reviewer checklist**

- [ ] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed).
- [ ] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.
---
 ui/components/app/confirm/info/row/text.tsx   | 26 +++----
 .../info/__snapshots__/info.test.tsx.snap     | 72 +++++++++----------
 .../__snapshots__/approve.test.tsx.snap       | 38 +++++-----
 .../__snapshots__/spending-cap.test.tsx.snap  | 14 ++--
 .../base-transaction-info.test.tsx.snap       | 24 +++----
 .../native-transfer.test.tsx.snap             | 24 +++----
 .../nft-token-transfer.test.tsx.snap          | 24 +++----
 .../set-approval-for-all-info.test.tsx.snap   | 24 +++----
 .../edit-gas-fees-row.test.tsx.snap           | 26 +++----
 .../edit-gas-fees-row/edit-gas-fees-row.tsx   |  8 +--
 .../gas-fees-details.test.tsx.snap            | 24 +++----
 .../gas-fees-section.test.tsx.snap            | 24 +++----
 .../token-transfer.test.tsx.snap              | 24 +++----
 13 files changed, 176 insertions(+), 176 deletions(-)

diff --git a/ui/components/app/confirm/info/row/text.tsx b/ui/components/app/confirm/info/row/text.tsx
index 1f026f53c7d4..0e26b5a75bdc 100644
--- a/ui/components/app/confirm/info/row/text.tsx
+++ b/ui/components/app/confirm/info/row/text.tsx
@@ -53,18 +53,6 @@ export const ConfirmInfoRowText: React.FC<ConfirmInfoRowTextProps> = ({
       gap={2}
       minWidth={BlockSize.Zero}
     >
-      {tooltip ? (
-        <Tooltip
-          position="bottom"
-          title={tooltip}
-          wrapperStyle={{ minWidth: 0 }}
-          interactive
-        >
-          <InfoText text={text} />
-        </Tooltip>
-      ) : (
-        <InfoText text={text} />
-      )}
       {isEditable ? (
         <ButtonIcon
           className={editIconClassName || undefined}
@@ -74,10 +62,22 @@ export const ConfirmInfoRowText: React.FC<ConfirmInfoRowTextProps> = ({
           onClick={onEditClick}
           size={ButtonIconSize.Sm}
           // to reset the button padding
-          style={{ marginLeft: '-4px' }}
+          style={{ marginRight: '-4px' }}
           data-testid={editIconDataTestId}
         />
       ) : null}
+      {tooltip ? (
+        <Tooltip
+          position="bottom"
+          title={tooltip}
+          wrapperStyle={{ minWidth: 0 }}
+          interactive
+        >
+          <InfoText text={text} />
+        </Tooltip>
+      ) : (
+        <InfoText text={text} />
+      )}
     </Box>
   );
 };
diff --git a/ui/pages/confirmations/components/confirm/info/__snapshots__/info.test.tsx.snap b/ui/pages/confirmations/components/confirm/info/__snapshots__/info.test.tsx.snap
index a3f98126b093..2ff281c5186e 100644
--- a/ui/pages/confirmations/components/confirm/info/__snapshots__/info.test.tsx.snap
+++ b/ui/pages/confirmations/components/confirm/info/__snapshots__/info.test.tsx.snap
@@ -92,18 +92,6 @@ exports[`Info renders info section for approve request 1`] = `
       <div
         class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-space-between mm-box--align-items-center mm-box--text-align-center"
       >
-        <p
-          class="mm-box mm-text mm-text--body-md mm-box--margin-right-1 mm-box--color-text-default"
-          data-testid="first-gas-field"
-        >
-          0.0001 ETH
-        </p>
-        <p
-          class="mm-box mm-text mm-text--body-md mm-box--margin-right-2 mm-box--color-text-alternative"
-          data-testid="native-currency"
-        >
-          $0.08
-        </p>
         <button
           class="mm-box mm-text mm-button-base mm-button-base--size-sm mm-button-link mm-text--body-md-medium mm-box--padding-0 mm-box--padding-right-0 mm-box--padding-left-0 mm-box--display-inline-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-primary-default mm-box--background-color-transparent"
           data-testid="edit-gas-fee-icon"
@@ -117,6 +105,18 @@ exports[`Info renders info section for approve request 1`] = `
             class="mm-box mm-text mm-text--inherit mm-box--color-primary-default"
           />
         </button>
+        <p
+          class="mm-box mm-text mm-text--body-md mm-box--margin-right-1 mm-box--color-text-default"
+          data-testid="first-gas-field"
+        >
+          0.0001 ETH
+        </p>
+        <p
+          class="mm-box mm-text mm-text--body-md mm-box--margin-right-2 mm-box--color-text-alternative"
+          data-testid="native-currency"
+        >
+          $0.08
+        </p>
       </div>
     </div>
     <div
@@ -439,18 +439,6 @@ exports[`Info renders info section for contract interaction request 1`] = `
       <div
         class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-space-between mm-box--align-items-center mm-box--text-align-center"
       >
-        <p
-          class="mm-box mm-text mm-text--body-md mm-box--margin-right-1 mm-box--color-text-default"
-          data-testid="first-gas-field"
-        >
-          0.0001 ETH
-        </p>
-        <p
-          class="mm-box mm-text mm-text--body-md mm-box--margin-right-2 mm-box--color-text-alternative"
-          data-testid="native-currency"
-        >
-          $0.04
-        </p>
         <button
           class="mm-box mm-text mm-button-base mm-button-base--size-sm mm-button-link mm-text--body-md-medium mm-box--padding-0 mm-box--padding-right-0 mm-box--padding-left-0 mm-box--display-inline-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-primary-default mm-box--background-color-transparent"
           data-testid="edit-gas-fee-icon"
@@ -464,6 +452,18 @@ exports[`Info renders info section for contract interaction request 1`] = `
             class="mm-box mm-text mm-text--inherit mm-box--color-primary-default"
           />
         </button>
+        <p
+          class="mm-box mm-text mm-text--body-md mm-box--margin-right-1 mm-box--color-text-default"
+          data-testid="first-gas-field"
+        >
+          0.0001 ETH
+        </p>
+        <p
+          class="mm-box mm-text mm-text--body-md mm-box--margin-right-2 mm-box--color-text-alternative"
+          data-testid="native-currency"
+        >
+          $0.04
+        </p>
       </div>
     </div>
     <div
@@ -810,18 +810,6 @@ exports[`Info renders info section for setApprovalForAll request 1`] = `
       <div
         class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-space-between mm-box--align-items-center mm-box--text-align-center"
       >
-        <p
-          class="mm-box mm-text mm-text--body-md mm-box--margin-right-1 mm-box--color-text-default"
-          data-testid="first-gas-field"
-        >
-          0.0001 ETH
-        </p>
-        <p
-          class="mm-box mm-text mm-text--body-md mm-box--margin-right-2 mm-box--color-text-alternative"
-          data-testid="native-currency"
-        >
-          $0.08
-        </p>
         <button
           class="mm-box mm-text mm-button-base mm-button-base--size-sm mm-button-link mm-text--body-md-medium mm-box--padding-0 mm-box--padding-right-0 mm-box--padding-left-0 mm-box--display-inline-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-primary-default mm-box--background-color-transparent"
           data-testid="edit-gas-fee-icon"
@@ -835,6 +823,18 @@ exports[`Info renders info section for setApprovalForAll request 1`] = `
             class="mm-box mm-text mm-text--inherit mm-box--color-primary-default"
           />
         </button>
+        <p
+          class="mm-box mm-text mm-text--body-md mm-box--margin-right-1 mm-box--color-text-default"
+          data-testid="first-gas-field"
+        >
+          0.0001 ETH
+        </p>
+        <p
+          class="mm-box mm-text mm-text--body-md mm-box--margin-right-2 mm-box--color-text-alternative"
+          data-testid="native-currency"
+        >
+          $0.08
+        </p>
       </div>
     </div>
     <div
diff --git a/ui/pages/confirmations/components/confirm/info/approve/__snapshots__/approve.test.tsx.snap b/ui/pages/confirmations/components/confirm/info/approve/__snapshots__/approve.test.tsx.snap
index c2c404726c61..bc8acf758720 100644
--- a/ui/pages/confirmations/components/confirm/info/approve/__snapshots__/approve.test.tsx.snap
+++ b/ui/pages/confirmations/components/confirm/info/approve/__snapshots__/approve.test.tsx.snap
@@ -414,23 +414,23 @@ exports[`<ApproveInfo /> renders component for approve request 1`] = `
       <div
         class="mm-box mm-box--display-flex mm-box--gap-2 mm-box--flex-wrap-wrap mm-box--align-items-center mm-box--min-width-0"
       >
-        <p
-          class="mm-box mm-text mm-text--body-md mm-box--color-inherit"
-          style="white-space: pre-wrap;"
-        >
-          1000 
-        </p>
         <button
           aria-label="Edit"
           class="mm-box mm-button-icon mm-button-icon--size-sm edit-spending-cap-btn mm-box--display-inline-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-primary-default mm-box--background-color-transparent mm-box--rounded-lg"
           data-testid="edit-spending-cap-icon"
-          style="margin-left: -4px;"
+          style="margin-right: -4px;"
         >
           <span
             class="mm-box mm-icon mm-icon--size-sm mm-box--display-inline-block mm-box--color-inherit"
             style="mask-image: url('./images/icons/edit.svg');"
           />
         </button>
+        <p
+          class="mm-box mm-text mm-text--body-md mm-box--color-inherit"
+          style="white-space: pre-wrap;"
+        >
+          1000 
+        </p>
       </div>
     </div>
   </div>
@@ -475,18 +475,6 @@ exports[`<ApproveInfo /> renders component for approve request 1`] = `
       <div
         class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-space-between mm-box--align-items-center mm-box--text-align-center"
       >
-        <p
-          class="mm-box mm-text mm-text--body-md mm-box--margin-right-1 mm-box--color-text-default"
-          data-testid="first-gas-field"
-        >
-          0.0001 ETH
-        </p>
-        <p
-          class="mm-box mm-text mm-text--body-md mm-box--margin-right-2 mm-box--color-text-alternative"
-          data-testid="native-currency"
-        >
-          $0.08
-        </p>
         <button
           class="mm-box mm-text mm-button-base mm-button-base--size-sm mm-button-link mm-text--body-md-medium mm-box--padding-0 mm-box--padding-right-0 mm-box--padding-left-0 mm-box--display-inline-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-primary-default mm-box--background-color-transparent"
           data-testid="edit-gas-fee-icon"
@@ -500,6 +488,18 @@ exports[`<ApproveInfo /> renders component for approve request 1`] = `
             class="mm-box mm-text mm-text--inherit mm-box--color-primary-default"
           />
         </button>
+        <p
+          class="mm-box mm-text mm-text--body-md mm-box--margin-right-1 mm-box--color-text-default"
+          data-testid="first-gas-field"
+        >
+          0.0001 ETH
+        </p>
+        <p
+          class="mm-box mm-text mm-text--body-md mm-box--margin-right-2 mm-box--color-text-alternative"
+          data-testid="native-currency"
+        >
+          $0.08
+        </p>
       </div>
     </div>
     <div
diff --git a/ui/pages/confirmations/components/confirm/info/approve/spending-cap/__snapshots__/spending-cap.test.tsx.snap b/ui/pages/confirmations/components/confirm/info/approve/spending-cap/__snapshots__/spending-cap.test.tsx.snap
index 9fca2dce8f70..67c00a96aff1 100644
--- a/ui/pages/confirmations/components/confirm/info/approve/spending-cap/__snapshots__/spending-cap.test.tsx.snap
+++ b/ui/pages/confirmations/components/confirm/info/approve/spending-cap/__snapshots__/spending-cap.test.tsx.snap
@@ -74,23 +74,23 @@ exports[`<SpendingCap /> renders component 1`] = `
       <div
         class="mm-box mm-box--display-flex mm-box--gap-2 mm-box--flex-wrap-wrap mm-box--align-items-center mm-box--min-width-0"
       >
-        <p
-          class="mm-box mm-text mm-text--body-md mm-box--color-inherit"
-          style="white-space: pre-wrap;"
-        >
-          1000 
-        </p>
         <button
           aria-label="Edit"
           class="mm-box mm-button-icon mm-button-icon--size-sm edit-spending-cap-btn mm-box--display-inline-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-primary-default mm-box--background-color-transparent mm-box--rounded-lg"
           data-testid="edit-spending-cap-icon"
-          style="margin-left: -4px;"
+          style="margin-right: -4px;"
         >
           <span
             class="mm-box mm-icon mm-icon--size-sm mm-box--display-inline-block mm-box--color-inherit"
             style="mask-image: url('./images/icons/edit.svg');"
           />
         </button>
+        <p
+          class="mm-box mm-text mm-text--body-md mm-box--color-inherit"
+          style="white-space: pre-wrap;"
+        >
+          1000 
+        </p>
       </div>
     </div>
   </div>
diff --git a/ui/pages/confirmations/components/confirm/info/base-transaction-info/__snapshots__/base-transaction-info.test.tsx.snap b/ui/pages/confirmations/components/confirm/info/base-transaction-info/__snapshots__/base-transaction-info.test.tsx.snap
index ee15d22e6363..f82c33d3d0f2 100644
--- a/ui/pages/confirmations/components/confirm/info/base-transaction-info/__snapshots__/base-transaction-info.test.tsx.snap
+++ b/ui/pages/confirmations/components/confirm/info/base-transaction-info/__snapshots__/base-transaction-info.test.tsx.snap
@@ -276,18 +276,6 @@ exports[`<BaseTransactionInfo /> renders component for contract interaction requ
       <div
         class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-space-between mm-box--align-items-center mm-box--text-align-center"
       >
-        <p
-          class="mm-box mm-text mm-text--body-md mm-box--margin-right-1 mm-box--color-text-default"
-          data-testid="first-gas-field"
-        >
-          0.0001 ETH
-        </p>
-        <p
-          class="mm-box mm-text mm-text--body-md mm-box--margin-right-2 mm-box--color-text-alternative"
-          data-testid="native-currency"
-        >
-          $0.04
-        </p>
         <button
           class="mm-box mm-text mm-button-base mm-button-base--size-sm mm-button-link mm-text--body-md-medium mm-box--padding-0 mm-box--padding-right-0 mm-box--padding-left-0 mm-box--display-inline-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-primary-default mm-box--background-color-transparent"
           data-testid="edit-gas-fee-icon"
@@ -301,6 +289,18 @@ exports[`<BaseTransactionInfo /> renders component for contract interaction requ
             class="mm-box mm-text mm-text--inherit mm-box--color-primary-default"
           />
         </button>
+        <p
+          class="mm-box mm-text mm-text--body-md mm-box--margin-right-1 mm-box--color-text-default"
+          data-testid="first-gas-field"
+        >
+          0.0001 ETH
+        </p>
+        <p
+          class="mm-box mm-text mm-text--body-md mm-box--margin-right-2 mm-box--color-text-alternative"
+          data-testid="native-currency"
+        >
+          $0.04
+        </p>
       </div>
     </div>
     <div
diff --git a/ui/pages/confirmations/components/confirm/info/native-transfer/__snapshots__/native-transfer.test.tsx.snap b/ui/pages/confirmations/components/confirm/info/native-transfer/__snapshots__/native-transfer.test.tsx.snap
index c194a43564f7..4fe5c3f41bbd 100644
--- a/ui/pages/confirmations/components/confirm/info/native-transfer/__snapshots__/native-transfer.test.tsx.snap
+++ b/ui/pages/confirmations/components/confirm/info/native-transfer/__snapshots__/native-transfer.test.tsx.snap
@@ -321,18 +321,6 @@ exports[`NativeTransferInfo renders correctly 1`] = `
       <div
         class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-space-between mm-box--align-items-center mm-box--text-align-center"
       >
-        <p
-          class="mm-box mm-text mm-text--body-md mm-box--margin-right-1 mm-box--color-text-default"
-          data-testid="first-gas-field"
-        >
-          0.0001 ETH
-        </p>
-        <p
-          class="mm-box mm-text mm-text--body-md mm-box--margin-right-2 mm-box--color-text-alternative"
-          data-testid="native-currency"
-        >
-          $0.08
-        </p>
         <button
           class="mm-box mm-text mm-button-base mm-button-base--size-sm mm-button-link mm-text--body-md-medium mm-box--padding-0 mm-box--padding-right-0 mm-box--padding-left-0 mm-box--display-inline-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-primary-default mm-box--background-color-transparent"
           data-testid="edit-gas-fee-icon"
@@ -346,6 +334,18 @@ exports[`NativeTransferInfo renders correctly 1`] = `
             class="mm-box mm-text mm-text--inherit mm-box--color-primary-default"
           />
         </button>
+        <p
+          class="mm-box mm-text mm-text--body-md mm-box--margin-right-1 mm-box--color-text-default"
+          data-testid="first-gas-field"
+        >
+          0.0001 ETH
+        </p>
+        <p
+          class="mm-box mm-text mm-text--body-md mm-box--margin-right-2 mm-box--color-text-alternative"
+          data-testid="native-currency"
+        >
+          $0.08
+        </p>
       </div>
     </div>
     <div
diff --git a/ui/pages/confirmations/components/confirm/info/nft-token-transfer/__snapshots__/nft-token-transfer.test.tsx.snap b/ui/pages/confirmations/components/confirm/info/nft-token-transfer/__snapshots__/nft-token-transfer.test.tsx.snap
index 07b9ad69b2ab..5ce090406606 100644
--- a/ui/pages/confirmations/components/confirm/info/nft-token-transfer/__snapshots__/nft-token-transfer.test.tsx.snap
+++ b/ui/pages/confirmations/components/confirm/info/nft-token-transfer/__snapshots__/nft-token-transfer.test.tsx.snap
@@ -349,18 +349,6 @@ exports[`NFTTokenTransferInfo renders correctly 1`] = `
       <div
         class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-space-between mm-box--align-items-center mm-box--text-align-center"
       >
-        <p
-          class="mm-box mm-text mm-text--body-md mm-box--margin-right-1 mm-box--color-text-default"
-          data-testid="first-gas-field"
-        >
-          0.0001 ETH
-        </p>
-        <p
-          class="mm-box mm-text mm-text--body-md mm-box--margin-right-2 mm-box--color-text-alternative"
-          data-testid="native-currency"
-        >
-          $0.08
-        </p>
         <button
           class="mm-box mm-text mm-button-base mm-button-base--size-sm mm-button-link mm-text--body-md-medium mm-box--padding-0 mm-box--padding-right-0 mm-box--padding-left-0 mm-box--display-inline-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-primary-default mm-box--background-color-transparent"
           data-testid="edit-gas-fee-icon"
@@ -374,6 +362,18 @@ exports[`NFTTokenTransferInfo renders correctly 1`] = `
             class="mm-box mm-text mm-text--inherit mm-box--color-primary-default"
           />
         </button>
+        <p
+          class="mm-box mm-text mm-text--body-md mm-box--margin-right-1 mm-box--color-text-default"
+          data-testid="first-gas-field"
+        >
+          0.0001 ETH
+        </p>
+        <p
+          class="mm-box mm-text mm-text--body-md mm-box--margin-right-2 mm-box--color-text-alternative"
+          data-testid="native-currency"
+        >
+          $0.08
+        </p>
       </div>
     </div>
     <div
diff --git a/ui/pages/confirmations/components/confirm/info/set-approval-for-all-info/__snapshots__/set-approval-for-all-info.test.tsx.snap b/ui/pages/confirmations/components/confirm/info/set-approval-for-all-info/__snapshots__/set-approval-for-all-info.test.tsx.snap
index 42efa15a2a5b..a3f8724e7561 100644
--- a/ui/pages/confirmations/components/confirm/info/set-approval-for-all-info/__snapshots__/set-approval-for-all-info.test.tsx.snap
+++ b/ui/pages/confirmations/components/confirm/info/set-approval-for-all-info/__snapshots__/set-approval-for-all-info.test.tsx.snap
@@ -196,18 +196,6 @@ exports[`<SetApprovalForAllInfo /> renders component for approve request 1`] = `
       <div
         class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-space-between mm-box--align-items-center mm-box--text-align-center"
       >
-        <p
-          class="mm-box mm-text mm-text--body-md mm-box--margin-right-1 mm-box--color-text-default"
-          data-testid="first-gas-field"
-        >
-          0.0001 ETH
-        </p>
-        <p
-          class="mm-box mm-text mm-text--body-md mm-box--margin-right-2 mm-box--color-text-alternative"
-          data-testid="native-currency"
-        >
-          $0.08
-        </p>
         <button
           class="mm-box mm-text mm-button-base mm-button-base--size-sm mm-button-link mm-text--body-md-medium mm-box--padding-0 mm-box--padding-right-0 mm-box--padding-left-0 mm-box--display-inline-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-primary-default mm-box--background-color-transparent"
           data-testid="edit-gas-fee-icon"
@@ -221,6 +209,18 @@ exports[`<SetApprovalForAllInfo /> renders component for approve request 1`] = `
             class="mm-box mm-text mm-text--inherit mm-box--color-primary-default"
           />
         </button>
+        <p
+          class="mm-box mm-text mm-text--body-md mm-box--margin-right-1 mm-box--color-text-default"
+          data-testid="first-gas-field"
+        >
+          0.0001 ETH
+        </p>
+        <p
+          class="mm-box mm-text mm-text--body-md mm-box--margin-right-2 mm-box--color-text-alternative"
+          data-testid="native-currency"
+        >
+          $0.08
+        </p>
       </div>
     </div>
     <div
diff --git a/ui/pages/confirmations/components/confirm/info/shared/edit-gas-fees-row/__snapshots__/edit-gas-fees-row.test.tsx.snap b/ui/pages/confirmations/components/confirm/info/shared/edit-gas-fees-row/__snapshots__/edit-gas-fees-row.test.tsx.snap
index 198f4be8f14d..8670c3b2aaca 100644
--- a/ui/pages/confirmations/components/confirm/info/shared/edit-gas-fees-row/__snapshots__/edit-gas-fees-row.test.tsx.snap
+++ b/ui/pages/confirmations/components/confirm/info/shared/edit-gas-fees-row/__snapshots__/edit-gas-fees-row.test.tsx.snap
@@ -39,6 +39,19 @@ exports[`<EditGasFeesRow /> renders component 1`] = `
     <div
       class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-space-between mm-box--align-items-center mm-box--text-align-center"
     >
+      <button
+        class="mm-box mm-text mm-button-base mm-button-base--size-sm mm-button-link mm-text--body-md-medium mm-box--padding-0 mm-box--padding-right-0 mm-box--padding-left-0 mm-box--display-inline-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-primary-default mm-box--background-color-transparent"
+        data-testid="edit-gas-fee-icon"
+        style="text-decoration: none;"
+      >
+        <span
+          class="mm-box mm-icon mm-icon--size-sm mm-box--margin-inline-end-1 mm-box--display-inline-block mm-box--color-inherit"
+          style="mask-image: url('./images/icons/edit.svg');"
+        />
+        <span
+          class="mm-box mm-text mm-text--inherit mm-box--color-primary-default"
+        />
+      </button>
       <p
         class="mm-box mm-text mm-text--body-md mm-box--margin-right-1 mm-box--color-text-default"
         data-testid="first-gas-field"
@@ -62,19 +75,6 @@ exports[`<EditGasFeesRow /> renders component 1`] = `
           </p>
         </div>
       </div>
-      <button
-        class="mm-box mm-text mm-button-base mm-button-base--size-sm mm-button-link mm-text--body-md-medium mm-box--padding-0 mm-box--padding-right-0 mm-box--padding-left-0 mm-box--display-inline-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-primary-default mm-box--background-color-transparent"
-        data-testid="edit-gas-fee-icon"
-        style="text-decoration: none;"
-      >
-        <span
-          class="mm-box mm-icon mm-icon--size-sm mm-box--margin-inline-end-1 mm-box--display-inline-block mm-box--color-inherit"
-          style="mask-image: url('./images/icons/edit.svg');"
-        />
-        <span
-          class="mm-box mm-text mm-text--inherit mm-box--color-primary-default"
-        />
-      </button>
     </div>
   </div>
 </div>
diff --git a/ui/pages/confirmations/components/confirm/info/shared/edit-gas-fees-row/edit-gas-fees-row.tsx b/ui/pages/confirmations/components/confirm/info/shared/edit-gas-fees-row/edit-gas-fees-row.tsx
index e351516941b8..2d3697c6f949 100644
--- a/ui/pages/confirmations/components/confirm/info/shared/edit-gas-fees-row/edit-gas-fees-row.tsx
+++ b/ui/pages/confirmations/components/confirm/info/shared/edit-gas-fees-row/edit-gas-fees-row.tsx
@@ -58,6 +58,10 @@ export const EditGasFeesRow = ({
         alignItems={AlignItems.center}
         textAlign={TextAlign.Center}
       >
+        <EditGasIconButton
+          supportsEIP1559={supportsEIP1559}
+          setShowCustomizeGasPopover={setShowCustomizeGasPopover}
+        />
         <Text
           marginRight={1}
           color={TextColor.textDefault}
@@ -85,10 +89,6 @@ export const EditGasFeesRow = ({
             {fiatFee}
           </Text>
         )}
-        <EditGasIconButton
-          supportsEIP1559={supportsEIP1559}
-          setShowCustomizeGasPopover={setShowCustomizeGasPopover}
-        />
       </Box>
     </ConfirmInfoAlertRow>
   );
diff --git a/ui/pages/confirmations/components/confirm/info/shared/gas-fees-details/__snapshots__/gas-fees-details.test.tsx.snap b/ui/pages/confirmations/components/confirm/info/shared/gas-fees-details/__snapshots__/gas-fees-details.test.tsx.snap
index 8cc9a9c3bfb5..081f1038b24b 100644
--- a/ui/pages/confirmations/components/confirm/info/shared/gas-fees-details/__snapshots__/gas-fees-details.test.tsx.snap
+++ b/ui/pages/confirmations/components/confirm/info/shared/gas-fees-details/__snapshots__/gas-fees-details.test.tsx.snap
@@ -39,18 +39,6 @@ exports[`<GasFeesDetails /> renders component for gas fees section 1`] = `
     <div
       class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-space-between mm-box--align-items-center mm-box--text-align-center"
     >
-      <p
-        class="mm-box mm-text mm-text--body-md mm-box--margin-right-1 mm-box--color-text-default"
-        data-testid="first-gas-field"
-      >
-        0.0001 ETH
-      </p>
-      <p
-        class="mm-box mm-text mm-text--body-md mm-box--margin-right-2 mm-box--color-text-alternative"
-        data-testid="native-currency"
-      >
-        $0.04
-      </p>
       <button
         class="mm-box mm-text mm-button-base mm-button-base--size-sm mm-button-link mm-text--body-md-medium mm-box--padding-0 mm-box--padding-right-0 mm-box--padding-left-0 mm-box--display-inline-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-primary-default mm-box--background-color-transparent"
         data-testid="edit-gas-fee-icon"
@@ -64,6 +52,18 @@ exports[`<GasFeesDetails /> renders component for gas fees section 1`] = `
           class="mm-box mm-text mm-text--inherit mm-box--color-primary-default"
         />
       </button>
+      <p
+        class="mm-box mm-text mm-text--body-md mm-box--margin-right-1 mm-box--color-text-default"
+        data-testid="first-gas-field"
+      >
+        0.0001 ETH
+      </p>
+      <p
+        class="mm-box mm-text mm-text--body-md mm-box--margin-right-2 mm-box--color-text-alternative"
+        data-testid="native-currency"
+      >
+        $0.04
+      </p>
     </div>
   </div>
   <div
diff --git a/ui/pages/confirmations/components/confirm/info/shared/gas-fees-section/__snapshots__/gas-fees-section.test.tsx.snap b/ui/pages/confirmations/components/confirm/info/shared/gas-fees-section/__snapshots__/gas-fees-section.test.tsx.snap
index 9300030d9b85..8f1400a7516a 100644
--- a/ui/pages/confirmations/components/confirm/info/shared/gas-fees-section/__snapshots__/gas-fees-section.test.tsx.snap
+++ b/ui/pages/confirmations/components/confirm/info/shared/gas-fees-section/__snapshots__/gas-fees-section.test.tsx.snap
@@ -45,18 +45,6 @@ exports[`<GasFeesSection /> renders component for gas fees section 1`] = `
       <div
         class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-space-between mm-box--align-items-center mm-box--text-align-center"
       >
-        <p
-          class="mm-box mm-text mm-text--body-md mm-box--margin-right-1 mm-box--color-text-default"
-          data-testid="first-gas-field"
-        >
-          0.0001 ETH
-        </p>
-        <p
-          class="mm-box mm-text mm-text--body-md mm-box--margin-right-2 mm-box--color-text-alternative"
-          data-testid="native-currency"
-        >
-          $0.04
-        </p>
         <button
           class="mm-box mm-text mm-button-base mm-button-base--size-sm mm-button-link mm-text--body-md-medium mm-box--padding-0 mm-box--padding-right-0 mm-box--padding-left-0 mm-box--display-inline-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-primary-default mm-box--background-color-transparent"
           data-testid="edit-gas-fee-icon"
@@ -70,6 +58,18 @@ exports[`<GasFeesSection /> renders component for gas fees section 1`] = `
             class="mm-box mm-text mm-text--inherit mm-box--color-primary-default"
           />
         </button>
+        <p
+          class="mm-box mm-text mm-text--body-md mm-box--margin-right-1 mm-box--color-text-default"
+          data-testid="first-gas-field"
+        >
+          0.0001 ETH
+        </p>
+        <p
+          class="mm-box mm-text mm-text--body-md mm-box--margin-right-2 mm-box--color-text-alternative"
+          data-testid="native-currency"
+        >
+          $0.04
+        </p>
       </div>
     </div>
     <div
diff --git a/ui/pages/confirmations/components/confirm/info/token-transfer/__snapshots__/token-transfer.test.tsx.snap b/ui/pages/confirmations/components/confirm/info/token-transfer/__snapshots__/token-transfer.test.tsx.snap
index 4cb3213f8dae..a9cdce1b702c 100644
--- a/ui/pages/confirmations/components/confirm/info/token-transfer/__snapshots__/token-transfer.test.tsx.snap
+++ b/ui/pages/confirmations/components/confirm/info/token-transfer/__snapshots__/token-transfer.test.tsx.snap
@@ -350,18 +350,6 @@ exports[`TokenTransferInfo renders correctly 1`] = `
       <div
         class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-space-between mm-box--align-items-center mm-box--text-align-center"
       >
-        <p
-          class="mm-box mm-text mm-text--body-md mm-box--margin-right-1 mm-box--color-text-default"
-          data-testid="first-gas-field"
-        >
-          0.0001 ETH
-        </p>
-        <p
-          class="mm-box mm-text mm-text--body-md mm-box--margin-right-2 mm-box--color-text-alternative"
-          data-testid="native-currency"
-        >
-          $0.08
-        </p>
         <button
           class="mm-box mm-text mm-button-base mm-button-base--size-sm mm-button-link mm-text--body-md-medium mm-box--padding-0 mm-box--padding-right-0 mm-box--padding-left-0 mm-box--display-inline-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-primary-default mm-box--background-color-transparent"
           data-testid="edit-gas-fee-icon"
@@ -375,6 +363,18 @@ exports[`TokenTransferInfo renders correctly 1`] = `
             class="mm-box mm-text mm-text--inherit mm-box--color-primary-default"
           />
         </button>
+        <p
+          class="mm-box mm-text mm-text--body-md mm-box--margin-right-1 mm-box--color-text-default"
+          data-testid="first-gas-field"
+        >
+          0.0001 ETH
+        </p>
+        <p
+          class="mm-box mm-text mm-text--body-md mm-box--margin-right-2 mm-box--color-text-alternative"
+          data-testid="native-currency"
+        >
+          $0.08
+        </p>
       </div>
     </div>
     <div

From c065d93f24625c9b9a50520d12d5fdd7912cc1c2 Mon Sep 17 00:00:00 2001
From: chloeYue <105063779+chloeYue@users.noreply.github.com>
Date: Thu, 12 Dec 2024 15:39:51 +0100
Subject: [PATCH 105/175] test: [POM] Migrate hardware wallet e2e tests to
 follow Page Object Model (#28768)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## **Description**

- Create base pages for hardware wallet related pages
- Migrate hardware wallet  e2e tests to Page Object Model
- Remove dead code (We should not keep unused functions in the codebase
because they can lead to several issues, such as increased maintenance
overhead, added complexity, potential bugs, and misleading information.)

[![Open in GitHub
Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/27155?quickstart=1)

## **Related issues**

Fixes: https://github.com/MetaMask/metamask-extension/issues/28808

## **Manual testing steps**
Check code readability, make sure tests pass.

## **Screenshots/Recordings**

<!-- If applicable, add screenshots and/or recordings to visualize the
before and after of your change. -->

### **Before**

<!-- [screenshots/recordings] -->

### **After**

<!-- [screenshots/recordings] -->

## **Pre-merge author checklist**

- [x] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension Coding
Standards](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/CODING_GUIDELINES.md).
- [x] I've completed the PR template to the best of my ability
- [x] I’ve included tests if applicable
- [x] I’ve documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [x] I’ve applied the right labels on the PR (see [labeling
guidelines](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.

## **Pre-merge reviewer checklist**

- [x] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed).
- [x] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.

---------

Co-authored-by: Harika <153644847+hjetpoluru@users.noreply.github.com>
Co-authored-by: Derek Brans <dbrans@gmail.com>
---
 .../page-objects/pages/account-list-page.ts   |  31 +++-
 .../connect-hardware-wallet-page.ts           |  54 ++++++
 .../select-trezor-account-page.ts             |  94 +++++++++++
 .../e2e/page-objects/pages/home/asset-list.ts |  44 -----
 .../pages/snap-simple-keyring-page.ts         |   5 +-
 test/e2e/page-objects/pages/test-dapp.ts      |  47 ++++--
 .../hardware-wallets/lattice-connect.spec.ts  |  38 ++---
 .../hardware-wallets/trezor-account.spec.js   | 156 ------------------
 .../hardware-wallets/trezor-account.spec.ts   | 117 +++++++++++++
 .../hardware-wallets/trezor-send.spec.ts      |  27 ++-
 .../hardware-wallets/trezor-sign.spec.ts      |  40 ++---
 11 files changed, 372 insertions(+), 281 deletions(-)
 create mode 100644 test/e2e/page-objects/pages/hardware-wallet/connect-hardware-wallet-page.ts
 create mode 100644 test/e2e/page-objects/pages/hardware-wallet/select-trezor-account-page.ts
 delete mode 100644 test/e2e/tests/hardware-wallets/trezor-account.spec.js
 create mode 100644 test/e2e/tests/hardware-wallets/trezor-account.spec.ts

diff --git a/test/e2e/page-objects/pages/account-list-page.ts b/test/e2e/page-objects/pages/account-list-page.ts
index 955dd5111fe1..bbf25013f607 100644
--- a/test/e2e/page-objects/pages/account-list-page.ts
+++ b/test/e2e/page-objects/pages/account-list-page.ts
@@ -1,6 +1,6 @@
 import { strict as assert } from 'assert';
 import { Driver } from '../../webdriver/driver';
-import { largeDelayMs } from '../../helpers';
+import { largeDelayMs, regularDelayMs } from '../../helpers';
 import messages from '../../../../app/_locales/en/messages.json';
 
 class AccountListPage {
@@ -8,6 +8,9 @@ class AccountListPage {
 
   private readonly accountAddressText = '.qr-code__address-segments';
 
+  private readonly accountListAddressItem =
+    '[data-testid="account-list-address"]';
+
   private readonly accountListBalance =
     '[data-testid="second-currency-display"]';
 
@@ -40,6 +43,11 @@ class AccountListPage {
   private readonly addEthereumAccountButton =
     '[data-testid="multichain-account-menu-popover-add-account"]';
 
+  private readonly addHardwareWalletButton = {
+    text: 'Add hardware wallet',
+    tag: 'button',
+  };
+
   private readonly addImportedAccountButton =
     '[data-testid="multichain-account-menu-popover-add-imported-account"]';
 
@@ -378,6 +386,15 @@ class AccountListPage {
     await this.driver.waitForSelector(this.addEthereumAccountButton);
   }
 
+  async openConnectHardwareWalletModal(): Promise<void> {
+    console.log(`Open connect hardware wallet modal`);
+    await this.driver.clickElement(this.createAccountButton);
+    await this.driver.clickElement(this.addHardwareWalletButton);
+    // This delay is needed to mitigate an existing bug in FF
+    // See https://github.com/metamask/metamask-extension/issues/25851
+    await this.driver.delay(regularDelayMs);
+  }
+
   async openHiddenAccountOptions(): Promise<void> {
     console.log(`Open hidden accounts options menu`);
     await this.driver.clickElement(this.hiddenAccountOptionsMenuButton);
@@ -436,6 +453,18 @@ class AccountListPage {
     await this.driver.clickElement(this.pinUnpinAccountButton);
   }
 
+  async check_accountAddressDisplayedInAccountList(
+    expectedAddress: string,
+  ): Promise<void> {
+    console.log(
+      `Check that account address ${expectedAddress} is displayed in account list`,
+    );
+    await this.driver.waitForSelector({
+      css: this.accountListAddressItem,
+      text: expectedAddress,
+    });
+  }
+
   /**
    * Checks that the account balance is displayed in the account list.
    *
diff --git a/test/e2e/page-objects/pages/hardware-wallet/connect-hardware-wallet-page.ts b/test/e2e/page-objects/pages/hardware-wallet/connect-hardware-wallet-page.ts
new file mode 100644
index 000000000000..e3b4de3fb522
--- /dev/null
+++ b/test/e2e/page-objects/pages/hardware-wallet/connect-hardware-wallet-page.ts
@@ -0,0 +1,54 @@
+import { Driver } from '../../../webdriver/driver';
+
+/**
+ * Represents the page for connecting hardware wallets.
+ * This page allows users to initiate connections with various hardware wallet types.
+ */
+class ConnectHardwareWalletPage {
+  private driver: Driver;
+
+  private readonly connectHardwareWalletPageTitle = {
+    text: 'Connect a hardware wallet',
+    tag: 'h3',
+  };
+
+  private readonly connectLatticeButton = '[data-testid="connect-lattice-btn"]';
+
+  private readonly connectTrezorButton = '[data-testid="connect-trezor-btn"]';
+
+  private readonly continueButton = { text: 'Continue', tag: 'button' };
+
+  constructor(driver: Driver) {
+    this.driver = driver;
+  }
+
+  async check_pageIsLoaded(): Promise<void> {
+    try {
+      await this.driver.waitForMultipleSelectors([
+        this.connectHardwareWalletPageTitle,
+        this.connectLatticeButton,
+      ]);
+    } catch (e) {
+      console.log(
+        'Timeout while waiting for connect hardware wallet page to be loaded',
+        e,
+      );
+      throw e;
+    }
+    console.log('Connect hardware wallet page is loaded');
+  }
+
+  async openConnectLatticePage(): Promise<void> {
+    console.log(`Open connect lattice page`);
+    await this.driver.clickElement(this.connectLatticeButton);
+    await this.driver.clickElement(this.continueButton);
+  }
+
+  async openConnectTrezorPage(): Promise<void> {
+    console.log(`Open connect trezor page`);
+    await this.driver.clickElement(this.connectTrezorButton);
+    await this.driver.clickElement(this.continueButton);
+  }
+}
+
+export default ConnectHardwareWalletPage;
diff --git a/test/e2e/page-objects/pages/hardware-wallet/select-trezor-account-page.ts b/test/e2e/page-objects/pages/hardware-wallet/select-trezor-account-page.ts
new file mode 100644
index 000000000000..65a00808c0bb
--- /dev/null
+++ b/test/e2e/page-objects/pages/hardware-wallet/select-trezor-account-page.ts
@@ -0,0 +1,94 @@
+import { Driver } from '../../../webdriver/driver';
+
+/**
+ * Represents the select trezor hardware wallet account page.
+ * This page allows users to select Trezor accounts to connect.
+ */
+class SelectTrezorAccountPage {
+  private driver: Driver;
+
+  private readonly cancelButton = { text: 'Cancel', tag: 'button' };
+
+  private readonly selectTrezorAccountPageTitle = {
+    text: 'Select an account',
+    tag: 'h3',
+  };
+
+  private readonly trezorAccountCheckbox = '.hw-account-list__item__checkbox';
+
+  private readonly unlockButton = { text: 'Unlock', tag: 'button' };
+
+  constructor(driver: Driver) {
+    this.driver = driver;
+  }
+
+  async check_pageIsLoaded(): Promise<void> {
+    try {
+      await this.driver.waitForMultipleSelectors([
+        this.selectTrezorAccountPageTitle,
+        this.cancelButton,
+      ]);
+    } catch (e) {
+      console.log(
+        'Timeout while waiting for select trezor account page to be loaded',
+        e,
+      );
+      throw e;
+    }
+    console.log('Select trezor account page is loaded');
+  }
+
+  async clickUnlockButton(): Promise<void> {
+    console.log(`Click unlock button on select trezor account page`);
+    await this.driver.clickElement(this.unlockButton);
+  }
+
+  async selectTrezorAccount(accountIndex: number): Promise<void> {
+    console.log(`Select trezor account ${accountIndex}`);
+    const accountCheckboxes = await this.driver.findElements(
+      this.trezorAccountCheckbox,
+    );
+    await accountCheckboxes[accountIndex - 1].click();
+  }
+
+  async unlockAccount(accountIndex: number): Promise<void> {
+    console.log(`Unlock trezor account ${accountIndex}`);
+    await this.selectTrezorAccount(accountIndex);
+    await this.clickUnlockButton();
+  }
+
+  /**
+   * Check that the specified address is displayed in the list of accounts.
+   *
+   * @param address - The address to check for.
+   */
+  async check_addressIsDisplayed(address: string): Promise<void> {
+    console.log(
+      `Check that account address ${address} is displayed on select trezor account page`,
+    );
+    await this.driver.waitForSelector({ text: address });
+  }
+
+  /**
+   * This function checks if the specified number of trezor account items is displayed in the trezor account list.
+   *
+   * @param expectedNumber - The number of trezor account items expected to be displayed. Defaults to 5.
+   * @returns A promise that resolves if the expected number of trezor account items is displayed.
+   */
+  async check_trezorAccountNumber(expectedNumber: number = 5): Promise<void> {
+    console.log(
+      `Waiting for ${expectedNumber} trezor account items to be displayed`,
+    );
+    await this.driver.wait(async () => {
+      const trezorAccountItems = await this.driver.findElements(
+        this.trezorAccountCheckbox,
+      );
+      return trezorAccountItems.length === expectedNumber;
+    }, 10000);
+    console.log(
+      `Expected number of trezor account items ${expectedNumber} is displayed.`,
+    );
+  }
+}
+
+export default SelectTrezorAccountPage;
diff --git a/test/e2e/page-objects/pages/home/asset-list.ts b/test/e2e/page-objects/pages/home/asset-list.ts
index abc5870ec04a..db9367991bf7 100644
--- a/test/e2e/page-objects/pages/home/asset-list.ts
+++ b/test/e2e/page-objects/pages/home/asset-list.ts
@@ -81,15 +81,6 @@ class AssetListPage {
     throw new Error(`${assetName} button not found`);
   }
 
-  async getAllNetworksOptionTotal(): Promise<string> {
-    console.log(`Retrieving the "All networks" option fiat value`);
-    const allNetworksValueElement = await this.driver.findElement(
-      this.allNetworksTotal,
-    );
-    const value = await allNetworksValueElement.getText();
-    return value;
-  }
-
   async getCurrentNetworksOptionTotal(): Promise<string> {
     console.log(`Retrieving the "Current network" option fiat value`);
     const allNetworksValueElement = await this.driver.findElement(
@@ -156,30 +147,6 @@ class AssetListPage {
     );
   }
 
-  async selectNetworkFilterAllNetworks(): Promise<void> {
-    console.log(`Selecting "All networks" from the network filter`);
-    await this.driver.clickElement(this.allNetworksOption);
-    await this.driver.waitUntil(
-      async () => {
-        const label = await this.getNetworksFilterLabel();
-        return label === 'All networks';
-      },
-      { timeout: 5000, interval: 100 },
-    );
-  }
-
-  async selectNetworkFilterCurrentNetwork(): Promise<void> {
-    console.log(`Selecting "Current network" from the network filter`);
-    await this.driver.clickElement(this.currentNetworkOption);
-    await this.driver.waitUntil(
-      async () => {
-        const label = await this.getNetworksFilterLabel();
-        return label !== 'All networks';
-      },
-      { timeout: 5000, interval: 100 },
-    );
-  }
-
   async waitUntilFilterLabelIs(label: string): Promise<void> {
     console.log(`Waiting until the filter label is ${label}`);
     await this.driver.waitUntil(
@@ -191,17 +158,6 @@ class AssetListPage {
     );
   }
 
-  async check_ifAssetIsVisible(assetName: string): Promise<boolean> {
-    const assets = await this.driver.findElements(this.tokenListItem);
-    for (const asset of assets) {
-      const text = await asset.getText();
-      if (text.includes(assetName)) {
-        return true;
-      }
-    }
-    return false;
-  }
-
   async check_networkFilterText(expectedText: string): Promise<void> {
     console.log(
       `Verify the displayed account label in header is: ${expectedText}`,
diff --git a/test/e2e/page-objects/pages/snap-simple-keyring-page.ts b/test/e2e/page-objects/pages/snap-simple-keyring-page.ts
index c75adb06da3a..21722cf7b36a 100644
--- a/test/e2e/page-objects/pages/snap-simple-keyring-page.ts
+++ b/test/e2e/page-objects/pages/snap-simple-keyring-page.ts
@@ -306,7 +306,10 @@ class SnapSimpleKeyringPage {
     await this.driver.switchToWindowWithTitle(WINDOW_TITLES.Dialog);
     await this.driver.clickElement(this.confirmConnectionButton);
 
-    await this.driver.waitForSelector(this.addtoMetamaskMessage);
+    // set a bigger timeout to wait for element as a temporary fix to reduce flakiness
+    await this.driver.waitForSelector(this.addtoMetamaskMessage, {
+      timeout: 15000,
+    });
     await this.driver.clickElementSafe(this.snapInstallScrollButton, 200);
     await this.driver.waitForSelector(this.confirmAddtoMetamask);
     await this.driver.clickElement(this.confirmAddtoMetamask);
diff --git a/test/e2e/page-objects/pages/test-dapp.ts b/test/e2e/page-objects/pages/test-dapp.ts
index c31ee497152e..5155707663b6 100644
--- a/test/e2e/page-objects/pages/test-dapp.ts
+++ b/test/e2e/page-objects/pages/test-dapp.ts
@@ -16,9 +16,15 @@ class TestDapp {
   private readonly confirmDialogScrollButton =
     '[data-testid="signature-request-scroll-button"]';
 
+  private readonly confirmScrollToBottomButtonRedesign =
+    '.confirm-scroll-to-bottom__button';
+
   private readonly confirmSignatureButton =
     '[data-testid="page-container-footer-next"]';
 
+  private readonly confirmSignatureButtonRedesign =
+    '[data-testid="confirm-footer-button"]';
+
   private readonly connectAccountButton = '#connectButton';
 
   private readonly connectMetaMaskMessage = {
@@ -116,6 +122,11 @@ class TestDapp {
     tag: 'div',
   };
 
+  private readonly signTypedDataV3V4SignatureRequestMessageRedesign = {
+    text: 'Hello, Bob!',
+    tag: 'p',
+  };
+
   private readonly signTypedDataV3VerifyButton = '#signTypedDataV3Verify';
 
   private readonly signTypedDataV3VerifyResult = '#signTypedDataV3VerifyResult';
@@ -159,11 +170,6 @@ class TestDapp {
     tag: 'h2',
   };
 
-  private readonly updateNetworkButton = {
-    text: 'Update',
-    tag: 'button',
-  };
-
   private readonly userRejectedRequestMessage = {
     tag: 'span',
     text: 'Error: User rejected the request.',
@@ -657,18 +663,33 @@ class TestDapp {
 
   /**
    * Sign a message with the signTypedDataV4 method.
+   *
+   * @param confirmationRedesign - Indicates whether the redesigned signature confirmation flow is used. Defaults to false.
    */
-  async signTypedDataV4() {
+  async signTypedDataV4(confirmationRedesign: boolean = false) {
     console.log('Sign message with signTypedDataV4');
     await this.clickSignTypedDatav4();
     await this.driver.switchToWindowWithTitle(WINDOW_TITLES.Dialog);
-    await this.driver.waitForSelector(
-      this.signTypedDataV3V4SignatureRequestMessage,
-    );
-    await this.driver.clickElementSafe(this.confirmDialogScrollButton, 200);
-    await this.driver.clickElementAndWaitForWindowToClose(
-      this.confirmSignatureButton,
-    );
+    if (confirmationRedesign) {
+      await this.driver.waitForSelector(
+        this.signTypedDataV3V4SignatureRequestMessageRedesign,
+      );
+      await this.driver.clickElementSafe(
+        this.confirmScrollToBottomButtonRedesign,
+        200,
+      );
+      await this.driver.clickElementAndWaitForWindowToClose(
+        this.confirmSignatureButtonRedesign,
+      );
+    } else {
+      await this.driver.waitForSelector(
+        this.signTypedDataV3V4SignatureRequestMessage,
+      );
+      await this.driver.clickElementSafe(this.confirmDialogScrollButton, 200);
+      await this.driver.clickElementAndWaitForWindowToClose(
+        this.confirmSignatureButton,
+      );
+    }
   }
 
   async pasteIntoEip747ContractAddressInput() {
diff --git a/test/e2e/tests/hardware-wallets/lattice-connect.spec.ts b/test/e2e/tests/hardware-wallets/lattice-connect.spec.ts
index b8497a9df692..e20e0bd6fb45 100644
--- a/test/e2e/tests/hardware-wallets/lattice-connect.spec.ts
+++ b/test/e2e/tests/hardware-wallets/lattice-connect.spec.ts
@@ -2,39 +2,33 @@ import { strict as assert } from 'assert';
 import { Suite } from 'mocha';
 import { Driver } from '../../webdriver/driver';
 import FixtureBuilder from '../../fixture-builder';
-import { withFixtures, unlockWallet } from '../../helpers';
+import { withFixtures } from '../../helpers';
 import { isManifestV3 } from '../../../../shared/modules/mv3.utils';
+import AccountListPage from '../../page-objects/pages/account-list-page';
+import ConnectHardwareWalletPage from '../../page-objects/pages/hardware-wallet/connect-hardware-wallet-page';
+import HeaderNavbar from '../../page-objects/pages/header-navbar';
+import { loginWithBalanceValidation } from '../../page-objects/flows/login.flow';
 
 describe('Lattice hardware wallet @no-mmi', function (this: Suite) {
-  it('connects to lattice hardware wallet', async function () {
+  it('lattice page rendering validation', async function () {
     await withFixtures(
       {
         fixtures: new FixtureBuilder().build(),
         title: this.test?.fullTitle(),
       },
       async ({ driver }: { driver: Driver }) => {
-        await unlockWallet(driver);
+        await loginWithBalanceValidation(driver);
+        const headerNavbar = new HeaderNavbar(driver);
+        await headerNavbar.openAccountMenu();
 
-        // choose Connect hardware wallet from the account menu
-        await driver.clickElement('[data-testid="account-menu-icon"]');
+        // Choose connect hardware wallet from the account menu
+        const accountListPage = new AccountListPage(driver);
+        await accountListPage.check_pageIsLoaded();
+        await accountListPage.openConnectHardwareWalletModal();
 
-        // Wait until account list is loaded to mitigate race condition
-        await driver.waitForSelector({
-          text: 'Account 1',
-          tag: 'span',
-        });
-        await driver.clickElement(
-          '[data-testid="multichain-account-menu-popover-action-button"]',
-        );
-        await driver.clickElement({
-          text: 'Add hardware wallet',
-          tag: 'button',
-        });
-        await driver.findClickableElement(
-          '[data-testid="hardware-connect-close-btn"]',
-        );
-        await driver.clickElement('[data-testid="connect-lattice-btn"]');
-        await driver.clickElement({ text: 'Continue', tag: 'button' });
+        const connectHardwareWalletPage = new ConnectHardwareWalletPage(driver);
+        await connectHardwareWalletPage.check_pageIsLoaded();
+        await connectHardwareWalletPage.openConnectLatticePage();
 
         const allWindows = await driver.waitUntilXWindowHandles(2);
         assert.equal(allWindows.length, isManifestV3 ? 3 : 2);
diff --git a/test/e2e/tests/hardware-wallets/trezor-account.spec.js b/test/e2e/tests/hardware-wallets/trezor-account.spec.js
deleted file mode 100644
index 9abf6e67974d..000000000000
--- a/test/e2e/tests/hardware-wallets/trezor-account.spec.js
+++ /dev/null
@@ -1,156 +0,0 @@
-const { strict: assert } = require('assert');
-const FixtureBuilder = require('../../fixture-builder');
-const {
-  defaultGanacheOptions,
-  unlockWallet,
-  withFixtures,
-  regularDelayMs,
-} = require('../../helpers');
-const { shortenAddress } = require('../../../../ui/helpers/utils/util');
-const { KNOWN_PUBLIC_KEY_ADDRESSES } = require('../../../stub/keyring-bridge');
-
-/**
- * Connect Trezor hardware wallet without selecting an account
- *
- * @param {*} driver - Selenium driver
- */
-async function connectTrezor(driver) {
-  // Open add hardware wallet modal
-  await driver.clickElement('[data-testid="account-menu-icon"]');
-  await driver.clickElement(
-    '[data-testid="multichain-account-menu-popover-action-button"]',
-  );
-  await driver.clickElement({ text: 'Add hardware wallet' });
-  // This delay is needed to mitigate an existing bug in FF
-  // See https://github.com/metamask/metamask-extension/issues/25851
-  await driver.delay(regularDelayMs);
-  // Select Trezor
-  await driver.clickElement('[data-testid="connect-trezor-btn"]');
-  await driver.clickElement({ text: 'Continue' });
-}
-
-describe('Trezor Hardware', function () {
-  it('derives the correct accounts', async function () {
-    await withFixtures(
-      {
-        fixtures: new FixtureBuilder().build(),
-        ganacheOptions: defaultGanacheOptions,
-        title: this.test.fullTitle(),
-      },
-      async ({ driver }) => {
-        await unlockWallet(driver);
-        await connectTrezor(driver);
-
-        // Check that the first page of accounts is correct
-        for (const { address, index } of KNOWN_PUBLIC_KEY_ADDRESSES.slice(
-          0,
-          4,
-        )) {
-          const shortenedAddress = `${address.slice(0, 4)}...${address.slice(
-            -4,
-          )}`;
-          assert(
-            await driver.isElementPresent({
-              text: shortenedAddress,
-            }),
-            `Known account ${index} not found`,
-          );
-        }
-      },
-    );
-  });
-
-  it('unlocks the first account', async function () {
-    await withFixtures(
-      {
-        fixtures: new FixtureBuilder().build(),
-        ganacheOptions: defaultGanacheOptions,
-        title: this.test.fullTitle(),
-      },
-      async ({ driver }) => {
-        await unlockWallet(driver);
-        await connectTrezor(driver);
-
-        // Select first account of first page and unlock
-        await driver.clickElement('.hw-account-list__item__checkbox');
-        await driver.clickElement({ text: 'Unlock' });
-
-        // Check that the correct account has been added
-        await driver.clickElement('[data-testid="account-menu-icon"]');
-        assert(
-          await driver.isElementPresent({
-            text: 'Trezor 1',
-          }),
-          'Trezor account not found',
-        );
-        assert(
-          await driver.isElementPresent({
-            text: shortenAddress(KNOWN_PUBLIC_KEY_ADDRESSES[0].address),
-          }),
-          'Unlocked account is wrong',
-        );
-      },
-    );
-  });
-
-  it('unlocks multiple accounts at once and removes one', async function () {
-    await withFixtures(
-      {
-        fixtures: new FixtureBuilder().build(),
-        ganacheOptions: defaultGanacheOptions,
-        title: this.test.fullTitle(),
-      },
-      async ({ driver }) => {
-        await unlockWallet(driver);
-        await connectTrezor(driver);
-
-        // Unlock 5 Trezor accounts
-        const accountCheckboxes = await driver.findElements(
-          '.hw-account-list__item__checkbox',
-        );
-        await accountCheckboxes[0].click();
-        await accountCheckboxes[1].click();
-        await accountCheckboxes[2].click();
-        await accountCheckboxes[3].click();
-        await accountCheckboxes[4].click();
-
-        await driver.clickElement({ text: 'Unlock' });
-
-        // Check that all 5 Trezor accounts are present
-        await driver.clickElement('[data-testid="account-menu-icon"]');
-        for (let i = 0; i < 5; i++) {
-          assert(
-            await driver.isElementPresent({
-              text: `Trezor ${i + 1}`,
-            }),
-            `Trezor account ${i + 1} not found`,
-          );
-          assert(
-            await driver.isElementPresent({
-              text: shortenAddress(KNOWN_PUBLIC_KEY_ADDRESSES[i].address),
-            }),
-            `Unlocked account ${i + 1} is wrong`,
-          );
-        }
-
-        // Remove Trezor account
-        const accountDetailsButton = await driver.findElements(
-          '[data-testid="account-list-item-menu-button"',
-        );
-        await accountDetailsButton[1].click();
-        await driver.clickElement('[data-testid="account-list-menu-remove"');
-        await driver.clickElement({
-          text: 'Remove',
-          tag: 'button',
-        });
-
-        // Assert Trezor account is removed
-        await driver.clickElement('[data-testid="account-menu-icon"]');
-
-        await driver.assertElementNotPresent({
-          text: 'Trezor 1',
-        });
-      },
-    );
-  });
-});
diff --git a/test/e2e/tests/hardware-wallets/trezor-account.spec.ts b/test/e2e/tests/hardware-wallets/trezor-account.spec.ts
new file mode 100644
index 000000000000..44a382023881
--- /dev/null
+++ b/test/e2e/tests/hardware-wallets/trezor-account.spec.ts
@@ -0,0 +1,117 @@
+import FixtureBuilder from '../../fixture-builder';
+import { withFixtures } from '../../helpers';
+import { shortenAddress } from '../../../../ui/helpers/utils/util';
+import { KNOWN_PUBLIC_KEY_ADDRESSES } from '../../../stub/keyring-bridge';
+import AccountListPage from '../../page-objects/pages/account-list-page';
+import ConnectHardwareWalletPage from '../../page-objects/pages/hardware-wallet/connect-hardware-wallet-page';
+import HeaderNavbar from '../../page-objects/pages/header-navbar';
+import HomePage from '../../page-objects/pages/home/homepage';
+import SelectTrezorAccountPage from '../../page-objects/pages/hardware-wallet/select-trezor-account-page';
+import { loginWithBalanceValidation } from '../../page-objects/flows/login.flow';
+
+describe('Trezor Hardware', function () {
+  it('derives the correct accounts and unlocks the first account', async function () {
+    await withFixtures(
+      {
+        fixtures: new FixtureBuilder().build(),
+        title: this.test?.fullTitle(),
+      },
+      async ({ driver }) => {
+        await loginWithBalanceValidation(driver);
+
+        const headerNavbar = new HeaderNavbar(driver);
+        await headerNavbar.openAccountMenu();
+
+        // Choose connect hardware wallet from the account menu
+        const accountListPage = new AccountListPage(driver);
+        await accountListPage.check_pageIsLoaded();
+        await accountListPage.openConnectHardwareWalletModal();
+
+        const connectHardwareWalletPage = new ConnectHardwareWalletPage(driver);
+        await connectHardwareWalletPage.check_pageIsLoaded();
+        await connectHardwareWalletPage.openConnectTrezorPage();
+
+        const selectTrezorAccountPage = new SelectTrezorAccountPage(driver);
+        await selectTrezorAccountPage.check_pageIsLoaded();
+
+        // Check that the first page of accounts is correct
+        await selectTrezorAccountPage.check_trezorAccountNumber();
+        for (const { address } of KNOWN_PUBLIC_KEY_ADDRESSES.slice(0, 4)) {
+          const shortenedAddress = `${address.slice(0, 4)}...${address.slice(
+            -4,
+          )}`;
+          await selectTrezorAccountPage.check_addressIsDisplayed(
+            shortenedAddress,
+          );
+        }
+
+        // Unlock first account of first page and check that the correct account has been added
+        await selectTrezorAccountPage.unlockAccount(1);
+        await headerNavbar.check_pageIsLoaded();
+        await new HomePage(driver).check_expectedBalanceIsDisplayed();
+        await headerNavbar.openAccountMenu();
+        await accountListPage.check_pageIsLoaded();
+        await accountListPage.check_accountDisplayedInAccountList('Trezor 1');
+        await accountListPage.check_accountAddressDisplayedInAccountList(
+          shortenAddress(KNOWN_PUBLIC_KEY_ADDRESSES[0].address),
+        );
+      },
+    );
+  });
+
+  it('unlocks multiple accounts at once and removes one', async function () {
+    await withFixtures(
+      {
+        fixtures: new FixtureBuilder().build(),
+        title: this.test?.fullTitle(),
+      },
+      async ({ driver }) => {
+        await loginWithBalanceValidation(driver);
+        const headerNavbar = new HeaderNavbar(driver);
+        await headerNavbar.openAccountMenu();
+
+        // Choose connect hardware wallet from the account menu
+        const accountListPage = new AccountListPage(driver);
+        await accountListPage.check_pageIsLoaded();
+        await accountListPage.openConnectHardwareWalletModal();
+
+        const connectHardwareWalletPage = new ConnectHardwareWalletPage(driver);
+        await connectHardwareWalletPage.check_pageIsLoaded();
+        await connectHardwareWalletPage.openConnectTrezorPage();
+
+        // Unlock 5 Trezor accounts
+        const selectTrezorAccountPage = new SelectTrezorAccountPage(driver);
+        await selectTrezorAccountPage.check_pageIsLoaded();
+        await selectTrezorAccountPage.check_trezorAccountNumber();
+        for (let i = 1; i <= 5; i++) {
+          await selectTrezorAccountPage.selectTrezorAccount(i);
+        }
+        await selectTrezorAccountPage.clickUnlockButton();
+
+        // Check that all 5 Trezor accounts are displayed in account list
+        const homePage = new HomePage(driver);
+        await homePage.check_pageIsLoaded();
+        await homePage.check_expectedBalanceIsDisplayed();
+        await headerNavbar.openAccountMenu();
+        await accountListPage.check_pageIsLoaded();
+        for (let i = 0; i < 5; i++) {
+          await accountListPage.check_accountDisplayedInAccountList(
+            `Trezor ${i + 1}`,
+          );
+          await accountListPage.check_accountAddressDisplayedInAccountList(
+            shortenAddress(KNOWN_PUBLIC_KEY_ADDRESSES[i].address),
+          );
+        }
+
+        // Remove Trezor 1 account and check Trezor 1 account is removed
+        await accountListPage.removeAccount('Trezor 1');
+        await homePage.check_pageIsLoaded();
+        await homePage.check_expectedBalanceIsDisplayed();
+        await headerNavbar.openAccountMenu();
+        await accountListPage.check_accountIsNotDisplayedInAccountList(
+          'Trezor 1',
+        );
+      },
+    );
+  });
+});
diff --git a/test/e2e/tests/hardware-wallets/trezor-send.spec.ts b/test/e2e/tests/hardware-wallets/trezor-send.spec.ts
index b10269c69ef0..5bb6fcb45220 100644
--- a/test/e2e/tests/hardware-wallets/trezor-send.spec.ts
+++ b/test/e2e/tests/hardware-wallets/trezor-send.spec.ts
@@ -2,13 +2,11 @@ import { Suite } from 'mocha';
 import { Driver } from '../../webdriver/driver';
 import { Ganache } from '../../seeder/ganache';
 import FixtureBuilder from '../../fixture-builder';
-import {
-  defaultGanacheOptions,
-  logInWithBalanceValidation,
-  sendTransaction,
-  withFixtures,
-} from '../../helpers';
+import { logInWithBalanceValidation, withFixtures } from '../../helpers';
 import { KNOWN_PUBLIC_KEY_ADDRESSES } from '../../../stub/keyring-bridge';
+import ActivityListPage from '../../page-objects/pages/home/activity-list';
+import HomePage from '../../page-objects/pages/home/homepage';
+import { sendRedesignedTransactionToAddress } from '../../page-objects/flows/send-transaction.flow';
 
 const RECIPIENT = '0x0Cc5261AB8cE458dc977078A3623E2BaDD27afD3';
 
@@ -17,7 +15,6 @@ describe('Trezor Hardware', function (this: Suite) {
     await withFixtures(
       {
         fixtures: new FixtureBuilder().withTrezorAccount().build(),
-        ganacheOptions: defaultGanacheOptions,
         title: this.test?.fullTitle(),
       },
       async ({
@@ -33,14 +30,16 @@ describe('Trezor Hardware', function (this: Suite) {
           '0x100000000000000000000',
         );
         await logInWithBalanceValidation(driver);
-
-        await sendTransaction(driver, RECIPIENT, '1');
-
-        // Wait for transaction to be confirmed
-        await driver.waitForSelector({
-          css: '.transaction-status-label',
-          text: 'Confirmed',
+        await sendRedesignedTransactionToAddress({
+          driver,
+          recipientAddress: RECIPIENT,
+          amount: '1',
         });
+        const homePage = new HomePage(driver);
+        await homePage.check_pageIsLoaded();
+        const activityList = new ActivityListPage(driver);
+        await activityList.check_confirmedTxNumberDisplayedInActivity();
+        await activityList.check_txAmountInActivity();
       },
     );
   });
diff --git a/test/e2e/tests/hardware-wallets/trezor-sign.spec.ts b/test/e2e/tests/hardware-wallets/trezor-sign.spec.ts
index f4cbf87b9dd4..418758a4d426 100644
--- a/test/e2e/tests/hardware-wallets/trezor-sign.spec.ts
+++ b/test/e2e/tests/hardware-wallets/trezor-sign.spec.ts
@@ -1,15 +1,10 @@
-import { strict as assert } from 'assert';
 import { Suite } from 'mocha';
 import { Driver } from '../../webdriver/driver';
 import FixtureBuilder from '../../fixture-builder';
-import {
-  defaultGanacheOptions,
-  openDapp,
-  unlockWallet,
-  WINDOW_TITLES,
-  withFixtures,
-} from '../../helpers';
+import { defaultGanacheOptions, withFixtures } from '../../helpers';
 import { KNOWN_PUBLIC_KEY_ADDRESSES } from '../../../stub/keyring-bridge';
+import TestDappPage from '../../page-objects/pages/test-dapp';
+import { loginWithBalanceValidation } from '../../page-objects/flows/login.flow';
 
 describe('Trezor Hardware Signatures', function (this: Suite) {
   it('sign typed v4', async function () {
@@ -26,28 +21,13 @@ describe('Trezor Hardware Signatures', function (this: Suite) {
         dapp: true,
       },
       async ({ driver }: { driver: Driver }) => {
-        await unlockWallet(driver);
-
-        await openDapp(driver);
-        await driver.clickElement('#signTypedDataV4');
-        await driver.switchToWindowWithTitle(WINDOW_TITLES.Dialog);
-        await driver.delay(1000);
-
-        await driver.clickElementSafe('.confirm-scroll-to-bottom__button');
-        await driver.clickElement({ text: 'Confirm', tag: 'button' });
-        await driver.delay(1000);
-
-        await driver.waitUntilXWindowHandles(2);
-        await driver.switchToWindowWithTitle(WINDOW_TITLES.TestDApp);
-        await driver.clickElement('#signTypedDataV4Verify');
-
-        const verifyRecoverAddress = await driver.findElement(
-          '#signTypedDataV4VerifyResult',
-        );
-
-        assert.equal(
-          await verifyRecoverAddress.getText(),
-          KNOWN_PUBLIC_KEY_ADDRESSES[0].address.toLocaleLowerCase(),
+        await loginWithBalanceValidation(driver);
+        const testDappPage = new TestDappPage(driver);
+        await testDappPage.openTestDappPage();
+        await testDappPage.check_pageIsLoaded();
+        await testDappPage.signTypedDataV4(true);
+        await testDappPage.check_successSignTypedDataV4(
+          KNOWN_PUBLIC_KEY_ADDRESSES[0].address,
         );
       },
     );

From 2e941a841a82f50bbc757e349e8e95f2f8ae86e5 Mon Sep 17 00:00:00 2001
From: Pedro Figueiredo <pedro.figueiredo@consensys.net>
Date: Thu, 12 Dec 2024 14:57:57 +0000
Subject: [PATCH 106/175] feat: Add new metric sending_value to Transaction *
 events (#29134)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<!--
Please submit this PR as a draft initially.
Do not mark it as "Ready for review" until the template has been
completely filled out, and PR status checks have passed at least once.
-->

## **Description**

Adds a `useSendingValueMetric` hook that uses
`updateTransactionEventFragment` to add the `sending_value` property on
erc20 and native token transfers. The value is sent as an unformatted
decimal javascript number.

<!--
Write a short description of the changes included in this pull request,
also include relevant motivation and context. Have in mind the following
questions:
1. What is the reason for the change?
2. What is the improvement/solution?
-->

[![Open in GitHub
Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/29134?quickstart=1)

## **Related issues**

Fixes: https://github.com/MetaMask/MetaMask-planning/issues/3784

## **Manual testing steps**

1. Go to this page...
2.
3.

## **Screenshots/Recordings**

<!-- If applicable, add screenshots and/or recordings to visualize the
before and after of your change. -->

### **Before**

<!-- [screenshots/recordings] -->

### **After**

<!-- [screenshots/recordings] -->

Native token send:
<img width="682" alt="Screenshot 2024-12-12 at 11 40 43"
src="https://github.com/user-attachments/assets/0d4f6d5f-9164-46e2-b3ee-99b94cfe761f"
/>

ERC20 token send:
<img width="682" alt="Screenshot 2024-12-12 at 11 41 47"
src="https://github.com/user-attachments/assets/49066f30-ed2d-4bb1-9948-8604127299aa"
/>


## **Pre-merge author checklist**

- [ ] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension Coding
Standards](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/CODING_GUIDELINES.md).
- [ ] I've completed the PR template to the best of my ability
- [ ] I’ve included tests if applicable
- [ ] I’ve documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [ ] I’ve applied the right labels on the PR (see [labeling
guidelines](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.

## **Pre-merge reviewer checklist**

- [ ] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed).
- [ ] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.
---
 .../info/hooks/use-token-values.test.ts       |   2 +
 .../confirm/info/hooks/use-token-values.ts    |   1 +
 .../info/hooks/useSendingValueMetric.test.ts  | 104 ++++++++++++++++++
 .../info/hooks/useSendingValueMetric.ts       |  26 +++++
 .../native-send-heading.tsx                   |   3 +
 .../info/shared/send-heading/send-heading.tsx |   4 +
 6 files changed, 140 insertions(+)
 create mode 100644 ui/pages/confirmations/components/confirm/info/hooks/useSendingValueMetric.test.ts
 create mode 100644 ui/pages/confirmations/components/confirm/info/hooks/useSendingValueMetric.ts

diff --git a/ui/pages/confirmations/components/confirm/info/hooks/use-token-values.test.ts b/ui/pages/confirmations/components/confirm/info/hooks/use-token-values.test.ts
index 4489690654d5..f7f9dd25d4b8 100644
--- a/ui/pages/confirmations/components/confirm/info/hooks/use-token-values.test.ts
+++ b/ui/pages/confirmations/components/confirm/info/hooks/use-token-values.test.ts
@@ -76,6 +76,7 @@ describe('useTokenValues', () => {
       decodedTransferValue: '7',
       displayTransferValue: '7',
       fiatDisplayValue: '$6.37',
+      fiatValue: 6.37,
       pending: false,
     });
   });
@@ -122,6 +123,7 @@ describe('useTokenValues', () => {
       decodedTransferValue: '7',
       displayTransferValue: '7',
       fiatDisplayValue: null,
+      fiatValue: null,
       pending: false,
     });
   });
diff --git a/ui/pages/confirmations/components/confirm/info/hooks/use-token-values.ts b/ui/pages/confirmations/components/confirm/info/hooks/use-token-values.ts
index 53987ffd06e6..b53e2842e5e7 100644
--- a/ui/pages/confirmations/components/confirm/info/hooks/use-token-values.ts
+++ b/ui/pages/confirmations/components/confirm/info/hooks/use-token-values.ts
@@ -89,6 +89,7 @@ export const useTokenValues = (transactionMeta: TransactionMeta) => {
     decodedTransferValue,
     displayTransferValue,
     fiatDisplayValue,
+    fiatValue,
     pending: pending || isDecodedTransferValuePending,
   };
 };
diff --git a/ui/pages/confirmations/components/confirm/info/hooks/useSendingValueMetric.test.ts b/ui/pages/confirmations/components/confirm/info/hooks/useSendingValueMetric.test.ts
new file mode 100644
index 000000000000..c143dc2879cd
--- /dev/null
+++ b/ui/pages/confirmations/components/confirm/info/hooks/useSendingValueMetric.test.ts
@@ -0,0 +1,104 @@
+import { TransactionMeta } from '@metamask/transaction-controller';
+import { renderHook } from '@testing-library/react-hooks';
+import { useEffect, useState } from 'react';
+import { genUnapprovedTokenTransferConfirmation } from '../../../../../../../test/data/confirmations/token-transfer';
+import { useTransactionEventFragment } from '../../../../hooks/useTransactionEventFragment';
+import { useSendingValueMetric } from './useSendingValueMetric';
+
+jest.mock('react-redux', () => ({
+  ...jest.requireActual('react-redux'),
+  useSelector: jest.fn(),
+}));
+
+jest.mock('react', () => ({
+  ...jest.requireActual('react'),
+  useEffect: jest.fn(),
+  useState: jest.fn(),
+}));
+
+jest.mock('../../../../hooks/useTransactionEventFragment');
+
+describe('useSimulationMetrics', () => {
+  const useTransactionEventFragmentMock = jest.mocked(
+    useTransactionEventFragment,
+  );
+
+  const useStateMock = jest.mocked(useState);
+  const useEffectMock = jest.mocked(useEffect);
+
+  // TODO: Replace `any` with type
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  let updateTransactionEventFragmentMock: jest.MockedFunction<any>;
+
+  beforeEach(() => {
+    jest.resetAllMocks();
+
+    updateTransactionEventFragmentMock = jest.fn();
+
+    useTransactionEventFragmentMock.mockReturnValue({
+      updateTransactionEventFragment: updateTransactionEventFragmentMock,
+    });
+
+    // TODO: Replace `any` with type
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    useStateMock.mockImplementation(((initialValue: any) => [
+      initialValue,
+      jest.fn(),
+      // TODO: Replace `any` with type
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    ]) as any);
+
+    useEffectMock.mockImplementation((fn) => fn());
+  });
+
+  describe('useSendingValueMetric', () => {
+    it('Updates the event property', async () => {
+      const MOCK_FIAT_VALUE = 10;
+      const transactionMeta = genUnapprovedTokenTransferConfirmation(
+        {},
+      ) as TransactionMeta;
+      const props = { transactionMeta, fiatValue: MOCK_FIAT_VALUE };
+
+      renderHook(() => useSendingValueMetric(props));
+
+      expect(updateTransactionEventFragmentMock).toHaveBeenCalledWith(
+        expect.objectContaining({
+          properties: expect.objectContaining({
+            sending_value: MOCK_FIAT_VALUE,
+          }),
+        }),
+        '1d7c08c0-fe54-11ee-9243-91b1e533746a',
+      );
+
+      jest.restoreAllMocks();
+    });
+
+    it('Does not updates the event property if fiat value is undefined', async () => {
+      const MOCK_FIAT_VALUE = undefined;
+      const transactionMeta = genUnapprovedTokenTransferConfirmation(
+        {},
+      ) as TransactionMeta;
+      const props = { transactionMeta, fiatValue: MOCK_FIAT_VALUE };
+
+      renderHook(() => useSendingValueMetric(props));
+
+      expect(updateTransactionEventFragmentMock).not.toHaveBeenCalled();
+
+      jest.restoreAllMocks();
+    });
+
+    it('Does not updates the event property if fiat value is empty string', async () => {
+      const MOCK_FIAT_VALUE = '' as const;
+      const transactionMeta = genUnapprovedTokenTransferConfirmation(
+        {},
+      ) as TransactionMeta;
+      const props = { transactionMeta, fiatValue: MOCK_FIAT_VALUE };
+
+      renderHook(() => useSendingValueMetric(props));
+
+      expect(updateTransactionEventFragmentMock).not.toHaveBeenCalled();
+
+      jest.restoreAllMocks();
+    });
+  });
+});
diff --git a/ui/pages/confirmations/components/confirm/info/hooks/useSendingValueMetric.ts b/ui/pages/confirmations/components/confirm/info/hooks/useSendingValueMetric.ts
new file mode 100644
index 000000000000..06d7bff39c03
--- /dev/null
+++ b/ui/pages/confirmations/components/confirm/info/hooks/useSendingValueMetric.ts
@@ -0,0 +1,26 @@
+import { TransactionMeta } from '@metamask/transaction-controller';
+import { useEffect } from 'react';
+import { useTransactionEventFragment } from '../../../../hooks/useTransactionEventFragment';
+
+export type UseSendingValueMetricProps = {
+  transactionMeta: TransactionMeta;
+  fiatValue: number | undefined | '';
+};
+
+export const useSendingValueMetric = ({
+  transactionMeta,
+  fiatValue,
+}: UseSendingValueMetricProps) => {
+  const { updateTransactionEventFragment } = useTransactionEventFragment();
+
+  const transactionId = transactionMeta.id;
+  const properties = { sending_value: fiatValue };
+  const sensitiveProperties = {};
+  const params = { properties, sensitiveProperties };
+
+  useEffect(() => {
+    if (fiatValue !== undefined && fiatValue !== '') {
+      updateTransactionEventFragment(params, transactionId);
+    }
+  }, [updateTransactionEventFragment, transactionId, JSON.stringify(params)]);
+};
diff --git a/ui/pages/confirmations/components/confirm/info/shared/native-send-heading/native-send-heading.tsx b/ui/pages/confirmations/components/confirm/info/shared/native-send-heading/native-send-heading.tsx
index f3f1f292fa2e..146eb6f169c7 100644
--- a/ui/pages/confirmations/components/confirm/info/shared/native-send-heading/native-send-heading.tsx
+++ b/ui/pages/confirmations/components/confirm/info/shared/native-send-heading/native-send-heading.tsx
@@ -32,6 +32,7 @@ import {
 import { getMultichainNetwork } from '../../../../../../../selectors/multichain';
 import { useConfirmContext } from '../../../../../context/confirm';
 import { formatAmount } from '../../../../simulation-details/formatAmount';
+import { useSendingValueMetric } from '../../hooks/useSendingValueMetric';
 
 const NativeSendHeading = () => {
   const { currentConfirmation: transactionMeta } =
@@ -114,6 +115,8 @@ const NativeSendHeading = () => {
       </Text>
     );
 
+  useSendingValueMetric({ transactionMeta, fiatValue });
+
   return (
     <Box
       display={Display.Flex}
diff --git a/ui/pages/confirmations/components/confirm/info/shared/send-heading/send-heading.tsx b/ui/pages/confirmations/components/confirm/info/shared/send-heading/send-heading.tsx
index 3f87b26a3b4a..cbba12835073 100644
--- a/ui/pages/confirmations/components/confirm/info/shared/send-heading/send-heading.tsx
+++ b/ui/pages/confirmations/components/confirm/info/shared/send-heading/send-heading.tsx
@@ -22,6 +22,7 @@ import { useI18nContext } from '../../../../../../../hooks/useI18nContext';
 import { getPreferences } from '../../../../../../../selectors';
 import { useConfirmContext } from '../../../../../context/confirm';
 import { useTokenValues } from '../../hooks/use-token-values';
+import { useSendingValueMetric } from '../../hooks/useSendingValueMetric';
 import { useTokenDetails } from '../../hooks/useTokenDetails';
 import { ConfirmLoader } from '../confirm-loader/confirm-loader';
 
@@ -34,6 +35,7 @@ const SendHeading = () => {
     decodedTransferValue,
     displayTransferValue,
     fiatDisplayValue,
+    fiatValue,
     pending,
   } = useTokenValues(transactionMeta);
 
@@ -85,6 +87,8 @@ const SendHeading = () => {
       </Text>
     );
 
+  useSendingValueMetric({ transactionMeta, fiatValue });
+
   if (pending) {
     return <ConfirmLoader />;
   }

From b3c4759639468d889f2248504cb58ae4b449f1dc Mon Sep 17 00:00:00 2001
From: Derek Brans <dbrans@gmail.com>
Date: Thu, 12 Dec 2024 10:16:09 -0500
Subject: [PATCH 107/175] chore: Add App Opened Metric Event (#28927)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## **Description**
This PR adds tracking for when the MetaMask app is opened in order to
track MAU/MTU.


[![Open in GitHub
Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/28927?quickstart=1)

## **Related issues**

Fixes:  https://github.com/MetaMask/MetaMask-planning/issues/3401

## **Manual testing steps**

1. Ensure MM is not "fullscreen" in any tabs
2. Open chrome dev tools for service worker
3. Clear the network tab
4. Open metamask (via Dapp or by clicking on extension)
5. There should be one or more new network request for POST
https://api.segment.io/v1/batch – One of those should should have event:
"App Opened"

## **Screenshots/Recordings**

<!-- If applicable, add screenshots and/or recordings to visualize the
before and after of your change. -->

### **Before**

<!-- [screenshots/recordings] -->

### **After**

<!-- [screenshots/recordings] -->

## **Pre-merge author checklist**

- [ ] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension Coding
Standards](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/CODING_GUIDELINES.md).
- [ ] I've completed the PR template to the best of my ability
- [ ] I’ve included tests if applicable
- [ ] I’ve documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [ ] I’ve applied the right labels on the PR (see [labeling
guidelines](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.

## **Pre-merge reviewer checklist**

- [ ] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed).
- [ ] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.

---------

Co-authored-by: Niranjana Binoy <43930900+NiranjanaBinoy@users.noreply.github.com>
---
 app/scripts/background.js                 |  44 +++++++++
 shared/constants/metametrics.ts           |   1 +
 test/e2e/tests/metrics/app-opened.spec.ts | 104 ++++++++++++++++++++++
 3 files changed, 149 insertions(+)
 create mode 100644 test/e2e/tests/metrics/app-opened.spec.ts

diff --git a/app/scripts/background.js b/app/scripts/background.js
index e9aaf2cab20b..320efbd5c302 100644
--- a/app/scripts/background.js
+++ b/app/scripts/background.js
@@ -741,6 +741,49 @@ function trackDappView(remotePort) {
   }
 }
 
+/**
+ * Emit App Opened event
+ */
+function emitAppOpenedMetricEvent() {
+  const { metaMetricsId, participateInMetaMetrics } =
+    controller.metaMetricsController.state;
+
+  // Skip if user hasn't opted into metrics
+  if (metaMetricsId === null && !participateInMetaMetrics) {
+    return;
+  }
+
+  controller.metaMetricsController.trackEvent({
+    event: MetaMetricsEventName.AppOpened,
+    category: MetaMetricsEventCategory.App,
+  });
+}
+
+/**
+ * This function checks if the app is being opened
+ * and emits an event only if no other UI instances are currently open.
+ *
+ * @param {string} environment - The environment type where the app is opening
+ */
+function trackAppOpened(environment) {
+  // List of valid environment types to track
+  const environmentTypeList = [
+    ENVIRONMENT_TYPE_POPUP,
+    ENVIRONMENT_TYPE_NOTIFICATION,
+    ENVIRONMENT_TYPE_FULLSCREEN,
+  ];
+
+  // Check if any UI instances are currently open
+  const isFullscreenOpen = Object.values(openMetamaskTabsIDs).some(Boolean);
+  const isAlreadyOpen =
+    isFullscreenOpen || notificationIsOpen || openPopupCount > 0;
+
+  // Only emit event if no UI is open and environment is valid
+  if (!isAlreadyOpen && environmentTypeList.includes(environment)) {
+    emitAppOpenedMetricEvent();
+  }
+}
+
 /**
  * Initializes the MetaMask Controller with any initial state and default language.
  * Configures platform-specific error reporting strategy.
@@ -883,6 +926,7 @@ export function setupController(
       // communication with popup
       controller.isClientOpen = true;
       controller.setupTrustedCommunication(portStream, remotePort.sender);
+      trackAppOpened(processName);
 
       initializeRemoteFeatureFlags();
 
diff --git a/shared/constants/metametrics.ts b/shared/constants/metametrics.ts
index d46bad603a83..700bead89320 100644
--- a/shared/constants/metametrics.ts
+++ b/shared/constants/metametrics.ts
@@ -640,6 +640,7 @@ export enum MetaMetricsEventName {
   ActivityDetailsClosed = 'Activity Details Closed',
   AnalyticsPreferenceSelected = 'Analytics Preference Selected',
   AppInstalled = 'App Installed',
+  AppOpened = 'App Opened',
   AppUnlocked = 'App Unlocked',
   AppUnlockedFailed = 'App Unlocked Failed',
   AppLocked = 'App Locked',
diff --git a/test/e2e/tests/metrics/app-opened.spec.ts b/test/e2e/tests/metrics/app-opened.spec.ts
new file mode 100644
index 000000000000..80169e36c369
--- /dev/null
+++ b/test/e2e/tests/metrics/app-opened.spec.ts
@@ -0,0 +1,104 @@
+import { strict as assert } from 'assert';
+import { Mockttp } from 'mockttp';
+import {
+  withFixtures,
+  getEventPayloads,
+  unlockWallet,
+  connectToDapp,
+} from '../../helpers';
+import FixtureBuilder from '../../fixture-builder';
+import { loginWithoutBalanceValidation } from '../../page-objects/flows/login.flow';
+
+/**
+ * Mocks the segment API for the App Opened event that we expect to see when
+ * these tests are run.
+ *
+ * @param mockServer - The mock server instance.
+ * @returns The mocked endpoints
+ */
+async function mockSegment(mockServer: Mockttp) {
+  return [
+    await mockServer
+      .forPost('https://api.segment.io/v1/batch')
+      .withJsonBodyIncluding({
+        batch: [{ type: 'track', event: 'App Opened' }],
+      })
+      .thenCallback(() => {
+        return {
+          statusCode: 200,
+        };
+      }),
+  ];
+}
+
+describe('App Opened metric @no-mmi', function () {
+  it('should send AppOpened metric when app is opened and metrics are enabled', async function () {
+    await withFixtures(
+      {
+        fixtures: new FixtureBuilder()
+          .withMetaMetricsController({
+            metaMetricsId: 'fake-metrics-fd20',
+            participateInMetaMetrics: true,
+          })
+          .build(),
+        title: this.test?.fullTitle(),
+        testSpecificMock: mockSegment,
+      },
+      async ({ driver, mockedEndpoint: mockedEndpoints }) => {
+        await loginWithoutBalanceValidation(driver);
+
+        const events = await getEventPayloads(driver, mockedEndpoints);
+        assert.equal(events.length, 1);
+        assert.equal(events[0].properties.category, 'App');
+      },
+    );
+  });
+
+  it('should not send AppOpened metric when metrics are disabled', async function () {
+    await withFixtures(
+      {
+        fixtures: new FixtureBuilder()
+          .withMetaMetricsController({
+            metaMetricsId: 'fake-metrics-fd20',
+            participateInMetaMetrics: false,
+          })
+          .build(),
+        title: this.test?.fullTitle(),
+        testSpecificMock: mockSegment,
+      },
+      async ({ driver, mockedEndpoint: mockedEndpoints }) => {
+        await unlockWallet(driver);
+
+        const events = await getEventPayloads(driver, mockedEndpoints);
+        assert.equal(events.length, 0);
+      },
+    );
+  });
+
+  it('should send AppOpened metric when dapp opens MetaMask', async function () {
+    await withFixtures(
+      {
+        dapp: true,
+        fixtures: new FixtureBuilder()
+          .withMetaMetricsController({
+            metaMetricsId: 'fake-metrics-fd20',
+            participateInMetaMetrics: true,
+          })
+          .build(),
+        title: this.test?.fullTitle(),
+        testSpecificMock: mockSegment,
+      },
+      async ({ driver, mockedEndpoint: mockedEndpoints }) => {
+        await unlockWallet(driver);
+
+        // Connect to dapp which will trigger MetaMask to open
+        await connectToDapp(driver);
+
+        // Wait for events to be tracked
+        const events = await getEventPayloads(driver, mockedEndpoints);
+        assert.equal(events.length, 1);
+        assert.equal(events[0].properties.category, 'App');
+      },
+    );
+  });
+});

From b7aab59d69fe46208be153f2a605f5fdde74349a Mon Sep 17 00:00:00 2001
From: Pedro Figueiredo <pedro.figueiredo@consensys.net>
Date: Thu, 12 Dec 2024 15:44:41 +0000
Subject: [PATCH 108/175] feat: Remove scroll to the bottom requirement for all
 personal sign requests (#29053)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<!--
Please submit this PR as a draft initially.
Do not mark it as "Ready for review" until the template has been
completely filled out, and PR status checks have passed at least once.
-->

## **Description**

Users can now Confirm personal sign requests without scrolling to the
bottom of the confirmation.

<!--
Write a short description of the changes included in this pull request,
also include relevant motivation and context. Have in mind the following
questions:
1. What is the reason for the change?
2. What is the improvement/solution?
-->

[![Open in GitHub
Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/29053?quickstart=1)

## **Related issues**

Fixes: https://github.com/MetaMask/MetaMask-planning/issues/3760

## **Manual testing steps**

1. Go to OpenSea
2. Login
3. See their personal sign request and how the Confirm button is
disabled

## **Screenshots/Recordings**

<!-- If applicable, add screenshots and/or recordings to visualize the
before and after of your change. -->

### **Before**

<!-- [screenshots/recordings] -->

### **After**

<!-- [screenshots/recordings] -->

<img width="1728" alt="Screenshot 2024-12-10 at 14 16 32"
src="https://github.com/user-attachments/assets/d72522db-39ac-4da1-bc6c-f119dc25ad51">


## **Pre-merge author checklist**

- [ ] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension Coding
Standards](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/CODING_GUIDELINES.md).
- [ ] I've completed the PR template to the best of my ability
- [ ] I’ve included tests if applicable
- [ ] I’ve documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [ ] I’ve applied the right labels on the PR (see [labeling
guidelines](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.

## **Pre-merge reviewer checklist**

- [ ] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed).
- [ ] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.
---
 .../components/confirm/footer/footer.test.tsx | 25 ++++++++-----------
 .../components/confirm/footer/footer.tsx      | 12 +++++++--
 2 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/ui/pages/confirmations/components/confirm/footer/footer.test.tsx b/ui/pages/confirmations/components/confirm/footer/footer.test.tsx
index 09d1fdf5753b..bd026848bd95 100644
--- a/ui/pages/confirmations/components/confirm/footer/footer.test.tsx
+++ b/ui/pages/confirmations/components/confirm/footer/footer.test.tsx
@@ -1,15 +1,10 @@
 import React from 'react';
-
 import {
   LedgerTransportTypes,
   WebHIDConnectedStatuses,
 } from '../../../../../../shared/constants/hardware-wallets';
 import { BlockaidResultType } from '../../../../../../shared/constants/security-provider';
-import {
-  signatureRequestSIWE,
-  unapprovedPersonalSignMsg,
-} from '../../../../../../test/data/confirmations/personal_sign';
-import { permitSignatureMsg } from '../../../../../../test/data/confirmations/typed_sign';
+import { genUnapprovedContractInteractionConfirmation } from '../../../../../../test/data/confirmations/contract-interaction';
 import {
   getMockContractInteractionConfirmState,
   getMockPersonalSignConfirmState,
@@ -17,17 +12,21 @@ import {
   getMockTypedSignConfirmState,
   getMockTypedSignConfirmStateForRequest,
 } from '../../../../../../test/data/confirmations/helper';
+import {
+  signatureRequestSIWE,
+  unapprovedPersonalSignMsg,
+} from '../../../../../../test/data/confirmations/personal_sign';
+import { permitSignatureMsg } from '../../../../../../test/data/confirmations/typed_sign';
 import mockState from '../../../../../../test/data/mock-state.json';
 import { fireEvent } from '../../../../../../test/jest';
 import { renderWithConfirmContextProvider } from '../../../../../../test/lib/confirmations/render-helpers';
+import { Alert } from '../../../../../ducks/confirm-alerts/confirm-alerts';
+import { Severity } from '../../../../../helpers/constants/design-system';
 import * as MMIConfirmations from '../../../../../hooks/useMMIConfirmations';
 import * as Actions from '../../../../../store/actions';
 import configureStore from '../../../../../store/store';
-import { Severity } from '../../../../../helpers/constants/design-system';
-import { SignatureRequestType } from '../../../types/confirm';
 import * as confirmContext from '../../../context/confirm';
-
-import { Alert } from '../../../../../ducks/confirm-alerts/confirm-alerts';
+import { SignatureRequestType } from '../../../types/confirm';
 import Footer from './footer';
 
 jest.mock('react-redux', () => ({
@@ -107,13 +106,11 @@ describe('ConfirmFooter', () => {
   describe('renders disabled "Confirm" Button', () => {
     it('when isScrollToBottomCompleted is false', () => {
       jest.spyOn(confirmContext, 'useConfirmContext').mockReturnValue({
-        currentConfirmation: unapprovedPersonalSignMsg,
+        currentConfirmation: genUnapprovedContractInteractionConfirmation(),
         isScrollToBottomCompleted: false,
         setIsScrollToBottomCompleted: () => undefined,
       });
-      const mockStateTypedSign = getMockPersonalSignConfirmStateForRequest(
-        unapprovedPersonalSignMsg,
-      );
+      const mockStateTypedSign = getMockContractInteractionConfirmState();
       const { getByText } = render(mockStateTypedSign);
 
       const confirmButton = getByText('Confirm');
diff --git a/ui/pages/confirmations/components/confirm/footer/footer.tsx b/ui/pages/confirmations/components/confirm/footer/footer.tsx
index a9aea54c03f7..82b10a9511a8 100644
--- a/ui/pages/confirmations/components/confirm/footer/footer.tsx
+++ b/ui/pages/confirmations/components/confirm/footer/footer.tsx
@@ -1,4 +1,7 @@
-import { TransactionMeta } from '@metamask/transaction-controller';
+import {
+  TransactionMeta,
+  TransactionType,
+} from '@metamask/transaction-controller';
 import { providerErrors, serializeError } from '@metamask/rpc-errors';
 import React, { useCallback, useState } from 'react';
 import { useDispatch, useSelector } from 'react-redux';
@@ -187,9 +190,14 @@ const Footer = () => {
   const isSIWE = isSIWESignatureRequest(currentConfirmation);
   const isPermit = isPermitSignatureRequest(currentConfirmation);
   const isPermitSimulationShown = isPermit && useTransactionSimulations;
+  const isPersonalSign =
+    currentConfirmation?.type === TransactionType.personalSign;
 
   const isConfirmDisabled =
-    (!isScrollToBottomCompleted && !isSIWE && !isPermitSimulationShown) ||
+    (!isScrollToBottomCompleted &&
+      !isSIWE &&
+      !isPermitSimulationShown &&
+      !isPersonalSign) ||
     ///: BEGIN:ONLY_INCLUDE_IF(build-mmi)
     mmiSubmitDisabled ||
     ///: END:ONLY_INCLUDE_IF

From fffb8c67d344acbb100dd6a6c36d88881cf53a66 Mon Sep 17 00:00:00 2001
From: infiniteflower <139582705+infiniteflower@users.noreply.github.com>
Date: Thu, 12 Dec 2024 11:02:50 -0500
Subject: [PATCH 109/175] feat: update bridge tx details (#29075)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<!--
Please submit this PR as a draft initially.
Do not mark it as "Ready for review" until the template has been
completely filled out, and PR status checks have passed at least once.
-->

## **Description**

<!--
Write a short description of the changes included in this pull request,
also include relevant motivation and context. Have in mind the following
questions:
1. What is the reason for the change?
2. What is the improvement/solution?
-->

[![Open in GitHub
Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/29075?quickstart=1)

This PR update the Bridge tx details screen with:
1. Source/destination chain always visible
2. You sent/received
3. Activity log

## **Related issues**

Fixes:

## **Manual testing steps**

1. Do a bridge tx
4. Click on the bridge tx in the activity list
5. Observe changes

## **Screenshots/Recordings**

<!-- If applicable, add screenshots and/or recordings to visualize the
before and after of your change. -->

### **Before**

<!-- [screenshots/recordings] -->

### **After**

<!-- [screenshots/recordings] -->
![Screenshot 2024-12-11 at 1 32
49 PM](https://github.com/user-attachments/assets/36879afa-e2ec-4d21-97a9-015d82dd8229)



## **Pre-merge author checklist**

- [x] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension Coding
Standards](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/CODING_GUIDELINES.md).
- [x] I've completed the PR template to the best of my ability
- [ ] I’ve included tests if applicable
- [ ] I’ve documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [x] I’ve applied the right labels on the PR (see [labeling
guidelines](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.

## **Pre-merge reviewer checklist**

- [ ] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed).
- [ ] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.
---
 app/_locales/en/messages.json                 |  40 +--
 .../transaction-list-item.component.js        |   1 +
 ui/hooks/bridge/useBridgeTxHistoryData.ts     |   7 +-
 .../transaction-details.tsx                   | 268 ++++++++++--------
 ui/pages/bridge/types.ts                      |   7 +-
 5 files changed, 174 insertions(+), 149 deletions(-)

diff --git a/app/_locales/en/messages.json b/app/_locales/en/messages.json
index 34afdaab62ed..466615b0343a 100644
--- a/app/_locales/en/messages.json
+++ b/app/_locales/en/messages.json
@@ -861,9 +861,6 @@
   "bridgeCalculatingAmount": {
     "message": "Calculating..."
   },
-  "bridgeDestination": {
-    "message": "Destination"
-  },
   "bridgeDontSend": {
     "message": "Bridge, don't send"
   },
@@ -888,9 +885,6 @@
   "bridgeSelectTokenAndAmount": {
     "message": "Select token and amount"
   },
-  "bridgeSource": {
-    "message": "Source"
-  },
   "bridgeStepActionBridgeComplete": {
     "message": "$1 received on $2",
     "description": "$1 is the amount of the destination asset, $2 is the name of the destination network"
@@ -923,14 +917,8 @@
   "bridgeTotalFeesTooltipText": {
     "message": "This includes gas fees (paid to crypto miners) and relayer fees (paid to power complex services like bridging).\nFees are based on network traffic and transaction complexity. MetaMask does not profit from either fee."
   },
-  "bridgeTxDetailsBaseFee": {
-    "message": "Base fee (GWEI)"
-  },
-  "bridgeTxDetailsBridgeAmount": {
-    "message": "Bridge amount"
-  },
-  "bridgeTxDetailsBridgeType": {
-    "message": "Bridge type"
+  "bridgeTxDetailsBridging": {
+    "message": "Bridging"
   },
   "bridgeTxDetailsDelayedDescription": {
     "message": "Reach out to"
@@ -941,21 +929,9 @@
   "bridgeTxDetailsDelayedTitle": {
     "message": "Has it been longer than 3 hours?"
   },
-  "bridgeTxDetailsGasLimit": {
-    "message": "Gas limit (units)"
-  },
-  "bridgeTxDetailsGasUsed": {
-    "message": "Gas used (units)"
-  },
-  "bridgeTxDetailsMaxFeePerGas": {
-    "message": "Max fee per gas"
-  },
   "bridgeTxDetailsNonce": {
     "message": "Nonce"
   },
-  "bridgeTxDetailsPriorityFee": {
-    "message": "Priority fee (GWEI)"
-  },
   "bridgeTxDetailsStatus": {
     "message": "Status"
   },
@@ -966,14 +942,18 @@
     "message": "$1 at $2",
     "description": "$1 is the date, $2 is the time"
   },
-  "bridgeTxDetailsTotal": {
-    "message": "Total"
+  "bridgeTxDetailsTokenAmountOnChain": {
+    "message": "$1 $2 on",
+    "description": "$1 is the amount of the token, $2 is the ticker symbol of the token"
   },
   "bridgeTxDetailsTotalGasFee": {
     "message": "Total gas fee"
   },
-  "bridgeTypeDirectionTo": {
-    "message": "To"
+  "bridgeTxDetailsYouReceived": {
+    "message": "You received"
+  },
+  "bridgeTxDetailsYouSent": {
+    "message": "You sent"
   },
   "browserNotSupported": {
     "message": "Your browser is not supported..."
diff --git a/ui/components/app/transaction-list-item/transaction-list-item.component.js b/ui/components/app/transaction-list-item/transaction-list-item.component.js
index fed0f925a3ac..09e8983b9196 100644
--- a/ui/components/app/transaction-list-item/transaction-list-item.component.js
+++ b/ui/components/app/transaction-list-item/transaction-list-item.component.js
@@ -99,6 +99,7 @@ function TransactionListItemInner({
   const { bridgeTxHistoryItem, isBridgeComplete, showBridgeTxDetails } =
     useBridgeTxHistoryData({
       transactionGroup,
+      isEarliestNonce,
     });
 
   const {
diff --git a/ui/hooks/bridge/useBridgeTxHistoryData.ts b/ui/hooks/bridge/useBridgeTxHistoryData.ts
index dc6db53896ae..0334f822cc16 100644
--- a/ui/hooks/bridge/useBridgeTxHistoryData.ts
+++ b/ui/hooks/bridge/useBridgeTxHistoryData.ts
@@ -25,10 +25,12 @@ export type TransactionGroup = {
 
 export type UseBridgeTxHistoryDataProps = {
   transactionGroup: TransactionGroup;
+  isEarliestNonce: boolean;
 };
 
 export function useBridgeTxHistoryData({
   transactionGroup,
+  isEarliestNonce,
 }: UseBridgeTxHistoryDataProps) {
   const history = useHistory();
   const bridgeHistory = useSelector(selectBridgeHistoryForAccount);
@@ -49,7 +51,10 @@ export function useBridgeTxHistoryData({
   )
     ? undefined
     : () => {
-        history.push(`${CROSS_CHAIN_SWAP_TX_DETAILS_ROUTE}/${srcTxMetaId}`);
+        history.push({
+          pathname: `${CROSS_CHAIN_SWAP_TX_DETAILS_ROUTE}/${srcTxMetaId}`,
+          state: { transactionGroup, isEarliestNonce },
+        });
       };
 
   return {
diff --git a/ui/pages/bridge/transaction-details/transaction-details.tsx b/ui/pages/bridge/transaction-details/transaction-details.tsx
index fe81e8e3b3dd..762e2c1218d9 100644
--- a/ui/pages/bridge/transaction-details/transaction-details.tsx
+++ b/ui/pages/bridge/transaction-details/transaction-details.tsx
@@ -1,8 +1,9 @@
 import React, { useContext } from 'react';
 import { useSelector } from 'react-redux';
-import { useHistory, useParams } from 'react-router-dom';
+import { useHistory, useParams, useLocation } from 'react-router-dom';
 import { NetworkConfiguration } from '@metamask/network-controller';
 import { TransactionMeta } from '@metamask/transaction-controller';
+import { BigNumber } from 'bignumber.js';
 import {
   AvatarNetwork,
   AvatarNetworkSize,
@@ -12,7 +13,9 @@ import {
   ButtonIcon,
   ButtonIconSize,
   ButtonLink,
+  Icon,
   IconName,
+  IconSize,
   Text,
 } from '../../../components/component-library';
 import { Content, Header } from '../../../components/multichain/pages/page';
@@ -28,7 +31,6 @@ import {
   PRIMARY,
   SUPPORT_REQUEST_LINK,
 } from '../../../helpers/constants/common';
-import CurrencyDisplay from '../../../components/ui/currency-display/currency-display.component';
 import {
   BridgeHistoryItem,
   StatusTypes,
@@ -51,6 +53,10 @@ import {
   MetaMetricsEventName,
 } from '../../../../shared/constants/metametrics';
 import { MetaMetricsContext } from '../../../contexts/metametrics';
+import { formatAmount } from '../../confirmations/components/simulation-details/formatAmount';
+import { getIntlLocale } from '../../../ducks/locale/locale';
+import { TransactionGroup } from '../../../hooks/bridge/useBridgeTxHistoryData';
+import TransactionActivityLog from '../../../components/app/transaction-activity-log';
 import TransactionDetailRow from './transaction-detail-row';
 import BridgeExplorerLinks from './bridge-explorer-links';
 import BridgeStepList from './bridge-step-list';
@@ -77,18 +83,47 @@ const getBlockExplorerUrl = (
 /**
  * @param options0
  * @param options0.bridgeHistoryItem
+ * @param options0.locale
  * @returns A string representing the bridge amount in decimal form
  */
-const getBridgeAmount = ({
+const getBridgeAmountSentFormatted = ({
+  locale,
   bridgeHistoryItem,
 }: {
+  locale: string;
   bridgeHistoryItem?: BridgeHistoryItem;
 }) => {
-  if (bridgeHistoryItem) {
-    return bridgeHistoryItem.pricingData?.amountSent;
+  if (!bridgeHistoryItem?.pricingData?.amountSent) {
+    return undefined;
+  }
+
+  return formatAmount(
+    locale,
+    new BigNumber(bridgeHistoryItem.pricingData.amountSent),
+  );
+};
+
+const getBridgeAmountReceivedFormatted = ({
+  locale,
+  bridgeHistoryItem,
+}: {
+  locale: string;
+  bridgeHistoryItem?: BridgeHistoryItem;
+}) => {
+  if (!bridgeHistoryItem) {
+    return undefined;
   }
 
-  return undefined;
+  const destAmount = bridgeHistoryItem.status.destChain?.amount;
+  if (!destAmount) {
+    return undefined;
+  }
+
+  const destAssetDecimals = bridgeHistoryItem.quote.destAsset.decimals;
+  return formatAmount(
+    locale,
+    new BigNumber(destAmount).dividedBy(10 ** destAssetDecimals),
+  );
 };
 
 /**
@@ -118,9 +153,11 @@ const StatusToColorMap: Record<StatusTypes, TextColor> = {
 
 const CrossChainSwapTxDetails = () => {
   const t = useI18nContext();
+  const locale = useSelector(getIntlLocale);
   const trackEvent = useContext(MetaMetricsContext);
   const rootState = useSelector((state) => state);
   const history = useHistory();
+  const location = useLocation();
   const { srcTxMetaId } = useParams<{ srcTxMetaId: string }>();
   const bridgeHistory = useSelector(selectBridgeHistoryForAccount);
   const selectedAddressTxList = useSelector(
@@ -131,6 +168,10 @@ const CrossChainSwapTxDetails = () => {
     getNetworkConfigurationsByChainId,
   );
 
+  const { transactionGroup, isEarliestNonce } = location.state as {
+    transactionGroup: TransactionGroup;
+    isEarliestNonce: boolean;
+  };
   const srcChainTxMeta = selectedAddressTxList.find(
     (tx) => tx.id === srcTxMetaId,
   );
@@ -154,12 +195,18 @@ const CrossChainSwapTxDetails = () => {
     ? bridgeHistoryItem?.status.status
     : StatusTypes.PENDING;
 
+  const srcChainIconUrl = srcNetwork
+    ? CHAIN_ID_TO_NETWORK_IMAGE_URL_MAP[
+        srcNetwork.chainId as keyof typeof CHAIN_ID_TO_NETWORK_IMAGE_URL_MAP
+      ]
+    : undefined;
+
   const destChainIconUrl = destNetwork
     ? CHAIN_ID_TO_NETWORK_IMAGE_URL_MAP[
         destNetwork.chainId as keyof typeof CHAIN_ID_TO_NETWORK_IMAGE_URL_MAP
       ]
     : undefined;
-  const bridgeTypeDirection = t('bridgeTypeDirectionTo');
+
   const srcNetworkName = srcNetwork?.name;
   const destNetworkName = destNetwork?.name;
 
@@ -171,9 +218,41 @@ const CrossChainSwapTxDetails = () => {
       })
     : undefined;
 
-  const bridgeAmount = getBridgeAmount({ bridgeHistoryItem });
+  const bridgeAmountSent = getBridgeAmountSentFormatted({
+    locale,
+    bridgeHistoryItem,
+  });
+  const bridgeAmountReceived = getBridgeAmountReceivedFormatted({
+    locale,
+    bridgeHistoryItem,
+  });
   const isDelayed = getIsDelayed(status, bridgeHistoryItem);
 
+  const srcNetworkIconName = (
+    <Box display={Display.Flex} gap={1} alignItems={AlignItems.center}>
+      {srcNetwork && (
+        <AvatarNetwork
+          size={AvatarNetworkSize.Xs}
+          src={srcChainIconUrl}
+          name={srcNetwork?.name}
+        />
+      )}
+      {srcNetworkName}
+    </Box>
+  );
+  const destNetworkIconName = (
+    <Box display={Display.Flex} gap={1} alignItems={AlignItems.center}>
+      {destNetwork && (
+        <AvatarNetwork
+          size={AvatarNetworkSize.Xs}
+          src={destChainIconUrl}
+          name={destNetwork?.name}
+        />
+      )}
+      {destNetworkName}
+    </Box>
+  );
+
   return (
     <div className="bridge">
       <div className="bridge__container">
@@ -196,6 +275,7 @@ const CrossChainSwapTxDetails = () => {
             flexDirection={FlexDirection.Column}
             gap={4}
           >
+            {/* Delayed banner */}
             {isDelayed && (
               <BannerAlert
                 title={t('bridgeTxDetailsDelayedTitle')}
@@ -231,6 +311,7 @@ const CrossChainSwapTxDetails = () => {
               </BannerAlert>
             )}
 
+            {/* Bridge step list */}
             {status !== StatusTypes.COMPLETE &&
               (bridgeHistoryItem || srcChainTxMeta) && (
                 <BridgeStepList
@@ -249,9 +330,10 @@ const CrossChainSwapTxDetails = () => {
               srcBlockExplorerUrl={srcBlockExplorerUrl}
               destBlockExplorerUrl={destBlockExplorerUrl}
             />
+
             <Divider />
 
-            {/* General tx details */}
+            {/* Bridge tx details */}
             <Box
               display={Display.Flex}
               flexDirection={FlexDirection.Column}
@@ -268,41 +350,20 @@ const CrossChainSwapTxDetails = () => {
                   </Text>
                 }
               />
-
-              {status !== StatusTypes.COMPLETE && (
-                <TransactionDetailRow
-                  title={t('bridgeTxDetailsBridgeType')}
-                  value={
-                    <Box
-                      display={Display.Flex}
-                      gap={1}
-                      alignItems={AlignItems.baseline}
-                    >
-                      {bridgeTypeDirection}{' '}
-                      {destNetwork && (
-                        <AvatarNetwork
-                          size={AvatarNetworkSize.Xs}
-                          src={destChainIconUrl}
-                          name={destNetwork?.name}
-                        />
-                      )}
-                      {destNetworkName}
-                    </Box>
-                  }
-                />
-              )}
-              {status === StatusTypes.COMPLETE && (
-                <>
-                  <TransactionDetailRow
-                    title={t('bridgeSource')}
-                    value={srcNetworkName}
-                  />
-                  <TransactionDetailRow
-                    title={t('bridgeDestination')}
-                    value={destNetworkName}
-                  />
-                </>
-              )}
+              <TransactionDetailRow
+                title={t('bridgeTxDetailsBridging')}
+                value={
+                  <Box
+                    display={Display.Flex}
+                    gap={1}
+                    alignItems={AlignItems.center}
+                  >
+                    {srcNetworkIconName}
+                    <Icon name={IconName.Arrow2Right} size={IconSize.Sm} />
+                    {destNetworkIconName}
+                  </Box>
+                }
+              />
               <TransactionDetailRow
                 title={t('bridgeTxDetailsTimestamp')}
                 value={t('bridgeTxDetailsTimestampValue', [
@@ -310,66 +371,48 @@ const CrossChainSwapTxDetails = () => {
                   formatDate(srcChainTxMeta?.time, 'hh:mm a'),
                 ])}
               />
-              <TransactionDetailRow
-                title={t('bridgeTxDetailsNonce')}
-                value={
-                  srcChainTxMeta?.txParams.nonce
-                    ? hexToDecimal(srcChainTxMeta?.txParams.nonce)
-                    : undefined
-                }
-              />
             </Box>
 
             <Divider />
 
+            {/* Bridge tx details 2 */}
             <Box
               display={Display.Flex}
               flexDirection={FlexDirection.Column}
               gap={2}
             >
               <TransactionDetailRow
-                title={t('bridgeTxDetailsBridgeAmount')}
-                value={bridgeAmount}
-              />
-              <TransactionDetailRow
-                title={t('bridgeTxDetailsGasLimit')}
-                value={data?.gas ? hexToDecimal(data?.gas) : undefined}
+                title={t('bridgeTxDetailsYouSent')}
+                value={
+                  <Box
+                    display={Display.Flex}
+                    gap={1}
+                    alignItems={AlignItems.center}
+                  >
+                    {t('bridgeTxDetailsTokenAmountOnChain', [
+                      bridgeAmountSent,
+                      bridgeHistoryItem?.quote.srcAsset.symbol,
+                    ])}
+                    {srcNetworkIconName}
+                  </Box>
+                }
               />
               <TransactionDetailRow
-                title={t('bridgeTxDetailsGasUsed')}
-                value={data?.gasUsed ? hexToDecimal(data?.gasUsed) : undefined}
+                title={t('bridgeTxDetailsYouReceived')}
+                value={
+                  <Box
+                    display={Display.Flex}
+                    gap={1}
+                    alignItems={AlignItems.center}
+                  >
+                    {t('bridgeTxDetailsTokenAmountOnChain', [
+                      bridgeAmountReceived,
+                      bridgeHistoryItem?.quote.destAsset.symbol,
+                    ])}
+                    {destNetworkIconName}
+                  </Box>
+                }
               />
-              {data?.isEIP1559Transaction &&
-                typeof data?.baseFee !== 'undefined' && (
-                  <TransactionDetailRow
-                    title={t('bridgeTxDetailsBaseFee')}
-                    value={
-                      <CurrencyDisplay
-                        currency={data?.nativeCurrency}
-                        denomination={EtherDenomination.GWEI}
-                        value={data?.baseFee}
-                        numberOfDecimals={10}
-                        hideLabel
-                      />
-                    }
-                  />
-                )}
-              {data?.isEIP1559Transaction &&
-                typeof data?.priorityFee !== 'undefined' && (
-                  <TransactionDetailRow
-                    title={t('bridgeTxDetailsPriorityFee')}
-                    value={
-                      <CurrencyDisplay
-                        currency={data?.nativeCurrency}
-                        denomination={EtherDenomination.GWEI}
-                        value={data?.priorityFee}
-                        numberOfDecimals={10}
-                        hideLabel
-                      />
-                    }
-                  />
-                )}
-
               <TransactionDetailRow
                 title={t('bridgeTxDetailsTotalGasFee')}
                 value={
@@ -382,34 +425,31 @@ const CrossChainSwapTxDetails = () => {
                   />
                 }
               />
-              <TransactionDetailRow
-                title={t('bridgeTxDetailsMaxFeePerGas')}
-                value={
-                  <UserPreferencedCurrencyDisplay
-                    currency={data?.nativeCurrency}
-                    denomination={EtherDenomination.ETH}
-                    numberOfDecimals={9}
-                    value={data?.maxFeePerGas}
-                    type={PRIMARY}
-                  />
-                }
-              />
             </Box>
 
             <Divider />
 
-            <TransactionDetailRow
-              title={t('bridgeTxDetailsTotal')}
-              value={
-                <UserPreferencedCurrencyDisplay
-                  type={PRIMARY}
-                  value={data?.totalInHex}
-                  numberOfDecimals={data?.l1HexGasTotal ? 18 : undefined}
-                />
-              }
-            />
+            {/* Generic tx details */}
+            <Box
+              display={Display.Flex}
+              flexDirection={FlexDirection.Column}
+              gap={2}
+            >
+              <TransactionDetailRow
+                title={t('bridgeTxDetailsNonce')}
+                value={
+                  srcChainTxMeta?.txParams.nonce
+                    ? hexToDecimal(srcChainTxMeta?.txParams.nonce)
+                    : undefined
+                }
+              />
 
-            <Divider />
+              <TransactionActivityLog
+                transactionGroup={transactionGroup}
+                className="transaction-list-item-details__transaction-activity-log"
+                isEarliestNonce={isEarliestNonce}
+              />
+            </Box>
           </Box>
         </Content>
       </div>
diff --git a/ui/pages/bridge/types.ts b/ui/pages/bridge/types.ts
index db6d7e8e1394..e753207f1631 100644
--- a/ui/pages/bridge/types.ts
+++ b/ui/pages/bridge/types.ts
@@ -94,12 +94,11 @@ export type Quote = {
   requestId: string;
   srcChainId: ChainId;
   srcAsset: BridgeAsset;
-  // This is amount sent - metabridge fee, however, some tokens have a fee of 0
-  // So sometimes it's equal to amount sent
-  srcTokenAmount: string;
+  // Some tokens have a fee of 0, so sometimes it's equal to amount sent
+  srcTokenAmount: string; // Atomic amount, the amount sent - fees
   destChainId: ChainId;
   destAsset: BridgeAsset;
-  destTokenAmount: string;
+  destTokenAmount: string; // Atomic amount, the amount received
   feeData: Record<FeeType.METABRIDGE, FeeData> &
     Partial<Record<FeeType, FeeData>>;
   bridgeId: string;

From 4b48ee62e4bd62fcb2981c230f2c2ed383d2ec62 Mon Sep 17 00:00:00 2001
From: Nick Gambino <35090461+gambinish@users.noreply.github.com>
Date: Thu, 12 Dec 2024 08:07:35 -0800
Subject: [PATCH 110/175] fix: Use correct selector to pull name from
 non-popular networks (#29121)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## **Description**

On token-list-item, we were using the wrong selector to select the
network configuration, which included the network name needed for the
fallback icon of non-popular networks.

`getNetworkConfigurationsByChainId` returns chainId =>
networkConfiguration mapping, while `getNetworkConfigurationIdByChainId`
returns a chainId => string mapping, which could be a networkId (random
UUID string)

This broke the fallback behavior, as we would render the first letter of
the uuid, rather than the first letter of the network name.

[![Open in GitHub
Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/29121?quickstart=1)

## **Related issues**

Fixes: Incorrect network logo fallback letter

## **Manual testing steps**

1. Add Base Sepolia as custom network: https://chainlist.org/chain/84532
2. Verify that the fallback image on main token-list and token-detail
page is `B` and matches the network picker.

## **Screenshots/Recordings**

Before
<img width="359" alt="Screenshot 2024-12-11 at 5 29 02 PM"
src="https://github.com/user-attachments/assets/9c1cc5ec-cd32-40d5-aa71-ccc19265fb68"
/>

After
<img width="359" alt="Screenshot 2024-12-11 at 5 28 21 PM"
src="https://github.com/user-attachments/assets/9ed50aae-1482-47ce-950f-99b7dafd28c6"
/>

## **Pre-merge author checklist**

- [x] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension Coding
Standards](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/CODING_GUIDELINES.md).
- [x] I've completed the PR template to the best of my ability
- [x] I’ve included tests if applicable
- [x] I’ve documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [x] I’ve applied the right labels on the PR (see [labeling
guidelines](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.

## **Pre-merge reviewer checklist**

- [ ] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed).
- [ ] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.
---
 .../assets/asset-list/network-filter/network-filter.tsx   | 2 +-
 .../multichain/token-list-item/token-list-item.tsx        | 8 +++-----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/ui/components/app/assets/asset-list/network-filter/network-filter.tsx b/ui/components/app/assets/asset-list/network-filter/network-filter.tsx
index d08d01f933ee..a63aef334d11 100644
--- a/ui/components/app/assets/asset-list/network-filter/network-filter.tsx
+++ b/ui/components/app/assets/asset-list/network-filter/network-filter.tsx
@@ -203,7 +203,7 @@ const NetworkFilter = ({ handleClose }: SortControlProps) => {
           </Box>
           <AvatarNetwork
             size={AvatarNetworkSize.Sm}
-            name="Current"
+            name={currentNetwork?.nickname || ''}
             src={currentNetwork?.rpcPrefs?.imageUrl}
           />
         </Box>
diff --git a/ui/components/multichain/token-list-item/token-list-item.tsx b/ui/components/multichain/token-list-item/token-list-item.tsx
index 76152770dbc9..40b91a001f17 100644
--- a/ui/components/multichain/token-list-item/token-list-item.tsx
+++ b/ui/components/multichain/token-list-item/token-list-item.tsx
@@ -44,7 +44,6 @@ import {
   getParticipateInMetaMetrics,
   getDataCollectionForMarketing,
   getMarketData,
-  getNetworkConfigurationIdByChainId,
   getCurrencyRates,
 } from '../../../selectors';
 import { getMultichainIsEvm } from '../../../selectors/multichain';
@@ -69,6 +68,7 @@ import {
   useSafeChains,
 } from '../../../pages/settings/networks-tab/networks-form/use-safe-chains';
 import { NETWORK_TO_SHORT_NETWORK_NAME_MAP } from '../../../../shared/constants/bridge';
+import { getNetworkConfigurationsByChainId } from '../../../../shared/modules/selectors/networks';
 import { PercentageChange } from './price/percentage-change/percentage-change';
 
 type TokenListItemProps = {
@@ -227,9 +227,7 @@ export const TokenListItem = ({
     </Box>
   );
   // Used for badge icon
-  const allNetworks: Record<string, string> = useSelector(
-    getNetworkConfigurationIdByChainId,
-  );
+  const allNetworks = useSelector(getNetworkConfigurationsByChainId);
   const testNetworkBackgroundColor = useSelector(getTestNetworkBackgroundColor);
 
   return (
@@ -285,7 +283,7 @@ export const TokenListItem = ({
           badge={
             <AvatarNetwork
               size={AvatarNetworkSize.Xs}
-              name={allNetworks?.[chainId] || ''}
+              name={allNetworks?.[chainId as Hex]?.name}
               src={tokenChainImage || undefined}
               backgroundColor={testNetworkBackgroundColor}
               className="multichain-token-list-item__badge__avatar-network"

From 0fb61dc6e1e32952e711180162e59dfc70027b40 Mon Sep 17 00:00:00 2001
From: infiniteflower <139582705+infiniteflower@users.noreply.github.com>
Date: Thu, 12 Dec 2024 11:34:19 -0500
Subject: [PATCH 111/175] chore: delay linea bridge tx to make it less flaky
 (#29109)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<!--
Please submit this PR as a draft initially.
Do not mark it as "Ready for review" until the template has been
completely filled out, and PR status checks have passed at least once.
-->

## **Description**

<!--
Write a short description of the changes included in this pull request,
also include relevant motivation and context. Have in mind the following
questions:
1. What is the reason for the change?
2. What is the improvement/solution?
-->

[![Open in GitHub
Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/29109?quickstart=1)

## **Related issues**

Fixes:

## **Manual testing steps**

1. Set network to Linea
2. Bridge an ERC20 to another network
3. Observe loading spinner on quotes page
4. Get redirected to activity list
5. See successful ERC20 approval and bridge tx

## **Screenshots/Recordings**

<!-- If applicable, add screenshots and/or recordings to visualize the
before and after of your change. -->

### **Before**

<!-- [screenshots/recordings] -->

### **After**

<!-- [screenshots/recordings] -->


https://github.com/user-attachments/assets/e6079f43-632e-4bd3-a9e0-54f7c427b541


## **Pre-merge author checklist**

- [x] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension Coding
Standards](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/CODING_GUIDELINES.md).
- [x] I've completed the PR template to the best of my ability
- [ ] I’ve included tests if applicable
- [ ] I’ve documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [x] I’ve applied the right labels on the PR (see [labeling
guidelines](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.

## **Pre-merge reviewer checklist**

- [ ] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed).
- [ ] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.
---
 .../hooks/useSubmitBridgeTransaction.ts       | 25 ++++++++++++++
 ui/pages/bridge/prepare/bridge-cta-button.tsx | 34 ++++++++++++-------
 2 files changed, 47 insertions(+), 12 deletions(-)

diff --git a/ui/pages/bridge/hooks/useSubmitBridgeTransaction.ts b/ui/pages/bridge/hooks/useSubmitBridgeTransaction.ts
index 39e905631e82..847df1204ab3 100644
--- a/ui/pages/bridge/hooks/useSubmitBridgeTransaction.ts
+++ b/ui/pages/bridge/hooks/useSubmitBridgeTransaction.ts
@@ -2,18 +2,25 @@ import { useDispatch, useSelector } from 'react-redux';
 import { zeroAddress } from 'ethereumjs-util';
 import { useHistory } from 'react-router-dom';
 import { TransactionMeta } from '@metamask/transaction-controller';
+import { createProjectLogger, Hex } from '@metamask/utils';
 import { QuoteMetadata, QuoteResponse } from '../types';
 import { DEFAULT_ROUTE } from '../../../helpers/constants/routes';
 import { setDefaultHomeActiveTabName } from '../../../store/actions';
 import { startPollingForBridgeTxStatus } from '../../../ducks/bridge-status/actions';
 import { getQuoteRequest } from '../../../ducks/bridge/selectors';
+import { CHAIN_IDS } from '../../../../shared/constants/network';
+import { getCurrentChainId } from '../../../../shared/modules/selectors/networks';
 import useAddToken from './useAddToken';
 import useHandleApprovalTx from './useHandleApprovalTx';
 import useHandleBridgeTx from './useHandleBridgeTx';
 
+const debugLog = createProjectLogger('bridge');
+const LINEA_DELAY_MS = 5000;
+
 export default function useSubmitBridgeTransaction() {
   const history = useHistory();
   const dispatch = useDispatch();
+  const srcChainId = useSelector(getCurrentChainId);
   const { addSourceToken, addDestToken } = useAddToken();
   const { handleApprovalTx } = useHandleApprovalTx();
   const { handleBridgeTx } = useHandleBridgeTx();
@@ -33,6 +40,24 @@ export default function useSubmitBridgeTransaction() {
       });
     }
 
+    if (
+      (
+        [
+          CHAIN_IDS.LINEA_MAINNET,
+          CHAIN_IDS.LINEA_GOERLI,
+          CHAIN_IDS.LINEA_SEPOLIA,
+        ] as Hex[]
+      ).includes(srcChainId)
+    ) {
+      debugLog(
+        'Delaying submitting bridge tx to make Linea confirmation more likely',
+      );
+      const waitPromise = new Promise((resolve) =>
+        setTimeout(resolve, LINEA_DELAY_MS),
+      );
+      await waitPromise;
+    }
+
     const bridgeTxMeta = await handleBridgeTx({
       quoteResponse,
       approvalTxId: approvalTxMeta?.id,
diff --git a/ui/pages/bridge/prepare/bridge-cta-button.tsx b/ui/pages/bridge/prepare/bridge-cta-button.tsx
index c8738a6551de..931b6cb4e8ea 100644
--- a/ui/pages/bridge/prepare/bridge-cta-button.tsx
+++ b/ui/pages/bridge/prepare/bridge-cta-button.tsx
@@ -35,6 +35,7 @@ export const BridgeCTAButton = () => {
   const { maxRefreshCount, refreshRate } = useSelector(getBridgeQuotesConfig);
 
   const { submitBridgeTransaction } = useSubmitBridgeTransaction();
+  const [isSubmitting, setIsSubmitting] = useState(false);
 
   const { isNoQuotesAvailable, isInsufficientBalance } =
     useSelector(getValidationErrors);
@@ -108,20 +109,29 @@ export const BridgeCTAButton = () => {
       data-testid="bridge-cta-button"
       onClick={() => {
         if (activeQuote && isTxSubmittable) {
-          quoteRequestProperties &&
-            requestMetadataProperties &&
-            tradeProperties &&
-            trackCrossChainSwapsEvent({
-              event: MetaMetricsEventName.ActionSubmitted,
-              properties: {
-                ...quoteRequestProperties,
-                ...requestMetadataProperties,
-                ...tradeProperties,
-              },
-            });
-          submitBridgeTransaction(activeQuote);
+          try {
+            // We don't need to worry about setting to true if the tx submission succeeds
+            // because we route immediately to Activity list page
+            setIsSubmitting(true);
+
+            quoteRequestProperties &&
+              requestMetadataProperties &&
+              tradeProperties &&
+              trackCrossChainSwapsEvent({
+                event: MetaMetricsEventName.ActionSubmitted,
+                properties: {
+                  ...quoteRequestProperties,
+                  ...requestMetadataProperties,
+                  ...tradeProperties,
+                },
+              });
+            submitBridgeTransaction(activeQuote);
+          } catch (error) {
+            setIsSubmitting(false);
+          }
         }
       }}
+      loading={isSubmitting}
       disabled={!isTxSubmittable || isQuoteExpired}
     >
       {label}

From edab215510e3936567818c767108151a48633a13 Mon Sep 17 00:00:00 2001
From: Mark Stacey <markjstacey@gmail.com>
Date: Thu, 12 Dec 2024 13:54:16 -0330
Subject: [PATCH 112/175] refactor: Refactor how manifest flags are set
 (#28686)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## **Description**

The pieces of `set-manifest-flags.ts` related to _getting_ flags have
been moved to the new `get-manifest-flags.ts` module. This module will
be used in a later PR by a script run during a CI workflow.

The migrated steps were also made asynchronous so that the asynchronous
steps could be run in parallel rather than blocking the process.

Documentation has been added to the `ManifestFlags` type as well, in
preparation for adding a new property in the next PR.

[![Open in GitHub
Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/28686?quickstart=1)

## **Related issues**

Related to https://github.com/MetaMask/metamask-extension/issues/28685

## **Manual testing steps**

N/A, no functional changes.

## **Screenshots/Recordings**

N/A

## **Pre-merge author checklist**

- [x] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension Coding
Standards](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/CODING_GUIDELINES.md).
- [x] I've completed the PR template to the best of my ability
- [x] I’ve included tests if applicable
- [x] I’ve documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [x] I’ve applied the right labels on the PR (see [labeling
guidelines](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.

## **Pre-merge reviewer checklist**

- [ ] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed).
- [ ] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.

---------

Co-authored-by: Howard Braham <howrad@gmail.com>
---
 app/scripts/lib/manifestFlags.ts     |  44 +++++++++++-
 development/lib/get-manifest-flag.ts | 102 +++++++++++++++++++++++++++
 test/e2e/helpers.js                  |   2 +-
 test/e2e/set-manifest-flags.ts       |  86 ++--------------------
 4 files changed, 150 insertions(+), 84 deletions(-)
 create mode 100644 development/lib/get-manifest-flag.ts

diff --git a/app/scripts/lib/manifestFlags.ts b/app/scripts/lib/manifestFlags.ts
index 5804c7391973..8f92bea93621 100644
--- a/app/scripts/lib/manifestFlags.ts
+++ b/app/scripts/lib/manifestFlags.ts
@@ -1,17 +1,59 @@
 import browser from 'webextension-polyfill';
 
+/**
+ * Flags that we use to control runtime behavior of the extension. Typically
+ * used for E2E tests.
+ *
+ * These flags are added to `manifest.json` for runtime querying.
+ */
 export type ManifestFlags = {
+  /**
+   * CircleCI metadata for the current run
+   */
   circleci?: {
+    /**
+     * Whether CircleCI manifest flags are enabled.
+     */
     enabled: boolean;
+    /**
+     * The name of the branch that triggered the current run on CircleCI
+     */
     branch?: string;
+    /**
+     * The current CircleCI build number
+     */
     buildNum?: number;
+    /**
+     * The name of the CircleCI job currently running
+     */
     job?: string;
+    /**
+     * For jobs with CircleCI parallelism enabled, this is the index of the current machine.
+     */
     nodeIndex?: number;
+    /**
+     * The number of the pull request that triggered the current run
+     */
     prNumber?: number;
   };
+  /**
+   * Sentry flags
+   */
   sentry?: {
+    /**
+     * Override the performance trace sample rate
+     */
     tracesSampleRate?: number;
-    lazyLoadSubSampleRate?: number; // multiply by tracesSampleRate to get the actual probability
+    /**
+     * Sub-sample rate for lazy-loaded components.
+     *
+     * Multiply this rate by tracesSampleRate to get the actual probability of sampling the load
+     * time of a lazy-loaded component.
+     */
+    lazyLoadSubSampleRate?: number;
+    /**
+     * Force enable Sentry (this is typically set by individual E2E tests in spec files)
+     */
     forceEnable?: boolean;
   };
 };
diff --git a/development/lib/get-manifest-flag.ts b/development/lib/get-manifest-flag.ts
new file mode 100644
index 000000000000..6253c3f3d98f
--- /dev/null
+++ b/development/lib/get-manifest-flag.ts
@@ -0,0 +1,102 @@
+import path from 'node:path';
+import fs from 'node:fs/promises';
+import { promisify } from 'node:util';
+import { exec as callbackExec } from 'node:child_process';
+
+import { hasProperty } from '@metamask/utils';
+import { merge } from 'lodash';
+
+import type { ManifestFlags } from '../../app/scripts/lib/manifestFlags';
+
+const exec = promisify(callbackExec);
+const PR_BODY_FILEPATH = path.resolve(
+  __dirname,
+  '..',
+  '..',
+  'changed-files',
+  'pr-body.txt',
+);
+
+/**
+ * Search a string for `flags = {...}` and return ManifestFlags if it exists
+ *
+ * @param str - The string to search
+ * @param errorType - The type of error to log if parsing fails
+ * @returns The ManifestFlags object if valid, otherwise undefined
+ */
+function regexSearchForFlags(str: string, errorType: string): ManifestFlags {
+  // Search str for `flags = {...}`
+  const flagsMatch = str.match(/flags\s*=\s*(\{.*\})/u);
+
+  if (flagsMatch) {
+    try {
+      // Get 1st capturing group from regex
+      return JSON.parse(flagsMatch[1]);
+    } catch (error) {
+      console.error(
+        `Error parsing flags from ${errorType}, ignoring flags\n`,
+        error,
+      );
+    }
+  }
+
+  return {};
+}
+
+/**
+ * Get flags from the GitHub PR body if they are set
+ *
+ * To use this feature, add a line to your PR body like:
+ * `flags = {"sentry": {"tracesSampleRate": 0.1}}`
+ * (must be valid JSON)
+ *
+ * @returns Any manifest flags found in the PR body
+ */
+async function getFlagsFromPrBody(): Promise<ManifestFlags> {
+  let body: string;
+  try {
+    body = await fs.readFile(PR_BODY_FILEPATH, 'utf8');
+  } catch (error) {
+    if (
+      error instanceof Error &&
+      hasProperty(error, 'code') &&
+      error.code === 'ENOENT'
+    ) {
+      console.debug('No pr-body.txt, ignoring flags');
+      return {};
+    }
+    throw error;
+  }
+
+  return regexSearchForFlags(body, 'PR body');
+}
+
+/**
+ * Get flags from the Git message if they are set
+ *
+ * To use this feature, add a line to your commit message like:
+ * `flags = {"sentry": {"tracesSampleRate": 0.1}}`
+ * (must be valid JSON)
+ *
+ * @returns Any manifest flags found in the commit message
+ */
+async function getFlagsFromGitMessage(): Promise<ManifestFlags> {
+  const gitMessage = (await exec(`git show --format='%B' --no-patch "HEAD"`))
+    .stdout;
+
+  return regexSearchForFlags(gitMessage, 'git message');
+}
+
+/**
+ * Get any manifest flags found in the PR body and git message.
+ *
+ * @returns Any manifest flags found
+ */
+export async function fetchManifestFlagsFromPRAndGit(): Promise<ManifestFlags> {
+  const [prBodyFlags, gitMessageFlags] = await Promise.all([
+    getFlagsFromPrBody(),
+    getFlagsFromGitMessage(),
+  ]);
+
+  return merge(prBodyFlags, gitMessageFlags);
+}
diff --git a/test/e2e/helpers.js b/test/e2e/helpers.js
index b06c29b17acf..3ad0d1d149c5 100644
--- a/test/e2e/helpers.js
+++ b/test/e2e/helpers.js
@@ -184,7 +184,7 @@ async function withFixtures(options, testSuite) {
     }
     await mockServer.start(8000);
 
-    setManifestFlags(manifestFlags);
+    await setManifestFlags(manifestFlags);
 
     driver = (await buildWebDriver(driverOptions)).driver;
     webDriver = driver.driver;
diff --git a/test/e2e/set-manifest-flags.ts b/test/e2e/set-manifest-flags.ts
index 75339250506f..8a7e45050f14 100644
--- a/test/e2e/set-manifest-flags.ts
+++ b/test/e2e/set-manifest-flags.ts
@@ -1,7 +1,7 @@
-import { execSync } from 'child_process';
 import fs from 'fs';
 import { merge } from 'lodash';
 import { ManifestFlags } from '../../app/scripts/lib/manifestFlags';
+import { fetchManifestFlagsFromPRAndGit } from '../../development/lib/get-manifest-flag';
 
 export const folder = `dist/${process.env.SELENIUM_BROWSER}`;
 
@@ -12,86 +12,8 @@ function parseIntOrUndefined(value: string | undefined): number | undefined {
   return value ? parseInt(value, 10) : undefined;
 }
 
-/**
- * Search a string for `flags = {...}` and return ManifestFlags if it exists
- *
- * @param str - The string to search
- * @param errorType - The type of error to log if parsing fails
- * @returns The ManifestFlags object if valid, otherwise undefined
- */
-function regexSearchForFlags(
-  str: string,
-  errorType: string,
-): ManifestFlags | undefined {
-  // Search str for `flags = {...}`
-  const flagsMatch = str.match(/flags\s*=\s*(\{.*\})/u);
-
-  if (flagsMatch) {
-    try {
-      // Get 1st capturing group from regex
-      return JSON.parse(flagsMatch[1]);
-    } catch (error) {
-      console.error(
-        `Error parsing flags from ${errorType}, ignoring flags\n`,
-        error,
-      );
-    }
-  }
-
-  return undefined;
-}
-
-/**
- * Add flags from the GitHub PR body if they are set
- *
- * To use this feature, add a line to your PR body like:
- * `flags = {"sentry": {"tracesSampleRate": 0.1}}`
- * (must be valid JSON)
- *
- * @param flags - The flags object to add to
- */
-function addFlagsFromPrBody(flags: ManifestFlags) {
-  let body;
-
-  try {
-    body = fs.readFileSync('changed-files/pr-body.txt', 'utf8');
-  } catch (error) {
-    console.debug('No pr-body.txt, ignoring flags');
-    return;
-  }
-
-  const newFlags = regexSearchForFlags(body, 'PR body');
-
-  if (newFlags) {
-    // Use lodash merge to do a deep merge (spread operator is shallow)
-    merge(flags, newFlags);
-  }
-}
-
-/**
- * Add flags from the Git message if they are set
- *
- * To use this feature, add a line to your commit message like:
- * `flags = {"sentry": {"tracesSampleRate": 0.1}}`
- * (must be valid JSON)
- *
- * @param flags - The flags object to add to
- */
-function addFlagsFromGitMessage(flags: ManifestFlags) {
-  const gitMessage = execSync(
-    `git show --format='%B' --no-patch "HEAD"`,
-  ).toString();
-
-  const newFlags = regexSearchForFlags(gitMessage, 'git message');
-
-  if (newFlags) {
-    // Use lodash merge to do a deep merge (spread operator is shallow)
-    merge(flags, newFlags);
-  }
-}
-
 // Alter the manifest with CircleCI environment variables and custom flags
-export function setManifestFlags(flags: ManifestFlags = {}) {
+export async function setManifestFlags(flags: ManifestFlags = {}) {
   if (process.env.CIRCLECI) {
     flags.circleci = {
       enabled: true,
@@ -104,8 +26,8 @@ export function setManifestFlags(flags: ManifestFlags = {}) {
       ),
     };
 
-    addFlagsFromPrBody(flags);
-    addFlagsFromGitMessage(flags);
+    const additionalManifestFlags = await fetchManifestFlagsFromPRAndGit();
+    merge(flags, additionalManifestFlags);
 
     // Set `flags.sentry.forceEnable` to true by default
     if (flags.sentry === undefined) {

From f74a897e3312dfad8b61d4bd52e4eaf71d68fbf8 Mon Sep 17 00:00:00 2001
From: infiniteflower <139582705+infiniteflower@users.noreply.github.com>
Date: Thu, 12 Dec 2024 12:44:50 -0500
Subject: [PATCH 113/175] chore: calc the max total gas fee as well (#29116)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<!--
Please submit this PR as a draft initially.
Do not mark it as "Ready for review" until the template has been
completely filled out, and PR status checks have passed at least once.
-->

## **Description**

<!--
Write a short description of the changes included in this pull request,
also include relevant motivation and context. Have in mind the following
questions:
1. What is the reason for the change?
2. What is the improvement/solution?
-->

[![Open in GitHub
Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/29116?quickstart=1)

This PR calculates the max total gas in order to block the submit
button.

## **Related issues**

Fixes:

## **Manual testing steps**

1. Go to this page...
2.
3.

## **Screenshots/Recordings**

<!-- If applicable, add screenshots and/or recordings to visualize the
before and after of your change. -->

### **Before**

<!-- [screenshots/recordings] -->

### **After**

<!-- [screenshots/recordings] -->

## **Pre-merge author checklist**

- [ ] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension Coding
Standards](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/CODING_GUIDELINES.md).
- [ ] I've completed the PR template to the best of my ability
- [ ] I’ve included tests if applicable
- [ ] I’ve documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [ ] I’ve applied the right labels on the PR (see [labeling
guidelines](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.

## **Pre-merge reviewer checklist**

- [ ] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed).
- [ ] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.
---
 ui/ducks/bridge/selectors.test.ts   | 18 +++++++++
 ui/ducks/bridge/selectors.ts        | 35 +++++++++++-----
 ui/pages/bridge/types.ts            |  3 +-
 ui/pages/bridge/utils/quote.test.ts | 18 +++++++--
 ui/pages/bridge/utils/quote.ts      | 63 +++++++++++++++++++++++------
 5 files changed, 110 insertions(+), 27 deletions(-)

diff --git a/ui/ducks/bridge/selectors.test.ts b/ui/ducks/bridge/selectors.test.ts
index 344fab115311..d90251e360f3 100644
--- a/ui/ducks/bridge/selectors.test.ts
+++ b/ui/ducks/bridge/selectors.test.ts
@@ -604,7 +604,13 @@ describe('Bridge selectors', () => {
         },
         gasFee: {
           amount: new BigNumber('7.141025952e-8'),
+          amountMax: new BigNumber('3.49092e-8'),
           valueInCurrency: new BigNumber('7.141025952e-8'),
+          valueInCurrencyMax: new BigNumber('3.49092e-8'),
+        },
+        totalMaxNetworkFee: {
+          amount: new BigNumber('0.0010000349092'),
+          valueInCurrency: new BigNumber('0.0010000349092'),
         },
         totalNetworkFee: {
           valueInCurrency: new BigNumber('0.00100007141025952'),
@@ -698,12 +704,18 @@ describe('Bridge selectors', () => {
         },
         gasFee: {
           amount: new BigNumber('7.141025952e-8'),
+          amountMax: new BigNumber('3.49092e-8'),
           valueInCurrency: new BigNumber('7.141025952e-8'),
+          valueInCurrencyMax: new BigNumber('3.49092e-8'),
         },
         totalNetworkFee: {
           valueInCurrency: new BigNumber('0.00100007141025952'),
           amount: new BigNumber('0.00100007141025952'),
         },
+        totalMaxNetworkFee: {
+          valueInCurrency: new BigNumber('0.0010000349092'),
+          amount: new BigNumber('0.0010000349092'),
+        },
       };
       expect(result.sortedQuotes).toHaveLength(2);
       const EXPECTED_SORTED_COSTS = [
@@ -797,12 +809,18 @@ describe('Bridge selectors', () => {
         },
         gasFee: {
           amount: new BigNumber('7.141025952e-8'),
+          amountMax: new BigNumber('3.49092e-8'),
           valueInCurrency: new BigNumber('7.141025952e-8'),
+          valueInCurrencyMax: new BigNumber('3.49092e-8'),
         },
         totalNetworkFee: {
           valueInCurrency: new BigNumber('0.00100007141025952'),
           amount: new BigNumber('0.00100007141025952'),
         },
+        totalMaxNetworkFee: {
+          valueInCurrency: new BigNumber('0.0010000349092'),
+          amount: new BigNumber('0.0010000349092'),
+        },
       };
       expect(result.sortedQuotes).toHaveLength(2);
       const EXPECTED_SORTED_COSTS = [
diff --git a/ui/ducks/bridge/selectors.ts b/ui/ducks/bridge/selectors.ts
index 2fd3d9586deb..7b0852965f8c 100644
--- a/ui/ducks/bridge/selectors.ts
+++ b/ui/ducks/bridge/selectors.ts
@@ -50,7 +50,7 @@ import {
   calcSentAmount,
   calcSwapRate,
   calcToAmount,
-  calcTotalGasFee,
+  calcEstimatedAndMaxTotalGasFee,
   isNativeAddress,
 } from '../../pages/bridge/utils/quote';
 import { decGWEIToHexWEI } from '../../../shared/modules/conversion.utils';
@@ -191,6 +191,8 @@ const _getBridgeFeesPerGas = createSelector(
     maxPriorityFeePerGasInDecGwei: (gasFeeEstimates as GasFeeEstimates)?.[
       BRIDGE_PREFERRED_GAS_ESTIMATE
     ]?.suggestedMaxPriorityFeePerGas,
+    maxFeePerGasInDecGwei: (gasFeeEstimates as GasFeeEstimates)?.high
+      ?.suggestedMaxFeePerGas,
     maxFeePerGas: decGWEIToHexWEI(
       (gasFeeEstimates as GasFeeEstimates)?.high?.suggestedMaxFeePerGas,
     ),
@@ -280,40 +282,53 @@ const _getQuotesWithMetadata = createDeepEqualSelector(
     toTokenExchangeRate,
     fromTokenExchangeRate,
     nativeExchangeRate,
-    { estimatedBaseFeeInDecGwei, maxPriorityFeePerGasInDecGwei },
+    {
+      estimatedBaseFeeInDecGwei,
+      maxPriorityFeePerGasInDecGwei,
+      maxFeePerGasInDecGwei,
+    },
   ): (QuoteResponse & QuoteMetadata)[] => {
     const newQuotes = quotes.map((quote: QuoteResponse) => {
       const toTokenAmount = calcToAmount(
         quote.quote,
         toTokenExchangeRate.valueInCurrency,
       );
-      const gasFee = calcTotalGasFee(
-        quote,
+      const gasFee = calcEstimatedAndMaxTotalGasFee({
+        bridgeQuote: quote,
         estimatedBaseFeeInDecGwei,
+        maxFeePerGasInDecGwei,
         maxPriorityFeePerGasInDecGwei,
         nativeExchangeRate,
-      );
+      });
       const relayerFee = calcRelayerFee(quote, nativeExchangeRate);
-      const totalNetworkFee = {
+      const totalEstimatedNetworkFee = {
         amount: gasFee.amount.plus(relayerFee.amount),
         valueInCurrency:
           gasFee.valueInCurrency?.plus(relayerFee.valueInCurrency || '0') ??
           null,
       };
+      const totalMaxNetworkFee = {
+        amount: gasFee.amountMax.plus(relayerFee.amount),
+        valueInCurrency:
+          gasFee.valueInCurrencyMax?.plus(relayerFee.valueInCurrency || '0') ??
+          null,
+      };
+
       const sentAmount = calcSentAmount(
         quote.quote,
         fromTokenExchangeRate.valueInCurrency,
       );
       const adjustedReturn = calcAdjustedReturn(
         toTokenAmount.valueInCurrency,
-        totalNetworkFee.valueInCurrency,
+        totalEstimatedNetworkFee.valueInCurrency,
       );
 
       return {
         ...quote,
         toTokenAmount,
         sentAmount,
-        totalNetworkFee,
+        totalNetworkFee: totalEstimatedNetworkFee,
+        totalMaxNetworkFee,
         adjustedReturn,
         gasFee,
         swapRate: calcSwapRate(sentAmount.amount, toTokenAmount.amount),
@@ -518,10 +533,10 @@ export const getValidationErrors = createDeepEqualSelector(
         if (balance && activeQuote && fromToken) {
           return isNativeAddress(fromToken.address)
             ? balance
-                .sub(activeQuote.totalNetworkFee.amount)
+                .sub(activeQuote.totalMaxNetworkFee.amount)
                 .sub(activeQuote.sentAmount.amount)
                 .lte(0)
-            : balance.lte(activeQuote.totalNetworkFee.amount);
+            : balance.lte(activeQuote.totalMaxNetworkFee.amount);
         }
         return false;
       },
diff --git a/ui/pages/bridge/types.ts b/ui/pages/bridge/types.ts
index e753207f1631..1216e447a6a3 100644
--- a/ui/pages/bridge/types.ts
+++ b/ui/pages/bridge/types.ts
@@ -9,7 +9,8 @@ export type L1GasFees = {
 // valueInCurrency values are calculated based on the user's selected currency
 export type QuoteMetadata = {
   gasFee: { amount: BigNumber; valueInCurrency: BigNumber | null };
-  totalNetworkFee: { amount: BigNumber; valueInCurrency: BigNumber | null }; // gasFees + relayerFees
+  totalNetworkFee: { amount: BigNumber; valueInCurrency: BigNumber | null }; // estimatedGasFees + relayerFees
+  totalMaxNetworkFee: { amount: BigNumber; valueInCurrency: BigNumber | null }; // maxGasFees + relayerFees
   toTokenAmount: { amount: BigNumber; valueInCurrency: BigNumber | null };
   adjustedReturn: { valueInCurrency: BigNumber | null }; // destTokenAmount - totalNetworkFee
   sentAmount: { amount: BigNumber; valueInCurrency: BigNumber | null }; // srcTokenAmount + metabridgeFee
diff --git a/ui/pages/bridge/utils/quote.test.ts b/ui/pages/bridge/utils/quote.test.ts
index f27cc5f63608..b932e9bf2c33 100644
--- a/ui/pages/bridge/utils/quote.test.ts
+++ b/ui/pages/bridge/utils/quote.test.ts
@@ -5,7 +5,7 @@ import {
   calcSentAmount,
   calcSwapRate,
   calcToAmount,
-  calcTotalGasFee,
+  calcEstimatedAndMaxTotalGasFee,
   calcRelayerFee,
   formatEtaInMinutes,
 } from './quote';
@@ -177,7 +177,13 @@ describe('Bridge quote utils', () => {
         approval: approvalGasLimit ? { gasLimit: approvalGasLimit } : undefined,
         quote: { srcAsset, srcTokenAmount, feeData },
       } as never;
-      const gasFee = calcTotalGasFee(quote, '0.00010456', '0.0001', 2517.42);
+      const gasFee = calcEstimatedAndMaxTotalGasFee({
+        bridgeQuote: quote,
+        maxFeePerGasInDecGwei: '0.0002',
+        estimatedBaseFeeInDecGwei: '0.00010456',
+        maxPriorityFeePerGasInDecGwei: '0.0001',
+        nativeExchangeRate: 2517.42,
+      });
       const relayerFee = calcRelayerFee(quote, 2517.42);
       const result = {
         amount: gasFee.amount.plus(relayerFee.amount),
@@ -264,7 +270,13 @@ describe('Bridge quote utils', () => {
         quote: { srcAsset, srcTokenAmount, feeData },
         l1GasFeesInHexWei: '0x25F63418AA4',
       } as never;
-      const gasFee = calcTotalGasFee(quote, '0.00010456', '0.0001', 2517.42);
+      const gasFee = calcEstimatedAndMaxTotalGasFee({
+        bridgeQuote: quote,
+        estimatedBaseFeeInDecGwei: '0.00010456',
+        maxFeePerGasInDecGwei: '0.0002',
+        maxPriorityFeePerGasInDecGwei: '0.0001',
+        nativeExchangeRate: 2517.42,
+      });
       const relayerFee = calcRelayerFee(quote, 2517.42);
       const result = {
         amount: gasFee.amount.plus(relayerFee.amount),
diff --git a/ui/pages/bridge/utils/quote.ts b/ui/pages/bridge/utils/quote.ts
index 05acc09db520..60faacacba20 100644
--- a/ui/pages/bridge/utils/quote.ts
+++ b/ui/pages/bridge/utils/quote.ts
@@ -104,32 +104,35 @@ export const calcRelayerFee = (
   };
 };
 
-export const calcTotalGasFee = (
-  bridgeQuote: QuoteResponse & L1GasFees,
-  estimatedBaseFeeInDecGwei: string,
-  maxPriorityFeePerGasInDecGwei: string,
-  nativeExchangeRate?: number,
-) => {
+const calcTotalGasFee = ({
+  bridgeQuote,
+  feePerGasInDecGwei,
+  priorityFeePerGasInDecGwei,
+  nativeExchangeRate,
+}: {
+  bridgeQuote: QuoteResponse & L1GasFees;
+  feePerGasInDecGwei: string;
+  priorityFeePerGasInDecGwei: string;
+  nativeExchangeRate?: number;
+}) => {
   const { approval, trade, l1GasFeesInHexWei } = bridgeQuote;
+
   const totalGasLimitInDec = sumDecimals(
     trade.gasLimit?.toString() ?? '0',
     approval?.gasLimit?.toString() ?? '0',
   );
-  const feePerGasInDecGwei = sumDecimals(
-    estimatedBaseFeeInDecGwei,
-    maxPriorityFeePerGasInDecGwei,
+  const totalFeePerGasInDecGwei = sumDecimals(
+    feePerGasInDecGwei,
+    priorityFeePerGasInDecGwei,
   );
-
   const l1GasFeesInDecGWei = Numeric.from(
     l1GasFeesInHexWei ?? '0',
     16,
     EtherDenomination.WEI,
   ).toDenomination(EtherDenomination.GWEI);
-
   const gasFeesInDecGwei = totalGasLimitInDec
-    .times(feePerGasInDecGwei)
+    .times(totalFeePerGasInDecGwei)
     .add(l1GasFeesInDecGWei);
-
   const gasFeesInDecEth = new BigNumber(
     gasFeesInDecGwei.shiftedBy(9).toString(),
   );
@@ -143,6 +146,40 @@ export const calcTotalGasFee = (
   };
 };
 
+export const calcEstimatedAndMaxTotalGasFee = ({
+  bridgeQuote,
+  estimatedBaseFeeInDecGwei,
+  maxFeePerGasInDecGwei,
+  maxPriorityFeePerGasInDecGwei,
+  nativeExchangeRate,
+}: {
+  bridgeQuote: QuoteResponse & L1GasFees;
+  estimatedBaseFeeInDecGwei: string;
+  maxFeePerGasInDecGwei: string;
+  maxPriorityFeePerGasInDecGwei: string;
+  nativeExchangeRate?: number;
+}) => {
+  const { amount, valueInCurrency } = calcTotalGasFee({
+    bridgeQuote,
+    feePerGasInDecGwei: estimatedBaseFeeInDecGwei,
+    priorityFeePerGasInDecGwei: maxPriorityFeePerGasInDecGwei,
+    nativeExchangeRate,
+  });
+  const { amount: amountMax, valueInCurrency: valueInCurrencyMax } =
+    calcTotalGasFee({
+      bridgeQuote,
+      feePerGasInDecGwei: maxFeePerGasInDecGwei,
+      priorityFeePerGasInDecGwei: maxPriorityFeePerGasInDecGwei,
+      nativeExchangeRate,
+    });
+  return {
+    amount,
+    amountMax,
+    valueInCurrency,
+    valueInCurrencyMax,
+  };
+};
+
 export const calcAdjustedReturn = (
   destTokenAmountInCurrency: BigNumber | null,
   totalNetworkFeeInCurrency: BigNumber | null,

From 1a239750147d79a0476bfe2aac4fa96af8388400 Mon Sep 17 00:00:00 2001
From: Bryan Fullam <bryan.fullam@consensys.net>
Date: Fri, 13 Dec 2024 00:45:23 +0700
Subject: [PATCH 114/175] feat: hardware wallet confirmation screen (#29113)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<!--
Please submit this PR as a draft initially.
Do not mark it as "Ready for review" until the template has been
completely filled out, and PR status checks have passed at least once.
-->

## **Description**

Bridge currently redirects to swap when trying to use a hardware wallet.
This PR allows hardware wallet accounts to access swaps and adds an info
screen to inform the user about the transactions they will need to
approve on their device.

<!--
Write a short description of the changes included in this pull request,
also include relevant motivation and context. Have in mind the following
questions:
1. What is the reason for the change?
2. What is the improvement/solution?
-->

[![Open in GitHub
Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/29113?quickstart=1)

## **Related issues**

Fixes:

## **Manual testing steps**

1. Connect with hardware wallet account
2. Go to bridge
3. Enter token, amount, and network
4. Confirm quote
5. See info screen

## **Screenshots/Recordings**

<!-- If applicable, add screenshots and/or recordings to visualize the
before and after of your change. -->

### **Before**

<!-- [screenshots/recordings] -->

### **After**
![Screenshot 2024-12-11 at 20 52
29](https://github.com/user-attachments/assets/cfb97ae1-17e2-4904-9c55-d6b9b08fdb49)

<!-- [screenshots/recordings] -->

## **Pre-merge author checklist**

- [x] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension Coding
Standards](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/CODING_GUIDELINES.md).
- [x] I've completed the PR template to the best of my ability
- [x] I’ve included tests if applicable
- [x] I’ve documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [x] I’ve applied the right labels on the PR (see [labeling
guidelines](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.

## **Pre-merge reviewer checklist**

- [ ] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed).
- [ ] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.

---------

Co-authored-by: IF <139582705+infiniteflower@users.noreply.github.com>
---
 app/_locales/en/messages.json                 |  14 ++
 test/jest/mock-store.js                       |   3 +
 ui/hooks/bridge/useBridging.ts                |  14 +-
 .../bridge/__snapshots__/index.test.tsx.snap  | 236 +++++++++++++++++-
 .../awaiting-signatures-cancel-button.tsx     |  25 ++
 .../awaiting-signatures.tsx                   | 154 ++++++++++++
 .../bridge/awaiting-signatures/index.scss     |  31 +++
 ui/pages/bridge/awaiting-signatures/index.ts  |   1 +
 .../hooks/useSubmitBridgeTransaction.ts       |  47 +++-
 ui/pages/bridge/index.scss                    |   1 +
 ui/pages/bridge/index.test.tsx                |  15 +-
 ui/pages/bridge/index.tsx                     |  85 ++++---
 12 files changed, 564 insertions(+), 62 deletions(-)
 create mode 100644 ui/pages/bridge/awaiting-signatures/awaiting-signatures-cancel-button.tsx
 create mode 100644 ui/pages/bridge/awaiting-signatures/awaiting-signatures.tsx
 create mode 100644 ui/pages/bridge/awaiting-signatures/index.scss
 create mode 100644 ui/pages/bridge/awaiting-signatures/index.ts

diff --git a/app/_locales/en/messages.json b/app/_locales/en/messages.json
index 466615b0343a..a4dc558e0b83 100644
--- a/app/_locales/en/messages.json
+++ b/app/_locales/en/messages.json
@@ -854,6 +854,10 @@
   "bridge": {
     "message": "Bridge"
   },
+  "bridgeAllowSwappingOf": {
+    "message": "Allow exact access to $1 $2 on $3 for bridging",
+    "description": "Shows a user that they need to allow a token for swapping on their hardware wallet"
+  },
   "bridgeApproval": {
     "message": "Approve $1 for bridge",
     "description": "Used in the transaction display list to describe a transaction that is an approve call on a token that is to be bridged. $1 is the symbol of a token that has been approved."
@@ -861,6 +865,9 @@
   "bridgeCalculatingAmount": {
     "message": "Calculating..."
   },
+  "bridgeConfirmTwoTransactions": {
+    "message": "You'll need to confirm 2 transactions on your hardware wallet:"
+  },
   "bridgeDontSend": {
     "message": "Bridge, don't send"
   },
@@ -873,6 +880,13 @@
   "bridgeFrom": {
     "message": "Bridge from"
   },
+  "bridgeFromTo": {
+    "message": "Bridge $1 $2 to $3",
+    "description": "Tells a user that they need to confirm on their hardware wallet a bridge. $1 is amount of source token, $2 is the source network, and $3 is the destination network"
+  },
+  "bridgeGasFeesSplit": {
+    "message": "Any network fee quoted on the previous screen includes both transactions and will be split."
+  },
   "bridgeNetCost": {
     "message": "Net cost"
   },
diff --git a/test/jest/mock-store.js b/test/jest/mock-store.js
index 84d18e1a3803..2f48e9794e98 100644
--- a/test/jest/mock-store.js
+++ b/test/jest/mock-store.js
@@ -868,5 +868,8 @@ export const createBridgeMockStore = (
         ...bridgeStatusStateOverrides,
       },
     },
+    send: {
+      swapsBlockedTokens: [],
+    },
   };
 };
diff --git a/ui/hooks/bridge/useBridging.ts b/ui/hooks/bridge/useBridging.ts
index 2b7ffb0083c9..bfc47491caa0 100644
--- a/ui/hooks/bridge/useBridging.ts
+++ b/ui/hooks/bridge/useBridging.ts
@@ -93,17 +93,9 @@ const useBridging = () => {
             chain_id: providerConfig.chainId,
           },
         });
-        if (usingHardwareWallet && global.platform.openExtensionInBrowser) {
-          global.platform.openExtensionInBrowser(
-            PREPARE_SWAP_ROUTE,
-            null,
-            false,
-          );
-        } else {
-          history.push(
-            `${CROSS_CHAIN_SWAP_ROUTE}${PREPARE_SWAP_ROUTE}?token=${token.address.toLowerCase()}`,
-          );
-        }
+        history.push(
+          `${CROSS_CHAIN_SWAP_ROUTE}${PREPARE_SWAP_ROUTE}?token=${token.address.toLowerCase()}`,
+        );
       } else {
         const portfolioUrl = getPortfolioUrl(
           'bridge',
diff --git a/ui/pages/bridge/__snapshots__/index.test.tsx.snap b/ui/pages/bridge/__snapshots__/index.test.tsx.snap
index b9a6a4c83797..d3960cf975a8 100644
--- a/ui/pages/bridge/__snapshots__/index.test.tsx.snap
+++ b/ui/pages/bridge/__snapshots__/index.test.tsx.snap
@@ -50,8 +50,240 @@ exports[`Bridge renders the component with initial props 1`] = `
         </div>
       </div>
       <div
-        class="mm-box multichain-page-content bridge__content mm-box--padding-4 mm-box--display-flex mm-box--flex-direction-column mm-box--width-full mm-box--height-full"
-      />
+        class="mm-box multichain-page-content mm-box--padding-4 mm-box--display-flex mm-box--flex-direction-column mm-box--width-full mm-box--height-full"
+      >
+        <div
+          class="prepare-bridge-page"
+        >
+          <div
+            class="mm-box prepare-bridge-page__content"
+          >
+            <div
+              class="mm-box bridge-box"
+            >
+              <div
+                class="mm-box prepare-bridge-page__input-row"
+              >
+                <button
+                  class="mm-box mm-text mm-button-base mm-button-base--size-md asset-picker mm-text--body-md-medium mm-box--padding-2 mm-box--padding-right-2 mm-box--padding-left-2 mm-box--display-flex mm-box--gap-2 mm-box--align-items-center mm-box--color-text-default mm-box--background-color-transparent mm-box--rounded-pill"
+                  data-testid="asset-picker-button"
+                >
+                  <span
+                    class="mm-box mm-text mm-text--inherit mm-box--color-text-default"
+                  >
+                    <div
+                      class="mm-box mm-box--display-flex mm-box--gap-3 mm-box--align-items-center"
+                    >
+                      <div
+                        class="mm-box mm-box--display-flex"
+                      >
+                        <div
+                          class="mm-box mm-badge-wrapper mm-box--display-inline-block"
+                        >
+                          <div
+                            class="mm-box mm-text mm-avatar-base mm-avatar-base--size-md mm-avatar-token mm-text--body-sm mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full"
+                          >
+                            <img
+                              alt="ETH logo"
+                              class="mm-avatar-token__token-image"
+                              src="./images/eth_logo.svg"
+                            />
+                          </div>
+                          <div
+                            class="mm-box mm-badge-wrapper__badge-container mm-badge-wrapper__badge-container--rectangular-bottom-right"
+                          >
+                            <div
+                              class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-network mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-md mm-box--border-color-border-muted mm-box--border-width-1 box--border-style-solid"
+                            >
+                              <img
+                                alt="Ethereum Mainnet logo"
+                                class="mm-avatar-network__network-image"
+                                src="./images/eth_logo.svg"
+                              />
+                            </div>
+                          </div>
+                        </div>
+                      </div>
+                      <div
+                        class="mm-box"
+                      >
+                        <div
+                          class=""
+                          style="display: inline;"
+                          tabindex="0"
+                          title=""
+                        >
+                          <p
+                            class="mm-box mm-text asset-picker__symbol mm-text--body-md mm-box--color-text-default"
+                          >
+                            ETH
+                          </p>
+                        </div>
+                      </div>
+                    </div>
+                  </span>
+                  <span
+                    class="mm-box mm-icon mm-icon--size-sm mm-box--margin-inline-start-0 mm-box--display-inline-block mm-box--color-icon-default"
+                    style="mask-image: url('./images/icons/arrow-down.svg');"
+                  />
+                </button>
+                <div>
+                  <div
+                    class="mm-box mm-text-field mm-text-field--size-md mm-text-field--focused mm-text-field--truncate amount-input mm-box--padding-right-0 mm-box--padding-left-0 mm-box--display-inline-flex mm-box--align-items-center mm-box--background-color-background-default mm-box--rounded-sm mm-box--border-width-1 box--border-style-solid"
+                  >
+                    <input
+                      autocomplete="off"
+                      class="mm-box mm-text mm-input mm-input--disable-state-styles mm-text-field__input mm-text--body-md mm-box--margin-0 mm-box--padding-0 mm-box--padding-right-4 mm-box--padding-left-4 mm-box--color-text-default mm-box--background-color-transparent mm-box--border-style-none"
+                      data-testid="from-amount"
+                      focused="true"
+                      placeholder="0"
+                      type="number"
+                      value=""
+                    />
+                  </div>
+                </div>
+              </div>
+              <div
+                class="mm-box prepare-bridge-page__amounts-row"
+              >
+                <p
+                  class="mm-box mm-text mm-text--body-md mm-box--color-text-alternative"
+                >
+                   
+                </p>
+                <div
+                  class="mm-box currency-display-component mm-box--display-flex mm-box--flex-wrap-wrap mm-box--align-items-center"
+                  title="$0.00"
+                >
+                  <span
+                    class="mm-box mm-text currency-display-component__text mm-text--inherit mm-text--ellipsis mm-box--color-text-default"
+                    data-testid="account-value-and-suffix"
+                  >
+                    $0.00
+                  </span>
+                </div>
+              </div>
+            </div>
+            <div
+              class="mm-box prepare-bridge-page__switch-tokens"
+            >
+              <button
+                aria-label="switch-tokens"
+                class="mm-box mm-button-icon mm-button-icon--size-lg mm-button-icon--disabled mm-box--display-inline-flex mm-box--justify-content-center mm-box--align-items-center mm-box--width-full mm-box--color-icon-default mm-box--background-color-transparent mm-box--rounded-lg"
+                data-testid="switch-tokens"
+                disabled=""
+              >
+                <span
+                  class="mm-box mm-icon mm-icon--size-lg mm-box--display-inline-block mm-box--color-inherit"
+                  style="mask-image: url('./images/icons/arrow-2-down.svg');"
+                />
+              </button>
+            </div>
+            <div
+              class="mm-box bridge-box"
+            >
+              <div
+                class="mm-box prepare-bridge-page__input-row"
+              >
+                <button
+                  class="mm-box mm-text mm-button-base mm-button-base--size-md asset-picker mm-text--body-md-medium mm-box--padding-2 mm-box--padding-right-2 mm-box--padding-left-2 mm-box--display-flex mm-box--gap-2 mm-box--align-items-center mm-box--color-text-default mm-box--background-color-transparent mm-box--rounded-pill"
+                  data-testid="asset-picker-button"
+                >
+                  <span
+                    class="mm-box mm-text mm-text--inherit mm-box--color-text-default"
+                  >
+                    <div
+                      class="mm-box mm-box--display-flex mm-box--gap-3 mm-box--align-items-center"
+                    >
+                      <div
+                        class="mm-box mm-box--display-flex"
+                      >
+                        <div
+                          class="mm-box mm-badge-wrapper mm-box--display-inline-block"
+                        >
+                          <div
+                            class="mm-box mm-text mm-avatar-base mm-avatar-base--size-md mm-avatar-token mm-text--body-sm mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full"
+                          >
+                            ?
+                          </div>
+                          <div
+                            class="mm-box mm-badge-wrapper__badge-container mm-badge-wrapper__badge-container--rectangular-bottom-right"
+                          >
+                            <div
+                              class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-network mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-md mm-box--border-color-border-default mm-box--border-width-1 box--border-style-solid"
+                            >
+                              <img
+                                alt="Ethereum Mainnet logo"
+                                class="mm-avatar-network__network-image"
+                                src="./images/eth_logo.svg"
+                              />
+                            </div>
+                          </div>
+                        </div>
+                      </div>
+                      <div
+                        class="mm-box"
+                      >
+                        <p
+                          class="mm-box mm-text asset-picker__symbol mm-text--body-md mm-box--color-text-default"
+                        />
+                      </div>
+                    </div>
+                  </span>
+                  <span
+                    class="mm-box mm-icon mm-icon--size-sm mm-box--margin-inline-start-0 mm-box--display-inline-block mm-box--color-icon-default"
+                    style="mask-image: url('./images/icons/arrow-down.svg');"
+                  />
+                </button>
+                <div>
+                  <div
+                    class="amount-tooltip"
+                    style="display: inherit;"
+                    tabindex="0"
+                    title=""
+                  >
+                    <div
+                      class="mm-box mm-text-field mm-text-field--size-md mm-text-field--disabled mm-text-field--truncate amount-input mm-box--padding-right-0 mm-box--padding-left-0 mm-box--display-inline-flex mm-box--align-items-center mm-box--background-color-background-default mm-box--rounded-sm mm-box--border-width-1 box--border-style-solid"
+                    >
+                      <input
+                        autocomplete="off"
+                        class="mm-box mm-text mm-input mm-input--disable-state-styles mm-input--disabled mm-text-field__input mm-text--body-md mm-box--margin-0 mm-box--padding-0 mm-box--padding-right-4 mm-box--padding-left-4 mm-box--color-text-default mm-box--background-color-transparent mm-box--border-style-none"
+                        data-testid="to-amount"
+                        disabled=""
+                        focused="false"
+                        placeholder="0"
+                        readonly=""
+                        type="number"
+                        value="0"
+                      />
+                    </div>
+                  </div>
+                </div>
+              </div>
+              <div
+                class="mm-box prepare-bridge-page__amounts-row"
+              >
+                <p
+                  class="mm-box mm-text mm-text--body-md mm-box--color-text-alternative"
+                >
+                   
+                </p>
+                <div
+                  class="mm-box currency-display-component mm-box--display-flex mm-box--flex-wrap-wrap mm-box--align-items-center"
+                  title="$0.00"
+                >
+                  <span
+                    class="mm-box mm-text currency-display-component__text mm-text--inherit mm-text--ellipsis mm-box--color-text-default"
+                    data-testid="account-value-and-suffix"
+                  >
+                    $0.00
+                  </span>
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
       <div
         class="mm-box multichain-page-footer mm-box--padding-4 mm-box--display-flex mm-box--gap-4 mm-box--width-full"
       >
diff --git a/ui/pages/bridge/awaiting-signatures/awaiting-signatures-cancel-button.tsx b/ui/pages/bridge/awaiting-signatures/awaiting-signatures-cancel-button.tsx
new file mode 100644
index 000000000000..10f63a414305
--- /dev/null
+++ b/ui/pages/bridge/awaiting-signatures/awaiting-signatures-cancel-button.tsx
@@ -0,0 +1,25 @@
+import React, { useContext } from 'react';
+import { useHistory } from 'react-router-dom';
+import {
+  CROSS_CHAIN_SWAP_ROUTE,
+  PREPARE_SWAP_ROUTE,
+} from '../../../helpers/constants/routes';
+import { Button } from '../../../components/component-library';
+import { I18nContext } from '../../../contexts/i18n';
+
+const AwaitingSignaturesCancelButton = () => {
+  const t = useContext(I18nContext);
+  const history = useHistory();
+
+  return (
+    <Button
+      onClick={() => {
+        history.push(`${CROSS_CHAIN_SWAP_ROUTE}${PREPARE_SWAP_ROUTE}`);
+      }}
+    >
+      {t('cancel')}
+    </Button>
+  );
+};
+
+export default AwaitingSignaturesCancelButton;
diff --git a/ui/pages/bridge/awaiting-signatures/awaiting-signatures.tsx b/ui/pages/bridge/awaiting-signatures/awaiting-signatures.tsx
new file mode 100644
index 000000000000..cf8d6b017a49
--- /dev/null
+++ b/ui/pages/bridge/awaiting-signatures/awaiting-signatures.tsx
@@ -0,0 +1,154 @@
+import React, { useContext, useEffect } from 'react';
+import { shallowEqual, useSelector } from 'react-redux';
+import isEqual from 'lodash/isEqual';
+
+import {
+  isHardwareWallet,
+  getHardwareWalletType,
+} from '../../../selectors/selectors';
+import PulseLoader from '../../../components/ui/pulse-loader';
+import {
+  TextVariant,
+  JustifyContent,
+  TextColor,
+  BlockSize,
+  Display,
+  FlexDirection,
+  BackgroundColor,
+} from '../../../helpers/constants/design-system';
+import { MetaMetricsContext } from '../../../contexts/metametrics';
+import { MetaMetricsEventCategory } from '../../../../shared/constants/metametrics';
+import {
+  AvatarBase,
+  AvatarBaseSize,
+  Box,
+  Text,
+} from '../../../components/component-library';
+import {
+  getBridgeQuotes,
+  getFromChain,
+  getFromToken,
+  getToToken,
+  getToChain,
+} from '../../../ducks/bridge/selectors';
+import { useI18nContext } from '../../../hooks/useI18nContext';
+
+export default function AwaitingSignatures() {
+  const t = useI18nContext();
+  const { activeQuote } = useSelector(getBridgeQuotes, shallowEqual);
+  const fromAmount = activeQuote?.sentAmount?.amount?.toNumber();
+  const fromToken = useSelector(getFromToken, isEqual);
+  const toToken = useSelector(getToToken, isEqual);
+  const fromChain = useSelector(getFromChain, isEqual);
+  const toChain = useSelector(getToChain, isEqual);
+  const hardwareWalletUsed = useSelector(isHardwareWallet);
+  const hardwareWalletType = useSelector(getHardwareWalletType);
+  const needsTwoConfirmations = Boolean(activeQuote?.approval);
+  const trackEvent = useContext(MetaMetricsContext);
+
+  useEffect(() => {
+    trackEvent({
+      event: 'Awaiting Signature(s) on a HW wallet',
+      category: MetaMetricsEventCategory.Swaps,
+      properties: {
+        needs_two_confirmations: needsTwoConfirmations,
+        token_from: fromToken?.symbol ?? '',
+        token_to: toToken?.symbol ?? '',
+        is_hardware_wallet: hardwareWalletUsed,
+        hardware_wallet_type: hardwareWalletType ?? '',
+      },
+      sensitiveProperties: {
+        token_from_amount: activeQuote?.quote?.srcTokenAmount ?? '',
+        token_to_amount: activeQuote?.quote?.destTokenAmount ?? '',
+      },
+    });
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, []);
+
+  return (
+    <div className="awaiting-bridge-signatures">
+      <Box
+        paddingLeft={6}
+        paddingRight={6}
+        height={BlockSize.Full}
+        justifyContent={JustifyContent.center}
+        display={Display.Flex}
+        flexDirection={FlexDirection.Column}
+      >
+        <Box marginTop={3} marginBottom={4}>
+          <PulseLoader />
+        </Box>
+        {!needsTwoConfirmations && (
+          <Text
+            color={TextColor.textDefault}
+            variant={TextVariant.headingMd}
+            as="h3"
+          >
+            {t('swapConfirmWithHwWallet')}
+          </Text>
+        )}
+        {needsTwoConfirmations && (
+          <>
+            <Text variant={TextVariant.bodyMdBold} marginTop={2}>
+              {t('bridgeConfirmTwoTransactions')}
+            </Text>
+            <ul className="awaiting-bridge-signatures__steps">
+              <li>
+                <AvatarBase
+                  size={AvatarBaseSize.Sm}
+                  backgroundColor={BackgroundColor.primaryMuted}
+                  color={TextColor.primaryDefault}
+                  marginRight={2}
+                >
+                  1
+                </AvatarBase>
+                {/* <BridgeStepIcon stepNumber={1} /> */}
+                {t('bridgeAllowSwappingOf', [
+                  <Text
+                    as="span"
+                    variant={TextVariant.bodyMd}
+                    key="allowAmount"
+                  >
+                    {fromAmount}
+                  </Text>,
+                  <Text as="span" variant={TextVariant.bodyMd} key="allowToken">
+                    {fromToken?.symbol}
+                  </Text>,
+                  <Text
+                    as="span"
+                    variant={TextVariant.bodyMd}
+                    key="allowNetwork"
+                  >
+                    {fromChain?.name}
+                  </Text>,
+                ])}
+              </li>
+              <li>
+                <AvatarBase
+                  size={AvatarBaseSize.Sm}
+                  backgroundColor={BackgroundColor.primaryMuted}
+                  color={TextColor.primaryDefault}
+                  marginRight={2}
+                >
+                  2
+                </AvatarBase>
+                {t('bridgeFromTo', [
+                  <Text as="span" variant={TextVariant.bodyMd} key="fromAmount">
+                    {fromAmount}
+                  </Text>,
+                  <Text as="span" variant={TextVariant.bodyMd} key="fromToken">
+                    {fromToken?.symbol}
+                  </Text>,
+                  <Text as="span" variant={TextVariant.bodyMd} key="toNetwork">
+                    {toChain?.name}
+                  </Text>,
+                ])}
+              </li>
+            </ul>
+            <Text variant={TextVariant.bodyXs}>{t('bridgeGasFeesSplit')}</Text>
+          </>
+        )}
+      </Box>
+    </div>
+  );
+}
diff --git a/ui/pages/bridge/awaiting-signatures/index.scss b/ui/pages/bridge/awaiting-signatures/index.scss
new file mode 100644
index 000000000000..89c56ffae88f
--- /dev/null
+++ b/ui/pages/bridge/awaiting-signatures/index.scss
@@ -0,0 +1,31 @@
+.awaiting-bridge-signatures {
+  display: flex;
+  flex-flow: column;
+  align-items: center;
+  flex: 1;
+  width: 100%;
+  margin-top: 40%;
+
+  &__content {
+    flex-flow: column;
+  }
+
+  div {
+    text-align: center;
+    display: flex;
+    justify-content: center;
+  }
+
+  &__steps {
+    display: flex;
+    flex-direction: column;
+    align-items: flex-start;
+    margin: 16px auto 12px auto;
+
+    li {
+      margin-bottom: 4px;
+      display: flex;
+      align-items: center;
+    }
+  }
+}
diff --git a/ui/pages/bridge/awaiting-signatures/index.ts b/ui/pages/bridge/awaiting-signatures/index.ts
new file mode 100644
index 000000000000..3950ca6bf482
--- /dev/null
+++ b/ui/pages/bridge/awaiting-signatures/index.ts
@@ -0,0 +1 @@
+export { default } from './awaiting-signatures';
diff --git a/ui/pages/bridge/hooks/useSubmitBridgeTransaction.ts b/ui/pages/bridge/hooks/useSubmitBridgeTransaction.ts
index 847df1204ab3..b3f4c9535a9e 100644
--- a/ui/pages/bridge/hooks/useSubmitBridgeTransaction.ts
+++ b/ui/pages/bridge/hooks/useSubmitBridgeTransaction.ts
@@ -4,9 +4,15 @@ import { useHistory } from 'react-router-dom';
 import { TransactionMeta } from '@metamask/transaction-controller';
 import { createProjectLogger, Hex } from '@metamask/utils';
 import { QuoteMetadata, QuoteResponse } from '../types';
-import { DEFAULT_ROUTE } from '../../../helpers/constants/routes';
+import {
+  AWAITING_SIGNATURES_ROUTE,
+  CROSS_CHAIN_SWAP_ROUTE,
+  DEFAULT_ROUTE,
+  PREPARE_SWAP_ROUTE,
+} from '../../../helpers/constants/routes';
 import { setDefaultHomeActiveTabName } from '../../../store/actions';
 import { startPollingForBridgeTxStatus } from '../../../ducks/bridge-status/actions';
+import { isHardwareWallet } from '../../../selectors';
 import { getQuoteRequest } from '../../../ducks/bridge/selectors';
 import { CHAIN_IDS } from '../../../../shared/constants/network';
 import { getCurrentChainId } from '../../../../shared/modules/selectors/networks';
@@ -24,20 +30,30 @@ export default function useSubmitBridgeTransaction() {
   const { addSourceToken, addDestToken } = useAddToken();
   const { handleApprovalTx } = useHandleApprovalTx();
   const { handleBridgeTx } = useHandleBridgeTx();
+  const hardwareWalletUsed = useSelector(isHardwareWallet);
   const { slippage } = useSelector(getQuoteRequest);
 
   const submitBridgeTransaction = async (
     quoteResponse: QuoteResponse & QuoteMetadata,
   ) => {
-    // TODO catch errors and emit ActionFailed here
+    if (hardwareWalletUsed) {
+      history.push(`${CROSS_CHAIN_SWAP_ROUTE}${AWAITING_SIGNATURES_ROUTE}`);
+    }
+
     // Execute transaction(s)
     let approvalTxMeta: TransactionMeta | undefined;
-    if (quoteResponse?.approval) {
-      // This will never be an STX
-      approvalTxMeta = await handleApprovalTx({
-        approval: quoteResponse.approval,
-        quoteResponse,
-      });
+    try {
+      if (quoteResponse?.approval) {
+        // This will never be an STX
+        approvalTxMeta = await handleApprovalTx({
+          approval: quoteResponse.approval,
+          quoteResponse,
+        });
+      }
+    } catch (e) {
+      debugLog('Approve transaction failed', e);
+      history.push(`${CROSS_CHAIN_SWAP_ROUTE}${PREPARE_SWAP_ROUTE}`);
+      return;
     }
 
     if (
@@ -58,10 +74,17 @@ export default function useSubmitBridgeTransaction() {
       await waitPromise;
     }
 
-    const bridgeTxMeta = await handleBridgeTx({
-      quoteResponse,
-      approvalTxId: approvalTxMeta?.id,
-    });
+    let bridgeTxMeta: TransactionMeta | undefined;
+    try {
+      bridgeTxMeta = await handleBridgeTx({
+        quoteResponse,
+        approvalTxId: approvalTxMeta?.id,
+      });
+    } catch (e) {
+      debugLog('Bridge transaction failed', e);
+      history.push(`${CROSS_CHAIN_SWAP_ROUTE}${PREPARE_SWAP_ROUTE}`);
+      return;
+    }
 
     // Get bridge tx status
     const statusRequest = {
diff --git a/ui/pages/bridge/index.scss b/ui/pages/bridge/index.scss
index e9d6009676f9..3102ece16dab 100644
--- a/ui/pages/bridge/index.scss
+++ b/ui/pages/bridge/index.scss
@@ -3,6 +3,7 @@
 @import 'prepare/index';
 @import 'quotes/index';
 @import 'transaction-details/index';
+@import 'awaiting-signatures/index';
 
 
 .bridge {
diff --git a/ui/pages/bridge/index.test.tsx b/ui/pages/bridge/index.test.tsx
index 81d6b6e2ba45..e5f225108b88 100644
--- a/ui/pages/bridge/index.test.tsx
+++ b/ui/pages/bridge/index.test.tsx
@@ -2,10 +2,15 @@ import React from 'react';
 import configureMockStore from 'redux-mock-store';
 import thunk from 'redux-thunk';
 import nock from 'nock';
+import { MemoryRouter } from 'react-router-dom';
 
 import { setBackgroundConnection } from '../../store/background-connection';
 import { renderWithProvider, MOCKS, CONSTANTS } from '../../../test/jest';
 import { createBridgeMockStore } from '../../../test/jest/mock-store';
+import {
+  CROSS_CHAIN_SWAP_ROUTE,
+  PREPARE_SWAP_ROUTE,
+} from '../../helpers/constants/routes';
 import CrossChainSwap from '.';
 
 const mockResetBridgeState = jest.fn();
@@ -24,6 +29,7 @@ setBackgroundConnection({
   setBridgeFeatureFlags: jest.fn(),
   selectSrcNetwork: jest.fn(),
   resetState: () => mockResetBridgeState(),
+  tokenBalancesStartPolling: jest.fn().mockResolvedValue('pollingToken'),
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
 } as any);
 
@@ -67,11 +73,18 @@ describe('Bridge', () => {
       featureFlagOverrides: {
         extensionConfig: { support: true },
       },
+      metamaskStateOverrides: {
+        useExternalServices: true,
+      },
     });
     const store = configureMockStore(middleware)(swapsMockStore);
 
     const { container, getByText } = renderWithProvider(
-      <CrossChainSwap />,
+      <MemoryRouter
+        initialEntries={[CROSS_CHAIN_SWAP_ROUTE + PREPARE_SWAP_ROUTE]}
+      >
+        <CrossChainSwap />
+      </MemoryRouter>,
       store,
     );
 
diff --git a/ui/pages/bridge/index.tsx b/ui/pages/bridge/index.tsx
index 9eddeffee798..6a1680f9d63c 100644
--- a/ui/pages/bridge/index.tsx
+++ b/ui/pages/bridge/index.tsx
@@ -1,6 +1,6 @@
 import React, { useContext, useEffect } from 'react';
 import { useDispatch, useSelector } from 'react-redux';
-import { Switch, useHistory } from 'react-router-dom';
+import { Route, Switch, useHistory } from 'react-router-dom';
 import { I18nContext } from '../../contexts/i18n';
 import { clearSwapsState } from '../../ducks/swaps/swaps';
 import {
@@ -8,6 +8,7 @@ import {
   SWAPS_MAINTENANCE_ROUTE,
   PREPARE_SWAP_ROUTE,
   CROSS_CHAIN_SWAP_ROUTE,
+  AWAITING_SIGNATURES_ROUTE,
 } from '../../helpers/constants/routes';
 import { resetBackgroundSwapsState } from '../../store/actions';
 import FeatureToggledRoute from '../../helpers/higher-order-components/feature-toggled-route';
@@ -35,6 +36,8 @@ import { useBridgeExchangeRates } from '../../hooks/bridge/useBridgeExchangeRate
 import { useQuoteFetchEvents } from '../../hooks/bridge/useQuoteFetchEvents';
 import PrepareBridgePage from './prepare/prepare-bridge-page';
 import { BridgeCTAButton } from './prepare/bridge-cta-button';
+import AwaitingSignaturesCancelButton from './awaiting-signatures/awaiting-signatures-cancel-button';
+import AwaitingSignatures from './awaiting-signatures/awaiting-signatures';
 
 const CrossChainSwap = () => {
   const t = useContext(I18nContext);
@@ -93,41 +96,51 @@ const CrossChainSwap = () => {
   return (
     <div className="bridge">
       <div className="bridge__container">
-        <Header
-          className="bridge__header"
-          startAccessory={
-            <ButtonIcon
-              iconName={IconName.ArrowLeft}
-              size={ButtonIconSize.Sm}
-              ariaLabel={t('back')}
-              onClick={redirectToDefaultRoute}
-            />
-          }
-          endAccessory={
-            <ButtonIcon
-              iconName={IconName.Setting}
-              size={ButtonIconSize.Sm}
-              ariaLabel={t('settings')}
-            />
-          }
-        >
-          {t('bridge')}
-        </Header>
-        <Content className="bridge__content">
-          <Switch>
-            <FeatureToggledRoute
-              redirectRoute={SWAPS_MAINTENANCE_ROUTE}
-              flag={isBridgeEnabled}
-              path={CROSS_CHAIN_SWAP_ROUTE + PREPARE_SWAP_ROUTE}
-              render={() => {
-                return <PrepareBridgePage />;
-              }}
-            />
-          </Switch>
-        </Content>
-        <Footer>
-          <BridgeCTAButton />
-        </Footer>
+        <Switch>
+          <FeatureToggledRoute
+            redirectRoute={SWAPS_MAINTENANCE_ROUTE}
+            flag={isBridgeEnabled}
+            path={CROSS_CHAIN_SWAP_ROUTE + PREPARE_SWAP_ROUTE}
+          >
+            <>
+              <Header
+                className="bridge__header"
+                startAccessory={
+                  <ButtonIcon
+                    iconName={IconName.ArrowLeft}
+                    size={ButtonIconSize.Sm}
+                    ariaLabel={t('back')}
+                    onClick={redirectToDefaultRoute}
+                  />
+                }
+                endAccessory={
+                  <ButtonIcon
+                    iconName={IconName.Setting}
+                    size={ButtonIconSize.Sm}
+                    ariaLabel={t('settings')}
+                  />
+                }
+              >
+                {t('bridge')}
+              </Header>
+              <Content>
+                <PrepareBridgePage />
+              </Content>
+              <Footer>
+                <BridgeCTAButton />
+              </Footer>
+            </>
+          </FeatureToggledRoute>
+
+          <Route path={CROSS_CHAIN_SWAP_ROUTE + AWAITING_SIGNATURES_ROUTE}>
+            <Content>
+              <AwaitingSignatures />
+            </Content>
+            <Footer>
+              <AwaitingSignaturesCancelButton />
+            </Footer>
+          </Route>
+        </Switch>
       </div>
     </div>
   );

From e9ea5b215a2111cab9879df4a3ec508283833dfb Mon Sep 17 00:00:00 2001
From: Mark Stacey <markjstacey@gmail.com>
Date: Thu, 12 Dec 2024 14:40:13 -0330
Subject: [PATCH 115/175] ci: Only check attributions on release candidates
 (#29043)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## **Description**

The `check-attributions` workflow has been updated to only check on
release candidates, as was initially intended.

[![Open in GitHub
Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/29043?quickstart=1)

## **Related issues**

Fixes #29037

## **Manual testing steps**

We could test this by creating a pretend release candidate, but that
would mess up some of our other metrics/release automation. In this case
it seems easier to test this by merging it, there are no significant
negative consequences if it doesn't work as intended.

## **Screenshots/Recordings**

N/A

## **Pre-merge author checklist**

- [x] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension Coding
Standards](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/CODING_GUIDELINES.md).
- [x] I've completed the PR template to the best of my ability
- [x] I’ve included tests if applicable
- [x] I’ve documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [x] I’ve applied the right labels on the PR (see [labeling
guidelines](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.

## **Pre-merge reviewer checklist**

- [ ] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed).
- [ ] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.
---
 .github/workflows/check-attributions.yml | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/.github/workflows/check-attributions.yml b/.github/workflows/check-attributions.yml
index 4880cc65ebe8..cadaf0d1141b 100644
--- a/.github/workflows/check-attributions.yml
+++ b/.github/workflows/check-attributions.yml
@@ -3,13 +3,6 @@ name: Check Attributions
 on:
   push:
     branches: Version-v*
-  pull_request:
-    branches: Version-v*
-    types:
-      - opened
-      - reopened
-      - synchronize
-      - ready_for_review
 
 jobs:
   check-attributions:

From b08388ae40ebf103e0ac163dd420618ee0522317 Mon Sep 17 00:00:00 2001
From: infiniteflower <139582705+infiniteflower@users.noreply.github.com>
Date: Thu, 12 Dec 2024 13:32:20 -0500
Subject: [PATCH 116/175] =?UTF-8?q?chore:=20disable=20button=20while=20sub?=
 =?UTF-8?q?miting,=20use=20finally=20set=20submitting=20to=20=E2=80=A6=20(?=
 =?UTF-8?q?#29149)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

…false


<!--
Please submit this PR as a draft initially.
Do not mark it as "Ready for review" until the template has been
completely filled out, and PR status checks have passed at least once.
-->

## **Description**

<!--
Write a short description of the changes included in this pull request,
also include relevant motivation and context. Have in mind the following
questions:
1. What is the reason for the change?
2. What is the improvement/solution?
-->

[![Open in GitHub
Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/29149?quickstart=1)

This PR handles some additional comments from
https://github.com/MetaMask/metamask-extension/pull/29109

## **Related issues**

Fixes:

## **Manual testing steps**

1. Go to this page...
2.
3.

## **Screenshots/Recordings**

<!-- If applicable, add screenshots and/or recordings to visualize the
before and after of your change. -->

### **Before**

<!-- [screenshots/recordings] -->

### **After**

<!-- [screenshots/recordings] -->

## **Pre-merge author checklist**

- [x] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension Coding
Standards](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/CODING_GUIDELINES.md).
- [x] I've completed the PR template to the best of my ability
- [ ] I’ve included tests if applicable
- [ ] I’ve documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [x] I’ve applied the right labels on the PR (see [labeling
guidelines](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.

## **Pre-merge reviewer checklist**

- [ ] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed).
- [ ] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.
---
 ui/pages/bridge/prepare/bridge-cta-button.tsx | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ui/pages/bridge/prepare/bridge-cta-button.tsx b/ui/pages/bridge/prepare/bridge-cta-button.tsx
index 931b6cb4e8ea..dd76ed2a7466 100644
--- a/ui/pages/bridge/prepare/bridge-cta-button.tsx
+++ b/ui/pages/bridge/prepare/bridge-cta-button.tsx
@@ -110,7 +110,7 @@ export const BridgeCTAButton = () => {
       onClick={() => {
         if (activeQuote && isTxSubmittable) {
           try {
-            // We don't need to worry about setting to true if the tx submission succeeds
+            // We don't need to worry about setting to false if the tx submission succeeds
             // because we route immediately to Activity list page
             setIsSubmitting(true);
 
@@ -126,13 +126,13 @@ export const BridgeCTAButton = () => {
                 },
               });
             submitBridgeTransaction(activeQuote);
-          } catch (error) {
+          } finally {
             setIsSubmitting(false);
           }
         }
       }}
       loading={isSubmitting}
-      disabled={!isTxSubmittable || isQuoteExpired}
+      disabled={!isTxSubmittable || isQuoteExpired || isSubmitting}
     >
       {label}
     </Button>

From fc054820318db24a334cd1614307e6db14bff8bf Mon Sep 17 00:00:00 2001
From: infiniteflower <139582705+infiniteflower@users.noreply.github.com>
Date: Thu, 12 Dec 2024 13:51:04 -0500
Subject: [PATCH 117/175] fix: show only 6 decimals max to reduce text cutoff
 in activity item (#29153)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<!--
Please submit this PR as a draft initially.
Do not mark it as "Ready for review" until the template has been
completely filled out, and PR status checks have passed at least once.
-->

## **Description**

<!--
Write a short description of the changes included in this pull request,
also include relevant motivation and context. Have in mind the following
questions:
1. What is the reason for the change?
2. What is the improvement/solution?
-->

[![Open in GitHub
Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/29153?quickstart=1)

This PR shortens Bridge txs amount sent so it's not cutoff as often.

## **Related issues**

Fixes:

## **Manual testing steps**

1. Submit a bridge of over 6 decimal places, eg 0.0012345678
2. Go to Activity page
3. Observe that bridge amount should be 0.001235

## **Screenshots/Recordings**

<!-- If applicable, add screenshots and/or recordings to visualize the
before and after of your change. -->

### **Before**

<!-- [screenshots/recordings] -->

### **After**

<!-- [screenshots/recordings] -->

![Screenshot 2024-12-12 at 12 53
31 PM](https://github.com/user-attachments/assets/9744080c-f784-4902-a165-b67b5317d3e2)


## **Pre-merge author checklist**

- [x] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension Coding
Standards](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/CODING_GUIDELINES.md).
- [x] I've completed the PR template to the best of my ability
- [ ] I’ve included tests if applicable
- [ ] I’ve documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [x] I’ve applied the right labels on the PR (see [labeling
guidelines](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.

## **Pre-merge reviewer checklist**

- [ ] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed).
- [ ] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.
---
 ui/hooks/useTransactionDisplayData.js | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/ui/hooks/useTransactionDisplayData.js b/ui/hooks/useTransactionDisplayData.js
index e29b52edad88..d5294b8d41d4 100644
--- a/ui/hooks/useTransactionDisplayData.js
+++ b/ui/hooks/useTransactionDisplayData.js
@@ -4,6 +4,7 @@ import {
   TransactionStatus,
   TransactionType,
 } from '@metamask/transaction-controller';
+import BigNumber from 'bignumber.js';
 import {
   getDetectedTokensInCurrentNetwork,
   getKnownMethodData,
@@ -37,6 +38,8 @@ import { isEqualCaseInsensitive } from '../../shared/modules/string-utils';
 import { getTokenValueParam } from '../../shared/lib/metamask-controller-utils';
 import { selectBridgeHistoryForAccount } from '../ducks/bridge-status/selectors';
 import { useBridgeTokenDisplayData } from '../pages/bridge/hooks/useBridgeTokenDisplayData';
+import { formatAmount } from '../pages/confirmations/components/simulation-details/formatAmount';
+import { getIntlLocale } from '../ducks/locale/locale';
 import { useI18nContext } from './useI18nContext';
 import { useTokenFiatAmount } from './useTokenFiatAmount';
 import { useUserPreferencedCurrency } from './useUserPreferencedCurrency';
@@ -103,6 +106,7 @@ export function useTransactionDisplayData(transactionGroup) {
   // To determine which primary currency to display for swaps transactions we need to be aware
   // of which asset, if any, we are viewing at present
   const dispatch = useDispatch();
+  const locale = useSelector(getIntlLocale);
   const currentAsset = useCurrentAsset();
   const knownTokens = useSelector(getTokens);
   const knownNfts = useSelector(getNfts);
@@ -387,7 +391,10 @@ export function useTransactionDisplayData(transactionGroup) {
     title = t('bridgeToChain', [destChainName || '']);
     category = bridgeTokenDisplayData.category;
     primarySuffix = bridgeTokenDisplayData.sourceTokenSymbol;
-    primaryDisplayValue = bridgeTokenDisplayData.sourceTokenAmountSent;
+    primaryDisplayValue = formatAmount(
+      locale,
+      new BigNumber(bridgeTokenDisplayData.sourceTokenAmountSent),
+    );
     secondaryDisplayValue = bridgeTokenDisplayData.displayCurrencyAmount;
   } else {
     dispatch(

From 06cf7459b963e26d0ae60312d4f9a342d07ab89d Mon Sep 17 00:00:00 2001
From: Bryan Fullam <bryan.fullam@consensys.net>
Date: Fri, 13 Dec 2024 02:00:16 +0700
Subject: [PATCH 118/175] feat: routing for failed transactions (#29158)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<!--
Please submit this PR as a draft initially.
Do not mark it as "Ready for review" until the template has been
completely filled out, and PR status checks have passed at least once.
-->

## **Description**

When a user has a transaction error, they should be routed correctly
based on the type of user they are and the type of error they have
encountered.

Hardware wallet user:
1. Decline either approval or bridge tx -> back to bridge page with
previous inputs restored
2. Tx fails for any other reason -> to activity tab, so they can see
status of bridge operation

Standard MM user:
1. Tx fails for any reason -> to activity tab, so they can see status of
bridge operation

<!--
Write a short description of the changes included in this pull request,
also include relevant motivation and context. Have in mind the following
questions:
1. What is the reason for the change?
3. What is the improvement/solution?
-->

[![Open in GitHub
Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/29158?quickstart=1)

## **Related issues**

Fixes:

## **Manual testing steps**

1. Go to bridge while using hardware wallet
2. Approve quote to start bridge
4. Deny tx on hardware wallet
5. Get rerouted back to bridge page with previous inputs restored

## **Screenshots/Recordings**

<!-- If applicable, add screenshots and/or recordings to visualize the
before and after of your change. -->

### **Before**

<!-- [screenshots/recordings] -->

### **After**

<!-- [screenshots/recordings] -->

## **Pre-merge author checklist**

- [x] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension Coding
Standards](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/CODING_GUIDELINES.md).
- [x] I've completed the PR template to the best of my ability
- [x] I’ve included tests if applicable
- [x] I’ve documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [x] I’ve applied the right labels on the PR (see [labeling
guidelines](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.

## **Pre-merge reviewer checklist**

- [ ] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed).
- [ ] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.

---------

Co-authored-by: IF <139582705+infiniteflower@users.noreply.github.com>
---
 .../hooks/useSubmitBridgeTransaction.ts       | 34 +++++++++++++++++--
 1 file changed, 32 insertions(+), 2 deletions(-)

diff --git a/ui/pages/bridge/hooks/useSubmitBridgeTransaction.ts b/ui/pages/bridge/hooks/useSubmitBridgeTransaction.ts
index b3f4c9535a9e..d9fe8de64385 100644
--- a/ui/pages/bridge/hooks/useSubmitBridgeTransaction.ts
+++ b/ui/pages/bridge/hooks/useSubmitBridgeTransaction.ts
@@ -23,6 +23,26 @@ import useHandleBridgeTx from './useHandleBridgeTx';
 const debugLog = createProjectLogger('bridge');
 const LINEA_DELAY_MS = 5000;
 
+const isHardwareWalletUserRejection = (error: unknown): boolean => {
+  const errorMessage = (error as Error).message?.toLowerCase() ?? '';
+  return (
+    // Ledger rejection
+    (errorMessage.includes('ledger') &&
+      (errorMessage.includes('rejected') ||
+        errorMessage.includes('denied') ||
+        errorMessage.includes('error while signing'))) ||
+    // Trezor rejection
+    (errorMessage.includes('trezor') &&
+      (errorMessage.includes('cancelled') ||
+        errorMessage.includes('rejected'))) ||
+    // Lattice rejection
+    (errorMessage.includes('lattice') && errorMessage.includes('rejected')) ||
+    // Generic hardware wallet rejections
+    errorMessage.includes('user rejected') ||
+    errorMessage.includes('user cancelled')
+  );
+};
+
 export default function useSubmitBridgeTransaction() {
   const history = useHistory();
   const dispatch = useDispatch();
@@ -52,7 +72,12 @@ export default function useSubmitBridgeTransaction() {
       }
     } catch (e) {
       debugLog('Approve transaction failed', e);
-      history.push(`${CROSS_CHAIN_SWAP_ROUTE}${PREPARE_SWAP_ROUTE}`);
+      if (hardwareWalletUsed && isHardwareWalletUserRejection(e)) {
+        history.push(`${CROSS_CHAIN_SWAP_ROUTE}${PREPARE_SWAP_ROUTE}`);
+      } else {
+        await dispatch(setDefaultHomeActiveTabName('activity'));
+        history.push(DEFAULT_ROUTE);
+      }
       return;
     }
 
@@ -82,7 +107,12 @@ export default function useSubmitBridgeTransaction() {
       });
     } catch (e) {
       debugLog('Bridge transaction failed', e);
-      history.push(`${CROSS_CHAIN_SWAP_ROUTE}${PREPARE_SWAP_ROUTE}`);
+      if (hardwareWalletUsed && isHardwareWalletUserRejection(e)) {
+        history.push(`${CROSS_CHAIN_SWAP_ROUTE}${PREPARE_SWAP_ROUTE}`);
+      } else {
+        await dispatch(setDefaultHomeActiveTabName('activity'));
+        history.push(DEFAULT_ROUTE);
+      }
       return;
     }
 

From ea75bf82115b7eaf3eb8fd929633e659f43e249b Mon Sep 17 00:00:00 2001
From: George Marshall <george.marshall@consensys.net>
Date: Thu, 12 Dec 2024 13:10:50 -0800
Subject: [PATCH 119/175] feat: add background-muted color to design system
 (#29117)

## Description

This PR adds support for the new `background-muted` color introduced in
@metamask/design-tokens v4.2.0.

## Related issues

Fixes: N/A

## Manual testing steps

1. Open Storybook
2. Navigate to Box component stories
3. Verify new background-muted color appears in BackgroundColor story
4. Verify color applies correctly when selected

## Screenshots/Recordings

### Before


https://github.com/user-attachments/assets/c79a8669-0609-49dc-9759-ee19f9a80a83

### After



https://github.com/user-attachments/assets/35f685ce-b240-437d-9d60-35037704d340



## Pre-merge author checklist

- [x] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension Coding
Standards](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/CODING_GUIDELINES.md)
- [x] I've completed the PR template to the best of my ability
- [x] I've included tests if applicable
- [x] I've documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [x] I've applied the right labels on the PR

## Pre-merge reviewer checklist

- [ ] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed)
- [ ] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots
---
 ui/components/component-library/box/box.stories.tsx | 5 +++++
 ui/css/design-system/_colors.scss                   | 1 +
 ui/helpers/constants/design-system.ts               | 2 ++
 3 files changed, 8 insertions(+)

diff --git a/ui/components/component-library/box/box.stories.tsx b/ui/components/component-library/box/box.stories.tsx
index 0ed75eac3f36..8da07a5daada 100644
--- a/ui/components/component-library/box/box.stories.tsx
+++ b/ui/components/component-library/box/box.stories.tsx
@@ -390,6 +390,11 @@ export const BackgroundColorStory = () => {
           BackgroundColor.backgroundAlternative
         </Text>
       </Box>
+      <Box padding={3} backgroundColor={BackgroundColor.backgroundMuted}>
+        <Text color={TextColor.textDefault}>
+          BackgroundColor.backgroundMuted
+        </Text>
+      </Box>
       <Box padding={3} backgroundColor={BackgroundColor.overlayDefault}>
         <Text color={TextColor.overlayInverse}>
           BackgroundColor.overlayDefault
diff --git a/ui/css/design-system/_colors.scss b/ui/css/design-system/_colors.scss
index 2d948b928012..da6553fd9087 100644
--- a/ui/css/design-system/_colors.scss
+++ b/ui/css/design-system/_colors.scss
@@ -1,6 +1,7 @@
 $color-map: (
   'background-default': --color-background-default,
   'background-alternative': --color-background-alternative,
+  'background-muted': --color-background-muted,
   'background-hover': --color-background-hover,
   'background-pressed': --color-background-pressed,
   'text-default': --color-text-default,
diff --git a/ui/helpers/constants/design-system.ts b/ui/helpers/constants/design-system.ts
index 8374e812b017..a1c55925e760 100644
--- a/ui/helpers/constants/design-system.ts
+++ b/ui/helpers/constants/design-system.ts
@@ -8,6 +8,7 @@
 export enum Color {
   backgroundDefault = 'background-default',
   backgroundAlternative = 'background-alternative',
+  backgroundMuted = 'background-muted',
   textDefault = 'text-default',
   textAlternative = 'text-alternative',
   textMuted = 'text-muted',
@@ -54,6 +55,7 @@ export enum Color {
 export enum BackgroundColor {
   backgroundDefault = 'background-default',
   backgroundAlternative = 'background-alternative',
+  backgroundMuted = 'background-muted',
   backgroundHover = 'background-hover',
   backgroundPressed = 'background-pressed',
   overlayDefault = 'overlay-default',

From 1ea15697c372205567a9d657d239540120e9e9a1 Mon Sep 17 00:00:00 2001
From: George Marshall <george.marshall@consensys.net>
Date: Thu, 12 Dec 2024 13:15:41 -0800
Subject: [PATCH 120/175] feat: Adding Skeleton component to component-library
 (#29082)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Replacement of https://github.com/MetaMask/metamask-extension/pull/22278

## **Description**
Initial draft of the `Skeleton` component to review with the
@MetaMask/design-system-engineers based on the findings in the [audit
and component discovery
sync](https://www.figma.com/file/bA81b0VvoGRgNS4E6059Pa/Loaders%2FSkeleton-Audit-and-Insight-Report?type=whiteboard&node-id=117%3A26&t=AnzMgSbVjzePPMmA-1)

## **Related issues**

Fixes: #20874

## **Manual testing steps**

1. Go to the latest storybook build on this PR
2. Search `Skeleton`
3. Check the docs, stories and controls

## **Screenshots/Recordings**

### **Before**

N/A

### **After**



https://github.com/user-attachments/assets/19e46ae0-d0ae-440a-9da4-99b037b6686b

Colors have been adjusted see [this
comment](https://github.com/MetaMask/metamask-extension/pull/29082/files#r1882837341)

## **Pre-merge author checklist**

- [x] I’ve followed [MetaMask Coding
Standards](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/CODING_GUIDELINES.md).
- [x] I've clearly explained what problem this PR is solving and how it
is solved.
- [x] I've linked related issues
- [x] I've included manual testing steps
- [x] I've included screenshots/recordings if applicable
- [x] I’ve included tests if applicable
- [x] I’ve documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [x] I’ve applied the right labels on the PR (see [labeling
guidelines](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.
- [x] I’ve properly set the pull request status:
  - [x] In case it's not yet "ready for review", I've set it to "draft".
- [x] In case it's "ready for review", I've changed it from "draft" to
"non-draft".

## **Pre-merge reviewer checklist**

- [ ] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed).
- [ ] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.
---
 .../component-library-components.scss         |   1 +
 .../component-library/skeleton/README.mdx     |  94 ++++++++++++
 .../__snapshots__/skeleton.test.tsx.snap      |   9 ++
 .../component-library/skeleton/index.ts       |   6 +
 .../component-library/skeleton/skeleton.scss  |  22 +++
 .../skeleton/skeleton.stories.tsx             | 134 ++++++++++++++++++
 .../skeleton/skeleton.test.tsx                |  22 +++
 .../component-library/skeleton/skeleton.tsx   |  44 ++++++
 .../skeleton/skeleton.types.ts                |  35 +++++
 ui/helpers/constants/design-system.ts         |   3 +
 10 files changed, 370 insertions(+)
 create mode 100644 ui/components/component-library/skeleton/README.mdx
 create mode 100644 ui/components/component-library/skeleton/__snapshots__/skeleton.test.tsx.snap
 create mode 100644 ui/components/component-library/skeleton/index.ts
 create mode 100644 ui/components/component-library/skeleton/skeleton.scss
 create mode 100644 ui/components/component-library/skeleton/skeleton.stories.tsx
 create mode 100644 ui/components/component-library/skeleton/skeleton.test.tsx
 create mode 100644 ui/components/component-library/skeleton/skeleton.tsx
 create mode 100644 ui/components/component-library/skeleton/skeleton.types.ts

diff --git a/ui/components/component-library/component-library-components.scss b/ui/components/component-library/component-library-components.scss
index ad170fd5e495..518bccab53ac 100644
--- a/ui/components/component-library/component-library-components.scss
+++ b/ui/components/component-library/component-library-components.scss
@@ -25,6 +25,7 @@
 @import 'button-secondary/button-secondary';
 @import 'checkbox/checkbox';
 @import 'input/input';
+@import 'skeleton/skeleton';
 // Molecules
 @import 'picker-network/picker-network';
 @import 'tag-url/tag-url';
diff --git a/ui/components/component-library/skeleton/README.mdx b/ui/components/component-library/skeleton/README.mdx
new file mode 100644
index 000000000000..16d1fa06d8af
--- /dev/null
+++ b/ui/components/component-library/skeleton/README.mdx
@@ -0,0 +1,94 @@
+import { Controls, Canvas } from '@storybook/blocks';
+
+import * as SkeletonStories from './skeleton.stories';
+
+# Skeleton
+
+`Skeleton` is a placeholder component that is used while the content is loading.
+
+<Canvas of={SkeletonStories.DefaultStory} />
+
+## Props
+
+<Controls of={SkeletonStories.DefaultStory} />
+
+### Width Height
+
+Use the `width` and `height` props to specify the width and height of the `Skeleton` component. It accepts both numbers and strings.
+
+<Canvas of={SkeletonStories.WidthHeight} />
+
+```jsx
+import { Skeleton } from '../../component-library';
+
+<Skeleton height={32} width={300} />
+<Skeleton height={16} width={250} />
+<Skeleton height={16} width={250} />
+```
+
+### Children
+
+Use the `children` prop to pass the `Skeleton` children.
+
+This is useful to create a `Skeleton` component that has a similar layout to the content that will be loaded.
+
+<Canvas of={SkeletonStories.Children} />
+
+```jsx
+import {
+  Display,
+  FlexDirection,
+  BackgroundColor,
+  BorderRadius,
+} from '../../../helpers/constants/design-system';
+import { Skeleton } from '../../component-library';
+
+<Skeleton
+  display={Display.Flex}
+  flexDirection={FlexDirection.Column}
+  gap={4}
+  backgroundColor={BackgroundColor.backgroundAlternative}
+  borderRadius={BorderRadius.LG}
+  padding={4}
+>
+  <Skeleton height={32} width="100%" />
+  <Skeleton height={16} width="95%" />
+  <Skeleton height={16} width="95%" />
+</Skeleton>;
+```
+
+### Hide Children
+
+Use the `hideChildren` prop to hide the `children` of the `Skeleton` component. This is useful to make sure the `Skeleton` component is the same size as the content that will be loaded.
+
+<Canvas of={SkeletonStories.HideChildren} />
+
+```jsx
+import { Skeleton, Text, TextVariant } from '../../component-library';
+
+isLoaded ? (
+  <Text variant={TextVariant.headingMd}>Content to load</Text>
+) : (
+  <Skeleton width="max-content" hideChildren={true}>
+    <Text variant={TextVariant.headingMd}>Hidden placeholder text</Text>
+  </Skeleton>
+);
+```
+
+### Border Radius
+
+Use the `borderRadius` prop and `BorderRadius` enum to specify the border radius of the `Skeleton` component.
+
+<Canvas of={SkeletonStories.BorderRadiusStory} />
+
+```jsx
+import { BorderRadius } from '../../../helpers/constants/design-system'
+import { Skeleton } from '../../component-library';
+
+<Skeleton borderRadius={BorderRadius.full} height={32} width={32} />
+<Skeleton borderRadius={BorderRadius.pill} height={32} width="100%" />
+<Skeleton borderRadius={BorderRadius.LG} height={32} width="100%" />
+<Skeleton borderRadius={BorderRadius.MD} height={32} width="100%" />
+<Skeleton borderRadius={BorderRadius.SM} height={32} width="100%" />
+<Skeleton borderRadius={BorderRadius.XS} height={32} width="100%" />
+```
diff --git a/ui/components/component-library/skeleton/__snapshots__/skeleton.test.tsx.snap b/ui/components/component-library/skeleton/__snapshots__/skeleton.test.tsx.snap
new file mode 100644
index 000000000000..b5f8168574a4
--- /dev/null
+++ b/ui/components/component-library/skeleton/__snapshots__/skeleton.test.tsx.snap
@@ -0,0 +1,9 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`Skeleton should match snapshot 1`] = `
+<div>
+  <div
+    class="mm-box mm-skeleton mm-box--background-color-icon-alternative mm-box--rounded-sm"
+  />
+</div>
+`;
diff --git a/ui/components/component-library/skeleton/index.ts b/ui/components/component-library/skeleton/index.ts
new file mode 100644
index 000000000000..695c64a99564
--- /dev/null
+++ b/ui/components/component-library/skeleton/index.ts
@@ -0,0 +1,6 @@
+export { Skeleton } from './skeleton';
+export type {
+  SkeletonProps,
+  SkeletonComponent,
+  SkeletonStyleUtilityProps,
+} from './skeleton.types';
diff --git a/ui/components/component-library/skeleton/skeleton.scss b/ui/components/component-library/skeleton/skeleton.scss
new file mode 100644
index 000000000000..598ac4b7bf8b
--- /dev/null
+++ b/ui/components/component-library/skeleton/skeleton.scss
@@ -0,0 +1,22 @@
+.mm-skeleton {
+  @keyframes skeleton-pulse {
+    0%,
+    100% {
+      opacity: 0.2;
+    }
+
+    50% {
+      opacity: 0.1;
+    }
+  }
+
+  animation: skeleton-pulse 1400ms cubic-bezier(0, 0, 1, 1) infinite;
+  background-clip: padding-box;
+  cursor: default;
+  pointer-events: none;
+  user-select: none;
+
+  &--hide-children * {
+    visibility: hidden;
+  }
+}
diff --git a/ui/components/component-library/skeleton/skeleton.stories.tsx b/ui/components/component-library/skeleton/skeleton.stories.tsx
new file mode 100644
index 000000000000..874c675e725b
--- /dev/null
+++ b/ui/components/component-library/skeleton/skeleton.stories.tsx
@@ -0,0 +1,134 @@
+import React from 'react';
+import type { Meta, StoryObj } from '@storybook/react';
+import {
+  BackgroundColor,
+  BlockSize,
+  Display,
+  FlexDirection,
+  BorderRadius,
+  TextVariant,
+  AlignItems,
+} from '../../../helpers/constants/design-system';
+import { Box, Button, ButtonVariant, Text } from '..';
+import README from './README.mdx';
+import { Skeleton } from './skeleton';
+
+const meta: Meta<typeof Skeleton> = {
+  title: 'Components/ComponentLibrary/Skeleton',
+  component: Skeleton,
+  parameters: {
+    docs: {
+      page: README,
+    },
+  },
+  argTypes: {
+    className: {
+      control: 'text',
+    },
+  },
+  args: {
+    className: '',
+  },
+};
+
+export default meta;
+type Story = StoryObj<typeof Skeleton>;
+
+export const DefaultStory: Story = {
+  args: {
+    height: 32,
+    width: 300,
+  },
+};
+
+DefaultStory.storyName = 'Default';
+
+export const WidthHeight: Story = {
+  render: () => (
+    <Box display={Display.Flex} flexDirection={FlexDirection.Column} gap={4}>
+      <Skeleton height={32} width={300} />
+      <Skeleton height={16} width={250} />
+      <Skeleton height={16} width={250} />
+    </Box>
+  ),
+};
+
+export const Children: Story = {
+  render: () => (
+    <Skeleton
+      display={Display.Flex}
+      flexDirection={FlexDirection.Column}
+      gap={4}
+      backgroundColor={BackgroundColor.backgroundAlternative}
+      borderRadius={BorderRadius.LG}
+      padding={4}
+    >
+      <Skeleton height={32} width="100%" />
+      <Skeleton height={16} width="95%" />
+      <Skeleton height={16} width="95%" />
+    </Skeleton>
+  ),
+};
+
+export const HideChildren: Story = {
+  args: {
+    width: 'max-content',
+    hideChildren: true,
+  },
+  render: (args) => {
+    const [isLoaded, setIsLoaded] = React.useState(false);
+    return (
+      <Box>
+        <Button
+          onClick={() => setIsLoaded(!isLoaded)}
+          variant={ButtonVariant.Secondary}
+          marginBottom={4}
+        >
+          Toggle isLoading
+        </Button>
+        {isLoaded ? (
+          <div>
+            <Text variant={TextVariant.headingMd}>Content to load</Text>
+          </div>
+        ) : (
+          <Skeleton {...args}>
+            <Text variant={TextVariant.headingMd}>Hidden placeholder text</Text>
+          </Skeleton>
+        )}
+      </Box>
+    );
+  },
+};
+
+export const BorderRadiusStory: Story = {
+  render: () => (
+    <Box display={Display.Flex} flexDirection={FlexDirection.Column} gap={4}>
+      <Box display={Display.Flex} alignItems={AlignItems.center} gap={4}>
+        <Text>BorderRadius.full</Text>
+        <Skeleton borderRadius={BorderRadius.full} height={32} width={32} />
+      </Box>
+      <Box display={Display.Flex} alignItems={AlignItems.center} gap={4}>
+        <Text>BorderRadius.full</Text>
+        <Skeleton borderRadius={BorderRadius.pill} height={32} width="100%" />
+      </Box>
+      <Box display={Display.Flex} alignItems={AlignItems.center} gap={4}>
+        <Text>BorderRadius.LG</Text>
+        <Skeleton borderRadius={BorderRadius.LG} height={32} width="100%" />
+      </Box>
+      <Box display={Display.Flex} alignItems={AlignItems.center} gap={4}>
+        <Text>BorderRadius.MD</Text>
+        <Skeleton borderRadius={BorderRadius.MD} height={32} width="100%" />
+      </Box>
+      <Box display={Display.Flex} alignItems={AlignItems.center} gap={4}>
+        <Text>BorderRadius.SM</Text>
+        <Skeleton borderRadius={BorderRadius.SM} height={32} width="100%" />
+      </Box>
+      <Box display={Display.Flex} alignItems={AlignItems.center} gap={4}>
+        <Text>BorderRadius.XS</Text>
+        <Skeleton borderRadius={BorderRadius.XS} height={32} width="100%" />
+      </Box>
+    </Box>
+  ),
+};
+
+BorderRadiusStory.storyName = 'BorderRadius';
diff --git a/ui/components/component-library/skeleton/skeleton.test.tsx b/ui/components/component-library/skeleton/skeleton.test.tsx
new file mode 100644
index 000000000000..ec0b4c1746c7
--- /dev/null
+++ b/ui/components/component-library/skeleton/skeleton.test.tsx
@@ -0,0 +1,22 @@
+import React from 'react';
+import { render } from '@testing-library/react';
+
+import { Skeleton } from './skeleton';
+
+describe('Skeleton', () => {
+  it('should render Skeleton without error', () => {
+    const { getByTestId } = render(<Skeleton data-testid="skeleton" />);
+    expect(getByTestId('skeleton')).toBeDefined();
+    expect(getByTestId('skeleton')).toHaveClass('mm-skeleton');
+  });
+  it('should match snapshot', () => {
+    const { container } = render(<Skeleton />);
+    expect(container).toMatchSnapshot();
+  });
+  it('should render with and additional className', () => {
+    const { getByTestId } = render(
+      <Skeleton data-testid="skeleton" className="test-class" />,
+    );
+    expect(getByTestId('skeleton')).toHaveClass('test-class');
+  });
+});
diff --git a/ui/components/component-library/skeleton/skeleton.tsx b/ui/components/component-library/skeleton/skeleton.tsx
new file mode 100644
index 000000000000..760083a0c4ca
--- /dev/null
+++ b/ui/components/component-library/skeleton/skeleton.tsx
@@ -0,0 +1,44 @@
+import React from 'react';
+import classnames from 'classnames';
+
+import {
+  BackgroundColor,
+  BorderRadius,
+} from '../../../helpers/constants/design-system';
+import { Box } from '..';
+import type { PolymorphicRef, BoxProps } from '../box';
+
+import { SkeletonProps, SkeletonComponent } from './skeleton.types';
+
+export const Skeleton: SkeletonComponent = React.forwardRef(
+  <C extends React.ElementType = 'div'>(
+    {
+      className = '',
+      height,
+      width,
+      children,
+      hideChildren,
+      ...props
+    }: SkeletonProps<C>,
+    ref?: PolymorphicRef<C>,
+  ) => (
+    <Box
+      className={classnames(
+        'mm-skeleton',
+        {
+          'mm-skeleton--hide-children': hideChildren,
+        },
+        className,
+      )}
+      backgroundColor={BackgroundColor.iconAlternative}
+      borderRadius={BorderRadius.SM}
+      ref={ref}
+      {...(props as BoxProps<C>)}
+      style={{ ...props?.style, height, width }}
+    >
+      {children}
+    </Box>
+  ),
+);
+
+export default Skeleton;
diff --git a/ui/components/component-library/skeleton/skeleton.types.ts b/ui/components/component-library/skeleton/skeleton.types.ts
new file mode 100644
index 000000000000..6c3ad5be4ea2
--- /dev/null
+++ b/ui/components/component-library/skeleton/skeleton.types.ts
@@ -0,0 +1,35 @@
+import React from 'react';
+
+import type {
+  StyleUtilityProps,
+  PolymorphicComponentPropWithRef,
+} from '../box';
+
+export type SkeletonStyleUtilityProps = Omit<
+  StyleUtilityProps,
+  'height' | 'width'
+> & {
+  /**
+   * Additional className to add to the Skeleton
+   */
+  className?: string;
+  /**
+   * The height of the Skeleton
+   */
+  height?: number | string;
+  /**
+   * The width of the Skeleton
+   */
+  width?: number | string;
+  /**
+   * The children of the Skeleton
+   */
+  children?: React.ReactNode;
+};
+
+export type SkeletonProps<C extends React.ElementType> =
+  PolymorphicComponentPropWithRef<C, SkeletonStyleUtilityProps>;
+
+export type SkeletonComponent = <C extends React.ElementType = 'span'>(
+  props: SkeletonProps<C>,
+) => React.ReactElement | null;
diff --git a/ui/helpers/constants/design-system.ts b/ui/helpers/constants/design-system.ts
index a1c55925e760..762aa517af2c 100644
--- a/ui/helpers/constants/design-system.ts
+++ b/ui/helpers/constants/design-system.ts
@@ -58,6 +58,9 @@ export enum BackgroundColor {
   backgroundMuted = 'background-muted',
   backgroundHover = 'background-hover',
   backgroundPressed = 'background-pressed',
+  iconDefault = 'icon-default',
+  iconAlternative = 'icon-alternative',
+  iconMuted = 'icon-muted',
   overlayDefault = 'overlay-default',
   overlayAlternative = 'overlay-alternative',
   primaryDefault = 'primary-default',

From 16d169309c13ff3901c65fcfd78677ad9b7682ac Mon Sep 17 00:00:00 2001
From: AugmentedMode <31675118+AugmentedMode@users.noreply.github.com>
Date: Thu, 12 Dec 2024 16:16:37 -0500
Subject: [PATCH 121/175] feat: add websocket support for c2 detection (#29150)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<!--
Please submit this PR as a draft initially.
Do not mark it as "Ready for review" until the template has been
completely filled out, and PR status checks have passed at least once.
-->

## **Description**


This pull request adds WebSocket support to the MetaMask extension's
phishing detection functionality. Scammers have started using WebSocket
connections for command-and-control (C2) operations to bypass
traditional HTTP-based phishing detection. This PR allows the extension
to intercept and block WebSocket handshake requests (`ws://` and
`wss://`) in addition to HTTP/HTTPS requests.

The key changes include:
1. Adding WebSocket schemes (`ws://*/*` and `wss://*/*`) to the `urls`
filter in `background.js`.
2. Updating the `manifest.json` to include WebSocket permissions in the
`host_permissions` field.

This ensures that malicious WebSocket connections can be detected and
blocked.


<!--
Write a short description of the changes included in this pull request,
also include relevant motivation and context. Have in mind the following
questions:
1. What is the reason for the change?
2. What is the improvement/solution?
-->

[![Open in GitHub
Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/28782?quickstart=1)

## **Related issues**

Fixes: https://github.com/MetaMask/MetaMask-planning/issues/3788

## **Manual testing steps**

1. Navigate to `example.com`
2. Initiate a WebSocket connection to a known safe domain (e.g.,
`wss://example.com`) and verify it works as expected by going to the
`console` via right clicking and hitting inspect. Then type into the
console `new WebSocket("https://example.com/")`
3. Attempt a WebSocket connection to a domain flagged as phishing, and
verify the connection is blocked and appropriate warnings are displayed
by going to the `console` via right clicking and hitting inspect. Then
type into the console `new WebSocket("https://walietconnectapi.com/")`


## **Screenshots/Recordings**

<!-- If applicable, add screenshots and/or recordings to visualize the
before and after of your change. -->

### **Before**

No support for detecting WebSocket phishing connections.

---

### **After**

WebSocket phishing connections are detected and blocked during the
handshake phase.


<!-- [screenshots/recordings] -->

## **Pre-merge author checklist**

- [x] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension Coding
Standards](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/CODING_GUIDELINES.md).
- [x] I've completed the PR template to the best of my ability
- [x] I’ve included tests if applicable
- [x] I’ve documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [x] I’ve applied the right labels on the PR (see [labeling
guidelines](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.

## **Pre-merge reviewer checklist**

- [ ] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed).
- [ ] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.

---------

Co-authored-by: Mark Stacey <markjstacey@gmail.com>
---
 app/manifest/v2/_base.json                    |  2 +
 app/manifest/v3/_base.json                    |  4 +-
 app/scripts/background.js                     | 17 ++--
 privacy-snapshot.json                         |  3 +-
 test/e2e/helpers.js                           | 39 ++++++++++
 test/e2e/tests/phishing-controller/mocks.js   | 19 +++--
 .../phishing-detection.spec.js                | 77 ++++++++++++++++++-
 7 files changed, 138 insertions(+), 23 deletions(-)

diff --git a/app/manifest/v2/_base.json b/app/manifest/v2/_base.json
index f29b7458a9e5..2f41a7e987fa 100644
--- a/app/manifest/v2/_base.json
+++ b/app/manifest/v2/_base.json
@@ -66,6 +66,8 @@
     "clipboardWrite",
     "http://*/*",
     "https://*/*",
+    "ws://*/*",
+    "wss://*/*",
     "activeTab",
     "webRequest",
     "webRequestBlocking",
diff --git a/app/manifest/v3/_base.json b/app/manifest/v3/_base.json
index 4d6ee38437d3..89758033f33a 100644
--- a/app/manifest/v3/_base.json
+++ b/app/manifest/v3/_base.json
@@ -50,7 +50,9 @@
     "http://localhost:8545/",
     "file://*/*",
     "http://*/*",
-    "https://*/*"
+    "https://*/*",
+    "ws://*/*",
+    "wss://*/*"
   ],
   "icons": {
     "16": "images/icon-16.png",
diff --git a/app/scripts/background.js b/app/scripts/background.js
index 320efbd5c302..c6a3bccd46aa 100644
--- a/app/scripts/background.js
+++ b/app/scripts/background.js
@@ -308,22 +308,21 @@ function maybeDetectPhishing(theController) {
       // blocking is better than tab redirection, as blocking will prevent
       // the browser from loading the page at all
       if (isManifestV2) {
-        if (details.type === 'sub_frame') {
-          // redirect the entire tab to the
-          // phishing warning page instead.
-          redirectTab(details.tabId, redirectHref);
-          // don't let the sub_frame load at all
-          return { cancel: true };
+        // We can redirect `main_frame` requests directly to the warning page.
+        // For non-`main_frame` requests (e.g. `sub_frame` or WebSocket), we cancel them
+        // and redirect the whole tab asynchronously so that the user sees the warning.
+        if (details.type === 'main_frame') {
+          return { redirectUrl: redirectHref };
         }
-        // redirect the whole tab
-        return { redirectUrl: redirectHref };
+        redirectTab(details.tabId, redirectHref);
+        return { cancel: true };
       }
       // redirect the whole tab (even if it's a sub_frame request)
       redirectTab(details.tabId, redirectHref);
       return {};
     },
     {
-      urls: ['http://*/*', 'https://*/*'],
+      urls: ['http://*/*', 'https://*/*', 'ws://*/*', 'wss://*/*'],
     },
     isManifestV2 ? ['blocking'] : [],
   );
diff --git a/privacy-snapshot.json b/privacy-snapshot.json
index 49eedf275364..230634421d52 100644
--- a/privacy-snapshot.json
+++ b/privacy-snapshot.json
@@ -72,5 +72,6 @@
   "unresponsive-rpc.test",
   "unresponsive-rpc.url",
   "user-storage.api.cx.metamask.io",
-  "www.4byte.directory"
+  "www.4byte.directory",
+  "verify.walletconnect.com"
 ]
diff --git a/test/e2e/helpers.js b/test/e2e/helpers.js
index 3ad0d1d149c5..0a915c0fba29 100644
--- a/test/e2e/helpers.js
+++ b/test/e2e/helpers.js
@@ -4,6 +4,7 @@ const BigNumber = require('bignumber.js');
 const mockttp = require('mockttp');
 const detectPort = require('detect-port');
 const { difference } = require('lodash');
+const WebSocket = require('ws');
 const createStaticServer = require('../../development/create-static-server');
 const { setupMocking } = require('./mock-e2e');
 const { Ganache } = require('./seeder/ganache');
@@ -640,6 +641,43 @@ async function unlockWallet(
   }
 }
 
+/**
+ * Simulates a WebSocket connection by executing a script in the browser context.
+ *
+ * @param {WebDriver} driver - The WebDriver instance.
+ * @param {string} hostname - The hostname to connect to.
+ */
+async function createWebSocketConnection(driver, hostname) {
+  try {
+    await driver.executeScript(async (wsHostname) => {
+      const url = `ws://${wsHostname}:8000`;
+      const socket = new WebSocket(url);
+      socket.onopen = () => {
+        console.log('WebSocket connection opened');
+        socket.send('Hello, server!');
+      };
+      socket.onerror = (error) => {
+        console.error(
+          'WebSocket error:',
+          error.message || 'Connection blocked',
+        );
+      };
+      socket.onmessage = (event) => {
+        console.log('Message received from server:', event.data);
+      };
+      socket.onclose = () => {
+        console.log('WebSocket connection closed');
+      };
+    }, hostname);
+  } catch (error) {
+    console.error(
+      `Failed to execute WebSocket connection script for ws://${hostname}:8000`,
+      error,
+    );
+    throw error;
+  }
+}
+
 const logInWithBalanceValidation = async (driver, ganacheServer) => {
   await unlockWallet(driver);
   // Wait for balance to load
@@ -975,4 +1013,5 @@ module.exports = {
   tempToggleSettingRedesignedTransactionConfirmations,
   openMenuSafe,
   sentryRegEx,
+  createWebSocketConnection,
 };
diff --git a/test/e2e/tests/phishing-controller/mocks.js b/test/e2e/tests/phishing-controller/mocks.js
index fe11118c6fd2..3165847740bf 100644
--- a/test/e2e/tests/phishing-controller/mocks.js
+++ b/test/e2e/tests/phishing-controller/mocks.js
@@ -10,7 +10,9 @@ const {
 const lastUpdated = 1;
 const defaultHotlist = { data: [] };
 const defaultC2DomainBlocklist = {
-  recentlyAdded: [],
+  recentlyAdded: [
+    '33c8e026e76cea2df82322428554c932961cd80080fa379454350d7f13371f36', // hash for malicious.localhost
+  ],
   recentlyRemoved: [],
   lastFetchedAt: '2024-08-27T15:30:45Z',
 };
@@ -95,15 +97,12 @@ async function setupPhishingDetectionMocks(
       };
     });
 
-  await mockServer
-    .forGet(C2_DOMAIN_BLOCKLIST_URL)
-    .withQuery({ timestamp: '2024-08-27T15:30:45Z' })
-    .thenCallback(() => {
-      return {
-        statusCode: 200,
-        json: defaultC2DomainBlocklist,
-      };
-    });
+  await mockServer.forGet(C2_DOMAIN_BLOCKLIST_URL).thenCallback(() => {
+    return {
+      statusCode: 200,
+      json: defaultC2DomainBlocklist,
+    };
+  });
 
   await mockServer
     .forGet('https://github.com/MetaMask/eth-phishing-detect/issues/new')
diff --git a/test/e2e/tests/phishing-controller/phishing-detection.spec.js b/test/e2e/tests/phishing-controller/phishing-detection.spec.js
index ad199cea1e70..1fabd8f901bc 100644
--- a/test/e2e/tests/phishing-controller/phishing-detection.spec.js
+++ b/test/e2e/tests/phishing-controller/phishing-detection.spec.js
@@ -9,6 +9,7 @@ const {
   openDapp,
   unlockWallet,
   WINDOW_TITLES,
+  createWebSocketConnection,
 } = require('../../helpers');
 const FixtureBuilder = require('../../fixture-builder');
 const {
@@ -307,10 +308,82 @@ describe('Phishing Detection', function () {
           text: 'Back to safety',
         });
 
+        await driver.waitForUrl({
+          url: `https://portfolio.metamask.io/?metamaskEntry=phishing_page_portfolio_button`,
+        });
+      },
+    );
+  });
+
+  it('should block a website that makes a websocket connection to a malicious command and control server', async function () {
+    const testPageURL = 'http://localhost:8080';
+    await withFixtures(
+      {
+        fixtures: new FixtureBuilder().build(),
+        ganacheOptions: defaultGanacheOptions,
+        title: this.test.fullTitle(),
+        testSpecificMock: async (mockServer) => {
+          await mockServer.forAnyWebSocket().thenEcho();
+          await setupPhishingDetectionMocks(mockServer, {
+            blockProvider: BlockProvider.MetaMask,
+          });
+        },
+        dapp: true,
+      },
+      async ({ driver }) => {
+        await unlockWallet(driver);
+
+        await driver.openNewPage(testPageURL);
+
+        await createWebSocketConnection(driver, 'malicious.localhost');
+
+        await driver.switchToWindowWithTitle(
+          'MetaMask Phishing Detection',
+          10000,
+        );
+
+        await driver.waitForSelector({
+          testId: 'unsafe-continue-loaded',
+        });
+
+        await driver.clickElement({
+          text: 'Back to safety',
+        });
+
+        await driver.waitForUrl({
+          url: `https://portfolio.metamask.io/?metamaskEntry=phishing_page_portfolio_button`,
+        });
+      },
+    );
+  });
+
+  it('should not block a website that makes a safe WebSocket connection', async function () {
+    const testPageURL = 'http://localhost:8080/';
+    await withFixtures(
+      {
+        fixtures: new FixtureBuilder().build(),
+        ganacheOptions: defaultGanacheOptions,
+        title: this.test.fullTitle(),
+        testSpecificMock: async (mockServer) => {
+          await mockServer.forAnyWebSocket().thenEcho();
+          await setupPhishingDetectionMocks(mockServer, {
+            blockProvider: BlockProvider.MetaMask,
+          });
+        },
+        dapp: true,
+      },
+      async ({ driver }) => {
+        await unlockWallet(driver);
+
+        await driver.openNewPage(testPageURL);
+
+        await createWebSocketConnection(driver, 'safe.localhost');
+
+        await driver.wait(until.titleIs(WINDOW_TITLES.TestDApp), 10000);
+
         const currentUrl = await driver.getCurrentUrl();
-        const expectedPortfolioUrl = `https://portfolio.metamask.io/?metamaskEntry=phishing_page_portfolio_button`;
 
-        assert.equal(currentUrl, expectedPortfolioUrl);
+        assert.equal(currentUrl, testPageURL);
       },
     );
   });

From 75f68267ee25ae5a54fef85b2977328583b7a082 Mon Sep 17 00:00:00 2001
From: infiniteflower <139582705+infiniteflower@users.noreply.github.com>
Date: Thu, 12 Dec 2024 19:33:47 -0500
Subject: [PATCH 122/175] =?UTF-8?q?fix:=20send=20user=20to=20native=20brid?=
 =?UTF-8?q?ge=20experience=20rather=20than=20portfolio=20when=E2=80=A6=20(?=
 =?UTF-8?q?#29169)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

… carousel clicked


<!--
Please submit this PR as a draft initially.
Do not mark it as "Ready for review" until the template has been
completely filled out, and PR status checks have passed at least once.
-->

## **Description**

<!--
Write a short description of the changes included in this pull request,
also include relevant motivation and context. Have in mind the following
questions:
1. What is the reason for the change?
2. What is the improvement/solution?
-->

This PR sends users to the in app Bridge experience rather than linking
them out to the Porfolio when the Bridge cards in the carousel is
clicked.

[![Open in GitHub
Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/29169?quickstart=1)

## **Related issues**

Fixes:

## **Manual testing steps**

1. Go to this page...
2.
3.

## **Screenshots/Recordings**

<!-- If applicable, add screenshots and/or recordings to visualize the
before and after of your change. -->

### **Before**

<!-- [screenshots/recordings] -->

### **After**

<!-- [screenshots/recordings] -->

## **Pre-merge author checklist**

- [x] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension Coding
Standards](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/CODING_GUIDELINES.md).
- [x] I've completed the PR template to the best of my ability
- [ ] I’ve included tests if applicable
- [ ] I’ve documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [x] I’ve applied the right labels on the PR (see [labeling
guidelines](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.

## **Pre-merge reviewer checklist**

- [ ] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed).
- [ ] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.
---
 .../account-overview-layout.tsx               | 37 ++++++++-----------
 1 file changed, 16 insertions(+), 21 deletions(-)

diff --git a/ui/components/multichain/account-overview/account-overview-layout.tsx b/ui/components/multichain/account-overview/account-overview-layout.tsx
index 6006cabf810f..01396b77d2c1 100644
--- a/ui/components/multichain/account-overview/account-overview-layout.tsx
+++ b/ui/components/multichain/account-overview/account-overview-layout.tsx
@@ -1,20 +1,20 @@
 import React, { useEffect } from 'react';
 import { useDispatch, useSelector } from 'react-redux';
+///: BEGIN:ONLY_INCLUDE_IF(build-main,build-beta,build-flask)
+import { isEqual } from 'lodash';
+///: END:ONLY_INCLUDE_IF
 import { removeSlide, updateSlides } from '../../../store/actions';
 import { Carousel } from '..';
 import {
-  ///: BEGIN:ONLY_INCLUDE_IF(build-main,build-beta,build-flask)
-  getSwapsDefaultToken,
-  getMetaMetricsId,
-  getParticipateInMetaMetrics,
-  getDataCollectionForMarketing,
-  ///: END:ONLY_INCLUDE_IF
   getSelectedAccountCachedBalance,
   getAppIsLoading,
   getSlides,
+  ///: BEGIN:ONLY_INCLUDE_IF(build-main,build-beta,build-flask)
+  getSwapsDefaultToken,
+  ///: END:ONLY_INCLUDE_IF
 } from '../../../selectors';
 ///: BEGIN:ONLY_INCLUDE_IF(build-main,build-beta,build-flask)
-import { getPortfolioUrl } from '../../../helpers/utils/portfolio';
+import useBridging from '../../../hooks/bridge/useBridging';
 ///: END:ONLY_INCLUDE_IF
 import {
   AccountOverviewTabsProps,
@@ -43,13 +43,14 @@ export const AccountOverviewLayout = ({
   const totalBalance = useSelector(getSelectedAccountCachedBalance);
   const isLoading = useSelector(getAppIsLoading);
 
+  ///: BEGIN:ONLY_INCLUDE_IF(build-main,build-beta,build-flask)
+  const defaultSwapsToken = useSelector(getSwapsDefaultToken, isEqual);
+  ///: END:ONLY_INCLUDE_IF
+
   const hasZeroBalance = totalBalance === ZERO_BALANCE;
 
   ///: BEGIN:ONLY_INCLUDE_IF(build-main,build-beta,build-flask)
-  const defaultSwapsToken = useSelector(getSwapsDefaultToken);
-  const metaMetricsId = useSelector(getMetaMetricsId);
-  const isMetaMetricsEnabled = useSelector(getParticipateInMetaMetrics);
-  const isMarketingEnabled = useSelector(getDataCollectionForMarketing);
+  const { openBridgeExperience } = useBridging();
   ///: END:ONLY_INCLUDE_IF
 
   useEffect(() => {
@@ -78,17 +79,11 @@ export const AccountOverviewLayout = ({
   ///: BEGIN:ONLY_INCLUDE_IF(build-main,build-beta,build-flask)
   const handleCarouselClick = (id: string) => {
     if (id === 'bridge') {
-      const portfolioUrl = getPortfolioUrl(
-        'bridge',
-        'ext_bridge_prepare_swap_link',
-        metaMetricsId,
-        isMetaMetricsEnabled,
-        isMarketingEnabled,
+      openBridgeExperience(
+        'Carousel',
+        defaultSwapsToken,
+        location.pathname.includes('asset') ? '&token=native' : '',
       );
-
-      global.platform.openTab({
-        url: `${portfolioUrl}&token=${defaultSwapsToken}`,
-      });
     }
   };
   ///: END:ONLY_INCLUDE_IF

From 98be28228e3666e2660ffcd6c73163a11822e727 Mon Sep 17 00:00:00 2001
From: Monte Lai <monte.lai@consensys.net>
Date: Fri, 13 Dec 2024 11:54:09 +0800
Subject: [PATCH 123/175] feat: display other currencies for non evm accounts.
 (#28963)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<!--
Please submit this PR as a draft initially.
Do not mark it as "Ready for review" until the template has been
completely filled out, and PR status checks have passed at least once.
-->

## **Description**

This PR enables the user's selected currency to be displayed for non evm
accounts.

<!--
Write a short description of the changes included in this pull request,
also include relevant motivation and context. Have in mind the following
questions:
1. What is the reason for the change?
2. What is the improvement/solution?
-->

[![Open in GitHub
Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/28963?quickstart=1)

## **Related issues**

Fixes: https://github.com/MetaMask/accounts-planning/issues/611

## **Manual testing steps**

1. Create a BTC account with mainnet funds on flask.
2. Go to settings then general and select a currency
3. See that the currency is displayed in the overview and account list
menu

## **Screenshots/Recordings**

<!-- If applicable, add screenshots and/or recordings to visualize the
before and after of your change. -->

### **Before**

<!-- [screenshots/recordings] -->
![Screenshot 2024-12-12 at 20 37
44](https://github.com/user-attachments/assets/cfed63ed-1c97-46f5-984f-bf0ef35959a2)
![Screenshot 2024-12-12 at 20 37
36](https://github.com/user-attachments/assets/87f58158-7a10-42c4-aad7-6d732b6d7142)
![Screenshot 2024-12-12 at 20 37
33](https://github.com/user-attachments/assets/e1aeb6e2-0fe4-47bb-aa7a-bdd887770c9a)

### **After**

<!-- [screenshots/recordings] -->
![Screenshot 2024-12-12 at 20 36
27](https://github.com/user-attachments/assets/59954640-49a2-45ae-8712-dbecde8a1c75)
![Screenshot 2024-12-12 at 20 36
23](https://github.com/user-attachments/assets/7697ad79-d134-4da2-a41c-4c99c42891a5)


## **Pre-merge author checklist**

- [x] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension Coding
Standards](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/CODING_GUIDELINES.md).
- [x] I've completed the PR template to the best of my ability
- [x] I’ve included tests if applicable
- [x] I’ve documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [x] I’ve applied the right labels on the PR (see [labeling
guidelines](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.

## **Pre-merge reviewer checklist**

- [ ] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed).
- [ ] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.
---
 app/scripts/metamask-controller.js            | 11 +++++
 app/scripts/metamask-controller.test.js       | 38 +++++++++++++++++
 .../native-token/use-native-token-balance.ts  |  9 +++-
 .../account-list-item.test.js                 | 35 ++++++++++++++++
 .../multichain/pages/send/send.test.js        | 15 -------
 ui/hooks/useCurrencyDisplay.js                |  1 +
 ui/selectors/multichain.test.ts               | 18 ++++----
 ui/selectors/multichain.ts                    | 41 ++++++++++---------
 ui/selectors/selectors.js                     | 16 +++++---
 9 files changed, 136 insertions(+), 48 deletions(-)

diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
index 5b29b843f859..967a6a2e7d31 100644
--- a/app/scripts/metamask-controller.js
+++ b/app/scripts/metamask-controller.js
@@ -3270,6 +3270,17 @@ export default class MetamaskController extends EventEmitter {
     );
     this.multichainBalancesController.start();
     this.multichainBalancesController.updateBalances();
+
+    this.controllerMessenger.subscribe(
+      'CurrencyRateController:stateChange',
+      ({ currentCurrency }) => {
+        if (
+          currentCurrency !== this.multichainRatesController.state.fiatCurrency
+        ) {
+          this.multichainRatesController.setFiatCurrency(currentCurrency);
+        }
+      },
+    );
   }
 
   /**
diff --git a/app/scripts/metamask-controller.test.js b/app/scripts/metamask-controller.test.js
index 29e6f3a954d6..c78b297efd64 100644
--- a/app/scripts/metamask-controller.test.js
+++ b/app/scripts/metamask-controller.test.js
@@ -2412,6 +2412,7 @@ describe('MetaMaskController', () => {
         methods: [BtcMethod.SendBitcoin],
         address: 'bc1qar0srrr7xfkvy5l643lydnw9re59gtzzwf5mdq',
       };
+      const mockCurrency = 'CAD';
 
       beforeEach(() => {
         jest.spyOn(metamaskController.multichainRatesController, 'start');
@@ -2509,6 +2510,43 @@ describe('MetaMaskController', () => {
           localMetamaskController.multichainRatesController.start,
         ).toHaveBeenCalled();
       });
+
+      it('calls setFiatCurrency when the `currentCurrency` has changed', async () => {
+        jest.spyOn(RatesController.prototype, 'setFiatCurrency');
+        const localMetamaskController = new MetaMaskController({
+          showUserConfirmation: noop,
+          encryptor: mockEncryptor,
+          initState: {
+            ...cloneDeep(firstTimeState),
+            AccountsController: {
+              internalAccounts: {
+                accounts: {
+                  [mockNonEvmAccount.id]: mockNonEvmAccount,
+                  [mockEvmAccount.id]: mockEvmAccount,
+                },
+                selectedAccount: mockNonEvmAccount.id,
+              },
+            },
+          },
+          initLangCode: 'en_US',
+          platform: {
+            showTransactionNotification: () => undefined,
+            getVersion: () => 'foo',
+          },
+          browser: browserPolyfillMock,
+          infuraProjectId: 'foo',
+          isFirstMetaMaskControllerSetup: true,
+        });
+
+        metamaskController.controllerMessenger.publish(
+          'CurrencyRateController:stateChange',
+          { currentCurrency: mockCurrency },
+        );
+
+        expect(
+          localMetamaskController.multichainRatesController.setFiatCurrency,
+        ).toHaveBeenCalledWith(mockCurrency);
+      });
     });
 
     describe('MultichainBalancesController', () => {
diff --git a/ui/components/app/assets/asset-list/native-token/use-native-token-balance.ts b/ui/components/app/assets/asset-list/native-token/use-native-token-balance.ts
index a14e65ac572b..7e7c94e9e1dc 100644
--- a/ui/components/app/assets/asset-list/native-token/use-native-token-balance.ts
+++ b/ui/components/app/assets/asset-list/native-token/use-native-token-balance.ts
@@ -7,7 +7,11 @@ import {
   getMultichainSelectedAccountCachedBalance,
   getMultichainShouldShowFiat,
 } from '../../../../../selectors/multichain';
-import { getCurrentCurrency, getPreferences } from '../../../../../selectors';
+import {
+  getCurrentCurrency,
+  getPreferences,
+  getSelectedInternalAccount,
+} from '../../../../../selectors';
 import { useIsOriginalNativeTokenSymbol } from '../../../../../hooks/useIsOriginalNativeTokenSymbol';
 import { PRIMARY, SECONDARY } from '../../../../../helpers/constants/common';
 import { useUserPreferencedCurrency } from '../../../../../hooks/useUserPreferencedCurrency';
@@ -16,6 +20,7 @@ import { TokenWithBalance } from '../asset-list';
 
 export const useNativeTokenBalance = () => {
   const showFiat = useSelector(getMultichainShouldShowFiat);
+  const account = useSelector(getSelectedInternalAccount);
   const primaryTokenImage = useSelector(getMultichainCurrencyImage);
   const { showNativeTokenAsMainBalance } = useSelector(getPreferences);
   const { chainId, ticker, type, rpcUrl } = useSelector(
@@ -46,12 +51,14 @@ export const useNativeTokenBalance = () => {
 
   const [primaryCurrencyDisplay, primaryCurrencyProperties] =
     useCurrencyDisplay(balance, {
+      account,
       numberOfDecimals: primaryNumberOfDecimals,
       currency: primaryCurrency,
     });
 
   const [secondaryCurrencyDisplay, secondaryCurrencyProperties] =
     useCurrencyDisplay(balance, {
+      account,
       numberOfDecimals: secondaryNumberOfDecimals,
       currency: secondaryCurrency,
     });
diff --git a/ui/components/multichain/account-list-item/account-list-item.test.js b/ui/components/multichain/account-list-item/account-list-item.test.js
index 6069ce4df530..94619d2ae389 100644
--- a/ui/components/multichain/account-list-item/account-list-item.test.js
+++ b/ui/components/multichain/account-list-item/account-list-item.test.js
@@ -237,6 +237,41 @@ describe('AccountListItem', () => {
         expect(avatarGroup).not.toBeInTheDocument();
       });
 
+      it('renders tokens for non-EVM account', () => {
+        const { container } = render(
+          {
+            account: mockNonEvmAccount,
+          },
+          {
+            metamask: {
+              preferences: {
+                showFiatInTestnets: false,
+              },
+            },
+          },
+        );
+
+        const firstCurrencyDisplay = container.querySelector(
+          '[data-testid="first-currency-display"]',
+        );
+        const secondCurrencyDisplay = container.querySelector(
+          '[data-testid="second-currency-display"]',
+        );
+        const avatarGroup = container.querySelector(
+          '[data-testid="avatar-group"]',
+        );
+
+        const expectedBalance = '$100,000.00';
+
+        expect(firstCurrencyDisplay).toBeInTheDocument();
+        expect(firstCurrencyDisplay.firstChild.textContent).toContain(
+          expectedBalance,
+        );
+        expect(firstCurrencyDisplay.lastChild.textContent).toContain('USD');
+        expect(secondCurrencyDisplay.textContent).toContain('BTC');
+        expect(avatarGroup).not.toBeInTheDocument();
+      });
+
       it('renders fiat for EVM account', () => {
         const { container } = render(
           {
diff --git a/ui/components/multichain/pages/send/send.test.js b/ui/components/multichain/pages/send/send.test.js
index 2eb37dc164c4..638c0f13f4bc 100644
--- a/ui/components/multichain/pages/send/send.test.js
+++ b/ui/components/multichain/pages/send/send.test.js
@@ -142,21 +142,6 @@ const baseStore = {
           methods: ETH_EOA_METHODS,
           type: EthAccountType.Eoa,
         },
-        permissionHistory: {
-          'https://uniswap.org/': {
-            eth_accounts: {
-              accounts: {
-                '0x0': 1709225290848,
-              },
-            },
-          },
-        },
-      },
-      activeTab: {
-        origin: 'https://uniswap.org/',
-      },
-      appState: {
-        sendInputCurrencySwitched: false,
       },
       selectedAccount: 'cf8dace4-9439-4bd4-b3a8-88c821c8fcb3',
     },
diff --git a/ui/hooks/useCurrencyDisplay.js b/ui/hooks/useCurrencyDisplay.js
index 03561153ed53..5d9b03ffff7e 100644
--- a/ui/hooks/useCurrencyDisplay.js
+++ b/ui/hooks/useCurrencyDisplay.js
@@ -105,6 +105,7 @@ function formatNonEvmAssetCurrencyDisplay({
  * @property {string} [denomination] - Denomination (wei, gwei) to convert to for display
  * @property {string} [currency] - Currency type to convert to. Will override nativeCurrency
  * @property {boolean} [hideLabel] – hide the currency label
+ * @property {object} [account] - The account object
  */
 
 /**
diff --git a/ui/selectors/multichain.test.ts b/ui/selectors/multichain.test.ts
index 2fa47a8db9e8..50f735aa9212 100644
--- a/ui/selectors/multichain.test.ts
+++ b/ui/selectors/multichain.test.ts
@@ -270,15 +270,17 @@ describe('Multichain Selectors', () => {
       },
     );
 
-    it('fallbacks to ticker as currency if account is non-EVM (bip122:*)', () => {
-      const state = getNonEvmState(); // .currentCurrency = 'ETH'
+    // @ts-expect-error This is missing from the Mocha type definitions
+    it.each(['usd', 'BTC'])(
+      "returns current currency '%s' if account is non-EVM",
+      (currency: string) => {
+        const state = getNonEvmState();
 
-      const bip122ProviderConfig = getBip122ProviderConfig();
-      expect(getCurrentCurrency(state).toLowerCase()).not.toBe('usd');
-      expect(getMultichainCurrentCurrency(state)).toBe(
-        bip122ProviderConfig.ticker,
-      );
-    });
+        state.metamask.currentCurrency = currency;
+        expect(getCurrentCurrency(state)).toBe(currency);
+        expect(getMultichainCurrentCurrency(state)).toBe(currency);
+      },
+    );
   });
 
   describe('getMultichainShouldShowFiat', () => {
diff --git a/ui/selectors/multichain.ts b/ui/selectors/multichain.ts
index 375949db877f..129021e0c4c1 100644
--- a/ui/selectors/multichain.ts
+++ b/ui/selectors/multichain.ts
@@ -254,22 +254,8 @@ export function getMultichainNativeCurrency(
     : getMultichainProviderConfig(state, account).ticker;
 }
 
-export function getMultichainCurrentCurrency(
-  state: MultichainState,
-  account?: InternalAccount,
-) {
-  const currentCurrency = getCurrentCurrency(state);
-
-  if (getMultichainIsEvm(state, account)) {
-    return currentCurrency;
-  }
-
-  // For non-EVM:
-  // To mimic `getCurrentCurrency` we only consider fiat values, otherwise we
-  // fallback to the current ticker symbol value
-  return currentCurrency && currentCurrency.toLowerCase() === 'usd'
-    ? 'usd'
-    : getMultichainProviderConfig(state, account).ticker;
+export function getMultichainCurrentCurrency(state: MultichainState) {
+  return getCurrentCurrency(state);
 }
 
 export function getMultichainCurrencyImage(
@@ -375,9 +361,12 @@ export const getMultichainCoinRates = (state: MultichainState) => {
   return state.metamask.rates;
 };
 
-function getNonEvmCachedBalance(state: MultichainState) {
+function getNonEvmCachedBalance(
+  state: MultichainState,
+  account?: InternalAccount,
+) {
   const balances = getMultichainBalances(state);
-  const account = getSelectedInternalAccount(state);
+  const selectedAccount = account ?? getSelectedInternalAccount(state);
   const network = getMultichainCurrentNetwork(state);
 
   // We assume that there's at least one asset type in and that is the native
@@ -387,7 +376,21 @@ function getNonEvmCachedBalance(state: MultichainState) {
       network.chainId as MultichainNetworks
     ]?.[0];
 
-  return balances?.[account.id]?.[asset]?.amount;
+  if (!asset) {
+    console.warn('Could not find asset type for network:', network);
+  }
+
+  const balancesForAccount = balances?.[selectedAccount.id];
+  if (!balancesForAccount) {
+    console.warn('Could not find balances for account:', selectedAccount);
+  }
+
+  const balanceOfAsset = balancesForAccount?.[asset];
+  if (!balanceOfAsset) {
+    console.warn('Could not find balance for asset:', asset);
+  }
+
+  return balanceOfAsset?.amount ?? 0;
 }
 
 export function getImageForChainId(chainId: string) {
diff --git a/ui/selectors/selectors.js b/ui/selectors/selectors.js
index a68ba58f3619..2986373913ca 100644
--- a/ui/selectors/selectors.js
+++ b/ui/selectors/selectors.js
@@ -105,7 +105,7 @@ import {
 import { BackgroundColor } from '../helpers/constants/design-system';
 import { NOTIFICATION_DROP_LEDGER_FIREFOX } from '../../shared/notifications';
 import { ENVIRONMENT_TYPE_POPUP } from '../../shared/constants/app';
-import { MultichainNativeAssets } from '../../shared/constants/multichain/assets';
+import { MULTICHAIN_NETWORK_TO_ASSET_TYPES } from '../../shared/constants/multichain/assets';
 // TODO: Remove restricted import
 // eslint-disable-next-line import/no-restricted-paths
 import { BridgeFeatureFlagsKey } from '../../app/scripts/controllers/bridge/types';
@@ -126,7 +126,10 @@ import {
   getSubjectMetadata,
 } from './permissions';
 import { getSelectedInternalAccount, getInternalAccounts } from './accounts';
-import { getMultichainBalances, getMultichainNetwork } from './multichain';
+import {
+  getMultichainBalances,
+  getMultichainNetworkProviders,
+} from './multichain';
 
 export function getNetworkIdentifier(state) {
   const { type, nickname, rpcUrl } = getProviderConfig(state);
@@ -265,13 +268,13 @@ export const getMetaMaskAccounts = createSelector(
   getMetaMaskAccountBalances,
   getMetaMaskCachedBalances,
   getMultichainBalances,
-  getMultichainNetwork,
+  getMultichainNetworkProviders,
   (
     internalAccounts,
     balances,
     cachedBalances,
     multichainBalances,
-    multichainNetwork,
+    multichainNetworkProviders,
   ) =>
     Object.values(internalAccounts).reduce((accounts, internalAccount) => {
       // TODO: mix in the identity state here as well, consolidating this
@@ -288,11 +291,14 @@ export const getMetaMaskAccounts = createSelector(
           };
         }
       } else {
+        const multichainNetwork = multichainNetworkProviders.find((network) =>
+          network.isAddressCompatible(internalAccount.address),
+        );
         account = {
           ...account,
           balance:
             multichainBalances?.[internalAccount.id]?.[
-              MultichainNativeAssets[multichainNetwork.chainId]
+              MULTICHAIN_NETWORK_TO_ASSET_TYPES[multichainNetwork.chainId]
             ]?.amount ?? '0',
         };
       }

From 72e4987eee2e116998af31b19ca87f3f25f3a6fb Mon Sep 17 00:00:00 2001
From: Vinicius Stevam <45455812+vinistevam@users.noreply.github.com>
Date: Fri, 13 Dec 2024 10:00:59 +0000
Subject: [PATCH 124/175] fix: increase signing or submitting alert severity to
 danger (#29140)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<!--
Please submit this PR as a draft initially.
Do not mark it as "Ready for review" until the template has been
completely filled out, and PR status checks have passed at least once.
-->

## **Description**
This PR addresses an issue where users are currently able to submit
multiple Smart Transaction (STX) requests while one is still pending in
the redesigned confirmation flow. This functionality is already
correctly implemented in the legacy confirmation flow, and the
redesigned flow is updated to match this behaviour.

**Changes Introduced:**
- Updates the alert text to match the copy used in the legacy
confirmation flow.
- Increases the severity of the alert from `Warning` to `Danger`.
- Ensures that dangerous banner alerts block the confirm button to avoid
user actions until resolved.

<!--
Write a short description of the changes included in this pull request,
also include relevant motivation and context. Have in mind the following
questions:
1. What is the reason for the change?
2. What is the improvement/solution?
-->

[![Open in GitHub
Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/29140?quickstart=1)

## **Related issues**

Fixes: https://github.com/MetaMask/metamask-extension/issues/29138

## **Manual testing steps**

1. Submit a STX
2. Trigger a new transaction

## **Screenshots/Recordings**


[wait_submitted_tx.webm](https://github.com/user-attachments/assets/0eff285e-46b1-409f-8041-4c99fef89839)

<!-- If applicable, add screenshots and/or recordings to visualize the
before and after of your change. -->

### **Before**

<!-- [screenshots/recordings] -->

### **After**

<!-- [screenshots/recordings] -->

## **Pre-merge author checklist**

- [x] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension Coding
Standards](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/CODING_GUIDELINES.md).
- [x] I've completed the PR template to the best of my ability
- [x] I’ve included tests if applicable
- [x] I’ve documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [x] I’ve applied the right labels on the PR (see [labeling
guidelines](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.

## **Pre-merge reviewer checklist**

- [ ] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed).
- [ ] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.
---
 app/_locales/de/messages.json                  |  3 ---
 app/_locales/el/messages.json                  |  3 ---
 app/_locales/en/messages.json                  |  7 +++----
 app/_locales/en_GB/messages.json               |  3 ---
 app/_locales/es/messages.json                  |  3 ---
 app/_locales/fr/messages.json                  |  3 ---
 app/_locales/hi/messages.json                  |  3 ---
 app/_locales/id/messages.json                  |  3 ---
 app/_locales/ja/messages.json                  |  3 ---
 app/_locales/ko/messages.json                  |  3 ---
 app/_locales/pt/messages.json                  |  3 ---
 app/_locales/ru/messages.json                  |  3 ---
 app/_locales/tl/messages.json                  |  3 ---
 app/_locales/tr/messages.json                  |  3 ---
 app/_locales/vi/messages.json                  |  3 ---
 app/_locales/zh_CN/messages.json               |  3 ---
 .../confirmations/transactions/alerts.test.tsx |  4 ++--
 .../components/confirm/footer/footer.test.tsx  | 18 ++++++++++++++++++
 .../components/confirm/footer/footer.tsx       |  4 ++--
 .../useSigningOrSubmittingAlerts.test.ts       |  5 ++---
 .../useSigningOrSubmittingAlerts.ts            |  4 ++--
 21 files changed, 29 insertions(+), 58 deletions(-)

diff --git a/app/_locales/de/messages.json b/app/_locales/de/messages.json
index ec9779e4d1af..10da27054b7d 100644
--- a/app/_locales/de/messages.json
+++ b/app/_locales/de/messages.json
@@ -443,9 +443,6 @@
   "alertMessageSignInWrongAccount": {
     "message": "Diese Seite fordert Sie auf, sich mit dem falschen Konto anzumelden."
   },
-  "alertMessageSigningOrSubmitting": {
-    "message": "Diese Transaktion wird erst durchgeführt, wenn Ihre vorherige Transaktion abgeschlossen ist."
-  },
   "alertModalAcknowledge": {
     "message": "Ich habe das Risiko erkannt und möchte trotzdem fortfahren"
   },
diff --git a/app/_locales/el/messages.json b/app/_locales/el/messages.json
index 42d08fa2f602..3f6bac2b40ac 100644
--- a/app/_locales/el/messages.json
+++ b/app/_locales/el/messages.json
@@ -443,9 +443,6 @@
   "alertMessageSignInWrongAccount": {
     "message": "Αυτός ο ιστότοπος σας ζητάει να συνδεθείτε χρησιμοποιώντας λάθος λογαριασμό."
   },
-  "alertMessageSigningOrSubmitting": {
-    "message": "Αυτή η συναλλαγή θα πραγματοποιηθεί μόνο όταν ολοκληρωθεί η προηγούμενη συναλλαγή σας."
-  },
   "alertModalAcknowledge": {
     "message": "Αναγνωρίζω τον κίνδυνο και εξακολουθώ να θέλω να συνεχίσω"
   },
diff --git a/app/_locales/en/messages.json b/app/_locales/en/messages.json
index a4dc558e0b83..1a2e847181f9 100644
--- a/app/_locales/en/messages.json
+++ b/app/_locales/en/messages.json
@@ -446,9 +446,6 @@
   "alertMessageSignInWrongAccount": {
     "message": "This site is asking you to sign in using the wrong account."
   },
-  "alertMessageSigningOrSubmitting": {
-    "message": "This transaction will only go through once your previous transaction is complete."
-  },
   "alertModalAcknowledge": {
     "message": "I have acknowledged the risk and still want to proceed"
   },
@@ -2930,7 +2927,9 @@
   "loadingScreenSnapMessage": {
     "message": "Please complete the transaction on the Snap."
   },
-  "loadingTokenList": { "message": "Loading token list" },
+  "loadingTokenList": {
+    "message": "Loading token list"
+  },
   "loadingTokens": {
     "message": "Loading tokens..."
   },
diff --git a/app/_locales/en_GB/messages.json b/app/_locales/en_GB/messages.json
index c72cccd973d9..2548f8bf0cfb 100644
--- a/app/_locales/en_GB/messages.json
+++ b/app/_locales/en_GB/messages.json
@@ -427,9 +427,6 @@
   "alertMessageSignInWrongAccount": {
     "message": "This site is asking you to sign in using the wrong account."
   },
-  "alertMessageSigningOrSubmitting": {
-    "message": "This transaction will only go through once your previous transaction is complete."
-  },
   "alertModalAcknowledge": {
     "message": "I have acknowledged the risk and still want to proceed"
   },
diff --git a/app/_locales/es/messages.json b/app/_locales/es/messages.json
index 9d3b9028c734..ebee69f7857d 100644
--- a/app/_locales/es/messages.json
+++ b/app/_locales/es/messages.json
@@ -443,9 +443,6 @@
   "alertMessageSignInWrongAccount": {
     "message": "Este sitio le pide que inicie sesión con la cuenta incorrecta."
   },
-  "alertMessageSigningOrSubmitting": {
-    "message": "Esta transacción solo se realizará una vez que se complete la transacción anterior."
-  },
   "alertModalAcknowledge": {
     "message": "Soy consciente del riesgo y aun así deseo continuar"
   },
diff --git a/app/_locales/fr/messages.json b/app/_locales/fr/messages.json
index 6b9f60d35678..7babefbca08d 100644
--- a/app/_locales/fr/messages.json
+++ b/app/_locales/fr/messages.json
@@ -443,9 +443,6 @@
   "alertMessageSignInWrongAccount": {
     "message": "Ce site vous demande de vous connecter en utilisant le mauvais compte."
   },
-  "alertMessageSigningOrSubmitting": {
-    "message": "La transaction précédente doit être finalisée avant que celle-ci ne soit traitée."
-  },
   "alertModalAcknowledge": {
     "message": "Je suis conscient du risque et je souhaite quand même continuer"
   },
diff --git a/app/_locales/hi/messages.json b/app/_locales/hi/messages.json
index 7e4df895fbd8..f02371f823c7 100644
--- a/app/_locales/hi/messages.json
+++ b/app/_locales/hi/messages.json
@@ -443,9 +443,6 @@
   "alertMessageSignInWrongAccount": {
     "message": "यह साइट आपसे गलत अकाउंट का उपयोग करके साइन इन करने के लिए कह रही है।"
   },
-  "alertMessageSigningOrSubmitting": {
-    "message": "यह ट्रांसेक्शन तभी पूरा होगा जब आपका पिछला ट्रांसेक्शन पूरा हो जाएगा।"
-  },
   "alertModalAcknowledge": {
     "message": "मैंने जोखिम को स्वीकार कर लिया है और इसके बावजूद आगे बढ़ना चाहता/चाहती हूं"
   },
diff --git a/app/_locales/id/messages.json b/app/_locales/id/messages.json
index 9cc407f17b1c..b0ab72319b2a 100644
--- a/app/_locales/id/messages.json
+++ b/app/_locales/id/messages.json
@@ -443,9 +443,6 @@
   "alertMessageSignInWrongAccount": {
     "message": "Situs ini meminta Anda masuk menggunakan akun yang salah."
   },
-  "alertMessageSigningOrSubmitting": {
-    "message": "Transaksi ini hanya akan dilanjutkan setelah transaksi Anda sebelumnya selesai."
-  },
   "alertModalAcknowledge": {
     "message": "Saya telah mengetahui risikonya dan tetap ingin melanjutkan"
   },
diff --git a/app/_locales/ja/messages.json b/app/_locales/ja/messages.json
index 08b8022108d1..fdd84149f279 100644
--- a/app/_locales/ja/messages.json
+++ b/app/_locales/ja/messages.json
@@ -443,9 +443,6 @@
   "alertMessageSignInWrongAccount": {
     "message": "このサイトは正しくないアカウントでのサインインを求めています。"
   },
-  "alertMessageSigningOrSubmitting": {
-    "message": "このトランザクションは、前のトランザクションが完了しないと実行されません。"
-  },
   "alertModalAcknowledge": {
     "message": "リスクを承知したうえで続行します"
   },
diff --git a/app/_locales/ko/messages.json b/app/_locales/ko/messages.json
index 11c9e64de010..ec7078d51efd 100644
--- a/app/_locales/ko/messages.json
+++ b/app/_locales/ko/messages.json
@@ -443,9 +443,6 @@
   "alertMessageSignInWrongAccount": {
     "message": "이 사이트에서 잘못된 계정으로 로그인하라고 요청합니다."
   },
-  "alertMessageSigningOrSubmitting": {
-    "message": "이 트랜잭션은 이전 트랜잭션이 완료된 경우에만 진행됩니다."
-  },
   "alertModalAcknowledge": {
     "message": "위험성을 인지했으며, 계속 진행합니다"
   },
diff --git a/app/_locales/pt/messages.json b/app/_locales/pt/messages.json
index af31962e7066..142163b5ac2a 100644
--- a/app/_locales/pt/messages.json
+++ b/app/_locales/pt/messages.json
@@ -443,9 +443,6 @@
   "alertMessageSignInWrongAccount": {
     "message": "Este site está pedindo que você entre usando a conta incorreta."
   },
-  "alertMessageSigningOrSubmitting": {
-    "message": "Essa transação só será processada quando sua transação anterior for concluída."
-  },
   "alertModalAcknowledge": {
     "message": "Eu reconheço o risco e ainda quero prosseguir"
   },
diff --git a/app/_locales/ru/messages.json b/app/_locales/ru/messages.json
index c8c54df2d25d..a8fd22c4b04d 100644
--- a/app/_locales/ru/messages.json
+++ b/app/_locales/ru/messages.json
@@ -443,9 +443,6 @@
   "alertMessageSignInWrongAccount": {
     "message": "Этот сайт просит вас войти в систему, используя неправильный счет."
   },
-  "alertMessageSigningOrSubmitting": {
-    "message": "Эта транзакция будет выполнена только после завершения вашей предыдущей транзакции."
-  },
   "alertModalAcknowledge": {
     "message": "Я осознал(-а) риск и все еще хочу продолжить"
   },
diff --git a/app/_locales/tl/messages.json b/app/_locales/tl/messages.json
index 34f248e7ec8c..42ae2e8b884f 100644
--- a/app/_locales/tl/messages.json
+++ b/app/_locales/tl/messages.json
@@ -443,9 +443,6 @@
   "alertMessageSignInWrongAccount": {
     "message": "Hinihingi sa iyo ng site na ito na mag-sign in gamit ang maling account."
   },
-  "alertMessageSigningOrSubmitting": {
-    "message": "Magpapatuloy lamang ang transaksyong ito kapag nakumpleto mo na ang naunang transaksyon."
-  },
   "alertModalAcknowledge": {
     "message": "Kinikilala ko ang panganib at nais ko pa rin magpatuloy"
   },
diff --git a/app/_locales/tr/messages.json b/app/_locales/tr/messages.json
index 3bfcbe9812c1..891cd12352fe 100644
--- a/app/_locales/tr/messages.json
+++ b/app/_locales/tr/messages.json
@@ -443,9 +443,6 @@
   "alertMessageSignInWrongAccount": {
     "message": "Bu site sizden yanlış hesabı kullanarak giriş yapmanızı istiyor."
   },
-  "alertMessageSigningOrSubmitting": {
-    "message": "Bu işlem sadece önceki işleminiz tamamlandıktan sonra gerçekleşecek."
-  },
   "alertModalAcknowledge": {
     "message": "Riski anlıyor ve yine de ilerlemek istiyorum"
   },
diff --git a/app/_locales/vi/messages.json b/app/_locales/vi/messages.json
index 47ca7fad8568..2a290e5a0cc0 100644
--- a/app/_locales/vi/messages.json
+++ b/app/_locales/vi/messages.json
@@ -443,9 +443,6 @@
   "alertMessageSignInWrongAccount": {
     "message": "Trang web này yêu cầu bạn đăng nhập bằng tài khoản không đúng."
   },
-  "alertMessageSigningOrSubmitting": {
-    "message": "Giao dịch này sẽ chỉ được thực hiện sau khi giao dịch trước đó của bạn hoàn tất."
-  },
   "alertModalAcknowledge": {
     "message": "Tôi đã nhận thức được rủi ro và vẫn muốn tiếp tục"
   },
diff --git a/app/_locales/zh_CN/messages.json b/app/_locales/zh_CN/messages.json
index 2e8a8ee3a052..42ab2a2dcae4 100644
--- a/app/_locales/zh_CN/messages.json
+++ b/app/_locales/zh_CN/messages.json
@@ -443,9 +443,6 @@
   "alertMessageSignInWrongAccount": {
     "message": "此网站要求您使用错误的账户登录。"
   },
-  "alertMessageSigningOrSubmitting": {
-    "message": "您的上一笔交易完成后，此交易才能继续进行。"
-  },
   "alertModalAcknowledge": {
     "message": "我已知晓风险并仍想继续"
   },
diff --git a/test/integration/confirmations/transactions/alerts.test.tsx b/test/integration/confirmations/transactions/alerts.test.tsx
index 72acf02efc60..b21a7dbb679c 100644
--- a/test/integration/confirmations/transactions/alerts.test.tsx
+++ b/test/integration/confirmations/transactions/alerts.test.tsx
@@ -470,7 +470,7 @@ describe('Contract Interaction Confirmation Alerts', () => {
     expect(
       alerts.some((alert) =>
         alert.textContent?.includes(
-          'This transaction will only go through once your previous transaction is complete.',
+          'A previous transaction is still being signed or submitted',
         ),
       ),
     ).toBe(true);
@@ -478,6 +478,6 @@ describe('Contract Interaction Confirmation Alerts', () => {
     expect(
       await screen.findByTestId('confirm-footer-button'),
     ).toBeInTheDocument();
-    expect(await screen.findByTestId('confirm-footer-button')).toBeEnabled();
+    expect(await screen.findByTestId('confirm-footer-button')).toBeDisabled();
   });
 });
diff --git a/ui/pages/confirmations/components/confirm/footer/footer.test.tsx b/ui/pages/confirmations/components/confirm/footer/footer.test.tsx
index bd026848bd95..7d56833c8807 100644
--- a/ui/pages/confirmations/components/confirm/footer/footer.test.tsx
+++ b/ui/pages/confirmations/components/confirm/footer/footer.test.tsx
@@ -355,6 +355,24 @@ describe('ConfirmFooter', () => {
       expect(getByText('Confirm')).toBeInTheDocument();
     });
 
+    it('renders the "confirm" button disabled when there are blocking dangerous banner alerts', () => {
+      const stateWithBannerDangerAlertMock = createStateWithAlerts(
+        [
+          {
+            ...alertsMock[0],
+            isBlocking: true,
+            field: undefined,
+          },
+        ],
+        {
+          [KEY_ALERT_KEY_MOCK]: false,
+        },
+      );
+      const { getByText } = render(stateWithBannerDangerAlertMock);
+      expect(getByText('Confirm')).toBeInTheDocument();
+      expect(getByText('Confirm')).toBeDisabled();
+    });
+
     it('renders the "confirm" button when there are no alerts', () => {
       const { getByText } = render();
       expect(getByText('Confirm')).toBeInTheDocument();
diff --git a/ui/pages/confirmations/components/confirm/footer/footer.tsx b/ui/pages/confirmations/components/confirm/footer/footer.tsx
index 82b10a9511a8..301338fbae69 100644
--- a/ui/pages/confirmations/components/confirm/footer/footer.tsx
+++ b/ui/pages/confirmations/components/confirm/footer/footer.tsx
@@ -99,14 +99,14 @@ const ConfirmButton = ({
     useState<boolean>(false);
 
   const {
+    alerts,
     hasDangerAlerts,
     hasUnconfirmedDangerAlerts,
-    fieldAlerts,
     hasUnconfirmedFieldDangerAlerts,
     unconfirmedFieldDangerAlerts,
   } = useAlerts(alertOwnerId);
 
-  const hasDangerBlockingAlerts = fieldAlerts.some(
+  const hasDangerBlockingAlerts = alerts.some(
     (alert) => alert.severity === Severity.Danger && alert.isBlocking,
   );
 
diff --git a/ui/pages/confirmations/hooks/alerts/transactions/useSigningOrSubmittingAlerts.test.ts b/ui/pages/confirmations/hooks/alerts/transactions/useSigningOrSubmittingAlerts.test.ts
index 08ed8f2aac7d..3705e218631f 100644
--- a/ui/pages/confirmations/hooks/alerts/transactions/useSigningOrSubmittingAlerts.test.ts
+++ b/ui/pages/confirmations/hooks/alerts/transactions/useSigningOrSubmittingAlerts.test.ts
@@ -14,9 +14,8 @@ import { useSigningOrSubmittingAlerts } from './useSigningOrSubmittingAlerts';
 const EXPECTED_ALERT = {
   isBlocking: true,
   key: 'signingOrSubmitting',
-  message:
-    'This transaction will only go through once your previous transaction is complete.',
-  severity: Severity.Warning,
+  message: 'A previous transaction is still being signed or submitted',
+  severity: Severity.Danger,
 };
 const ACCOUNT_ADDRESS = '0x0dcd5d886577d5081b0c52e242ef29e70be3e7bc';
 const TRANSACTION_ID_MOCK = '123-456';
diff --git a/ui/pages/confirmations/hooks/alerts/transactions/useSigningOrSubmittingAlerts.ts b/ui/pages/confirmations/hooks/alerts/transactions/useSigningOrSubmittingAlerts.ts
index 3cb6c45b31e1..585754d21afc 100644
--- a/ui/pages/confirmations/hooks/alerts/transactions/useSigningOrSubmittingAlerts.ts
+++ b/ui/pages/confirmations/hooks/alerts/transactions/useSigningOrSubmittingAlerts.ts
@@ -32,8 +32,8 @@ export function useSigningOrSubmittingAlerts(): Alert[] {
       {
         isBlocking: true,
         key: 'signingOrSubmitting',
-        message: t('alertMessageSigningOrSubmitting'),
-        severity: Severity.Warning,
+        message: t('isSigningOrSubmitting'),
+        severity: Severity.Danger,
       },
     ];
   }, [isSigningOrSubmitting]);

From 71cafe7411bd37d3a0ed88040509f7cb6caa2477 Mon Sep 17 00:00:00 2001
From: Frederik Bolding <frederik.bolding@gmail.com>
Date: Fri, 13 Dec 2024 11:03:28 +0100
Subject: [PATCH 125/175] fix: Swap out Spinner component exposed to Snaps
 (#29143)

<!--
Please submit this PR as a draft initially.
Do not mark it as "Ready for review" until the template has been
completely filled out, and PR status checks have passed at least once.
-->

## **Description**

Swap out the `Spinner` component exposed to Snaps for the `Preloader`
component.

[![Open in GitHub
Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/29143?quickstart=1)

## **Screenshots/Recordings**


![image](https://github.com/user-attachments/assets/d4c9a712-67a8-4d1f-b2f2-8d8550d87f27)
---
 .../app/metamask-template-renderer/safe-component-list.js       | 2 ++
 ui/components/app/snaps/snap-ui-renderer/components/spinner.ts  | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/ui/components/app/metamask-template-renderer/safe-component-list.js b/ui/components/app/metamask-template-renderer/safe-component-list.js
index a41b92c9f463..03f8625733b9 100644
--- a/ui/components/app/metamask-template-renderer/safe-component-list.js
+++ b/ui/components/app/metamask-template-renderer/safe-component-list.js
@@ -28,6 +28,7 @@ import {
 import { SnapDelineator } from '../snaps/snap-delineator';
 import { Copyable } from '../snaps/copyable';
 import Spinner from '../../ui/spinner';
+import Preloader from '../../ui/icon/preloader';
 import { SnapUIMarkdown } from '../snaps/snap-ui-markdown';
 import { SnapUILink } from '../snaps/snap-ui-link';
 import { SmartTransactionStatusPage } from '../../../pages/smart-transactions/smart-transaction-status-page';
@@ -93,6 +94,7 @@ export const safeComponentList = {
   SnapUIImage,
   BannerAlert,
   Spinner,
+  Preloader,
   ConfirmInfoRow,
   ConfirmInfoRowAddress,
   ConfirmInfoRowValueDouble,
diff --git a/ui/components/app/snaps/snap-ui-renderer/components/spinner.ts b/ui/components/app/snaps/snap-ui-renderer/components/spinner.ts
index 0e0cd71cd9a4..c6b826853b3e 100644
--- a/ui/components/app/snaps/snap-ui-renderer/components/spinner.ts
+++ b/ui/components/app/snaps/snap-ui-renderer/components/spinner.ts
@@ -2,7 +2,7 @@ import { SpinnerElement } from '@metamask/snaps-sdk/jsx';
 import { UIComponentFactory } from './types';
 
 export const spinner: UIComponentFactory<SpinnerElement> = () => ({
-  element: 'Spinner',
+  element: 'Preloader',
   props: {
     className: 'snap-ui-renderer__spinner',
   },

From 527717e8c7ef60905f74bcb4d8bd9e80d4d60f30 Mon Sep 17 00:00:00 2001
From: Pedro Figueiredo <pedro.figueiredo@consensys.net>
Date: Fri, 13 Dec 2024 10:22:12 +0000
Subject: [PATCH 126/175] feat: Migrate signature e2e tests for redesigned
 screens (#29023)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<!--
Please submit this PR as a draft initially.
Do not mark it as "Ready for review" until the template has been
completely filled out, and PR status checks have passed at least once.
-->

## **Description**

A number of e2e tests uses `tempToggleSettingRedesignedConfirmations` to
programatically disable the redesigned signature confirmations.

This PR duplicates those tests and tucks them under an "Old confirmation
screens" describe block. All original tests are correspondingly moved to
under a "Redesigned confirmation screens" describe block, and the helper
method is removed. Then each test is modified enough so its assertions
can pass again.

The "old confirmation screens" tests will be removed in
https://github.com/MetaMask/MetaMask-planning/issues/3029.

<!--
Write a short description of the changes included in this pull request,
also include relevant motivation and context. Have in mind the following
questions:
1. What is the reason for the change?
2. What is the improvement/solution?
-->

[![Open in GitHub
Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/29023?quickstart=1)

## **Related issues**

Fixes: https://github.com/MetaMask/MetaMask-planning/issues/3718

## **Manual testing steps**

1. Go to this page...
2.
3.

## **Screenshots/Recordings**

<!-- If applicable, add screenshots and/or recordings to visualize the
before and after of your change. -->

### **Before**

<!-- [screenshots/recordings] -->

### **After**

<!-- [screenshots/recordings] -->

## **Pre-merge author checklist**

- [ ] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension Coding
Standards](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/CODING_GUIDELINES.md).
- [ ] I've completed the PR template to the best of my ability
- [ ] I’ve included tests if applicable
- [ ] I’ve documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [ ] I’ve applied the right labels on the PR (see [labeling
guidelines](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.

## **Pre-merge reviewer checklist**

- [ ] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed).
- [ ] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.
---
 test/e2e/helpers.js                           |   24 +
 test/e2e/snaps/test-snap-siginsights.spec.js  | 1202 ++++++++++-------
 .../signin-with-ethereum.spec.js              |  209 ++-
 .../tests/metrics/signature-approved.spec.js  |  492 ++++---
 .../petnames/petnames-signatures.spec.js      |  304 +++--
 .../e2e/tests/signature/personal-sign.spec.js |  288 ++--
 .../tests/signature/signature-request.spec.js |  811 +++++++----
 7 files changed, 2171 insertions(+), 1159 deletions(-)

diff --git a/test/e2e/helpers.js b/test/e2e/helpers.js
index 0a915c0fba29..3b69d55fc122 100644
--- a/test/e2e/helpers.js
+++ b/test/e2e/helpers.js
@@ -728,6 +728,29 @@ async function clickSignOnSignatureConfirmation({
   await driver.clickElement({ text: 'Sign', tag: 'button' });
 }
 
+/**
+ * This method handles clicking the sign button on signature confirmation
+ * screen.
+ *
+ * @param {object} options - Options for the function.
+ * @param {WebDriver} options.driver - The WebDriver instance controlling the browser.
+ * @param {boolean} [options.snapSigInsights] - Whether to wait for the insights snap to be ready before clicking the sign button.
+ */
+async function clickSignOnRedesignedSignatureConfirmation({
+  driver,
+  snapSigInsights = false,
+}) {
+  await driver.clickElementSafe('.confirm-scroll-to-bottom__button');
+
+  if (snapSigInsights) {
+    // there is no condition we can wait for to know the snap is ready,
+    // so we have to add a small delay as the last alternative to avoid flakiness.
+    await driver.delay(regularDelayMs);
+  }
+
+  await driver.clickElement({ text: 'Confirm', tag: 'button' });
+}
+
 /**
  * Some signing methods have extra security that requires the user to click a
  * button to validate that they have verified the details. This method handles
@@ -1000,6 +1023,7 @@ module.exports = {
   roundToXDecimalPlaces,
   generateRandNumBetween,
   clickSignOnSignatureConfirmation,
+  clickSignOnRedesignedSignatureConfirmation,
   validateContractDetails,
   switchToNotificationWindow,
   getEventPayloads,
diff --git a/test/e2e/snaps/test-snap-siginsights.spec.js b/test/e2e/snaps/test-snap-siginsights.spec.js
index 94237b99c7f9..c463d09d864a 100644
--- a/test/e2e/snaps/test-snap-siginsights.spec.js
+++ b/test/e2e/snaps/test-snap-siginsights.spec.js
@@ -1,6 +1,7 @@
 const {
   withFixtures,
   clickSignOnSignatureConfirmation,
+  clickSignOnRedesignedSignatureConfirmation,
   defaultGanacheOptions,
   openDapp,
   unlockWallet,
@@ -11,494 +12,721 @@ const FixtureBuilder = require('../fixture-builder');
 const { TEST_SNAPS_WEBSITE_URL } = require('./enums');
 
 describe('Test Snap Signature Insights', function () {
-  it('tests Signature Insights functionality (New)', async function () {
-    await withFixtures(
-      {
-        dapp: true,
-        fixtures: new FixtureBuilder()
-          .withPermissionControllerConnectedToTestDapp()
-          .build(),
-        ganacheOptions: defaultGanacheOptions,
-        failOnConsoleError: false,
-        title: this.test.fullTitle(),
-      },
-      async ({ driver }) => {
-        await unlockWallet(driver);
-
-        // navigate to test snaps page and connect
-        await driver.openNewPage(TEST_SNAPS_WEBSITE_URL);
-
-        // wait for page to load
-        await driver.waitForSelector({
-          text: 'Installed Snaps',
-          tag: 'h2',
-        });
-
-        // find and scroll to the transaction-insights snap
-        const snapButton1 = await driver.findElement(
-          '#connectsignature-insights',
-        );
-        await driver.scrollToElement(snapButton1);
-
-        // added delay for firefox (deflake)
-        await driver.delayFirefox(1000);
-
-        // wait for and click connect
-        await driver.waitForSelector('#connectsignature-insights');
-        await driver.clickElement('#connectsignature-insights');
-
-        // switch to metamask extension
-        await driver.switchToWindowWithTitle(WINDOW_TITLES.Dialog);
-
-        // wait for and click connect
-        await driver.waitForSelector({
-          text: 'Connect',
-          tag: 'button',
-        });
-        await driver.clickElement({
-          text: 'Connect',
-          tag: 'button',
-        });
-
-        // wait for and click confirm
-        await driver.waitForSelector({ text: 'Confirm' });
-        await driver.clickElement({
-          text: 'Confirm',
-          tag: 'button',
-        });
-
-        // wait for and click ok and wait for window to close
-        await driver.waitForSelector({ text: 'OK' });
-        await driver.clickElementAndWaitForWindowToClose({
-          text: 'OK',
-          tag: 'button',
-        });
-
-        // switch to test-snaps page
-        await driver.switchToWindowWithTitle(WINDOW_TITLES.TestSnaps);
-
-        // open the test-dapp page
-        await openDapp(driver);
-
-        // TEST ONE: personal sign
-        // find and scroll to personal sign and click sign
-        const personalSignButton1 = await driver.findElement('#personalSign');
-        await driver.scrollToElement(personalSignButton1);
-        await driver.clickElement('#personalSign');
-
-        // switch back to MetaMask window and switch to tx insights pane
-        await driver.switchToWindowWithTitle(WINDOW_TITLES.Dialog);
-
-        // wait for information from signature request screen
-        await driver.waitForSelector({
-          text: 'Example `personal_sign` message',
-          tag: 'p',
-        });
-
-        // look for returned signature insights data
-        await driver.waitForSelector({
-          text: '0x4578616d706c652060706572736f6e616c5f7369676e60206d657373616765',
-          tag: 'p',
-        });
-
-        // Click down arrow
-        await driver.clickElementSafe('[aria-label="Scroll down"]');
-
-        // click sign button
-        await driver.clickElementAndWaitForWindowToClose(
-          '[data-testid="confirm-footer-button"]',
-        );
-
-        // switch back to test-dapp window
-        await driver.switchToWindowWithTitle(WINDOW_TITLES.TestDApp);
-
-        // check result of test
-        await driver.waitForSelector({
-          text: '0xa10b6707dd79e2f1f91ba243ab7abe15a46f58b052ad9cec170c5366ef5667c447a87eba2c0a9d4c9fbfa0a23e9db1fb55865d0568c32bd7cc681b8d0860e7af1b',
-          tag: 'span',
-        });
-
-        // TEST TWO: sign typed data
-        // find and scroll to sign typed data and click sign
-        const signTypedButton1 = await driver.findElement('#signTypedData');
-        await driver.scrollToElement(signTypedButton1);
-        await driver.clickElement('#signTypedData');
-
-        // switch back to MetaMask window and switch to tx insights pane
-        await driver.switchToWindowWithTitle(WINDOW_TITLES.Dialog);
-
-        // wait for information from signature request screen
-        await driver.waitForSelector({
-          text: 'Hi, Alice!',
-          tag: 'p',
-        });
-
-        // click down arrow
-        await driver.clickElementSafe('[aria-label="Scroll down"]');
-
-        // required: delay for scroll to render
-        await driver.delay(500);
-
-        // look for returned signature insights data
-        await driver.waitForSelector({
-          text: '1',
-          tag: 'p',
-        });
-
-        // click sign button and wait for window to close
-        await driver.clickElementAndWaitForWindowToClose(
-          '[data-testid="confirm-footer-button"]',
-        );
-
-        // switch back to test-dapp window
-        await driver.switchToWindowWithTitle(WINDOW_TITLES.TestDApp);
-
-        // check result of test
-        await driver.waitForSelector({
-          text: '0x32791e3c41d40dd5bbfb42e66cf80ca354b0869ae503ad61cd19ba68e11d4f0d2e42a5835b0bfd633596b6a7834ef7d36033633a2479dacfdb96bda360d51f451b',
-          tag: 'span',
-        });
-
-        // TEST THREE: sign typed data v3
-        // find and scroll to sign typed data v3 and click sign
-        const signTypedV3Button1 = await driver.findElement('#signTypedDataV3');
-        await driver.scrollToElement(signTypedV3Button1);
-        await driver.clickElement('#signTypedDataV3');
-
-        // switch back to MetaMask window and switch to tx insights pane
-        await driver.switchToWindowWithTitle(WINDOW_TITLES.Dialog);
-
-        // click down arrow
-        await driver.clickElementSafe('[aria-label="Scroll down"]');
-
-        // required: delay for scroll to render
-        await driver.delay(500);
-
-        // wait for information from signature request screen
-        await driver.waitForSelector({
-          text: 'Hello, Bob!',
-          tag: 'p',
-        });
-
-        // click down arrow
-        await driver.clickElementSafe('[aria-label="Scroll down"]');
-
-        // required: delay for scroll to render
-        await driver.delay(500);
-
-        // look for returned signature insights data
-        await driver.waitForSelector({
-          text: '0xCcCCccccCCCCcCCCCCCcCcCccCcCCCcCcccccccC has been identified as a malicious verifying contract.',
-          tag: 'p',
-        });
-
-        // click sign button
-        await driver.clickElementAndWaitForWindowToClose(
-          '[data-testid="confirm-footer-button"]',
-        );
-
-        // switch back to test-dapp window
-        await driver.switchToWindowWithTitle(WINDOW_TITLES.TestDApp);
-
-        // check result of test
-        await driver.waitForSelector({
-          text: '0x0a22f7796a2a70c8dc918e7e6eb8452c8f2999d1a1eb5ad714473d36270a40d6724472e5609948c778a07216bd082b60b6f6853d6354c731fd8ccdd3a2f4af261b',
-          tag: 'span',
-        });
-
-        // TEST FOUR: sign typed data v4
-        // find and scroll to sign typed data v4 and click sign
-        const signTypedV4Button1 = await driver.findElement('#signTypedDataV4');
-        await driver.scrollToElement(signTypedV4Button1);
-        await driver.clickElement('#signTypedDataV4');
-
-        // switch back to MetaMask window and switch to tx insights pane
-        await driver.switchToWindowWithTitle(WINDOW_TITLES.Dialog);
-
-        // click down arrow
-        await driver.clickElementSafe('[aria-label="Scroll down"]');
-
-        // required: delay for scroll to render
-        await driver.delay(500);
-
-        // wait for information from signature request screen
-        await driver.waitForSelector({
-          text: 'Hello, Bob!',
-          tag: 'p',
-        });
-
-        // click down arrow
-        await driver.clickElementSafe('[aria-label="Scroll down"]');
-
-        // required: delay for scroll to render
-        await driver.delay(500);
-
-        // look for returned signature insights data
-        await driver.waitForSelector({
-          text: '0xCcCCccccCCCCcCCCCCCcCcCccCcCCCcCcccccccC has been identified as a malicious verifying contract.',
-          tag: 'p',
-        });
-
-        // click sign button and wait for window to close
-        await driver.clickElementAndWaitForWindowToClose(
-          '[data-testid="confirm-footer-button"]',
-        );
-
-        // switch back to test-dapp window
-        await driver.switchToWindowWithTitle(WINDOW_TITLES.TestDApp);
-
-        // check results of test
-        await driver.waitForSelector({
-          text: '0xcd2f9c55840f5e1bcf61812e93c1932485b524ca673b36355482a4fbdf52f692684f92b4f4ab6f6c8572dacce46bd107da154be1c06939b855ecce57a1616ba71b',
-          tag: 'span',
-        });
-      },
-    );
+  describe('Old confirmation screens', function () {
+    it('tests Signature Insights functionality (Legacy)', async function () {
+      await withFixtures(
+        {
+          dapp: true,
+          fixtures: new FixtureBuilder()
+            .withPermissionControllerConnectedToTestDapp()
+            .build(),
+          ganacheOptions: defaultGanacheOptions,
+          failOnConsoleError: false,
+          title: this.test.fullTitle(),
+        },
+        async ({ driver }) => {
+          await unlockWallet(driver);
+          await tempToggleSettingRedesignedConfirmations(driver);
+
+          // navigate to test snaps page and connect
+          await driver.openNewPage(TEST_SNAPS_WEBSITE_URL);
+
+          // delay added for page render (deflake)
+          await driver.delay(1000);
+
+          // find and scroll to the transaction-insights test snap
+          const snapButton1 = await driver.findElement(
+            '#connectsignature-insights',
+          );
+          await driver.scrollToElement(snapButton1);
+
+          // added delay for firefox (deflake)
+          await driver.delayFirefox(1000);
+
+          // wait for and click connect
+          await driver.waitForSelector('#connectsignature-insights');
+          await driver.clickElement('#connectsignature-insights');
+
+          // switch to metamask extension
+          await driver.switchToWindowWithTitle(WINDOW_TITLES.Dialog);
+
+          // wait for and click connect
+          await driver.waitForSelector({
+            text: 'Connect',
+            tag: 'button',
+          });
+          await driver.clickElement({
+            text: 'Connect',
+            tag: 'button',
+          });
+
+          // wait for and click confirm
+          await driver.waitForSelector({ text: 'Confirm' });
+          await driver.clickElement({
+            text: 'Confirm',
+            tag: 'button',
+          });
+
+          // wait for and click ok and wait for window to close
+          await driver.waitForSelector({ text: 'OK' });
+          await driver.clickElementAndWaitForWindowToClose({
+            text: 'OK',
+            tag: 'button',
+          });
+
+          // switch to test-snaps page
+          await driver.switchToWindowWithTitle(WINDOW_TITLES.TestSnaps);
+
+          // open the test-dapp page
+          await openDapp(driver);
+
+          // TEST ONE: personal sign
+          // find and scroll to personal sign and click sign
+          const personalSignButton1 = await driver.findElement('#personalSign');
+          await driver.scrollToElement(personalSignButton1);
+          await driver.clickElement('#personalSign');
+
+          // switch back to MetaMask window and switch to tx insights pane
+          await driver.switchToWindowWithTitle(WINDOW_TITLES.Dialog);
+
+          // wait for and click sign
+          await clickSignOnSignatureConfirmation({
+            driver,
+            snapSigInsights: true,
+          });
+
+          // look for returned signature insights data
+          await driver.waitForSelector({
+            text: '0x4578616d706c652060706572736f6e616c5f7369676e60206d657373616765',
+            tag: 'p',
+          });
+
+          // wait for host to render and click checkbox to authorize signing
+          await driver.waitForSelector({
+            text: '127.0.0.1:8080',
+            tag: 'span',
+          });
+          await driver.clickElement('.mm-checkbox__input-wrapper');
+
+          // click sign button and wait for window to close
+          await driver.clickElementAndWaitForWindowToClose(
+            '[data-testid="snapInsightsButtonConfirm"]',
+          );
+
+          // switch back to test-dapp window
+          await driver.switchToWindowWithTitle(WINDOW_TITLES.TestDApp);
+
+          // check result of test
+          await driver.waitForSelector({
+            text: '0xa10b6707dd79e2f1f91ba243ab7abe15a46f58b052ad9cec170c5366ef5667c447a87eba2c0a9d4c9fbfa0a23e9db1fb55865d0568c32bd7cc681b8d0860e7af1b',
+            tag: 'span',
+          });
+
+          // TEST TWO: sign typed data
+          // find and scroll to sign typed data and click sign
+          const signTypedButton1 = await driver.findElement('#signTypedData');
+          await driver.scrollToElement(signTypedButton1);
+          await driver.clickElement('#signTypedData');
+
+          // switch back to MetaMask window and switch to tx insights pane
+          await driver.switchToWindowWithTitle(WINDOW_TITLES.Dialog);
+
+          // wait for and click sign
+          await clickSignOnSignatureConfirmation({
+            driver,
+            snapSigInsights: true,
+          });
+
+          // look for returned signature insights data
+          await driver.waitForSelector({
+            text: '1',
+            tag: 'p',
+          });
+
+          // wait for host to render and click checkbox to authorize signing
+          await driver.waitForSelector({
+            text: '127.0.0.1:8080',
+            tag: 'span',
+          });
+          await driver.clickElement('.mm-checkbox__input-wrapper');
+
+          // click sign button and wait for window to close
+          await driver.clickElementAndWaitForWindowToClose(
+            '[data-testid="snapInsightsButtonConfirm"]',
+          );
+
+          // switch back to test-dapp window
+          await driver.switchToWindowWithTitle(WINDOW_TITLES.TestDApp);
+
+          // check result of test
+          await driver.waitForSelector({
+            text: '0x32791e3c41d40dd5bbfb42e66cf80ca354b0869ae503ad61cd19ba68e11d4f0d2e42a5835b0bfd633596b6a7834ef7d36033633a2479dacfdb96bda360d51f451b',
+            tag: 'span',
+          });
+
+          // TEST THREE: sign typed data v3
+          // find and scroll to sign typed data v3 and click sign
+          const signTypedV3Button1 = await driver.findElement(
+            '#signTypedDataV3',
+          );
+          await driver.scrollToElement(signTypedV3Button1);
+          await driver.clickElement('#signTypedDataV3');
+
+          // switch back to MetaMask window and switch to tx insights pane
+          await driver.switchToWindowWithTitle(WINDOW_TITLES.Dialog);
+
+          // click down arrow
+          await driver.clickElementSafe('.fa-arrow-down');
+
+          // wait for and click sign
+          await clickSignOnSignatureConfirmation({
+            driver,
+            snapSigInsights: true,
+          });
+
+          // look for returned signature insights data
+          await driver.waitForSelector({
+            text: '0xCcCCccccCCCCcCCCCCCcCcCccCcCCCcCcccccccC has been identified as a malicious verifying contract.',
+            tag: 'p',
+          });
+
+          // wait for host to render and click checkbox to authorize signing
+          await driver.waitForSelector({
+            text: '127.0.0.1:8080',
+            tag: 'span',
+          });
+          await driver.clickElement('.mm-checkbox__input-wrapper');
+
+          // click sign button and wait for window to close
+          await driver.clickElementAndWaitForWindowToClose(
+            '[data-testid="snapInsightsButtonConfirm"]',
+          );
+
+          // switch back to test-dapp window
+          await driver.switchToWindowWithTitle(WINDOW_TITLES.TestDApp);
+
+          // check result of test
+          await driver.waitForSelector({
+            text: '0x0a22f7796a2a70c8dc918e7e6eb8452c8f2999d1a1eb5ad714473d36270a40d6724472e5609948c778a07216bd082b60b6f6853d6354c731fd8ccdd3a2f4af261b',
+            tag: 'span',
+          });
+
+          // TEST FOUR: sign typed data v4
+          // find and scroll to sign typed data v4 and click sign
+          const signTypedV4Button1 = await driver.findElement(
+            '#signTypedDataV4',
+          );
+          await driver.scrollToElement(signTypedV4Button1);
+          await driver.clickElement('#signTypedDataV4');
+
+          // switch back to MetaMask window and switch to tx insights pane
+          await driver.switchToWindowWithTitle(WINDOW_TITLES.Dialog);
+
+          // click down arrow
+          await driver.clickElementSafe('.fa-arrow-down');
+
+          // wait for and click sign
+          await clickSignOnSignatureConfirmation({
+            driver,
+            snapSigInsights: true,
+          });
+
+          // look for returned signature insights data
+          await driver.waitForSelector({
+            text: '0xCcCCccccCCCCcCCCCCCcCcCccCcCCCcCcccccccC has been identified as a malicious verifying contract.',
+            tag: 'p',
+          });
+
+          // wait for host to render and click checkbox to authorize signing
+          await driver.waitForSelector({
+            text: '127.0.0.1:8080',
+            tag: 'span',
+          });
+          await driver.clickElement('.mm-checkbox__input-wrapper');
+
+          // click sign button and wait for window to close
+          await driver.clickElementAndWaitForWindowToClose(
+            '[data-testid="snapInsightsButtonConfirm"]',
+          );
+
+          // switch back to test-dapp window
+          await driver.switchToWindowWithTitle(WINDOW_TITLES.TestDApp);
+
+          // check results of test
+          await driver.waitForSelector({
+            text: '0xcd2f9c55840f5e1bcf61812e93c1932485b524ca673b36355482a4fbdf52f692684f92b4f4ab6f6c8572dacce46bd107da154be1c06939b855ecce57a1616ba71b',
+            tag: 'span',
+          });
+        },
+      );
+    });
   });
 
-  it('tests Signature Insights functionality (Legacy)', async function () {
-    await withFixtures(
-      {
-        dapp: true,
-        fixtures: new FixtureBuilder()
-          .withPermissionControllerConnectedToTestDapp()
-          .build(),
-        ganacheOptions: defaultGanacheOptions,
-        failOnConsoleError: false,
-        title: this.test.fullTitle(),
-      },
-      async ({ driver }) => {
-        await unlockWallet(driver);
-        await tempToggleSettingRedesignedConfirmations(driver);
-
-        // navigate to test snaps page and connect
-        await driver.openNewPage(TEST_SNAPS_WEBSITE_URL);
-
-        // delay added for page render (deflake)
-        await driver.delay(1000);
-
-        // find and scroll to the transaction-insights test snap
-        const snapButton1 = await driver.findElement(
-          '#connectsignature-insights',
-        );
-        await driver.scrollToElement(snapButton1);
-
-        // added delay for firefox (deflake)
-        await driver.delayFirefox(1000);
-
-        // wait for and click connect
-        await driver.waitForSelector('#connectsignature-insights');
-        await driver.clickElement('#connectsignature-insights');
-
-        // switch to metamask extension
-        await driver.switchToWindowWithTitle(WINDOW_TITLES.Dialog);
-
-        // wait for and click connect
-        await driver.waitForSelector({
-          text: 'Connect',
-          tag: 'button',
-        });
-        await driver.clickElement({
-          text: 'Connect',
-          tag: 'button',
-        });
-
-        // wait for and click confirm
-        await driver.waitForSelector({ text: 'Confirm' });
-        await driver.clickElement({
-          text: 'Confirm',
-          tag: 'button',
-        });
-
-        // wait for and click ok and wait for window to close
-        await driver.waitForSelector({ text: 'OK' });
-        await driver.clickElementAndWaitForWindowToClose({
-          text: 'OK',
-          tag: 'button',
-        });
-
-        // switch to test-snaps page
-        await driver.switchToWindowWithTitle(WINDOW_TITLES.TestSnaps);
-
-        // open the test-dapp page
-        await openDapp(driver);
-
-        // TEST ONE: personal sign
-        // find and scroll to personal sign and click sign
-        const personalSignButton1 = await driver.findElement('#personalSign');
-        await driver.scrollToElement(personalSignButton1);
-        await driver.clickElement('#personalSign');
-
-        // switch back to MetaMask window and switch to tx insights pane
-        await driver.switchToWindowWithTitle(WINDOW_TITLES.Dialog);
-
-        // wait for and click sign
-        await clickSignOnSignatureConfirmation({
-          driver,
-          snapSigInsights: true,
-        });
-
-        // look for returned signature insights data
-        await driver.waitForSelector({
-          text: '0x4578616d706c652060706572736f6e616c5f7369676e60206d657373616765',
-          tag: 'p',
-        });
-
-        // wait for host to render and click checkbox to authorize signing
-        await driver.waitForSelector({
-          text: '127.0.0.1:8080',
-          tag: 'span',
-        });
-        await driver.clickElement('.mm-checkbox__input-wrapper');
-
-        // click sign button and wait for window to close
-        await driver.clickElementAndWaitForWindowToClose(
-          '[data-testid="snapInsightsButtonConfirm"]',
-        );
-
-        // switch back to test-dapp window
-        await driver.switchToWindowWithTitle(WINDOW_TITLES.TestDApp);
-
-        // check result of test
-        await driver.waitForSelector({
-          text: '0xa10b6707dd79e2f1f91ba243ab7abe15a46f58b052ad9cec170c5366ef5667c447a87eba2c0a9d4c9fbfa0a23e9db1fb55865d0568c32bd7cc681b8d0860e7af1b',
-          tag: 'span',
-        });
-
-        // TEST TWO: sign typed data
-        // find and scroll to sign typed data and click sign
-        const signTypedButton1 = await driver.findElement('#signTypedData');
-        await driver.scrollToElement(signTypedButton1);
-        await driver.clickElement('#signTypedData');
-
-        // switch back to MetaMask window and switch to tx insights pane
-        await driver.switchToWindowWithTitle(WINDOW_TITLES.Dialog);
-
-        // wait for and click sign
-        await clickSignOnSignatureConfirmation({
-          driver,
-          snapSigInsights: true,
-        });
-
-        // look for returned signature insights data
-        await driver.waitForSelector({
-          text: '1',
-          tag: 'p',
-        });
-
-        // wait for host to render and click checkbox to authorize signing
-        await driver.waitForSelector({
-          text: '127.0.0.1:8080',
-          tag: 'span',
-        });
-        await driver.clickElement('.mm-checkbox__input-wrapper');
-
-        // click sign button and wait for window to close
-        await driver.clickElementAndWaitForWindowToClose(
-          '[data-testid="snapInsightsButtonConfirm"]',
-        );
-
-        // switch back to test-dapp window
-        await driver.switchToWindowWithTitle(WINDOW_TITLES.TestDApp);
-
-        // check result of test
-        await driver.waitForSelector({
-          text: '0x32791e3c41d40dd5bbfb42e66cf80ca354b0869ae503ad61cd19ba68e11d4f0d2e42a5835b0bfd633596b6a7834ef7d36033633a2479dacfdb96bda360d51f451b',
-          tag: 'span',
-        });
-
-        // TEST THREE: sign typed data v3
-        // find and scroll to sign typed data v3 and click sign
-        const signTypedV3Button1 = await driver.findElement('#signTypedDataV3');
-        await driver.scrollToElement(signTypedV3Button1);
-        await driver.clickElement('#signTypedDataV3');
-
-        // switch back to MetaMask window and switch to tx insights pane
-        await driver.switchToWindowWithTitle(WINDOW_TITLES.Dialog);
-
-        // click down arrow
-        await driver.waitForSelector('.fa-arrow-down');
-        await driver.clickElement('.fa-arrow-down');
-
-        // wait for and click sign
-        await clickSignOnSignatureConfirmation({
-          driver,
-          snapSigInsights: true,
-        });
-
-        // look for returned signature insights data
-        await driver.waitForSelector({
-          text: '0xCcCCccccCCCCcCCCCCCcCcCccCcCCCcCcccccccC has been identified as a malicious verifying contract.',
-          tag: 'p',
-        });
-
-        // wait for host to render and click checkbox to authorize signing
-        await driver.waitForSelector({
-          text: '127.0.0.1:8080',
-          tag: 'span',
-        });
-        await driver.clickElement('.mm-checkbox__input-wrapper');
-
-        // click sign button and wait for window to close
-        await driver.clickElementAndWaitForWindowToClose(
-          '[data-testid="snapInsightsButtonConfirm"]',
-        );
-
-        // switch back to test-dapp window
-        await driver.switchToWindowWithTitle(WINDOW_TITLES.TestDApp);
-
-        // check result of test
-        await driver.waitForSelector({
-          text: '0x0a22f7796a2a70c8dc918e7e6eb8452c8f2999d1a1eb5ad714473d36270a40d6724472e5609948c778a07216bd082b60b6f6853d6354c731fd8ccdd3a2f4af261b',
-          tag: 'span',
-        });
-
-        // TEST FOUR: sign typed data v4
-        // find and scroll to sign typed data v4 and click sign
-        const signTypedV4Button1 = await driver.findElement('#signTypedDataV4');
-        await driver.scrollToElement(signTypedV4Button1);
-        await driver.clickElement('#signTypedDataV4');
-
-        // switch back to MetaMask window and switch to tx insights pane
-        await driver.switchToWindowWithTitle(WINDOW_TITLES.Dialog);
-
-        // click down arrow
-        await driver.waitForSelector('.fa-arrow-down');
-        await driver.clickElement('.fa-arrow-down');
-
-        // wait for and click sign
-        await clickSignOnSignatureConfirmation({
-          driver,
-          snapSigInsights: true,
-        });
-
-        // look for returned signature insights data
-        await driver.waitForSelector({
-          text: '0xCcCCccccCCCCcCCCCCCcCcCccCcCCCcCcccccccC has been identified as a malicious verifying contract.',
-          tag: 'p',
-        });
-
-        // wait for host to render and click checkbox to authorize signing
-        await driver.waitForSelector({
-          text: '127.0.0.1:8080',
-          tag: 'span',
-        });
-        await driver.clickElement('.mm-checkbox__input-wrapper');
-
-        // click sign button and wait for window to close
-        await driver.clickElementAndWaitForWindowToClose(
-          '[data-testid="snapInsightsButtonConfirm"]',
-        );
-
-        // switch back to test-dapp window
-        await driver.switchToWindowWithTitle(WINDOW_TITLES.TestDApp);
-
-        // check results of test
-        await driver.waitForSelector({
-          text: '0xcd2f9c55840f5e1bcf61812e93c1932485b524ca673b36355482a4fbdf52f692684f92b4f4ab6f6c8572dacce46bd107da154be1c06939b855ecce57a1616ba71b',
-          tag: 'span',
-        });
-      },
-    );
+  describe('Redesigned confirmation screens', function () {
+    it('tests Signature Insights functionality (New)', async function () {
+      await withFixtures(
+        {
+          dapp: true,
+          fixtures: new FixtureBuilder()
+            .withPermissionControllerConnectedToTestDapp()
+            .build(),
+          ganacheOptions: defaultGanacheOptions,
+          failOnConsoleError: false,
+          title: this.test.fullTitle(),
+        },
+        async ({ driver }) => {
+          await unlockWallet(driver);
+
+          // navigate to test snaps page and connect
+          await driver.openNewPage(TEST_SNAPS_WEBSITE_URL);
+
+          // wait for page to load
+          await driver.waitForSelector({
+            text: 'Installed Snaps',
+            tag: 'h2',
+          });
+
+          // find and scroll to the transaction-insights snap
+          const snapButton1 = await driver.findElement(
+            '#connectsignature-insights',
+          );
+          await driver.scrollToElement(snapButton1);
+
+          // added delay for firefox (deflake)
+          await driver.delayFirefox(1000);
+
+          // wait for and click connect
+          await driver.waitForSelector('#connectsignature-insights');
+          await driver.clickElement('#connectsignature-insights');
+
+          // switch to metamask extension
+          await driver.switchToWindowWithTitle(WINDOW_TITLES.Dialog);
+
+          // wait for and click connect
+          await driver.waitForSelector({
+            text: 'Connect',
+            tag: 'button',
+          });
+          await driver.clickElement({
+            text: 'Connect',
+            tag: 'button',
+          });
+
+          // wait for and click confirm
+          await driver.waitForSelector({ text: 'Confirm' });
+          await driver.clickElement({
+            text: 'Confirm',
+            tag: 'button',
+          });
+
+          // wait for and click ok and wait for window to close
+          await driver.waitForSelector({ text: 'OK' });
+          await driver.clickElementAndWaitForWindowToClose({
+            text: 'OK',
+            tag: 'button',
+          });
+
+          // switch to test-snaps page
+          await driver.switchToWindowWithTitle(WINDOW_TITLES.TestSnaps);
+
+          // open the test-dapp page
+          await openDapp(driver);
+
+          // TEST ONE: personal sign
+          // find and scroll to personal sign and click sign
+          const personalSignButton1 = await driver.findElement('#personalSign');
+          await driver.scrollToElement(personalSignButton1);
+          await driver.clickElement('#personalSign');
+
+          // switch back to MetaMask window and switch to tx insights pane
+          await driver.switchToWindowWithTitle(WINDOW_TITLES.Dialog);
+
+          // wait for information from signature request screen
+          await driver.waitForSelector({
+            text: 'Example `personal_sign` message',
+            tag: 'p',
+          });
+
+          // look for returned signature insights data
+          await driver.waitForSelector({
+            text: '0x4578616d706c652060706572736f6e616c5f7369676e60206d657373616765',
+            tag: 'p',
+          });
+
+          // Click down arrow
+          await driver.clickElementSafe('[aria-label="Scroll down"]');
+
+          // click sign button
+          await driver.clickElementAndWaitForWindowToClose(
+            '[data-testid="confirm-footer-button"]',
+          );
+
+          // switch back to test-dapp window
+          await driver.switchToWindowWithTitle(WINDOW_TITLES.TestDApp);
+
+          // check result of test
+          await driver.waitForSelector({
+            text: '0xa10b6707dd79e2f1f91ba243ab7abe15a46f58b052ad9cec170c5366ef5667c447a87eba2c0a9d4c9fbfa0a23e9db1fb55865d0568c32bd7cc681b8d0860e7af1b',
+            tag: 'span',
+          });
+
+          // TEST TWO: sign typed data
+          // find and scroll to sign typed data and click sign
+          const signTypedButton1 = await driver.findElement('#signTypedData');
+          await driver.scrollToElement(signTypedButton1);
+          await driver.clickElement('#signTypedData');
+
+          // switch back to MetaMask window and switch to tx insights pane
+          await driver.switchToWindowWithTitle(WINDOW_TITLES.Dialog);
+
+          // wait for information from signature request screen
+          await driver.waitForSelector({
+            text: 'Hi, Alice!',
+            tag: 'p',
+          });
+
+          // click down arrow
+          await driver.clickElementSafe('[aria-label="Scroll down"]');
+
+          // required: delay for scroll to render
+          await driver.delay(500);
+
+          // look for returned signature insights data
+          await driver.waitForSelector({
+            text: '1',
+            tag: 'p',
+          });
+
+          // click sign button and wait for window to close
+          await driver.clickElementAndWaitForWindowToClose(
+            '[data-testid="confirm-footer-button"]',
+          );
+
+          // switch back to test-dapp window
+          await driver.switchToWindowWithTitle(WINDOW_TITLES.TestDApp);
+
+          // check result of test
+          await driver.waitForSelector({
+            text: '0x32791e3c41d40dd5bbfb42e66cf80ca354b0869ae503ad61cd19ba68e11d4f0d2e42a5835b0bfd633596b6a7834ef7d36033633a2479dacfdb96bda360d51f451b',
+            tag: 'span',
+          });
+
+          // TEST THREE: sign typed data v3
+          // find and scroll to sign typed data v3 and click sign
+          const signTypedV3Button1 = await driver.findElement(
+            '#signTypedDataV3',
+          );
+          await driver.scrollToElement(signTypedV3Button1);
+          await driver.clickElement('#signTypedDataV3');
+
+          // switch back to MetaMask window and switch to tx insights pane
+          await driver.switchToWindowWithTitle(WINDOW_TITLES.Dialog);
+
+          // click down arrow
+          await driver.clickElementSafe('[aria-label="Scroll down"]');
+
+          // required: delay for scroll to render
+          await driver.delay(500);
+
+          // wait for information from signature request screen
+          await driver.waitForSelector({
+            text: 'Hello, Bob!',
+            tag: 'p',
+          });
+
+          // click down arrow
+          await driver.clickElementSafe('[aria-label="Scroll down"]');
+
+          // required: delay for scroll to render
+          await driver.delay(500);
+
+          // look for returned signature insights data
+          await driver.waitForSelector({
+            text: '0xCcCCccccCCCCcCCCCCCcCcCccCcCCCcCcccccccC has been identified as a malicious verifying contract.',
+            tag: 'p',
+          });
+
+          // click sign button
+          await driver.clickElementAndWaitForWindowToClose(
+            '[data-testid="confirm-footer-button"]',
+          );
+
+          // switch back to test-dapp window
+          await driver.switchToWindowWithTitle(WINDOW_TITLES.TestDApp);
+
+          // check result of test
+          await driver.waitForSelector({
+            text: '0x0a22f7796a2a70c8dc918e7e6eb8452c8f2999d1a1eb5ad714473d36270a40d6724472e5609948c778a07216bd082b60b6f6853d6354c731fd8ccdd3a2f4af261b',
+            tag: 'span',
+          });
+
+          // TEST FOUR: sign typed data v4
+          // find and scroll to sign typed data v4 and click sign
+          const signTypedV4Button1 = await driver.findElement(
+            '#signTypedDataV4',
+          );
+          await driver.scrollToElement(signTypedV4Button1);
+          await driver.clickElement('#signTypedDataV4');
+
+          // switch back to MetaMask window and switch to tx insights pane
+          await driver.switchToWindowWithTitle(WINDOW_TITLES.Dialog);
+
+          // click down arrow
+          await driver.clickElementSafe('[aria-label="Scroll down"]');
+
+          // required: delay for scroll to render
+          await driver.delay(500);
+
+          // wait for information from signature request screen
+          await driver.waitForSelector({
+            text: 'Hello, Bob!',
+            tag: 'p',
+          });
+
+          // click down arrow
+          await driver.clickElementSafe('[aria-label="Scroll down"]');
+
+          // required: delay for scroll to render
+          await driver.delay(500);
+
+          // look for returned signature insights data
+          await driver.waitForSelector({
+            text: '0xCcCCccccCCCCcCCCCCCcCcCccCcCCCcCcccccccC has been identified as a malicious verifying contract.',
+            tag: 'p',
+          });
+
+          // click sign button and wait for window to close
+          await driver.clickElementAndWaitForWindowToClose(
+            '[data-testid="confirm-footer-button"]',
+          );
+
+          // switch back to test-dapp window
+          await driver.switchToWindowWithTitle(WINDOW_TITLES.TestDApp);
+
+          // check results of test
+          await driver.waitForSelector({
+            text: '0xcd2f9c55840f5e1bcf61812e93c1932485b524ca673b36355482a4fbdf52f692684f92b4f4ab6f6c8572dacce46bd107da154be1c06939b855ecce57a1616ba71b',
+            tag: 'span',
+          });
+        },
+      );
+    });
+
+    it('tests Signature Insights functionality (Legacy)', async function () {
+      await withFixtures(
+        {
+          dapp: true,
+          fixtures: new FixtureBuilder()
+            .withPermissionControllerConnectedToTestDapp()
+            .build(),
+          ganacheOptions: defaultGanacheOptions,
+          failOnConsoleError: false,
+          title: this.test.fullTitle(),
+        },
+        async ({ driver }) => {
+          await unlockWallet(driver);
+
+          // navigate to test snaps page and connect
+          await driver.openNewPage(TEST_SNAPS_WEBSITE_URL);
+
+          // delay added for page render (deflake)
+          await driver.delay(1000);
+
+          // find and scroll to the transaction-insights test snap
+          const snapButton1 = await driver.findElement(
+            '#connectsignature-insights',
+          );
+          await driver.scrollToElement(snapButton1);
+
+          // added delay for firefox (deflake)
+          await driver.delayFirefox(1000);
+
+          // wait for and click connect
+          await driver.waitForSelector('#connectsignature-insights');
+          await driver.clickElement('#connectsignature-insights');
+
+          // switch to metamask extension
+          await driver.switchToWindowWithTitle(WINDOW_TITLES.Dialog);
+
+          // wait for and click connect
+          await driver.waitForSelector({
+            text: 'Connect',
+            tag: 'button',
+          });
+          await driver.clickElement({
+            text: 'Connect',
+            tag: 'button',
+          });
+
+          // wait for and click confirm
+          await driver.waitForSelector({ text: 'Confirm' });
+          await driver.clickElement({
+            text: 'Confirm',
+            tag: 'button',
+          });
+
+          // wait for and click ok and wait for window to close
+          await driver.waitForSelector({ text: 'OK' });
+          await driver.clickElementAndWaitForWindowToClose({
+            text: 'OK',
+            tag: 'button',
+          });
+
+          // switch to test-snaps page
+          await driver.switchToWindowWithTitle(WINDOW_TITLES.TestSnaps);
+
+          // open the test-dapp page
+          await openDapp(driver);
+
+          // TEST ONE: personal sign
+          // find and scroll to personal sign and click sign
+          const personalSignButton1 = await driver.findElement('#personalSign');
+          await driver.scrollToElement(personalSignButton1);
+          await driver.clickElement('#personalSign');
+
+          // switch back to MetaMask window and switch to tx insights pane
+          await driver.switchToWindowWithTitle(WINDOW_TITLES.Dialog);
+
+          // look for returned signature insights data
+          await driver.waitForSelector({
+            text: '0x4578616d706c652060706572736f6e616c5f7369676e60206d657373616765',
+            tag: 'p',
+          });
+
+          // wait for host to render and click checkbox to authorize signing
+          await driver.waitForSelector({
+            text: '127.0.0.1:8080',
+            tag: 'p',
+          });
+
+          // wait for and click sign
+          await clickSignOnRedesignedSignatureConfirmation({
+            driver,
+            snapSigInsights: true,
+          });
+
+          // switch back to test-dapp window
+          await driver.switchToWindowWithTitle(WINDOW_TITLES.TestDApp);
+
+          // check result of test
+          await driver.waitForSelector({
+            text: '0xa10b6707dd79e2f1f91ba243ab7abe15a46f58b052ad9cec170c5366ef5667c447a87eba2c0a9d4c9fbfa0a23e9db1fb55865d0568c32bd7cc681b8d0860e7af1b',
+            tag: 'span',
+          });
+
+          // TEST TWO: sign typed data
+          // find and scroll to sign typed data and click sign
+          const signTypedButton1 = await driver.findElement('#signTypedData');
+          await driver.scrollToElement(signTypedButton1);
+          await driver.clickElement('#signTypedData');
+
+          // switch back to MetaMask window and switch to tx insights pane
+          await driver.switchToWindowWithTitle(WINDOW_TITLES.Dialog);
+
+          // look for returned signature insights data
+          await driver.waitForSelector({
+            text: '1',
+            tag: 'p',
+          });
+
+          // wait for host to render and click checkbox to authorize signing
+          await driver.waitForSelector({
+            text: '127.0.0.1:8080',
+            tag: 'p',
+          });
+
+          // wait for and click sign
+          await clickSignOnRedesignedSignatureConfirmation({
+            driver,
+            snapSigInsights: true,
+          });
+
+          // switch back to test-dapp window
+          await driver.switchToWindowWithTitle(WINDOW_TITLES.TestDApp);
+
+          // check result of test
+          await driver.waitForSelector({
+            text: '0x32791e3c41d40dd5bbfb42e66cf80ca354b0869ae503ad61cd19ba68e11d4f0d2e42a5835b0bfd633596b6a7834ef7d36033633a2479dacfdb96bda360d51f451b',
+            tag: 'span',
+          });
+
+          // TEST THREE: sign typed data v3
+          // find and scroll to sign typed data v3 and click sign
+          const signTypedV3Button1 = await driver.findElement(
+            '#signTypedDataV3',
+          );
+          await driver.scrollToElement(signTypedV3Button1);
+          await driver.clickElement('#signTypedDataV3');
+
+          // switch back to MetaMask window and switch to tx insights pane
+          await driver.switchToWindowWithTitle(WINDOW_TITLES.Dialog);
+
+          // look for returned signature insights data
+          await driver.waitForSelector({
+            text: '0xCcCCccccCCCCcCCCCCCcCcCccCcCCCcCcccccccC has been identified as a malicious verifying contract.',
+            tag: 'p',
+          });
+
+          // wait for host to render and click checkbox to authorize signing
+          await driver.waitForSelector({
+            text: '127.0.0.1:8080',
+            tag: 'p',
+          });
+
+          // wait for and click sign
+          await clickSignOnRedesignedSignatureConfirmation({
+            driver,
+            snapSigInsights: true,
+          });
+
+          // switch back to test-dapp window
+          await driver.switchToWindowWithTitle(WINDOW_TITLES.TestDApp);
+
+          // check result of test
+          await driver.waitForSelector({
+            text: '0x0a22f7796a2a70c8dc918e7e6eb8452c8f2999d1a1eb5ad714473d36270a40d6724472e5609948c778a07216bd082b60b6f6853d6354c731fd8ccdd3a2f4af261b',
+            tag: 'span',
+          });
+
+          // TEST FOUR: sign typed data v4
+          // find and scroll to sign typed data v4 and click sign
+          const signTypedV4Button1 = await driver.findElement(
+            '#signTypedDataV4',
+          );
+          await driver.scrollToElement(signTypedV4Button1);
+          await driver.clickElement('#signTypedDataV4');
+
+          // switch back to MetaMask window and switch to tx insights pane
+          await driver.switchToWindowWithTitle(WINDOW_TITLES.Dialog);
+
+          // look for returned signature insights data
+          await driver.waitForSelector({
+            text: '0xCcCCccccCCCCcCCCCCCcCcCccCcCCCcCcccccccC has been identified as a malicious verifying contract.',
+            tag: 'p',
+          });
+
+          // wait for host to render and click checkbox to authorize signing
+          await driver.waitForSelector({
+            text: '127.0.0.1:8080',
+            tag: 'p',
+          });
+
+          // wait for and click sign
+          await clickSignOnRedesignedSignatureConfirmation({
+            driver,
+            snapSigInsights: true,
+          });
+
+          // switch back to test-dapp window
+          await driver.switchToWindowWithTitle(WINDOW_TITLES.TestDApp);
+
+          // check results of test
+          await driver.waitForSelector({
+            text: '0xcd2f9c55840f5e1bcf61812e93c1932485b524ca673b36355482a4fbdf52f692684f92b4f4ab6f6c8572dacce46bd107da154be1c06939b855ecce57a1616ba71b',
+            tag: 'span',
+          });
+        },
+      );
+    });
   });
 });
diff --git a/test/e2e/tests/dapp-interactions/signin-with-ethereum.spec.js b/test/e2e/tests/dapp-interactions/signin-with-ethereum.spec.js
index b2fe384f9523..eab8dc430d40 100644
--- a/test/e2e/tests/dapp-interactions/signin-with-ethereum.spec.js
+++ b/test/e2e/tests/dapp-interactions/signin-with-ethereum.spec.js
@@ -11,74 +11,157 @@ const {
 const FixtureBuilder = require('../../fixture-builder');
 
 describe('Sign in with ethereum', function () {
-  it('user should be able to confirm sign in with ethereum', async function () {
-    const expectedSigninMessageTitle =
-      'This site is requesting to sign in with Account 1';
-    const expectedSigninMessage =
-      'I accept the MetaMask Terms of Service: https://community.metamask.io/tos';
-    const expectedSignInResult =
-      '0xef8674a92d62a1876624547bdccaef6c67014ae821de18fa910fbff56577a65830f68848585b33d1f4b9ea1c3da1c1b11553b6aabe8446717daf7cd1e38a68271c';
-    await withFixtures(
-      {
-        dapp: true,
-        fixtures: new FixtureBuilder()
-          .withPermissionControllerConnectedToTestDapp()
-          .build(),
-        ganacheOptions: defaultGanacheOptions,
-        title: this.test.fullTitle(),
-      },
-      async ({ driver }) => {
-        await unlockWallet(driver);
-        await tempToggleSettingRedesignedConfirmations(driver);
+  describe('Old confirmation screens', function () {
+    it('user should be able to confirm sign in with ethereum', async function () {
+      const expectedSigninMessageTitle =
+        'This site is requesting to sign in with Account 1';
+      const expectedSigninMessage =
+        'I accept the MetaMask Terms of Service: https://community.metamask.io/tos';
+      const expectedSignInResult =
+        '0xef8674a92d62a1876624547bdccaef6c67014ae821de18fa910fbff56577a65830f68848585b33d1f4b9ea1c3da1c1b11553b6aabe8446717daf7cd1e38a68271c';
+      await withFixtures(
+        {
+          dapp: true,
+          fixtures: new FixtureBuilder()
+            .withPermissionControllerConnectedToTestDapp()
+            .build(),
+          ganacheOptions: defaultGanacheOptions,
+          title: this.test.fullTitle(),
+        },
+        async ({ driver }) => {
+          await unlockWallet(driver);
+          await tempToggleSettingRedesignedConfirmations(driver);
 
-        // Create a signin with ethereum request in test dapp
-        await openDapp(driver);
-        await driver.clickElement('#siwe');
+          // Create a signin with ethereum request in test dapp
+          await openDapp(driver);
+          await driver.clickElement('#siwe');
 
-        // Wait for signature request popup and check the message title
-        await driver.waitUntilXWindowHandles(3);
-        let windowHandles = await driver.getAllWindowHandles();
-        await driver.switchToWindowWithTitle(
-          WINDOW_TITLES.Dialog,
-          windowHandles,
-        );
-        const title = await driver.findElement(
-          '.permissions-connect-header__title',
-        );
-        const origin = await driver.findElement('.site-origin');
-        assert.equal(await title.getText(), 'Sign-in request');
-        assert.equal(await origin.getText(), DAPP_URL);
+          // Wait for signature request popup and check the message title
+          await driver.waitUntilXWindowHandles(3);
+          let windowHandles = await driver.getAllWindowHandles();
+          await driver.switchToWindowWithTitle(
+            WINDOW_TITLES.Dialog,
+            windowHandles,
+          );
+          const title = await driver.findElement(
+            '.permissions-connect-header__title',
+          );
+          const origin = await driver.findElement('.site-origin');
+          assert.equal(await title.getText(), 'Sign-in request');
+          assert.equal(await origin.getText(), DAPP_URL);
 
-        const displayedMessageTitle = await driver.findElement(
-          '.permissions-connect-header__subtitle',
-        );
-        const account = await driver.findElement(
-          '.account-list-item__account-name',
-        );
-        assert.equal(
-          `${await displayedMessageTitle.getText()} ${await account.getText()}`,
-          expectedSigninMessageTitle,
-        );
+          const displayedMessageTitle = await driver.findElement(
+            '.permissions-connect-header__subtitle',
+          );
+          const account = await driver.findElement(
+            '.account-list-item__account-name',
+          );
+          assert.equal(
+            `${await displayedMessageTitle.getText()} ${await account.getText()}`,
+            expectedSigninMessageTitle,
+          );
 
-        // Check the displayed information in popup content
-        const [message, url, version, chainId] = await driver.findElements(
-          '.signature-request-siwe-message__sub-text',
-        );
-        assert.equal(await message.getText(), expectedSigninMessage);
-        assert.equal(await url.getText(), 'https://127.0.0.1:8080');
-        assert.equal(await version.getText(), '1');
-        assert.equal(await chainId.getText(), '1');
+          // Check the displayed information in popup content
+          const [message, url, version, chainId] = await driver.findElements(
+            '.signature-request-siwe-message__sub-text',
+          );
+          assert.equal(await message.getText(), expectedSigninMessage);
+          assert.equal(await url.getText(), 'https://127.0.0.1:8080');
+          assert.equal(await version.getText(), '1');
+          assert.equal(await chainId.getText(), '1');
 
-        // Click on extension popup to approve signin with ethereum
-        await driver.clickElement('[data-testid="page-container-footer-next"]');
-        await driver.waitUntilXWindowHandles(2);
+          // Click on extension popup to approve signin with ethereum
+          await driver.clickElement(
+            '[data-testid="page-container-footer-next"]',
+          );
+          await driver.waitUntilXWindowHandles(2);
 
-        // Switch back to the dapp and verify the signed result
-        windowHandles = await driver.getAllWindowHandles();
-        await driver.switchToWindowWithTitle('E2E Test Dapp', windowHandles);
-        const result = await driver.findElement('#siweResult');
-        assert.equal(await result.getText(), expectedSignInResult);
-      },
-    );
+          // Switch back to the dapp and verify the signed result
+          windowHandles = await driver.getAllWindowHandles();
+          await driver.switchToWindowWithTitle('E2E Test Dapp', windowHandles);
+          const result = await driver.findElement('#siweResult');
+          assert.equal(await result.getText(), expectedSignInResult);
+        },
+      );
+    });
+  });
+
+  describe('Redesigned confirmation screens', function () {
+    it('user should be able to confirm sign in with ethereum', async function () {
+      const expectedSigninMessageTitle =
+        'A site wants you to sign in to prove you own this account.';
+      const expectedSigninMessage =
+        'I accept the MetaMask Terms of Service: https://community.metamask.io/tos';
+      const expectedSignInResult =
+        '0xef8674a92d62a1876624547bdccaef6c67014ae821de18fa910fbff56577a65830f68848585b33d1f4b9ea1c3da1c1b11553b6aabe8446717daf7cd1e38a68271c';
+      await withFixtures(
+        {
+          dapp: true,
+          fixtures: new FixtureBuilder()
+            .withPermissionControllerConnectedToTestDapp()
+            .build(),
+          ganacheOptions: defaultGanacheOptions,
+          title: this.test.fullTitle(),
+        },
+        async ({ driver }) => {
+          await unlockWallet(driver);
+
+          // Create a signin with ethereum request in test dapp
+          await openDapp(driver);
+          await driver.clickElement('#siwe');
+
+          // Wait for signature request popup and check the message title
+          await driver.waitUntilXWindowHandles(3);
+          let windowHandles = await driver.getAllWindowHandles();
+          await driver.switchToWindowWithTitle(
+            WINDOW_TITLES.Dialog,
+            windowHandles,
+          );
+          await driver.findElement({
+            css: 'h2',
+            text: 'Sign-in request',
+          });
+          await driver.findElement({
+            css: 'p',
+            text: expectedSigninMessageTitle,
+          });
+          await driver.findElement({
+            css: 'p',
+            text: '127.0.0.1:8080',
+          });
+
+          await driver.clickElement('[data-testid="sectionCollapseButton"]');
+
+          // Check the displayed information in popup content
+          await driver.findElement({
+            css: 'p',
+            text: expectedSigninMessage,
+          });
+          await driver.findElement({
+            css: 'p',
+            text: 'https://127.0.0.1:8080',
+          });
+          await driver.findElement({
+            css: 'p',
+            text: '1',
+          });
+          await driver.findElement({
+            css: 'p',
+            text: '1',
+          });
+
+          await driver.clickElement({
+            css: 'button',
+            text: 'Confirm',
+          });
+
+          // Switch back to the dapp and verify the signed result
+          windowHandles = await driver.getAllWindowHandles();
+          await driver.switchToWindowWithTitle('E2E Test Dapp', windowHandles);
+          const result = await driver.findElement('#siweResult');
+          assert.equal(await result.getText(), expectedSignInResult);
+        },
+      );
+    });
   });
 });
diff --git a/test/e2e/tests/metrics/signature-approved.spec.js b/test/e2e/tests/metrics/signature-approved.spec.js
index 2ea84d281b50..d0d1bb9c32c3 100644
--- a/test/e2e/tests/metrics/signature-approved.spec.js
+++ b/test/e2e/tests/metrics/signature-approved.spec.js
@@ -10,6 +10,8 @@ const {
   clickSignOnSignatureConfirmation,
   tempToggleSettingRedesignedConfirmations,
   validateContractDetails,
+  clickSignOnRedesignedSignatureConfirmation,
+  WINDOW_TITLES,
 } = require('../../helpers');
 const FixtureBuilder = require('../../fixture-builder');
 
@@ -58,168 +60,342 @@ const expectedEventPropertiesBase = {
   security_alert_response: 'loading',
 };
 
+const additionalRedesignEventProperties = {
+  ui_customizations: ['redesigned_confirmation'],
+};
+
 describe('Signature Approved Event @no-mmi', function () {
-  it('Successfully tracked for signTypedData_v4', async function () {
-    await withFixtures(
-      {
-        dapp: true,
-        fixtures: new FixtureBuilder()
-          .withPermissionControllerConnectedToTestDapp()
-          .withMetaMetricsController({
-            metaMetricsId: 'fake-metrics-id',
-            participateInMetaMetrics: true,
-          })
-          .build(),
-        defaultGanacheOptions,
-        title: this.test.fullTitle(),
-        testSpecificMock: mockSegment,
-      },
-      async ({ driver, mockedEndpoint: mockedEndpoints }) => {
-        await unlockWallet(driver);
-        await tempToggleSettingRedesignedConfirmations(driver);
-        await openDapp(driver);
-
-        // creates a sign typed data signature request
-        await driver.clickElement('#signTypedDataV4');
-        await switchToNotificationWindow(driver);
-        await validateContractDetails(driver);
-        await clickSignOnSignatureConfirmation({ driver });
-        const events = await getEventPayloads(driver, mockedEndpoints);
-
-        assert.deepStrictEqual(events[0].properties, {
-          ...expectedEventPropertiesBase,
-          signature_type: 'eth_signTypedData_v4',
-          eip712_primary_type: 'Mail',
-        });
-
-        assert.deepStrictEqual(events[1].properties, {
-          ...expectedEventPropertiesBase,
-          signature_type: 'eth_signTypedData_v4',
-          eip712_primary_type: 'Mail',
-          security_alert_response: 'Benign',
-        });
-      },
-    );
-  });
+  describe('Old confirmation screens', function () {
+    it('Successfully tracked for signTypedData_v4', async function () {
+      await withFixtures(
+        {
+          dapp: true,
+          fixtures: new FixtureBuilder()
+            .withPermissionControllerConnectedToTestDapp()
+            .withMetaMetricsController({
+              metaMetricsId: 'fake-metrics-id',
+              participateInMetaMetrics: true,
+            })
+            .build(),
+          defaultGanacheOptions,
+          title: this.test.fullTitle(),
+          testSpecificMock: mockSegment,
+        },
+        async ({ driver, mockedEndpoint: mockedEndpoints }) => {
+          await unlockWallet(driver);
+          await tempToggleSettingRedesignedConfirmations(driver);
+          await openDapp(driver);
 
-  it('Successfully tracked for signTypedData_v3', async function () {
-    await withFixtures(
-      {
-        dapp: true,
-        fixtures: new FixtureBuilder()
-          .withPermissionControllerConnectedToTestDapp()
-          .withMetaMetricsController({
-            metaMetricsId: 'fake-metrics-id',
-            participateInMetaMetrics: true,
-          })
-          .build(),
-        defaultGanacheOptions,
-        title: this.test.fullTitle(),
-        testSpecificMock: mockSegment,
-      },
-      async ({ driver, mockedEndpoint: mockedEndpoints }) => {
-        await unlockWallet(driver);
-        await tempToggleSettingRedesignedConfirmations(driver);
-        await openDapp(driver);
-
-        // creates a sign typed data signature request
-        await driver.clickElement('#signTypedDataV3');
-        await switchToNotificationWindow(driver);
-        await validateContractDetails(driver);
-        await clickSignOnSignatureConfirmation({ driver });
-        const events = await getEventPayloads(driver, mockedEndpoints);
-
-        assert.deepStrictEqual(events[0].properties, {
-          ...expectedEventPropertiesBase,
-          signature_type: 'eth_signTypedData_v3',
-        });
-
-        assert.deepStrictEqual(events[1].properties, {
-          ...expectedEventPropertiesBase,
-          signature_type: 'eth_signTypedData_v3',
-          security_alert_response: 'Benign',
-        });
-      },
-    );
-  });
+          // creates a sign typed data signature request
+          await driver.clickElement('#signTypedDataV4');
+          await switchToNotificationWindow(driver);
+          await validateContractDetails(driver);
+          await clickSignOnSignatureConfirmation({ driver });
+          const events = await getEventPayloads(driver, mockedEndpoints);
+
+          assert.deepStrictEqual(events[0].properties, {
+            ...expectedEventPropertiesBase,
+            signature_type: 'eth_signTypedData_v4',
+            eip712_primary_type: 'Mail',
+          });
+
+          assert.deepStrictEqual(events[1].properties, {
+            ...expectedEventPropertiesBase,
+            signature_type: 'eth_signTypedData_v4',
+            eip712_primary_type: 'Mail',
+            security_alert_response: 'Benign',
+          });
+        },
+      );
+    });
+
+    it('Successfully tracked for signTypedData_v3', async function () {
+      await withFixtures(
+        {
+          dapp: true,
+          fixtures: new FixtureBuilder()
+            .withPermissionControllerConnectedToTestDapp()
+            .withMetaMetricsController({
+              metaMetricsId: 'fake-metrics-id',
+              participateInMetaMetrics: true,
+            })
+            .build(),
+          defaultGanacheOptions,
+          title: this.test.fullTitle(),
+          testSpecificMock: mockSegment,
+        },
+        async ({ driver, mockedEndpoint: mockedEndpoints }) => {
+          await unlockWallet(driver);
+          await tempToggleSettingRedesignedConfirmations(driver);
+          await openDapp(driver);
+
+          // creates a sign typed data signature request
+          await driver.clickElement('#signTypedDataV3');
+          await switchToNotificationWindow(driver);
+          await validateContractDetails(driver);
+          await clickSignOnSignatureConfirmation({ driver });
+          const events = await getEventPayloads(driver, mockedEndpoints);
+
+          assert.deepStrictEqual(events[0].properties, {
+            ...expectedEventPropertiesBase,
+            signature_type: 'eth_signTypedData_v3',
+          });
+
+          assert.deepStrictEqual(events[1].properties, {
+            ...expectedEventPropertiesBase,
+            signature_type: 'eth_signTypedData_v3',
+            security_alert_response: 'Benign',
+          });
+        },
+      );
+    });
+
+    it('Successfully tracked for signTypedData', async function () {
+      await withFixtures(
+        {
+          dapp: true,
+          fixtures: new FixtureBuilder()
+            .withPermissionControllerConnectedToTestDapp()
+            .withMetaMetricsController({
+              metaMetricsId: 'fake-metrics-id',
+              participateInMetaMetrics: true,
+            })
+            .build(),
+          defaultGanacheOptions,
+          title: this.test.fullTitle(),
+          testSpecificMock: mockSegment,
+        },
+        async ({ driver, mockedEndpoint: mockedEndpoints }) => {
+          await unlockWallet(driver);
+          await tempToggleSettingRedesignedConfirmations(driver);
+          await openDapp(driver);
+
+          // creates a sign typed data signature request
+          await driver.clickElement('#signTypedData');
+          await switchToNotificationWindow(driver);
+          await clickSignOnSignatureConfirmation({ driver });
+          const events = await getEventPayloads(driver, mockedEndpoints);
+
+          assert.deepStrictEqual(events[0].properties, {
+            ...expectedEventPropertiesBase,
+            signature_type: 'eth_signTypedData',
+          });
+
+          assert.deepStrictEqual(events[1].properties, {
+            ...expectedEventPropertiesBase,
+            signature_type: 'eth_signTypedData',
+            security_alert_response: 'Benign',
+          });
+        },
+      );
+    });
+
+    it('Successfully tracked for personalSign', async function () {
+      await withFixtures(
+        {
+          dapp: true,
+          fixtures: new FixtureBuilder()
+            .withPermissionControllerConnectedToTestDapp()
+            .withMetaMetricsController({
+              metaMetricsId: 'fake-metrics-id',
+              participateInMetaMetrics: true,
+            })
+            .build(),
+          defaultGanacheOptions,
+          title: this.test.fullTitle(),
+          testSpecificMock: mockSegment,
+        },
+        async ({ driver, mockedEndpoint: mockedEndpoints }) => {
+          await unlockWallet(driver);
+          await tempToggleSettingRedesignedConfirmations(driver);
+          await openDapp(driver);
+
+          // creates a sign typed data signature request
+          await driver.clickElement('#personalSign');
+          await switchToNotificationWindow(driver);
+          await clickSignOnSignatureConfirmation({ driver });
+          const events = await getEventPayloads(driver, mockedEndpoints);
 
-  it('Successfully tracked for signTypedData', async function () {
-    await withFixtures(
-      {
-        dapp: true,
-        fixtures: new FixtureBuilder()
-          .withPermissionControllerConnectedToTestDapp()
-          .withMetaMetricsController({
-            metaMetricsId: 'fake-metrics-id',
-            participateInMetaMetrics: true,
-          })
-          .build(),
-        defaultGanacheOptions,
-        title: this.test.fullTitle(),
-        testSpecificMock: mockSegment,
-      },
-      async ({ driver, mockedEndpoint: mockedEndpoints }) => {
-        await unlockWallet(driver);
-        await tempToggleSettingRedesignedConfirmations(driver);
-        await openDapp(driver);
-
-        // creates a sign typed data signature request
-        await driver.clickElement('#signTypedData');
-        await switchToNotificationWindow(driver);
-        await clickSignOnSignatureConfirmation({ driver });
-        const events = await getEventPayloads(driver, mockedEndpoints);
-
-        assert.deepStrictEqual(events[0].properties, {
-          ...expectedEventPropertiesBase,
-          signature_type: 'eth_signTypedData',
-        });
-
-        assert.deepStrictEqual(events[1].properties, {
-          ...expectedEventPropertiesBase,
-          signature_type: 'eth_signTypedData',
-          security_alert_response: 'Benign',
-        });
-      },
-    );
+          assert.deepStrictEqual(events[0].properties, {
+            ...expectedEventPropertiesBase,
+            signature_type: 'personal_sign',
+          });
+
+          assert.deepStrictEqual(events[1].properties, {
+            ...expectedEventPropertiesBase,
+            signature_type: 'personal_sign',
+            security_alert_response: 'Benign',
+          });
+        },
+      );
+    });
   });
 
-  it('Successfully tracked for personalSign', async function () {
-    await withFixtures(
-      {
-        dapp: true,
-        fixtures: new FixtureBuilder()
-          .withPermissionControllerConnectedToTestDapp()
-          .withMetaMetricsController({
-            metaMetricsId: 'fake-metrics-id',
-            participateInMetaMetrics: true,
-          })
-          .build(),
-        defaultGanacheOptions,
-        title: this.test.fullTitle(),
-        testSpecificMock: mockSegment,
-      },
-      async ({ driver, mockedEndpoint: mockedEndpoints }) => {
-        await unlockWallet(driver);
-        await tempToggleSettingRedesignedConfirmations(driver);
-        await openDapp(driver);
-
-        // creates a sign typed data signature request
-        await driver.clickElement('#personalSign');
-        await switchToNotificationWindow(driver);
-        await clickSignOnSignatureConfirmation({ driver });
-        const events = await getEventPayloads(driver, mockedEndpoints);
-
-        assert.deepStrictEqual(events[0].properties, {
-          ...expectedEventPropertiesBase,
-          signature_type: 'personal_sign',
-        });
-
-        assert.deepStrictEqual(events[1].properties, {
-          ...expectedEventPropertiesBase,
-          signature_type: 'personal_sign',
-          security_alert_response: 'Benign',
-        });
-      },
-    );
+  describe('Redesigned confirmation screens', function () {
+    it('Successfully tracked for signTypedData_v4', async function () {
+      await withFixtures(
+        {
+          dapp: true,
+          fixtures: new FixtureBuilder()
+            .withPermissionControllerConnectedToTestDapp()
+            .withMetaMetricsController({
+              metaMetricsId: 'fake-metrics-id',
+              participateInMetaMetrics: true,
+            })
+            .build(),
+          defaultGanacheOptions,
+          title: this.test.fullTitle(),
+          testSpecificMock: mockSegment,
+        },
+        async ({ driver, mockedEndpoint: mockedEndpoints }) => {
+          await unlockWallet(driver);
+          await openDapp(driver);
+
+          // creates a sign typed data signature request
+          await driver.clickElement('#signTypedDataV4');
+          await driver.switchToWindowWithTitle(WINDOW_TITLES.Dialog);
+          await clickSignOnRedesignedSignatureConfirmation({ driver });
+          const events = await getEventPayloads(driver, mockedEndpoints);
+
+          assert.deepStrictEqual(events[0].properties, {
+            ...expectedEventPropertiesBase,
+            ...additionalRedesignEventProperties,
+            signature_type: 'eth_signTypedData_v4',
+            eip712_primary_type: 'Mail',
+          });
+
+          assert.deepStrictEqual(events[1].properties, {
+            ...expectedEventPropertiesBase,
+            ...additionalRedesignEventProperties,
+            signature_type: 'eth_signTypedData_v4',
+            eip712_primary_type: 'Mail',
+            security_alert_response: 'Benign',
+          });
+        },
+      );
+    });
+
+    it('Successfully tracked for signTypedData_v3', async function () {
+      await withFixtures(
+        {
+          dapp: true,
+          fixtures: new FixtureBuilder()
+            .withPermissionControllerConnectedToTestDapp()
+            .withMetaMetricsController({
+              metaMetricsId: 'fake-metrics-id',
+              participateInMetaMetrics: true,
+            })
+            .build(),
+          defaultGanacheOptions,
+          title: this.test.fullTitle(),
+          testSpecificMock: mockSegment,
+        },
+        async ({ driver, mockedEndpoint: mockedEndpoints }) => {
+          await unlockWallet(driver);
+          await openDapp(driver);
+
+          // creates a sign typed data signature request
+          await driver.clickElement('#signTypedDataV3');
+          await driver.switchToWindowWithTitle(WINDOW_TITLES.Dialog);
+          await clickSignOnRedesignedSignatureConfirmation({ driver });
+          const events = await getEventPayloads(driver, mockedEndpoints);
+
+          assert.deepStrictEqual(events[0].properties, {
+            ...expectedEventPropertiesBase,
+            ...additionalRedesignEventProperties,
+            signature_type: 'eth_signTypedData_v3',
+          });
+
+          assert.deepStrictEqual(events[1].properties, {
+            ...expectedEventPropertiesBase,
+            ...additionalRedesignEventProperties,
+            signature_type: 'eth_signTypedData_v3',
+            security_alert_response: 'Benign',
+          });
+        },
+      );
+    });
+
+    it('Successfully tracked for signTypedData', async function () {
+      await withFixtures(
+        {
+          dapp: true,
+          fixtures: new FixtureBuilder()
+            .withPermissionControllerConnectedToTestDapp()
+            .withMetaMetricsController({
+              metaMetricsId: 'fake-metrics-id',
+              participateInMetaMetrics: true,
+            })
+            .build(),
+          defaultGanacheOptions,
+          title: this.test.fullTitle(),
+          testSpecificMock: mockSegment,
+        },
+        async ({ driver, mockedEndpoint: mockedEndpoints }) => {
+          await unlockWallet(driver);
+          await openDapp(driver);
+
+          // creates a sign typed data signature request
+          await driver.clickElement('#signTypedData');
+          await driver.switchToWindowWithTitle(WINDOW_TITLES.Dialog);
+          await clickSignOnRedesignedSignatureConfirmation({ driver });
+          const events = await getEventPayloads(driver, mockedEndpoints);
+
+          assert.deepStrictEqual(events[0].properties, {
+            ...expectedEventPropertiesBase,
+            ...additionalRedesignEventProperties,
+            signature_type: 'eth_signTypedData',
+          });
+
+          assert.deepStrictEqual(events[1].properties, {
+            ...expectedEventPropertiesBase,
+            ...additionalRedesignEventProperties,
+            signature_type: 'eth_signTypedData',
+            security_alert_response: 'Benign',
+          });
+        },
+      );
+    });
+
+    it('Successfully tracked for personalSign', async function () {
+      await withFixtures(
+        {
+          dapp: true,
+          fixtures: new FixtureBuilder()
+            .withPermissionControllerConnectedToTestDapp()
+            .withMetaMetricsController({
+              metaMetricsId: 'fake-metrics-id',
+              participateInMetaMetrics: true,
+            })
+            .build(),
+          defaultGanacheOptions,
+          title: this.test.fullTitle(),
+          testSpecificMock: mockSegment,
+        },
+        async ({ driver, mockedEndpoint: mockedEndpoints }) => {
+          await unlockWallet(driver);
+          await openDapp(driver);
+
+          // creates a sign typed data signature request
+          await driver.clickElement('#personalSign');
+          await driver.switchToWindowWithTitle(WINDOW_TITLES.Dialog);
+          await clickSignOnRedesignedSignatureConfirmation({ driver });
+          const events = await getEventPayloads(driver, mockedEndpoints);
+
+          assert.deepStrictEqual(events[0].properties, {
+            ...expectedEventPropertiesBase,
+            ...additionalRedesignEventProperties,
+            signature_type: 'personal_sign',
+          });
+
+          assert.deepStrictEqual(events[1].properties, {
+            ...expectedEventPropertiesBase,
+            ...additionalRedesignEventProperties,
+            signature_type: 'personal_sign',
+            security_alert_response: 'Benign',
+          });
+        },
+      );
+    });
   });
 });
diff --git a/test/e2e/tests/petnames/petnames-signatures.spec.js b/test/e2e/tests/petnames/petnames-signatures.spec.js
index 6c472901057e..4641424e053f 100644
--- a/test/e2e/tests/petnames/petnames-signatures.spec.js
+++ b/test/e2e/tests/petnames/petnames-signatures.spec.js
@@ -5,6 +5,7 @@ const {
   tempToggleSettingRedesignedConfirmations,
   unlockWallet,
   defaultGanacheOptions,
+  WINDOW_TITLES,
 } = require('../../helpers');
 const FixtureBuilder = require('../../fixture-builder');
 const { TEST_SNAPS_WEBSITE_URL } = require('../../snaps/enums');
@@ -14,6 +15,7 @@ const {
   rejectSignatureOrTransactionRequest,
   saveName,
   clickName,
+  rejectRedesignedSignatureOrTransactionRequest,
 } = require('./petnames-helpers');
 
 const SIGNATURE_TYPE = {
@@ -95,109 +97,209 @@ async function expectProposedNames(driver, value, options) {
   }
 }
 
-describe('Petnames - Signatures', function () {
-  it('can save names for addresses in type 3 signatures', async function () {
-    await withFixtures(
-      {
-        dapp: true,
-        fixtures: new FixtureBuilder()
-          .withPermissionControllerConnectedToTestDapp()
-          .withNoNames()
-          .build(),
-        ganacheOptions: defaultGanacheOptions,
-        title: this.test.fullTitle(),
-      },
-      async ({ driver }) => {
-        await unlockWallet(driver);
-        await tempToggleSettingRedesignedConfirmations(driver);
-        await openDapp(driver);
-        await createSignatureRequest(driver, SIGNATURE_TYPE.TYPED_V3);
-        await switchToNotificationWindow(driver, 3);
-        await expectName(driver, '0xCD2a3...DD826', false);
-        await expectName(driver, '0xbBbBB...bBBbB', false);
-        await saveName(driver, '0xCD2a3...DD826', undefined, 'test.lens');
-        await saveName(driver, '0xbBbBB...bBBbB', undefined, 'test2.lens');
-        await showThirdPartyDetails(driver);
-        await expectName(driver, '0xCcCCc...ccccC', false);
-        await saveName(driver, '0xCcCCc...ccccC', 'Custom Name');
-        await closeThirdPartyDetails(driver);
-        await rejectSignatureOrTransactionRequest(driver);
-        await focusTestDapp(driver);
-        await createSignatureRequest(driver, SIGNATURE_TYPE.TYPED_V3);
-        await switchToNotificationWindow(driver, 3);
-        await expectName(driver, 'test.lens', true);
-        await expectName(driver, 'test2.lens', true);
-        await showThirdPartyDetails(driver);
-        await expectName(driver, 'Custom Name', true);
-      },
-    );
-  });
+describe('Petnames - Signatures', function () {
+  describe('Old confirmation screens', function () {
+    it('can save names for addresses in type 3 signatures', async function () {
+      await withFixtures(
+        {
+          dapp: true,
+          fixtures: new FixtureBuilder()
+            .withPermissionControllerConnectedToTestDapp()
+            .withNoNames()
+            .build(),
+          ganacheOptions: defaultGanacheOptions,
+          title: this.test.fullTitle(),
+        },
+        async ({ driver }) => {
+          await unlockWallet(driver);
+          await tempToggleSettingRedesignedConfirmations(driver);
+          await openDapp(driver);
+          await createSignatureRequest(driver, SIGNATURE_TYPE.TYPED_V3);
+          await switchToNotificationWindow(driver, 3);
+          await expectName(driver, '0xCD2a3...DD826', false);
+          await expectName(driver, '0xbBbBB...bBBbB', false);
+          await saveName(driver, '0xCD2a3...DD826', undefined, 'test.lens');
+          await saveName(driver, '0xbBbBB...bBBbB', undefined, 'test2.lens');
+          await showThirdPartyDetails(driver);
+          await expectName(driver, '0xCcCCc...ccccC', false);
+          await saveName(driver, '0xCcCCc...ccccC', 'Custom Name');
+          await closeThirdPartyDetails(driver);
+          await rejectSignatureOrTransactionRequest(driver);
+          await focusTestDapp(driver);
+          await createSignatureRequest(driver, SIGNATURE_TYPE.TYPED_V3);
+          await switchToNotificationWindow(driver, 3);
+          await expectName(driver, 'test.lens', true);
+          await expectName(driver, 'test2.lens', true);
+          await showThirdPartyDetails(driver);
+          await expectName(driver, 'Custom Name', true);
+        },
+      );
+    });
 
-  it('can save names for addresses in type 4 signatures', async function () {
-    await withFixtures(
-      {
-        dapp: true,
-        fixtures: new FixtureBuilder()
-          .withPermissionControllerConnectedToTestDapp()
-          .withNoNames()
-          .build(),
-        ganacheOptions: defaultGanacheOptions,
-        title: this.test.fullTitle(),
-      },
-      async ({ driver }) => {
-        await unlockWallet(driver);
-        await tempToggleSettingRedesignedConfirmations(driver);
-        await openDapp(driver);
-        await createSignatureRequest(driver, SIGNATURE_TYPE.TYPED_V4);
-        await switchToNotificationWindow(driver, 3);
-        await expectName(driver, '0xCD2a3...DD826', false);
-        await expectName(driver, '0xDeaDb...DbeeF', false);
-        await expectName(driver, '0xbBbBB...bBBbB', false);
-        await expectName(driver, '0xB0Bda...bEa57', false);
-        await expectName(driver, '0xB0B0b...00000', false);
-        await saveName(driver, '0xCD2a3...DD826', undefined, 'test.lens');
-        await saveName(driver, '0xB0Bda...bEa57', undefined, 'Test Token 2');
-        await showThirdPartyDetails(driver);
-        await expectName(driver, '0xCcCCc...ccccC', false);
-        await saveName(driver, '0xCcCCc...ccccC', 'Custom Name');
-        await closeThirdPartyDetails(driver);
-        await rejectSignatureOrTransactionRequest(driver);
-        await focusTestDapp(driver);
-        await createSignatureRequest(driver, SIGNATURE_TYPE.TYPED_V4);
-        await switchToNotificationWindow(driver, 3);
-        await expectName(driver, 'test.lens', true);
-        await expectName(driver, 'Test Token 2', true);
-        await showThirdPartyDetails(driver);
-        await expectName(driver, 'Custom Name', true);
-      },
-    );
+    it('can save names for addresses in type 4 signatures', async function () {
+      await withFixtures(
+        {
+          dapp: true,
+          fixtures: new FixtureBuilder()
+            .withPermissionControllerConnectedToTestDapp()
+            .withNoNames()
+            .build(),
+          ganacheOptions: defaultGanacheOptions,
+          title: this.test.fullTitle(),
+        },
+        async ({ driver }) => {
+          await unlockWallet(driver);
+          await tempToggleSettingRedesignedConfirmations(driver);
+          await openDapp(driver);
+          await createSignatureRequest(driver, SIGNATURE_TYPE.TYPED_V4);
+          await switchToNotificationWindow(driver, 3);
+          await expectName(driver, '0xCD2a3...DD826', false);
+          await expectName(driver, '0xDeaDb...DbeeF', false);
+          await expectName(driver, '0xbBbBB...bBBbB', false);
+          await expectName(driver, '0xB0Bda...bEa57', false);
+          await expectName(driver, '0xB0B0b...00000', false);
+          await saveName(driver, '0xCD2a3...DD826', undefined, 'test.lens');
+          await saveName(driver, '0xB0Bda...bEa57', undefined, 'Test Token 2');
+          await showThirdPartyDetails(driver);
+          await expectName(driver, '0xCcCCc...ccccC', false);
+          await saveName(driver, '0xCcCCc...ccccC', 'Custom Name');
+          await closeThirdPartyDetails(driver);
+          await rejectSignatureOrTransactionRequest(driver);
+          await focusTestDapp(driver);
+          await createSignatureRequest(driver, SIGNATURE_TYPE.TYPED_V4);
+          await switchToNotificationWindow(driver, 3);
+          await expectName(driver, 'test.lens', true);
+          await expectName(driver, 'Test Token 2', true);
+          await showThirdPartyDetails(driver);
+          await expectName(driver, 'Custom Name', true);
+        },
+      );
+    });
+
+    it('can propose names using installed snaps', async function () {
+      await withFixtures(
+        {
+          dapp: true,
+          fixtures: new FixtureBuilder()
+            .withPermissionControllerConnectedToTestDapp()
+            .withNoNames()
+            .build(),
+          ganacheOptions: defaultGanacheOptions,
+          title: this.test.fullTitle(),
+        },
+        async ({ driver }) => {
+          await unlockWallet(driver);
+          await tempToggleSettingRedesignedConfirmations(driver);
+          await openDapp(driver);
+          await openTestSnaps(driver);
+          await installNameLookupSnap(driver);
+          await focusTestDapp(driver);
+          await createSignatureRequest(driver, SIGNATURE_TYPE.TYPED_V4);
+          await switchToNotificationWindow(driver, 4);
+          await expectProposedNames(driver, '0xCD2a3...DD826', [
+            ['test.lens', 'Lens Protocol'],
+            ['cd2.1337.test.domain', 'Name Lookup Example Snap'],
+          ]);
+        },
+      );
+    });
   });
 
-  it('can propose names using installed snaps', async function () {
-    await withFixtures(
-      {
-        dapp: true,
-        fixtures: new FixtureBuilder()
-          .withPermissionControllerConnectedToTestDapp()
-          .withNoNames()
-          .build(),
-        ganacheOptions: defaultGanacheOptions,
-        title: this.test.fullTitle(),
-      },
-      async ({ driver }) => {
-        await unlockWallet(driver);
-        await tempToggleSettingRedesignedConfirmations(driver);
-        await openDapp(driver);
-        await openTestSnaps(driver);
-        await installNameLookupSnap(driver);
-        await focusTestDapp(driver);
-        await createSignatureRequest(driver, SIGNATURE_TYPE.TYPED_V4);
-        await switchToNotificationWindow(driver, 4);
-        await expectProposedNames(driver, '0xCD2a3...DD826', [
-          ['test.lens', 'Lens Protocol'],
-          ['cd2.1337.test.domain', 'Name Lookup Example Snap'],
-        ]);
-      },
-    );
+  describe('Redesigned confirmation screens', function () {
+    it('can save names for addresses in type 3 signatures', async function () {
+      await withFixtures(
+        {
+          dapp: true,
+          fixtures: new FixtureBuilder()
+            .withPermissionControllerConnectedToTestDapp()
+            .withNoNames()
+            .build(),
+          ganacheOptions: defaultGanacheOptions,
+          title: this.test.fullTitle(),
+        },
+        async ({ driver }) => {
+          await unlockWallet(driver);
+          await openDapp(driver);
+          await createSignatureRequest(driver, SIGNATURE_TYPE.TYPED_V3);
+          await driver.switchToWindowWithTitle(WINDOW_TITLES.Dialog);
+          await expectName(driver, '0xCD2a3...DD826', false);
+          await expectName(driver, '0xbBbBB...bBBbB', false);
+          await saveName(driver, '0xCD2a3...DD826', undefined, 'test.lens');
+          await saveName(driver, '0xbBbBB...bBBbB', undefined, 'test2.lens');
+          await expectName(driver, '0xCcCCc...ccccC', false);
+          await saveName(driver, '0xCcCCc...ccccC', 'Custom Name');
+          await rejectRedesignedSignatureOrTransactionRequest(driver);
+          await focusTestDapp(driver);
+          await createSignatureRequest(driver, SIGNATURE_TYPE.TYPED_V3);
+          await driver.switchToWindowWithTitle(WINDOW_TITLES.Dialog);
+          await expectName(driver, 'test.lens', true);
+          await expectName(driver, 'test2.lens', true);
+          await expectName(driver, 'Custom Name', true);
+        },
+      );
+    });
+
+    it('can save names for addresses in type 4 signatures', async function () {
+      await withFixtures(
+        {
+          dapp: true,
+          fixtures: new FixtureBuilder()
+            .withPermissionControllerConnectedToTestDapp()
+            .withNoNames()
+            .build(),
+          ganacheOptions: defaultGanacheOptions,
+          title: this.test.fullTitle(),
+        },
+        async ({ driver }) => {
+          await unlockWallet(driver);
+          await openDapp(driver);
+          await createSignatureRequest(driver, SIGNATURE_TYPE.TYPED_V4);
+          await driver.switchToWindowWithTitle(WINDOW_TITLES.Dialog);
+          await expectName(driver, '0xCD2a3...DD826', false);
+          await expectName(driver, '0xDeaDb...DbeeF', false);
+          await expectName(driver, '0xbBbBB...bBBbB', false);
+          await expectName(driver, '0xB0Bda...bEa57', false);
+          await expectName(driver, '0xB0B0b...00000', false);
+          await saveName(driver, '0xCD2a3...DD826', undefined, 'test.lens');
+          await saveName(driver, '0xB0Bda...bEa57', undefined, 'Test Token 2');
+          await expectName(driver, '0xCcCCc...ccccC', false);
+          await saveName(driver, '0xCcCCc...ccccC', 'Custom Name');
+          await rejectRedesignedSignatureOrTransactionRequest(driver);
+          await focusTestDapp(driver);
+          await createSignatureRequest(driver, SIGNATURE_TYPE.TYPED_V4);
+          await driver.switchToWindowWithTitle(WINDOW_TITLES.Dialog);
+          await expectName(driver, 'test.lens', true);
+          await expectName(driver, 'Test Token 2', true);
+          await expectName(driver, 'Custom Name', true);
+        },
+      );
+    });
+
+    it('can propose names using installed snaps', async function () {
+      await withFixtures(
+        {
+          dapp: true,
+          fixtures: new FixtureBuilder()
+            .withPermissionControllerConnectedToTestDapp()
+            .withNoNames()
+            .build(),
+          ganacheOptions: defaultGanacheOptions,
+          title: this.test.fullTitle(),
+        },
+        async ({ driver }) => {
+          await unlockWallet(driver);
+          await openDapp(driver);
+          await openTestSnaps(driver);
+          await installNameLookupSnap(driver);
+          await focusTestDapp(driver);
+          await createSignatureRequest(driver, SIGNATURE_TYPE.TYPED_V4);
+          await driver.switchToWindowWithTitle(WINDOW_TITLES.Dialog);
+          await expectProposedNames(driver, '0xCD2a3...DD826', [
+            ['test.lens', 'Lens Protocol'],
+            ['cd2.1337.test.domain', 'Name Lookup Example Snap'],
+          ]);
+        },
+      );
+    });
   });
 });
diff --git a/test/e2e/tests/signature/personal-sign.spec.js b/test/e2e/tests/signature/personal-sign.spec.js
index e4864a84db47..092a9518ba01 100644
--- a/test/e2e/tests/signature/personal-sign.spec.js
+++ b/test/e2e/tests/signature/personal-sign.spec.js
@@ -1,4 +1,5 @@
 const { strict: assert } = require('assert');
+const { By } = require('selenium-webdriver');
 const {
   defaultGanacheOptions,
   withFixtures,
@@ -11,99 +12,204 @@ const {
 const FixtureBuilder = require('../../fixture-builder');
 
 describe('Personal sign', function () {
-  it('can initiate and confirm a personal sign', async function () {
-    await withFixtures(
-      {
-        dapp: true,
-        fixtures: new FixtureBuilder()
-          .withPermissionControllerConnectedToTestDapp()
-          .build(),
-        ganacheOptions: defaultGanacheOptions,
-        title: this.test.fullTitle(),
-      },
-      async ({ driver, ganacheServer }) => {
-        const addresses = await ganacheServer.getAccounts();
-        const publicAddress = addresses[0];
-        await unlockWallet(driver);
-        await tempToggleSettingRedesignedConfirmations(driver);
-
-        await openDapp(driver);
-        await driver.clickElement('#personalSign');
-
-        await driver.waitUntilXWindowHandles(3);
-        const windowHandles = await driver.getAllWindowHandles();
-        await driver.switchToWindowWithTitle(
-          WINDOW_TITLES.Dialog,
-          windowHandles,
-        );
-
-        const personalMessageRow = await driver.findElement(
-          '.request-signature__row-value',
-        );
-        const personalMessage = await personalMessageRow.getText();
-        assert.equal(personalMessage, 'Example `personal_sign` message');
-
-        await driver.clickElement('[data-testid="page-container-footer-next"]');
-
-        await verifyAndAssertPersonalMessage(driver, publicAddress);
-      },
-    );
+  describe('Old confirmation screens', function () {
+    it('can initiate and confirm a personal sign', async function () {
+      await withFixtures(
+        {
+          dapp: true,
+          fixtures: new FixtureBuilder()
+            .withPermissionControllerConnectedToTestDapp()
+            .build(),
+          ganacheOptions: defaultGanacheOptions,
+          title: this.test.fullTitle(),
+        },
+        async ({ driver, ganacheServer }) => {
+          const addresses = await ganacheServer.getAccounts();
+          const publicAddress = addresses[0];
+          await unlockWallet(driver);
+          await tempToggleSettingRedesignedConfirmations(driver);
+
+          await openDapp(driver);
+          await driver.clickElement('#personalSign');
+
+          await driver.waitUntilXWindowHandles(3);
+          const windowHandles = await driver.getAllWindowHandles();
+          await driver.switchToWindowWithTitle(
+            WINDOW_TITLES.Dialog,
+            windowHandles,
+          );
+
+          const personalMessageRow = await driver.findElement(
+            '.request-signature__row-value',
+          );
+          const personalMessage = await personalMessageRow.getText();
+          assert.equal(personalMessage, 'Example `personal_sign` message');
+
+          await driver.clickElement(
+            '[data-testid="page-container-footer-next"]',
+          );
+
+          await verifyAndAssertPersonalMessage(driver, publicAddress);
+        },
+      );
+    });
+
+    it('can queue multiple personal signs and confirm', async function () {
+      await withFixtures(
+        {
+          dapp: true,
+          fixtures: new FixtureBuilder()
+            .withPermissionControllerConnectedToTestDapp()
+            .build(),
+          ganacheOptions: defaultGanacheOptions,
+          title: this.test.fullTitle(),
+        },
+        async ({ driver, ganacheServer }) => {
+          const addresses = await ganacheServer.getAccounts();
+          const publicAddress = addresses[0];
+          await unlockWallet(driver);
+          await tempToggleSettingRedesignedConfirmations(driver);
+
+          await openDapp(driver);
+          // Create personal sign
+          await driver.clickElement('#personalSign');
+
+          await driver.waitUntilXWindowHandles(3);
+          const windowHandles = await driver.getAllWindowHandles();
+
+          // Switch to Dapp
+          await driver.switchToWindowWithTitle('E2E Test Dapp', windowHandles);
+
+          // Create second personal sign
+          await driver.clickElement('#personalSign');
+
+          await driver.switchToWindowWithTitle(
+            WINDOW_TITLES.Dialog,
+            windowHandles,
+          );
+
+          await driver.waitForSelector({
+            text: 'Reject 2 requests',
+            tag: 'button',
+          });
+
+          const personalMessageRow = await driver.findElement(
+            '.request-signature__row-value',
+          );
+          const personalMessage = await personalMessageRow.getText();
+          assert.equal(personalMessage, 'Example `personal_sign` message');
+
+          // Confirm first personal sign
+          await driver.clickElement(
+            '[data-testid="page-container-footer-next"]',
+          );
+          await driver.delay(regularDelayMs);
+          // Confirm second personal sign
+          await driver.clickElement(
+            '[data-testid="page-container-footer-next"]',
+          );
+
+          await verifyAndAssertPersonalMessage(driver, publicAddress);
+        },
+      );
+    });
   });
 
-  it('can queue multiple personal signs and confirm', async function () {
-    await withFixtures(
-      {
-        dapp: true,
-        fixtures: new FixtureBuilder()
-          .withPermissionControllerConnectedToTestDapp()
-          .build(),
-        ganacheOptions: defaultGanacheOptions,
-        title: this.test.fullTitle(),
-      },
-      async ({ driver, ganacheServer }) => {
-        const addresses = await ganacheServer.getAccounts();
-        const publicAddress = addresses[0];
-        await unlockWallet(driver);
-        await tempToggleSettingRedesignedConfirmations(driver);
-
-        await openDapp(driver);
-        // Create personal sign
-        await driver.clickElement('#personalSign');
-
-        await driver.waitUntilXWindowHandles(3);
-        const windowHandles = await driver.getAllWindowHandles();
-
-        // Switch to Dapp
-        await driver.switchToWindowWithTitle('E2E Test Dapp', windowHandles);
-
-        // Create second personal sign
-        await driver.clickElement('#personalSign');
-
-        await driver.switchToWindowWithTitle(
-          WINDOW_TITLES.Dialog,
-          windowHandles,
-        );
-
-        await driver.waitForSelector({
-          text: 'Reject 2 requests',
-          tag: 'button',
-        });
-
-        const personalMessageRow = await driver.findElement(
-          '.request-signature__row-value',
-        );
-        const personalMessage = await personalMessageRow.getText();
-        assert.equal(personalMessage, 'Example `personal_sign` message');
-
-        // Confirm first personal sign
-        await driver.clickElement('[data-testid="page-container-footer-next"]');
-        await driver.delay(regularDelayMs);
-        // Confirm second personal sign
-        await driver.clickElement('[data-testid="page-container-footer-next"]');
-
-        await verifyAndAssertPersonalMessage(driver, publicAddress);
-      },
-    );
+  describe('Redesigned confirmation screens', function () {
+    it('can initiate and confirm a personal sign', async function () {
+      await withFixtures(
+        {
+          dapp: true,
+          fixtures: new FixtureBuilder()
+            .withPermissionControllerConnectedToTestDapp()
+            .build(),
+          ganacheOptions: defaultGanacheOptions,
+          title: this.test.fullTitle(),
+        },
+        async ({ driver, ganacheServer }) => {
+          const addresses = await ganacheServer.getAccounts();
+          const publicAddress = addresses[0];
+          await unlockWallet(driver);
+
+          await openDapp(driver);
+          await driver.clickElement('#personalSign');
+
+          await driver.waitUntilXWindowHandles(3);
+          const windowHandles = await driver.getAllWindowHandles();
+          await driver.switchToWindowWithTitle(
+            WINDOW_TITLES.Dialog,
+            windowHandles,
+          );
+
+          await driver.findElement({
+            css: 'p',
+            text: 'Example `personal_sign` message',
+          });
+
+          await driver.clickElement('[data-testid="confirm-footer-button"]');
+
+          await verifyAndAssertPersonalMessage(driver, publicAddress);
+        },
+      );
+    });
+
+    it('can queue multiple personal signs and confirm', async function () {
+      await withFixtures(
+        {
+          dapp: true,
+          fixtures: new FixtureBuilder()
+            .withPermissionControllerConnectedToTestDapp()
+            .build(),
+          ganacheOptions: defaultGanacheOptions,
+          title: this.test.fullTitle(),
+        },
+        async ({ driver, ganacheServer }) => {
+          const addresses = await ganacheServer.getAccounts();
+          const publicAddress = addresses[0];
+          await unlockWallet(driver);
+
+          await openDapp(driver);
+          // Create personal sign
+          await driver.clickElement('#personalSign');
+
+          await driver.waitUntilXWindowHandles(3);
+          const windowHandles = await driver.getAllWindowHandles();
+
+          // Switch to Dapp
+          await driver.switchToWindowWithTitle('E2E Test Dapp', windowHandles);
+
+          // Create second personal sign
+          await driver.clickElement('#personalSign');
+
+          await driver.switchToWindowWithTitle(
+            WINDOW_TITLES.Dialog,
+            windowHandles,
+          );
+
+          await driver.waitForSelector(
+            By.xpath("//p[normalize-space(.)='1 of 2']"),
+          );
+
+          await driver.waitForSelector({
+            text: 'Reject all',
+            tag: 'button',
+          });
+
+          await driver.findElement({
+            css: 'p',
+            text: 'Example `personal_sign` message',
+          });
+
+          // Confirm first personal sign
+          await driver.clickElement('[data-testid="confirm-footer-button"]');
+          await driver.delay(regularDelayMs);
+          // Confirm second personal sign
+          await driver.clickElement('[data-testid="confirm-footer-button"]');
+
+          await verifyAndAssertPersonalMessage(driver, publicAddress);
+        },
+      );
+    });
   });
 });
 
diff --git a/test/e2e/tests/signature/signature-request.spec.js b/test/e2e/tests/signature/signature-request.spec.js
index 99fcb61c5067..716ee1f98d95 100644
--- a/test/e2e/tests/signature/signature-request.spec.js
+++ b/test/e2e/tests/signature/signature-request.spec.js
@@ -1,4 +1,5 @@
 const { strict: assert } = require('assert');
+const { By } = require('selenium-webdriver');
 const {
   withFixtures,
   regularDelayMs,
@@ -63,267 +64,543 @@ const testData = [
 ];
 
 describe('Sign Typed Data Signature Request', function () {
-  testData.forEach((data) => {
-    it(`can initiate and confirm a Signature Request of ${data.type}`, async function () {
-      await withFixtures(
-        {
-          dapp: true,
-          fixtures: new FixtureBuilder()
-            .withPermissionControllerConnectedToTestDapp()
-            .build(),
-          ganacheOptions: defaultGanacheOptions,
-          title: this.test.fullTitle(),
-        },
-        async ({ driver, ganacheServer }) => {
-          const addresses = await ganacheServer.getAccounts();
-          const publicAddress = addresses[0];
-          await unlockWallet(driver);
-          await tempToggleSettingRedesignedConfirmations(driver);
-
-          await openDapp(driver);
-
-          // creates a sign typed data signature request
-          await driver.clickElement(data.buttonId);
-
-          await driver.waitUntilXWindowHandles(3);
-          let windowHandles = await driver.getAllWindowHandles();
-          await driver.switchToWindowWithTitle(
-            WINDOW_TITLES.Dialog,
-            windowHandles,
-          );
-
-          await verifyAndAssertSignTypedData(
-            driver,
-            data.type,
-            data.verifyAndAssertMessage.titleClass,
-            data.verifyAndAssertMessage.originClass,
-            data.verifyAndAssertMessage.messageClass,
-            data.expectedMessage,
-          );
-
-          // Approve signing typed data
-          await finalizeSignatureRequest(
-            driver,
-            data.type,
-            '[data-testid="signature-request-scroll-button"]',
-            'Sign',
-          );
-          await driver.waitUntilXWindowHandles(2);
-          windowHandles = await driver.getAllWindowHandles();
-
-          // switch to the Dapp and verify the signed address
-          await driver.switchToWindowWithTitle('E2E Test Dapp', windowHandles);
-          await driver.clickElement(data.verifyId);
-          const recoveredAddress = await driver.findElement(
-            data.verifyResultId,
-          );
-
-          assert.equal(await recoveredAddress.getText(), publicAddress);
-        },
-      );
+  describe('Old confirmation screens', function () {
+    testData.forEach((data) => {
+      it(`can initiate and confirm a Signature Request of ${data.type}`, async function () {
+        await withFixtures(
+          {
+            dapp: true,
+            fixtures: new FixtureBuilder()
+              .withPermissionControllerConnectedToTestDapp()
+              .build(),
+            ganacheOptions: defaultGanacheOptions,
+            title: this.test.fullTitle(),
+          },
+          async ({ driver, ganacheServer }) => {
+            const addresses = await ganacheServer.getAccounts();
+            const publicAddress = addresses[0];
+            await unlockWallet(driver);
+            await tempToggleSettingRedesignedConfirmations(driver);
+
+            await openDapp(driver);
+
+            // creates a sign typed data signature request
+            await driver.clickElement(data.buttonId);
+
+            await driver.waitUntilXWindowHandles(3);
+            let windowHandles = await driver.getAllWindowHandles();
+            await driver.switchToWindowWithTitle(
+              WINDOW_TITLES.Dialog,
+              windowHandles,
+            );
+
+            await verifyAndAssertSignTypedData(
+              driver,
+              data.type,
+              data.verifyAndAssertMessage.titleClass,
+              data.verifyAndAssertMessage.originClass,
+              data.verifyAndAssertMessage.messageClass,
+              data.expectedMessage,
+            );
+
+            // Approve signing typed data
+            await finalizeSignatureRequest(
+              driver,
+              '[data-testid="signature-request-scroll-button"]',
+              'Sign',
+            );
+            await driver.waitUntilXWindowHandles(2);
+            windowHandles = await driver.getAllWindowHandles();
+
+            // switch to the Dapp and verify the signed address
+            await driver.switchToWindowWithTitle(
+              'E2E Test Dapp',
+              windowHandles,
+            );
+            await driver.clickElement(data.verifyId);
+            const recoveredAddress = await driver.findElement(
+              data.verifyResultId,
+            );
+
+            assert.equal(await recoveredAddress.getText(), publicAddress);
+          },
+        );
+      });
     });
-  });
 
-  testData.forEach((data) => {
-    it(`can queue multiple Signature Requests of ${data.type} and confirm`, async function () {
-      await withFixtures(
-        {
-          dapp: true,
-          fixtures: new FixtureBuilder()
-            .withPermissionControllerConnectedToTestDapp()
-            .build(),
-          ganacheOptions: defaultGanacheOptions,
-          title: this.test.fullTitle(),
-        },
-        async ({ driver, ganacheServer }) => {
-          const addresses = await ganacheServer.getAccounts();
-          const publicAddress = addresses[0];
-          await unlockWallet(driver);
-          await tempToggleSettingRedesignedConfirmations(driver);
-
-          await openDapp(driver);
-
-          // creates multiple sign typed data signature requests
-          await driver.clickElement(data.buttonId);
-
-          await driver.waitUntilXWindowHandles(3);
-          const windowHandles = await driver.getAllWindowHandles();
-          // switches to Dapp
-          await driver.switchToWindowWithTitle('E2E Test Dapp', windowHandles);
-          // creates second sign typed data signature request
-          await driver.clickElement(data.buttonId);
-
-          await driver.switchToWindowWithTitle(
-            WINDOW_TITLES.Dialog,
-            windowHandles,
-          );
-
-          await driver.waitForSelector({
-            text: 'Reject 2 requests',
-            tag: 'button',
-          });
-
-          await verifyAndAssertSignTypedData(
-            driver,
-            data.type,
-            data.verifyAndAssertMessage.titleClass,
-            data.verifyAndAssertMessage.originClass,
-            data.verifyAndAssertMessage.messageClass,
-            data.expectedMessage,
-          );
-
-          // approve first signature request
-          await finalizeSignatureRequest(
-            driver,
-            data.type,
-            '[data-testid="signature-request-scroll-button"]',
-            'Sign',
-          );
-          await driver.waitUntilXWindowHandles(3);
-
-          // approve second signature request
-          await finalizeSignatureRequest(
-            driver,
-            data.type,
-            '[data-testid="signature-request-scroll-button"]',
-            'Sign',
-          );
-          await driver.waitUntilXWindowHandles(2);
-
-          // switch to the Dapp and verify the signed address for each request
-          await driver.switchToWindowWithTitle('E2E Test Dapp');
-          await driver.clickElement(data.verifyId);
-          const recoveredAddress = await driver.findElement(
-            data.verifyResultId,
-          );
-          assert.equal(await recoveredAddress.getText(), publicAddress);
-        },
-      );
+    testData.forEach((data) => {
+      it(`can queue multiple Signature Requests of ${data.type} and confirm`, async function () {
+        await withFixtures(
+          {
+            dapp: true,
+            fixtures: new FixtureBuilder()
+              .withPermissionControllerConnectedToTestDapp()
+              .build(),
+            ganacheOptions: defaultGanacheOptions,
+            title: this.test.fullTitle(),
+          },
+          async ({ driver, ganacheServer }) => {
+            const addresses = await ganacheServer.getAccounts();
+            const publicAddress = addresses[0];
+            await unlockWallet(driver);
+            await tempToggleSettingRedesignedConfirmations(driver);
+
+            await openDapp(driver);
+
+            // creates multiple sign typed data signature requests
+            await driver.clickElement(data.buttonId);
+
+            await driver.waitUntilXWindowHandles(3);
+            const windowHandles = await driver.getAllWindowHandles();
+            // switches to Dapp
+            await driver.switchToWindowWithTitle(
+              'E2E Test Dapp',
+              windowHandles,
+            );
+            // creates second sign typed data signature request
+            await driver.clickElement(data.buttonId);
+
+            await driver.switchToWindowWithTitle(
+              WINDOW_TITLES.Dialog,
+              windowHandles,
+            );
+
+            await driver.waitForSelector({
+              text: 'Reject 2 requests',
+              tag: 'button',
+            });
+
+            await verifyAndAssertSignTypedData(
+              driver,
+              data.type,
+              data.verifyAndAssertMessage.titleClass,
+              data.verifyAndAssertMessage.originClass,
+              data.verifyAndAssertMessage.messageClass,
+              data.expectedMessage,
+            );
+
+            // approve first signature request
+            await finalizeSignatureRequest(
+              driver,
+              '[data-testid="signature-request-scroll-button"]',
+              'Sign',
+            );
+            await driver.waitUntilXWindowHandles(3);
+
+            // approve second signature request
+            await finalizeSignatureRequest(
+              driver,
+              '[data-testid="signature-request-scroll-button"]',
+              'Sign',
+            );
+            await driver.waitUntilXWindowHandles(2);
+
+            // switch to the Dapp and verify the signed address for each request
+            await driver.switchToWindowWithTitle('E2E Test Dapp');
+            await driver.clickElement(data.verifyId);
+            const recoveredAddress = await driver.findElement(
+              data.verifyResultId,
+            );
+            assert.equal(await recoveredAddress.getText(), publicAddress);
+          },
+        );
+      });
+    });
+
+    testData.forEach((data) => {
+      it(`can initiate and reject a Signature Request of ${data.type}`, async function () {
+        await withFixtures(
+          {
+            dapp: true,
+            fixtures: new FixtureBuilder()
+              .withPermissionControllerConnectedToTestDapp()
+              .build(),
+            ganacheOptions: defaultGanacheOptions,
+            title: this.test.fullTitle(),
+          },
+          async ({ driver }) => {
+            await unlockWallet(driver);
+            await tempToggleSettingRedesignedConfirmations(driver);
+
+            await openDapp(driver);
+
+            // creates a sign typed data signature request
+            await driver.clickElement(data.buttonId);
+
+            await driver.waitUntilXWindowHandles(3);
+            let windowHandles = await driver.getAllWindowHandles();
+            await driver.switchToWindowWithTitle(
+              WINDOW_TITLES.Dialog,
+              windowHandles,
+            );
+
+            // Reject signing typed data
+            await finalizeSignatureRequest(
+              driver,
+              '[data-testid="signature-request-scroll-button"]',
+              'Reject',
+            );
+            await driver.waitUntilXWindowHandles(2);
+            windowHandles = await driver.getAllWindowHandles();
+
+            // switch to the Dapp and verify the rejection was successful
+            await driver.switchToWindowWithTitle(
+              'E2E Test Dapp',
+              windowHandles,
+            );
+
+            await driver.waitForSelector(data.verifyRejectionResultId);
+            const rejectionResult = await driver.findElement(
+              data.verifyRejectionResultId,
+            );
+
+            assert.equal(
+              await rejectionResult.getText(),
+              data.rejectSignatureMessage,
+            );
+          },
+        );
+      });
     });
-  });
 
-  testData.forEach((data) => {
-    it(`can initiate and reject a Signature Request of ${data.type}`, async function () {
-      await withFixtures(
-        {
-          dapp: true,
-          fixtures: new FixtureBuilder()
-            .withPermissionControllerConnectedToTestDapp()
-            .build(),
-          ganacheOptions: defaultGanacheOptions,
-          title: this.test.fullTitle(),
-        },
-        async ({ driver }) => {
-          await unlockWallet(driver);
-          await tempToggleSettingRedesignedConfirmations(driver);
-
-          await openDapp(driver);
-
-          // creates a sign typed data signature request
-          await driver.clickElement(data.buttonId);
-
-          await driver.waitUntilXWindowHandles(3);
-          let windowHandles = await driver.getAllWindowHandles();
-          await driver.switchToWindowWithTitle(
-            WINDOW_TITLES.Dialog,
-            windowHandles,
-          );
-
-          // Reject signing typed data
-          await finalizeSignatureRequest(
-            driver,
-            data.type,
-            '[data-testid="signature-request-scroll-button"]',
-            'Reject',
-          );
-          await driver.waitUntilXWindowHandles(2);
-          windowHandles = await driver.getAllWindowHandles();
-
-          // switch to the Dapp and verify the rejection was successful
-          await driver.switchToWindowWithTitle('E2E Test Dapp', windowHandles);
-
-          await driver.waitForSelector(data.verifyRejectionResultId);
-          const rejectionResult = await driver.findElement(
-            data.verifyRejectionResultId,
-          );
-
-          assert.equal(
-            await rejectionResult.getText(),
-            data.rejectSignatureMessage,
-          );
-        },
-      );
+    testData.forEach((data) => {
+      it(`can queue multiple Signature Requests of ${data.type} and reject`, async function () {
+        await withFixtures(
+          {
+            dapp: true,
+            fixtures: new FixtureBuilder()
+              .withPermissionControllerConnectedToTestDapp()
+              .build(),
+            ganacheOptions: defaultGanacheOptions,
+            title: this.test.fullTitle(),
+          },
+          async ({ driver }) => {
+            await unlockWallet(driver);
+            await tempToggleSettingRedesignedConfirmations(driver);
+
+            await openDapp(driver);
+
+            // creates multiple sign typed data signature requests
+            await driver.clickElement(data.buttonId);
+
+            await driver.waitUntilXWindowHandles(3);
+            const windowHandles = await driver.getAllWindowHandles();
+            // switches to Dapp
+            await driver.switchToWindowWithTitle(
+              'E2E Test Dapp',
+              windowHandles,
+            );
+            // creates second sign typed data signature request
+            await driver.clickElement(data.buttonId);
+
+            await driver.switchToWindowWithTitle(
+              WINDOW_TITLES.Dialog,
+              windowHandles,
+            );
+
+            await driver.waitForSelector({
+              text: 'Reject 2 requests',
+              tag: 'button',
+            });
+
+            // reject first signature request
+            await finalizeSignatureRequest(
+              driver,
+              '[data-testid="signature-request-scroll-button"]',
+              'Reject',
+            );
+            await driver.waitUntilXWindowHandles(3);
+
+            // reject second signature request
+            await finalizeSignatureRequest(
+              driver,
+              '[data-testid="signature-request-scroll-button"]',
+              'Reject',
+            );
+            await driver.waitUntilXWindowHandles(2);
+
+            // switch to the Dapp and verify the rejection was successful
+            await driver.switchToWindowWithTitle('E2E Test Dapp');
+
+            await driver.waitForSelector(data.verifyRejectionResultId);
+            const rejectionResult = await driver.findElement(
+              data.verifyRejectionResultId,
+            );
+            assert.equal(
+              await rejectionResult.getText(),
+              data.rejectSignatureMessage,
+            );
+          },
+        );
+      });
     });
   });
 
-  testData.forEach((data) => {
-    it(`can queue multiple Signature Requests of ${data.type} and reject`, async function () {
-      await withFixtures(
-        {
-          dapp: true,
-          fixtures: new FixtureBuilder()
-            .withPermissionControllerConnectedToTestDapp()
-            .build(),
-          ganacheOptions: defaultGanacheOptions,
-          title: this.test.fullTitle(),
-        },
-        async ({ driver }) => {
-          await unlockWallet(driver);
-          await tempToggleSettingRedesignedConfirmations(driver);
-
-          await openDapp(driver);
-
-          // creates multiple sign typed data signature requests
-          await driver.clickElement(data.buttonId);
-
-          await driver.waitUntilXWindowHandles(3);
-          const windowHandles = await driver.getAllWindowHandles();
-          // switches to Dapp
-          await driver.switchToWindowWithTitle('E2E Test Dapp', windowHandles);
-          // creates second sign typed data signature request
-          await driver.clickElement(data.buttonId);
-
-          await driver.switchToWindowWithTitle(
-            WINDOW_TITLES.Dialog,
-            windowHandles,
-          );
-
-          await driver.waitForSelector({
-            text: 'Reject 2 requests',
-            tag: 'button',
-          });
-
-          // reject first signature request
-          await finalizeSignatureRequest(
-            driver,
-            data.type,
-            '[data-testid="signature-request-scroll-button"]',
-            'Reject',
-          );
-          await driver.waitUntilXWindowHandles(3);
-
-          // reject second signature request
-          await finalizeSignatureRequest(
-            driver,
-            data.type,
-            '[data-testid="signature-request-scroll-button"]',
-            'Reject',
-          );
-          await driver.waitUntilXWindowHandles(2);
-
-          // switch to the Dapp and verify the rejection was successful
-          await driver.switchToWindowWithTitle('E2E Test Dapp');
-
-          await driver.waitForSelector(data.verifyRejectionResultId);
-          const rejectionResult = await driver.findElement(
-            data.verifyRejectionResultId,
-          );
-          assert.equal(
-            await rejectionResult.getText(),
-            data.rejectSignatureMessage,
-          );
-        },
-      );
+  describe('Redesigned confirmation screens', function () {
+    testData.forEach((data) => {
+      it(`can initiate and confirm a Signature Request of ${data.type}`, async function () {
+        await withFixtures(
+          {
+            dapp: true,
+            fixtures: new FixtureBuilder()
+              .withPermissionControllerConnectedToTestDapp()
+              .build(),
+            ganacheOptions: defaultGanacheOptions,
+            title: this.test.fullTitle(),
+          },
+          async ({ driver, ganacheServer }) => {
+            const addresses = await ganacheServer.getAccounts();
+            const publicAddress = addresses[0];
+            await unlockWallet(driver);
+
+            await openDapp(driver);
+
+            // creates a sign typed data signature request
+            await driver.clickElement(data.buttonId);
+
+            await driver.waitUntilXWindowHandles(3);
+            let windowHandles = await driver.getAllWindowHandles();
+            await driver.switchToWindowWithTitle(
+              WINDOW_TITLES.Dialog,
+              windowHandles,
+            );
+
+            await verifyAndAssertRedesignedSignTypedData(
+              driver,
+              data.expectedMessage,
+            );
+
+            // Approve signing typed data
+            await finalizeSignatureRequest(
+              driver,
+              '.confirm-scroll-to-bottom__button',
+              'Confirm',
+            );
+            await driver.waitUntilXWindowHandles(2);
+            windowHandles = await driver.getAllWindowHandles();
+
+            // switch to the Dapp and verify the signed address
+            await driver.switchToWindowWithTitle(
+              'E2E Test Dapp',
+              windowHandles,
+            );
+            await driver.clickElement(data.verifyId);
+            const recoveredAddress = await driver.findElement(
+              data.verifyResultId,
+            );
+
+            assert.equal(await recoveredAddress.getText(), publicAddress);
+          },
+        );
+      });
+    });
+
+    testData.forEach((data) => {
+      it(`can queue multiple Signature Requests of ${data.type} and confirm`, async function () {
+        await withFixtures(
+          {
+            dapp: true,
+            fixtures: new FixtureBuilder()
+              .withPermissionControllerConnectedToTestDapp()
+              .build(),
+            ganacheOptions: defaultGanacheOptions,
+            title: this.test.fullTitle(),
+          },
+          async ({ driver, ganacheServer }) => {
+            const addresses = await ganacheServer.getAccounts();
+            const publicAddress = addresses[0];
+            await unlockWallet(driver);
+
+            await openDapp(driver);
+
+            // creates multiple sign typed data signature requests
+            await driver.clickElement(data.buttonId);
+
+            await driver.waitUntilXWindowHandles(3);
+            const windowHandles = await driver.getAllWindowHandles();
+            // switches to Dapp
+            await driver.switchToWindowWithTitle(
+              'E2E Test Dapp',
+              windowHandles,
+            );
+            // creates second sign typed data signature request
+            await driver.clickElement(data.buttonId);
+
+            await driver.switchToWindowWithTitle(
+              WINDOW_TITLES.Dialog,
+              windowHandles,
+            );
+
+            await driver.waitForSelector(
+              By.xpath("//div[normalize-space(.)='1 of 2']"),
+            );
+
+            await driver.waitForSelector({
+              text: 'Reject all',
+              tag: 'button',
+            });
+
+            await verifyAndAssertRedesignedSignTypedData(
+              driver,
+              data.expectedMessage,
+            );
+
+            // Approve signing typed data
+            await finalizeSignatureRequest(
+              driver,
+              '.confirm-scroll-to-bottom__button',
+              'Confirm',
+            );
+            await driver.waitUntilXWindowHandles(3);
+
+            // Approve signing typed data
+            await finalizeSignatureRequest(
+              driver,
+              '.confirm-scroll-to-bottom__button',
+              'Confirm',
+            );
+            await driver.waitUntilXWindowHandles(2);
+
+            // switch to the Dapp and verify the signed address for each request
+            await driver.switchToWindowWithTitle('E2E Test Dapp');
+            await driver.clickElement(data.verifyId);
+            const recoveredAddress = await driver.findElement(
+              data.verifyResultId,
+            );
+            assert.equal(await recoveredAddress.getText(), publicAddress);
+          },
+        );
+      });
+    });
+
+    testData.forEach((data) => {
+      it(`can initiate and reject a Signature Request of ${data.type}`, async function () {
+        await withFixtures(
+          {
+            dapp: true,
+            fixtures: new FixtureBuilder()
+              .withPermissionControllerConnectedToTestDapp()
+              .build(),
+            ganacheOptions: defaultGanacheOptions,
+            title: this.test.fullTitle(),
+          },
+          async ({ driver }) => {
+            await unlockWallet(driver);
+
+            await openDapp(driver);
+
+            // creates a sign typed data signature request
+            await driver.clickElement(data.buttonId);
+
+            await driver.waitUntilXWindowHandles(3);
+            let windowHandles = await driver.getAllWindowHandles();
+            await driver.switchToWindowWithTitle(
+              WINDOW_TITLES.Dialog,
+              windowHandles,
+            );
+
+            // Reject signing typed data
+            await finalizeSignatureRequest(
+              driver,
+              '.confirm-scroll-to-bottom__button',
+              'Cancel',
+            );
+            await driver.waitUntilXWindowHandles(2);
+            windowHandles = await driver.getAllWindowHandles();
+
+            // switch to the Dapp and verify the rejection was successful
+            await driver.switchToWindowWithTitle(
+              'E2E Test Dapp',
+              windowHandles,
+            );
+
+            await driver.waitForSelector(data.verifyRejectionResultId);
+            const rejectionResult = await driver.findElement(
+              data.verifyRejectionResultId,
+            );
+
+            assert.equal(
+              await rejectionResult.getText(),
+              data.rejectSignatureMessage,
+            );
+          },
+        );
+      });
+    });
+
+    testData.forEach((data) => {
+      it(`can queue multiple Signature Requests of ${data.type} and reject`, async function () {
+        await withFixtures(
+          {
+            dapp: true,
+            fixtures: new FixtureBuilder()
+              .withPermissionControllerConnectedToTestDapp()
+              .build(),
+            ganacheOptions: defaultGanacheOptions,
+            title: this.test.fullTitle(),
+          },
+          async ({ driver }) => {
+            await unlockWallet(driver);
+
+            await openDapp(driver);
+
+            // creates multiple sign typed data signature requests
+            await driver.clickElement(data.buttonId);
+
+            await driver.waitUntilXWindowHandles(3);
+            const windowHandles = await driver.getAllWindowHandles();
+            // switches to Dapp
+            await driver.switchToWindowWithTitle(
+              'E2E Test Dapp',
+              windowHandles,
+            );
+            // creates second sign typed data signature request
+            await driver.clickElement(data.buttonId);
+
+            await driver.switchToWindowWithTitle(
+              WINDOW_TITLES.Dialog,
+              windowHandles,
+            );
+
+            await driver.waitForSelector(
+              By.xpath("//div[normalize-space(.)='1 of 2']"),
+            );
+
+            await driver.waitForSelector({
+              text: 'Reject all',
+              tag: 'button',
+            });
+
+            // reject first signature request
+            await finalizeSignatureRequest(
+              driver,
+              '.confirm-scroll-to-bottom__button',
+              'Cancel',
+            );
+            await driver.waitUntilXWindowHandles(3);
+
+            // reject second signature request
+            await finalizeSignatureRequest(
+              driver,
+              '.confirm-scroll-to-bottom__button',
+              'Cancel',
+            );
+            await driver.waitUntilXWindowHandles(2);
+
+            // switch to the Dapp and verify the rejection was successful
+            await driver.switchToWindowWithTitle('E2E Test Dapp');
+
+            await driver.waitForSelector(data.verifyRejectionResultId);
+            const rejectionResult = await driver.findElement(
+              data.verifyRejectionResultId,
+            );
+            assert.equal(
+              await rejectionResult.getText(),
+              data.rejectSignatureMessage,
+            );
+          },
+        );
+      });
     });
   });
 });
@@ -359,11 +636,27 @@ async function verifyAndAssertSignTypedData(
   assert.equal(await messages[messageNumber].getText(), expectedMessage);
 }
 
-async function finalizeSignatureRequest(driver, type, buttonElementId, action) {
-  if (type !== signatureRequestType.signTypedData) {
-    await driver.delay(regularDelayMs);
-    await driver.clickElement(buttonElementId);
-  }
+async function verifyAndAssertRedesignedSignTypedData(driver, expectedMessage) {
+  await driver.findElement({
+    css: 'h2',
+    text: 'Signature request',
+  });
+
+  await driver.findElement({
+    css: 'p',
+    text: '127.0.0.1:8080',
+  });
+
+  await driver.findElement({
+    css: 'p',
+    text: expectedMessage,
+  });
+}
+
+async function finalizeSignatureRequest(driver, buttonElementId, action) {
+  await driver.delay(regularDelayMs);
+  await driver.clickElementSafe(buttonElementId);
+
   await driver.delay(regularDelayMs);
   await driver.clickElement({ text: action, tag: 'button' });
 }

From 788e4a23d7db808acc4ca46e89b194b0dc617b8d Mon Sep 17 00:00:00 2001
From: OGPoyraz <omergoktugpoyraz@gmail.com>
Date: Fri, 13 Dec 2024 12:36:10 +0100
Subject: [PATCH 127/175] fix: Fix not set `estimate_type` and rename
 `dappSuggested` transaction metric property value (#29052)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<!--
Please submit this PR as a draft initially.
Do not mark it as "Ready for review" until the template has been
completely filled out, and PR status checks have passed at least once.
-->

## **Description**

<!--
Write a short description of the changes included in this pull request,
also include relevant motivation and context. Have in mind the following
questions:
1. What is the reason for the change?
2. What is the improvement/solution?
-->

This PR aims to rename `dappSuggested` transaction event value to
`dapp_proposed`.
Also it fixes the `estimate_type` property to `default_estimate` on not
EIP1559 transactions.

[![Open in GitHub
Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/29052?quickstart=1)

## **Related issues**

Fixes: https://github.com/MetaMask/MetaMask-planning/issues/3595

## **Manual testing steps**

N/A

## **Screenshots/Recordings**

<!-- If applicable, add screenshots and/or recordings to visualize the
before and after of your change. -->

### **Before**

<!-- [screenshots/recordings] -->

### **After**

<!-- [screenshots/recordings] -->

## **Pre-merge author checklist**

- [ ] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension Coding
Standards](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/CODING_GUIDELINES.md).
- [ ] I've completed the PR template to the best of my ability
- [ ] I’ve included tests if applicable
- [ ] I’ve documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [ ] I’ve applied the right labels on the PR (see [labeling
guidelines](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.

## **Pre-merge reviewer checklist**

- [ ] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed).
- [ ] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.
---
 app/scripts/lib/transaction/metrics.test.ts |  2 ++
 app/scripts/lib/transaction/metrics.ts      | 14 ++++++++++++--
 shared/constants/metametrics.ts             |  5 +++++
 3 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/app/scripts/lib/transaction/metrics.test.ts b/app/scripts/lib/transaction/metrics.test.ts
index 2fea8da0dcb7..8e2924a0e30f 100644
--- a/app/scripts/lib/transaction/metrics.test.ts
+++ b/app/scripts/lib/transaction/metrics.test.ts
@@ -18,6 +18,7 @@ import {
   MetaMetricsTransactionEventSource,
   MetaMetricsEventCategory,
   MetaMetricsEventUiCustomization,
+  MetaMetricsEventTransactionEstimateType,
 } from '../../../../shared/constants/metametrics';
 import { TRANSACTION_ENVELOPE_TYPE_NAMES } from '../../../../shared/lib/transactions-controller-utils';
 import {
@@ -165,6 +166,7 @@ describe('Transaction metrics', () => {
     };
 
     expectedSensitiveProperties = {
+      default_estimate: MetaMetricsEventTransactionEstimateType.DefaultEstimate,
       default_gas: '0.000031501',
       default_gas_price: '2',
       first_seen: 1624408066355,
diff --git a/app/scripts/lib/transaction/metrics.ts b/app/scripts/lib/transaction/metrics.ts
index 21a385307742..ee09d60259cd 100644
--- a/app/scripts/lib/transaction/metrics.ts
+++ b/app/scripts/lib/transaction/metrics.ts
@@ -9,12 +9,16 @@ import {
   TransactionType,
 } from '@metamask/transaction-controller';
 import { ORIGIN_METAMASK } from '../../../../shared/constants/app';
-import { GasRecommendations } from '../../../../shared/constants/gas';
+import {
+  GasRecommendations,
+  PriorityLevels,
+} from '../../../../shared/constants/gas';
 import {
   MetaMetricsEventCategory,
   MetaMetricsEventFragment,
   MetaMetricsEventName,
   MetaMetricsEventUiCustomization,
+  MetaMetricsEventTransactionEstimateType,
   MetaMetricsPageObject,
   MetaMetricsReferrerObject,
 } from '../../../../shared/constants/metametrics';
@@ -824,12 +828,18 @@ async function buildEventFragmentProperties({
     gasParams.max_priority_fee_per_gas = maxPriorityFeePerGas;
   } else {
     gasParams.gas_price = gasPrice;
+    gasParams.default_estimate =
+      MetaMetricsEventTransactionEstimateType.DefaultEstimate;
   }
 
   if (defaultGasEstimates) {
     const { estimateType } = defaultGasEstimates;
     if (estimateType) {
-      gasParams.default_estimate = estimateType;
+      gasParams.default_estimate =
+        estimateType === PriorityLevels.dAppSuggested
+          ? MetaMetricsEventTransactionEstimateType.DappProposed
+          : estimateType;
+
       let defaultMaxFeePerGas =
         transactionMeta.defaultGasEstimates?.maxFeePerGas;
       let defaultMaxPriorityFeePerGas =
diff --git a/shared/constants/metametrics.ts b/shared/constants/metametrics.ts
index 700bead89320..a65c349963ec 100644
--- a/shared/constants/metametrics.ts
+++ b/shared/constants/metametrics.ts
@@ -1034,3 +1034,8 @@ export enum DeleteRegulationStatus {
   Running = 'RUNNING',
   Unknown = 'UNKNOWN',
 }
+
+export enum MetaMetricsEventTransactionEstimateType {
+  DappProposed = 'dapp_proposed',
+  DefaultEstimate = 'default_estimate',
+}

From 57f5a6bc9c29b92803493c44b66140315c310ce4 Mon Sep 17 00:00:00 2001
From: Frederik Bolding <frederik.bolding@gmail.com>
Date: Fri, 13 Dec 2024 14:02:07 +0100
Subject: [PATCH 128/175] fix: Disable link out modal for preinstalled Snap
 links (#29142)

<!--
Please submit this PR as a draft initially.
Do not mark it as "Ready for review" until the template has been
completely filled out, and PR status checks have passed at least once.
-->

## **Description**

Disables the link out modal for links displayed by preinstalled Snaps,
reducing the UX friction. Also memoizes a frequently used selector in
Snaps UI components.

[![Open in GitHub
Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/29142?quickstart=1)

## **Related issues**

Closes https://github.com/MetaMask/snaps/issues/2936

## **Manual testing steps**

1. Go to the Solana send flow and fill out the inputs
2. Proceed to the review screen
3. Click the links on the review screen and notice that they open right
away
---
 .../app/snaps/snap-ui-link/snap-ui-link.js    | 44 ++++++++++++++++---
 ui/selectors/selectors.js                     |  2 +-
 2 files changed, 39 insertions(+), 7 deletions(-)

diff --git a/ui/components/app/snaps/snap-ui-link/snap-ui-link.js b/ui/components/app/snaps/snap-ui-link/snap-ui-link.js
index 58a22008a52a..9a93127febcc 100644
--- a/ui/components/app/snaps/snap-ui-link/snap-ui-link.js
+++ b/ui/components/app/snaps/snap-ui-link/snap-ui-link.js
@@ -1,5 +1,6 @@
 import React, { useState } from 'react';
 import PropTypes from 'prop-types';
+import { useSelector } from 'react-redux';
 import { Display } from '../../../../helpers/constants/design-system';
 import {
   ButtonLink,
@@ -10,6 +11,8 @@ import {
 } from '../../../component-library';
 import SnapLinkWarning from '../snap-link-warning';
 import useSnapNavigation from '../../../../hooks/snaps/useSnapNavigation';
+import { useSnapInterfaceContext } from '../../../../contexts/snaps';
+import { getHideSnapBranding } from '../../../../selectors';
 
 export const SnapUILink = ({ href, children }) => {
   const [isOpen, setIsOpen] = useState(false);
@@ -17,12 +20,17 @@ export const SnapUILink = ({ href, children }) => {
   const isMetaMaskUrl = href.startsWith('metamask:');
   const { navigate } = useSnapNavigation();
 
+  const { snapId } = useSnapInterfaceContext();
+  const hideSnapBranding = useSelector((state) =>
+    getHideSnapBranding(state, snapId),
+  );
+
+  const handleMetaMaskLinkClick = () => {
+    navigate(href);
+  };
+
   const handleLinkClick = () => {
-    if (isMetaMaskUrl) {
-      navigate(href);
-    } else {
-      setIsOpen(true);
-    }
+    setIsOpen(true);
   };
 
   const handleModalClose = () => {
@@ -35,9 +43,33 @@ export const SnapUILink = ({ href, children }) => {
         as="a"
         size={ButtonLinkSize.Inherit}
         className="snap-ui-renderer__link"
-        onClick={handleLinkClick}
+        onClick={handleMetaMaskLinkClick}
+      >
+        {children}
+      </ButtonLink>
+    );
+  }
+
+  // hideSnapBranding disables the modal and allows direct external links.
+  if (hideSnapBranding) {
+    return (
+      <ButtonLink
+        as="a"
+        href={href}
+        externalLink
+        size={ButtonLinkSize.Inherit}
+        display={Display.Inline}
+        className="snap-ui-renderer__link"
+        style={{
+          // Prevents the link from taking up the full width of the parent.
+          width: 'fit-content',
+        }}
+        textProps={{
+          display: Display.Inline,
+        }}
       >
         {children}
+        <Icon name={IconName.Export} size={IconSize.Inherit} marginLeft={1} />
       </ButtonLink>
     );
   }
diff --git a/ui/selectors/selectors.js b/ui/selectors/selectors.js
index 2986373913ca..02adf1241e30 100644
--- a/ui/selectors/selectors.js
+++ b/ui/selectors/selectors.js
@@ -1332,7 +1332,7 @@ export const getAnySnapUpdateAvailable = createSelector(
 /**
  * Return if the snap branding should show in the UI.
  */
-export const getHideSnapBranding = createSelector(
+export const getHideSnapBranding = createDeepEqualSelector(
   [selectInstalledSnaps, selectSnapId],
   (installedSnaps, snapId) => {
     return installedSnaps[snapId]?.hideSnapBranding;

From c671bf3aed17bf28ee315ce04d96f32c0116e77d Mon Sep 17 00:00:00 2001
From: Jongsun Suh <jongsun.suh@icloud.com>
Date: Fri, 13 Dec 2024 10:08:12 -0500
Subject: [PATCH 129/175] chore: Bump `reselect` to `^5.1.1` for
 heterogenously-typed selectors support (#29094)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## Motivation

#### Homogenous selector types:

```ts
const selectorOne = (state: State) => state.something;
const selectorTwo = (state: State) => state.other;
createSelector([selectorOne, selectorTwo], () => ...);
```

#### Heterogenous selector types:

```ts
const selectorOne = (state: { something: string }) => state.something;
const selectorTwo = (state: { other: number }) => state.other;
createSelector([selectorOne, selectorTwo], () => ...);
```

Support for heterogenous typing is essential for selectors to function
properly, because selectors must be both mergeable and atomic. Without
heterogenous selectors, these becoming conflicting objectives.

- **Mergeable:**
- Without heterogenous typing for selectors, the size of the state type
for all selectors tend to inflate. This is because a selector's state
must be a supertype for the intersection of the state types of all of
its merged selectors, including selectors nested in the definitions of
merged selectors.
- Eventually, many selectors end up being defined with a state type that
is close to the entire Redux state.
- Paradoxically, selectors that only need access to very few properties
end up needing to have the widest state type, because they tend to be
merged into the most selectors across several nested levels.

- **Atomic:**
- When selectors are actually invoked, including in test files, it's not
always practical to prepare and pass in a very large state object.
- It's both safer and more convenient to restrict the state being passed
into the selector to the minimum size required for the selector to
function.
- This requirement becomes incompatible with the mergeability
requirement if all selectors must share a common state type.

Enabling merged selectors to accept different, even disjoint state types
resolves this issue.

> [!NOTE]
> See the
[`MultichainState`](https://github.com/MetaMask/metamask-extension/blob/4f970df0acec3e3bc80da08373aa3b16f23aae41/ui/selectors/multichain.ts#L53)
type for an example of a bloated selector state type which will become
unnecessary with this update.

## **Description**

- `reselect@4.0.0` supports heterogenous typing for selector inputs to
`createSelector` and `createDeepEqualSelector`.
  - https://github.com/reduxjs/reselect/issues/351
    - https://github.com/reduxjs/reselect/pull/274
    - https://github.com/reduxjs/reselect/pull/315
- Upgrade to `^5.1.1` (latest) is necessary to fix type issues in
`4.0.0`
-
https://app.circleci.com/jobs/github/MetaMask/metamask-extension/4320173

[![Open in GitHub
Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/29094?quickstart=1)

## **Related issues**

- Blocks TypeScript conversion of selectors for
https://github.com/MetaMask/MetaMask-planning/issues/2894.
  - https://github.com/MetaMask/metamask-extension/pull/29014

## **Manual testing steps**

## **Screenshots/Recordings**

<!-- If applicable, add screenshots and/or recordings to visualize the
before and after of your change. -->

### **Before**

<!-- [screenshots/recordings] -->

### **After**

<!-- [screenshots/recordings] -->

## **Pre-merge author checklist**

- [x] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension Coding
Standards](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/CODING_GUIDELINES.md).
- [x] I've completed the PR template to the best of my ability
- [x] I’ve included tests if applicable
- [x] I’ve documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [x] I’ve applied the right labels on the PR (see [labeling
guidelines](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.

## **Pre-merge reviewer checklist**

- [ ] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed).
- [ ] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.

---------

Co-authored-by: MetaMask Bot <metamaskbot@users.noreply.github.com>
---
 lavamoat/browserify/beta/policy.json          |  16 +-
 lavamoat/browserify/flask/policy.json         |  16 +-
 lavamoat/browserify/main/policy.json          |  16 +-
 lavamoat/browserify/mmi/policy.json           |  16 +-
 package.json                                  |   2 +-
 .../modules/selectors/smart-transactions.ts   |   2 +
 shared/modules/selectors/util.js              |   4 +-
 .../snap-authorship-pill.tsx                  |   1 -
 .../app/snaps/snap-icon/snap-icon.tsx         |   1 -
 ui/ducks/bridge/selectors.test.ts             |  42 ++--
 .../bridge/quotes/bridge-quotes-modal.tsx     | 238 +++++++++---------
 .../snaps/snaps-section/snap-insight.tsx      |   1 -
 yarn.lock                                     |   9 +-
 13 files changed, 185 insertions(+), 179 deletions(-)

diff --git a/lavamoat/browserify/beta/policy.json b/lavamoat/browserify/beta/policy.json
index 4212ef454eea..52e53af28a1e 100644
--- a/lavamoat/browserify/beta/policy.json
+++ b/lavamoat/browserify/beta/policy.json
@@ -1694,10 +1694,10 @@
         "@metamask/network-controller>@metamask/eth-block-tracker": true,
         "@metamask/network-controller>@metamask/eth-json-rpc-infura": true,
         "@metamask/network-controller>@metamask/swappable-obj-proxy": true,
-        "@metamask/network-controller>reselect": true,
         "@metamask/rpc-errors": true,
         "@metamask/utils": true,
         "eslint>fast-deep-equal": true,
+        "reselect": true,
         "uri-js": true,
         "uuid": true
       }
@@ -1756,13 +1756,6 @@
         "semver": true
       }
     },
-    "@metamask/network-controller>reselect": {
-      "globals": {
-        "WeakRef": true,
-        "console.warn": true,
-        "unstable_autotrackMemoize": true
-      }
-    },
     "@metamask/notification-controller>nanoid": {
       "globals": {
         "crypto.getRandomValues": true
@@ -5138,6 +5131,13 @@
         "@babel/runtime": true
       }
     },
+    "reselect": {
+      "globals": {
+        "WeakRef": true,
+        "console.warn": true,
+        "unstable_autotrackMemoize": true
+      }
+    },
     "semver": {
       "globals": {
         "console.error": true
diff --git a/lavamoat/browserify/flask/policy.json b/lavamoat/browserify/flask/policy.json
index 4212ef454eea..52e53af28a1e 100644
--- a/lavamoat/browserify/flask/policy.json
+++ b/lavamoat/browserify/flask/policy.json
@@ -1694,10 +1694,10 @@
         "@metamask/network-controller>@metamask/eth-block-tracker": true,
         "@metamask/network-controller>@metamask/eth-json-rpc-infura": true,
         "@metamask/network-controller>@metamask/swappable-obj-proxy": true,
-        "@metamask/network-controller>reselect": true,
         "@metamask/rpc-errors": true,
         "@metamask/utils": true,
         "eslint>fast-deep-equal": true,
+        "reselect": true,
         "uri-js": true,
         "uuid": true
       }
@@ -1756,13 +1756,6 @@
         "semver": true
       }
     },
-    "@metamask/network-controller>reselect": {
-      "globals": {
-        "WeakRef": true,
-        "console.warn": true,
-        "unstable_autotrackMemoize": true
-      }
-    },
     "@metamask/notification-controller>nanoid": {
       "globals": {
         "crypto.getRandomValues": true
@@ -5138,6 +5131,13 @@
         "@babel/runtime": true
       }
     },
+    "reselect": {
+      "globals": {
+        "WeakRef": true,
+        "console.warn": true,
+        "unstable_autotrackMemoize": true
+      }
+    },
     "semver": {
       "globals": {
         "console.error": true
diff --git a/lavamoat/browserify/main/policy.json b/lavamoat/browserify/main/policy.json
index 4212ef454eea..52e53af28a1e 100644
--- a/lavamoat/browserify/main/policy.json
+++ b/lavamoat/browserify/main/policy.json
@@ -1694,10 +1694,10 @@
         "@metamask/network-controller>@metamask/eth-block-tracker": true,
         "@metamask/network-controller>@metamask/eth-json-rpc-infura": true,
         "@metamask/network-controller>@metamask/swappable-obj-proxy": true,
-        "@metamask/network-controller>reselect": true,
         "@metamask/rpc-errors": true,
         "@metamask/utils": true,
         "eslint>fast-deep-equal": true,
+        "reselect": true,
         "uri-js": true,
         "uuid": true
       }
@@ -1756,13 +1756,6 @@
         "semver": true
       }
     },
-    "@metamask/network-controller>reselect": {
-      "globals": {
-        "WeakRef": true,
-        "console.warn": true,
-        "unstable_autotrackMemoize": true
-      }
-    },
     "@metamask/notification-controller>nanoid": {
       "globals": {
         "crypto.getRandomValues": true
@@ -5138,6 +5131,13 @@
         "@babel/runtime": true
       }
     },
+    "reselect": {
+      "globals": {
+        "WeakRef": true,
+        "console.warn": true,
+        "unstable_autotrackMemoize": true
+      }
+    },
     "semver": {
       "globals": {
         "console.error": true
diff --git a/lavamoat/browserify/mmi/policy.json b/lavamoat/browserify/mmi/policy.json
index 5234fe8d6fbb..b10d976bb08c 100644
--- a/lavamoat/browserify/mmi/policy.json
+++ b/lavamoat/browserify/mmi/policy.json
@@ -1786,10 +1786,10 @@
         "@metamask/network-controller>@metamask/eth-block-tracker": true,
         "@metamask/network-controller>@metamask/eth-json-rpc-infura": true,
         "@metamask/network-controller>@metamask/swappable-obj-proxy": true,
-        "@metamask/network-controller>reselect": true,
         "@metamask/rpc-errors": true,
         "@metamask/utils": true,
         "eslint>fast-deep-equal": true,
+        "reselect": true,
         "uri-js": true,
         "uuid": true
       }
@@ -1848,13 +1848,6 @@
         "semver": true
       }
     },
-    "@metamask/network-controller>reselect": {
-      "globals": {
-        "WeakRef": true,
-        "console.warn": true,
-        "unstable_autotrackMemoize": true
-      }
-    },
     "@metamask/notification-controller>nanoid": {
       "globals": {
         "crypto.getRandomValues": true
@@ -5230,6 +5223,13 @@
         "@babel/runtime": true
       }
     },
+    "reselect": {
+      "globals": {
+        "WeakRef": true,
+        "console.warn": true,
+        "unstable_autotrackMemoize": true
+      }
+    },
     "semver": {
       "globals": {
         "console.error": true
diff --git a/package.json b/package.json
index a0c25ef6cdee..bd3507bf6f0a 100644
--- a/package.json
+++ b/package.json
@@ -426,7 +426,7 @@
     "redux": "^4.0.5",
     "redux-thunk": "^2.3.0",
     "remove-trailing-slash": "^0.1.1",
-    "reselect": "^3.0.1",
+    "reselect": "^5.1.1",
     "ses": "^1.1.0",
     "simple-git": "^3.20.0",
     "single-call-balance-checker-abi": "^1.0.0",
diff --git a/shared/modules/selectors/smart-transactions.ts b/shared/modules/selectors/smart-transactions.ts
index c9a696ba9b9e..9367c24853c6 100644
--- a/shared/modules/selectors/smart-transactions.ts
+++ b/shared/modules/selectors/smart-transactions.ts
@@ -84,6 +84,7 @@ export const getSmartTransactionsOptInStatusInternal = createSelector(
  * @returns true if the user has explicitly opted in, false if they have opted out,
  * or null if they have not explicitly opted in or out.
  */
+// @ts-expect-error TODO: Fix types for `getSmartTransactionsOptInStatusInternal` once `getPreferences is converted to TypeScript
 export const getSmartTransactionsOptInStatusForMetrics = createSelector(
   getSmartTransactionsOptInStatusInternal,
   (optInStatus: boolean): boolean => optInStatus,
@@ -96,6 +97,7 @@ export const getSmartTransactionsOptInStatusForMetrics = createSelector(
  * @param state
  * @returns
  */
+// @ts-expect-error TODO: Fix types for `getSmartTransactionsOptInStatusInternal` once `getPreferences is converted to TypeScript
 export const getSmartTransactionsPreferenceEnabled = createSelector(
   getSmartTransactionsOptInStatusInternal,
   (optInStatus: boolean): boolean => {
diff --git a/shared/modules/selectors/util.js b/shared/modules/selectors/util.js
index d44b7d905087..35153a82bc4d 100644
--- a/shared/modules/selectors/util.js
+++ b/shared/modules/selectors/util.js
@@ -1,9 +1,9 @@
 import { TransactionStatus } from '@metamask/transaction-controller';
 import { isEqual } from 'lodash';
-import { createSelectorCreator, defaultMemoize } from 'reselect';
+import { createSelectorCreator, lruMemoize } from 'reselect';
 
 export const createDeepEqualSelector = createSelectorCreator(
-  defaultMemoize,
+  lruMemoize,
   isEqual,
 );
 
diff --git a/ui/components/app/snaps/snap-authorship-pill/snap-authorship-pill.tsx b/ui/components/app/snaps/snap-authorship-pill/snap-authorship-pill.tsx
index fd8831f36e0f..3a52a5c43eef 100644
--- a/ui/components/app/snaps/snap-authorship-pill/snap-authorship-pill.tsx
+++ b/ui/components/app/snaps/snap-authorship-pill/snap-authorship-pill.tsx
@@ -22,7 +22,6 @@ const SnapAuthorshipPill: React.FC<SnapAuthorshipPillProps> = ({
   onClick,
 }) => {
   const { name: snapName } = useSelector((state) =>
-    // @ts-expect-error ts is picking up the wrong type for the selector
     getSnapMetadata(state, snapId),
   );
 
diff --git a/ui/components/app/snaps/snap-icon/snap-icon.tsx b/ui/components/app/snaps/snap-icon/snap-icon.tsx
index fa27616e4d97..5d81f97834b9 100644
--- a/ui/components/app/snaps/snap-icon/snap-icon.tsx
+++ b/ui/components/app/snaps/snap-icon/snap-icon.tsx
@@ -40,7 +40,6 @@ export const SnapIcon: FunctionComponent<SnapIconProps> = ({
   );
 
   const { name: snapName } = useSelector((state) =>
-    /* @ts-expect-error wrong type on selector. */
     getSnapMetadata(state, snapId),
   );
 
diff --git a/ui/ducks/bridge/selectors.test.ts b/ui/ducks/bridge/selectors.test.ts
index d90251e360f3..cd79a8e6454b 100644
--- a/ui/ducks/bridge/selectors.test.ts
+++ b/ui/ducks/bridge/selectors.test.ts
@@ -13,7 +13,11 @@ import {
 import { mockNetworkState } from '../../../test/stub/networks';
 import mockErc20Erc20Quotes from '../../../test/data/bridge/mock-quotes-erc20-erc20.json';
 import mockBridgeQuotesNativeErc20 from '../../../test/data/bridge/mock-quotes-native-erc20.json';
-import { SortOrder } from '../../pages/bridge/types';
+import {
+  QuoteMetadata,
+  QuoteResponse,
+  SortOrder,
+} from '../../pages/bridge/types';
 import {
   getAllBridgeableNetworks,
   getBridgeQuotes,
@@ -722,9 +726,11 @@ describe('Bridge selectors', () => {
         { valueInCurrency: new BigNumber('0.156562871410260918428') },
         { valueInCurrency: new BigNumber('0.33900008283534602') },
       ];
-      result.sortedQuotes.forEach((quote, idx) => {
-        expect(quote.cost).toStrictEqual(EXPECTED_SORTED_COSTS[idx]);
-      });
+      result.sortedQuotes.forEach(
+        (quote: QuoteMetadata & QuoteResponse, idx: number) => {
+          expect(quote.cost).toStrictEqual(EXPECTED_SORTED_COSTS[idx]);
+        },
+      );
       expect(result).toStrictEqual({
         sortedQuotes: expect.any(Array),
         recommendedQuote: {
@@ -827,9 +833,11 @@ describe('Bridge selectors', () => {
         { valueInCurrency: new BigNumber('0.15656287141025952') },
         { valueInCurrency: new BigNumber('0.33900008283534464') },
       ];
-      result.sortedQuotes.forEach((quote, idx) => {
-        expect(quote.cost).toStrictEqual(EXPECTED_SORTED_COSTS[idx]);
-      });
+      result.sortedQuotes.forEach(
+        (quote: QuoteMetadata & QuoteResponse, idx: number) => {
+          expect(quote.cost).toStrictEqual(EXPECTED_SORTED_COSTS[idx]);
+        },
+      );
 
       expect(result).toStrictEqual({
         sortedQuotes: expect.any(Array),
@@ -898,14 +906,18 @@ describe('Bridge selectors', () => {
         '381c23bc-e3e4-48fe-bc53-257471e388ad',
       );
       expect(sortedQuotes).toHaveLength(2);
-      sortedQuotes.forEach((quote, idx) => {
-        expect(
-          quoteMetadataKeys.every((k) => Object.keys(quote ?? {}).includes(k)),
-        ).toBe(true);
-        expect(quote?.quote.requestId).toStrictEqual(
-          mockBridgeQuotesNativeErc20[idx]?.quote.requestId,
-        );
-      });
+      sortedQuotes.forEach(
+        (quote: QuoteMetadata & QuoteResponse, idx: number) => {
+          expect(
+            quoteMetadataKeys.every((k) =>
+              Object.keys(quote ?? {}).includes(k),
+            ),
+          ).toBe(true);
+          expect(quote?.quote.requestId).toStrictEqual(
+            mockBridgeQuotesNativeErc20[idx]?.quote.requestId,
+          );
+        },
+      );
     });
 
     it('should sort quotes by ETA', () => {
diff --git a/ui/pages/bridge/quotes/bridge-quotes-modal.tsx b/ui/pages/bridge/quotes/bridge-quotes-modal.tsx
index d251b8ab72f5..d50a2ad3bbd9 100644
--- a/ui/pages/bridge/quotes/bridge-quotes-modal.tsx
+++ b/ui/pages/bridge/quotes/bridge-quotes-modal.tsx
@@ -26,7 +26,7 @@ import {
 import { useI18nContext } from '../../../hooks/useI18nContext';
 import { getCurrentCurrency } from '../../../selectors';
 import { setSelectedQuote, setSortOrder } from '../../../ducks/bridge/actions';
-import { SortOrder } from '../types';
+import { QuoteMetadata, QuoteResponse, SortOrder } from '../types';
 import {
   getBridgeQuotes,
   getBridgeSortOrder,
@@ -135,127 +135,129 @@ export const BridgeQuotesModal = ({
         </Row>
         {/* QUOTE LIST */}
         <Column style={{ overflow: 'scroll' }}>
-          {sortedQuotes.map((quote, index) => {
-            const {
-              totalNetworkFee,
-              estimatedProcessingTimeInSeconds,
-              toTokenAmount,
-              cost,
-              quote: { destAsset, bridges, requestId },
-            } = quote;
-            const isQuoteActive = requestId === activeQuote?.quote.requestId;
-            const isRecommendedQuote =
-              requestId === recommendedQuote?.quote.requestId;
+          {sortedQuotes.map(
+            (quote: QuoteMetadata & QuoteResponse, index: number) => {
+              const {
+                totalNetworkFee,
+                estimatedProcessingTimeInSeconds,
+                toTokenAmount,
+                cost,
+                quote: { destAsset, bridges, requestId },
+              } = quote;
+              const isQuoteActive = requestId === activeQuote?.quote.requestId;
+              const isRecommendedQuote =
+                requestId === recommendedQuote?.quote.requestId;
 
-            return (
-              <Row
-                alignItems={AlignItems.flexStart}
-                key={index}
-                backgroundColor={
-                  isQuoteActive ? BackgroundColor.primaryMuted : undefined
-                }
-                onClick={() => {
-                  dispatch(setSelectedQuote(quote));
-                  // Emit QuoteSelected event after dispatching setSelectedQuote
-                  quoteRequestProperties &&
-                    requestMetadataProperties &&
-                    quoteListProperties &&
-                    tradeProperties &&
-                    trackCrossChainSwapsEvent({
-                      event: MetaMetricsEventName.QuoteSelected,
-                      properties: {
-                        ...quoteRequestProperties,
-                        ...requestMetadataProperties,
-                        ...quoteListProperties,
-                        ...tradeProperties,
-                        is_best_quote: isRecommendedQuote,
-                      },
-                    });
-                  onClose();
-                }}
-                paddingInline={4}
-                paddingTop={3}
-                paddingBottom={3}
-                style={{ position: 'relative', height: 78 }}
-              >
-                {isQuoteActive && (
-                  <Column
-                    style={{
-                      position: 'absolute',
-                      left: 4,
-                      top: 4,
-                      height: 70,
-                      width: 4,
-                      borderRadius: 8,
-                    }}
-                    backgroundColor={BackgroundColor.primaryDefault}
-                  />
-                )}
-                <Column>
-                  <Text variant={TextVariant.bodyMd}>
-                    {cost.valueInCurrency &&
-                      formatCurrencyAmount(cost.valueInCurrency, currency, 0)}
-                  </Text>
-                  {[
-                    totalNetworkFee?.valueInCurrency
-                      ? t('quotedNetworkFee', [
+              return (
+                <Row
+                  alignItems={AlignItems.flexStart}
+                  key={index}
+                  backgroundColor={
+                    isQuoteActive ? BackgroundColor.primaryMuted : undefined
+                  }
+                  onClick={() => {
+                    dispatch(setSelectedQuote(quote));
+                    // Emit QuoteSelected event after dispatching setSelectedQuote
+                    quoteRequestProperties &&
+                      requestMetadataProperties &&
+                      quoteListProperties &&
+                      tradeProperties &&
+                      trackCrossChainSwapsEvent({
+                        event: MetaMetricsEventName.QuoteSelected,
+                        properties: {
+                          ...quoteRequestProperties,
+                          ...requestMetadataProperties,
+                          ...quoteListProperties,
+                          ...tradeProperties,
+                          is_best_quote: isRecommendedQuote,
+                        },
+                      });
+                    onClose();
+                  }}
+                  paddingInline={4}
+                  paddingTop={3}
+                  paddingBottom={3}
+                  style={{ position: 'relative', height: 78 }}
+                >
+                  {isQuoteActive && (
+                    <Column
+                      style={{
+                        position: 'absolute',
+                        left: 4,
+                        top: 4,
+                        height: 70,
+                        width: 4,
+                        borderRadius: 8,
+                      }}
+                      backgroundColor={BackgroundColor.primaryDefault}
+                    />
+                  )}
+                  <Column>
+                    <Text variant={TextVariant.bodyMd}>
+                      {cost.valueInCurrency &&
+                        formatCurrencyAmount(cost.valueInCurrency, currency, 0)}
+                    </Text>
+                    {[
+                      totalNetworkFee?.valueInCurrency
+                        ? t('quotedNetworkFee', [
+                            formatCurrencyAmount(
+                              totalNetworkFee.valueInCurrency,
+                              currency,
+                              0,
+                            ),
+                          ])
+                        : t('quotedNetworkFee', [
+                            formatTokenAmount(
+                              totalNetworkFee.amount,
+                              nativeCurrency,
+                            ),
+                          ]),
+                      t(
+                        sortOrder === SortOrder.ETA_ASC
+                          ? 'quotedReceivingAmount'
+                          : 'quotedReceiveAmount',
+                        [
                           formatCurrencyAmount(
-                            totalNetworkFee.valueInCurrency,
+                            toTokenAmount.valueInCurrency,
                             currency,
                             0,
-                          ),
-                        ])
-                      : t('quotedNetworkFee', [
-                          formatTokenAmount(
-                            totalNetworkFee.amount,
-                            nativeCurrency,
-                          ),
-                        ]),
-                    t(
-                      sortOrder === SortOrder.ETA_ASC
-                        ? 'quotedReceivingAmount'
-                        : 'quotedReceiveAmount',
-                      [
-                        formatCurrencyAmount(
-                          toTokenAmount.valueInCurrency,
-                          currency,
-                          0,
-                        ) ??
-                          formatTokenAmount(
-                            toTokenAmount.amount,
-                            destAsset.symbol,
-                            0,
-                          ),
-                      ],
-                    ),
-                  ]
-                    [sortOrder === SortOrder.ETA_ASC ? 'reverse' : 'slice']()
-                    .map((content) => (
-                      <Text
-                        key={content}
-                        variant={TextVariant.bodyXsMedium}
-                        color={TextColor.textAlternative}
-                      >
-                        {content}
-                      </Text>
-                    ))}
-                </Column>
-                <Column alignItems={AlignItems.flexEnd}>
-                  <Text variant={TextVariant.bodyMd}>
-                    {t('bridgeTimingMinutes', [
-                      formatEtaInMinutes(estimatedProcessingTimeInSeconds),
-                    ])}
-                  </Text>
-                  <Text
-                    variant={TextVariant.bodyXsMedium}
-                    color={TextColor.textAlternative}
-                  >
-                    {startCase(bridges[0])}
-                  </Text>
-                </Column>
-              </Row>
-            );
-          })}
+                          ) ??
+                            formatTokenAmount(
+                              toTokenAmount.amount,
+                              destAsset.symbol,
+                              0,
+                            ),
+                        ],
+                      ),
+                    ]
+                      [sortOrder === SortOrder.ETA_ASC ? 'reverse' : 'slice']()
+                      .map((content) => (
+                        <Text
+                          key={content}
+                          variant={TextVariant.bodyXsMedium}
+                          color={TextColor.textAlternative}
+                        >
+                          {content}
+                        </Text>
+                      ))}
+                  </Column>
+                  <Column alignItems={AlignItems.flexEnd}>
+                    <Text variant={TextVariant.bodyMd}>
+                      {t('bridgeTimingMinutes', [
+                        formatEtaInMinutes(estimatedProcessingTimeInSeconds),
+                      ])}
+                    </Text>
+                    <Text
+                      variant={TextVariant.bodyXsMedium}
+                      color={TextColor.textAlternative}
+                    >
+                      {startCase(bridges[0])}
+                    </Text>
+                  </Column>
+                </Row>
+              );
+            },
+          )}
         </Column>
       </ModalContent>
     </Modal>
diff --git a/ui/pages/confirmations/components/confirm/snaps/snaps-section/snap-insight.tsx b/ui/pages/confirmations/components/confirm/snaps/snaps-section/snap-insight.tsx
index 7102970b4f84..cd46f6ea7113 100644
--- a/ui/pages/confirmations/components/confirm/snaps/snaps-section/snap-insight.tsx
+++ b/ui/pages/confirmations/components/confirm/snaps/snaps-section/snap-insight.tsx
@@ -27,7 +27,6 @@ export const SnapInsight: React.FunctionComponent<SnapInsightProps> = ({
 }) => {
   const t = useI18nContext();
   const { name: snapName } = useSelector((state) =>
-    /* @ts-expect-error wrong type on selector. */
     getSnapMetadata(state, snapId),
   );
 
diff --git a/yarn.lock b/yarn.lock
index a4163ea118e5..2fbe7d7dd430 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -26818,7 +26818,7 @@ __metadata:
     redux-thunk: "npm:^2.3.0"
     remote-redux-devtools: "npm:^0.5.16"
     remove-trailing-slash: "npm:^0.1.1"
-    reselect: "npm:^3.0.1"
+    reselect: "npm:^5.1.1"
     resolve-url-loader: "npm:^3.1.5"
     sass-embedded: "npm:^1.71.0"
     sass-loader: "npm:^14.1.1"
@@ -32229,13 +32229,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"reselect@npm:^3.0.1":
-  version: 3.0.1
-  resolution: "reselect@npm:3.0.1"
-  checksum: 10/ebafc7b2d0e907aa1e2e16d37bb1c7c37e9291b3656a7e7bfb9c9523faeaa65ef3db9dec669da250c2b81f59f3231cf3143b0c8e76e7fc8f5a6d79f6ea50e21e
-  languageName: node
-  linkType: hard
-
 "reselect@npm:^4.1.8":
   version: 4.1.8
   resolution: "reselect@npm:4.1.8"

From f46bdefb3ef59f42ed7986a75220f72620a08f95 Mon Sep 17 00:00:00 2001
From: Bryan Fullam <bryan.fullam@consensys.net>
Date: Fri, 13 Dec 2024 22:50:20 +0700
Subject: [PATCH 130/175] feat: show info message when a HW user declines a tx
 (#29198)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<!--
Please submit this PR as a draft initially.
Do not mark it as "Ready for review" until the template has been
completely filled out, and PR status checks have passed at least once.
-->

## **Description**

When a hardware wallet user declines a transaction during the bridge
process, they are redirected back to the bridge setup page. This PR adds
an info message to clarify why they were redirected and prompt them to
get a new quote.

<!--
Write a short description of the changes included in this pull request,
also include relevant motivation and context. Have in mind the following
questions:
1. What is the reason for the change?
2. What is the improvement/solution?
-->

[![Open in GitHub
Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/29198?quickstart=1)

## **Related issues**

Fixes:

## **Manual testing steps**

1. Go to bridge with a hardware wallet
2. Attempt bridge
3. Decline transaction on hardware wallet
4. See info message when you're redirected

## **Screenshots/Recordings**

<!-- If applicable, add screenshots and/or recordings to visualize the
before and after of your change. -->

### **Before**

<!-- [screenshots/recordings] -->

### **After**
![Screenshot 2024-12-13 at 14 53
00](https://github.com/user-attachments/assets/abbeca68-39d9-4926-b50f-5321949f58ec)

<!-- [screenshots/recordings] -->

## **Pre-merge author checklist**

- [x] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension Coding
Standards](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/CODING_GUIDELINES.md).
- [x] I've completed the PR template to the best of my ability
- [x] I’ve included tests if applicable
- [x] I’ve documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [x] I’ve applied the right labels on the PR (see [labeling
guidelines](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.

## **Pre-merge reviewer checklist**

- [ ] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed).
- [ ] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.
---
 ui/ducks/bridge/actions.ts                    |  2 +
 ui/ducks/bridge/bridge.test.ts                | 14 +++++++
 ui/ducks/bridge/bridge.ts                     |  5 +++
 ui/ducks/bridge/selectors.ts                  |  4 ++
 .../hooks/useSubmitBridgeTransaction.ts       |  3 ++
 ui/pages/bridge/index.tsx                     |  9 ++++-
 .../prepare/bridge-tx-declined-message.tsx    | 37 +++++++++++++++++++
 .../bridge/prepare/prepare-bridge-page.tsx    |  5 ++-
 8 files changed, 77 insertions(+), 2 deletions(-)
 create mode 100644 ui/pages/bridge/prepare/bridge-tx-declined-message.tsx

diff --git a/ui/ducks/bridge/actions.ts b/ui/ducks/bridge/actions.ts
index 766689cb8cda..7f94fdeb6c20 100644
--- a/ui/ducks/bridge/actions.ts
+++ b/ui/ducks/bridge/actions.ts
@@ -25,6 +25,7 @@ const {
   resetInputFields,
   setSortOrder,
   setSelectedQuote,
+  setWasTxDeclined,
 } = bridgeSlice.actions;
 
 export {
@@ -37,6 +38,7 @@ export {
   setSrcTokenExchangeRates,
   setSortOrder,
   setSelectedQuote,
+  setWasTxDeclined,
 };
 
 const callBridgeControllerMethod = <T>(
diff --git a/ui/ducks/bridge/bridge.test.ts b/ui/ducks/bridge/bridge.test.ts
index 7b00c95d09a4..5a8558039fce 100644
--- a/ui/ducks/bridge/bridge.test.ts
+++ b/ui/ducks/bridge/bridge.test.ts
@@ -24,6 +24,7 @@ import {
   updateQuoteRequestParams,
   resetBridgeState,
   setDestTokenExchangeRates,
+  setWasTxDeclined,
 } from './actions';
 
 const middleware = [thunk];
@@ -153,6 +154,7 @@ describe('Ducks - Bridge', () => {
         sortOrder: 'cost_ascending',
         toTokenExchangeRate: null,
         fromTokenExchangeRate: null,
+        wasTxDeclined: false,
       });
     });
   });
@@ -217,6 +219,7 @@ describe('Ducks - Bridge', () => {
         toChainId: null,
         toToken: null,
         toTokenExchangeRate: null,
+        wasTxDeclined: false,
       });
     });
   });
@@ -309,4 +312,15 @@ describe('Ducks - Bridge', () => {
       });
     });
   });
+
+  describe('setWasTxDeclined', () => {
+    it('sets the wasTxDeclined flag to true', () => {
+      const state = store.getState().bridge;
+      store.dispatch(setWasTxDeclined(true));
+      const actions = store.getActions();
+      expect(actions[0].type).toStrictEqual('bridge/setWasTxDeclined');
+      const newState = bridgeReducer(state, actions[0]);
+      expect(newState.wasTxDeclined).toStrictEqual(true);
+    });
+  });
 });
diff --git a/ui/ducks/bridge/bridge.ts b/ui/ducks/bridge/bridge.ts
index 7abdb8c751e8..7450fe9f3e9c 100644
--- a/ui/ducks/bridge/bridge.ts
+++ b/ui/ducks/bridge/bridge.ts
@@ -19,6 +19,7 @@ export type BridgeState = {
   toTokenExchangeRate: number | null; // Exchange rate from the selected token to the default currency (can be fiat or crypto)
   sortOrder: SortOrder;
   selectedQuote: (QuoteResponse & QuoteMetadata) | null; // Alternate quote selected by user. When quotes refresh, the best match will be activated.
+  wasTxDeclined: boolean; // Whether the user declined the transaction. Relevant for hardware wallets.
 };
 
 const initialState: BridgeState = {
@@ -30,6 +31,7 @@ const initialState: BridgeState = {
   toTokenExchangeRate: null,
   sortOrder: SortOrder.COST_ASC,
   selectedQuote: null,
+  wasTxDeclined: false,
 };
 
 export const setSrcTokenExchangeRates = createAsyncThunk(
@@ -68,6 +70,9 @@ const bridgeSlice = createSlice({
     setSelectedQuote: (state, action) => {
       state.selectedQuote = action.payload;
     },
+    setWasTxDeclined: (state, action) => {
+      state.wasTxDeclined = action.payload;
+    },
   },
   extraReducers: (builder) => {
     builder.addCase(setDestTokenExchangeRates.pending, (state) => {
diff --git a/ui/ducks/bridge/selectors.ts b/ui/ducks/bridge/selectors.ts
index 7b0852965f8c..2bf90f502b3b 100644
--- a/ui/ducks/bridge/selectors.ts
+++ b/ui/ducks/bridge/selectors.ts
@@ -554,3 +554,7 @@ export const getValidationErrors = createDeepEqualSelector(
     };
   },
 );
+
+export const getWasTxDeclined = (state: BridgeAppState): boolean => {
+  return state.bridge.wasTxDeclined;
+};
diff --git a/ui/pages/bridge/hooks/useSubmitBridgeTransaction.ts b/ui/pages/bridge/hooks/useSubmitBridgeTransaction.ts
index d9fe8de64385..6f8ec559a6a5 100644
--- a/ui/pages/bridge/hooks/useSubmitBridgeTransaction.ts
+++ b/ui/pages/bridge/hooks/useSubmitBridgeTransaction.ts
@@ -16,6 +16,7 @@ import { isHardwareWallet } from '../../../selectors';
 import { getQuoteRequest } from '../../../ducks/bridge/selectors';
 import { CHAIN_IDS } from '../../../../shared/constants/network';
 import { getCurrentChainId } from '../../../../shared/modules/selectors/networks';
+import { setWasTxDeclined } from '../../../ducks/bridge/actions';
 import useAddToken from './useAddToken';
 import useHandleApprovalTx from './useHandleApprovalTx';
 import useHandleBridgeTx from './useHandleBridgeTx';
@@ -73,6 +74,7 @@ export default function useSubmitBridgeTransaction() {
     } catch (e) {
       debugLog('Approve transaction failed', e);
       if (hardwareWalletUsed && isHardwareWalletUserRejection(e)) {
+        dispatch(setWasTxDeclined(true));
         history.push(`${CROSS_CHAIN_SWAP_ROUTE}${PREPARE_SWAP_ROUTE}`);
       } else {
         await dispatch(setDefaultHomeActiveTabName('activity'));
@@ -108,6 +110,7 @@ export default function useSubmitBridgeTransaction() {
     } catch (e) {
       debugLog('Bridge transaction failed', e);
       if (hardwareWalletUsed && isHardwareWalletUserRejection(e)) {
+        dispatch(setWasTxDeclined(true));
         history.push(`${CROSS_CHAIN_SWAP_ROUTE}${PREPARE_SWAP_ROUTE}`);
       } else {
         await dispatch(setDefaultHomeActiveTabName('activity'));
diff --git a/ui/pages/bridge/index.tsx b/ui/pages/bridge/index.tsx
index 6a1680f9d63c..89ab42df9641 100644
--- a/ui/pages/bridge/index.tsx
+++ b/ui/pages/bridge/index.tsx
@@ -34,10 +34,12 @@ import { resetBridgeState, setFromChain } from '../../ducks/bridge/actions';
 import { useGasFeeEstimates } from '../../hooks/useGasFeeEstimates';
 import { useBridgeExchangeRates } from '../../hooks/bridge/useBridgeExchangeRates';
 import { useQuoteFetchEvents } from '../../hooks/bridge/useQuoteFetchEvents';
+import { getWasTxDeclined } from '../../ducks/bridge/selectors';
 import PrepareBridgePage from './prepare/prepare-bridge-page';
 import { BridgeCTAButton } from './prepare/bridge-cta-button';
 import AwaitingSignaturesCancelButton from './awaiting-signatures/awaiting-signatures-cancel-button';
 import AwaitingSignatures from './awaiting-signatures/awaiting-signatures';
+import { BridgeTxDeclinedMessage } from './prepare/bridge-tx-declined-message';
 
 const CrossChainSwap = () => {
   const t = useContext(I18nContext);
@@ -53,6 +55,7 @@ const CrossChainSwap = () => {
   const providerConfig = useSelector(getProviderConfig);
   const isBridgeChain = useSelector(getIsBridgeChain);
   const currency = useSelector(getCurrentCurrency);
+  const wasTxDeclined = useSelector(getWasTxDeclined);
 
   useEffect(() => {
     if (isBridgeChain && isBridgeEnabled && providerConfig) {
@@ -127,7 +130,11 @@ const CrossChainSwap = () => {
                 <PrepareBridgePage />
               </Content>
               <Footer>
-                <BridgeCTAButton />
+                {wasTxDeclined ? (
+                  <BridgeTxDeclinedMessage />
+                ) : (
+                  <BridgeCTAButton />
+                )}
               </Footer>
             </>
           </FeatureToggledRoute>
diff --git a/ui/pages/bridge/prepare/bridge-tx-declined-message.tsx b/ui/pages/bridge/prepare/bridge-tx-declined-message.tsx
new file mode 100644
index 000000000000..37b3e98eec2e
--- /dev/null
+++ b/ui/pages/bridge/prepare/bridge-tx-declined-message.tsx
@@ -0,0 +1,37 @@
+import React from 'react';
+import { useDispatch } from 'react-redux';
+import {
+  AlignItems,
+  Display,
+  TextColor,
+} from '../../../helpers/constants/design-system';
+import {
+  ButtonLinkSize,
+  Text,
+  ButtonLink,
+} from '../../../components/component-library';
+import { setWasTxDeclined } from '../../../ducks/bridge/actions';
+
+export const BridgeTxDeclinedMessage = () => {
+  const dispatch = useDispatch();
+
+  return (
+    <Text
+      color={TextColor.textMuted}
+      display={Display.Flex}
+      alignItems={AlignItems.center}
+      style={{ whiteSpace: 'nowrap' }}
+    >
+      You declined the transaction.
+      <ButtonLink
+        size={ButtonLinkSize.Sm}
+        paddingLeft={1}
+        onClick={() => {
+          dispatch(setWasTxDeclined(false));
+        }}
+      >
+        Get a new quote.
+      </ButtonLink>
+    </Text>
+  );
+};
diff --git a/ui/pages/bridge/prepare/prepare-bridge-page.tsx b/ui/pages/bridge/prepare/prepare-bridge-page.tsx
index 1533fc1a9c20..cb9f920b55ea 100644
--- a/ui/pages/bridge/prepare/prepare-bridge-page.tsx
+++ b/ui/pages/bridge/prepare/prepare-bridge-page.tsx
@@ -27,6 +27,7 @@ import {
   getToToken,
   getToTokens,
   getToTopAssets,
+  getWasTxDeclined,
 } from '../../../ducks/bridge/selectors';
 import {
   Box,
@@ -78,6 +79,8 @@ const PrepareBridgePage = () => {
   const quoteRequest = useSelector(getQuoteRequest);
   const { activeQuote } = useSelector(getBridgeQuotes);
 
+  const wasTxDeclined = useSelector(getWasTxDeclined);
+
   const fromTokenListGenerator = useTokensWithFiltering(
     fromTokens,
     fromTopAssets,
@@ -323,7 +326,7 @@ const PrepareBridgePage = () => {
           }}
         />
       </Box>
-      <BridgeQuoteCard />
+      {!wasTxDeclined && <BridgeQuoteCard />}
     </div>
   );
 };

From b7c2198c460b045b90c24dbf1d74bee09aa3e8cc Mon Sep 17 00:00:00 2001
From: infiniteflower <139582705+infiniteflower@users.noreply.github.com>
Date: Fri, 13 Dec 2024 11:16:04 -0500
Subject: [PATCH 131/175] fix: crashing after submitting tx (#29203)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<!--
Please submit this PR as a draft initially.
Do not mark it as "Ready for review" until the template has been
completely filled out, and PR status checks have passed at least once.
-->

## **Description**

<!--
Write a short description of the changes included in this pull request,
also include relevant motivation and context. Have in mind the following
questions:
1. What is the reason for the change?
2. What is the improvement/solution?
-->

[![Open in GitHub
Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/29203?quickstart=1)

This PR fixes an issue where the app would crash after submitting a
bridge transaction.

## **Related issues**

Fixes:

## **Manual testing steps**

1. Do a bridge tx
2. Should be routed to activity list and not crash

## **Screenshots/Recordings**

<!-- If applicable, add screenshots and/or recordings to visualize the
before and after of your change. -->

### **Before**

<!-- [screenshots/recordings] -->

### **After**

<!-- [screenshots/recordings] -->

## **Pre-merge author checklist**

- [x] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension Coding
Standards](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/CODING_GUIDELINES.md).
- [x] I've completed the PR template to the best of my ability
- [ ] I’ve included tests if applicable
- [ ] I’ve documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [x] I’ve applied the right labels on the PR (see [labeling
guidelines](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.

## **Pre-merge reviewer checklist**

- [ ] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed).
- [ ] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.
---
 ui/hooks/useTransactionDisplayData.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ui/hooks/useTransactionDisplayData.js b/ui/hooks/useTransactionDisplayData.js
index d5294b8d41d4..07c4d0ade382 100644
--- a/ui/hooks/useTransactionDisplayData.js
+++ b/ui/hooks/useTransactionDisplayData.js
@@ -393,7 +393,7 @@ export function useTransactionDisplayData(transactionGroup) {
     primarySuffix = bridgeTokenDisplayData.sourceTokenSymbol;
     primaryDisplayValue = formatAmount(
       locale,
-      new BigNumber(bridgeTokenDisplayData.sourceTokenAmountSent),
+      new BigNumber(bridgeTokenDisplayData.sourceTokenAmountSent ?? 0),
     );
     secondaryDisplayValue = bridgeTokenDisplayData.displayCurrencyAmount;
   } else {

From bb1c77e80d547ded8307a47038af95883b693d5a Mon Sep 17 00:00:00 2001
From: infiniteflower <139582705+infiniteflower@users.noreply.github.com>
Date: Fri, 13 Dec 2024 11:16:10 -0500
Subject: [PATCH 132/175] chore: replace portfolio links to bridge with native
 bridge exp (#29175)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<!--
Please submit this PR as a draft initially.
Do not mark it as "Ready for review" until the template has been
completely filled out, and PR status checks have passed at least once.
-->

## **Description**

<!--
Write a short description of the changes included in this pull request,
also include relevant motivation and context. Have in mind the following
questions:
1. What is the reason for the change?
2. What is the improvement/solution?
-->

[![Open in GitHub
Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/29175?quickstart=1)

This PR replaces a link in Swaps to the Portfolio Bridge with a link to
the native Bridge experience.

## **Related issues**

Fixes:

## **Manual testing steps**

1. Go to Swaps
2. Click on the Bridge link
3. Get directed to native Bridge exp

## **Screenshots/Recordings**

<!-- If applicable, add screenshots and/or recordings to visualize the
before and after of your change. -->

### **Before**

<!-- [screenshots/recordings] -->

### **After**

<!-- [screenshots/recordings] -->


https://github.com/user-attachments/assets/6f27cefd-d43b-4872-a523-5b2d868ea09c



## **Pre-merge author checklist**

- [x] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension Coding
Standards](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/CODING_GUIDELINES.md).
- [x] I've completed the PR template to the best of my ability
- [ ] I’ve included tests if applicable
- [ ] I’ve documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [x] I’ve applied the right labels on the PR (see [labeling
guidelines](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.

## **Pre-merge reviewer checklist**

- [ ] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed).
- [ ] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.
---
 app/_locales/en/messages.json                 |  3 ++
 .../prepare-swap-page/prepare-swap-page.js    | 40 +++++--------------
 2 files changed, 12 insertions(+), 31 deletions(-)

diff --git a/app/_locales/en/messages.json b/app/_locales/en/messages.json
index 1a2e847181f9..918b249d326a 100644
--- a/app/_locales/en/messages.json
+++ b/app/_locales/en/messages.json
@@ -1435,6 +1435,9 @@
   "crossChainSwapsLink": {
     "message": "Swap across networks with MetaMask Portfolio"
   },
+  "crossChainSwapsLinkNative": {
+    "message": "Swap across networks with Bridge"
+  },
   "cryptoCompare": {
     "message": "CryptoCompare"
   },
diff --git a/ui/pages/swaps/prepare-swap-page/prepare-swap-page.js b/ui/pages/swaps/prepare-swap-page/prepare-swap-page.js
index 63af7ff75ad1..a100b490b4d6 100644
--- a/ui/pages/swaps/prepare-swap-page/prepare-swap-page.js
+++ b/ui/pages/swaps/prepare-swap-page/prepare-swap-page.js
@@ -64,9 +64,7 @@ import {
   isHardwareWallet,
   getHardwareWalletType,
   getIsBridgeChain,
-  getMetaMetricsId,
-  getParticipateInMetaMetrics,
-  getDataCollectionForMarketing,
+  getIsBridgeEnabled,
 } from '../../../selectors';
 import {
   getSmartTransactionsEnabled,
@@ -78,7 +76,6 @@ import {
   hexToDecimal,
 } from '../../../../shared/modules/conversion.utils';
 import { getURLHostName } from '../../../helpers/utils/util';
-import { getPortfolioUrl } from '../../../helpers/utils/portfolio';
 import { usePrevious } from '../../../hooks/usePrevious';
 import { useTokenTracker } from '../../../hooks/useTokenTracker';
 import { useTokenFiatAmount } from '../../../hooks/useTokenFiatAmount';
@@ -143,6 +140,7 @@ import SwapsFooter from '../swaps-footer';
 import SelectedToken from '../selected-token/selected-token';
 import ListWithSearch from '../list-with-search/list-with-search';
 import { CHAIN_IDS } from '../../../../shared/constants/network';
+import useBridging from '../../../hooks/bridge/useBridging';
 import QuotesLoadingAnimation from './quotes-loading-animation';
 import ReviewQuote from './review-quote';
 
@@ -157,6 +155,7 @@ export default function PrepareSwapPage({
   const dispatch = useDispatch();
   const history = useHistory();
   const trackEvent = useContext(MetaMetricsContext);
+  const { openBridgeExperience } = useBridging();
 
   const [fetchedTokenExchangeRate, setFetchedTokenExchangeRate] =
     useState(undefined);
@@ -176,6 +175,7 @@ export default function PrepareSwapPage({
   const [prefetchingQuotes, setPrefetchingQuotes] = useState(false);
   const [rotateSwitchTokens, setRotateSwitchTokens] = useState(false);
 
+  const isBridgeSupported = useSelector(getIsBridgeEnabled);
   const isFeatureFlagLoaded = useSelector(getIsFeatureFlagLoaded);
   const balanceError = useSelector(getBalanceError);
   const fetchParams = useSelector(getFetchParams, isEqual);
@@ -207,7 +207,6 @@ export default function PrepareSwapPage({
     ? Object.keys(aggregatorMetadata).length
     : 0;
   const isBridgeChain = useSelector(getIsBridgeChain);
-  const metaMetricsId = useSelector(getMetaMetricsId);
 
   const tokenConversionRates = useSelector(getTokenExchangeRates, isEqual);
   const conversionRate = useSelector(getConversionRate);
@@ -226,8 +225,6 @@ export default function PrepareSwapPage({
   const currentCurrency = useSelector(getCurrentCurrency);
   const fetchingQuotes = useSelector(getFetchingQuotes);
   const loadingComplete = !fetchingQuotes && areQuotesPresent;
-  const isMetaMetricsEnabled = useSelector(getParticipateInMetaMetrics);
-  const isMarketingEnabled = useSelector(getDataCollectionForMarketing);
 
   const fetchParamsFromToken = isSwapsDefaultTokenAddress(
     sourceTokenInfo?.address,
@@ -1060,7 +1057,7 @@ export default function PrepareSwapPage({
         </div>
         {showCrossChainSwapsLink && (
           <ButtonLink
-            endIconName={IconName.Export}
+            endIconName={isBridgeSupported ? undefined : IconName.Export}
             endIconProps={{
               size: IconSize.Xs,
             }}
@@ -1068,33 +1065,14 @@ export default function PrepareSwapPage({
             marginTop={2}
             fontWeight={FontWeight.Normal}
             onClick={() => {
-              const portfolioUrl = getPortfolioUrl(
-                'bridge',
-                'ext_bridge_prepare_swap_link',
-                metaMetricsId,
-                isMetaMetricsEnabled,
-                isMarketingEnabled,
-              );
-
-              global.platform.openTab({
-                url: `${portfolioUrl}&token=${fromTokenAddress}`,
-              });
-
-              trackEvent({
-                category: MetaMetricsEventCategory.Swaps,
-                event: MetaMetricsEventName.BridgeLinkClicked,
-                properties: {
-                  location: 'Swaps',
-                  text: 'Swap across networks with MetaMask Portfolio',
-                  chain_id: chainId,
-                  token_symbol: fromTokenSymbol,
-                },
-              });
+              openBridgeExperience('Swaps', fromToken);
             }}
             target="_blank"
             data-testid="prepare-swap-page-cross-chain-swaps-link"
           >
-            {t('crossChainSwapsLink')}
+            {isBridgeSupported
+              ? t('crossChainSwapsLinkNative')
+              : t('crossChainSwapsLink')}
           </ButtonLink>
         )}
         {!showReviewQuote && toTokenIsNotDefault && occurrences < 2 && (

From 98be9681decfbf74c86715f4a50f214d3f3c7de3 Mon Sep 17 00:00:00 2001
From: Mathieu Artu <mathieu.artu@consensys.net>
Date: Mon, 16 Dec 2024 11:13:04 +0100
Subject: [PATCH 133/175] chore: bump profile-sync-controller to version v3.1.1
 (#29100)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## **Description**

This PR bumps `@profile-sync-controller` to version `v3.1.1`.

[![Open in GitHub
Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/29100?quickstart=1)

## **Related issues**

Fixes:

## **Manual testing steps**

1. No manual testing steps

## **Screenshots/Recordings**

<!-- If applicable, add screenshots and/or recordings to visualize the
before and after of your change. -->

### **Before**

<!-- [screenshots/recordings] -->

### **After**

<!-- [screenshots/recordings] -->

## **Pre-merge author checklist**

- [x] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension Coding
Standards](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/CODING_GUIDELINES.md).
- [x] I've completed the PR template to the best of my ability
- [x] I’ve included tests if applicable
- [x] I’ve documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [x] I’ve applied the right labels on the PR (see [labeling
guidelines](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.

## **Pre-merge reviewer checklist**

- [x] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed).
- [x] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.

---------

Co-authored-by: MetaMask Bot <metamaskbot@users.noreply.github.com>
---
 lavamoat/browserify/beta/policy.json  | 49 +++++++++++++++++-
 lavamoat/browserify/flask/policy.json | 49 +++++++++++++++++-
 lavamoat/browserify/main/policy.json  | 49 +++++++++++++++++-
 lavamoat/browserify/mmi/policy.json   | 49 +++++++++++++++++-
 package.json                          |  2 +-
 yarn.lock                             | 72 +++++++++++++++++++--------
 6 files changed, 245 insertions(+), 25 deletions(-)

diff --git a/lavamoat/browserify/beta/policy.json b/lavamoat/browserify/beta/policy.json
index 52e53af28a1e..bed94b6bf3c6 100644
--- a/lavamoat/browserify/beta/policy.json
+++ b/lavamoat/browserify/beta/policy.json
@@ -1556,6 +1556,30 @@
         "semver": true
       }
     },
+    "@metamask/keyring-controller>@metamask/keyring-api>@metamask/keyring-utils": {
+      "globals": {
+        "URL": true
+      },
+      "packages": {
+        "@metamask/keyring-controller>@metamask/keyring-api>@metamask/keyring-utils>@metamask/utils": true,
+        "@metamask/utils>@metamask/superstruct": true
+      }
+    },
+    "@metamask/keyring-controller>@metamask/keyring-api>@metamask/keyring-utils>@metamask/utils": {
+      "globals": {
+        "TextDecoder": true,
+        "TextEncoder": true
+      },
+      "packages": {
+        "@metamask/utils>@metamask/superstruct": true,
+        "@metamask/utils>@scure/base": true,
+        "@metamask/utils>pony-cause": true,
+        "@noble/hashes": true,
+        "browserify>buffer": true,
+        "nock>debug": true,
+        "semver": true
+      }
+    },
     "@metamask/keyring-controller>ethereumjs-wallet": {
       "packages": {
         "@metamask/keyring-controller>ethereumjs-wallet>ethereum-cryptography": true,
@@ -2103,9 +2127,9 @@
       },
       "packages": {
         "@metamask/base-controller": true,
-        "@metamask/keyring-api": true,
         "@metamask/keyring-controller": true,
         "@metamask/network-controller": true,
+        "@metamask/profile-sync-controller>@metamask/keyring-api": true,
         "@metamask/profile-sync-controller>@noble/ciphers": true,
         "@metamask/profile-sync-controller>siwe": true,
         "@noble/hashes": true,
@@ -2113,6 +2137,29 @@
         "loglevel": true
       }
     },
+    "@metamask/profile-sync-controller>@metamask/keyring-api": {
+      "packages": {
+        "@metamask/keyring-api>bech32": true,
+        "@metamask/keyring-controller>@metamask/keyring-api>@metamask/keyring-utils": true,
+        "@metamask/profile-sync-controller>@metamask/keyring-api>@metamask/utils": true,
+        "@metamask/utils>@metamask/superstruct": true
+      }
+    },
+    "@metamask/profile-sync-controller>@metamask/keyring-api>@metamask/utils": {
+      "globals": {
+        "TextDecoder": true,
+        "TextEncoder": true
+      },
+      "packages": {
+        "@metamask/utils>@metamask/superstruct": true,
+        "@metamask/utils>@scure/base": true,
+        "@metamask/utils>pony-cause": true,
+        "@noble/hashes": true,
+        "browserify>buffer": true,
+        "nock>debug": true,
+        "semver": true
+      }
+    },
     "@metamask/profile-sync-controller>@noble/ciphers": {
       "globals": {
         "TextDecoder": true,
diff --git a/lavamoat/browserify/flask/policy.json b/lavamoat/browserify/flask/policy.json
index 52e53af28a1e..bed94b6bf3c6 100644
--- a/lavamoat/browserify/flask/policy.json
+++ b/lavamoat/browserify/flask/policy.json
@@ -1556,6 +1556,30 @@
         "semver": true
       }
     },
+    "@metamask/keyring-controller>@metamask/keyring-api>@metamask/keyring-utils": {
+      "globals": {
+        "URL": true
+      },
+      "packages": {
+        "@metamask/keyring-controller>@metamask/keyring-api>@metamask/keyring-utils>@metamask/utils": true,
+        "@metamask/utils>@metamask/superstruct": true
+      }
+    },
+    "@metamask/keyring-controller>@metamask/keyring-api>@metamask/keyring-utils>@metamask/utils": {
+      "globals": {
+        "TextDecoder": true,
+        "TextEncoder": true
+      },
+      "packages": {
+        "@metamask/utils>@metamask/superstruct": true,
+        "@metamask/utils>@scure/base": true,
+        "@metamask/utils>pony-cause": true,
+        "@noble/hashes": true,
+        "browserify>buffer": true,
+        "nock>debug": true,
+        "semver": true
+      }
+    },
     "@metamask/keyring-controller>ethereumjs-wallet": {
       "packages": {
         "@metamask/keyring-controller>ethereumjs-wallet>ethereum-cryptography": true,
@@ -2103,9 +2127,9 @@
       },
       "packages": {
         "@metamask/base-controller": true,
-        "@metamask/keyring-api": true,
         "@metamask/keyring-controller": true,
         "@metamask/network-controller": true,
+        "@metamask/profile-sync-controller>@metamask/keyring-api": true,
         "@metamask/profile-sync-controller>@noble/ciphers": true,
         "@metamask/profile-sync-controller>siwe": true,
         "@noble/hashes": true,
@@ -2113,6 +2137,29 @@
         "loglevel": true
       }
     },
+    "@metamask/profile-sync-controller>@metamask/keyring-api": {
+      "packages": {
+        "@metamask/keyring-api>bech32": true,
+        "@metamask/keyring-controller>@metamask/keyring-api>@metamask/keyring-utils": true,
+        "@metamask/profile-sync-controller>@metamask/keyring-api>@metamask/utils": true,
+        "@metamask/utils>@metamask/superstruct": true
+      }
+    },
+    "@metamask/profile-sync-controller>@metamask/keyring-api>@metamask/utils": {
+      "globals": {
+        "TextDecoder": true,
+        "TextEncoder": true
+      },
+      "packages": {
+        "@metamask/utils>@metamask/superstruct": true,
+        "@metamask/utils>@scure/base": true,
+        "@metamask/utils>pony-cause": true,
+        "@noble/hashes": true,
+        "browserify>buffer": true,
+        "nock>debug": true,
+        "semver": true
+      }
+    },
     "@metamask/profile-sync-controller>@noble/ciphers": {
       "globals": {
         "TextDecoder": true,
diff --git a/lavamoat/browserify/main/policy.json b/lavamoat/browserify/main/policy.json
index 52e53af28a1e..bed94b6bf3c6 100644
--- a/lavamoat/browserify/main/policy.json
+++ b/lavamoat/browserify/main/policy.json
@@ -1556,6 +1556,30 @@
         "semver": true
       }
     },
+    "@metamask/keyring-controller>@metamask/keyring-api>@metamask/keyring-utils": {
+      "globals": {
+        "URL": true
+      },
+      "packages": {
+        "@metamask/keyring-controller>@metamask/keyring-api>@metamask/keyring-utils>@metamask/utils": true,
+        "@metamask/utils>@metamask/superstruct": true
+      }
+    },
+    "@metamask/keyring-controller>@metamask/keyring-api>@metamask/keyring-utils>@metamask/utils": {
+      "globals": {
+        "TextDecoder": true,
+        "TextEncoder": true
+      },
+      "packages": {
+        "@metamask/utils>@metamask/superstruct": true,
+        "@metamask/utils>@scure/base": true,
+        "@metamask/utils>pony-cause": true,
+        "@noble/hashes": true,
+        "browserify>buffer": true,
+        "nock>debug": true,
+        "semver": true
+      }
+    },
     "@metamask/keyring-controller>ethereumjs-wallet": {
       "packages": {
         "@metamask/keyring-controller>ethereumjs-wallet>ethereum-cryptography": true,
@@ -2103,9 +2127,9 @@
       },
       "packages": {
         "@metamask/base-controller": true,
-        "@metamask/keyring-api": true,
         "@metamask/keyring-controller": true,
         "@metamask/network-controller": true,
+        "@metamask/profile-sync-controller>@metamask/keyring-api": true,
         "@metamask/profile-sync-controller>@noble/ciphers": true,
         "@metamask/profile-sync-controller>siwe": true,
         "@noble/hashes": true,
@@ -2113,6 +2137,29 @@
         "loglevel": true
       }
     },
+    "@metamask/profile-sync-controller>@metamask/keyring-api": {
+      "packages": {
+        "@metamask/keyring-api>bech32": true,
+        "@metamask/keyring-controller>@metamask/keyring-api>@metamask/keyring-utils": true,
+        "@metamask/profile-sync-controller>@metamask/keyring-api>@metamask/utils": true,
+        "@metamask/utils>@metamask/superstruct": true
+      }
+    },
+    "@metamask/profile-sync-controller>@metamask/keyring-api>@metamask/utils": {
+      "globals": {
+        "TextDecoder": true,
+        "TextEncoder": true
+      },
+      "packages": {
+        "@metamask/utils>@metamask/superstruct": true,
+        "@metamask/utils>@scure/base": true,
+        "@metamask/utils>pony-cause": true,
+        "@noble/hashes": true,
+        "browserify>buffer": true,
+        "nock>debug": true,
+        "semver": true
+      }
+    },
     "@metamask/profile-sync-controller>@noble/ciphers": {
       "globals": {
         "TextDecoder": true,
diff --git a/lavamoat/browserify/mmi/policy.json b/lavamoat/browserify/mmi/policy.json
index b10d976bb08c..8d54d36f2abd 100644
--- a/lavamoat/browserify/mmi/policy.json
+++ b/lavamoat/browserify/mmi/policy.json
@@ -1648,6 +1648,30 @@
         "semver": true
       }
     },
+    "@metamask/keyring-controller>@metamask/keyring-api>@metamask/keyring-utils": {
+      "globals": {
+        "URL": true
+      },
+      "packages": {
+        "@metamask/keyring-controller>@metamask/keyring-api>@metamask/keyring-utils>@metamask/utils": true,
+        "@metamask/utils>@metamask/superstruct": true
+      }
+    },
+    "@metamask/keyring-controller>@metamask/keyring-api>@metamask/keyring-utils>@metamask/utils": {
+      "globals": {
+        "TextDecoder": true,
+        "TextEncoder": true
+      },
+      "packages": {
+        "@metamask/utils>@metamask/superstruct": true,
+        "@metamask/utils>@scure/base": true,
+        "@metamask/utils>pony-cause": true,
+        "@noble/hashes": true,
+        "browserify>buffer": true,
+        "nock>debug": true,
+        "semver": true
+      }
+    },
     "@metamask/keyring-controller>ethereumjs-wallet": {
       "packages": {
         "@metamask/keyring-controller>ethereumjs-wallet>ethereum-cryptography": true,
@@ -2195,9 +2219,9 @@
       },
       "packages": {
         "@metamask/base-controller": true,
-        "@metamask/keyring-api": true,
         "@metamask/keyring-controller": true,
         "@metamask/network-controller": true,
+        "@metamask/profile-sync-controller>@metamask/keyring-api": true,
         "@metamask/profile-sync-controller>@noble/ciphers": true,
         "@metamask/profile-sync-controller>siwe": true,
         "@noble/hashes": true,
@@ -2205,6 +2229,29 @@
         "loglevel": true
       }
     },
+    "@metamask/profile-sync-controller>@metamask/keyring-api": {
+      "packages": {
+        "@metamask/keyring-api>bech32": true,
+        "@metamask/keyring-controller>@metamask/keyring-api>@metamask/keyring-utils": true,
+        "@metamask/profile-sync-controller>@metamask/keyring-api>@metamask/utils": true,
+        "@metamask/utils>@metamask/superstruct": true
+      }
+    },
+    "@metamask/profile-sync-controller>@metamask/keyring-api>@metamask/utils": {
+      "globals": {
+        "TextDecoder": true,
+        "TextEncoder": true
+      },
+      "packages": {
+        "@metamask/utils>@metamask/superstruct": true,
+        "@metamask/utils>@scure/base": true,
+        "@metamask/utils>pony-cause": true,
+        "@noble/hashes": true,
+        "browserify>buffer": true,
+        "nock>debug": true,
+        "semver": true
+      }
+    },
     "@metamask/profile-sync-controller>@noble/ciphers": {
       "globals": {
         "TextDecoder": true,
diff --git a/package.json b/package.json
index bd3507bf6f0a..1072a40599f4 100644
--- a/package.json
+++ b/package.json
@@ -330,7 +330,7 @@
     "@metamask/post-message-stream": "^8.0.0",
     "@metamask/ppom-validator": "0.36.0",
     "@metamask/preinstalled-example-snap": "^0.2.0",
-    "@metamask/profile-sync-controller": "^3.0.0",
+    "@metamask/profile-sync-controller": "^3.1.1",
     "@metamask/providers": "^18.2.0",
     "@metamask/queued-request-controller": "^7.0.1",
     "@metamask/rate-limit-controller": "^6.0.0",
diff --git a/yarn.lock b/yarn.lock
index 2fbe7d7dd430..f670242e47b3 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5640,9 +5640,21 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/keyring-controller@npm:^19.0.0, @metamask/keyring-controller@npm:^19.0.1":
-  version: 19.0.1
-  resolution: "@metamask/keyring-controller@npm:19.0.1"
+"@metamask/keyring-api@npm:^12.0.0":
+  version: 12.0.0
+  resolution: "@metamask/keyring-api@npm:12.0.0"
+  dependencies:
+    "@metamask/keyring-utils": "npm:^1.0.0"
+    "@metamask/superstruct": "npm:^3.1.0"
+    "@metamask/utils": "npm:^9.3.0"
+    bech32: "npm:^2.0.0"
+  checksum: 10/ba8b75c55d3fcb9f8b52c58ff141cba81f7c416c3fa684e089965717ea129d50e8df7a73e7ab1c96eaf59d70b6e2dd8a618434939b75ef0d3402b547b5196877
+  languageName: node
+  linkType: hard
+
+"@metamask/keyring-controller@npm:^19.0.0, @metamask/keyring-controller@npm:^19.0.2":
+  version: 19.0.2
+  resolution: "@metamask/keyring-controller@npm:19.0.2"
   dependencies:
     "@ethereumjs/util": "npm:^8.1.0"
     "@keystonehq/metamask-airgapped-keyring": "npm:^0.14.1"
@@ -5651,16 +5663,36 @@ __metadata:
     "@metamask/eth-hd-keyring": "npm:^7.0.4"
     "@metamask/eth-sig-util": "npm:^8.0.0"
     "@metamask/eth-simple-keyring": "npm:^6.0.5"
-    "@metamask/keyring-api": "npm:^10.1.0"
-    "@metamask/message-manager": "npm:^11.0.2"
+    "@metamask/keyring-api": "npm:^12.0.0"
+    "@metamask/keyring-internal-api": "npm:^1.0.0"
+    "@metamask/message-manager": "npm:^11.0.3"
     "@metamask/utils": "npm:^10.0.0"
     async-mutex: "npm:^0.5.0"
     ethereumjs-wallet: "npm:^1.0.1"
     immer: "npm:^9.0.6"
-  peerDependencies:
-    "@metamask/providers": ^18.1.0
-    webextension-polyfill: ^0.10.0 || ^0.11.0 || ^0.12.0
-  checksum: 10/09aa13bbb7d85b155122763d12a8fd409d4ebe9612093b2c303da8077ecdbeb32d93acc32db2f29911e8dcbc35fb17463b0e467cf5795f019798b9466de009a2
+  checksum: 10/bbc140db91902dc8a9b8e1220d3c07e91858d68b9888d26df74fe300b1baf1331c5df62dde4ea71be77b485a0bca314bfc899358375490c7dbce594810bc74b6
+  languageName: node
+  linkType: hard
+
+"@metamask/keyring-internal-api@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "@metamask/keyring-internal-api@npm:1.0.0"
+  dependencies:
+    "@metamask/keyring-api": "npm:^12.0.0"
+    "@metamask/keyring-utils": "npm:^1.0.0"
+    "@metamask/superstruct": "npm:^3.1.0"
+    "@metamask/utils": "npm:^9.3.0"
+  checksum: 10/dd0fff93ddfdce008f1db82d404bd040d09840413723c831819d3a7f4c2819a4303657e4acd7578cfd22bd05ad9c7aa563fc88f13f2f06999e2325ada71b824c
+  languageName: node
+  linkType: hard
+
+"@metamask/keyring-utils@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "@metamask/keyring-utils@npm:1.0.0"
+  dependencies:
+    "@metamask/superstruct": "npm:^3.1.0"
+    "@metamask/utils": "npm:^9.3.0"
+  checksum: 10/f74f7343a7154b029e0fa4c25735c589eba4dc25a9e323d43b7c733ce5dbb23ce603a4f02aac455163993649ceeaf714b8b843985ba7a9cb00b926b3b8dc6b51
   languageName: node
   linkType: hard
 
@@ -5685,7 +5717,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/message-manager@npm:^11.0.0, @metamask/message-manager@npm:^11.0.2":
+"@metamask/message-manager@npm:^11.0.0, @metamask/message-manager@npm:^11.0.3":
   version: 11.0.3
   resolution: "@metamask/message-manager@npm:11.0.3"
   dependencies:
@@ -5752,7 +5784,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/network-controller@npm:^22.1.0":
+"@metamask/network-controller@npm:^22.1.1":
   version: 22.1.1
   resolution: "@metamask/network-controller@npm:22.1.1"
   dependencies:
@@ -5990,14 +6022,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/profile-sync-controller@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "@metamask/profile-sync-controller@npm:3.0.0"
+"@metamask/profile-sync-controller@npm:^3.1.1":
+  version: 3.1.1
+  resolution: "@metamask/profile-sync-controller@npm:3.1.1"
   dependencies:
     "@metamask/base-controller": "npm:^7.0.2"
-    "@metamask/keyring-api": "npm:^10.1.0"
-    "@metamask/keyring-controller": "npm:^19.0.1"
-    "@metamask/network-controller": "npm:^22.1.0"
+    "@metamask/keyring-api": "npm:^12.0.0"
+    "@metamask/keyring-controller": "npm:^19.0.2"
+    "@metamask/network-controller": "npm:^22.1.1"
     "@metamask/snaps-sdk": "npm:^6.7.0"
     "@metamask/snaps-utils": "npm:^8.3.0"
     "@noble/ciphers": "npm:^0.5.2"
@@ -6012,7 +6044,7 @@ __metadata:
     "@metamask/providers": ^18.1.0
     "@metamask/snaps-controllers": ^9.10.0
     webextension-polyfill: ^0.10.0 || ^0.11.0 || ^0.12.0
-  checksum: 10/5329492b4fd92801807e1c657c8ec9e8822d9ab32feba8d23714f8f0e88dffddc860c600a2c5f7a48f6ee358cdf536e2f39a6659f6ab68a8fee579ccf24da57a
+  checksum: 10/42dd1ea0f9595eca6bd1a179681f7d16dfc6cc5090494131c8999a15caa02866f133febe1a95fca7cc74b4f3dafa7ef740f27b08eadbbf3049ebc087a739fb1b
   languageName: node
   linkType: hard
 
@@ -6458,7 +6490,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/utils@npm:^9.0.0, @metamask/utils@npm:^9.1.0, @metamask/utils@npm:^9.2.1":
+"@metamask/utils@npm:^9.0.0, @metamask/utils@npm:^9.1.0, @metamask/utils@npm:^9.2.1, @metamask/utils@npm:^9.3.0":
   version: 9.3.0
   resolution: "@metamask/utils@npm:9.3.0"
   dependencies:
@@ -26550,7 +26582,7 @@ __metadata:
     "@metamask/ppom-validator": "npm:0.36.0"
     "@metamask/preferences-controller": "npm:^15.0.1"
     "@metamask/preinstalled-example-snap": "npm:^0.2.0"
-    "@metamask/profile-sync-controller": "npm:^3.0.0"
+    "@metamask/profile-sync-controller": "npm:^3.1.1"
     "@metamask/providers": "npm:^18.2.0"
     "@metamask/queued-request-controller": "npm:^7.0.1"
     "@metamask/rate-limit-controller": "npm:^6.0.0"

From fb0b414cd026f5a67b4ca39de878b8a36c0eb9bb Mon Sep 17 00:00:00 2001
From: Mathieu Artu <mathieu.artu@consensys.net>
Date: Mon, 16 Dec 2024 13:45:39 +0100
Subject: [PATCH 134/175] feat: decouple authentication logic from
 `useMetametrics` (#29070)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## **Description**

This PR decouples the authentication logic that was incorporated into
the `useMetametrics` hook.
It now lives in `metamask-controller.js`.

Auth sign-in / sign-out will now be performed whenever the
`MetaMetricsController`'s state changes to signify that a user changed
the value of `participateInMetaMetrics`

Scenarios:

- Sign-in will be performed if a user enables either metametrics or
profile syncing
- Sign-out will be performed if a user disables metametrics & has
profile syncing turned off
- Alternatively, sign-out will be performed if a user disables profile
syncing & has metametrics turned off

[![Open in GitHub
Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/29070?quickstart=1)

## **Related issues**

Fixes:

## **Manual testing steps**

1. Go to the settings page
2. Turn off profile syncing and metametrics
3. Turn only metametrics back on
4. Look into the network tab and see requests to
`https://authentication.api.cx.metamask.io`

## **Screenshots/Recordings**

<!-- If applicable, add screenshots and/or recordings to visualize the
before and after of your change. -->

### **Before**

<!-- [screenshots/recordings] -->

### **After**

<!-- [screenshots/recordings] -->

## **Pre-merge author checklist**

- [x] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension Coding
Standards](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/CODING_GUIDELINES.md).
- [x] I've completed the PR template to the best of my ability
- [x] I’ve included tests if applicable
- [x] I’ve documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [x] I’ve applied the right labels on the PR (see [labeling
guidelines](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.

## **Pre-merge reviewer checklist**

- [x] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed).
- [x] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.
---
 app/scripts/metamask-controller.js            |  33 +++++
 app/scripts/metamask-controller.test.js       | 140 ++++++++++++++++++
 ui/hooks/identity/useCreateSession.ts         |  10 +-
 .../useProfileSyncing/profileSyncing.test.tsx |  22 +++
 .../useProfileSyncing/profileSyncing.ts       |  12 +-
 .../{identity => }/useMetametrics.test.tsx    |  20 +--
 ui/hooks/{identity => }/useMetametrics.ts     |  25 +---
 .../pin-extension/pin-extension.js            |   4 +-
 .../metametrics-toggle.test.tsx               |   2 +-
 .../metametrics-toggle/metametrics-toggle.tsx |   6 +-
 ui/selectors/identity/authentication.test.ts  |  29 ++--
 ui/selectors/identity/authentication.ts       |  18 +--
 12 files changed, 241 insertions(+), 80 deletions(-)
 rename ui/hooks/{identity => }/useMetametrics.test.tsx (75%)
 rename ui/hooks/{identity => }/useMetametrics.ts (71%)

diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
index 967a6a2e7d31..e3a223da4e02 100644
--- a/app/scripts/metamask-controller.js
+++ b/app/scripts/metamask-controller.js
@@ -1678,6 +1678,39 @@ export default class MetamaskController extends EventEmitter {
       }),
     });
 
+    this.controllerMessenger.subscribe(
+      'MetaMetricsController:stateChange',
+      previousValueComparator(async (prevState, currState) => {
+        const { participateInMetaMetrics: prevParticipateInMetaMetrics } =
+          prevState;
+        const { participateInMetaMetrics: currParticipateInMetaMetrics } =
+          currState;
+
+        const metaMetricsWasDisabled =
+          prevParticipateInMetaMetrics && !currParticipateInMetaMetrics;
+        const metaMetricsWasEnabled =
+          !prevParticipateInMetaMetrics && currParticipateInMetaMetrics;
+
+        if (!metaMetricsWasDisabled && !metaMetricsWasEnabled) {
+          return;
+        }
+
+        const shouldPerformSignIn =
+          metaMetricsWasEnabled &&
+          !this.authenticationController.state.isSignedIn;
+        const shouldPerformSignOut =
+          metaMetricsWasDisabled &&
+          this.authenticationController.state.isSignedIn &&
+          !this.userStorageController.state.isProfileSyncingEnabled;
+
+        if (shouldPerformSignIn) {
+          await this.authenticationController.performSignIn();
+        } else if (shouldPerformSignOut) {
+          await this.authenticationController.performSignOut();
+        }
+      }, this.metaMetricsController.state),
+    );
+
     const notificationServicesPushControllerMessenger =
       this.controllerMessenger.getRestricted({
         name: 'NotificationServicesPushController',
diff --git a/app/scripts/metamask-controller.test.js b/app/scripts/metamask-controller.test.js
index c78b297efd64..47a9050232fd 100644
--- a/app/scripts/metamask-controller.test.js
+++ b/app/scripts/metamask-controller.test.js
@@ -2878,4 +2878,144 @@ describe('MetaMaskController', () => {
       expect(browserPolyfillMock.storage.session.set).not.toHaveBeenCalled();
     });
   });
+
+  describe('MetaMetrics & authentication dependencies', () => {
+    let metamaskController;
+    let mockPerformSignIn;
+    let mockPerformSignOut;
+
+    const arrangeControllerState = (stateOverrides) => {
+      metamaskController = new MetaMaskController({
+        showUserConfirmation: noop,
+        encryptor: mockEncryptor,
+        initState: { ...cloneDeep(firstTimeState), ...stateOverrides },
+        initLangCode: 'en_US',
+        platform: {
+          showTransactionNotification: () => undefined,
+          getVersion: () => 'foo',
+        },
+        browser: browserPolyfillMock,
+        infuraProjectId: 'foo',
+        isFirstMetaMaskControllerSetup: true,
+      });
+
+      mockPerformSignIn = jest
+        .spyOn(metamaskController.authenticationController, 'performSignIn')
+        .mockResolvedValue();
+      mockPerformSignOut = jest
+        .spyOn(metamaskController.authenticationController, 'performSignOut')
+        .mockResolvedValue();
+    };
+
+    it('should sign in the user if MetaMetrics is enabled and the user is not signed in', async () => {
+      arrangeControllerState({
+        MetaMetricsController: {
+          participateInMetaMetrics: false,
+        },
+        AuthenticationController: {
+          isSignedIn: false,
+        },
+      });
+
+      metamaskController.controllerMessenger.publish(
+        'MetaMetricsController:stateChange',
+        {
+          participateInMetaMetrics: true,
+        },
+      );
+
+      expect(mockPerformSignIn).toHaveBeenCalledTimes(1);
+      expect(mockPerformSignOut).not.toHaveBeenCalled();
+    });
+
+    it('should sign out the user if MetaMetrics is disabled and the user is signed in but profile syncing is disabled', async () => {
+      arrangeControllerState({
+        MetaMetricsController: {
+          participateInMetaMetrics: true,
+        },
+        AuthenticationController: {
+          isSignedIn: true,
+        },
+        UserStorageController: {
+          isProfileSyncingEnabled: false,
+        },
+      });
+
+      metamaskController.controllerMessenger.publish(
+        'MetaMetricsController:stateChange',
+        {
+          participateInMetaMetrics: false,
+        },
+      );
+
+      expect(mockPerformSignIn).not.toHaveBeenCalled();
+      expect(mockPerformSignOut).toHaveBeenCalledTimes(1);
+    });
+
+    it('should not sign in the user if MetaMetrics is enabled and the user is already signed in', async () => {
+      arrangeControllerState({
+        MetaMetricsController: {
+          participateInMetaMetrics: false,
+        },
+        AuthenticationController: {
+          isSignedIn: true,
+        },
+      });
+
+      metamaskController.controllerMessenger.publish(
+        'MetaMetricsController:stateChange',
+        {
+          participateInMetaMetrics: true,
+        },
+      );
+
+      expect(mockPerformSignIn).not.toHaveBeenCalled();
+      expect(mockPerformSignOut).not.toHaveBeenCalled();
+    });
+
+    it('should not sign out the user if MetaMetrics is disabled and the user is not signed in', async () => {
+      arrangeControllerState({
+        MetaMetricsController: {
+          participateInMetaMetrics: true,
+        },
+        AuthenticationController: {
+          isSignedIn: false,
+        },
+      });
+
+      metamaskController.controllerMessenger.publish(
+        'MetaMetricsController:stateChange',
+        {
+          participateInMetaMetrics: false,
+        },
+      );
+
+      expect(mockPerformSignIn).not.toHaveBeenCalled();
+      expect(mockPerformSignOut).not.toHaveBeenCalled();
+    });
+
+    it('should not sign out the user if MetaMetrics is disabled and profile syncing is enabled', async () => {
+      arrangeControllerState({
+        MetaMetricsController: {
+          participateInMetaMetrics: true,
+        },
+        AuthenticationController: {
+          isSignedIn: true,
+        },
+        UserStorageController: {
+          isProfileSyncingEnabled: true,
+        },
+      });
+
+      metamaskController.controllerMessenger.publish(
+        'MetaMetricsController:stateChange',
+        {
+          participateInMetaMetrics: false,
+        },
+      );
+
+      expect(mockPerformSignIn).not.toHaveBeenCalled();
+      expect(mockPerformSignOut).not.toHaveBeenCalled();
+    });
+  });
 });
diff --git a/ui/hooks/identity/useCreateSession.ts b/ui/hooks/identity/useCreateSession.ts
index 1ee6c92874c8..459fce4d69a7 100644
--- a/ui/hooks/identity/useCreateSession.ts
+++ b/ui/hooks/identity/useCreateSession.ts
@@ -1,12 +1,10 @@
 import { useCallback } from 'react';
 import { useSelector, useDispatch } from 'react-redux';
 import log from 'loglevel';
-import {
-  selectIsSignedIn,
-  selectParticipateInMetaMetrics,
-} from '../../selectors/identity/authentication';
+import { selectIsSignedIn } from '../../selectors/identity/authentication';
 import { selectIsProfileSyncingEnabled } from '../../selectors/identity/profile-syncing';
 import { performSignIn, disableProfileSyncing } from '../../store/actions';
+import { getParticipateInMetaMetrics } from '../../selectors';
 
 /**
  * Custom hook to manage the creation of a session based on the user's authentication status,
@@ -26,9 +24,7 @@ export function useCreateSession(): {
 
   const isSignedIn = useSelector(selectIsSignedIn);
   const isProfileSyncingEnabled = useSelector(selectIsProfileSyncingEnabled);
-  const isParticipateInMetaMetrics = useSelector(
-    selectParticipateInMetaMetrics,
-  );
+  const isParticipateInMetaMetrics = useSelector(getParticipateInMetaMetrics);
 
   const createSession = useCallback(async () => {
     const safeDispatchDisableProfileSync = async () => {
diff --git a/ui/hooks/identity/useProfileSyncing/profileSyncing.test.tsx b/ui/hooks/identity/useProfileSyncing/profileSyncing.test.tsx
index 949d15445b7e..0cae6b4042de 100644
--- a/ui/hooks/identity/useProfileSyncing/profileSyncing.test.tsx
+++ b/ui/hooks/identity/useProfileSyncing/profileSyncing.test.tsx
@@ -46,4 +46,26 @@ describe('useDisableProfileSyncing()', () => {
 
     expect(mockDisableProfileSyncingAction).toHaveBeenCalled();
   });
+
+  it('should sign out the user if MetaMetrics is not enabled and the user is signed in', async () => {
+    const mockPerformSignOutAction = jest.spyOn(actions, 'performSignOut');
+
+    const { result } = renderHookWithProviderTyped(
+      () => useDisableProfileSyncing(),
+      {
+        metamask: {
+          participateInMetaMetrics: false,
+          isSignedIn: true,
+        },
+      },
+      undefined,
+      MetamaskNotificationsProvider,
+    );
+
+    await act(async () => {
+      await result.current.disableProfileSyncing();
+    });
+
+    expect(mockPerformSignOutAction).toHaveBeenCalled();
+  });
 });
diff --git a/ui/hooks/identity/useProfileSyncing/profileSyncing.ts b/ui/hooks/identity/useProfileSyncing/profileSyncing.ts
index 5e3581927c08..d29c908ae7d4 100644
--- a/ui/hooks/identity/useProfileSyncing/profileSyncing.ts
+++ b/ui/hooks/identity/useProfileSyncing/profileSyncing.ts
@@ -1,12 +1,15 @@
 import { useState, useCallback } from 'react';
-import { useDispatch } from 'react-redux';
+import { useDispatch, useSelector } from 'react-redux';
 import log from 'loglevel';
 import { useMetamaskNotificationsContext } from '../../../contexts/metamask-notifications/metamask-notifications';
+import { getParticipateInMetaMetrics } from '../../../selectors';
+import { selectIsSignedIn } from '../../../selectors/identity/authentication';
 import {
   disableProfileSyncing as disableProfileSyncingAction,
   enableProfileSyncing as enableProfileSyncingAction,
   setIsProfileSyncingEnabled as setIsProfileSyncingEnabledAction,
   hideLoadingIndication,
+  performSignOut,
 } from '../../../store/actions';
 
 /**
@@ -53,6 +56,8 @@ export function useDisableProfileSyncing(): {
 } {
   const dispatch = useDispatch();
   const { listNotifications } = useMetamaskNotificationsContext();
+  const isMetaMetricsEnabled = useSelector(getParticipateInMetaMetrics);
+  const isSignedIn = useSelector(selectIsSignedIn);
 
   const [error, setError] = useState<string | null>(null);
 
@@ -63,6 +68,11 @@ export function useDisableProfileSyncing(): {
       // disable profile syncing
       await dispatch(disableProfileSyncingAction());
 
+      // sign out the user if MetaMetrics is not enabled and the user is signed in
+      if (!isMetaMetricsEnabled && isSignedIn) {
+        await dispatch(performSignOut());
+      }
+
       // list notifications to update the counter
       await listNotifications();
     } catch (e) {
diff --git a/ui/hooks/identity/useMetametrics.test.tsx b/ui/hooks/useMetametrics.test.tsx
similarity index 75%
rename from ui/hooks/identity/useMetametrics.test.tsx
rename to ui/hooks/useMetametrics.test.tsx
index 3d4afffd03e7..099198c7fa85 100644
--- a/ui/hooks/identity/useMetametrics.test.tsx
+++ b/ui/hooks/useMetametrics.test.tsx
@@ -4,15 +4,13 @@ import { renderHook, act } from '@testing-library/react-hooks';
 import configureStore from 'redux-mock-store';
 import thunk from 'redux-thunk';
 import type { Store } from 'redux';
-import * as actions from '../../store/actions';
+import * as actions from '../store/actions';
 import { useEnableMetametrics, useDisableMetametrics } from './useMetametrics';
 
 const middlewares = [thunk];
 const mockStore = configureStore(middlewares);
 
-jest.mock('../../store/actions', () => ({
-  performSignOut: jest.fn(),
-  performSignIn: jest.fn(),
+jest.mock('../store/actions', () => ({
   setParticipateInMetaMetrics: jest.fn(),
   showLoadingIndication: jest.fn(),
   hideLoadingIndication: jest.fn(),
@@ -25,8 +23,6 @@ describe('useMetametrics', () => {
     store = mockStore({
       metamask: {
         participateInMetaMetrics: false,
-        isProfileSyncingEnabled: false,
-        isSignedIn: false,
       },
     });
 
@@ -40,12 +36,10 @@ describe('useMetametrics', () => {
     jest.clearAllMocks();
   });
 
-  it('should enable MetaMetrics when user is not signed in and profile syncing enabled', async () => {
+  it('should enable MetaMetrics', async () => {
     store.getState = () => ({
       metamask: {
-        participateInMetaMetrics: true,
-        isProfileSyncingEnabled: true,
-        isSignedIn: false,
+        participateInMetaMetrics: false,
       },
     });
 
@@ -64,18 +58,15 @@ describe('useMetametrics', () => {
 
     await waitForNextUpdate();
 
-    expect(actions.performSignIn).toHaveBeenCalled();
     expect(actions.setParticipateInMetaMetrics).toHaveBeenCalledWith(true);
     expect(store.dispatch).toHaveBeenCalled();
     expect(result.current.loading).toBe(false);
   });
 
-  it('should disable MetaMetrics and sign out if profile syncing is enabled', async () => {
+  it('should disable MetaMetrics', async () => {
     store.getState = () => ({
       metamask: {
         participateInMetaMetrics: true,
-        isProfileSyncingEnabled: true,
-        isSignedIn: true,
       },
     });
 
@@ -94,7 +85,6 @@ describe('useMetametrics', () => {
 
     await waitForNextUpdate();
 
-    expect(actions.performSignOut).toHaveBeenCalled();
     expect(actions.setParticipateInMetaMetrics).toHaveBeenCalledWith(false);
     expect(result.current.loading).toBe(false);
   });
diff --git a/ui/hooks/identity/useMetametrics.ts b/ui/hooks/useMetametrics.ts
similarity index 71%
rename from ui/hooks/identity/useMetametrics.ts
rename to ui/hooks/useMetametrics.ts
index ec159f22453e..cb7dfe4aec1a 100644
--- a/ui/hooks/identity/useMetametrics.ts
+++ b/ui/hooks/useMetametrics.ts
@@ -1,19 +1,15 @@
 import { useState, useCallback } from 'react';
-import { useSelector, useDispatch } from 'react-redux';
+import { useDispatch } from 'react-redux';
 import log from 'loglevel';
-import { selectIsSignedIn } from '../../selectors/identity/authentication';
-import { selectIsProfileSyncingEnabled } from '../../selectors/identity/profile-syncing';
 import {
-  performSignOut,
-  performSignIn,
   setParticipateInMetaMetrics,
   showLoadingIndication,
   hideLoadingIndication,
-} from '../../store/actions';
+} from '../store/actions';
 
 /**
  * Provides a hook to enable MetaMetrics tracking.
- * This hook handles user sign-in if not already signed in and sets participation in MetaMetrics to true.
+ * This hook handles sets participation in MetaMetrics to true.
  *
  * @returns An object containing the `enableMetametrics` function, a `loading` boolean indicating the operation status, and an `error` string for error messages.
  */
@@ -23,8 +19,6 @@ export function useEnableMetametrics(): {
   error: string | null;
 } {
   const dispatch = useDispatch();
-  const isProfileSyncingEnabled = useSelector(selectIsProfileSyncingEnabled);
-  const isUserSignedIn = useSelector(selectIsSignedIn);
 
   const [loading, setLoading] = useState<boolean>(false);
   const [error, setError] = useState<string | null>(null);
@@ -35,10 +29,6 @@ export function useEnableMetametrics(): {
     setError(null);
 
     try {
-      if (isProfileSyncingEnabled && !isUserSignedIn) {
-        await dispatch(performSignIn());
-      }
-
       await dispatch(setParticipateInMetaMetrics(true));
     } catch (e) {
       setError(e instanceof Error ? e.message : 'An unexpected error occurred');
@@ -50,7 +40,7 @@ export function useEnableMetametrics(): {
     }
 
     dispatch(hideLoadingIndication());
-  }, [dispatch, isUserSignedIn]);
+  }, [dispatch]);
 
   return {
     enableMetametrics,
@@ -71,8 +61,6 @@ export function useDisableMetametrics(): {
   error: string | null;
 } {
   const dispatch = useDispatch();
-  const isProfileSyncingEnabled = useSelector(selectIsProfileSyncingEnabled);
-  const isUserSignedIn = useSelector(selectIsSignedIn);
 
   const [loading, setLoading] = useState<boolean>(false);
   const [error, setError] = useState<string | null>(null);
@@ -83,9 +71,6 @@ export function useDisableMetametrics(): {
     setError(null);
 
     try {
-      if (isProfileSyncingEnabled && isUserSignedIn) {
-        await dispatch(performSignOut());
-      }
       await dispatch(setParticipateInMetaMetrics(false));
     } catch (e) {
       setError(e instanceof Error ? e.message : 'An unexpected error occurred');
@@ -96,7 +81,7 @@ export function useDisableMetametrics(): {
     }
 
     dispatch(hideLoadingIndication());
-  }, [dispatch, isProfileSyncingEnabled]);
+  }, [dispatch]);
 
   return {
     disableMetametrics,
diff --git a/ui/pages/onboarding-flow/pin-extension/pin-extension.js b/ui/pages/onboarding-flow/pin-extension/pin-extension.js
index 85cfafa66478..b70a779740da 100644
--- a/ui/pages/onboarding-flow/pin-extension/pin-extension.js
+++ b/ui/pages/onboarding-flow/pin-extension/pin-extension.js
@@ -39,9 +39,9 @@ import { MetaMetricsContext } from '../../../contexts/metametrics';
 import {
   getFirstTimeFlowType,
   getExternalServicesOnboardingToggleState,
+  getParticipateInMetaMetrics,
 } from '../../../selectors';
 import { selectIsProfileSyncingEnabled } from '../../../selectors/identity/profile-syncing';
-import { selectParticipateInMetaMetrics } from '../../../selectors/identity/authentication';
 import {
   MetaMetricsEventCategory,
   MetaMetricsEventName,
@@ -63,7 +63,7 @@ export default function OnboardingPinExtension() {
     getExternalServicesOnboardingToggleState,
   );
   const isProfileSyncingEnabled = useSelector(selectIsProfileSyncingEnabled);
-  const participateInMetaMetrics = useSelector(selectParticipateInMetaMetrics);
+  const participateInMetaMetrics = useSelector(getParticipateInMetaMetrics);
 
   const handleClick = async () => {
     if (selectedIndex === 0) {
diff --git a/ui/pages/settings/security-tab/metametrics-toggle/metametrics-toggle.test.tsx b/ui/pages/settings/security-tab/metametrics-toggle/metametrics-toggle.test.tsx
index d0bd3d352030..8fba094594ea 100644
--- a/ui/pages/settings/security-tab/metametrics-toggle/metametrics-toggle.test.tsx
+++ b/ui/pages/settings/security-tab/metametrics-toggle/metametrics-toggle.test.tsx
@@ -2,7 +2,7 @@ import React from 'react';
 import { Provider } from 'react-redux';
 import configureMockStore from 'redux-mock-store';
 import { render, fireEvent } from '@testing-library/react';
-import * as MetametricsHooks from '../../../../hooks/identity/useMetametrics';
+import * as MetametricsHooks from '../../../../hooks/useMetametrics';
 import MetametricsToggle from './metametrics-toggle';
 
 let mockUseSelectorReturnValue = false;
diff --git a/ui/pages/settings/security-tab/metametrics-toggle/metametrics-toggle.tsx b/ui/pages/settings/security-tab/metametrics-toggle/metametrics-toggle.tsx
index 5ee8ed292b08..86a7bb4bb2c3 100644
--- a/ui/pages/settings/security-tab/metametrics-toggle/metametrics-toggle.tsx
+++ b/ui/pages/settings/security-tab/metametrics-toggle/metametrics-toggle.tsx
@@ -5,9 +5,8 @@ import { MetaMetricsContext } from '../../../../contexts/metametrics';
 import {
   useEnableMetametrics,
   useDisableMetametrics,
-} from '../../../../hooks/identity/useMetametrics';
+} from '../../../../hooks/useMetametrics';
 import { selectIsProfileSyncingEnabled } from '../../../../selectors/identity/profile-syncing';
-import { selectParticipateInMetaMetrics } from '../../../../selectors/identity/authentication';
 import {
   MetaMetricsEventCategory,
   MetaMetricsEventName,
@@ -21,6 +20,7 @@ import {
   TextColor,
   TextVariant,
 } from '../../../../helpers/constants/design-system';
+import { getParticipateInMetaMetrics } from '../../../../selectors';
 
 const MetametricsToggle = ({
   dataCollectionForMarketing,
@@ -39,7 +39,7 @@ const MetametricsToggle = ({
   const error = enableMetametricsError || disableMetametricsError;
 
   const isProfileSyncingEnabled = useSelector(selectIsProfileSyncingEnabled);
-  const participateInMetaMetrics = useSelector(selectParticipateInMetaMetrics);
+  const participateInMetaMetrics = useSelector(getParticipateInMetaMetrics);
 
   const handleUseParticipateInMetaMetrics = async () => {
     if (participateInMetaMetrics) {
diff --git a/ui/selectors/identity/authentication.test.ts b/ui/selectors/identity/authentication.test.ts
index b240a934dc00..34e592cb7ebb 100644
--- a/ui/selectors/identity/authentication.test.ts
+++ b/ui/selectors/identity/authentication.test.ts
@@ -1,26 +1,27 @@
-import {
-  selectIsSignedIn,
-  selectParticipateInMetaMetrics,
-} from './authentication';
+import { selectIsSignedIn, selectSessionData } from './authentication';
 
 describe('Authentication Selectors', () => {
   const mockState = {
     metamask: {
       isSignedIn: true,
-      metametricsId: 'id',
-      participateInMetaMetrics: true,
+      sessionData: {
+        profile: {
+          identifierId: 'identifierId',
+          profileId: 'profileId',
+        },
+        accessToken: 'accessToken',
+        expiresIn: 'expiresIn',
+      },
     },
   };
 
-  it('should select the Authentications status', () => {
-    expect(selectIsSignedIn(mockState)).toBe(true);
+  it('should select the authentication status', () => {
+    expect(selectIsSignedIn(mockState)).toBe(mockState.metamask.isSignedIn);
   });
 
-  it('should select the Metamask Notifications Enabled status', () => {
-    expect(selectParticipateInMetaMetrics(mockState)).toBe(true);
-  });
-
-  it('should select the Metamask Notifications Enabled status', () => {
-    expect(selectParticipateInMetaMetrics(mockState)).toBe(true);
+  it('should select the session data', () => {
+    expect(selectSessionData(mockState)).toEqual(
+      mockState.metamask.sessionData,
+    );
   });
 });
diff --git a/ui/selectors/identity/authentication.ts b/ui/selectors/identity/authentication.ts
index be11c40dbf12..e7fa0f2f3620 100644
--- a/ui/selectors/identity/authentication.ts
+++ b/ui/selectors/identity/authentication.ts
@@ -2,9 +2,7 @@ import { createSelector } from 'reselect';
 import type { AuthenticationController } from '@metamask/profile-sync-controller';
 
 type AppState = {
-  metamask: AuthenticationController.AuthenticationControllerState & {
-    participateInMetaMetrics: boolean;
-  };
+  metamask: AuthenticationController.AuthenticationControllerState;
 };
 
 const getMetamask = (state: AppState) => state.metamask;
@@ -23,20 +21,6 @@ export const selectIsSignedIn = createSelector(
   (metamask) => metamask.isSignedIn,
 );
 
-/**
- * Selector to determine if the user participates in MetaMetrics.
- *
- * This selector accesses the `participateInMetaMetrics` property from the `metamask` state using the `createSelector` function.
- * It provides a memoized selector that returns whether the user has opted into MetaMetrics.
- *
- * @param {AppState} state - The current state of the Redux store.
- * @returns {boolean} Returns true if the user participates in MetaMetrics, false otherwise.
- */
-export const selectParticipateInMetaMetrics = createSelector(
-  [getMetamask],
-  (metamask) => metamask.participateInMetaMetrics,
-);
-
 /**
  * Selector to retrieve session data.
  *

From 45c7bfd515f5d0758a3a7cc2c3b7139484f508e0 Mon Sep 17 00:00:00 2001
From: javiergarciavera <76975121+javiergarciavera@users.noreply.github.com>
Date: Mon, 16 Dec 2024 14:18:27 +0100
Subject: [PATCH 135/175] feat: added solana to flask build (#29147)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## **Description**

Added Solana feature on Flask build

[![Open in GitHub
Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/29195?quickstart=1)

## **Related issues**

N/A

## **Manual testing steps**

- Open Experimental settings and enable Solana
- You should see Solana option when creating account

## **Screenshots/Recordings**

### **Before**

### **After**

## **Pre-merge author checklist**

- [x] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension Coding
Standards](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/CODING_GUIDELINES.md).
- [x] I've completed the PR template to the best of my ability
- [x] I’ve included tests if applicable
- [x] I’ve documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [x] I’ve applied the right labels on the PR (see [labeling
guidelines](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.

## **Pre-merge reviewer checklist**

- [x] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed).
- [x] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.

---------

Co-authored-by: Charly Chevalier <charly.chevalier@consensys.net>
---
 builds.yml            | 1 +
 privacy-snapshot.json | 7 ++++---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/builds.yml b/builds.yml
index fd071904a961..e8c7f5a28d93 100644
--- a/builds.yml
+++ b/builds.yml
@@ -64,6 +64,7 @@ buildTypes:
     features:
       - build-flask
       - keyring-snaps
+      - solana
     env:
       - INFURA_FLASK_PROJECT_ID
       - SEGMENT_FLASK_WRITE_KEY
diff --git a/privacy-snapshot.json b/privacy-snapshot.json
index 230634421d52..fc5dafb7333c 100644
--- a/privacy-snapshot.json
+++ b/privacy-snapshot.json
@@ -46,10 +46,10 @@
   "on-ramp-content.uat-api.cx.metamask.io",
   "phishing-detection.api.cx.metamask.io",
   "portfolio.metamask.io",
+  "price-api.metamask-institutional.io",
   "price.api.cx.metamask.io",
   "proxy.api.cx.metamask.io",
   "proxy.dev-api.cx.metamask.io",
-  "signature-insights.api.cx.metamask.io",
   "raw.githubusercontent.com",
   "registry.npmjs.org",
   "responsive-rpc.test",
@@ -57,6 +57,7 @@
   "security-alerts.dev-api.cx.metamask.io",
   "sentry.io",
   "sepolia.infura.io",
+  "signature-insights.api.cx.metamask.io",
   "snaps.metamask.io",
   "sourcify.dev",
   "start.metamask.io",
@@ -72,6 +73,6 @@
   "unresponsive-rpc.test",
   "unresponsive-rpc.url",
   "user-storage.api.cx.metamask.io",
-  "www.4byte.directory",
-  "verify.walletconnect.com"
+  "verify.walletconnect.com",
+  "www.4byte.directory"
 ]

From 78ea51a0113eb47f447841d3c2a85b45a819032f Mon Sep 17 00:00:00 2001
From: Howard Braham <howrad@gmail.com>
Date: Mon, 16 Dec 2024 20:38:44 +0530
Subject: [PATCH 136/175] ci: add flags.circleci.timeoutMinutes (#29156)

## **Description**

1. Allows you to customize the E2E timeout by writing this in the PR
description:

`flags = {"circleci": {"timeoutMinutes": 35}}`

2. change to git-diff-default-branch.ts to be able to run it as a direct
script or as a library
3. changes the default value for the merge queue
4. increases runAll.js's time-default from 30s to 50s

[![Open in GitHub
Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/29156?quickstart=1)

<!--## **Related issues**
## **Manual testing steps**
## **Screenshots/Recordings**
### **Before**
### **After**
## **Pre-merge author checklist**
## **Pre-merge reviewer checklist**
-->

---------

Co-authored-by: Mark Stacey <markjstacey@gmail.com>
---
 .circleci/config.yml                          |  1 +
 .circleci/scripts/git-diff-default-branch.ts  | 13 +++++++----
 .../scripts/test-run-e2e-timeout-minutes.ts   | 23 +++++++++++++++----
 app/scripts/lib/manifestFlags.ts              |  4 ++++
 development/lib/get-manifest-flag.ts          |  1 -
 test/e2e/run-all.js                           |  2 +-
 6 files changed, 33 insertions(+), 11 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 37da32cf59f3..552aa3305509 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -224,6 +224,7 @@ workflows:
       - test-api-specs:
           requires:
             - prep-build-test
+            - get-changed-files-with-git-diff
       - test-e2e-chrome-multiple-providers:
           requires:
             - prep-build-test
diff --git a/.circleci/scripts/git-diff-default-branch.ts b/.circleci/scripts/git-diff-default-branch.ts
index 8db64e0f7058..269de912dafd 100644
--- a/.circleci/scripts/git-diff-default-branch.ts
+++ b/.circleci/scripts/git-diff-default-branch.ts
@@ -123,9 +123,7 @@ async function storeGitDiffOutputAndPrBody() {
     // even if we want to skip this step.
     fs.mkdirSync(CHANGED_FILES_DIR, { recursive: true });
 
-    console.log(
-      `Determining whether to run git diff...`,
-    );
+    console.log(`Determining whether to run git diff...`);
     if (!PR_NUMBER) {
       console.log('Not a PR, skipping git diff');
       return;
@@ -141,7 +139,9 @@ async function storeGitDiffOutputAndPrBody() {
       console.log(`This is for a PR targeting '${baseRef}', skipping git diff`);
       writePrBodyToFile(prInfo.body);
       return;
-    } else if (prInfo.labels.some(label => label.name === 'skip-e2e-quality-gate')) {
+    } else if (
+      prInfo.labels.some((label) => label.name === 'skip-e2e-quality-gate')
+    ) {
       console.log('PR has the skip-e2e-quality-gate label, skipping git diff');
       return;
     }
@@ -164,4 +164,7 @@ async function storeGitDiffOutputAndPrBody() {
   }
 }
 
-storeGitDiffOutputAndPrBody();
+// If main module (i.e. this is the TS file that was run directly)
+if (require.main === module) {
+  storeGitDiffOutputAndPrBody();
+}
diff --git a/.circleci/scripts/test-run-e2e-timeout-minutes.ts b/.circleci/scripts/test-run-e2e-timeout-minutes.ts
index c539133b0c60..c486224139c3 100644
--- a/.circleci/scripts/test-run-e2e-timeout-minutes.ts
+++ b/.circleci/scripts/test-run-e2e-timeout-minutes.ts
@@ -1,8 +1,23 @@
+import { fetchManifestFlagsFromPRAndGit } from '../../development/lib/get-manifest-flag';
 import { filterE2eChangedFiles } from '../../test/e2e/changedFilesUtil';
 
-const changedOrNewTests = filterE2eChangedFiles();
+fetchManifestFlagsFromPRAndGit().then((manifestFlags) => {
+  let timeout;
 
-// 20 minutes, plus 3 minutes for every changed file, up to a maximum of 30 minutes
-const extraTime = Math.min(20 + changedOrNewTests.length * 3, 30);
+  if (manifestFlags.circleci?.timeoutMinutes) {
+    timeout = manifestFlags.circleci?.timeoutMinutes;
+  } else {
+    const changedOrNewTests = filterE2eChangedFiles();
 
-console.log(extraTime);
+    // 20 minutes, plus 3 minutes for every changed file, up to a maximum of 30 minutes
+    timeout = Math.min(20 + changedOrNewTests.length * 3, 30);
+  }
+
+  // If this is the Merge Queue, add 10 minutes
+  if (process.env.CIRCLE_BRANCH?.startsWith('gh-readonly-queue')) {
+    timeout += 10;
+  }
+
+  // This is an essential log, that feeds into a bash script
+  console.log(timeout);
+});
diff --git a/app/scripts/lib/manifestFlags.ts b/app/scripts/lib/manifestFlags.ts
index 8f92bea93621..574099d0cb94 100644
--- a/app/scripts/lib/manifestFlags.ts
+++ b/app/scripts/lib/manifestFlags.ts
@@ -35,6 +35,10 @@ export type ManifestFlags = {
      * The number of the pull request that triggered the current run
      */
     prNumber?: number;
+    /**
+     * The number of minutes to allow the E2E tests to run before timing out
+     */
+    timeoutMinutes?: number;
   };
   /**
    * Sentry flags
diff --git a/development/lib/get-manifest-flag.ts b/development/lib/get-manifest-flag.ts
index 6253c3f3d98f..225b3a05121c 100644
--- a/development/lib/get-manifest-flag.ts
+++ b/development/lib/get-manifest-flag.ts
@@ -62,7 +62,6 @@ async function getFlagsFromPrBody(): Promise<ManifestFlags> {
       hasProperty(error, 'code') &&
       error.code === 'ENOENT'
     ) {
-      console.debug('No pr-body.txt, ignoring flags');
       return {};
     }
     throw error;
diff --git a/test/e2e/run-all.js b/test/e2e/run-all.js
index b1b75d8864f6..3ef50edf66b0 100644
--- a/test/e2e/run-all.js
+++ b/test/e2e/run-all.js
@@ -79,7 +79,7 @@ function runningOnCircleCI(testPaths) {
   // 1. split the test files into chunks based on how long they take to run
   // 2. support "Rerun failed tests" on CircleCI
   const result = execSync(
-    'circleci tests run --command=">test/test-results/myTestList.txt xargs echo" --split-by=timings --timings-type=filename --time-default=30s < test/test-results/fullTestList.txt',
+    'circleci tests run --command=">test/test-results/myTestList.txt xargs echo" --split-by=timings --timings-type=filename --time-default=50s < test/test-results/fullTestList.txt',
   ).toString('utf8');
 
   // Report if no tests found, exit gracefully

From 6c4cc0efa069d7f0c52da35edbc1bcfd1adcb29c Mon Sep 17 00:00:00 2001
From: infiniteflower <139582705+infiniteflower@users.noreply.github.com>
Date: Mon, 16 Dec 2024 12:01:51 -0500
Subject: [PATCH 137/175] fix: correct a typo (#29207)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<!--
Please submit this PR as a draft initially.
Do not mark it as "Ready for review" until the template has been
completely filled out, and PR status checks have passed at least once.
-->

## **Description**

<!--
Write a short description of the changes included in this pull request,
also include relevant motivation and context. Have in mind the following
questions:
1. What is the reason for the change?
2. What is the improvement/solution?
-->

[![Open in GitHub
Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/29207?quickstart=1)

This PR fixes a typo that uses a non existent field on an object.

## **Related issues**

Fixes:

## **Manual testing steps**

1. Go to this page...
2.
3.

## **Screenshots/Recordings**

<!-- If applicable, add screenshots and/or recordings to visualize the
before and after of your change. -->

### **Before**

<!-- [screenshots/recordings] -->

### **After**

<!-- [screenshots/recordings] -->

## **Pre-merge author checklist**

- [x] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension Coding
Standards](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/CODING_GUIDELINES.md).
- [x] I've completed the PR template to the best of my ability
- [ ] I’ve included tests if applicable
- [ ] I’ve documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [x] I’ve applied the right labels on the PR (see [labeling
guidelines](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.

## **Pre-merge reviewer checklist**

- [ ] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed).
- [ ] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.
---
 ui/ducks/bridge/utils.ts | 27 +++++++++++++++++++++++----
 1 file changed, 23 insertions(+), 4 deletions(-)

diff --git a/ui/ducks/bridge/utils.ts b/ui/ducks/bridge/utils.ts
index 638ba92e9ae8..a563b5af2c73 100644
--- a/ui/ducks/bridge/utils.ts
+++ b/ui/ducks/bridge/utils.ts
@@ -12,6 +12,26 @@ import { TxData } from '../../pages/bridge/types';
 import { getTransaction1559GasFeeEstimates } from '../../pages/swaps/swaps.util';
 import { fetchTokenExchangeRates as fetchTokenExchangeRatesUtil } from '../../helpers/utils/util';
 
+type GasFeeEstimate = {
+  suggestedMaxPriorityFeePerGas: string;
+  suggestedMaxFeePerGas: string;
+  minWaitTimeEstimate: number;
+  maxWaitTimeEstimate: number;
+};
+
+type NetworkGasFeeEstimates = {
+  low: GasFeeEstimate;
+  medium: GasFeeEstimate;
+  high: GasFeeEstimate;
+  estimatedBaseFee: string;
+  historicalBaseFeeRange: [string, string];
+  baseFeeTrend: 'up' | 'down';
+  latestPriorityFeeRange: [string, string];
+  historicalPriorityFeeRange: [string, string];
+  priorityFeeTrend: 'up' | 'down';
+  networkCongestion: number;
+};
+
 // We don't need to use gas multipliers here because the gasLimit from Bridge API already included it
 export const getHexMaxGasLimit = (gasLimit: number) => {
   return new Numeric(
@@ -26,14 +46,13 @@ export const getTxGasEstimates = async ({
   hexChainId,
 }: {
   networkAndAccountSupports1559: boolean;
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  networkGasFeeEstimates: any;
+  networkGasFeeEstimates: NetworkGasFeeEstimates;
   txParams: TxData;
   hexChainId: Hex;
 }) => {
   if (networkAndAccountSupports1559) {
-    const { estimatedBaseFeeGwei = '0' } = networkGasFeeEstimates;
-    const hexEstimatedBaseFee = decGWEIToHexWEI(estimatedBaseFeeGwei) as Hex;
+    const { estimatedBaseFee = '0' } = networkGasFeeEstimates;
+    const hexEstimatedBaseFee = decGWEIToHexWEI(estimatedBaseFee) as Hex;
     const txGasFeeEstimates = await getTransaction1559GasFeeEstimates(
       {
         ...txParams,

From 67d1a12386723f7dbc449b18836cfee22eb1dbcb Mon Sep 17 00:00:00 2001
From: seaona <54408225+seaona@users.noreply.github.com>
Date: Mon, 16 Dec 2024 18:04:09 +0100
Subject: [PATCH 138/175] test: [POM] Basic functionality spec migration
 (#29229)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<!--
Please submit this PR as a draft initially.
Do not mark it as "Ready for review" until the template has been
completely filled out, and PR status checks have passed at least once.
-->

## **Description**

- Migrates `test/e2e/tests/privacy/basic-functionality.spec.ts` to POM
and ts
- Updates classes to accommodate more methods needed for the spec above

[![Open in GitHub
Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/29229?quickstart=1)

## **Related issues**

Fixes: https://github.com/MetaMask/metamask-extension/issues/29230

## **Manual testing steps**

1. Check ci passes
2. Run manually ` yarn test:e2e:single
test/e2e/tests/privacy/basic-functionality.spec.ts --browser=chrome
--leave-running=true`

## **Screenshots/Recordings**

<!-- If applicable, add screenshots and/or recordings to visualize the
before and after of your change. -->

### **Before**

<!-- [screenshots/recordings] -->

### **After**

<!-- [screenshots/recordings] -->

## **Pre-merge author checklist**

- [x] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension Coding
Standards](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/CODING_GUIDELINES.md).
- [x] I've completed the PR template to the best of my ability
- [x] I’ve included tests if applicable
- [x] I’ve documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [x] I’ve applied the right labels on the PR (see [labeling
guidelines](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.

## **Pre-merge reviewer checklist**

- [ ] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed).
- [ ] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.
---
 .../pages/dialog/select-network.ts            |   1 +
 test/e2e/page-objects/pages/home/homepage.ts  |  10 +
 .../tests/privacy/basic-functionality.spec.js | 176 ------------------
 .../tests/privacy/basic-functionality.spec.ts | 120 ++++++++++++
 4 files changed, 131 insertions(+), 176 deletions(-)
 delete mode 100644 test/e2e/tests/privacy/basic-functionality.spec.js
 create mode 100644 test/e2e/tests/privacy/basic-functionality.spec.ts

diff --git a/test/e2e/page-objects/pages/dialog/select-network.ts b/test/e2e/page-objects/pages/dialog/select-network.ts
index bc20c42855ae..914684c6a240 100644
--- a/test/e2e/page-objects/pages/dialog/select-network.ts
+++ b/test/e2e/page-objects/pages/dialog/select-network.ts
@@ -86,6 +86,7 @@ class SelectNetwork {
     console.log(`Click ${networkName}`);
     const networkNameItem = `[data-testid="${networkName}"]`;
     await this.driver.clickElementAndWaitToDisappear(networkNameItem);
+    await this.driver.assertElementNotPresent('.loading-overlay');
   }
 
   async selectRPC(rpcName: string): Promise<void> {
diff --git a/test/e2e/page-objects/pages/home/homepage.ts b/test/e2e/page-objects/pages/home/homepage.ts
index 6b6197eed797..8240e51f736c 100644
--- a/test/e2e/page-objects/pages/home/homepage.ts
+++ b/test/e2e/page-objects/pages/home/homepage.ts
@@ -23,12 +23,16 @@ class HomePage {
     tag: 'h6',
   };
 
+  private readonly erc20TokenDropdown = '[data-testid="import-token-button"]';
+
   private readonly nftTab = '[data-testid="account-overview__nfts-tab"]';
 
   private readonly popoverBackground = '.popover-bg';
 
   private readonly popoverCloseButton = '[data-testid="popover-close"]';
 
+  private readonly refreshErc20Tokens = '[data-testid="refreshList"]';
+
   private readonly sendButton = '[data-testid="eth-overview-send"]';
 
   private readonly tokensTab = '[data-testid="account-overview__asset-tab"]';
@@ -79,6 +83,12 @@ class HomePage {
     await this.driver.clickElement(this.nftTab);
   }
 
+  async refreshErc20TokenList(): Promise<void> {
+    console.log(`Refresh the ERC20 token list`);
+    await this.driver.clickElement(this.erc20TokenDropdown);
+    await this.driver.clickElement(this.refreshErc20Tokens);
+  }
+
   async startSendFlow(): Promise<void> {
     await this.driver.clickElement(this.sendButton);
   }
diff --git a/test/e2e/tests/privacy/basic-functionality.spec.js b/test/e2e/tests/privacy/basic-functionality.spec.js
deleted file mode 100644
index 77e9dad0b46f..000000000000
--- a/test/e2e/tests/privacy/basic-functionality.spec.js
+++ /dev/null
@@ -1,176 +0,0 @@
-const { strict: assert } = require('assert');
-const { defaultGanacheOptions, withFixtures } = require('../../helpers');
-const { METAMASK_STALELIST_URL } = require('../phishing-controller/helpers');
-const FixtureBuilder = require('../../fixture-builder');
-const {
-  importSRPOnboardingFlow,
-} = require('../../page-objects/flows/onboarding.flow');
-
-async function mockApis(mockServer) {
-  return [
-    await mockServer.forGet(METAMASK_STALELIST_URL).thenCallback(() => {
-      return {
-        statusCode: 200,
-        body: [{ fakedata: true }],
-      };
-    }),
-    await mockServer
-      .forGet('https://token.api.cx.metamask.io/tokens/1')
-      .thenCallback(() => {
-        return {
-          statusCode: 200,
-          body: [{ fakedata: true }],
-        };
-      }),
-    await mockServer
-      .forGet('https://min-api.cryptocompare.com/data/pricemulti')
-      .withQuery({ fsyms: 'ETH', tsyms: 'usd' })
-      .thenCallback(() => {
-        return {
-          statusCode: 200,
-          json: {
-            fakedata: 0,
-          },
-        };
-      }),
-  ];
-}
-
-describe('MetaMask onboarding @no-mmi', function () {
-  it('should prevent network requests to basic functionality endpoints when the basic functionality toggle is off', async function () {
-    await withFixtures(
-      {
-        fixtures: new FixtureBuilder({ onboarding: true }).build(),
-        ganacheOptions: defaultGanacheOptions,
-        title: this.test.fullTitle(),
-        testSpecificMock: mockApis,
-      },
-      async ({ driver, mockedEndpoint: mockedEndpoints }) => {
-        await importSRPOnboardingFlow({ driver });
-
-        await driver.clickElement({
-          text: 'Manage default privacy settings',
-          tag: 'button',
-        });
-        await driver.clickElement('[data-testid="category-item-General"]');
-
-        await driver.clickElement(
-          '[data-testid="basic-functionality-toggle"] .toggle-button',
-        );
-
-        await driver.clickElement('[id="basic-configuration-checkbox"]');
-        await driver.clickElement({ text: 'Turn off', tag: 'button' });
-        await driver.clickElement('[data-testid="category-back-button"]');
-        await driver.clickElement('[data-testid="category-item-Assets"]');
-        await driver.clickElement(
-          '[data-testid="currency-rate-check-toggle"] .toggle-button',
-        );
-        await driver.clickElement('[data-testid="category-back-button"]');
-
-        // Wait until the onboarding carousel has stopped moving
-        // otherwise the click has no effect.
-        await driver.waitForElementToStopMoving(
-          '[data-testid="privacy-settings-back-button"]',
-        );
-        await driver.clickElement(
-          '[data-testid="privacy-settings-back-button"]',
-        );
-
-        await driver.clickElementAndWaitToDisappear({
-          text: 'Done',
-          tag: 'button',
-        });
-        await driver.clickElement({
-          text: 'Next',
-          tag: 'button',
-        });
-
-        // Wait until the onboarding carousel has stopped moving
-        // otherwise the click has no effect.
-        await driver.waitForElementToStopMoving({
-          text: 'Done',
-          tag: 'button',
-        });
-        await driver.clickElementAndWaitToDisappear({
-          text: 'Done',
-          tag: 'button',
-        });
-
-        await driver.clickElement('[data-testid="network-display"]');
-
-        await driver.clickElement({ text: 'Ethereum Mainnet', tag: 'p' });
-
-        // Wait until network is fully switched and refresh tokens before asserting to mitigate flakiness
-        await driver.assertElementNotPresent('.loading-overlay');
-        await driver.clickElement(`[data-testid="import-token-button"]`);
-        await driver.clickElement('[data-testid="refreshList"]');
-
-        for (let i = 0; i < mockedEndpoints.length; i += 1) {
-          const requests = await mockedEndpoints[i].getSeenRequests();
-
-          assert.equal(
-            requests.length,
-            0,
-            `${mockedEndpoints[i]} should make requests after onboarding`,
-          );
-        }
-      },
-    );
-  });
-
-  it('should not prevent network requests to basic functionality endpoints when the basic functionality toggle is on', async function () {
-    await withFixtures(
-      {
-        fixtures: new FixtureBuilder({ onboarding: true }).build(),
-        ganacheOptions: defaultGanacheOptions,
-        title: this.test.fullTitle(),
-        testSpecificMock: mockApis,
-      },
-      async ({ driver, mockedEndpoint: mockedEndpoints }) => {
-        await importSRPOnboardingFlow({ driver });
-
-        await driver.clickElement({
-          text: 'Manage default privacy settings',
-          tag: 'button',
-        });
-        await driver.clickElement('[data-testid="category-item-General"]');
-        // Wait until the onboarding carousel has stopped moving
-        // otherwise the click has no effect.
-        await driver.waitForElementToStopMoving(
-          '[data-testid="category-back-button"]',
-        );
-        await driver.clickElement('[data-testid="category-back-button"]');
-        // Wait until the onboarding carousel has stopped moving
-        // otherwise the click has no effect.
-        await driver.waitForElementToStopMoving(
-          '[data-testid="privacy-settings-back-button"]',
-        );
-        await driver.clickElement(
-          '[data-testid="privacy-settings-back-button"]',
-        );
-        await driver.clickElement({ text: 'Done', tag: 'button' });
-        await driver.clickElement('[data-testid="pin-extension-next"]');
-        await driver.clickElement({ text: 'Done', tag: 'button' });
-
-        await driver.clickElement('[data-testid="network-display"]');
-
-        await driver.clickElement({ text: 'Ethereum Mainnet', tag: 'p' });
-
-        // Wait until network is fully switched and refresh tokens before asserting to mitigate flakiness
-        await driver.assertElementNotPresent('.loading-overlay');
-        await driver.clickElement(`[data-testid="import-token-button"]`);
-        await driver.clickElement('[data-testid="refreshList"]');
-        // intended delay to allow for network requests to complete
-        await driver.delay(1000);
-        for (let i = 0; i < mockedEndpoints.length; i += 1) {
-          const requests = await mockedEndpoints[i].getSeenRequests();
-          assert.equal(
-            requests.length,
-            1,
-            `${mockedEndpoints[i]} should make requests after onboarding`,
-          );
-        }
-      },
-    );
-  });
-});
diff --git a/test/e2e/tests/privacy/basic-functionality.spec.ts b/test/e2e/tests/privacy/basic-functionality.spec.ts
new file mode 100644
index 000000000000..3d438f8d3474
--- /dev/null
+++ b/test/e2e/tests/privacy/basic-functionality.spec.ts
@@ -0,0 +1,120 @@
+import { strict as assert } from 'assert';
+import { Mockttp } from 'mockttp';
+import { defaultGanacheOptions, withFixtures } from '../../helpers';
+import { METAMASK_STALELIST_URL } from '../phishing-controller/helpers';
+import FixtureBuilder from '../../fixture-builder';
+import HomePage from '../../page-objects/pages/home/homepage';
+import OnboardingCompletePage from '../../page-objects/pages/onboarding/onboarding-complete-page';
+import OnboardingPrivacySettingsPage from '../../page-objects/pages/onboarding/onboarding-privacy-settings-page';
+import { switchToNetworkFlow } from '../../page-objects/flows/network.flow';
+import {
+  completeImportSRPOnboardingFlow,
+  importSRPOnboardingFlow,
+} from '../../page-objects/flows/onboarding.flow';
+
+async function mockApis(mockServer: Mockttp) {
+  return [
+    await mockServer.forGet(METAMASK_STALELIST_URL).thenCallback(() => {
+      return {
+        statusCode: 200,
+        json: [{ fakedata: true }],
+      };
+    }),
+    await mockServer
+      .forGet('https://token.api.cx.metamask.io/tokens/1')
+      .thenCallback(() => {
+        return {
+          statusCode: 200,
+          json: [{ fakedata: true }],
+        };
+      }),
+    await mockServer
+      .forGet('https://min-api.cryptocompare.com/data/pricemulti')
+      .withQuery({ fsyms: 'ETH', tsyms: 'usd' })
+      .thenCallback(() => {
+        return {
+          statusCode: 200,
+          json: {
+            fakedata: 0,
+          },
+        };
+      }),
+  ];
+}
+
+describe('MetaMask onboarding @no-mmi', function () {
+  it('should prevent network requests to basic functionality endpoints when the basic functionality toggle is off', async function () {
+    await withFixtures(
+      {
+        fixtures: new FixtureBuilder({ onboarding: true }).build(),
+        ganacheOptions: defaultGanacheOptions,
+        title: this.test?.fullTitle(),
+        testSpecificMock: mockApis,
+      },
+      async ({ driver, mockedEndpoint: mockedEndpoints }) => {
+        await importSRPOnboardingFlow({ driver });
+
+        const onboardingCompletePage = new OnboardingCompletePage(driver);
+        await onboardingCompletePage.check_pageIsLoaded();
+        await onboardingCompletePage.check_walletReadyMessageIsDisplayed();
+        await onboardingCompletePage.navigateToDefaultPrivacySettings();
+
+        const onboardingPrivacySettingsPage = new OnboardingPrivacySettingsPage(
+          driver,
+        );
+        await onboardingPrivacySettingsPage.toggleBasicFunctionalitySettings();
+        await onboardingPrivacySettingsPage.toggleAssetsSettings();
+        await onboardingPrivacySettingsPage.navigateBackToOnboardingCompletePage();
+
+        await onboardingCompletePage.check_pageIsLoaded();
+        await onboardingCompletePage.completeOnboarding();
+
+        const homePage = new HomePage(driver);
+        await homePage.check_pageIsLoaded();
+
+        await switchToNetworkFlow(driver, 'Ethereum Mainnet');
+        await homePage.refreshErc20TokenList();
+
+        for (const mockedEndpoint of mockedEndpoints) {
+          const requests = await mockedEndpoint.getSeenRequests();
+          assert.equal(
+            requests.length,
+            0,
+            `${mockedEndpoint} should make requests after onboarding`,
+          );
+        }
+      },
+    );
+  });
+
+  it('should not prevent network requests to basic functionality endpoints when the basic functionality toggle is on', async function () {
+    await withFixtures(
+      {
+        fixtures: new FixtureBuilder({ onboarding: true }).build(),
+        ganacheOptions: defaultGanacheOptions,
+        title: this.test?.fullTitle(),
+        testSpecificMock: mockApis,
+      },
+      async ({ driver, mockedEndpoint: mockedEndpoints }) => {
+        await completeImportSRPOnboardingFlow({ driver });
+
+        const homePage = new HomePage(driver);
+        await homePage.check_pageIsLoaded();
+
+        await switchToNetworkFlow(driver, 'Ethereum Mainnet');
+        await homePage.refreshErc20TokenList();
+
+        // intended delay to allow for network requests to complete
+        await driver.delay(1000);
+        for (const mockedEndpoint of mockedEndpoints) {
+          const requests = await mockedEndpoint.getSeenRequests();
+          assert.equal(
+            requests.length,
+            1,
+            `${mockedEndpoint} should make requests after onboarding`,
+          );
+        }
+      },
+    );
+  });
+});

From 149c7c9edf79e62a5003e494b721a873020e0e73 Mon Sep 17 00:00:00 2001
From: Frederik Bolding <frederik.bolding@gmail.com>
Date: Mon, 16 Dec 2024 18:07:50 +0100
Subject: [PATCH 139/175] fix: `FileInput` displaying wrong outside of `Field`
 (#29243)

<!--
Please submit this PR as a draft initially.
Do not mark it as "Ready for review" until the template has been
completely filled out, and PR status checks have passed at least once.
-->

## **Description**

The `FileInput` was broken outside of its use in `Field` due to the
mapping logic being flawed. This PR fixes this by correcting the mapper.
This issue way not was not caught due to the component not being E2E
tested outside a Field.

[![Open in GitHub
Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/29243?quickstart=1)


## **Manual testing steps**
```ts
import type { OnRpcRequestHandler } from '@metamask/snaps-sdk';
import {
  Box,
  Text,
  Bold,
  Input,
  Field,
  FileInput,
} from '@metamask/snaps-sdk/jsx';

/**
 * Handle incoming JSON-RPC requests, sent through `wallet_invokeSnap`.
 *
 * @param args - The request handler args as object.
 * @param args.origin - The origin of the request, e.g., the website that
 * invoked the snap.
 * @param args.request - A validated JSON-RPC request object.
 * @returns The result of `snap_dialog`.
 * @throws If the request method is not valid for this snap.
 */
export const onRpcRequest: OnRpcRequestHandler = async ({
  origin,
  request,
}) => {
  switch (request.method) {
    case 'hello':
      return snap.request({
        method: 'snap_dialog',
        params: {
          type: 'confirmation',
          content: (
            <Box>
              <Text>
                Hello, <Bold>{origin}</Bold>!
              </Text>
              <Text>
                This custom confirmation is just for display purposes.
              </Text>
              <Text>
                But you can edit the snap source code to make it do something,
                if you want to!
              </Text>
              <FileInput name="file-input" />
            </Box>
          ),
        },
      });
    default:
      throw new Error('Method not found.');
  }
};
```
---
 .../snaps/snap-ui-renderer/components/file-input.ts | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/ui/components/app/snaps/snap-ui-renderer/components/file-input.ts b/ui/components/app/snaps/snap-ui-renderer/components/file-input.ts
index edeba6d89551..8ea22787cfff 100644
--- a/ui/components/app/snaps/snap-ui-renderer/components/file-input.ts
+++ b/ui/components/app/snaps/snap-ui-renderer/components/file-input.ts
@@ -6,14 +6,11 @@ export const fileInput: UIComponentFactory<FileInputElement> = ({
   element,
   form,
 }) => ({
-  element: 'SnapUIInput',
+  element: 'SnapUIFileInput',
   props: {
-    element: 'SnapUIFileInput',
-    props: {
-      name: element.props.name,
-      accept: element.props.accept,
-      compact: element.props.compact,
-      form,
-    },
+    name: element.props.name,
+    accept: element.props.accept,
+    compact: element.props.compact,
+    form,
   },
 });

From 207245fb240ff41362bb90a9db83ca7faef1a2f7 Mon Sep 17 00:00:00 2001
From: Frederik Bolding <frederik.bolding@gmail.com>
Date: Mon, 16 Dec 2024 18:20:58 +0100
Subject: [PATCH 140/175] fix: Prevent loss of focus when using UI inputs
 without labels (#29238)

<!--
Please submit this PR as a draft initially.
Do not mark it as "Ready for review" until the template has been
completely filled out, and PR status checks have passed at least once.
-->

## **Description**

Prevents loss of focus when using UI inputs without labels due to the
layout of the children being different. This PR fixes it by using a
query selector instead of assuming the child to be a index 0.

[![Open in GitHub
Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/29238?quickstart=1)

## **Manual testing steps**

```ts
import type { OnRpcRequestHandler } from '@metamask/snaps-sdk';
import { Box, Text, Bold, Input, Field } from '@metamask/snaps-sdk/jsx';

/**
 * Handle incoming JSON-RPC requests, sent through `wallet_invokeSnap`.
 *
 * @param args - The request handler args as object.
 * @param args.origin - The origin of the request, e.g., the website that
 * invoked the snap.
 * @param args.request - A validated JSON-RPC request object.
 * @returns The result of `snap_dialog`.
 * @throws If the request method is not valid for this snap.
 */
export const onRpcRequest: OnRpcRequestHandler = async ({
  origin,
  request,
}) => {
  switch (request.method) {
    case 'hello':
      return snap.request({
        method: 'snap_dialog',
        params: {
          type: 'confirmation',
          content: (
            <Box>
              <Text>
                Hello, <Bold>{origin}</Bold>!
              </Text>
              <Text>
                This custom confirmation is just for display purposes.
              </Text>
              <Text>
                But you can edit the snap source code to make it do something,
                if you want to!
              </Text>
              <Field>
                <Input name="foo" />
              </Field>
            </Box>
          ),
        },
      });
    default:
      throw new Error('Method not found.');
  }
};

export const onUserInput = async ({ id, event }) => {
  await snap.request({
    method: 'snap_updateInterface',
    params: {
      id,
      ui: (
        <Box>
          <Text>Hello world!</Text>
          <Text>This custom confirmation is just for display purposes.</Text>
          <Text>
            But you can edit the snap source code to make it do something, if
            you want to!
          </Text>
          <Field>
            <Input name="foo" />
          </Field>
          <Text>{event.value ?? ''}</Text>
        </Box>
      ),
    },
  });
};

```
---
 ui/components/app/snaps/snap-ui-input/snap-ui-input.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ui/components/app/snaps/snap-ui-input/snap-ui-input.tsx b/ui/components/app/snaps/snap-ui-input/snap-ui-input.tsx
index 51c1c9a54a7a..469a8313f4a1 100644
--- a/ui/components/app/snaps/snap-ui-input/snap-ui-input.tsx
+++ b/ui/components/app/snaps/snap-ui-input/snap-ui-input.tsx
@@ -33,11 +33,11 @@ export const SnapUIInput: FunctionComponent<
 
   /*
    * Focus input if the last focused input was this input
-   * This avoids loosing the focus when the UI is re-rendered
+   * This avoids losing the focus when the UI is re-rendered
    */
   useEffect(() => {
     if (inputRef.current && name === focusedInput) {
-      (inputRef.current.children[0] as HTMLInputElement).focus();
+      (inputRef.current.querySelector('input') as HTMLInputElement).focus();
     }
   }, [inputRef]);
 

From 58ca7af401213bb35783f2c9cc4fae8a0fec69cf Mon Sep 17 00:00:00 2001
From: David Murdoch <187813+davidmurdoch@users.noreply.github.com>
Date: Mon, 16 Dec 2024 12:35:54 -0500
Subject: [PATCH 141/175] build(webpack): fix `--zip` in Node.js 22 by cloning
 assets into `Uint8Array`s before zipping (#29177)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Use a copy of the Buffer via `Buffer.from(asset)`, as Zip will *consume*
it, which breaks things if we are compiling for multiple browsers at
once. `Buffer.from` uses the internal pool, so it's superior to `new
Uint8Array` if we don't need to pass it off to a worker thread.

Additionally, in Node.js 22+ a Buffer marked as "Untransferable" (like
ours) can't be passed to a worker, which `AsyncZipDeflate` uses. See:
https://github.com/101arrowz/fflate/issues/227#issuecomment-2540024304

This can probably be simplified to `zipFile.push(Buffer.from(asset),
true);` if the above issue is resolved.

This fix should hopefully unblock
https://github.com/MetaMask/metamask-extension/pull/28368


<!--
Please submit this PR as a draft initially.
Do not mark it as "Ready for review" until the template has been
completely filled out, and PR status checks have passed at least once.


## **Description**

<!--
Write a short description of the changes included in this pull request,
also include relevant motivation and context. Have in mind the following
questions:
1. What is the reason for the change?
2. What is the improvement/solution?


[![Open in GitHub
Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/29177?quickstart=1)

## **Related issues**

Fixes:

## **Manual testing steps**

1. Go to this page...
2.
3.

## **Screenshots/Recordings**


### **Before**


### **After**


## **Pre-merge author checklist**

- [ ] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension Coding
Standards](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/CODING_GUIDELINES.md).
- [ ] I've completed the PR template to the best of my ability
- [ ] I’ve included tests if applicable
- [ ] I’ve documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [ ] I’ve applied the right labels on the PR (see [labeling
guidelines](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.

## **Pre-merge reviewer checklist**

- [ ] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed).
- [ ] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.

-->
---
 .../utils/plugins/ManifestPlugin/index.ts     | 35 +++++++++----------
 1 file changed, 17 insertions(+), 18 deletions(-)

diff --git a/development/webpack/utils/plugins/ManifestPlugin/index.ts b/development/webpack/utils/plugins/ManifestPlugin/index.ts
index bd18541cc1e3..a29219084de6 100644
--- a/development/webpack/utils/plugins/ManifestPlugin/index.ts
+++ b/development/webpack/utils/plugins/ManifestPlugin/index.ts
@@ -25,16 +25,6 @@ type Assets = Compilation['assets'];
 const NAME = 'ManifestPlugin';
 const BROWSER_TEMPLATE_RE = /\[browser\]/gu;
 
-/**
- * Clones a Buffer or Uint8Array and returns it
- *
- * @param data
- * @returns
- */
-function clone(data: Buffer | Uint8Array): Buffer {
-  return Buffer.from(data);
-}
-
 /**
  * Adds the given asset to the zip file
  *
@@ -54,12 +44,23 @@ function addAssetToZip(
   zip: Zip,
 ): void {
   const zipFile = compress
-    ? new AsyncZipDeflate(assetName, compressionOptions)
-    : new ZipPassThrough(assetName);
+    ? // AsyncZipDeflate uses workers
+      new AsyncZipDeflate(assetName, compressionOptions)
+    : // ZipPassThrough doesn't use workers
+      new ZipPassThrough(assetName);
   zipFile.mtime = mtime;
   zip.add(zipFile);
-  // use a copy of the Buffer, as Zip will consume it
-  zipFile.push(asset, true);
+  // Use a copy of the Buffer via `Buffer.from(asset)`, as Zip will *consume*
+  // it, which breaks things if we are compiling for multiple browsers at once.
+  // `Buffer.from` uses the internal pool, so it's superior to `new Uint8Array`
+  // if we don't need to pass it off to a worker thread.
+  //
+  // Additionally, in Node.js 22+ a Buffer marked as "Untransferable" (like
+  // ours) can't be passed to a worker, which `AsyncZipDeflate` uses.
+  // See: https://github.com/101arrowz/fflate/issues/227#issuecomment-2540024304
+  // this can probably be simplified to `zipFile.push(Buffer.from(asset), true);`
+  // if the above issue is resolved.
+  zipFile.push(compress ? new Uint8Array(asset) : Buffer.from(asset), true);
 }
 
 /**
@@ -145,7 +146,7 @@ export class ManifestPlugin<Z extends boolean> {
             errored = true;
             reject(error);
           } else {
-            zipSource.add(new RawSource(clone(data)));
+            zipSource.add(new RawSource(Buffer.from(data)));
             // we've received our final bit of data, return the zipSource
             if (final) resolve(zipSource);
           }
@@ -171,9 +172,7 @@ export class ManifestPlugin<Z extends boolean> {
           if (excludeExtensions.includes(extName)) continue;
 
           addAssetToZip(
-            // make a copy of the asset Buffer as Zipping will *consume* it,
-            // which breaks things if we are compiling for multiple browsers.
-            clone(asset.buffer()),
+            asset.buffer(),
             assetName,
             ManifestPlugin.compressibleFileTypes.has(extName),
             compressionOptions,

From f59ba9a9ac0ec287378edba448952701ea04c1b1 Mon Sep 17 00:00:00 2001
From: Salim TOUBAL <salim.toubal@outlook.com>
Date: Mon, 16 Dec 2024 21:43:28 +0100
Subject: [PATCH 142/175] fix: Add migration to remove tokens with null
 decimals and log affected tokens (#29245)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<!--
Please submit this PR as a draft initially.
Do not mark it as "Ready for review" until the template has been
completely filled out, and PR status checks have passed at least once.
-->

## **Description**

This PR introduces a new migration (version 135) to remove tokens with
decimals === null from the following properties within the
TokensController state:

- `allTokens`
- `allDetectedTokens`
- `tokens`
- `detectedTokens`

Additionally, it logs the addresses of the affected tokens using
global.sentry?.captureMessage before removing them from the state.

<!--
Write a short description of the changes included in this pull request,
also include relevant motivation and context. Have in mind the following
questions:
1. What is the reason for the change?
2. What is the improvement/solution?
-->

[![Open in GitHub
Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/29245?quickstart=1)

## **Related issues**

Fixes:

## **Manual testing steps**

1. mock tokens on the state and set decimals to null on the main branch
2. switch branch , the token should be hidden

## **Screenshots/Recordings**

<!-- If applicable, add screenshots and/or recordings to visualize the
before and after of your change. -->

### **Before**

<!-- [screenshots/recordings] -->

### **After**

<!-- [screenshots/recordings] -->

## **Pre-merge author checklist**

- [x] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension Coding
Standards](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/CODING_GUIDELINES.md).
- [x] I've completed the PR template to the best of my ability
- [x] I’ve included tests if applicable
- [x] I’ve documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [x] I’ve applied the right labels on the PR (see [labeling
guidelines](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.

## **Pre-merge reviewer checklist**

- [ ] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed).
- [ ] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.
---
 app/scripts/migrations/133.1.test.ts | 224 +++++++++++++++++++++++++++
 app/scripts/migrations/133.1.ts      | 187 ++++++++++++++++++++++
 app/scripts/migrations/index.js      |   1 +
 3 files changed, 412 insertions(+)
 create mode 100644 app/scripts/migrations/133.1.test.ts
 create mode 100644 app/scripts/migrations/133.1.ts

diff --git a/app/scripts/migrations/133.1.test.ts b/app/scripts/migrations/133.1.test.ts
new file mode 100644
index 000000000000..4f1979f31a97
--- /dev/null
+++ b/app/scripts/migrations/133.1.test.ts
@@ -0,0 +1,224 @@
+import { cloneDeep } from 'lodash';
+import { TokensControllerState } from '@metamask/assets-controllers';
+import { migrate, version } from './133.1';
+
+const sentryCaptureExceptionMock = jest.fn();
+const sentryCaptureMessageMock = jest.fn();
+
+global.sentry = {
+  captureException: sentryCaptureExceptionMock,
+  captureMessage: sentryCaptureMessageMock,
+};
+
+const oldVersion = 133;
+
+const mockStateWithNullDecimals = {
+  meta: { version: oldVersion },
+  data: {
+    TokensController: {
+      allTokens: {
+        '0x1': {
+          '0x123': [
+            { address: '0x1', symbol: 'TOKEN1', decimals: null },
+            { address: '0x2', symbol: 'TOKEN2', decimals: 18 },
+          ],
+        },
+      },
+      allDetectedTokens: {
+        '0x1': {
+          '0x123': [
+            { address: '0x5', symbol: 'TOKEN5', decimals: null },
+            { address: '0x6', symbol: 'TOKEN6', decimals: 6 },
+          ],
+        },
+      },
+      tokens: [
+        { address: '0x7', symbol: 'TOKEN7', decimals: null },
+        { address: '0x8', symbol: 'TOKEN8', decimals: 18 },
+      ],
+      detectedTokens: [
+        { address: '0x9', symbol: 'TOKEN9', decimals: null },
+        { address: '0xA', symbol: 'TOKEN10', decimals: 6 },
+      ],
+    },
+  },
+};
+
+describe(`migration #${version}`, () => {
+  afterEach(() => jest.resetAllMocks());
+
+  it('updates the version metadata', async () => {
+    const oldStorage = cloneDeep(mockStateWithNullDecimals);
+
+    const newStorage = await migrate(oldStorage);
+
+    expect(newStorage.meta).toStrictEqual({ version });
+  });
+
+  it('removes tokens with null decimals from allTokens', async () => {
+    const oldStorage = cloneDeep(mockStateWithNullDecimals);
+
+    const newStorage = await migrate(oldStorage);
+
+    const tokensControllerState = newStorage.data
+      .TokensController as TokensControllerState;
+    const { allTokens } = tokensControllerState;
+
+    expect(allTokens).toEqual({
+      '0x1': {
+        '0x123': [{ address: '0x2', symbol: 'TOKEN2', decimals: 18 }],
+      },
+    });
+  });
+
+  it('removes tokens with null decimals from allDetectedTokens', async () => {
+    const oldStorage = cloneDeep(mockStateWithNullDecimals);
+
+    const newStorage = await migrate(oldStorage);
+
+    const tokensControllerState = newStorage.data
+      .TokensController as TokensControllerState;
+    const { allDetectedTokens } = tokensControllerState;
+
+    expect(allDetectedTokens).toEqual({
+      '0x1': {
+        '0x123': [{ address: '0x6', symbol: 'TOKEN6', decimals: 6 }],
+      },
+    });
+  });
+
+  it('removes tokens with null decimals from tokens array', async () => {
+    const oldStorage = cloneDeep(mockStateWithNullDecimals);
+
+    const newStorage = await migrate(oldStorage);
+
+    const tokensControllerState = newStorage.data
+      .TokensController as TokensControllerState;
+    const { tokens } = tokensControllerState;
+
+    expect(tokens).toEqual([
+      { address: '0x8', symbol: 'TOKEN8', decimals: 18 },
+    ]);
+  });
+
+  it('removes tokens with null decimals from detectedTokens array', async () => {
+    const oldStorage = cloneDeep(mockStateWithNullDecimals);
+
+    const newStorage = await migrate(oldStorage);
+
+    const tokensControllerState = newStorage.data
+      .TokensController as TokensControllerState;
+    const { detectedTokens } = tokensControllerState;
+
+    expect(detectedTokens).toEqual([
+      { address: '0xA', symbol: 'TOKEN10', decimals: 6 },
+    ]);
+  });
+
+  it('logs tokens with null decimals before removing them', async () => {
+    const oldStorage = cloneDeep(mockStateWithNullDecimals);
+
+    await migrate(oldStorage);
+
+    expect(sentryCaptureMessageMock).toHaveBeenCalledTimes(4);
+    expect(sentryCaptureMessageMock).toHaveBeenCalledWith(
+      `Migration ${version}: Removed token with decimals === null in allTokens. Address: 0x1`,
+    );
+    expect(sentryCaptureMessageMock).toHaveBeenCalledWith(
+      `Migration ${version}: Removed token with decimals === null in allDetectedTokens. Address: 0x5`,
+    );
+    expect(sentryCaptureMessageMock).toHaveBeenCalledWith(
+      `Migration ${version}: Removed token with decimals === null in tokens. Address: 0x7`,
+    );
+    expect(sentryCaptureMessageMock).toHaveBeenCalledWith(
+      `Migration ${version}: Removed token with decimals === null in detectedTokens. Address: 0x9`,
+    );
+  });
+
+  it('does nothing if all tokens have valid decimals', async () => {
+    const validState = {
+      meta: { version: oldVersion },
+      data: {
+        TokensController: {
+          allTokens: {
+            '0x1': {
+              '0x123': [{ address: '0x2', symbol: 'TOKEN2', decimals: 18 }],
+            },
+          },
+          allDetectedTokens: {
+            '0x1': {
+              '0x123': [{ address: '0x6', symbol: 'TOKEN6', decimals: 6 }],
+            },
+          },
+          tokens: [{ address: '0x8', symbol: 'TOKEN8', decimals: 18 }],
+          detectedTokens: [{ address: '0xA', symbol: 'TOKEN10', decimals: 6 }],
+        },
+      },
+    };
+
+    const oldStorage = cloneDeep(validState);
+    const newStorage = await migrate(oldStorage);
+
+    expect(newStorage.data).toStrictEqual(oldStorage.data);
+    expect(sentryCaptureMessageMock).not.toHaveBeenCalled();
+  });
+
+  it('does nothing if TokensController is missing', async () => {
+    const oldStorage = {
+      meta: { version: oldVersion },
+      data: {},
+    };
+
+    const newStorage = await migrate(cloneDeep(oldStorage));
+
+    expect(newStorage.data).toStrictEqual(oldStorage.data);
+    expect(sentryCaptureMessageMock).not.toHaveBeenCalled();
+  });
+
+  const invalidState = [
+    {
+      errorMessage: `Migration ${version}: Invalid allTokens state of type 'string'`,
+      label: 'Invalid allTokens',
+      state: { TokensController: { allTokens: 'invalid' } },
+    },
+    {
+      errorMessage: `Migration ${version}: Invalid allDetectedTokens state of type 'string'`,
+      label: 'Invalid allDetectedTokens',
+      state: { TokensController: { allDetectedTokens: 'invalid' } },
+    },
+    {
+      errorMessage: `Migration ${version}: Invalid tokens state of type 'string'`,
+      label: 'Invalid tokens',
+      state: { TokensController: { tokens: 'invalid' } },
+    },
+    {
+      errorMessage: `Migration ${version}: Invalid detectedTokens state of type 'string'`,
+      label: 'Invalid detectedTokens',
+      state: { TokensController: { detectedTokens: 'invalid' } },
+    },
+  ];
+
+  // @ts-expect-error 'each' function is not recognized by TypeScript types
+  it.each(invalidState)(
+    'captures error when state is invalid due to: $label',
+    async ({
+      errorMessage,
+      state,
+    }: {
+      errorMessage: string;
+      state: Record<string, unknown>;
+    }) => {
+      const oldStorage = {
+        meta: { version: oldVersion },
+        data: state,
+      };
+
+      const newStorage = await migrate(cloneDeep(oldStorage));
+
+      expect(sentryCaptureExceptionMock).toHaveBeenCalledWith(
+        new Error(errorMessage),
+      );
+      expect(newStorage.data).toStrictEqual(oldStorage.data);
+    },
+  );
+});
diff --git a/app/scripts/migrations/133.1.ts b/app/scripts/migrations/133.1.ts
new file mode 100644
index 000000000000..c59b5c0cfed5
--- /dev/null
+++ b/app/scripts/migrations/133.1.ts
@@ -0,0 +1,187 @@
+import { hasProperty, isObject } from '@metamask/utils';
+import { cloneDeep } from 'lodash';
+
+type VersionedData = {
+  meta: { version: number };
+  data: Record<string, unknown>;
+};
+
+export const version = 133.1;
+
+/**
+ * Removes tokens with `decimals === null` from `allTokens`, `allDetectedTokens`, `tokens`, and `detectedTokens`.
+ * Captures exceptions for invalid states using Sentry and logs tokens with `decimals === null`.
+ *
+ * @param originalVersionedData - Versioned MetaMask extension state, exactly
+ * what we persist to disk.
+ * @returns Updated versioned MetaMask extension state.
+ */
+export async function migrate(
+  originalVersionedData: VersionedData,
+): Promise<VersionedData> {
+  const versionedData = cloneDeep(originalVersionedData);
+  versionedData.meta.version = version;
+  transformState(versionedData.data);
+  return versionedData;
+}
+
+/**
+ * Transforms the TokensController state to remove tokens with `decimals === null`.
+ *
+ * @param state - The persisted MetaMask state.
+ */
+function transformState(state: Record<string, unknown>): void {
+  if (!hasProperty(state, 'TokensController')) {
+    return;
+  }
+
+  const tokensControllerState = state.TokensController;
+
+  if (!isObject(tokensControllerState)) {
+    global.sentry?.captureException(
+      new Error(
+        `Migration ${version}: Invalid TokensController state of type '${typeof tokensControllerState}'`,
+      ),
+    );
+    return;
+  }
+
+  // Validate and transform `allTokens`
+  if (hasProperty(tokensControllerState, 'allTokens')) {
+    if (isObject(tokensControllerState.allTokens)) {
+      tokensControllerState.allTokens = transformTokenCollection(
+        tokensControllerState.allTokens,
+        'allTokens',
+      );
+    } else {
+      global.sentry?.captureException(
+        new Error(
+          `Migration ${version}: Invalid allTokens state of type '${typeof tokensControllerState.allTokens}'`,
+        ),
+      );
+    }
+  }
+
+  // Validate and transform `allDetectedTokens`
+  if (hasProperty(tokensControllerState, 'allDetectedTokens')) {
+    if (isObject(tokensControllerState.allDetectedTokens)) {
+      tokensControllerState.allDetectedTokens = transformTokenCollection(
+        tokensControllerState.allDetectedTokens,
+        'allDetectedTokens',
+      );
+    } else {
+      global.sentry?.captureException(
+        new Error(
+          `Migration ${version}: Invalid allDetectedTokens state of type '${typeof tokensControllerState.allDetectedTokens}'`,
+        ),
+      );
+    }
+  }
+
+  // Transform `tokens` array
+  if (
+    hasProperty(tokensControllerState, 'tokens') &&
+    Array.isArray(tokensControllerState.tokens)
+  ) {
+    tokensControllerState.tokens = tokensControllerState.tokens.filter(
+      (token) => {
+        if (
+          isObject(token) &&
+          hasProperty(token, 'decimals') &&
+          token.decimals === null &&
+          hasProperty(token, 'address')
+        ) {
+          global.sentry?.captureMessage(
+            `Migration ${version}: Removed token with decimals === null in tokens. Address: ${token.address}`,
+          );
+          return false;
+        }
+        return true;
+      },
+    );
+  } else if (hasProperty(tokensControllerState, 'tokens')) {
+    global.sentry?.captureException(
+      new Error(
+        `Migration ${version}: Invalid tokens state of type '${typeof tokensControllerState.tokens}'`,
+      ),
+    );
+  }
+
+  // Transform `detectedTokens` array
+  if (
+    hasProperty(tokensControllerState, 'detectedTokens') &&
+    Array.isArray(tokensControllerState.detectedTokens)
+  ) {
+    tokensControllerState.detectedTokens =
+      tokensControllerState.detectedTokens.filter((token) => {
+        if (
+          isObject(token) &&
+          hasProperty(token, 'decimals') &&
+          token.decimals === null &&
+          hasProperty(token, 'address')
+        ) {
+          global.sentry?.captureMessage(
+            `Migration ${version}: Removed token with decimals === null in detectedTokens. Address: ${token.address}`,
+          );
+          return false;
+        }
+        return true;
+      });
+  } else if (hasProperty(tokensControllerState, 'detectedTokens')) {
+    global.sentry?.captureException(
+      new Error(
+        `Migration ${version}: Invalid detectedTokens state of type '${typeof tokensControllerState.detectedTokens}'`,
+      ),
+    );
+  }
+}
+
+/**
+ * Removes tokens with `decimals === null` from a token collection and logs their addresses.
+ *
+ * @param tokenCollection - The token collection to transform.
+ * @param propertyName - The name of the property being transformed (for logging purposes).
+ * @returns The updated token collection.
+ */
+function transformTokenCollection(
+  tokenCollection: Record<string, unknown>,
+  propertyName: string,
+) {
+  const updatedState: Record<string, unknown> = {};
+
+  for (const [chainId, accounts] of Object.entries(tokenCollection)) {
+    if (isObject(accounts)) {
+      const updatedTokensAccounts: Record<string, unknown[]> = {};
+
+      for (const [account, tokens] of Object.entries(accounts)) {
+        if (Array.isArray(tokens)) {
+          // Filter tokens and log those with `decimals === null`
+          const filteredTokens = tokens.filter((token) => {
+            if (
+              isObject(token) &&
+              hasProperty(token, 'decimals') &&
+              token.decimals === null &&
+              hasProperty(token, 'address')
+            ) {
+              global.sentry?.captureMessage(
+                `Migration ${version}: Removed token with decimals === null in ${propertyName}. Address: ${token.address}`,
+              );
+              return false; // Exclude token
+            }
+            return (
+              isObject(token) &&
+              hasProperty(token, 'decimals') &&
+              token.decimals !== null
+            );
+          });
+
+          updatedTokensAccounts[account] = filteredTokens;
+        }
+      }
+
+      updatedState[chainId] = updatedTokensAccounts;
+    }
+  }
+
+  return updatedState;
+}
diff --git a/app/scripts/migrations/index.js b/app/scripts/migrations/index.js
index 5efa3807c68f..6673d1e62d2f 100644
--- a/app/scripts/migrations/index.js
+++ b/app/scripts/migrations/index.js
@@ -155,6 +155,7 @@ const migrations = [
   require('./131.1'),
   require('./132'),
   require('./133'),
+  require('./133.1'),
   require('./134'),
 ];
 

From edd7b25ba7b912768341b6f34c369b1ca409b1c4 Mon Sep 17 00:00:00 2001
From: micaelae <100321200+micaelae@users.noreply.github.com>
Date: Mon, 16 Dec 2024 14:06:48 -0800
Subject: [PATCH 143/175] feat: cross-chain swaps ui re-design (#28373)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<!--
Please submit this PR as a draft initially.
Do not mark it as "Ready for review" until the template has been
completely filled out, and PR status checks have passed at least once.
-->

## **Description**
Changes include
- layout and styling updates for the landing screen
- re-styling input fields, including asset pickers
- integrates the multichain asset list into bridge's token list
generator
- style + copy updates in quote display components
- advanced settings modal
- input and quote validation alerts
- bug fixes

This depends on 3 open PRs
1. tracking events:
https://github.com/MetaMask/metamask-extension/pull/28713
2. multichain AssetPicker:
https://github.com/MetaMask/metamask-extension/pull/28975
3. NetworkAvatar style update:
https://github.com/MetaMask/metamask-extension/pull/28976

Changes from #2 and #3 are currently included here, but will mainly just
contain bridge component updates after those are merged. Since those are
being reviewed by external teams, reviews on this one should be focused
on bridge-specific files/directories

Figma:
https://www.figma.com/design/IuOIRmU3wI0IdJIfol0ESu/Cross-Chain-Swaps?node-id=7-24563&node-type=canvas&m=dev

<!--
Write a short description of the changes included in this pull request,
also include relevant motivation and context. Have in mind the following
questions:
1. What is the reason for the change?
2. What is the improvement/solution?
-->

[![Open in GitHub
Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/28373?quickstart=1)

## **Related issues**

Fixes: https://consensyssoftware.atlassian.net/browse/MMS-1451

## **Manual testing steps**

1. Set these in .metamaskrc and run `yarn webpack --watch`
```
SEGMENT_HOST='http://localhost:9090'
SEGMENT_WRITE_KEY='FAKE'
BRIDGE_USE_DEV_APIS=1
```
2. Try out the Bridge page, asset picker, submitting txs, viewing quotes
etc
3. Open the background console network tab to see emitted events

## **Screenshots/Recordings**

<!-- If applicable, add screenshots and/or recordings to visualize the
before and after of your change. -->

### **Before**

<!-- [screenshots/recordings] -->
![Screenshot 2024-12-11 at 3 02
20 PM](https://github.com/user-attachments/assets/826f7cba-202d-4a52-b15f-ca16c29d7a96)


### **After**

<!-- [screenshots/recordings] -->

## **Pre-merge author checklist**

- [X] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension Coding
Standards](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/CODING_GUIDELINES.md).
- [X] I've completed the PR template to the best of my ability
- [X] I’ve included tests if applicable
- [X] I’ve documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [X] I’ve applied the right labels on the PR (see [labeling
guidelines](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.

## **Pre-merge reviewer checklist**

- [ ] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed).
- [ ] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.

---------

Co-authored-by: infiniteflower <139582705+infiniteflower@users.noreply.github.com>
Co-authored-by: Jack Clancy <jack.clancy93@gmail.com>
---
 app/_locales/de/messages.json                 |  12 -
 app/_locales/el/messages.json                 |  12 -
 app/_locales/en/messages.json                 |  83 ++-
 app/_locales/es/messages.json                 |  12 -
 app/_locales/fr/messages.json                 |  12 -
 app/_locales/hi/messages.json                 |  12 -
 app/_locales/id/messages.json                 |  12 -
 app/_locales/ja/messages.json                 |  13 +-
 app/_locales/ko/messages.json                 |  13 +-
 app/_locales/pt/messages.json                 |  13 +-
 app/_locales/ru/messages.json                 |  12 -
 app/_locales/tl/messages.json                 |  13 +-
 app/_locales/tr/messages.json                 |  13 +-
 app/_locales/vi/messages.json                 |  13 +-
 app/_locales/zh_CN/messages.json              |  13 +-
 app/scripts/constants/sentry-state.ts         |   2 +
 .../bridge/bridge-controller.test.ts          |  21 +-
 .../controllers/bridge/bridge-controller.ts   |  30 +-
 app/scripts/controllers/bridge/constants.ts   |   2 +
 app/scripts/controllers/bridge/types.ts       |   2 +
 shared/constants/bridge.ts                    |   3 +-
 test/data/bridge/mock-token-data.ts           | 102 +++
 test/e2e/tests/metrics/errors.spec.js         |   2 +
 ...rs-after-init-opt-in-background-state.json |   2 +
 test/jest/mock-store.js                       | 109 +--
 .../app/wallet-overview/coin-buttons.tsx      |   3 +-
 .../app/wallet-overview/eth-overview.test.js  |  28 +-
 ui/ducks/bridge/actions.ts                    |   4 +
 ui/ducks/bridge/bridge.test.ts                |  22 +
 ui/ducks/bridge/bridge.ts                     |  26 +-
 ui/ducks/bridge/selectors.test.ts             | 258 ++------
 ui/ducks/bridge/selectors.ts                  | 192 +++---
 ui/helpers/constants/design-system.ts         |   3 +
 .../useTokensWithFiltering.test.ts.snap       | 192 ++++++
 ui/hooks/bridge/useBridgeExchangeRates.ts     |  18 +-
 ui/hooks/bridge/useBridgeTokens.ts            |  39 ++
 ui/hooks/bridge/useBridging.ts                |   7 +-
 ui/hooks/bridge/useCountdownTimer.test.ts     |   7 +-
 ui/hooks/bridge/useCountdownTimer.ts          |  15 +-
 .../bridge/useCrossChainSwapsEventTracker.ts  |   1 +
 ui/hooks/bridge/useLatestBalance.test.ts      |  14 +-
 ui/hooks/bridge/useLatestBalance.ts           |  19 +-
 .../bridge/useTokensWithFiltering.test.ts     | 108 +++
 ui/hooks/bridge/useTokensWithFiltering.ts     | 218 ++++++
 ui/hooks/useTokensWithFiltering.test.ts       | 157 -----
 ui/hooks/useTokensWithFiltering.ts            | 202 ------
 ui/pages/asset/components/asset-page.test.tsx |   8 +-
 ui/pages/asset/components/token-buttons.tsx   |   3 +-
 .../bridge/__snapshots__/index.test.tsx.snap  | 329 ++++------
 ui/pages/bridge/bridge.util.test.ts           |  12 +
 ui/pages/bridge/bridge.util.ts                |   2 +-
 ui/pages/bridge/index.scss                    |  60 +-
 ui/pages/bridge/index.test.tsx                |   2 +-
 ui/pages/bridge/index.tsx                     | 110 ++--
 ui/pages/bridge/layout/tooltip.tsx            |  95 ++-
 .../bridge-cta-button.test.tsx.snap           |  36 +-
 .../prepare-bridge-page.test.tsx.snap         | 621 +++++++-----------
 .../bridge/prepare/bridge-cta-button.test.tsx |  24 +-
 ui/pages/bridge/prepare/bridge-cta-button.tsx |  86 ++-
 .../bridge/prepare/bridge-input-group.tsx     | 325 +++++----
 ...dge-transaction-settings-modal.stories.tsx |  51 ++
 .../bridge-transaction-settings-modal.tsx     | 217 ++++++
 .../components/bridge-asset-picker-button.tsx |  93 +++
 ui/pages/bridge/prepare/index.scss            | 188 ++----
 .../prepare/prepare-bridge-page.stories.tsx   | 248 +++++++
 .../prepare/prepare-bridge-page.test.tsx      |  43 +-
 .../bridge/prepare/prepare-bridge-page.tsx    | 439 ++++++++++---
 .../bridge-quote-card.test.tsx.snap           | 432 ++++++------
 .../bridge-quotes-modal.test.tsx.snap         |  22 +-
 ui/pages/bridge/quotes/bridge-quote-card.tsx  | 348 +++++++---
 .../quotes/bridge-quotes-modal.test.tsx       |  23 +
 .../bridge/quotes/bridge-quotes-modal.tsx     |  79 +--
 ui/pages/bridge/quotes/index.scss             |  63 --
 ui/pages/bridge/quotes/quote-info-row.tsx     |  51 --
 ui/pages/bridge/types.ts                      |  14 +
 ui/pages/bridge/utils/quote.ts                |  26 +-
 ui/pages/bridge/utils/validators.ts           |  12 +-
 .../mascot-background-animation.js            |  12 +-
 78 files changed, 3608 insertions(+), 2532 deletions(-)
 create mode 100644 test/data/bridge/mock-token-data.ts
 create mode 100644 ui/hooks/bridge/__snapshots__/useTokensWithFiltering.test.ts.snap
 create mode 100644 ui/hooks/bridge/useBridgeTokens.ts
 create mode 100644 ui/hooks/bridge/useTokensWithFiltering.test.ts
 create mode 100644 ui/hooks/bridge/useTokensWithFiltering.ts
 delete mode 100644 ui/hooks/useTokensWithFiltering.test.ts
 delete mode 100644 ui/hooks/useTokensWithFiltering.ts
 create mode 100644 ui/pages/bridge/prepare/bridge-transaction-settings-modal.stories.tsx
 create mode 100644 ui/pages/bridge/prepare/bridge-transaction-settings-modal.tsx
 create mode 100644 ui/pages/bridge/prepare/components/bridge-asset-picker-button.tsx
 create mode 100644 ui/pages/bridge/prepare/prepare-bridge-page.stories.tsx
 delete mode 100644 ui/pages/bridge/quotes/quote-info-row.tsx

diff --git a/app/_locales/de/messages.json b/app/_locales/de/messages.json
index 10da27054b7d..a738b56b0fe0 100644
--- a/app/_locales/de/messages.json
+++ b/app/_locales/de/messages.json
@@ -855,15 +855,9 @@
   "bridgeSelectTokenAndAmount": {
     "message": "Token und Betrag auswählen"
   },
-  "bridgeTimingTooltipText": {
-    "message": "Dies ist die voraussichtliche Dauer, bis das Bridging abgeschlossen ist."
-  },
   "bridgeTo": {
     "message": "Bridge nach"
   },
-  "bridgeTotalFeesTooltipText": {
-    "message": "Dazu gehören Gas-Gebühren (die an Krypto-Miner gezahlt werden) und Relayer-Gebühren (die für die Bereitstellung komplexer Dienste wie Bridging entrichtet werden).\nDie Gebühren richten sich nach dem Netzwerk-Traffic und der Komplexität der Transaktionen. MetaMask profitiert von keiner der Gebühren."
-  },
   "browserNotSupported": {
     "message": "Ihr Browser wird nicht unterstützt …"
   },
@@ -1983,9 +1977,6 @@
   "estimatedFeeTooltip": {
     "message": "Betrag, der für die Bearbeitung der Transaktion im Netzwerk gezahlt wurde."
   },
-  "estimatedTime": {
-    "message": "Geschätzte Dauer"
-  },
   "ethGasPriceFetchWarning": {
     "message": "Der Gas-Preis, der sich aus der Gas-Hauptschätzungsdienst ergibt, ist derzeit nicht verfügbar."
   },
@@ -6106,9 +6097,6 @@
   "total": {
     "message": "Gesamt"
   },
-  "totalFees": {
-    "message": "Gesamtgebühren"
-  },
   "totalVolume": {
     "message": "Gesamtvolumen"
   },
diff --git a/app/_locales/el/messages.json b/app/_locales/el/messages.json
index 3f6bac2b40ac..7992443a500a 100644
--- a/app/_locales/el/messages.json
+++ b/app/_locales/el/messages.json
@@ -855,15 +855,9 @@
   "bridgeSelectTokenAndAmount": {
     "message": "Επιλέξτε token και ποσό"
   },
-  "bridgeTimingTooltipText": {
-    "message": "Αυτός είναι ο εκτιμώμενος χρόνος που θα χρειαστεί για να ολοκληρωθεί η διασύνδεση."
-  },
   "bridgeTo": {
     "message": "Γέφυρα σε"
   },
-  "bridgeTotalFeesTooltipText": {
-    "message": "Αυτό περιλαμβάνει τα τέλη συναλλαγών (που καταβάλλονται στους αναλυτές κρυπτονομισμάτων) και τέλη αποδεκτών (που καταβάλλονται για την παροχή σύνθετων υπηρεσιών όπως η διασύνδεση).\nΤα τέλη βασίζονται στην κίνηση του δικτύου και την πολυπλοκότητα των συναλλαγών. Το MetaMask δεν επωφελείται από κανένα από τα δύο τέλη."
-  },
   "browserNotSupported": {
     "message": "Το Πρόγραμμα Περιήγησής σας δεν υποστηρίζεται..."
   },
@@ -1983,9 +1977,6 @@
   "estimatedFeeTooltip": {
     "message": "Ποσό που καταβλήθηκε για τη διεκπεραίωση της συναλλαγής στο δίκτυο."
   },
-  "estimatedTime": {
-    "message": "Εκτιμώμενος χρόνος"
-  },
   "ethGasPriceFetchWarning": {
     "message": "Η εφεδρική τιμή του τέλους συναλλαγής παρέχεται καθώς η κύρια υπηρεσία εκτίμησης τελών συναλλαγής, δεν είναι διαθέσιμη αυτή τη στιγμή."
   },
@@ -6106,9 +6097,6 @@
   "total": {
     "message": "Σύνολο"
   },
-  "totalFees": {
-    "message": "Συνολικά τέλη"
-  },
   "totalVolume": {
     "message": "Συνολικός όγκος"
   },
diff --git a/app/_locales/en/messages.json b/app/_locales/en/messages.json
index 918b249d326a..12df50e257d7 100644
--- a/app/_locales/en/messages.json
+++ b/app/_locales/en/messages.json
@@ -740,6 +740,9 @@
   "beCareful": {
     "message": "Be careful"
   },
+  "bestPrice": {
+    "message": "Best price"
+  },
   "beta": {
     "message": "Beta"
   },
@@ -859,6 +862,12 @@
     "message": "Approve $1 for bridge",
     "description": "Used in the transaction display list to describe a transaction that is an approve call on a token that is to be bridged. $1 is the symbol of a token that has been approved."
   },
+  "bridgeApprovalWarning": {
+    "message": "You are allowing access to the specified amount, $1 $2. The contract will not access any additional funds."
+  },
+  "bridgeApprovalWarningForHardware": {
+    "message": "You will need to allow access to $1 $2 for bridging, and then approve bridging to $2. This will require two separate confirmations."
+  },
   "bridgeCalculatingAmount": {
     "message": "Calculating..."
   },
@@ -869,7 +878,7 @@
     "message": "Bridge, don't send"
   },
   "bridgeEnterAmount": {
-    "message": "Enter amount"
+    "message": "Select amount"
   },
   "bridgeExplorerLinkViewOn": {
     "message": "View on $1"
@@ -912,22 +921,19 @@
     "message": "Swapping $1 for $2",
     "description": "$1 is the amount of the source asset, $2 is the amount of the destination asset"
   },
+  "bridgeTerms": {
+    "message": "Terms"
+  },
   "bridgeTimingMinutes": {
     "message": "$1 min",
     "description": "$1 is the ticker symbol of a an asset the user is being prompted to purchase"
   },
-  "bridgeTimingTooltipText": {
-    "message": "This is the estimated time it will take for the bridging to be complete."
-  },
   "bridgeTo": {
     "message": "Bridge to"
   },
   "bridgeToChain": {
     "message": "Bridge to $1"
   },
-  "bridgeTotalFeesTooltipText": {
-    "message": "This includes gas fees (paid to crypto miners) and relayer fees (paid to power complex services like bridging).\nFees are based on network traffic and transaction complexity. MetaMask does not profit from either fee."
-  },
   "bridgeTxDetailsBridging": {
     "message": "Bridging"
   },
@@ -966,6 +972,15 @@
   "bridgeTxDetailsYouSent": {
     "message": "You sent"
   },
+  "bridgeValidationInsufficientGasMessage": {
+    "message": "You don't have enough $1 to pay the gas fee for this bridge. Enter a smaller amount or buy more $1."
+  },
+  "bridgeValidationInsufficientGasTitle": {
+    "message": "More $1 needed for gas"
+  },
+  "bridging": {
+    "message": "Bridging"
+  },
   "browserNotSupported": {
     "message": "Your browser is not supported..."
   },
@@ -975,6 +990,9 @@
   "builtAroundTheWorld": {
     "message": "MetaMask is designed and built around the world."
   },
+  "bulletpoint": {
+    "message": "·"
+  },
   "busy": {
     "message": "Busy"
   },
@@ -1549,6 +1567,9 @@
     "message": "Use $1 to customize the gas price. This can be confusing if you aren’t familiar. Interact at your own risk.",
     "description": "$1 is key 'advanced' (text: 'Advanced') separated here so that it can be passed in with bold font-weight"
   },
+  "customSlippage": {
+    "message": "Custom"
+  },
   "customSpendLimit": {
     "message": "Custom spend limit"
   },
@@ -2108,9 +2129,6 @@
   "estimatedFeeTooltip": {
     "message": "Amount paid to process the transaction on network."
   },
-  "estimatedTime": {
-    "message": "Estimated time"
-  },
   "ethGasPriceFetchWarning": {
     "message": "Backup gas price is provided as the main gas estimation service is unavailable right now."
   },
@@ -2360,6 +2378,7 @@
   "gotIt": {
     "message": "Got it"
   },
+  "grantExactAccess": { "message": "Grant exact access" },
   "grantedToWithColon": {
     "message": "Granted to:"
   },
@@ -2488,6 +2507,12 @@
   "holdToRevealUnlockedLabel": {
     "message": "hold to reveal circle unlocked"
   },
+  "howQuotesWork": {
+    "message": "How quotes work"
+  },
+  "howQuotesWorkExplanation": {
+    "message": "This quote has the best return of the quotes we searched. This is based on the swap rate, which includes bridging fees and a $1% MetaMask fee, minus gas fees. Gas fees depend on how busy the network is and how complex the transaction is."
+  },
   "id": {
     "message": "ID"
   },
@@ -2955,6 +2980,12 @@
   "low": {
     "message": "Low"
   },
+  "lowEstimatedReturnTooltipMessage": {
+    "message": "Either your rate or your fees are less favorable than usual. It looks like you'll get back less than $1% of the amount you’re bridging."
+  },
+  "lowEstimatedReturnTooltipTitle": {
+    "message": "Low estimated return"
+  },
   "lowGasSettingToolTipMessage": {
     "message": "Use $1 to wait for a cheaper price. Time estimates are much less accurate as prices are somewhat unpredictable.",
     "description": "$1 is key 'low' separated here so that it can be passed in with bold font-weight"
@@ -3111,6 +3142,9 @@
     "message": "+ $1 more networks",
     "description": "$1 is the number of networks"
   },
+  "moreQuotes": {
+    "message": "More quotes"
+  },
   "multichainAddEthereumChainConfirmationDescription": {
     "message": "You're adding this network to MetaMask and giving this site permission to use it."
   },
@@ -3238,6 +3272,9 @@
   "networkFee": {
     "message": "Network fee"
   },
+  "networkFees": {
+    "message": "Network fees"
+  },
   "networkIsBusy": {
     "message": "Network is busy. Gas prices are high and estimates are less accurate."
   },
@@ -3472,6 +3509,9 @@
   "noNetworksFound": {
     "message": "No networks found for the given search query"
   },
+  "noOptionsAvailableMessage": {
+    "message": "This trade route isn't available right now. Try changing the amount, network, or token and we'll find the best option."
+  },
   "noSnaps": {
     "message": "You don't have any snaps installed."
   },
@@ -4475,18 +4515,16 @@
   "quoteRate": {
     "message": "Quote rate"
   },
-  "quotedNetworkFee": {
-    "message": "$1 network fee"
-  },
   "quotedReceiveAmount": {
     "message": "$1 receive amount"
   },
-  "quotedReceivingAmount": {
-    "message": "$1 receiving"
-  },
+  "quotedTotalCost": { "message": "$1 total cost" },
   "rank": {
     "message": "Rank"
   },
+  "rateIncludesMMFee": {
+    "message": "Rate includes $1% fee"
+  },
   "reAddAccounts": {
     "message": "re-add any other accounts"
   },
@@ -6340,9 +6378,6 @@
   "total": {
     "message": "Total"
   },
-  "totalFees": {
-    "message": "Total fees"
-  },
   "totalVolume": {
     "message": "Total volume"
   },
@@ -6814,6 +6849,12 @@
   "whatsThis": {
     "message": "What's this?"
   },
+  "willApproveAmountForBridging": {
+    "message": "This will approve $1 for bridging."
+  },
+  "willApproveAmountForBridgingHardware": {
+    "message": "You’ll need to confirm two transactions on your hardware wallet."
+  },
   "withdrawing": {
     "message": "Withdrawing"
   },
@@ -6826,6 +6867,7 @@
   "you": {
     "message": "You"
   },
+  "youDeclinedTheTransaction": { "message": "You declined the transaction." },
   "youNeedToAllowCameraAccess": {
     "message": "You need to allow camera access to use this feature."
   },
@@ -6847,6 +6889,9 @@
   "yourNFTmayBeAtRisk": {
     "message": "Your NFT may be at risk"
   },
+  "yourNetworks": {
+    "message": "Your networks"
+  },
   "yourPrivateSeedPhrase": {
     "message": "Your Secret Recovery Phrase"
   },
diff --git a/app/_locales/es/messages.json b/app/_locales/es/messages.json
index ebee69f7857d..2475977d0794 100644
--- a/app/_locales/es/messages.json
+++ b/app/_locales/es/messages.json
@@ -855,15 +855,9 @@
   "bridgeSelectTokenAndAmount": {
     "message": "Seleccione token y monto"
   },
-  "bridgeTimingTooltipText": {
-    "message": "Este es el tiempo estimado que tardará en completarse el puenteo."
-  },
   "bridgeTo": {
     "message": "Puentear hacia"
   },
-  "bridgeTotalFeesTooltipText": {
-    "message": "Esto incluye las tarifas de gas (pagadas a los mineros de criptomonedas) y las tarifas de repetidores (pagadas para alimentar servicios complejos como el puenteo).\nLas tarifas se basan en el tráfico de la red y la complejidad de las transacciones. MetaMask no lucra con ninguna de las dos tarifas."
-  },
   "browserNotSupported": {
     "message": "Su explorador no es compatible..."
   },
@@ -1983,9 +1977,6 @@
   "estimatedFeeTooltip": {
     "message": "Monto pagado para procesar la transacción en la red."
   },
-  "estimatedTime": {
-    "message": "Tiempo estimado"
-  },
   "ethGasPriceFetchWarning": {
     "message": "Se muestra el precio del gas de respaldo, ya que el servicio para calcular el precio del gas principal no se encuentra disponible en este momento."
   },
@@ -6106,9 +6097,6 @@
   "total": {
     "message": "Total"
   },
-  "totalFees": {
-    "message": "Tarifas totales"
-  },
   "totalVolume": {
     "message": "Volúmen total"
   },
diff --git a/app/_locales/fr/messages.json b/app/_locales/fr/messages.json
index 7babefbca08d..abe83f8ea900 100644
--- a/app/_locales/fr/messages.json
+++ b/app/_locales/fr/messages.json
@@ -855,15 +855,9 @@
   "bridgeSelectTokenAndAmount": {
     "message": "Sélectionnez le jeton et le montant"
   },
-  "bridgeTimingTooltipText": {
-    "message": "Il s’agit d’une estimation du temps nécessaire pour que la passerelle soit établie."
-  },
   "bridgeTo": {
     "message": "Passerelle vers"
   },
-  "bridgeTotalFeesTooltipText": {
-    "message": "Cela comprend les frais de gaz (payés aux mineurs de crypto-monnaies) et les frais pour relayeurs (payés pour assurer des services complexes tels que l’établissement de passerelles).\nLes frais sont basés sur le trafic réseau et la complexité des transactions. MetaMask ne tire aucun profit de ces frais."
-  },
   "browserNotSupported": {
     "message": "Votre navigateur internet n’est pas compatible..."
   },
@@ -1983,9 +1977,6 @@
   "estimatedFeeTooltip": {
     "message": "Montant payé pour traiter la transaction sur le réseau."
   },
-  "estimatedTime": {
-    "message": "Temps estimé"
-  },
   "ethGasPriceFetchWarning": {
     "message": "Le prix de carburant de sauvegarde est fourni, car le service principal d’estimation du carburant est momentanément indisponible."
   },
@@ -6106,9 +6097,6 @@
   "total": {
     "message": "Total"
   },
-  "totalFees": {
-    "message": "Frais totaux"
-  },
   "totalVolume": {
     "message": "Volume total"
   },
diff --git a/app/_locales/hi/messages.json b/app/_locales/hi/messages.json
index f02371f823c7..4eaf54f8b012 100644
--- a/app/_locales/hi/messages.json
+++ b/app/_locales/hi/messages.json
@@ -855,15 +855,9 @@
   "bridgeSelectTokenAndAmount": {
     "message": "टोकन और रकम का चयन करें"
   },
-  "bridgeTimingTooltipText": {
-    "message": "ब्रिजिंग का काम पूरा होने में यह अनुमानित समय लगेगा।"
-  },
   "bridgeTo": {
     "message": "इसपर ब्रिज करें"
   },
-  "bridgeTotalFeesTooltipText": {
-    "message": "इसमें गैस शुल्क (क्रिप्टो माइनरों (miners) को भुगतान) और रीलेयर (relayer) शुल्क (ब्रिजिंग जैसी जटिल सेवाओं को मजबूत करने के लिए भुगतान) शामिल हैं।\nशुल्क नेटवर्क ट्रैफ़िक और ट्रांसेक्शन जटिलता पर आधारित हैं। MetaMask को किसी भी शुल्क से लाभ नहीं होता है।"
-  },
   "browserNotSupported": {
     "message": "आपका ब्राउज़र सपोर्टेड नहीं है..."
   },
@@ -1983,9 +1977,6 @@
   "estimatedFeeTooltip": {
     "message": "नेटवर्क पर ट्रांसेक्शन को प्रोसेस करने के लिए भुगतान की गई राशि।"
   },
-  "estimatedTime": {
-    "message": "अनुमानित समय"
-  },
   "ethGasPriceFetchWarning": {
     "message": "बैकअप गैस प्राइस दिया गया है क्योंकि मेन गैस एस्टीमेशन सर्विस अभी उपलब्ध नहीं है।"
   },
@@ -6106,9 +6097,6 @@
   "total": {
     "message": "कुलयोग"
   },
-  "totalFees": {
-    "message": "कुल शुल्क"
-  },
   "totalVolume": {
     "message": "टोटल वॉल्यूम"
   },
diff --git a/app/_locales/id/messages.json b/app/_locales/id/messages.json
index b0ab72319b2a..c93bd496ac12 100644
--- a/app/_locales/id/messages.json
+++ b/app/_locales/id/messages.json
@@ -855,15 +855,9 @@
   "bridgeSelectTokenAndAmount": {
     "message": "Pilih token dan jumlah"
   },
-  "bridgeTimingTooltipText": {
-    "message": "Ini merupakan estimasi waktu yang diperlukan untuk menyelesaikan bridge."
-  },
   "bridgeTo": {
     "message": "Bridge ke"
   },
-  "bridgeTotalFeesTooltipText": {
-    "message": "Ini termasuk biaya gas (dibayarkan kepada penambang kripto) dan biaya relayer (dibayarkan untuk menjalankan layanan kompleks seperti bridge).\nBiaya didasarkan pada lalu lintas jaringan dan kompleksitas transaksi. MetaMask tidak mendapat keuntungan dari kedua biaya tersebut."
-  },
   "browserNotSupported": {
     "message": "Browser Anda tidak didukung..."
   },
@@ -1983,9 +1977,6 @@
   "estimatedFeeTooltip": {
     "message": "Jumlah yang dibayarkan untuk memproses transaksi di jaringan."
   },
-  "estimatedTime": {
-    "message": "Estimasi waktu"
-  },
   "ethGasPriceFetchWarning": {
     "message": "Biaya gas cadangan diberikan karena layanan estimasi gas utama saat ini tidak tersedia."
   },
@@ -6106,9 +6097,6 @@
   "total": {
     "message": "Total"
   },
-  "totalFees": {
-    "message": "Total biaya"
-  },
   "totalVolume": {
     "message": "Volume total"
   },
diff --git a/app/_locales/ja/messages.json b/app/_locales/ja/messages.json
index fdd84149f279..24a2f60314cd 100644
--- a/app/_locales/ja/messages.json
+++ b/app/_locales/ja/messages.json
@@ -855,15 +855,10 @@
   "bridgeSelectTokenAndAmount": {
     "message": "トークンと金額を選択"
   },
-  "bridgeTimingTooltipText": {
-    "message": "これは、ブリッジが完了するまでの推定時間です。"
-  },
   "bridgeTo": {
     "message": "ブリッジ先:"
   },
-  "bridgeTotalFeesTooltipText": {
-    "message": "これには、(仮想通貨マイナーに支払われる) ガス代と (ブリッジなどの複雑なサービスを供給するために支払われる) リレイヤー手数料が含まれます。\n手数料はネットワークトラフィックとトランザクションの複雑性に基づいています。MetaMaskはどちらの手数料からも利益を得ることはありません。"
-  },
+
   "browserNotSupported": {
     "message": "ご使用のブラウザはサポートされていません..."
   },
@@ -1983,9 +1978,6 @@
   "estimatedFeeTooltip": {
     "message": "ネットワーク上のトランザクションの処理に支払われる金額"
   },
-  "estimatedTime": {
-    "message": "推定所要時間"
-  },
   "ethGasPriceFetchWarning": {
     "message": "現在メインのガスの見積もりサービスが利用できないため、バックアップのガス価格が提供されています。"
   },
@@ -6106,9 +6098,6 @@
   "total": {
     "message": "合計"
   },
-  "totalFees": {
-    "message": "合計手数料"
-  },
   "totalVolume": {
     "message": "合計量"
   },
diff --git a/app/_locales/ko/messages.json b/app/_locales/ko/messages.json
index ec7078d51efd..c261f74b4b5c 100644
--- a/app/_locales/ko/messages.json
+++ b/app/_locales/ko/messages.json
@@ -855,15 +855,10 @@
   "bridgeSelectTokenAndAmount": {
     "message": "토큰 및 금액 선택"
   },
-  "bridgeTimingTooltipText": {
-    "message": "브릿지가 완료되는 데 걸리는 예상 시간입니다."
-  },
   "bridgeTo": {
     "message": "브릿지 대상"
   },
-  "bridgeTotalFeesTooltipText": {
-    "message": "가스비(암호화폐 채굴자에게 지급)와 릴레이어 수수료(브릿지와 같은 복잡한 서비스 제공에 지급)가 포함됩니다.\n수수료는 네트워크 트래픽과 트랜잭션 복잡성에 따라 달라집니다. MetaMask는 어떤 수수료에서도 수익을 얻지 않습니다."
-  },
+
   "browserNotSupported": {
     "message": "지원되지 않는 브라우저입니다..."
   },
@@ -1983,9 +1978,6 @@
   "estimatedFeeTooltip": {
     "message": "네트워크에서 트랜잭션을 처리하기 위해 지불한 금액입니다."
   },
-  "estimatedTime": {
-    "message": "예상 시간"
-  },
   "ethGasPriceFetchWarning": {
     "message": "현재 주요 가스 견적 서비스를 사용할 수 없으므로 백업 가스 가격을 제공합니다."
   },
@@ -6106,9 +6098,6 @@
   "total": {
     "message": "합계"
   },
-  "totalFees": {
-    "message": "총 수수료"
-  },
   "totalVolume": {
     "message": "총 거래량"
   },
diff --git a/app/_locales/pt/messages.json b/app/_locales/pt/messages.json
index 142163b5ac2a..5a1389a0d4d6 100644
--- a/app/_locales/pt/messages.json
+++ b/app/_locales/pt/messages.json
@@ -855,15 +855,10 @@
   "bridgeSelectTokenAndAmount": {
     "message": "Selecionar token e valor"
   },
-  "bridgeTimingTooltipText": {
-    "message": "Este é o tempo estimado para a conclusão da ponte."
-  },
   "bridgeTo": {
     "message": "Ponte para"
   },
-  "bridgeTotalFeesTooltipText": {
-    "message": "Isso inclui as taxas de gás (pagas aos mineradores de criptmoedas) e taxas de retransmissão (pagas para promover serviços complexos como pontes).\nAs taxas são baseadas no tráfego da rede e na complexidade da transação. A MetaMask não lucra com nenhuma dessas taxas."
-  },
+
   "browserNotSupported": {
     "message": "Seu navegador não é compatível..."
   },
@@ -1983,9 +1978,6 @@
   "estimatedFeeTooltip": {
     "message": "Valor pago para processar a transação na rede."
   },
-  "estimatedTime": {
-    "message": "Tempo estimado"
-  },
   "ethGasPriceFetchWarning": {
     "message": "O preço de backup do gás é fornecido porque a estimativa de gás principal está indisponível no momento."
   },
@@ -6106,9 +6098,6 @@
   "total": {
     "message": "Total"
   },
-  "totalFees": {
-    "message": "Taxas totais"
-  },
   "totalVolume": {
     "message": "Volume total"
   },
diff --git a/app/_locales/ru/messages.json b/app/_locales/ru/messages.json
index a8fd22c4b04d..37a672ec798a 100644
--- a/app/_locales/ru/messages.json
+++ b/app/_locales/ru/messages.json
@@ -855,15 +855,9 @@
   "bridgeSelectTokenAndAmount": {
     "message": "Выберите токен и сумму"
   },
-  "bridgeTimingTooltipText": {
-    "message": "Это примерное время, которое потребуется для создания моста."
-  },
   "bridgeTo": {
     "message": "Мост в"
   },
-  "bridgeTotalFeesTooltipText": {
-    "message": "Сюда входят плата за газ (выплачивается майнерам криптовалюты) и плата ретранслятору (выплачивается за услуги энергетического комплекса, такие как мостовое соединение).\nРазмер комиссии зависит от сетевого трафика и сложности транзакции. MetaMask не получает прибыли ни от одной комиссии."
-  },
   "browserNotSupported": {
     "message": "Ваш браузер не поддерживается..."
   },
@@ -1983,9 +1977,6 @@
   "estimatedFeeTooltip": {
     "message": "Сумма, уплаченная за обработку транзакции в сети."
   },
-  "estimatedTime": {
-    "message": "Примерное время"
-  },
   "ethGasPriceFetchWarning": {
     "message": "Указана резервная цена газа, поскольку основной сервис определения цены газа сейчас недоступен."
   },
@@ -6106,9 +6097,6 @@
   "total": {
     "message": "Итого"
   },
-  "totalFees": {
-    "message": "Итого комиссий"
-  },
   "totalVolume": {
     "message": "Общий объем"
   },
diff --git a/app/_locales/tl/messages.json b/app/_locales/tl/messages.json
index 42ae2e8b884f..20b318456d77 100644
--- a/app/_locales/tl/messages.json
+++ b/app/_locales/tl/messages.json
@@ -855,15 +855,10 @@
   "bridgeSelectTokenAndAmount": {
     "message": "Piliin ang token at halaga"
   },
-  "bridgeTimingTooltipText": {
-    "message": "Ito ang tinatayang tagal para makumpleto ang pag-bridge."
-  },
   "bridgeTo": {
     "message": "I-bridge papunta sa"
   },
-  "bridgeTotalFeesTooltipText": {
-    "message": "Kasama rito ang mga bayad sa gas (binabayaran sa mga crypto miner) at mga bayad sa tagapaghatid (binabayaran sa mga serbisyo ng power complex gaya ng pag-bridge).\nNakabatay ang mga bayad sa trapiko sa network at kung paano kakumplikado ang transaksyon. Hindi kumikita ang MetaMask sa anumang bayad."
-  },
+
   "browserNotSupported": {
     "message": "Hindi sinusuportahan ang iyong browser..."
   },
@@ -1983,9 +1978,6 @@
   "estimatedFeeTooltip": {
     "message": "Halaga na binayaran para iproseso ang transaksyon sa network."
   },
-  "estimatedTime": {
-    "message": "Tinatayang oras"
-  },
   "ethGasPriceFetchWarning": {
     "message": "Ang backup na presyo ng gas ay ibinigay dahil ang pangunahing serbisyo ng pagtantya ng gas ay hindi available sa ngayon."
   },
@@ -6106,9 +6098,6 @@
   "total": {
     "message": "Kabuuan"
   },
-  "totalFees": {
-    "message": "Kabuuang bayad"
-  },
   "totalVolume": {
     "message": "Kabuuang volume"
   },
diff --git a/app/_locales/tr/messages.json b/app/_locales/tr/messages.json
index 891cd12352fe..470bb934f74b 100644
--- a/app/_locales/tr/messages.json
+++ b/app/_locales/tr/messages.json
@@ -855,15 +855,10 @@
   "bridgeSelectTokenAndAmount": {
     "message": "Token ve miktar seçin"
   },
-  "bridgeTimingTooltipText": {
-    "message": "Bu, köprü işleminin tamamlanacağı tahmini süredir."
-  },
   "bridgeTo": {
     "message": "Şuraya köprü:"
   },
-  "bridgeTotalFeesTooltipText": {
-    "message": "Buna, gaz ücretleri (kripto madencilerine ödenen) ve düzenleyici ücretleri (köprü gibi güç kompleksi hizmetlerine ödenen) dahildir. Ücretler ağ trafiğine ve işlemin karmaşıklığına dayanır. MetaMask iki ücretten de kazanç sağlamaz."
-  },
+
   "browserNotSupported": {
     "message": "Tarayıcınız desteklenmiyor..."
   },
@@ -1983,9 +1978,6 @@
   "estimatedFeeTooltip": {
     "message": "Ağda işlemi gerçekleştirmek için ödenen tutar."
   },
-  "estimatedTime": {
-    "message": "Tahmini süre"
-  },
   "ethGasPriceFetchWarning": {
     "message": "Ana gaz tahmini hizmeti olarak sunulan yedek gaz fiyatı şu anda kullanılamıyor."
   },
@@ -6106,9 +6098,6 @@
   "total": {
     "message": "Toplam"
   },
-  "totalFees": {
-    "message": "Toplam ücretler"
-  },
   "totalVolume": {
     "message": "Toplam hacim"
   },
diff --git a/app/_locales/vi/messages.json b/app/_locales/vi/messages.json
index 2a290e5a0cc0..d331ab42b9b5 100644
--- a/app/_locales/vi/messages.json
+++ b/app/_locales/vi/messages.json
@@ -855,15 +855,10 @@
   "bridgeSelectTokenAndAmount": {
     "message": "Chọn token và số tiền"
   },
-  "bridgeTimingTooltipText": {
-    "message": "Đây là thời gian ước tính để hoàn thành cầu nối."
-  },
   "bridgeTo": {
     "message": "Cầu nối đến"
   },
-  "bridgeTotalFeesTooltipText": {
-    "message": "Bao gồm phí gas (trả cho các thợ đào tiền mã hóa) và phí sàn chuyển tiếp (trả để cung cấp các dịch vụ phức tạp như cầu nối).\nPhí được tính dựa trên lưu lượng mạng và độ phức tạp của giao dịch. MetaMask không thu lợi từ bất kỳ khoản phí nào."
-  },
+
   "browserNotSupported": {
     "message": "Trình duyệt của bạn không được hỗ trợ..."
   },
@@ -1983,9 +1978,6 @@
   "estimatedFeeTooltip": {
     "message": "Số tiền được chi trả để xử lý giao dịch trên mạng."
   },
-  "estimatedTime": {
-    "message": "Thời gian ước tính"
-  },
   "ethGasPriceFetchWarning": {
     "message": "Giá gas dự phòng được cung cấp vì dịch vụ ước tính giá gas chính hiện không hoạt động."
   },
@@ -6106,9 +6098,6 @@
   "total": {
     "message": "Tổng"
   },
-  "totalFees": {
-    "message": "Tổng phí"
-  },
   "totalVolume": {
     "message": "Tổng khối lượng giao dịch"
   },
diff --git a/app/_locales/zh_CN/messages.json b/app/_locales/zh_CN/messages.json
index 42ab2a2dcae4..52941dcc24f9 100644
--- a/app/_locales/zh_CN/messages.json
+++ b/app/_locales/zh_CN/messages.json
@@ -855,15 +855,10 @@
   "bridgeSelectTokenAndAmount": {
     "message": "选择代币和金额"
   },
-  "bridgeTimingTooltipText": {
-    "message": "这是完成桥接所需的预估时间。"
-  },
   "bridgeTo": {
     "message": "桥接至"
   },
-  "bridgeTotalFeesTooltipText": {
-    "message": "这包括燃料费（支付给加密货币矿工）和中继器费用（用于为桥接等复杂服务提供动力）。\n费用根据网络流量和交易复杂性而定。MetaMask 不会从这两项费用中获利。"
-  },
+
   "browserNotSupported": {
     "message": "您的浏览器不受支持……"
   },
@@ -1983,9 +1978,6 @@
   "estimatedFeeTooltip": {
     "message": "为在网络上处理交易而支付的金额。"
   },
-  "estimatedTime": {
-    "message": "预估时间"
-  },
   "ethGasPriceFetchWarning": {
     "message": "由于目前主要的燃料估算服务不可用，因此提供了备用燃料价格。"
   },
@@ -6106,9 +6098,6 @@
   "total": {
     "message": "共计"
   },
-  "totalFees": {
-    "message": "总费用"
-  },
   "totalVolume": {
     "message": "总交易额"
   },
diff --git a/app/scripts/constants/sentry-state.ts b/app/scripts/constants/sentry-state.ts
index c0b075c2b28b..68926c02dc89 100644
--- a/app/scripts/constants/sentry-state.ts
+++ b/app/scripts/constants/sentry-state.ts
@@ -104,8 +104,10 @@ export const SENTRY_BACKGROUND_STATE = {
       },
       destTokens: {},
       destTopAssets: [],
+      destTokensLoadingStatus: false,
       srcTokens: {},
       srcTopAssets: [],
+      srcTokensLoadingStatus: false,
       quoteRequest: {
         walletAddress: false,
         srcTokenAddress: true,
diff --git a/app/scripts/controllers/bridge/bridge-controller.test.ts b/app/scripts/controllers/bridge/bridge-controller.test.ts
index 9ffb95832350..3b0d095fa0c3 100644
--- a/app/scripts/controllers/bridge/bridge-controller.test.ts
+++ b/app/scripts/controllers/bridge/bridge-controller.test.ts
@@ -18,7 +18,7 @@ import { QuoteResponse } from '../../../../ui/pages/bridge/types';
 import { decimalToHex } from '../../../../shared/modules/conversion.utils';
 import BridgeController from './bridge-controller';
 import { BridgeControllerMessenger } from './types';
-import { DEFAULT_BRIDGE_CONTROLLER_STATE } from './constants';
+import { DEFAULT_BRIDGE_CONTROLLER_STATE, RequestStatus } from './constants';
 
 const EMPTY_INIT_STATE = {
   bridgeState: DEFAULT_BRIDGE_CONTROLLER_STATE,
@@ -106,6 +106,7 @@ describe('BridgeController', function () {
           address: '0x1f9840a85d5af5bf1d1762f925bdaddc4201f984',
           symbol: 'ABC',
           decimals: 16,
+          aggregators: ['lifl', 'socket'],
         },
         {
           address: '0x1291478912',
@@ -171,6 +172,12 @@ describe('BridgeController', function () {
   it('selectDestNetwork should set the bridge dest tokens and top assets', async function () {
     await bridgeController.selectDestNetwork('0xa');
     expect(bridgeController.state.bridgeState.destTokens).toStrictEqual({
+      '0x1f9840a85d5af5bf1d1762f925bdaddc4201f984': {
+        address: '0x1f9840a85d5af5bf1d1762f925bdaddc4201f984',
+        symbol: 'ABC',
+        decimals: 16,
+        aggregators: ['lifl', 'socket'],
+      },
       '0x0000000000000000000000000000000000000000': {
         address: '0x0000000000000000000000000000000000000000',
         decimals: 18,
@@ -178,12 +185,10 @@ describe('BridgeController', function () {
         name: 'Ether',
         symbol: 'ETH',
       },
-      '0x1f9840a85d5af5bf1d1762f925bdaddc4201f984': {
-        address: '0x1f9840a85d5af5bf1d1762f925bdaddc4201f984',
-        symbol: 'ABC',
-        decimals: 16,
-      },
     });
+    expect(
+      bridgeController.state.bridgeState.destTokensLoadingStatus,
+    ).toStrictEqual(RequestStatus.FETCHED);
     expect(bridgeController.state.bridgeState.destTopAssets).toStrictEqual([
       { address: '0x1f9840a85d5af5bf1d1762f925bdaddc4201f984', symbol: 'ABC' },
     ]);
@@ -208,8 +213,12 @@ describe('BridgeController', function () {
         address: '0x1f9840a85d5af5bf1d1762f925bdaddc4201f984',
         symbol: 'ABC',
         decimals: 16,
+        aggregators: ['lifl', 'socket'],
       },
     });
+    expect(
+      bridgeController.state.bridgeState.srcTokensLoadingStatus,
+    ).toStrictEqual(RequestStatus.FETCHED);
     expect(bridgeController.state.bridgeState.srcTopAssets).toStrictEqual([
       {
         address: '0x1f9840a85d5af5bf1d1762f925bdaddc4201f984',
diff --git a/app/scripts/controllers/bridge/bridge-controller.ts b/app/scripts/controllers/bridge/bridge-controller.ts
index 031725530f52..4770c342587c 100644
--- a/app/scripts/controllers/bridge/bridge-controller.ts
+++ b/app/scripts/controllers/bridge/bridge-controller.ts
@@ -224,13 +224,35 @@ export default class BridgeController extends StaticIntervalPollingController<Br
   };
 
   selectSrcNetwork = async (chainId: Hex) => {
-    await this.#setTopAssets(chainId, 'srcTopAssets');
-    await this.#setTokens(chainId, 'srcTokens');
+    this.update((state) => {
+      state.bridgeState.srcTokensLoadingStatus = RequestStatus.LOADING;
+      return state;
+    });
+    try {
+      await this.#setTopAssets(chainId, 'srcTopAssets');
+      await this.#setTokens(chainId, 'srcTokens');
+    } finally {
+      this.update((state) => {
+        state.bridgeState.srcTokensLoadingStatus = RequestStatus.FETCHED;
+        return state;
+      });
+    }
   };
 
   selectDestNetwork = async (chainId: Hex) => {
-    await this.#setTopAssets(chainId, 'destTopAssets');
-    await this.#setTokens(chainId, 'destTokens');
+    this.update((state) => {
+      state.bridgeState.destTokensLoadingStatus = RequestStatus.LOADING;
+      return state;
+    });
+    try {
+      await this.#setTopAssets(chainId, 'destTopAssets');
+      await this.#setTokens(chainId, 'destTokens');
+    } finally {
+      this.update((state) => {
+        state.bridgeState.destTokensLoadingStatus = RequestStatus.FETCHED;
+        return state;
+      });
+    }
   };
 
   #fetchBridgeQuotes = async ({
diff --git a/app/scripts/controllers/bridge/constants.ts b/app/scripts/controllers/bridge/constants.ts
index 2d507418b5d9..4903a9ee2858 100644
--- a/app/scripts/controllers/bridge/constants.ts
+++ b/app/scripts/controllers/bridge/constants.ts
@@ -27,6 +27,8 @@ export const DEFAULT_BRIDGE_CONTROLLER_STATE: BridgeControllerState = {
     },
   },
   srcTokens: {},
+  srcTokensLoadingStatus: undefined,
+  destTokensLoadingStatus: undefined,
   srcTopAssets: [],
   destTokens: {},
   destTopAssets: [],
diff --git a/app/scripts/controllers/bridge/types.ts b/app/scripts/controllers/bridge/types.ts
index 6a28eb9d6ffd..7cdfa43cabd0 100644
--- a/app/scripts/controllers/bridge/types.ts
+++ b/app/scripts/controllers/bridge/types.ts
@@ -37,6 +37,8 @@ export type BridgeControllerState = {
   bridgeFeatureFlags: BridgeFeatureFlags;
   srcTokens: Record<string, SwapsTokenObject>;
   srcTopAssets: { address: string }[];
+  srcTokensLoadingStatus?: RequestStatus;
+  destTokensLoadingStatus?: RequestStatus;
   destTokens: Record<string, SwapsTokenObject>;
   destTopAssets: { address: string }[];
   quoteRequest: Partial<QuoteRequest>;
diff --git a/shared/constants/bridge.ts b/shared/constants/bridge.ts
index 06e0d55b8195..ef7cb7f8a785 100644
--- a/shared/constants/bridge.ts
+++ b/shared/constants/bridge.ts
@@ -29,7 +29,7 @@ export const METABRIDGE_ETHEREUM_ADDRESS =
 export const BRIDGE_QUOTE_MAX_ETA_SECONDS = 60 * 60; // 1 hour
 export const BRIDGE_QUOTE_MAX_RETURN_DIFFERENCE_PERCENTAGE = 0.8; // if a quote returns in x times less return than the best quote, ignore it
 
-export const BRIDGE_PREFERRED_GAS_ESTIMATE = 'medium';
+export const BRIDGE_PREFERRED_GAS_ESTIMATE = 'high';
 export const BRIDGE_DEFAULT_SLIPPAGE = 0.5;
 
 export const NETWORK_TO_SHORT_NETWORK_NAME_MAP: Record<
@@ -46,3 +46,4 @@ export const NETWORK_TO_SHORT_NETWORK_NAME_MAP: Record<
   [CHAIN_IDS.ZKSYNC_ERA]: 'ZkSync Era',
   [CHAIN_IDS.BASE]: 'Base',
 };
+export const BRIDGE_MM_FEE_RATE = 0.875;
diff --git a/test/data/bridge/mock-token-data.ts b/test/data/bridge/mock-token-data.ts
new file mode 100644
index 000000000000..0eafa4802ea5
--- /dev/null
+++ b/test/data/bridge/mock-token-data.ts
@@ -0,0 +1,102 @@
+import { CHAIN_IDS } from '@metamask/transaction-controller';
+
+export const mockTokenData = {
+  allTokens: {
+    [CHAIN_IDS.MAINNET]: {
+      '0x0dcd5d886577d5081b0c52e242ef29e70be3e7bc': [
+        {
+          address: '0x1f9840a85d5af5bf1d1762f925bdaddc4201f984',
+          balance: 'a',
+          decimals: 6,
+        },
+        {
+          address: '0x514910771af9ca656af840dff83e8264ecf986ca',
+          balance: 'e',
+        },
+      ],
+      '0xec1adf982415d2ef5ec55899b9bfb8bc0f29251b': [
+        {
+          address: '0x6b3595068778dd592e39a122f4f5a5cf09c90fe2',
+          balance: 'e',
+        },
+      ],
+    },
+    [CHAIN_IDS.LINEA_MAINNET]: {
+      '0x0dcd5d886577d5081b0c52e242ef29e70be3e7bc': [
+        {
+          address: '0x1f9840a85d5af5bf1d1762f925bdaddc4201f984',
+          balance: 'e',
+        },
+      ],
+      '0xec1adf982415d2ef5ec55899b9bfb8bc0f29251b': [
+        {
+          address: '0x6b3595068778dd592e39a122f4f5a5cf09c90fe2',
+          balance: 'e',
+        },
+      ],
+    },
+  },
+  accountsByChainId: {
+    [CHAIN_IDS.MAINNET]: {
+      '0x0dcd5d886577d5081b0c52e242ef29e70be3e7bc': {
+        address: '0x0dcd5d886577d5081b0c52e242ef29e70be3e7bc',
+        balance: '0xa',
+      },
+      '0xec1adf982415d2ef5ec55899b9bfb8bc0f29251b': {
+        address: '0xec1adf982415d2ef5ec55899b9bfb8bc0f29251b',
+        balance: '0xe',
+      },
+    },
+    [CHAIN_IDS.LINEA_MAINNET]: {
+      '0x0dcd5d886577d5081b0c52e242ef29e70be3e7bc': {
+        address: '0x0dcd5d886577d5081b0c52e242ef29e70be3e7bc',
+        balance: '0xe',
+      },
+      '0xec1adf982415d2ef5ec55899b9bfb8bc0f29251b': {
+        address: '0xec1adf982415d2ef5ec55899b9bfb8bc0f29251b',
+        balance: '0xe',
+      },
+    },
+  },
+  tokensChainsCache: {
+    [CHAIN_IDS.MAINNET]: {
+      timestamp: 111111,
+      data: [
+        {
+          address: '0x514910771af9ca656af840dff83e8264ecf986ca',
+          symbol: 'LINK',
+          decimals: 18,
+        },
+        {
+          address: '0xc00e94cb662c3520282e6f5717214004a7f26888',
+          symbol: 'COMP',
+          decimals: 18,
+        },
+      ],
+    },
+    [CHAIN_IDS.LINEA_MAINNET]: {
+      timestamp: 111111,
+      data: {
+        '0x514910771af9ca656af840dff83e8264ecf986ca': {
+          address: '0x514910771af9ca656af840dff83e8264ecf986ca',
+          symbol: 'LINK',
+          decimals: 18,
+        },
+        '0xc00e94cb662c3520282e6f5717214004a7f26888': {
+          address: '0xc00e94cb662c3520282e6f5717214004a7f26888',
+          symbol: 'COMP',
+          decimals: 18,
+        },
+      },
+    },
+  },
+  tokenBalances: {
+    '0x0dcd5d886577d5081b0c52e242ef29e70be3e7bc': {
+      '0x5': {},
+      '0x1': {
+        '0x514910771af9ca656af840dff83e8264ecf986ca': '0x1',
+        '0x1f9840a85d5af5bf1d1762f925bdaddc4201f984': '0x738',
+      },
+    },
+  },
+};
diff --git a/test/e2e/tests/metrics/errors.spec.js b/test/e2e/tests/metrics/errors.spec.js
index 7ddbe6c1117a..12a44e26fbf1 100644
--- a/test/e2e/tests/metrics/errors.spec.js
+++ b/test/e2e/tests/metrics/errors.spec.js
@@ -874,6 +874,8 @@ describe('Sentry errors', function () {
           srcTokenAmount: true,
           walletAddress: false,
         },
+        destTokensLoadingStatus: false,
+        srcTokensLoadingStatus: false,
         quotesLastFetched: true,
         quotesLoadingStatus: true,
         quotesRefreshCount: true,
diff --git a/test/e2e/tests/metrics/state-snapshots/errors-after-init-opt-in-background-state.json b/test/e2e/tests/metrics/state-snapshots/errors-after-init-opt-in-background-state.json
index cae1a6ae8951..b00f37993b78 100644
--- a/test/e2e/tests/metrics/state-snapshots/errors-after-init-opt-in-background-state.json
+++ b/test/e2e/tests/metrics/state-snapshots/errors-after-init-opt-in-background-state.json
@@ -76,6 +76,8 @@
       "srcTokens": {},
       "srcTopAssets": {},
       "destTokens": {},
+      "destTokensLoadingStatus": "undefined",
+      "srcTokensLoadingStatus": "undefined",
       "destTopAssets": {},
       "quoteRequest": {
         "srcTokenAddress": "0x0000000000000000000000000000000000000000",
diff --git a/test/jest/mock-store.js b/test/jest/mock-store.js
index 2f48e9794e98..f22f088e64ec 100644
--- a/test/jest/mock-store.js
+++ b/test/jest/mock-store.js
@@ -6,6 +6,7 @@ import { mockNetworkState } from '../stub/networks';
 import { DEFAULT_BRIDGE_CONTROLLER_STATE } from '../../app/scripts/controllers/bridge/constants';
 import { DEFAULT_BRIDGE_STATUS_CONTROLLER_STATE } from '../../app/scripts/controllers/bridge-status/constants';
 import { BRIDGE_PREFERRED_GAS_ESTIMATE } from '../../shared/constants/bridge';
+import { mockTokenData } from '../data/bridge/mock-token-data';
 
 export const createGetSmartTransactionFeesApiResponse = () => {
   return {
@@ -720,6 +721,11 @@ export const createBridgeMockStore = (
   const swapsStore = createSwapsMockStore();
   return {
     ...swapsStore,
+    // For initial state of dest asset picker
+    swaps: {
+      ...swapsStore.swaps,
+      topAssets: [],
+    },
     bridge: {
       toChainId: null,
       sortOrder: 'cost_ascending',
@@ -750,107 +756,10 @@ export const createBridgeMockStore = (
           },
         },
       },
-      allTokens: {
-        [CHAIN_IDS.MAINNET]: {
-          '0x0dcd5d886577d5081b0c52e242ef29e70be3e7bc': [
-            {
-              address: '0x1f9840a85d5af5bf1d1762f925bdaddc4201f984',
-              balance: 'a',
-              decimals: 6,
-            },
-            {
-              address: '0x514910771af9ca656af840dff83e8264ecf986ca',
-              balance: 'e',
-            },
-          ],
-          '0xec1adf982415d2ef5ec55899b9bfb8bc0f29251b': [
-            {
-              address: '0x6b3595068778dd592e39a122f4f5a5cf09c90fe2',
-              balance: 'e',
-            },
-          ],
-        },
-        [CHAIN_IDS.LINEA_MAINNET]: {
-          '0x0dcd5d886577d5081b0c52e242ef29e70be3e7bc': [
-            {
-              address: '0x1f9840a85d5af5bf1d1762f925bdaddc4201f984',
-              balance: 'e',
-            },
-          ],
-          '0xec1adf982415d2ef5ec55899b9bfb8bc0f29251b': [
-            {
-              address: '0x6b3595068778dd592e39a122f4f5a5cf09c90fe2',
-              balance: 'e',
-            },
-          ],
-        },
-      },
-      accountsByChainId: {
-        [CHAIN_IDS.MAINNET]: {
-          '0x0dcd5d886577d5081b0c52e242ef29e70be3e7bc': {
-            address: '0x0dcd5d886577d5081b0c52e242ef29e70be3e7bc',
-            balance: '0xa',
-          },
-          '0xec1adf982415d2ef5ec55899b9bfb8bc0f29251b': {
-            address: '0xec1adf982415d2ef5ec55899b9bfb8bc0f29251b',
-            balance: '0xe',
-          },
-        },
-        [CHAIN_IDS.LINEA_MAINNET]: {
-          '0x0dcd5d886577d5081b0c52e242ef29e70be3e7bc': {
-            address: '0x0dcd5d886577d5081b0c52e242ef29e70be3e7bc',
-            balance: '0xe',
-          },
-          '0xec1adf982415d2ef5ec55899b9bfb8bc0f29251b': {
-            address: '0xec1adf982415d2ef5ec55899b9bfb8bc0f29251b',
-            balance: '0xe',
-          },
-        },
-      },
-      tokensChainsCache: {
-        [CHAIN_IDS.MAINNET]: {
-          timestamp: 111111,
-          data: [
-            {
-              address: '0x514910771af9ca656af840dff83e8264ecf986ca',
-              symbol: 'LINK',
-              decimals: 18,
-            },
-            {
-              address: '0xc00e94cb662c3520282e6f5717214004a7f26888',
-              symbol: 'COMP',
-              decimals: 18,
-            },
-          ],
-        },
-        [CHAIN_IDS.LINEA_MAINNET]: {
-          timestamp: 111111,
-          data: {
-            '0x514910771af9ca656af840dff83e8264ecf986ca': {
-              address: '0x514910771af9ca656af840dff83e8264ecf986ca',
-              symbol: 'LINK',
-              decimals: 18,
-            },
-            '0xc00e94cb662c3520282e6f5717214004a7f26888': {
-              address: '0xc00e94cb662c3520282e6f5717214004a7f26888',
-              symbol: 'COMP',
-              decimals: 18,
-            },
-          },
-        },
-      },
-      tokenBalances: {
-        '0x0dcd5d886577d5081b0c52e242ef29e70be3e7bc': {
-          '0x5': {},
-          '0x1': {
-            '0x514910771af9ca656af840dff83e8264ecf986ca': '0x1',
-            '0x1f9840a85d5af5bf1d1762f925bdaddc4201f984': '0x738',
-          },
-        },
-      },
+      ...mockTokenData,
       ...metamaskStateOverrides,
       bridgeState: {
-        ...(swapsStore.metamask.bridgeState ?? {}),
+        ...DEFAULT_BRIDGE_CONTROLLER_STATE,
         bridgeFeatureFlags: {
           ...featureFlagOverrides,
           extensionConfig: {
@@ -859,8 +768,6 @@ export const createBridgeMockStore = (
             ...featureFlagOverrides.extensionConfig,
           },
         },
-        quotes: DEFAULT_BRIDGE_CONTROLLER_STATE.quotes,
-        quoteRequest: DEFAULT_BRIDGE_CONTROLLER_STATE.quoteRequest,
         ...bridgeStateOverrides,
       },
       bridgeStatusState: {
diff --git a/ui/components/app/wallet-overview/coin-buttons.tsx b/ui/components/app/wallet-overview/coin-buttons.tsx
index 6509b4f415c0..2819e24cad0b 100644
--- a/ui/components/app/wallet-overview/coin-buttons.tsx
+++ b/ui/components/app/wallet-overview/coin-buttons.tsx
@@ -463,10 +463,11 @@ const CoinButtons = ({
     });
   }, [chainId, defaultSwapsToken]);
 
-  const handleBridgeOnClick = useCallback(() => {
+  const handleBridgeOnClick = useCallback(async () => {
     if (!defaultSwapsToken) {
       return;
     }
+    await setCorrectChain();
     openBridgeExperience(
       'Home',
       defaultSwapsToken,
diff --git a/ui/components/app/wallet-overview/eth-overview.test.js b/ui/components/app/wallet-overview/eth-overview.test.js
index 104764251cf8..254e1eb9d1d4 100644
--- a/ui/components/app/wallet-overview/eth-overview.test.js
+++ b/ui/components/app/wallet-overview/eth-overview.test.js
@@ -253,7 +253,25 @@ describe('EthOverview', () => {
     });
 
     it('should open the Bridge URI when clicking on Bridge button on supported network', async () => {
-      const { queryByTestId } = renderWithProvider(<EthOverview />, store);
+      const mockedStore = configureMockStore([thunk])({
+        ...store,
+        metamask: {
+          ...mockStore.metamask,
+          ...mockNetworkState({ chainId: '0xa86a' }),
+          useExternalServices: true,
+          bridgeState: {
+            bridgeFeatureFlags: {
+              extensionConfig: {
+                support: false,
+              },
+            },
+          },
+        },
+      });
+      const { queryByTestId } = renderWithProvider(
+        <EthOverview />,
+        mockedStore,
+      );
 
       const bridgeButton = queryByTestId(ETH_OVERVIEW_BRIDGE);
 
@@ -261,15 +279,15 @@ describe('EthOverview', () => {
       expect(bridgeButton).not.toBeDisabled();
 
       fireEvent.click(bridgeButton);
-      expect(openTabSpy).toHaveBeenCalledTimes(1);
 
-      await waitFor(() =>
+      await waitFor(() => {
+        expect(openTabSpy).toHaveBeenCalledTimes(1);
         expect(openTabSpy).toHaveBeenCalledWith({
           url: expect.stringContaining(
             '/bridge?metamaskEntry=ext_bridge_button',
           ),
-        }),
-      );
+        });
+      });
     });
 
     it('should open the MMI PD Swaps URI when clicking on Swap button with a Custody account', async () => {
diff --git a/ui/ducks/bridge/actions.ts b/ui/ducks/bridge/actions.ts
index 7f94fdeb6c20..5597503206da 100644
--- a/ui/ducks/bridge/actions.ts
+++ b/ui/ducks/bridge/actions.ts
@@ -14,6 +14,7 @@ import { MetaMaskReduxDispatch } from '../../store/store';
 import {
   bridgeSlice,
   setDestTokenExchangeRates,
+  setDestTokenUsdExchangeRates,
   setSrcTokenExchangeRates,
 } from './bridge';
 
@@ -26,6 +27,7 @@ const {
   setSortOrder,
   setSelectedQuote,
   setWasTxDeclined,
+  setSlippage,
 } = bridgeSlice.actions;
 
 export {
@@ -35,10 +37,12 @@ export {
   setFromToken,
   setFromTokenInputValue,
   setDestTokenExchangeRates,
+  setDestTokenUsdExchangeRates,
   setSrcTokenExchangeRates,
   setSortOrder,
   setSelectedQuote,
   setWasTxDeclined,
+  setSlippage,
 };
 
 const callBridgeControllerMethod = <T>(
diff --git a/ui/ducks/bridge/bridge.test.ts b/ui/ducks/bridge/bridge.test.ts
index 5a8558039fce..d317d1b53bb8 100644
--- a/ui/ducks/bridge/bridge.test.ts
+++ b/ui/ducks/bridge/bridge.test.ts
@@ -11,6 +11,7 @@ import {
   // eslint-disable-next-line import/no-restricted-paths
 } from '../../../app/scripts/controllers/bridge/types';
 import * as util from '../../helpers/utils/util';
+import { BRIDGE_DEFAULT_SLIPPAGE } from '../../../shared/constants/bridge';
 import bridgeReducer from './bridge';
 import {
   setBridgeFeatureFlags,
@@ -25,6 +26,7 @@ import {
   resetBridgeState,
   setDestTokenExchangeRates,
   setWasTxDeclined,
+  setSlippage,
 } from './actions';
 
 const middleware = [thunk];
@@ -37,6 +39,21 @@ describe('Ducks - Bridge', () => {
     store.clearActions();
   });
 
+  describe('setSlippage', () => {
+    it('calls the "bridge/setSlippage" action', () => {
+      const state = store.getState().bridge;
+      const actionPayload = 0.1;
+
+      store.dispatch(setSlippage(actionPayload as never) as never);
+
+      // Check redux state
+      const actions = store.getActions();
+      expect(actions[0].type).toStrictEqual('bridge/setSlippage');
+      const newState = bridgeReducer(state, actions[0]);
+      expect(newState.slippage).toStrictEqual(actionPayload);
+    });
+  });
+
   describe('setToChainId', () => {
     it('calls the "bridge/setToChainId" action', () => {
       const state = store.getState().bridge;
@@ -150,11 +167,13 @@ describe('Ducks - Bridge', () => {
         toChainId: null,
         fromToken: null,
         toToken: null,
+        slippage: BRIDGE_DEFAULT_SLIPPAGE,
         fromTokenInputValue: null,
         sortOrder: 'cost_ascending',
         toTokenExchangeRate: null,
         fromTokenExchangeRate: null,
         wasTxDeclined: false,
+        toTokenUsdExchangeRate: null,
       });
     });
   });
@@ -215,14 +234,17 @@ describe('Ducks - Bridge', () => {
         fromTokenExchangeRate: null,
         fromTokenInputValue: null,
         selectedQuote: null,
+        slippage: BRIDGE_DEFAULT_SLIPPAGE,
         sortOrder: 'cost_ascending',
         toChainId: null,
         toToken: null,
         toTokenExchangeRate: null,
         wasTxDeclined: false,
+        toTokenUsdExchangeRate: null,
       });
     });
   });
+
   describe('setDestTokenExchangeRates', () => {
     it('fetches token prices and updates dest exchange rates in state, native dest token', async () => {
       // eslint-disable-next-line @typescript-eslint/no-explicit-any
diff --git a/ui/ducks/bridge/bridge.ts b/ui/ducks/bridge/bridge.ts
index 7450fe9f3e9c..82bbba964868 100644
--- a/ui/ducks/bridge/bridge.ts
+++ b/ui/ducks/bridge/bridge.ts
@@ -1,25 +1,27 @@
 import { createAsyncThunk, createSlice } from '@reduxjs/toolkit';
 import { Hex } from '@metamask/utils';
 import { swapsSlice } from '../swaps/swaps';
-import { SwapsTokenObject } from '../../../shared/constants/swaps';
-import { SwapsEthToken } from '../../selectors';
 import {
+  BridgeToken,
   QuoteMetadata,
   QuoteResponse,
   SortOrder,
 } from '../../pages/bridge/types';
+import { BRIDGE_DEFAULT_SLIPPAGE } from '../../../shared/constants/bridge';
 import { getTokenExchangeRate } from './utils';
 
 export type BridgeState = {
   toChainId: Hex | null;
-  fromToken: SwapsTokenObject | SwapsEthToken | null;
-  toToken: SwapsTokenObject | SwapsEthToken | null;
+  fromToken: BridgeToken;
+  toToken: BridgeToken;
   fromTokenInputValue: string | null;
   fromTokenExchangeRate: number | null; // Exchange rate from selected token to the default currency (can be fiat or crypto)
   toTokenExchangeRate: number | null; // Exchange rate from the selected token to the default currency (can be fiat or crypto)
+  toTokenUsdExchangeRate: number | null; // Exchange rate from the selected token to the USD. This is needed for metrics
   sortOrder: SortOrder;
   selectedQuote: (QuoteResponse & QuoteMetadata) | null; // Alternate quote selected by user. When quotes refresh, the best match will be activated.
   wasTxDeclined: boolean; // Whether the user declined the transaction. Relevant for hardware wallets.
+  slippage: number;
 };
 
 const initialState: BridgeState = {
@@ -29,9 +31,11 @@ const initialState: BridgeState = {
   fromTokenInputValue: null,
   fromTokenExchangeRate: null,
   toTokenExchangeRate: null,
+  toTokenUsdExchangeRate: null,
   sortOrder: SortOrder.COST_ASC,
   selectedQuote: null,
   wasTxDeclined: false,
+  slippage: BRIDGE_DEFAULT_SLIPPAGE,
 };
 
 export const setSrcTokenExchangeRates = createAsyncThunk(
@@ -44,6 +48,11 @@ export const setDestTokenExchangeRates = createAsyncThunk(
   getTokenExchangeRate,
 );
 
+export const setDestTokenUsdExchangeRates = createAsyncThunk(
+  'bridge/setDestTokenUsdExchangeRates',
+  getTokenExchangeRate,
+);
+
 const bridgeSlice = createSlice({
   name: 'bridge',
   initialState: { ...initialState },
@@ -73,17 +82,26 @@ const bridgeSlice = createSlice({
     setWasTxDeclined: (state, action) => {
       state.wasTxDeclined = action.payload;
     },
+    setSlippage: (state, action) => {
+      state.slippage = action.payload;
+    },
   },
   extraReducers: (builder) => {
     builder.addCase(setDestTokenExchangeRates.pending, (state) => {
       state.toTokenExchangeRate = null;
     });
+    builder.addCase(setDestTokenUsdExchangeRates.pending, (state) => {
+      state.toTokenUsdExchangeRate = null;
+    });
     builder.addCase(setSrcTokenExchangeRates.pending, (state) => {
       state.fromTokenExchangeRate = null;
     });
     builder.addCase(setDestTokenExchangeRates.fulfilled, (state, action) => {
       state.toTokenExchangeRate = action.payload ?? null;
     });
+    builder.addCase(setDestTokenUsdExchangeRates.fulfilled, (state, action) => {
+      state.toTokenUsdExchangeRate = action.payload ?? null;
+    });
     builder.addCase(setSrcTokenExchangeRates.fulfilled, (state, action) => {
       state.fromTokenExchangeRate = action.payload ?? null;
     });
diff --git a/ui/ducks/bridge/selectors.test.ts b/ui/ducks/bridge/selectors.test.ts
index cd79a8e6454b..0e948ee18784 100644
--- a/ui/ducks/bridge/selectors.test.ts
+++ b/ui/ducks/bridge/selectors.test.ts
@@ -6,10 +6,7 @@ import {
   CHAIN_IDS,
   FEATURED_RPCS,
 } from '../../../shared/constants/network';
-import {
-  ALLOWED_BRIDGE_CHAIN_IDS,
-  BRIDGE_QUOTE_MAX_ETA_SECONDS,
-} from '../../../shared/constants/bridge';
+import { ALLOWED_BRIDGE_CHAIN_IDS } from '../../../shared/constants/bridge';
 import { mockNetworkState } from '../../../test/stub/networks';
 import mockErc20Erc20Quotes from '../../../test/data/bridge/mock-quotes-erc20-erc20.json';
 import mockBridgeQuotesNativeErc20 from '../../../test/data/bridge/mock-quotes-native-erc20.json';
@@ -26,13 +23,11 @@ import {
   getFromChains,
   getFromToken,
   getFromTokens,
-  getFromTopAssets,
   getIsBridgeTx,
   getToChain,
   getToChains,
   getToToken,
   getToTokens,
-  getToTopAssets,
   getValidationErrors,
 } from './selectors';
 
@@ -208,7 +203,7 @@ describe('Bridge selectors', () => {
   });
 
   describe('getToChains', () => {
-    it('excludes selected providerConfig and disabled chains from options', () => {
+    it('includes selected providerConfig and disabled chains from options', () => {
       const state = createBridgeMockStore({
         featureFlagOverrides: {
           extensionConfig: {
@@ -220,6 +215,7 @@ describe('Bridge selectors', () => {
               },
               [CHAIN_IDS.OPTIMISM]: { isActiveSrc: false, isActiveDest: true },
               [CHAIN_IDS.POLYGON]: { isActiveSrc: false, isActiveDest: true },
+              [CHAIN_IDS.BSC]: { isActiveSrc: false, isActiveDest: true },
             },
           },
         },
@@ -229,14 +225,20 @@ describe('Bridge selectors', () => {
       });
       const result = getToChains(state as never);
 
-      expect(result).toHaveLength(3);
+      expect(result).toHaveLength(5);
       expect(result[0]).toStrictEqual(
-        expect.objectContaining({ chainId: CHAIN_IDS.ARBITRUM }),
+        expect.objectContaining({ chainId: CHAIN_IDS.LINEA_MAINNET }),
       );
       expect(result[1]).toStrictEqual(
-        expect.objectContaining({ chainId: CHAIN_IDS.OPTIMISM }),
+        expect.objectContaining({ chainId: CHAIN_IDS.ARBITRUM }),
       );
       expect(result[2]).toStrictEqual(
+        expect.objectContaining({ chainId: CHAIN_IDS.BSC }),
+      );
+      expect(result[3]).toStrictEqual(
+        expect.objectContaining({ chainId: CHAIN_IDS.OPTIMISM }),
+      );
+      expect(result[4]).toStrictEqual(
         expect.objectContaining({ chainId: CHAIN_IDS.POLYGON }),
       );
     });
@@ -387,12 +389,15 @@ describe('Bridge selectors', () => {
 
       expect(result).toStrictEqual({
         address: '0x0000000000000000000000000000000000000000',
-        balance: '0',
+        chainId: '0x1',
         decimals: 18,
         iconUrl: './images/eth_logo.svg',
+        image: './images/eth_logo.svg',
         name: 'Ether',
-        string: '0',
         symbol: 'ETH',
+        type: 'NATIVE',
+        balance: '0',
+        string: '0',
       });
     });
 
@@ -404,12 +409,15 @@ describe('Bridge selectors', () => {
 
       expect(result).toStrictEqual({
         address: '0x0000000000000000000000000000000000000000',
-        balance: '0',
+        chainId: '0x1',
         decimals: 18,
         iconUrl: './images/eth_logo.svg',
+        image: './images/eth_logo.svg',
         name: 'Ether',
-        string: '0',
         symbol: 'ETH',
+        type: 'NATIVE',
+        balance: '0',
+        string: '0',
       });
     });
   });
@@ -467,23 +475,14 @@ describe('Bridge selectors', () => {
       const result = getToTokens(state as never);
 
       expect(result).toStrictEqual({
-        '0x00': { address: '0x00', symbol: 'TEST' },
-      });
-    });
-
-    it('returns empty dest tokens from controller state when toChainId is undefined', () => {
-      const state = createBridgeMockStore({
-        bridgeStateOverrides: {
-          destTokens: { '0x00': { address: '0x00', symbol: 'TEST' } },
+        isLoading: false,
+        toTokens: {
+          '0x00': { address: '0x00', symbol: 'TEST' },
         },
+        toTopAssets: [],
       });
-      const result = getToTokens(state as never);
-
-      expect(result).toStrictEqual({});
     });
-  });
 
-  describe('getToTopAssets', () => {
     it('returns dest top assets from controller state when toChainId is defined', () => {
       const state = createBridgeMockStore({
         bridgeSliceOverrides: { toChainId: '0x1' },
@@ -492,21 +491,11 @@ describe('Bridge selectors', () => {
           destTopAssets: [{ address: '0x00', symbol: 'TEST' }],
         },
       });
-      const result = getToTopAssets(state as never);
-
-      expect(result).toStrictEqual([{ address: '0x00', symbol: 'TEST' }]);
-    });
-
-    it('returns empty dest top assets from controller state when toChainId is undefined', () => {
-      const state = createBridgeMockStore({
-        bridgeStateOverrides: {
-          destTokens: { '0x00': { address: '0x00', symbol: 'TEST' } },
-          destTopAssets: [{ address: '0x00', symbol: 'TEST' }],
-        },
-      });
-      const result = getToTopAssets(state as never);
+      const result = getToTokens(state as never);
 
-      expect(result).toStrictEqual([]);
+      expect(result.toTopAssets).toStrictEqual([
+        { address: '0x00', symbol: 'TEST' },
+      ]);
     });
   });
 
@@ -516,17 +505,20 @@ describe('Bridge selectors', () => {
         bridgeSliceOverrides: { toChainId: '0x1' },
         bridgeStateOverrides: {
           srcTokens: { '0x00': { address: '0x00', symbol: 'TEST' } },
+          srcTopAssets: [{ address: '0x01', symbol: 'SYMB' }],
         },
       });
       const result = getFromTokens(state as never);
 
       expect(result).toStrictEqual({
-        '0x00': { address: '0x00', symbol: 'TEST' },
+        fromTokens: {
+          '0x00': { address: '0x00', symbol: 'TEST' },
+        },
+        fromTopAssets: [{ address: '0x01', symbol: 'SYMB' }],
+        isLoading: false,
       });
     });
-  });
 
-  describe('getFromTopAssets', () => {
     it('returns src top assets from controller state', () => {
       const state = createBridgeMockStore({
         bridgeSliceOverrides: { toChainId: '0x1' },
@@ -535,9 +527,11 @@ describe('Bridge selectors', () => {
           srcTopAssets: [{ address: '0x00', symbol: 'TEST' }],
         },
       });
-      const result = getFromTopAssets(state as never);
+      const result = getFromTokens(state as never);
 
-      expect(result).toStrictEqual([{ address: '0x00', symbol: 'TEST' }]);
+      expect(result.fromTopAssets).toStrictEqual([
+        { address: '0x00', symbol: 'TEST' },
+      ]);
     });
   });
 
@@ -608,13 +602,13 @@ describe('Bridge selectors', () => {
         },
         gasFee: {
           amount: new BigNumber('7.141025952e-8'),
-          amountMax: new BigNumber('3.49092e-8'),
+          amountMax: new BigNumber('9.933761952e-8'),
           valueInCurrency: new BigNumber('7.141025952e-8'),
-          valueInCurrencyMax: new BigNumber('3.49092e-8'),
+          valueInCurrencyMax: new BigNumber('9.933761952e-8'),
         },
         totalMaxNetworkFee: {
-          amount: new BigNumber('0.0010000349092'),
-          valueInCurrency: new BigNumber('0.0010000349092'),
+          amount: new BigNumber('0.00100009933761952'),
+          valueInCurrency: new BigNumber('0.00100009933761952'),
         },
         totalNetworkFee: {
           valueInCurrency: new BigNumber('0.00100007141025952'),
@@ -708,17 +702,17 @@ describe('Bridge selectors', () => {
         },
         gasFee: {
           amount: new BigNumber('7.141025952e-8'),
-          amountMax: new BigNumber('3.49092e-8'),
+          amountMax: new BigNumber('9.933761952e-8'),
           valueInCurrency: new BigNumber('7.141025952e-8'),
-          valueInCurrencyMax: new BigNumber('3.49092e-8'),
+          valueInCurrencyMax: new BigNumber('9.933761952e-8'),
         },
         totalNetworkFee: {
           valueInCurrency: new BigNumber('0.00100007141025952'),
           amount: new BigNumber('0.00100007141025952'),
         },
         totalMaxNetworkFee: {
-          valueInCurrency: new BigNumber('0.0010000349092'),
-          amount: new BigNumber('0.0010000349092'),
+          valueInCurrency: new BigNumber('0.00100009933761952'),
+          amount: new BigNumber('0.00100009933761952'),
         },
       };
       expect(result.sortedQuotes).toHaveLength(2);
@@ -815,17 +809,17 @@ describe('Bridge selectors', () => {
         },
         gasFee: {
           amount: new BigNumber('7.141025952e-8'),
-          amountMax: new BigNumber('3.49092e-8'),
+          amountMax: new BigNumber('9.933761952e-8'),
           valueInCurrency: new BigNumber('7.141025952e-8'),
-          valueInCurrencyMax: new BigNumber('3.49092e-8'),
+          valueInCurrencyMax: new BigNumber('9.933761952e-8'),
         },
         totalNetworkFee: {
           valueInCurrency: new BigNumber('0.00100007141025952'),
           amount: new BigNumber('0.00100007141025952'),
         },
         totalMaxNetworkFee: {
-          valueInCurrency: new BigNumber('0.0010000349092'),
-          amount: new BigNumber('0.0010000349092'),
+          valueInCurrency: new BigNumber('0.00100009933761952'),
+          amount: new BigNumber('0.00100009933761952'),
         },
       };
       expect(result.sortedQuotes).toHaveLength(2);
@@ -870,7 +864,7 @@ describe('Bridge selectors', () => {
         isLoading: false,
         isQuoteGoingToRefresh: false,
         quotesLastFetchedMs: undefined,
-        quotesRefreshCount: undefined,
+        quotesRefreshCount: 0,
         recommendedQuote: undefined,
         quotesInitialLoadTimeMs: undefined,
         sortedQuotes: [],
@@ -953,136 +947,6 @@ describe('Bridge selectors', () => {
         mockBridgeQuotesNativeErc20[0]?.quote.requestId,
       );
     });
-
-    it('should recommend 2nd cheapest quote if ETA exceeds 1 hour', () => {
-      const state = createBridgeMockStore({
-        bridgeSliceOverrides: { sortOrder: SortOrder.COST_ASC },
-        bridgeStateOverrides: {
-          quotes: [
-            mockBridgeQuotesNativeErc20[1],
-            {
-              ...mockBridgeQuotesNativeErc20[0],
-              estimatedProcessingTimeInSeconds:
-                BRIDGE_QUOTE_MAX_ETA_SECONDS + 1,
-              quote: {
-                ...mockBridgeQuotesNativeErc20[0].quote,
-                requestId: 'cheapestQuoteWithLongETA',
-              },
-            },
-          ],
-        },
-      });
-
-      const { activeQuote, recommendedQuote, sortedQuotes } = getBridgeQuotes(
-        state as never,
-      );
-
-      expect(activeQuote?.quote.requestId).toStrictEqual(
-        '4277a368-40d7-4e82-aa67-74f29dc5f98a',
-      );
-      expect(recommendedQuote?.quote.requestId).toStrictEqual(
-        '4277a368-40d7-4e82-aa67-74f29dc5f98a',
-      );
-      expect(sortedQuotes).toHaveLength(2);
-      expect(sortedQuotes[0]?.quote.requestId).toStrictEqual(
-        '4277a368-40d7-4e82-aa67-74f29dc5f98a',
-      );
-      expect(sortedQuotes[1]?.quote.requestId).toStrictEqual(
-        'cheapestQuoteWithLongETA',
-      );
-    });
-
-    it('should recommend 2nd fastest quote if adjustedReturn is less than 80% of cheapest quote', () => {
-      const state = createBridgeMockStore({
-        featureFlagOverrides: {
-          extensionConfig: {
-            chains: {
-              '0xa': { isActiveSrc: true, isActiveDest: false },
-              '0x89': { isActiveSrc: false, isActiveDest: true },
-            },
-          },
-        },
-        bridgeSliceOverrides: {
-          toChainId: '0x89',
-          fromToken: { address: zeroAddress(), symbol: 'ETH' },
-          toToken: { address: zeroAddress(), symbol: 'TEST' },
-          fromTokenExchangeRate: 2524.25,
-          sortOrder: SortOrder.ETA_ASC,
-          toTokenExchangeRate: 0.998781,
-        },
-        bridgeStateOverrides: {
-          quotes: [
-            ...mockBridgeQuotesNativeErc20,
-            {
-              ...mockBridgeQuotesNativeErc20[0],
-              estimatedProcessingTimeInSeconds: 1,
-              quote: {
-                ...mockBridgeQuotesNativeErc20[0].quote,
-                requestId: 'fastestQuote',
-                destTokenAmount: '1',
-              },
-            },
-          ],
-        },
-        metamaskStateOverrides: {
-          currencyRates: {
-            ETH: {
-              conversionRate: 2524.25,
-            },
-            POL: {
-              conversionRate: 0.354073,
-              usdConversionRate: 1,
-            },
-          },
-          marketData: {},
-          ...mockNetworkState(
-            { chainId: CHAIN_IDS.MAINNET },
-            { chainId: CHAIN_IDS.LINEA_MAINNET },
-            { chainId: CHAIN_IDS.POLYGON },
-            { chainId: CHAIN_IDS.OPTIMISM },
-          ),
-        },
-      });
-
-      const { activeQuote, recommendedQuote, sortedQuotes } = getBridgeQuotes(
-        state as never,
-      );
-      const {
-        sentAmount,
-        totalNetworkFee,
-        toTokenAmount,
-        adjustedReturn,
-        cost,
-      } = activeQuote ?? {};
-
-      expect(activeQuote?.quote.requestId).toStrictEqual(
-        '4277a368-40d7-4e82-aa67-74f29dc5f98a',
-      );
-      expect(recommendedQuote?.quote.requestId).toStrictEqual(
-        '4277a368-40d7-4e82-aa67-74f29dc5f98a',
-      );
-      expect(sentAmount?.valueInCurrency?.toString()).toStrictEqual('25.2425');
-      expect(totalNetworkFee?.valueInCurrency?.toString()).toStrictEqual(
-        '2.52459306428938562',
-      );
-      expect(toTokenAmount?.valueInCurrency?.toString()).toStrictEqual(
-        '24.226654664163',
-      );
-      expect(adjustedReturn?.valueInCurrency?.toString()).toStrictEqual(
-        '21.70206159987361438',
-      );
-      expect(cost?.valueInCurrency?.toString()).toStrictEqual(
-        '3.54043840012638562',
-      );
-      expect(sortedQuotes).toHaveLength(3);
-      expect(sortedQuotes[0]?.quote.requestId).toStrictEqual('fastestQuote');
-      expect(sortedQuotes[1]?.quote.requestId).toStrictEqual(
-        '4277a368-40d7-4e82-aa67-74f29dc5f98a',
-      );
-      expect(sortedQuotes[2]?.quote.requestId).toStrictEqual(
-        '381c23bc-e3e4-48fe-bc53-257471e388ad',
-      );
-    });
   });
 
   describe('getValidationErrors', () => {
@@ -1119,12 +983,14 @@ describe('Bridge selectors', () => {
       const state = createBridgeMockStore({
         bridgeSliceOverrides: {
           toChainId: '0x1',
-          fromTokenInputValue: '0.001',
+          fromToken: { decimals: 6, address: zeroAddress() },
+          fromChain: { chainId: CHAIN_IDS.MAINNET },
         },
         bridgeStateOverrides: {
           srcTokens: { '0x00': { address: '0x00', symbol: 'TEST' } },
           srcTopAssets: [{ address: '0x00', symbol: 'TEST' }],
           quotesLastFetched: Date.now(),
+          quoteRequest: { srcTokenAmount: '1000' },
         },
       });
       const result = getValidationErrors(state as never);
@@ -1168,12 +1034,14 @@ describe('Bridge selectors', () => {
       const state = createBridgeMockStore({
         bridgeSliceOverrides: {
           toChainId: '0x1',
-          fromTokenInputValue: '0.001',
+          fromToken: { decimals: 6, address: zeroAddress() },
+          fromChain: { chainId: CHAIN_IDS.MAINNET },
         },
         bridgeStateOverrides: {
           srcTokens: { '0x00': { address: '0x00', symbol: 'TEST' } },
           srcTopAssets: [{ address: '0x00', symbol: 'TEST' }],
           quotesLastFetched: Date.now(),
+          quoteRequest: { srcTokenAmount: '1000' },
         },
       });
       const result = getValidationErrors(state as never);
@@ -1314,7 +1182,7 @@ describe('Bridge selectors', () => {
       ).toStrictEqual(true);
     });
 
-    it('should return isInsufficientGasForQuote=false when balance is greater than required network fees in quote', () => {
+    it('should return isInsufficientGasForQuote=false when balance is greater than max network fees in quote', () => {
       const state = createBridgeMockStore({
         bridgeSliceOverrides: {
           toChainId: '0x1',
@@ -1333,11 +1201,14 @@ describe('Bridge selectors', () => {
       expect(
         getBridgeQuotes(state as never).activeQuote?.totalNetworkFee.amount,
       ).toStrictEqual(new BigNumber('0.00100012486628784'));
+      expect(
+        getBridgeQuotes(state as never).activeQuote?.totalMaxNetworkFee.amount,
+      ).toStrictEqual(new BigNumber('0.00100017369940784'));
       expect(
         getBridgeQuotes(state as never).activeQuote?.sentAmount.amount,
       ).toStrictEqual(new BigNumber('0.01'));
       expect(
-        result.isInsufficientGasForQuote(new BigNumber('0.01100012486628785')),
+        result.isInsufficientGasForQuote(new BigNumber('1')),
       ).toStrictEqual(false);
     });
 
@@ -1355,6 +1226,7 @@ describe('Bridge selectors', () => {
           toChainId: '0x89',
           fromToken: { address: zeroAddress(), symbol: 'ETH' },
           toToken: { address: zeroAddress(), symbol: 'TEST' },
+          fromTokenInputValue: '1',
           fromTokenExchangeRate: 2524.25,
           toTokenExchangeRate: 0.798781,
         },
diff --git a/ui/ducks/bridge/selectors.ts b/ui/ducks/bridge/selectors.ts
index 2bf90f502b3b..9241af57db6d 100644
--- a/ui/ducks/bridge/selectors.ts
+++ b/ui/ducks/bridge/selectors.ts
@@ -1,4 +1,5 @@
 import {
+  AddNetworkFields,
   NetworkConfiguration,
   NetworkState,
 } from '@metamask/network-controller';
@@ -6,19 +7,17 @@ import { orderBy, uniqBy } from 'lodash';
 import { createSelector } from 'reselect';
 import { GasFeeEstimates } from '@metamask/gas-fee-controller';
 import { BigNumber } from 'bignumber.js';
+import { calcTokenAmount } from '@metamask/notification-services-controller/push-services';
 import {
   getIsBridgeEnabled,
   getMarketData,
-  getSwapsDefaultToken,
   getUSDConversionRate,
   getUSDConversionRateByChainId,
   selectConversionRateByChainId,
-  SwapsEthToken,
 } from '../../selectors/selectors';
 import {
   ALLOWED_BRIDGE_CHAIN_IDS,
   BRIDGE_PREFERRED_GAS_ESTIMATE,
-  BRIDGE_QUOTE_MAX_ETA_SECONDS,
   BRIDGE_QUOTE_MAX_RETURN_DIFFERENCE_PERCENTAGE,
 } from '../../../shared/constants/bridge';
 import {
@@ -28,17 +27,18 @@ import {
   // eslint-disable-next-line import/no-restricted-paths
 } from '../../../app/scripts/controllers/bridge/types';
 import { createDeepEqualSelector } from '../../../shared/modules/selectors/util';
+import { SWAPS_CHAINID_DEFAULT_TOKEN_MAP } from '../../../shared/constants/swaps';
 import {
   getProviderConfig,
   getNetworkConfigurationsByChainId,
 } from '../../../shared/modules/selectors/networks';
-import { SwapsTokenObject } from '../../../shared/constants/swaps';
 import { getConversionRate, getGasFeeEstimates } from '../metamask/metamask';
 // TODO: Remove restricted import
 // eslint-disable-next-line import/no-restricted-paths
 import { RequestStatus } from '../../../app/scripts/controllers/bridge/constants';
 import {
   L1GasFees,
+  BridgeToken,
   QuoteMetadata,
   QuoteResponse,
   SortOrder,
@@ -53,8 +53,12 @@ import {
   calcEstimatedAndMaxTotalGasFee,
   isNativeAddress,
 } from '../../pages/bridge/utils/quote';
+import { AssetType } from '../../../shared/constants/transaction';
 import { decGWEIToHexWEI } from '../../../shared/modules/conversion.utils';
-import { calcTokenAmount } from '../../../shared/lib/transactions-controller-utils';
+import {
+  CHAIN_ID_TOKEN_IMAGE_MAP,
+  FEATURED_RPCS,
+} from '../../../shared/constants/network';
 import {
   exchangeRatesFromNativeAndCurrencyRates,
   exchangeRateFromMarketData,
@@ -115,18 +119,14 @@ export const getFromChain = createDeepEqualSelector(
 );
 
 export const getToChains = createDeepEqualSelector(
-  getFromChain,
   getAllBridgeableNetworks,
   (state: BridgeAppState) => state.metamask.bridgeState?.bridgeFeatureFlags,
   (
-    fromChain,
     allBridgeableNetworks,
     bridgeFeatureFlags,
-  ): NetworkConfiguration[] =>
-    allBridgeableNetworks.filter(
+  ): (AddNetworkFields | NetworkConfiguration)[] =>
+    uniqBy([...allBridgeableNetworks, ...FEATURED_RPCS], 'chainId').filter(
       ({ chainId }) =>
-        fromChain?.chainId &&
-        chainId !== fromChain.chainId &&
         bridgeFeatureFlags[BridgeFeatureFlagsKey.EXTENSION_CONFIG].chains[
           chainId
         ]?.isActiveDest,
@@ -136,43 +136,74 @@ export const getToChains = createDeepEqualSelector(
 export const getToChain = createDeepEqualSelector(
   getToChains,
   (state: BridgeAppState) => state.bridge.toChainId,
-  (toChains, toChainId): NetworkConfiguration | undefined =>
+  (toChains, toChainId): NetworkConfiguration | AddNetworkFields | undefined =>
     toChains.find(({ chainId }) => chainId === toChainId),
 );
 
-export const getFromTokens = (state: BridgeAppState) => {
-  return state.metamask.bridgeState.srcTokens ?? {};
-};
-
-export const getFromTopAssets = (state: BridgeAppState) => {
-  return state.metamask.bridgeState.srcTopAssets ?? [];
-};
-
-export const getToTopAssets = (state: BridgeAppState) => {
-  return state.bridge.toChainId ? state.metamask.bridgeState.destTopAssets : [];
-};
+export const getFromTokens = createDeepEqualSelector(
+  (state: BridgeAppState) => state.metamask.bridgeState.srcTokens,
+  (state: BridgeAppState) => state.metamask.bridgeState.srcTopAssets,
+  (state: BridgeAppState) =>
+    state.metamask.bridgeState.srcTokensLoadingStatus === RequestStatus.LOADING,
+  (fromTokens, fromTopAssets, isLoading) => {
+    return {
+      isLoading,
+      fromTokens: fromTokens ?? {},
+      fromTopAssets: fromTopAssets ?? [],
+    };
+  },
+);
 
-export const getToTokens = (state: BridgeAppState) => {
-  return state.bridge.toChainId ? state.metamask.bridgeState.destTokens : {};
-};
+export const getToTokens = createDeepEqualSelector(
+  (state: BridgeAppState) => state.metamask.bridgeState.destTokens,
+  (state: BridgeAppState) => state.metamask.bridgeState.destTopAssets,
+  (state: BridgeAppState) =>
+    state.metamask.bridgeState.destTokensLoadingStatus ===
+    RequestStatus.LOADING,
+  (toTokens, toTopAssets, isLoading) => {
+    return {
+      isLoading,
+      toTokens: toTokens ?? {},
+      toTopAssets: toTopAssets ?? [],
+    };
+  },
+);
 
-export const getFromToken = (
-  state: BridgeAppState,
-): SwapsTokenObject | SwapsEthToken | null => {
-  return state.bridge.fromToken?.address
-    ? state.bridge.fromToken
-    : getSwapsDefaultToken(state);
-};
+export const getFromToken = createSelector(
+  (state: BridgeAppState) => state.bridge.fromToken,
+  getFromChain,
+  (fromToken, fromChain): BridgeToken => {
+    if (!fromChain?.chainId) {
+      return null;
+    }
+    if (fromToken?.address) {
+      return fromToken;
+    }
+    return {
+      ...SWAPS_CHAINID_DEFAULT_TOKEN_MAP[
+        fromChain.chainId as keyof typeof SWAPS_CHAINID_DEFAULT_TOKEN_MAP
+      ],
+      chainId: fromChain.chainId,
+      image:
+        CHAIN_ID_TOKEN_IMAGE_MAP[
+          fromChain.chainId as keyof typeof CHAIN_ID_TOKEN_IMAGE_MAP
+        ],
+      balance: '0',
+      string: '0',
+      type: AssetType.native,
+    };
+  },
+);
 
-export const getToToken = (
-  state: BridgeAppState,
-): SwapsTokenObject | SwapsEthToken | null => {
+export const getToToken = (state: BridgeAppState): BridgeToken => {
   return state.bridge.toToken;
 };
 
 export const getFromAmount = (state: BridgeAppState): string | null =>
   state.bridge.fromTokenInputValue;
 
+export const getSlippage = (state: BridgeAppState) => state.bridge.slippage;
+
 export const getQuoteRequest = (state: BridgeAppState) => {
   const { quoteRequest } = state.metamask.bridgeState;
   return quoteRequest;
@@ -245,11 +276,31 @@ export const getToTokenConversionRate = createDeepEqualSelector(
   getToChain,
   getMarketData,
   getToToken,
+  getNetworkConfigurationsByChainId,
   (state) => ({
     state,
     toTokenExchangeRate: state.bridge.toTokenExchangeRate,
+    toTokenUsdExchangeRate: state.bridge.toTokenUsdExchangeRate,
   }),
-  (toChain, marketData, toToken, { state, toTokenExchangeRate }) => {
+  (
+    toChain,
+    marketData,
+    toToken,
+    allNetworksByChainId,
+    { state, toTokenExchangeRate, toTokenUsdExchangeRate },
+  ) => {
+    // When the toChain is not imported, the exchange rate to native asset is not available
+    // The rate in the bridge state is used instead
+    if (
+      toChain?.chainId &&
+      !allNetworksByChainId[toChain.chainId] &&
+      toTokenExchangeRate
+    ) {
+      return {
+        valueInCurrency: toTokenExchangeRate,
+        usd: toTokenUsdExchangeRate,
+      };
+    }
     if (toChain?.chainId && toToken && marketData) {
       const { chainId } = toChain;
 
@@ -271,8 +322,8 @@ export const getToTokenConversionRate = createDeepEqualSelector(
   },
 );
 
-const _getQuotesWithMetadata = createDeepEqualSelector(
-  (state) => state.metamask.bridgeState.quotes,
+const _getQuotesWithMetadata = createSelector(
+  (state: BridgeAppState) => state.metamask.bridgeState.quotes,
   getToTokenConversionRate,
   getFromTokenConversionRate,
   getConversionRate,
@@ -343,7 +394,7 @@ const _getQuotesWithMetadata = createDeepEqualSelector(
   },
 );
 
-const _getSortedQuotesWithMetadata = createDeepEqualSelector(
+const _getSortedQuotesWithMetadata = createSelector(
   _getQuotesWithMetadata,
   getBridgeSortOrder,
   (quotesWithMetadata, sortOrder) => {
@@ -354,56 +405,16 @@ const _getSortedQuotesWithMetadata = createDeepEqualSelector(
           (quote) => quote.estimatedProcessingTimeInSeconds,
           'asc',
         );
-      case SortOrder.COST_ASC:
       default:
         return orderBy(
           quotesWithMetadata,
-          ({ cost }) => cost.valueInCurrency,
+          ({ cost }) => cost.valueInCurrency?.toNumber(),
           'asc',
         );
     }
   },
 );
 
-const _getRecommendedQuote = createDeepEqualSelector(
-  _getSortedQuotesWithMetadata,
-  getBridgeSortOrder,
-  (sortedQuotesWithMetadata, sortOrder) => {
-    if (!sortedQuotesWithMetadata.length) {
-      return undefined;
-    }
-
-    const bestReturnValue = BigNumber.max(
-      sortedQuotesWithMetadata.map(
-        ({ adjustedReturn }) => adjustedReturn.valueInCurrency ?? 0,
-      ),
-    );
-
-    const isFastestQuoteValueReasonable = (
-      adjustedReturnInCurrency: BigNumber | null,
-    ) =>
-      adjustedReturnInCurrency
-        ? adjustedReturnInCurrency
-            .div(bestReturnValue)
-            .gte(BRIDGE_QUOTE_MAX_RETURN_DIFFERENCE_PERCENTAGE)
-        : true;
-
-    const isBestPricedQuoteETAReasonable = (
-      estimatedProcessingTimeInSeconds: number,
-    ) => estimatedProcessingTimeInSeconds < BRIDGE_QUOTE_MAX_ETA_SECONDS;
-
-    return (
-      sortedQuotesWithMetadata.find((quote) => {
-        return sortOrder === SortOrder.ETA_ASC
-          ? isFastestQuoteValueReasonable(quote.adjustedReturn.valueInCurrency)
-          : isBestPricedQuoteETAReasonable(
-              quote.estimatedProcessingTimeInSeconds,
-            );
-      }) ?? sortedQuotesWithMetadata[0]
-    );
-  },
-);
-
 // Generates a pseudo-unique string that identifies each quote
 // by aggregator, bridge, steps and value
 const _getQuoteIdentifier = ({ quote }: QuoteResponse & L1GasFees) =>
@@ -426,7 +437,6 @@ const _getSelectedQuote = createSelector(
 
 export const getBridgeQuotes = createSelector(
   _getSortedQuotesWithMetadata,
-  _getRecommendedQuote,
   _getSelectedQuote,
   (state) => state.metamask.bridgeState.quotesLastFetched,
   (state) =>
@@ -438,7 +448,6 @@ export const getBridgeQuotes = createSelector(
   getQuoteRequest,
   (
     sortedQuotesWithMetadata,
-    recommendedQuote,
     selectedQuote,
     quotesLastFetchedMs,
     isLoading,
@@ -449,8 +458,8 @@ export const getBridgeQuotes = createSelector(
     { insufficientBal },
   ) => ({
     sortedQuotes: sortedQuotesWithMetadata,
-    recommendedQuote,
-    activeQuote: selectedQuote ?? recommendedQuote,
+    recommendedQuote: sortedQuotesWithMetadata[0],
+    activeQuote: selectedQuote ?? sortedQuotesWithMetadata[0],
     quotesLastFetchedMs,
     isLoading,
     quoteFetchError,
@@ -506,14 +515,14 @@ export const getFromAmountInCurrency = createSelector(
 
 export const getValidationErrors = createDeepEqualSelector(
   getBridgeQuotes,
-  getFromAmount,
   _getValidatedSrcAmount,
   getFromToken,
+  getFromAmount,
   (
     { activeQuote, quotesLastFetchedMs, isLoading },
-    fromAmount,
     validatedSrcAmount,
     fromToken,
+    fromTokenInputValue,
   ) => {
     return {
       isNoQuotesAvailable: Boolean(
@@ -530,7 +539,7 @@ export const getValidationErrors = createDeepEqualSelector(
       },
       // Shown after fetching quotes
       isInsufficientGasForQuote: (balance?: BigNumber) => {
-        if (balance && activeQuote && fromToken) {
+        if (balance && activeQuote && fromToken && fromTokenInputValue) {
           return isNativeAddress(fromToken.address)
             ? balance
                 .sub(activeQuote.totalMaxNetworkFee.amount)
@@ -541,10 +550,13 @@ export const getValidationErrors = createDeepEqualSelector(
         return false;
       },
       isInsufficientBalance: (balance?: BigNumber) =>
-        fromAmount && balance !== undefined ? balance.lt(fromAmount) : false,
+        validatedSrcAmount && balance !== undefined
+          ? balance.lt(validatedSrcAmount)
+          : false,
       isEstimatedReturnLow:
         activeQuote?.sentAmount?.valueInCurrency &&
-        activeQuote?.adjustedReturn?.valueInCurrency
+        activeQuote?.adjustedReturn?.valueInCurrency &&
+        fromTokenInputValue
           ? activeQuote.adjustedReturn.valueInCurrency.lt(
               new BigNumber(
                 BRIDGE_QUOTE_MAX_RETURN_DIFFERENCE_PERCENTAGE,
diff --git a/ui/helpers/constants/design-system.ts b/ui/helpers/constants/design-system.ts
index 762aa517af2c..297d0d0a7f04 100644
--- a/ui/helpers/constants/design-system.ts
+++ b/ui/helpers/constants/design-system.ts
@@ -56,6 +56,7 @@ export enum BackgroundColor {
   backgroundDefault = 'background-default',
   backgroundAlternative = 'background-alternative',
   backgroundMuted = 'background-muted',
+  backgroundAlternativeSoft = 'background-alternative-soft',
   backgroundHover = 'background-hover',
   backgroundPressed = 'background-pressed',
   iconDefault = 'icon-default',
@@ -114,6 +115,7 @@ export enum BorderColor {
 export enum TextColor {
   textDefault = 'text-default',
   textAlternative = 'text-alternative',
+  textAlternativeSoft = 'text-alternative-soft',
   textMuted = 'text-muted',
   overlayInverse = 'overlay-inverse',
   primaryDefault = 'primary-default',
@@ -144,6 +146,7 @@ export enum TextColor {
 export enum IconColor {
   iconDefault = 'icon-default',
   iconAlternative = 'icon-alternative',
+  iconAlternativeSoft = 'icon-alternative-soft',
   iconMuted = 'icon-muted',
   overlayInverse = 'overlay-inverse',
   primaryDefault = 'primary-default',
diff --git a/ui/hooks/bridge/__snapshots__/useTokensWithFiltering.test.ts.snap b/ui/hooks/bridge/__snapshots__/useTokensWithFiltering.test.ts.snap
new file mode 100644
index 000000000000..8fceeffe9730
--- /dev/null
+++ b/ui/hooks/bridge/__snapshots__/useTokensWithFiltering.test.ts.snap
@@ -0,0 +1,192 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`useTokensWithFiltering should not return tokens that are not in the allowlist 1`] = `
+[
+  {
+    "address": "0x0000000000000000000000000000000000000000",
+    "balance": "0.000000000000000014",
+    "chainId": "0xe708",
+    "decimals": 18,
+    "image": "./images/eth_logo.svg",
+    "string": "0.000000000000000014",
+    "symbol": "ETH",
+    "tokenFiatAmount": 3.53395e-14,
+    "type": "NATIVE",
+  },
+  {
+    "address": "0x0000000000000000000000000000000000000000",
+    "balance": "0.00000000000000001",
+    "chainId": "0x1",
+    "decimals": 18,
+    "image": "./images/eth_logo.svg",
+    "string": "0.00000000000000001",
+    "symbol": "ETH",
+    "tokenFiatAmount": 2.5242500000000003e-14,
+    "type": "NATIVE",
+  },
+  {
+    "address": "0x6b3595068778dd592e39a122f4f5a5cf09c90fe2",
+    "aggregators": [],
+    "balance": "",
+    "chainId": "0x1",
+    "decimals": 18,
+    "erc20": true,
+    "erc721": false,
+    "iconUrl": "images/contract/sushi.svg",
+    "image": "images/contract/sushi.svg",
+    "name": "SushiSwap",
+    "string": undefined,
+    "symbol": "SUSHI",
+    "type": "TOKEN",
+  },
+  {
+    "address": "0x0000000000000000000000000000000000000000",
+    "balance": "0x0",
+    "chainId": "0x1",
+    "decimals": 18,
+    "iconUrl": "./images/eth_logo.svg",
+    "image": "./images/eth_logo.svg",
+    "name": "Ether",
+    "string": "0x0",
+    "symbol": "ETH",
+    "type": "NATIVE",
+  },
+  {
+    "address": "0x1f9840a85d5af5bf1d1762f925bdaddc4201f984",
+    "aggregators": [],
+    "balance": "",
+    "chainId": "0x1",
+    "decimals": 18,
+    "erc20": true,
+    "iconUrl": "images/contract/uni.svg",
+    "image": "images/contract/uni.svg",
+    "name": "Uniswap",
+    "string": undefined,
+    "symbol": "UNI",
+    "type": "TOKEN",
+  },
+]
+`;
+
+exports[`useTokensWithFiltering should return all tokens when chainId === activeChainId, sorted by balance 1`] = `
+[
+  {
+    "address": "0x1f9840a85d5af5bf1d1762f925bdaddc4201f984",
+    "balance": "0.00184",
+    "chainId": "0x1",
+    "decimals": 6,
+    "image": undefined,
+    "isNative": false,
+    "string": "0.00184",
+    "tokenFiatAmount": 0.004232,
+    "type": "TOKEN",
+  },
+  {
+    "address": "0x0000000000000000000000000000000000000000",
+    "balance": "0.000000000000000014",
+    "chainId": "0xe708",
+    "decimals": 18,
+    "image": "./images/eth_logo.svg",
+    "string": "0.000000000000000014",
+    "symbol": "ETH",
+    "tokenFiatAmount": 3.53395e-14,
+    "type": "NATIVE",
+  },
+  {
+    "address": "0x0000000000000000000000000000000000000000",
+    "balance": "0.00000000000000001",
+    "chainId": "0x1",
+    "decimals": 18,
+    "image": "./images/eth_logo.svg",
+    "string": "0.00000000000000001",
+    "symbol": "ETH",
+    "tokenFiatAmount": 2.5242500000000003e-14,
+    "type": "NATIVE",
+  },
+  {
+    "address": "0x514910771af9ca656af840dff83e8264ecf986ca",
+    "balance": "1",
+    "chainId": "0x1",
+    "image": undefined,
+    "isNative": false,
+    "string": "1",
+    "tokenFiatAmount": null,
+    "type": "TOKEN",
+  },
+  {
+    "address": "0x1f9840a85d5af5bf1d1762f925bdaddc4201f984",
+    "balance": "",
+    "chainId": "0x1",
+    "decimals": 6,
+    "string": undefined,
+    "type": "TOKEN",
+  },
+  {
+    "address": "0x6b3595068778dd592e39a122f4f5a5cf09c90fe2",
+    "aggregators": [],
+    "balance": "",
+    "chainId": "0x1",
+    "decimals": 18,
+    "erc20": true,
+    "erc721": false,
+    "iconUrl": "images/contract/sushi.svg",
+    "image": "images/contract/sushi.svg",
+    "name": "SushiSwap",
+    "string": undefined,
+    "symbol": "SUSHI",
+    "type": "TOKEN",
+  },
+  {
+    "address": "0x0000000000000000000000000000000000000000",
+    "balance": "0x0",
+    "chainId": "0x1",
+    "decimals": 18,
+    "iconUrl": "./images/eth_logo.svg",
+    "image": "./images/eth_logo.svg",
+    "name": "Ether",
+    "string": "0x0",
+    "symbol": "ETH",
+    "type": "NATIVE",
+  },
+  {
+    "address": "0x1f9840a85d5af5bf1d1762f925bdaddc4201f984",
+    "aggregators": [],
+    "balance": "",
+    "chainId": "0x1",
+    "decimals": 18,
+    "erc20": true,
+    "iconUrl": "images/contract/uni.svg",
+    "image": "images/contract/uni.svg",
+    "name": "Uniswap",
+    "string": undefined,
+    "symbol": "UNI",
+    "type": "TOKEN",
+  },
+  {
+    "address": "0xdac17f958d2ee523a2206206994597c13d831ec7",
+    "aggregators": [],
+    "balance": "",
+    "chainId": "0x1",
+    "decimals": 6,
+    "erc20": true,
+    "iconUrl": "images/contract/usdt.svg",
+    "image": "images/contract/usdt.svg",
+    "name": "Tether USD",
+    "string": undefined,
+    "symbol": "USDT",
+    "type": "TOKEN",
+  },
+  {
+    "address": "0x0000000000000000000000000000000000000000",
+    "balance": "0x0",
+    "chainId": "0x1",
+    "decimals": 18,
+    "iconUrl": "./images/eth_logo.svg",
+    "image": "./images/eth_logo.svg",
+    "name": "Ether",
+    "string": "0x0",
+    "symbol": "ETH",
+    "type": "NATIVE",
+  },
+]
+`;
diff --git a/ui/hooks/bridge/useBridgeExchangeRates.ts b/ui/hooks/bridge/useBridgeExchangeRates.ts
index ef3c6669a2c8..20f70b17dfd6 100644
--- a/ui/hooks/bridge/useBridgeExchangeRates.ts
+++ b/ui/hooks/bridge/useBridgeExchangeRates.ts
@@ -5,11 +5,16 @@ import {
   getQuoteRequest,
   getToChain,
 } from '../../ducks/bridge/selectors';
-import { getCurrentCurrency, getMarketData } from '../../selectors';
+import {
+  getCurrentCurrency,
+  getMarketData,
+  getParticipateInMetaMetrics,
+} from '../../selectors';
 import { decimalToPrefixedHex } from '../../../shared/modules/conversion.utils';
 import { getCurrentChainId } from '../../../shared/modules/selectors/networks';
 import {
   setDestTokenExchangeRates,
+  setDestTokenUsdExchangeRates,
   setSrcTokenExchangeRates,
 } from '../../ducks/bridge/bridge';
 import { exchangeRateFromMarketData } from '../../ducks/bridge/utils';
@@ -19,6 +24,7 @@ export const useBridgeExchangeRates = () => {
   const { activeQuote } = useSelector(getBridgeQuotes);
   const chainId = useSelector(getCurrentChainId);
   const toChain = useSelector(getToChain);
+  const isMetaMetricsEnabled = useSelector(getParticipateInMetaMetrics);
 
   const dispatch = useDispatch();
 
@@ -78,6 +84,16 @@ export const useBridgeExchangeRates = () => {
             currency,
           }),
         );
+        // If the selected currency is not USD, fetch the USD exchange rate for metrics
+        if (isMetaMetricsEnabled && currency !== 'usd') {
+          dispatch(
+            setDestTokenUsdExchangeRates({
+              chainId: toChainId,
+              tokenAddress: toTokenAddress,
+              currency: 'usd',
+            }),
+          );
+        }
       }
     }
   }, [toChainId, toTokenAddress]);
diff --git a/ui/hooks/bridge/useBridgeTokens.ts b/ui/hooks/bridge/useBridgeTokens.ts
new file mode 100644
index 000000000000..acddb7ec2fb0
--- /dev/null
+++ b/ui/hooks/bridge/useBridgeTokens.ts
@@ -0,0 +1,39 @@
+import { useEffect, useState } from 'react';
+import { useSelector } from 'react-redux';
+import { getAllBridgeableNetworks } from '../../ducks/bridge/selectors';
+import { fetchBridgeTokens } from '../../pages/bridge/bridge.util';
+
+// This hook is used to fetch the bridge tokens for all bridgeable networks
+export const useBridgeTokens = () => {
+  const allBridgeChains = useSelector(getAllBridgeableNetworks);
+
+  const [tokenAllowlistByChainId, setTokenAllowlistByChainId] = useState<
+    Record<string, Set<string>>
+  >({});
+
+  useEffect(() => {
+    const tokenAllowlistPromises = Promise.allSettled(
+      allBridgeChains.map(
+        async ({ chainId }) =>
+          await fetchBridgeTokens(chainId).then((tokens) => ({
+            [chainId]: new Set(Object.keys(tokens)),
+          })),
+      ),
+    );
+
+    (async () => {
+      const results = await tokenAllowlistPromises;
+      const tokenAllowlistResults = Object.fromEntries(
+        results.map((result) => {
+          if (result.status === 'fulfilled') {
+            return Object.entries(result.value)[0];
+          }
+          return [];
+        }),
+      );
+      setTokenAllowlistByChainId(tokenAllowlistResults);
+    })();
+  }, [allBridgeChains.length]);
+
+  return tokenAllowlistByChainId;
+};
diff --git a/ui/hooks/bridge/useBridging.ts b/ui/hooks/bridge/useBridging.ts
index bfc47491caa0..f48a4e515ec6 100644
--- a/ui/hooks/bridge/useBridging.ts
+++ b/ui/hooks/bridge/useBridging.ts
@@ -4,7 +4,6 @@ import { useHistory } from 'react-router-dom';
 import { setBridgeFeatureFlags } from '../../ducks/bridge/actions';
 import {
   ///: BEGIN:ONLY_INCLUDE_IF(build-main,build-beta,build-flask)
-  getCurrentKeyring,
   getDataCollectionForMarketing,
   getIsBridgeChain,
   getIsBridgeEnabled,
@@ -28,10 +27,10 @@ import {
   ///: END:ONLY_INCLUDE_IF
 } from '../../helpers/constants/routes';
 ///: BEGIN:ONLY_INCLUDE_IF(build-main,build-beta,build-flask)
-import { isHardwareKeyring } from '../../helpers/utils/hardware';
 import { getPortfolioUrl } from '../../helpers/utils/portfolio';
 import { SwapsTokenObject } from '../../../shared/constants/swaps';
 import { getProviderConfig } from '../../../shared/modules/selectors/networks';
+// eslint-disable-next-line import/no-restricted-paths
 import { useCrossChainSwapsEventTracker } from './useCrossChainSwapsEventTracker';
 ///: END:ONLY_INCLUDE_IF
 
@@ -45,10 +44,7 @@ const useBridging = () => {
   const isMetaMetricsEnabled = useSelector(getParticipateInMetaMetrics);
   const isMarketingEnabled = useSelector(getDataCollectionForMarketing);
   const providerConfig = useSelector(getProviderConfig);
-  const keyring = useSelector(getCurrentKeyring);
   const isExternalServicesEnabled = useSelector(getUseExternalServices);
-  // @ts-expect-error keyring type is wrong maybe?
-  const usingHardwareWallet = isHardwareKeyring(keyring.type);
 
   const isBridgeSupported = useSelector(getIsBridgeEnabled);
   const isBridgeChain = useSelector(getIsBridgeChain);
@@ -126,7 +122,6 @@ const useBridging = () => {
       isBridgeSupported,
       isBridgeChain,
       dispatch,
-      usingHardwareWallet,
       history,
       metaMetricsId,
       trackEvent,
diff --git a/ui/hooks/bridge/useCountdownTimer.test.ts b/ui/hooks/bridge/useCountdownTimer.test.ts
index 0adc18f68c15..55360c729a44 100644
--- a/ui/hooks/bridge/useCountdownTimer.test.ts
+++ b/ui/hooks/bridge/useCountdownTimer.test.ts
@@ -1,6 +1,7 @@
 import { renderHookWithProvider } from '../../../test/lib/render-helpers';
 import { createBridgeMockStore } from '../../../test/jest/mock-store';
 import { flushPromises } from '../../../test/lib/timer-helpers';
+import { SECOND } from '../../../shared/constants/time';
 import { useCountdownTimer } from './useCountdownTimer';
 
 jest.useFakeTimers();
@@ -30,13 +31,11 @@ describe('useCountdownTimer', () => {
     let i = 0;
     while (i <= 40) {
       const secondsLeft = Math.min(41, 40 - i + 2);
-      expect(result.current).toStrictEqual(
-        `0:${secondsLeft < 10 ? '0' : ''}${secondsLeft}`,
-      );
+      expect(result.current).toStrictEqual(secondsLeft * SECOND);
       i += 10;
       jest.advanceTimersByTime(10000);
       await flushPromises();
     }
-    expect(result.current).toStrictEqual('0:00');
+    expect(result.current).toStrictEqual(0);
   });
 });
diff --git a/ui/hooks/bridge/useCountdownTimer.ts b/ui/hooks/bridge/useCountdownTimer.ts
index 39e7ac9d2eca..ad022f7d4274 100644
--- a/ui/hooks/bridge/useCountdownTimer.ts
+++ b/ui/hooks/bridge/useCountdownTimer.ts
@@ -1,18 +1,17 @@
-import { Duration } from 'luxon';
 import { useEffect, useState } from 'react';
 import { useSelector } from 'react-redux';
 import {
   getBridgeQuotes,
   getBridgeQuotesConfig,
 } from '../../ducks/bridge/selectors';
-import { SECOND } from '../../../shared/constants/time';
 
+const STEP = 1000;
 /**
  * Custom hook that provides a countdown timer based on the last fetched quotes timestamp.
  *
  * This hook calculates the remaining time until the next refresh interval and updates every second.
  *
- * @returns The formatted remaining time in 'm:ss' format.
+ * @returns The remaining time in milliseconds.
  */
 export const useCountdownTimer = () => {
   const { quotesLastFetchedMs } = useSelector(getBridgeQuotes);
@@ -22,18 +21,16 @@ export const useCountdownTimer = () => {
 
   useEffect(() => {
     if (quotesLastFetchedMs) {
-      setTimeRemaining(
-        refreshRate - (Date.now() - quotesLastFetchedMs) + SECOND,
-      );
+      setTimeRemaining(refreshRate - (Date.now() - quotesLastFetchedMs) + STEP);
     }
   }, [quotesLastFetchedMs]);
 
   useEffect(() => {
     const interval = setInterval(() => {
-      setTimeRemaining(Math.max(0, timeRemaining - SECOND));
-    }, SECOND);
+      setTimeRemaining(Math.max(0, timeRemaining - STEP));
+    }, STEP);
     return () => clearInterval(interval);
   }, [timeRemaining]);
 
-  return Duration.fromMillis(timeRemaining).toFormat('m:ss');
+  return timeRemaining;
 };
diff --git a/ui/hooks/bridge/useCrossChainSwapsEventTracker.ts b/ui/hooks/bridge/useCrossChainSwapsEventTracker.ts
index f28244cba995..ad4b3698fe84 100644
--- a/ui/hooks/bridge/useCrossChainSwapsEventTracker.ts
+++ b/ui/hooks/bridge/useCrossChainSwapsEventTracker.ts
@@ -104,6 +104,7 @@ export const useCrossChainSwapsEventTracker = () => {
           action_type: ActionType.CROSSCHAIN_V1,
           ...properties,
         },
+        value: 'value' in properties ? (properties.value as never) : undefined,
       });
     },
     [trackEvent],
diff --git a/ui/hooks/bridge/useLatestBalance.test.ts b/ui/hooks/bridge/useLatestBalance.test.ts
index 6d79672e4550..25f0d0936791 100644
--- a/ui/hooks/bridge/useLatestBalance.test.ts
+++ b/ui/hooks/bridge/useLatestBalance.test.ts
@@ -1,4 +1,4 @@
-import { BigNumber } from 'ethers';
+import { BigNumber } from 'bignumber.js';
 import { renderHookWithProvider } from '../../../test/lib/render-helpers';
 import { CHAIN_IDS } from '../../../shared/constants/network';
 import { createBridgeMockStore } from '../../../test/jest/mock-store';
@@ -47,8 +47,8 @@ describe('useLatestBalance', () => {
     global.ethereumProvider = provider as any;
   });
 
-  it('returns formattedBalance for native asset in current chain', async () => {
-    mockGetBalance.mockResolvedValue(BigNumber.from('1000000000000000000'));
+  it('returns balanceAmount for native asset in current chain', async () => {
+    mockGetBalance.mockResolvedValue(new BigNumber('1000000000000000000'));
 
     const { result, waitForNextUpdate } = renderUseLatestBalance(
       { address: zeroAddress(), decimals: 18 },
@@ -57,7 +57,7 @@ describe('useLatestBalance', () => {
     );
 
     await waitForNextUpdate();
-    expect(result.current.formattedBalance).toStrictEqual('1');
+    expect(result.current.balanceAmount).toStrictEqual(new BigNumber('1'));
 
     expect(mockGetBalance).toHaveBeenCalledTimes(1);
     expect(mockGetBalance).toHaveBeenCalledWith(
@@ -66,8 +66,8 @@ describe('useLatestBalance', () => {
     expect(mockFetchTokenBalance).toHaveBeenCalledTimes(0);
   });
 
-  it('returns formattedBalance for ERC20 asset in current chain', async () => {
-    mockFetchTokenBalance.mockResolvedValueOnce(BigNumber.from('15390000'));
+  it('returns balanceAmount for ERC20 asset in current chain', async () => {
+    mockFetchTokenBalance.mockResolvedValueOnce(new BigNumber('15390000'));
 
     const { result, waitForNextUpdate } = renderUseLatestBalance(
       { address: '0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48', decimals: '6' },
@@ -76,7 +76,7 @@ describe('useLatestBalance', () => {
     );
 
     await waitForNextUpdate();
-    expect(result.current.formattedBalance).toStrictEqual('15.39');
+    expect(result.current.balanceAmount).toStrictEqual(new BigNumber('15.39'));
 
     expect(mockFetchTokenBalance).toHaveBeenCalledTimes(1);
     expect(mockFetchTokenBalance).toHaveBeenCalledWith(
diff --git a/ui/hooks/bridge/useLatestBalance.ts b/ui/hooks/bridge/useLatestBalance.ts
index 6aaf7da68c0c..98ee8dfd4f4c 100644
--- a/ui/hooks/bridge/useLatestBalance.ts
+++ b/ui/hooks/bridge/useLatestBalance.ts
@@ -1,10 +1,8 @@
 import { useSelector } from 'react-redux';
 import { Hex } from '@metamask/utils';
 import { Numeric } from '../../../shared/modules/Numeric';
-import { DEFAULT_PRECISION } from '../useCurrencyDisplay';
 import { getCurrentChainId } from '../../../shared/modules/selectors/networks';
-import { getSelectedInternalAccount, SwapsEthToken } from '../../selectors';
-import { SwapsTokenObject } from '../../../shared/constants/swaps';
+import { getSelectedInternalAccount } from '../../selectors';
 import { calcLatestSrcBalance } from '../../../shared/modules/bridge-utils/balance';
 import { useAsyncResult } from '../useAsyncResult';
 import { calcTokenAmount } from '../../../shared/lib/transactions-controller-utils';
@@ -14,10 +12,14 @@ import { calcTokenAmount } from '../../../shared/lib/transactions-controller-uti
  *
  * @param token - The token object for which the balance is to be fetched. Can be null.
  * @param chainId - The chain ID to be used for fetching the balance. Optional.
- * @returns An object containing the formatted balance as a string.
+ * @returns An object containing the balanceAmount as a string.
  */
 const useLatestBalance = (
-  token: SwapsTokenObject | SwapsEthToken | null,
+  token: {
+    address: string;
+    decimals: number;
+    symbol: string;
+  } | null,
   chainId?: Hex,
 ) => {
   const { address: selectedAddress } = useSelector(getSelectedInternalAccount);
@@ -52,13 +54,6 @@ const useLatestBalance = (
   const tokenDecimals = token?.decimals ? Number(token.decimals) : 1;
 
   return {
-    formattedBalance:
-      token && latestBalance
-        ? latestBalance
-            .shiftedBy(tokenDecimals)
-            .round(DEFAULT_PRECISION)
-            .toString()
-        : undefined,
     balanceAmount:
       token && latestBalance
         ? calcTokenAmount(latestBalance.toString(), tokenDecimals)
diff --git a/ui/hooks/bridge/useTokensWithFiltering.test.ts b/ui/hooks/bridge/useTokensWithFiltering.test.ts
new file mode 100644
index 000000000000..e6903756bcfd
--- /dev/null
+++ b/ui/hooks/bridge/useTokensWithFiltering.test.ts
@@ -0,0 +1,108 @@
+import { renderHookWithProvider } from '../../../test/lib/render-helpers';
+import { createBridgeMockStore } from '../../../test/jest/mock-store';
+import { STATIC_MAINNET_TOKEN_LIST } from '../../../shared/constants/tokens';
+import { SWAPS_CHAINID_DEFAULT_TOKEN_MAP } from '../../../shared/constants/swaps';
+import { CHAIN_IDS } from '../../../shared/constants/network';
+import { useTokensWithFiltering } from './useTokensWithFiltering';
+
+const mockUseTokenTracker = jest
+  .fn()
+  .mockReturnValue({ tokensWithBalances: [] });
+jest.mock('../useTokenTracker', () => ({
+  useTokenTracker: () => mockUseTokenTracker(),
+}));
+
+const NATIVE_TOKEN = SWAPS_CHAINID_DEFAULT_TOKEN_MAP[CHAIN_IDS.MAINNET];
+
+describe('useTokensWithFiltering', () => {
+  afterEach(() => {
+    jest.clearAllMocks();
+  });
+
+  it('should return all tokens when chainId === activeChainId, sorted by balance', () => {
+    const mockStore = createBridgeMockStore({
+      metamaskStateOverrides: {
+        completedOnboarding: true,
+        allDetectedTokens: {
+          '0x1': {
+            '0x0dcd5d886577d5081b0c52e242ef29e70be3e7bc': [
+              {
+                address: '0x1f9840a85d5af5bf1d1762f925bdaddc4201f984',
+                decimals: 6,
+              }, // USDC
+            ],
+          },
+        },
+      },
+    });
+    const { result } = renderHookWithProvider(
+      () =>
+        useTokensWithFiltering(
+          {
+            [NATIVE_TOKEN.address]: NATIVE_TOKEN,
+            ...STATIC_MAINNET_TOKEN_LIST,
+          },
+          [
+            { address: '0x6b3595068778dd592e39a122f4f5a5cf09c90fe2' }, // UNI
+            { address: NATIVE_TOKEN.address },
+            { address: '0x1f9840a85d5af5bf1d1762f925bdaddc4201f984' }, // USDC
+            { address: '0xdac17f958d2ee523a2206206994597c13d831ec7' }, // USDT
+          ],
+          {
+            [CHAIN_IDS.MAINNET]: new Set(
+              Object.keys(STATIC_MAINNET_TOKEN_LIST),
+            ),
+          },
+          CHAIN_IDS.MAINNET,
+        ),
+      mockStore,
+    );
+    // The first 10 tokens returned
+    const first10Tokens = [...result.current(() => true)].slice(0, 10);
+    expect(first10Tokens).toMatchSnapshot();
+  });
+
+  it('should not return tokens that are not in the allowlist', () => {
+    const mockStore = createBridgeMockStore({
+      metamaskStateOverrides: {
+        completedOnboarding: true,
+        allDetectedTokens: {
+          '0x1': {
+            '0x0dcd5d886577d5081b0c52e242ef29e70be3e7bc': [
+              {
+                address: '0x1f9840a85d5af5bf1d1762f925bdaddc4201f984',
+                decimals: 6,
+              }, // USDC
+            ],
+          },
+        },
+      },
+    });
+    const { result } = renderHookWithProvider(
+      () =>
+        useTokensWithFiltering(
+          {
+            [NATIVE_TOKEN.address]: NATIVE_TOKEN,
+            ...STATIC_MAINNET_TOKEN_LIST,
+          },
+          [
+            { address: '0x6b3595068778dd592e39a122f4f5a5cf09c90fe2' }, // UNI
+            { address: NATIVE_TOKEN.address },
+            { address: '0x1f9840a85d5af5bf1d1762f925bdaddc4201f984' }, // USDC
+            { address: '0xdac17f958d2ee523a2206206994597c13d831ec7' }, // USDT
+          ],
+          // Only 1 token in allowlist
+          {
+            [CHAIN_IDS.MAINNET]: new Set([
+              '0x6b3595068778dd592e39a122f4f5a5cf09c90fe2',
+            ]),
+          },
+          CHAIN_IDS.MAINNET,
+        ),
+      mockStore,
+    );
+    // The first 5 tokens returned
+    const first5Tokens = [...result.current(() => true)].slice(0, 5);
+    expect(first5Tokens).toMatchSnapshot();
+  });
+});
diff --git a/ui/hooks/bridge/useTokensWithFiltering.ts b/ui/hooks/bridge/useTokensWithFiltering.ts
new file mode 100644
index 000000000000..56b16ddc4b68
--- /dev/null
+++ b/ui/hooks/bridge/useTokensWithFiltering.ts
@@ -0,0 +1,218 @@
+import { useCallback } from 'react';
+import { useSelector } from 'react-redux';
+import { isEqual } from 'lodash';
+import { ChainId } from '@metamask/controller-utils';
+import { Hex } from '@metamask/utils';
+import { useParams } from 'react-router-dom';
+import { zeroAddress } from 'ethereumjs-util';
+import {
+  getAllDetectedTokensForSelectedAddress,
+  getCurrentCurrency,
+  getSelectedInternalAccountWithBalance,
+  getTokenExchangeRates,
+} from '../../selectors';
+import { getConversionRate } from '../../ducks/metamask/metamask';
+import { SwapsTokenObject } from '../../../shared/constants/swaps';
+import {
+  AssetWithDisplayData,
+  ERC20Asset,
+  NativeAsset,
+} from '../../components/multichain/asset-picker-amount/asset-picker-modal/types';
+import { AssetType } from '../../../shared/constants/transaction';
+import { isNativeAddress } from '../../pages/bridge/utils/quote';
+import { CHAIN_ID_TOKEN_IMAGE_MAP } from '../../../shared/constants/network';
+import { getCurrentChainId } from '../../../shared/modules/selectors/networks';
+import { Token } from '../../components/app/assets/token-list/token-list';
+import { useMultichainBalances } from '../useMultichainBalances';
+
+type FilterPredicate = (
+  symbol: string,
+  address?: string,
+  tokenChainId?: string,
+) => boolean;
+
+/**
+ * Returns a token list generator that filters and sorts tokens in this order
+ * - matches URL token parameter
+ * - matches search query
+ * - highest balance in selected currency
+ * - detected tokens (with balance)
+ * - popularity
+ * - all other tokens
+ *
+ * @param tokenList - a mapping of token addresses in the selected chainId to token metadata from the bridge-api
+ * @param topTokens - a list of top tokens from the swap-api
+ * @param tokenAddressAllowlistByChainId - a mapping of all supported chainIds to a Set of allowed token addresses
+ * @param chainId - the selected src/dest chainId
+ */
+export const useTokensWithFiltering = (
+  tokenList: Record<string, SwapsTokenObject>,
+  topTokens: { address: string }[],
+  tokenAddressAllowlistByChainId: Record<string, Set<string>>,
+  chainId?: ChainId | Hex,
+) => {
+  const { token: tokenAddressFromUrl } = useParams();
+  const allDetectedTokens: Record<string, Token[]> = useSelector(
+    getAllDetectedTokensForSelectedAddress,
+  );
+
+  const { balance } = useSelector(getSelectedInternalAccountWithBalance);
+
+  const tokenConversionRates = useSelector(getTokenExchangeRates, isEqual);
+  const conversionRate = useSelector(getConversionRate);
+  const currentCurrency = useSelector(getCurrentCurrency);
+  const currentChainId = useSelector(getCurrentChainId);
+
+  const { assetsWithBalance: multichainTokensWithBalance } =
+    useMultichainBalances();
+
+  // This transforms the token object from the bridge-api into the format expected by the AssetPicker
+  const buildTokenData = (
+    token?: SwapsTokenObject,
+  ): AssetWithDisplayData<NativeAsset | ERC20Asset> | undefined => {
+    if (!chainId || !token) {
+      return undefined;
+    }
+    // Only tokens on the active chain are processed here here
+    const sharedFields = { ...token, chainId };
+
+    if (isNativeAddress(token.address)) {
+      return {
+        ...sharedFields,
+        type: AssetType.native,
+        address: zeroAddress(),
+        image:
+          CHAIN_ID_TOKEN_IMAGE_MAP[
+            chainId as keyof typeof CHAIN_ID_TOKEN_IMAGE_MAP
+          ],
+        balance: currentChainId === chainId ? balance : '',
+        string: currentChainId === chainId ? balance : '',
+      };
+    }
+
+    return {
+      ...sharedFields,
+      type: AssetType.token,
+      image: token.iconUrl,
+      // Only tokens with 0 balance are processed here so hardcode empty string
+      balance: '',
+      string: undefined,
+      address: token.address || zeroAddress(),
+    };
+  };
+
+  // This returns whether the token is blocked by any of the supported chainIds
+  const isTokenBlocked = (tokenAddress: string, tokenChainId: string) =>
+    !tokenAddressAllowlistByChainId[tokenChainId]?.has(
+      tokenAddress.toLowerCase(),
+    );
+
+  // shouldAddToken is a filter condition passed in from the AssetPicker that determines whether a token should be included
+  const filteredTokenListGenerator = useCallback(
+    (shouldAddToken: FilterPredicate) =>
+      (function* (): Generator<
+        AssetWithDisplayData<NativeAsset> | AssetWithDisplayData<ERC20Asset>
+      > {
+        // If a token address is in the URL (e.g. from a deep link), yield that token first
+        if (tokenAddressFromUrl) {
+          const token =
+            tokenList?.[tokenAddressFromUrl] ??
+            tokenList?.[tokenAddressFromUrl.toLowerCase()];
+          if (
+            shouldAddToken(token.symbol, token.address ?? undefined, chainId)
+          ) {
+            const tokenWithData = buildTokenData(token);
+            if (tokenWithData) {
+              yield tokenWithData;
+            }
+          }
+        }
+
+        // Yield multichain tokens with balances and are not blocked
+        for (const token of multichainTokensWithBalance) {
+          if (
+            shouldAddToken(
+              token.symbol,
+              token.address ?? undefined,
+              token.chainId,
+            ) &&
+            (token.address
+              ? !isTokenBlocked(token.address, token.chainId)
+              : true)
+          ) {
+            // If there's no address, set it to the native address in swaps/bridge
+            yield { ...token, address: token.address || zeroAddress() };
+          }
+        }
+
+        // Yield all detected tokens for all supported chains
+        for (const token of Object.values(allDetectedTokens).flat()) {
+          if (
+            shouldAddToken(
+              token.symbol,
+              token.address ?? undefined,
+              token.chainId,
+            ) &&
+            (token.address
+              ? !isTokenBlocked(token.address, token.chainId)
+              : true)
+          ) {
+            yield {
+              ...token,
+              type: AssetType.token,
+              // Balance is not 0 but is not in the data so hardcode 0
+              // If a detected token is selected useLatestBalance grabs the on-chain balance
+              balance: '',
+              string: undefined,
+            };
+          }
+        }
+
+        // Yield topTokens from selected chain
+        for (const token_ of topTokens) {
+          const matchedToken =
+            tokenList?.[token_.address] ??
+            tokenList?.[token_.address.toLowerCase()];
+          if (
+            matchedToken &&
+            shouldAddToken(
+              matchedToken.symbol,
+              matchedToken.address ?? undefined,
+              chainId,
+            )
+          ) {
+            const token = buildTokenData(matchedToken);
+            if (token) {
+              yield token;
+            }
+          }
+        }
+
+        // Yield other tokens from selected chain
+        for (const token_ of Object.values(tokenList)) {
+          if (
+            token_ &&
+            shouldAddToken(token_.symbol, token_.address ?? undefined, chainId)
+          ) {
+            const token = buildTokenData(token_);
+            if (token) {
+              yield token;
+            }
+          }
+        }
+      })(),
+    [
+      multichainTokensWithBalance,
+      topTokens,
+      tokenConversionRates,
+      conversionRate,
+      currentCurrency,
+      chainId,
+      tokenList,
+      tokenAddressFromUrl,
+      allDetectedTokens,
+    ],
+  );
+
+  return filteredTokenListGenerator;
+};
diff --git a/ui/hooks/useTokensWithFiltering.test.ts b/ui/hooks/useTokensWithFiltering.test.ts
deleted file mode 100644
index 0a523b69bd74..000000000000
--- a/ui/hooks/useTokensWithFiltering.test.ts
+++ /dev/null
@@ -1,157 +0,0 @@
-import { renderHookWithProvider } from '../../test/lib/render-helpers';
-import { createBridgeMockStore } from '../../test/jest/mock-store';
-import { STATIC_MAINNET_TOKEN_LIST } from '../../shared/constants/tokens';
-import {
-  SWAPS_CHAINID_DEFAULT_TOKEN_MAP,
-  SwapsTokenObject,
-  TokenBucketPriority,
-} from '../../shared/constants/swaps';
-import { useTokensWithFiltering } from './useTokensWithFiltering';
-
-const mockUseTokenTracker = jest
-  .fn()
-  .mockReturnValue({ tokensWithBalances: [] });
-jest.mock('./useTokenTracker', () => ({
-  useTokenTracker: () => mockUseTokenTracker(),
-}));
-
-const TEST_CHAIN_ID = '0x1';
-const NATIVE_TOKEN = SWAPS_CHAINID_DEFAULT_TOKEN_MAP[TEST_CHAIN_ID];
-
-const MOCK_TOP_ASSETS = [
-  { address: '0x6b3595068778dd592e39a122f4f5a5cf09c90fe2' }, // UNI
-  { address: NATIVE_TOKEN.address },
-  { address: '0x1f9840a85d5af5bf1d1762f925bdaddc4201f984' }, // USDC
-  { address: '0xdac17f958d2ee523a2206206994597c13d831ec7' }, // USDT
-];
-
-const MOCK_TOKEN_LIST_BY_ADDRESS: Record<string, SwapsTokenObject> = {
-  [NATIVE_TOKEN.address]: NATIVE_TOKEN,
-  ...STATIC_MAINNET_TOKEN_LIST,
-};
-
-describe('useTokensWithFiltering should return token list generator', () => {
-  afterEach(() => {
-    jest.clearAllMocks();
-  });
-
-  it('when chainId === activeChainId and sorted by topAssets', () => {
-    const mockStore = createBridgeMockStore();
-    const { result } = renderHookWithProvider(
-      () =>
-        useTokensWithFiltering(
-          MOCK_TOKEN_LIST_BY_ADDRESS,
-          MOCK_TOP_ASSETS,
-          TokenBucketPriority.top,
-          TEST_CHAIN_ID,
-        ),
-      mockStore,
-    );
-
-    expect(result.current).toHaveLength(1);
-    expect(typeof result.current).toStrictEqual('function');
-    const tokenGenerator = result.current(() => true);
-    expect(tokenGenerator.next().value).toStrictEqual({
-      address: '0x0000000000000000000000000000000000000000',
-      balance: undefined,
-      decimals: 18,
-      iconUrl: './images/eth_logo.svg',
-      identiconAddress: null,
-      image: './images/eth_logo.svg',
-      name: 'Ether',
-      primaryLabel: 'ETH',
-      rawFiat: '',
-      chainId: '0x1',
-      rightPrimaryLabel: undefined,
-      rightSecondaryLabel: '',
-      secondaryLabel: 'Ether',
-      symbol: 'ETH',
-      type: 'NATIVE',
-    });
-    expect(tokenGenerator.next().value).toStrictEqual({
-      address: '0x6b3595068778dd592e39a122f4f5a5cf09c90fe2',
-      aggregators: [],
-      balance: undefined,
-      decimals: 18,
-      erc20: true,
-      erc721: false,
-      chainId: '0x1',
-      iconUrl:
-        'https://static.cx.metamask.io/api/v1/tokenIcons/1/0x6b3595068778dd592e39a122f4f5a5cf09c90fe2.png',
-      identiconAddress: null,
-      image: 'images/contract/sushi.svg',
-      name: 'SushiSwap',
-      primaryLabel: 'SUSHI',
-      rawFiat: '',
-      rightPrimaryLabel: undefined,
-      rightSecondaryLabel: '',
-      secondaryLabel: 'SushiSwap',
-      symbol: 'SUSHI',
-      type: 'TOKEN',
-    });
-  });
-
-  it('when chainId === activeChainId and sorted by balance', () => {
-    const mockStore = createBridgeMockStore();
-    mockUseTokenTracker.mockReturnValue({
-      tokensWithBalances: [
-        {
-          address: '0xdac17f958d2ee523a2206206994597c13d831ec7',
-          balance: '0xa',
-        },
-      ],
-    });
-    const { result } = renderHookWithProvider(
-      () =>
-        useTokensWithFiltering(
-          MOCK_TOKEN_LIST_BY_ADDRESS,
-          MOCK_TOP_ASSETS,
-          TokenBucketPriority.owned,
-          TEST_CHAIN_ID,
-        ),
-      mockStore,
-    );
-
-    expect(result.current).toHaveLength(1);
-    expect(typeof result.current).toStrictEqual('function');
-    const tokenGenerator = result.current(() => true);
-    expect(tokenGenerator.next().value).toStrictEqual({
-      address: '0x0000000000000000000000000000000000000000',
-      balance: '0x0',
-      decimals: 18,
-      iconUrl: './images/eth_logo.svg',
-      identiconAddress: null,
-      image: './images/eth_logo.svg',
-      name: 'Ether',
-      chainId: '0x1',
-      primaryLabel: 'ETH',
-      rawFiat: '0',
-      rightPrimaryLabel: '0 ETH',
-      rightSecondaryLabel: '$0.00 USD',
-      secondaryLabel: 'Ether',
-      string: '0',
-      symbol: 'ETH',
-      type: 'NATIVE',
-    });
-    expect(tokenGenerator.next().value).toStrictEqual({
-      address: '0xdac17f958d2ee523a2206206994597c13d831ec7',
-      aggregators: [],
-      balance: '0xa',
-      decimals: 6,
-      erc20: true,
-      iconUrl:
-        'https://static.cx.metamask.io/api/v1/tokenIcons/1/0xdac17f958d2ee523a2206206994597c13d831ec7.png',
-      identiconAddress: null,
-      image: 'images/contract/usdt.svg',
-      name: 'Tether USD',
-      chainId: '0x1',
-      primaryLabel: 'USDT',
-      rawFiat: '',
-      rightPrimaryLabel: undefined,
-      rightSecondaryLabel: '',
-      secondaryLabel: 'Tether USD',
-      symbol: 'USDT',
-      type: 'TOKEN',
-    });
-  });
-});
diff --git a/ui/hooks/useTokensWithFiltering.ts b/ui/hooks/useTokensWithFiltering.ts
deleted file mode 100644
index ef155eb9ca1c..000000000000
--- a/ui/hooks/useTokensWithFiltering.ts
+++ /dev/null
@@ -1,202 +0,0 @@
-import { useCallback, useMemo } from 'react';
-import { useSelector } from 'react-redux';
-import { isEqual } from 'lodash';
-import { ChainId, hexToBN } from '@metamask/controller-utils';
-import { Hex } from '@metamask/utils';
-import { useParams } from 'react-router-dom';
-import {
-  getAllTokens,
-  getCurrentCurrency,
-  getSelectedInternalAccountWithBalance,
-  getShouldHideZeroBalanceTokens,
-  getTokenExchangeRates,
-} from '../selectors';
-import { getConversionRate } from '../ducks/metamask/metamask';
-import {
-  SWAPS_CHAINID_DEFAULT_TOKEN_MAP,
-  SwapsTokenObject,
-  TokenBucketPriority,
-} from '../../shared/constants/swaps';
-import { getValueFromWeiHex } from '../../shared/modules/conversion.utils';
-import { EtherDenomination } from '../../shared/constants/common';
-import {
-  AssetWithDisplayData,
-  ERC20Asset,
-  NativeAsset,
-  TokenWithBalance,
-} from '../components/multichain/asset-picker-amount/asset-picker-modal/types';
-import { AssetType } from '../../shared/constants/transaction';
-import { isSwapsDefaultTokenSymbol } from '../../shared/modules/swaps.utils';
-import { useTokenTracker } from './useTokenTracker';
-import { getRenderableTokenData } from './useTokensToSearch';
-
-/*
- * Returns a token list generator that filters and sorts tokens based on
- * query match, balance/popularity, all other tokens
- */
-export const useTokensWithFiltering = (
-  tokenList: Record<string, SwapsTokenObject>,
-  topTokens: { address: string }[],
-  sortOrder: TokenBucketPriority = TokenBucketPriority.owned,
-  chainId?: ChainId | Hex,
-) => {
-  const { token: tokenAddressFromUrl } = useParams();
-
-  // Only includes non-native tokens
-  const allDetectedTokens = useSelector(getAllTokens);
-  const { address: selectedAddress, balance: balanceOnActiveChain } =
-    useSelector(getSelectedInternalAccountWithBalance);
-
-  const allDetectedTokensForChainAndAddress = chainId
-    ? allDetectedTokens?.[chainId]?.[selectedAddress] ?? []
-    : [];
-
-  const shouldHideZeroBalanceTokens = useSelector(
-    getShouldHideZeroBalanceTokens,
-  );
-  const {
-    tokensWithBalances: erc20TokensWithBalances,
-  }: { tokensWithBalances: TokenWithBalance[] } = useTokenTracker({
-    tokens: allDetectedTokensForChainAndAddress,
-    address: selectedAddress,
-    hideZeroBalanceTokens: Boolean(shouldHideZeroBalanceTokens),
-  });
-
-  const tokenConversionRates = useSelector(getTokenExchangeRates, isEqual);
-  const conversionRate = useSelector(getConversionRate);
-  const currentCurrency = useSelector(getCurrentCurrency);
-
-  const sortedErc20TokensWithBalances = useMemo(
-    () =>
-      erc20TokensWithBalances.toSorted(
-        (a, b) => Number(b.string) - Number(a.string),
-      ),
-    [erc20TokensWithBalances],
-  );
-
-  const filteredTokenListGenerator = useCallback(
-    (
-      shouldAddToken: (
-        symbol: string,
-        address?: string,
-        tokenChainId?: string,
-      ) => boolean,
-    ) => {
-      const buildTokenData = (
-        token: SwapsTokenObject,
-      ):
-        | AssetWithDisplayData<NativeAsset>
-        | AssetWithDisplayData<ERC20Asset>
-        | undefined => {
-        if (chainId && shouldAddToken(token.symbol, token.address, chainId)) {
-          return getRenderableTokenData(
-            {
-              ...token,
-              type: isSwapsDefaultTokenSymbol(token.symbol, chainId)
-                ? AssetType.native
-                : AssetType.token,
-              image: token.iconUrl,
-              chainId,
-            },
-            tokenConversionRates,
-            conversionRate,
-            currentCurrency,
-            chainId,
-            tokenList,
-          );
-        }
-        return undefined;
-      };
-
-      return (function* (): Generator<
-        AssetWithDisplayData<NativeAsset> | AssetWithDisplayData<ERC20Asset>
-      > {
-        const balance = hexToBN(balanceOnActiveChain);
-        const srcBalanceFields =
-          sortOrder === TokenBucketPriority.owned
-            ? {
-                balance: balanceOnActiveChain,
-                string: getValueFromWeiHex({
-                  value: balance,
-                  numberOfDecimals: 4,
-                  toDenomination: EtherDenomination.ETH,
-                }),
-                chainId,
-              }
-            : {};
-        const nativeToken = buildTokenData({
-          ...SWAPS_CHAINID_DEFAULT_TOKEN_MAP[
-            chainId as keyof typeof SWAPS_CHAINID_DEFAULT_TOKEN_MAP
-          ],
-          ...srcBalanceFields,
-        });
-        if (nativeToken) {
-          yield nativeToken;
-        }
-
-        if (tokenAddressFromUrl) {
-          const tokenListItem =
-            tokenList?.[tokenAddressFromUrl] ??
-            tokenList?.[tokenAddressFromUrl.toLowerCase()];
-          if (tokenListItem) {
-            const tokenWithTokenListData = buildTokenData(tokenListItem);
-            if (tokenWithTokenListData) {
-              yield tokenWithTokenListData;
-            }
-          }
-        }
-
-        if (sortOrder === TokenBucketPriority.owned) {
-          for (const tokenWithBalance of sortedErc20TokensWithBalances) {
-            const cachedTokenData =
-              tokenWithBalance.address &&
-              tokenList &&
-              (tokenList[tokenWithBalance.address] ??
-                tokenList[tokenWithBalance.address.toLowerCase()]);
-            if (cachedTokenData) {
-              const combinedTokenData = buildTokenData({
-                ...tokenWithBalance,
-                ...(cachedTokenData ?? {}),
-              });
-              if (combinedTokenData) {
-                yield combinedTokenData;
-              }
-            }
-          }
-        }
-
-        for (const topToken of topTokens) {
-          const tokenListItem =
-            tokenList?.[topToken.address] ??
-            tokenList?.[topToken.address.toLowerCase()];
-          if (tokenListItem) {
-            const tokenWithTokenListData = buildTokenData(tokenListItem);
-            if (tokenWithTokenListData) {
-              yield tokenWithTokenListData;
-            }
-          }
-        }
-
-        for (const token of Object.values(tokenList)) {
-          const tokenWithTokenListData = buildTokenData(token);
-          if (tokenWithTokenListData) {
-            yield tokenWithTokenListData;
-          }
-        }
-      })();
-    },
-    [
-      balanceOnActiveChain,
-      sortedErc20TokensWithBalances,
-      topTokens,
-      tokenConversionRates,
-      conversionRate,
-      currentCurrency,
-      chainId,
-      tokenList,
-      tokenAddressFromUrl,
-    ],
-  );
-
-  return filteredTokenListGenerator;
-};
diff --git a/ui/pages/asset/components/asset-page.test.tsx b/ui/pages/asset/components/asset-page.test.tsx
index 28e232a0ba0b..71ca5483b50c 100644
--- a/ui/pages/asset/components/asset-page.test.tsx
+++ b/ui/pages/asset/components/asset-page.test.tsx
@@ -291,13 +291,13 @@ describe('AssetPage', () => {
     expect(bridgeButton).not.toBeDisabled();
 
     fireEvent.click(bridgeButton as HTMLElement);
-    expect(openTabSpy).toHaveBeenCalledTimes(1);
 
-    await waitFor(() =>
+    await waitFor(() => {
+      expect(openTabSpy).toHaveBeenCalledTimes(1);
       expect(openTabSpy).toHaveBeenCalledWith({
         url: `https://portfolio.test/bridge?metamaskEntry=ext_bridge_button&metametricsId=&metricsEnabled=false&marketingEnabled=false&token=${token.address}`,
-      }),
-    );
+      });
+    });
   });
 
   it('should not show the Bridge button if chain id is not supported', async () => {
diff --git a/ui/pages/asset/components/token-buttons.tsx b/ui/pages/asset/components/token-buttons.tsx
index 7a1a71132fbb..c61cb5eeedb3 100644
--- a/ui/pages/asset/components/token-buttons.tsx
+++ b/ui/pages/asset/components/token-buttons.tsx
@@ -335,7 +335,8 @@ const TokenButtons = ({
               />
             }
             label={t('bridge')}
-            onClick={() => {
+            onClick={async () => {
+              await setCorrectChain();
               openBridgeExperience(MetaMetricsSwapsEventSource.TokenView, {
                 ...token,
                 iconUrl: token.image,
diff --git a/ui/pages/bridge/__snapshots__/index.test.tsx.snap b/ui/pages/bridge/__snapshots__/index.test.tsx.snap
index d3960cf975a8..51473d6fefa0 100644
--- a/ui/pages/bridge/__snapshots__/index.test.tsx.snap
+++ b/ui/pages/bridge/__snapshots__/index.test.tsx.snap
@@ -3,13 +3,13 @@
 exports[`Bridge renders the component with initial props 1`] = `
 <div>
   <div
-    class="bridge"
+    class="mm-box multichain-page mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--width-full mm-box--height-full mm-box--background-color-background-alternative"
   >
     <div
-      class="bridge__container"
+      class="mm-box multichain-page__inner-container bridge__container mm-box--display-flex mm-box--flex-direction-column mm-box--width-full mm-box--height-full mm-box--background-color-background-default"
     >
       <div
-        class="mm-box mm-header-base multichain-page-header bridge__header mm-box--padding-4 mm-box--display-flex mm-box--justify-content-center mm-box--width-full"
+        class="mm-box mm-header-base multichain-page-header mm-box--padding-4 mm-box--display-flex mm-box--justify-content-center mm-box--width-full"
       >
         <div
           class="mm-box"
@@ -28,11 +28,11 @@ exports[`Bridge renders the component with initial props 1`] = `
         <div
           class="mm-box"
         >
-          <p
-            class="mm-box mm-text mm-text--body-md-bold mm-text--ellipsis mm-text--text-align-center mm-box--padding-inline-start-8 mm-box--padding-inline-end-8 mm-box--display-block mm-box--color-text-default"
+          <h4
+            class="mm-box mm-text mm-text--heading-sm mm-text--ellipsis mm-text--text-align-center mm-box--padding-inline-start-8 mm-box--padding-inline-end-8 mm-box--display-block mm-box--color-text-default"
           >
             Bridge
-          </p>
+          </h4>
         </div>
         <div
           class="mm-box mm-box--display-flex mm-box--justify-content-flex-end"
@@ -50,128 +50,112 @@ exports[`Bridge renders the component with initial props 1`] = `
         </div>
       </div>
       <div
-        class="mm-box multichain-page-content mm-box--padding-4 mm-box--display-flex mm-box--flex-direction-column mm-box--width-full mm-box--height-full"
+        class="mm-box multichain-page-content mm-box--padding-0 mm-box--display-flex mm-box--flex-direction-column mm-box--width-full mm-box--height-full"
       >
         <div
-          class="prepare-bridge-page"
+          class="mm-box mm-container mm-container--max-width-undefined prepare-bridge-page mm-box--display-flex mm-box--gap-8 mm-box--flex-direction-column mm-box--width-full"
         >
           <div
-            class="mm-box prepare-bridge-page__content"
+            class="mm-box mm-container mm-container--max-width-undefined mm-box--padding-inline-6 mm-box--display-flex mm-box--gap-1 mm-box--flex-direction-column mm-box--width-full"
           >
             <div
-              class="mm-box bridge-box"
+              class="mm-box mm-container mm-container--max-width-undefined mm-box--display-flex mm-box--gap-4 mm-box--flex-direction-row mm-box--flex-wrap-nowrap mm-box--justify-content-space-between mm-box--align-items-center"
             >
               <div
-                class="mm-box prepare-bridge-page__input-row"
+                class="mm-box mm-text-field mm-text-field--size-md mm-text-field--focused mm-text-field--truncate amount-input mm-box--padding-right-0 mm-box--padding-left-0 mm-box--display-flex mm-box--align-items-center mm-box--background-color-background-default mm-box--rounded-sm mm-box--border-width-1 box--border-style-solid"
+                style="min-width: 96px; max-width: 190px;"
               >
-                <button
-                  class="mm-box mm-text mm-button-base mm-button-base--size-md asset-picker mm-text--body-md-medium mm-box--padding-2 mm-box--padding-right-2 mm-box--padding-left-2 mm-box--display-flex mm-box--gap-2 mm-box--align-items-center mm-box--color-text-default mm-box--background-color-transparent mm-box--rounded-pill"
-                  data-testid="asset-picker-button"
+                <input
+                  autocomplete="off"
+                  class="mm-box mm-text mm-input mm-input--disable-state-styles mm-text-field__input mm-text--body-md mm-text--text-align-start mm-box--margin-0 mm-box--padding-0 mm-box--padding-right-4 mm-box--padding-left-4 mm-box--color-text-default mm-box--background-color-transparent mm-box--border-style-none"
+                  data-testid="from-amount"
+                  focused="true"
+                  placeholder="0"
+                  style="font-weight: 400; font-size: 36px; transition: font-size 0.1s; padding: 0px;"
+                  type="text"
+                  value=""
+                />
+              </div>
+              <button
+                class="mm-box mm-text mm-select-button mm-select-button--size-lg mm-text--body-md mm-box--padding-top-3 mm-box--padding-right-4 mm-box--padding-bottom-3 mm-box--padding-left-4 mm-box--display-flex mm-box--gap-0 mm-box--justify-content-space-between mm-box--align-items-center mm-box--height-full mm-box--color-text-default mm-box--background-color-background-default mm-box--rounded-pill mm-box--border-color-border-muted box--border-style-solid box--border-width-1"
+                style="padding: 8px 11px 8px 8px; min-width: fit-content;"
+              >
+                <div
+                  class="mm-box mm-badge-wrapper mm-box--margin-right-2 mm-box--display-inline-block"
                 >
-                  <span
-                    class="mm-box mm-text mm-text--inherit mm-box--color-text-default"
+                  <div
+                    class="mm-box mm-text mm-avatar-base mm-avatar-base--size-md mm-avatar-token mm-text--body-sm mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-hover mm-box--rounded-full"
+                  >
+                    <img
+                      alt="ETH logo"
+                      class="mm-avatar-token__token-image"
+                      src="./images/eth_logo.svg"
+                    />
+                  </div>
+                  <div
+                    class="mm-box mm-badge-wrapper__badge-container mm-badge-wrapper__badge-container--rectangular-bottom-right"
                   >
                     <div
-                      class="mm-box mm-box--display-flex mm-box--gap-3 mm-box--align-items-center"
+                      class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-network mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-md mm-box--border-color-background-default mm-box--border-width-1 box--border-style-solid"
                     >
-                      <div
-                        class="mm-box mm-box--display-flex"
-                      >
-                        <div
-                          class="mm-box mm-badge-wrapper mm-box--display-inline-block"
-                        >
-                          <div
-                            class="mm-box mm-text mm-avatar-base mm-avatar-base--size-md mm-avatar-token mm-text--body-sm mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full"
-                          >
-                            <img
-                              alt="ETH logo"
-                              class="mm-avatar-token__token-image"
-                              src="./images/eth_logo.svg"
-                            />
-                          </div>
-                          <div
-                            class="mm-box mm-badge-wrapper__badge-container mm-badge-wrapper__badge-container--rectangular-bottom-right"
-                          >
-                            <div
-                              class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-network mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-md mm-box--border-color-border-muted mm-box--border-width-1 box--border-style-solid"
-                            >
-                              <img
-                                alt="Ethereum Mainnet logo"
-                                class="mm-avatar-network__network-image"
-                                src="./images/eth_logo.svg"
-                              />
-                            </div>
-                          </div>
-                        </div>
-                      </div>
-                      <div
-                        class="mm-box"
-                      >
-                        <div
-                          class=""
-                          style="display: inline;"
-                          tabindex="0"
-                          title=""
-                        >
-                          <p
-                            class="mm-box mm-text asset-picker__symbol mm-text--body-md mm-box--color-text-default"
-                          >
-                            ETH
-                          </p>
-                        </div>
-                      </div>
+                      <img
+                        alt="Ethereum Mainnet logo"
+                        class="mm-avatar-network__network-image"
+                        src="./images/eth_logo.svg"
+                      />
                     </div>
-                  </span>
-                  <span
-                    class="mm-box mm-icon mm-icon--size-sm mm-box--margin-inline-start-0 mm-box--display-inline-block mm-box--color-icon-default"
-                    style="mask-image: url('./images/icons/arrow-down.svg');"
-                  />
-                </button>
-                <div>
-                  <div
-                    class="mm-box mm-text-field mm-text-field--size-md mm-text-field--focused mm-text-field--truncate amount-input mm-box--padding-right-0 mm-box--padding-left-0 mm-box--display-inline-flex mm-box--align-items-center mm-box--background-color-background-default mm-box--rounded-sm mm-box--border-width-1 box--border-style-solid"
-                  >
-                    <input
-                      autocomplete="off"
-                      class="mm-box mm-text mm-input mm-input--disable-state-styles mm-text-field__input mm-text--body-md mm-box--margin-0 mm-box--padding-0 mm-box--padding-right-4 mm-box--padding-left-4 mm-box--color-text-default mm-box--background-color-transparent mm-box--border-style-none"
-                      data-testid="from-amount"
-                      focused="true"
-                      placeholder="0"
-                      type="number"
-                      value=""
-                    />
                   </div>
                 </div>
-              </div>
+                <span
+                  class="mm-box mm-select-button__content mm-box--display-flex mm-box--flex-direction-column mm-box--width-full"
+                >
+                  <label
+                    class="mm-box mm-text mm-label mm-text--body-md mm-text--font-weight-medium mm-box--display-inline-flex mm-box--align-items-center mm-box--color-text-default"
+                  >
+                    <p
+                      class="mm-box mm-text mm-text--body-lg-medium mm-text--ellipsis mm-box--color-text-default"
+                    >
+                      ETH
+                    </p>
+                  </label>
+                </span>
+                <span
+                  class="mm-box mm-icon mm-icon--size-sm mm-box--display-inline-block mm-box--color-inherit"
+                  style="mask-image: url('./images/icons/arrow-2-down.svg'); display: none;"
+                />
+              </button>
+            </div>
+            <div
+              class="mm-box mm-container mm-container--max-width-undefined mm-box--display-flex mm-box--flex-direction-row mm-box--flex-wrap-nowrap mm-box--justify-content-space-between mm-box--align-items-center"
+            >
               <div
-                class="mm-box prepare-bridge-page__amounts-row"
+                class="mm-box mm-container mm-container--max-width-undefined mm-box--display-flex mm-box--flex-direction-row mm-box--flex-wrap-nowrap mm-box--justify-content-space-between mm-box--align-items-center"
               >
                 <p
-                  class="mm-box mm-text mm-text--body-md mm-box--color-text-alternative"
+                  class="mm-box mm-text mm-text--body-md mm-text--font-weight-normal mm-text--ellipsis mm-text--text-align-end mm-box--color-text-alternative-soft"
                 >
-                   
+                  $0.00
                 </p>
-                <div
-                  class="mm-box currency-display-component mm-box--display-flex mm-box--flex-wrap-wrap mm-box--align-items-center"
-                  title="$0.00"
-                >
-                  <span
-                    class="mm-box mm-text currency-display-component__text mm-text--inherit mm-text--ellipsis mm-box--color-text-default"
-                    data-testid="account-value-and-suffix"
-                  >
-                    $0.00
-                  </span>
-                </div>
               </div>
+              <p
+                class="mm-box mm-text mm-text--body-md mm-box--display-flex mm-box--gap-1 mm-box--color-text-alternative-soft"
+              />
             </div>
+          </div>
+          <div
+            class="mm-box mm-container mm-container--max-width-undefined mm-box--padding-top-8 mm-box--display-flex mm-box--flex-direction-column mm-box--width-full mm-box--height-full mm-box--background-color-background-alternative-soft"
+            style="position: relative;"
+          >
             <div
-              class="mm-box prepare-bridge-page__switch-tokens"
+              class="mm-box prepare-bridge-page__switch-tokens mm-box--display-flex mm-box--background-color-background-alternative-soft"
+              style="position: absolute; top: calc(-20px + 1px); right: calc(50% - 20px); border-radius: 100%; opacity: 1; width: 40px; height: 40px; justify-content: center;"
             >
               <button
                 aria-label="switch-tokens"
-                class="mm-box mm-button-icon mm-button-icon--size-lg mm-button-icon--disabled mm-box--display-inline-flex mm-box--justify-content-center mm-box--align-items-center mm-box--width-full mm-box--color-icon-default mm-box--background-color-transparent mm-box--rounded-lg"
+                class="mm-box mm-button-icon mm-button-icon--size-lg mm-button-icon--disabled mm-box--display-inline-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-icon-alternative-soft mm-box--background-color-transparent mm-box--rounded-lg"
                 data-testid="switch-tokens"
                 disabled=""
+                style="align-self: center; border-radius: 100%; width: 100%; height: 100%;"
               >
                 <span
                   class="mm-box mm-icon mm-icon--size-lg mm-box--display-inline-block mm-box--color-inherit"
@@ -180,122 +164,75 @@ exports[`Bridge renders the component with initial props 1`] = `
               </button>
             </div>
             <div
-              class="mm-box bridge-box"
+              class="mm-box mm-container mm-container--max-width-undefined mm-box--padding-inline-6 mm-box--display-flex mm-box--gap-1 mm-box--flex-direction-column mm-box--width-full"
             >
               <div
-                class="mm-box prepare-bridge-page__input-row"
+                class="mm-box mm-container mm-container--max-width-undefined mm-box--display-flex mm-box--gap-4 mm-box--flex-direction-row mm-box--flex-wrap-nowrap mm-box--justify-content-space-between mm-box--align-items-center"
               >
-                <button
-                  class="mm-box mm-text mm-button-base mm-button-base--size-md asset-picker mm-text--body-md-medium mm-box--padding-2 mm-box--padding-right-2 mm-box--padding-left-2 mm-box--display-flex mm-box--gap-2 mm-box--align-items-center mm-box--color-text-default mm-box--background-color-transparent mm-box--rounded-pill"
-                  data-testid="asset-picker-button"
+                <div
+                  class="mm-box mm-text-field mm-text-field--size-md mm-text-field--disabled mm-text-field--truncate amount-input mm-box--padding-right-0 mm-box--padding-left-0 mm-box--display-flex mm-box--align-items-center mm-box--background-color-background-default mm-box--rounded-sm mm-box--border-width-1 box--border-style-solid"
+                  style="min-width: 96px; max-width: 190px; opacity: 1;"
                 >
-                  <span
-                    class="mm-box mm-text mm-text--inherit mm-box--color-text-default"
-                  >
-                    <div
-                      class="mm-box mm-box--display-flex mm-box--gap-3 mm-box--align-items-center"
-                    >
-                      <div
-                        class="mm-box mm-box--display-flex"
-                      >
-                        <div
-                          class="mm-box mm-badge-wrapper mm-box--display-inline-block"
-                        >
-                          <div
-                            class="mm-box mm-text mm-avatar-base mm-avatar-base--size-md mm-avatar-token mm-text--body-sm mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full"
-                          >
-                            ?
-                          </div>
-                          <div
-                            class="mm-box mm-badge-wrapper__badge-container mm-badge-wrapper__badge-container--rectangular-bottom-right"
-                          >
-                            <div
-                              class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-network mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-md mm-box--border-color-border-default mm-box--border-width-1 box--border-style-solid"
-                            >
-                              <img
-                                alt="Ethereum Mainnet logo"
-                                class="mm-avatar-network__network-image"
-                                src="./images/eth_logo.svg"
-                              />
-                            </div>
-                          </div>
-                        </div>
-                      </div>
-                      <div
-                        class="mm-box"
-                      >
-                        <p
-                          class="mm-box mm-text asset-picker__symbol mm-text--body-md mm-box--color-text-default"
-                        />
-                      </div>
-                    </div>
-                  </span>
-                  <span
-                    class="mm-box mm-icon mm-icon--size-sm mm-box--margin-inline-start-0 mm-box--display-inline-block mm-box--color-icon-default"
-                    style="mask-image: url('./images/icons/arrow-down.svg');"
+                  <input
+                    autocomplete="off"
+                    class="mm-box mm-text mm-input mm-input--disable-state-styles mm-input--disabled mm-text-field__input mm-text--body-md mm-text--text-align-start mm-box--margin-0 mm-box--padding-0 mm-box--padding-right-4 mm-box--padding-left-4 mm-box--color-text-default mm-box--background-color-transparent mm-box--border-style-none"
+                    data-testid="to-amount"
+                    disabled=""
+                    focused="false"
+                    placeholder="0"
+                    readonly=""
+                    style="font-weight: 400; font-size: 36px; transition: font-size 0.1s; padding: 0px;"
+                    type="text"
+                    value="0"
                   />
-                </button>
-                <div>
-                  <div
-                    class="amount-tooltip"
-                    style="display: inherit;"
-                    tabindex="0"
-                    title=""
-                  >
-                    <div
-                      class="mm-box mm-text-field mm-text-field--size-md mm-text-field--disabled mm-text-field--truncate amount-input mm-box--padding-right-0 mm-box--padding-left-0 mm-box--display-inline-flex mm-box--align-items-center mm-box--background-color-background-default mm-box--rounded-sm mm-box--border-width-1 box--border-style-solid"
-                    >
-                      <input
-                        autocomplete="off"
-                        class="mm-box mm-text mm-input mm-input--disable-state-styles mm-input--disabled mm-text-field__input mm-text--body-md mm-box--margin-0 mm-box--padding-0 mm-box--padding-right-4 mm-box--padding-left-4 mm-box--color-text-default mm-box--background-color-transparent mm-box--border-style-none"
-                        data-testid="to-amount"
-                        disabled=""
-                        focused="false"
-                        placeholder="0"
-                        readonly=""
-                        type="number"
-                        value="0"
-                      />
-                    </div>
-                  </div>
                 </div>
+                <button
+                  class="mm-box mm-text mm-button-base mm-button-base--size-lg mm-button-primary mm-text--body-md-medium mm-text--font-weight-normal mm-box--padding-0 mm-box--padding-right-6 mm-box--padding-left-6 mm-box--display-inline-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-primary-inverse mm-box--background-color-primary-default mm-box--rounded-pill"
+                  data-theme="light"
+                  style="white-space: nowrap;"
+                >
+                  Bridge to
+                </button>
               </div>
               <div
-                class="mm-box prepare-bridge-page__amounts-row"
+                class="mm-box mm-container mm-container--max-width-undefined mm-box--display-flex mm-box--flex-direction-row mm-box--flex-wrap-nowrap mm-box--justify-content-space-between mm-box--align-items-center"
               >
-                <p
-                  class="mm-box mm-text mm-text--body-md mm-box--color-text-alternative"
+                <div
+                  class="mm-box mm-container mm-container--max-width-undefined mm-box--display-flex mm-box--flex-direction-row mm-box--flex-wrap-nowrap mm-box--justify-content-space-between mm-box--align-items-center"
                 >
-                   
-                </p>
+                  <p
+                    class="mm-box mm-text mm-text--body-md mm-text--font-weight-normal mm-text--ellipsis mm-text--text-align-end mm-box--color-text-alternative-soft"
+                  />
+                </div>
+                <a
+                  class="mm-box mm-text mm-text--body-md mm-box--display-flex mm-box--gap-1 mm-box--color-text-alternative-soft"
+                />
+              </div>
+            </div>
+            <div
+              class="mm-box mm-container mm-container--max-width-undefined mm-box--display-flex mm-box--flex-direction-column mm-box--justify-content-center mm-box--width-full mm-box--height-full"
+            />
+            <div
+              class="mm-box mm-container mm-container--max-width-undefined mm-box--padding-6 mm-box--display-flex mm-box--flex-direction-row mm-box--flex-wrap-nowrap mm-box--justify-content-space-between mm-box--align-items-center"
+            >
+              <div
+                class="mm-box mm-container mm-container--max-width-undefined mm-box--display-flex mm-box--gap-3 mm-box--flex-direction-column mm-box--width-full"
+                style="padding-inline: 16px; position: relative; overflow: hidden;"
+              >
                 <div
-                  class="mm-box currency-display-component mm-box--display-flex mm-box--flex-wrap-wrap mm-box--align-items-center"
-                  title="$0.00"
+                  class="mm-box multichain-page-footer mm-box--padding-0 mm-box--display-flex mm-box--gap-2 mm-box--flex-direction-column mm-box--width-full"
                 >
-                  <span
-                    class="mm-box mm-text currency-display-component__text mm-text--inherit mm-text--ellipsis mm-box--color-text-default"
-                    data-testid="account-value-and-suffix"
+                  <p
+                    class="mm-box mm-text mm-text--body-md mm-text--text-align-center mm-box--width-full mm-box--color-text-alternative-soft"
                   >
-                    $0.00
-                  </span>
+                    Select token and amount
+                  </p>
                 </div>
               </div>
             </div>
           </div>
         </div>
       </div>
-      <div
-        class="mm-box multichain-page-footer mm-box--padding-4 mm-box--display-flex mm-box--gap-4 mm-box--width-full"
-      >
-        <button
-          class="mm-box mm-text mm-button-base mm-button-base--size-md mm-button-base--disabled mm-button-primary mm-button-primary--disabled mm-text--body-md-medium mm-box--padding-0 mm-box--padding-right-4 mm-box--padding-left-4 mm-box--display-inline-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-primary-inverse mm-box--background-color-primary-default mm-box--rounded-pill"
-          data-testid="bridge-cta-button"
-          data-theme="light"
-          disabled=""
-        >
-          Select token and amount
-        </button>
-      </div>
     </div>
   </div>
 </div>
diff --git a/ui/pages/bridge/bridge.util.test.ts b/ui/pages/bridge/bridge.util.test.ts
index a22cc39876b4..f302cd44090c 100644
--- a/ui/pages/bridge/bridge.util.test.ts
+++ b/ui/pages/bridge/bridge.util.test.ts
@@ -167,6 +167,12 @@ describe('Bridge utils', () => {
         },
         {
           address: '0x1f9840a85d5af5bf1d1762f925bdaddc4201f986',
+          decimals: 16,
+          symbol: 'DEF',
+          aggregators: ['lifi'],
+        },
+        {
+          address: '0x1f9840a85d5af5bf1d1762f925bdaddc4201f987',
           symbol: 'DEF',
         },
         {
@@ -198,6 +204,12 @@ describe('Bridge utils', () => {
           name: 'Ether',
           symbol: 'ETH',
         },
+        '0x1f9840a85d5af5bf1d1762f925bdaddc4201f986': {
+          address: '0x1f9840a85d5af5bf1d1762f925bdaddc4201f986',
+          decimals: 16,
+          symbol: 'DEF',
+          aggregators: ['lifi'],
+        },
         '0x1f9840a85d5af5bf1d1762f925bdaddc4201f984': {
           address: '0x1f9840a85d5af5bf1d1762f925bdaddc4201f984',
           decimals: 16,
diff --git a/ui/pages/bridge/bridge.util.ts b/ui/pages/bridge/bridge.util.ts
index 13db68ba2ca4..534ea3418219 100644
--- a/ui/pages/bridge/bridge.util.ts
+++ b/ui/pages/bridge/bridge.util.ts
@@ -124,7 +124,7 @@ export async function fetchBridgeTokens(
 
   tokens.forEach((token: unknown) => {
     if (
-      validateResponse<SwapsTokenObject>(TOKEN_VALIDATORS, token, url) &&
+      validateResponse<SwapsTokenObject>(TOKEN_VALIDATORS, token, url, false) &&
       !(
         isSwapsDefaultTokenSymbol(token.symbol, chainId) ||
         isSwapsDefaultTokenAddress(token.address, chainId)
diff --git a/ui/pages/bridge/index.scss b/ui/pages/bridge/index.scss
index 3102ece16dab..af7b5ee6fd3b 100644
--- a/ui/pages/bridge/index.scss
+++ b/ui/pages/bridge/index.scss
@@ -6,28 +6,40 @@
 @import 'awaiting-signatures/index';
 
 
-.bridge {
-  max-height: 100vh;
-  width: 360px;
-  position: relative;
-
-  &__container {
-    width: 100%;
-
-    .multichain-page-footer {
-      position: absolute;
-      width: 100%;
-      height: 80px;
-      bottom: 0;
-      padding: 16px;
-      display: flex;
-
-      button {
-        flex: 1;
-        height: 100%;
-        font-size: 14px;
-        font-weight: 500;
-      }
-    }
-  }
+
+// TODO add to design-tokens package
+.mm-avatar-base--size-xxs {
+  --size: 12px;
+}
+
+[data-theme='light'],
+.light {
+  --color-background-alternative-soft: #f9fafb;
+  --color-text-alternative-soft: #6a737d;
+  --color-icon-alternative-soft: #6a737d;
+}
+
+[data-theme='dark'],
+.dark {
+  --color-background-alternative-soft: #1f2124;
+  --color-text-alternative-soft: #848c96;
+  --color-icon-alternative-soft: #848c96;
+}
+
+.mm-box--color-text-alternative-soft {
+  color: var(--color-text-alternative-soft);
+}
+
+.mm-box--color-icon-alternative-soft {
+  color: var(--color-icon-alternative-soft);
+}
+
+.mm-box--background-color-background-alternative-soft {
+  background-color: var(--color-background-alternative-soft);
+}
+
+.bridge__container {
+  height: 100%;
+  min-width: 360px;
+  max-width: 480px;
 }
diff --git a/ui/pages/bridge/index.test.tsx b/ui/pages/bridge/index.test.tsx
index e5f225108b88..7878126c47e1 100644
--- a/ui/pages/bridge/index.test.tsx
+++ b/ui/pages/bridge/index.test.tsx
@@ -90,6 +90,6 @@ describe('Bridge', () => {
 
     expect(getByText('Bridge')).toBeInTheDocument();
     expect(container).toMatchSnapshot();
-    expect(mockResetBridgeState).toHaveBeenCalledTimes(1);
+    expect(mockResetBridgeState).toHaveBeenCalledTimes(2);
   });
 });
diff --git a/ui/pages/bridge/index.tsx b/ui/pages/bridge/index.tsx
index 89ab42df9641..fa815a0de2b9 100644
--- a/ui/pages/bridge/index.tsx
+++ b/ui/pages/bridge/index.tsx
@@ -1,4 +1,4 @@
-import React, { useContext, useEffect } from 'react';
+import React, { useContext, useEffect, useState } from 'react';
 import { useDispatch, useSelector } from 'react-redux';
 import { Route, Switch, useHistory } from 'react-router-dom';
 import { I18nContext } from '../../contexts/i18n';
@@ -17,29 +17,28 @@ import {
   ButtonIconSize,
   IconName,
 } from '../../components/component-library';
-import { getProviderConfig } from '../../../shared/modules/selectors/networks';
 import {
-  getCurrentCurrency,
-  getIsBridgeChain,
-  getIsBridgeEnabled,
-} from '../../selectors';
+  getCurrentChainId,
+  getSelectedNetworkClientId,
+} from '../../../shared/modules/selectors/networks';
+import { getIsBridgeChain, getIsBridgeEnabled } from '../../selectors';
 import useBridging from '../../hooks/bridge/useBridging';
 import {
   Content,
   Footer,
   Header,
+  Page,
 } from '../../components/multichain/pages/page';
 import { useSwapsFeatureFlags } from '../swaps/hooks/useSwapsFeatureFlags';
 import { resetBridgeState, setFromChain } from '../../ducks/bridge/actions';
 import { useGasFeeEstimates } from '../../hooks/useGasFeeEstimates';
 import { useBridgeExchangeRates } from '../../hooks/bridge/useBridgeExchangeRates';
 import { useQuoteFetchEvents } from '../../hooks/bridge/useQuoteFetchEvents';
-import { getWasTxDeclined } from '../../ducks/bridge/selectors';
+import { TextVariant } from '../../helpers/constants/design-system';
 import PrepareBridgePage from './prepare/prepare-bridge-page';
-import { BridgeCTAButton } from './prepare/bridge-cta-button';
 import AwaitingSignaturesCancelButton from './awaiting-signatures/awaiting-signatures-cancel-button';
 import AwaitingSignatures from './awaiting-signatures/awaiting-signatures';
-import { BridgeTxDeclinedMessage } from './prepare/bridge-tx-declined-message';
+import { BridgeTransactionSettingsModal } from './prepare/bridge-transaction-settings-modal';
 
 const CrossChainSwap = () => {
   const t = useContext(I18nContext);
@@ -52,16 +51,15 @@ const CrossChainSwap = () => {
   const dispatch = useDispatch();
 
   const isBridgeEnabled = useSelector(getIsBridgeEnabled);
-  const providerConfig = useSelector(getProviderConfig);
   const isBridgeChain = useSelector(getIsBridgeChain);
-  const currency = useSelector(getCurrentCurrency);
-  const wasTxDeclined = useSelector(getWasTxDeclined);
+  const selectedNetworkClientId = useSelector(getSelectedNetworkClientId);
+  const chainId = useSelector(getCurrentChainId);
 
   useEffect(() => {
-    if (isBridgeChain && isBridgeEnabled && providerConfig) {
-      dispatch(setFromChain(providerConfig.chainId));
+    if (isBridgeChain && isBridgeEnabled && chainId) {
+      dispatch(setFromChain(chainId));
     }
-  }, [isBridgeChain, isBridgeEnabled, providerConfig, currency]);
+  }, [isBridgeChain, isBridgeEnabled, chainId]);
 
   const resetControllerAndInputStates = async () => {
     await dispatch(resetBridgeState());
@@ -80,7 +78,7 @@ const CrossChainSwap = () => {
   }, []);
 
   // Needed for refreshing gas estimates
-  useGasFeeEstimates(providerConfig?.id);
+  useGasFeeEstimates(selectedNetworkClientId);
   // Needed for fetching exchange rates for tokens that have not been imported
   useBridgeExchangeRates();
   // Emits events related to quote-fetching
@@ -96,49 +94,53 @@ const CrossChainSwap = () => {
     await resetControllerAndInputStates();
   };
 
+  const [isSettingsModalOpen, setIsSettingsModalOpen] = useState(false);
+
   return (
-    <div className="bridge">
-      <div className="bridge__container">
+    <Page className="bridge__container">
+      <Header
+        textProps={{ variant: TextVariant.headingSm }}
+        startAccessory={
+          <ButtonIcon
+            iconName={IconName.ArrowLeft}
+            size={ButtonIconSize.Sm}
+            ariaLabel={t('back')}
+            onClick={redirectToDefaultRoute}
+          />
+        }
+        endAccessory={
+          <ButtonIcon
+            iconName={IconName.Setting}
+            size={ButtonIconSize.Sm}
+            ariaLabel={t('settings')}
+            onClick={() => {
+              setIsSettingsModalOpen(true);
+            }}
+          />
+        }
+      >
+        {t('bridge')}
+      </Header>
+      <Content padding={0}>
         <Switch>
           <FeatureToggledRoute
             redirectRoute={SWAPS_MAINTENANCE_ROUTE}
             flag={isBridgeEnabled}
             path={CROSS_CHAIN_SWAP_ROUTE + PREPARE_SWAP_ROUTE}
-          >
-            <>
-              <Header
-                className="bridge__header"
-                startAccessory={
-                  <ButtonIcon
-                    iconName={IconName.ArrowLeft}
-                    size={ButtonIconSize.Sm}
-                    ariaLabel={t('back')}
-                    onClick={redirectToDefaultRoute}
-                  />
-                }
-                endAccessory={
-                  <ButtonIcon
-                    iconName={IconName.Setting}
-                    size={ButtonIconSize.Sm}
-                    ariaLabel={t('settings')}
+            render={() => {
+              return (
+                <>
+                  <BridgeTransactionSettingsModal
+                    isOpen={isSettingsModalOpen}
+                    onClose={() => {
+                      setIsSettingsModalOpen(false);
+                    }}
                   />
-                }
-              >
-                {t('bridge')}
-              </Header>
-              <Content>
-                <PrepareBridgePage />
-              </Content>
-              <Footer>
-                {wasTxDeclined ? (
-                  <BridgeTxDeclinedMessage />
-                ) : (
-                  <BridgeCTAButton />
-                )}
-              </Footer>
-            </>
-          </FeatureToggledRoute>
-
+                  <PrepareBridgePage />
+                </>
+              );
+            }}
+          />
           <Route path={CROSS_CHAIN_SWAP_ROUTE + AWAITING_SIGNATURES_ROUTE}>
             <Content>
               <AwaitingSignatures />
@@ -148,8 +150,8 @@ const CrossChainSwap = () => {
             </Footer>
           </Route>
         </Switch>
-      </div>
-    </div>
+      </Content>
+    </Page>
   );
 };
 
diff --git a/ui/pages/bridge/layout/tooltip.tsx b/ui/pages/bridge/layout/tooltip.tsx
index b6781c9bf480..00f52bf0b617 100644
--- a/ui/pages/bridge/layout/tooltip.tsx
+++ b/ui/pages/bridge/layout/tooltip.tsx
@@ -1,6 +1,10 @@
 import React, { useState } from 'react';
 import {
   Box,
+  Icon,
+  IconName,
+  IconSize,
+  PolymorphicRef,
   Popover,
   PopoverHeader,
   PopoverPosition,
@@ -8,38 +12,64 @@ import {
   Text,
 } from '../../../components/component-library';
 import {
+  Display,
+  IconColor,
   JustifyContent,
   TextAlign,
   TextColor,
 } from '../../../helpers/constants/design-system';
+import Column from './column';
 
 const Tooltip = React.forwardRef(
-  ({
-    children,
-    title,
-    triggerElement,
-    disabled = false,
-    ...props
-  }: PopoverProps<'div'> & {
-    triggerElement: React.ReactElement;
-    disabled?: boolean;
-  }) => {
+  (
+    {
+      children,
+      title,
+      triggerElement,
+      disabled = false,
+      onClose,
+      iconName,
+      style,
+      ...props
+    }: PopoverProps<'div'> & {
+      triggerElement?: React.ReactElement;
+      disabled?: boolean;
+      onClose?: () => void;
+      iconName?: IconName;
+    },
+    ref?: PolymorphicRef<'div'>,
+  ) => {
     const [isOpen, setIsOpen] = useState(false);
     const [referenceElement, setReferenceElement] =
       useState<HTMLSpanElement | null>(null);
 
     const handleMouseEnter = () => setIsOpen(true);
     const handleMouseLeave = () => setIsOpen(false);
-    const setBoxRef = (ref: HTMLSpanElement | null) => setReferenceElement(ref);
+    const setBoxRef = (newRef: HTMLSpanElement | null) =>
+      setReferenceElement(newRef);
 
     return (
-      <>
+      <Box ref={ref}>
         <Box
           ref={setBoxRef}
           onMouseEnter={handleMouseEnter}
           onMouseLeave={handleMouseLeave}
+          display={Display.Flex}
         >
-          {triggerElement}
+          {triggerElement ??
+            (iconName && (
+              <Icon
+                color={IconColor.iconAlternativeSoft}
+                name={iconName}
+                size={IconSize.Sm}
+              />
+            )) ?? (
+              <Icon
+                name={IconName.Question}
+                color={IconColor.iconAlternativeSoft}
+                size={IconSize.Sm}
+              />
+            )}
         </Box>
         {!disabled && (
           <Popover
@@ -55,27 +85,40 @@ const Tooltip = React.forwardRef(
               paddingBottom: '8px',
               transitionTimingFunction: 'linear',
               display: 'inherit',
+              ...style,
             }}
             preventOverflow
             flip
             hasArrow
+            isPortal
             {...props}
           >
-            <PopoverHeader
-              color={TextColor.infoInverse}
-              textAlign={TextAlign.Center}
-            >
-              {title}
-            </PopoverHeader>
-            <Text
-              justifyContent={JustifyContent.center}
-              color={TextColor.infoInverse}
-            >
-              {children}
-            </Text>
+            <Column gap={4}>
+              {title && (
+                <PopoverHeader
+                  color={TextColor.infoInverse}
+                  textAlign={TextAlign.Center}
+                  justifyContent={
+                    onClose
+                      ? JustifyContent.spaceBetween
+                      : JustifyContent.center
+                  }
+                  onClose={onClose}
+                  childrenWrapperProps={{ style: { whiteSpace: 'nowrap' } }}
+                >
+                  {title}
+                </PopoverHeader>
+              )}
+              <Text
+                justifyContent={JustifyContent.center}
+                color={TextColor.infoInverse}
+              >
+                {children}
+              </Text>
+            </Column>
           </Popover>
         )}
-      </>
+      </Box>
     );
   },
 );
diff --git a/ui/pages/bridge/prepare/__snapshots__/bridge-cta-button.test.tsx.snap b/ui/pages/bridge/prepare/__snapshots__/bridge-cta-button.test.tsx.snap
index f225adec3b6d..0b46d2764523 100644
--- a/ui/pages/bridge/prepare/__snapshots__/bridge-cta-button.test.tsx.snap
+++ b/ui/pages/bridge/prepare/__snapshots__/bridge-cta-button.test.tsx.snap
@@ -1,14 +1,42 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`BridgeCTAButton should render the component's initial state 1`] = `
+exports[`BridgeCTAButton should disable the component when quotes are loading and there are no existing quotes 1`] = `
+<div>
+  <p
+    class="mm-box mm-text mm-text--body-md mm-text--text-align-center mm-box--width-full mm-box--color-text-alternative-soft"
+  />
+</div>
+`;
+
+exports[`BridgeCTAButton should enable the component when quotes are loading and there are existing quotes 1`] = `
 <div>
   <button
-    class="mm-box mm-text mm-button-base mm-button-base--size-md mm-button-base--disabled mm-button-primary mm-button-primary--disabled mm-text--body-md-medium mm-box--padding-0 mm-box--padding-right-4 mm-box--padding-left-4 mm-box--display-inline-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-primary-inverse mm-box--background-color-primary-default mm-box--rounded-pill"
+    class="mm-box mm-text mm-button-base mm-button-base--size-md mm-button-primary mm-text--body-md mm-box--padding-0 mm-box--padding-right-4 mm-box--padding-left-4 mm-box--display-inline-flex mm-box--justify-content-center mm-box--align-items-center mm-box--width-full mm-box--color-primary-inverse mm-box--background-color-primary-default mm-box--rounded-pill"
     data-testid="bridge-cta-button"
     data-theme="light"
-    disabled=""
+    style="box-shadow: none;"
   >
-    Select token
+    Submit
   </button>
 </div>
 `;
+
+exports[`BridgeCTAButton should render the component when amount and dest token is missing 1`] = `
+<div>
+  <p
+    class="mm-box mm-text mm-text--body-md mm-text--text-align-center mm-box--width-full mm-box--color-text-alternative-soft"
+  >
+    Select token and amount
+  </p>
+</div>
+`;
+
+exports[`BridgeCTAButton should render the component's initial state 1`] = `
+<div>
+  <p
+    class="mm-box mm-text mm-text--body-md mm-text--text-align-center mm-box--width-full mm-box--color-text-alternative-soft"
+  >
+    Select token
+  </p>
+</div>
+`;
diff --git a/ui/pages/bridge/prepare/__snapshots__/prepare-bridge-page.test.tsx.snap b/ui/pages/bridge/prepare/__snapshots__/prepare-bridge-page.test.tsx.snap
index b4873c7e1c89..d5b980d13fd6 100644
--- a/ui/pages/bridge/prepare/__snapshots__/prepare-bridge-page.test.tsx.snap
+++ b/ui/pages/bridge/prepare/__snapshots__/prepare-bridge-page.test.tsx.snap
@@ -3,125 +3,109 @@
 exports[`PrepareBridgePage should render the component, with initial state 1`] = `
 <div>
   <div
-    class="prepare-bridge-page"
+    class="mm-box mm-container mm-container--max-width-undefined prepare-bridge-page mm-box--display-flex mm-box--gap-8 mm-box--flex-direction-column mm-box--width-full"
   >
     <div
-      class="mm-box prepare-bridge-page__content"
+      class="mm-box mm-container mm-container--max-width-undefined mm-box--padding-inline-6 mm-box--display-flex mm-box--gap-1 mm-box--flex-direction-column mm-box--width-full"
     >
       <div
-        class="mm-box bridge-box"
+        class="mm-box mm-container mm-container--max-width-undefined mm-box--display-flex mm-box--gap-4 mm-box--flex-direction-row mm-box--flex-wrap-nowrap mm-box--justify-content-space-between mm-box--align-items-center"
       >
         <div
-          class="mm-box prepare-bridge-page__input-row"
+          class="mm-box mm-text-field mm-text-field--size-md mm-text-field--focused mm-text-field--truncate amount-input mm-box--padding-right-0 mm-box--padding-left-0 mm-box--display-flex mm-box--align-items-center mm-box--background-color-background-default mm-box--rounded-sm mm-box--border-width-1 box--border-style-solid"
+          style="min-width: 96px; max-width: 190px;"
         >
-          <button
-            class="mm-box mm-text mm-button-base mm-button-base--size-md asset-picker mm-text--body-md-medium mm-box--padding-2 mm-box--padding-right-2 mm-box--padding-left-2 mm-box--display-flex mm-box--gap-2 mm-box--align-items-center mm-box--color-text-default mm-box--background-color-transparent mm-box--rounded-pill"
-            data-testid="asset-picker-button"
+          <input
+            autocomplete="off"
+            class="mm-box mm-text mm-input mm-input--disable-state-styles mm-text-field__input mm-text--body-md mm-text--text-align-start mm-box--margin-0 mm-box--padding-0 mm-box--padding-right-4 mm-box--padding-left-4 mm-box--color-text-default mm-box--background-color-transparent mm-box--border-style-none"
+            data-testid="from-amount"
+            focused="true"
+            placeholder="0"
+            style="font-weight: 400; font-size: 36px; transition: font-size 0.1s; padding: 0px;"
+            type="text"
+            value=""
+          />
+        </div>
+        <button
+          class="mm-box mm-text mm-select-button mm-select-button--size-lg mm-text--body-md mm-box--padding-top-3 mm-box--padding-right-4 mm-box--padding-bottom-3 mm-box--padding-left-4 mm-box--display-flex mm-box--gap-0 mm-box--justify-content-space-between mm-box--align-items-center mm-box--height-full mm-box--color-text-default mm-box--background-color-background-default mm-box--rounded-pill mm-box--border-color-border-muted box--border-style-solid box--border-width-1"
+          style="padding: 8px 11px 8px 8px; min-width: fit-content;"
+        >
+          <div
+            class="mm-box mm-badge-wrapper mm-box--margin-right-2 mm-box--display-inline-block"
           >
-            <span
-              class="mm-box mm-text mm-text--inherit mm-box--color-text-default"
+            <div
+              class="mm-box mm-text mm-avatar-base mm-avatar-base--size-md mm-avatar-token mm-text--body-sm mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-hover mm-box--rounded-full"
+            >
+              <img
+                alt="ETH logo"
+                class="mm-avatar-token__token-image"
+                src="./images/eth_logo.svg"
+              />
+            </div>
+            <div
+              class="mm-box mm-badge-wrapper__badge-container mm-badge-wrapper__badge-container--rectangular-bottom-right"
             >
               <div
-                class="mm-box mm-box--display-flex mm-box--gap-3 mm-box--align-items-center"
+                class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-network mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-md mm-box--border-color-background-default mm-box--border-width-1 box--border-style-solid"
               >
-                <div
-                  class="mm-box mm-box--display-flex"
-                >
-                  <div
-                    class="mm-box mm-badge-wrapper mm-box--display-inline-block"
-                  >
-                    <div
-                      class="mm-box mm-text mm-avatar-base mm-avatar-base--size-md mm-avatar-token mm-text--body-sm mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full"
-                    >
-                      <img
-                        alt="ETH logo"
-                        class="mm-avatar-token__token-image"
-                        src="./images/eth_logo.svg"
-                      />
-                    </div>
-                    <div
-                      class="mm-box mm-badge-wrapper__badge-container mm-badge-wrapper__badge-container--rectangular-bottom-right"
-                    >
-                      <div
-                        class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-network mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-md mm-box--border-color-border-muted mm-box--border-width-1 box--border-style-solid"
-                      >
-                        <img
-                          alt="Ethereum Mainnet logo"
-                          class="mm-avatar-network__network-image"
-                          src="./images/eth_logo.svg"
-                        />
-                      </div>
-                    </div>
-                  </div>
-                </div>
-                <div
-                  class="mm-box"
-                >
-                  <div
-                    class=""
-                    style="display: inline;"
-                    tabindex="0"
-                    title=""
-                  >
-                    <p
-                      class="mm-box mm-text asset-picker__symbol mm-text--body-md mm-box--color-text-default"
-                    >
-                      ETH
-                    </p>
-                  </div>
-                </div>
+                <img
+                  alt="Ethereum Mainnet logo"
+                  class="mm-avatar-network__network-image"
+                  src="./images/eth_logo.svg"
+                />
               </div>
-            </span>
-            <span
-              class="mm-box mm-icon mm-icon--size-sm mm-box--margin-inline-start-0 mm-box--display-inline-block mm-box--color-icon-default"
-              style="mask-image: url('./images/icons/arrow-down.svg');"
-            />
-          </button>
-          <div>
-            <div
-              class="mm-box mm-text-field mm-text-field--size-md mm-text-field--focused mm-text-field--truncate amount-input mm-box--padding-right-0 mm-box--padding-left-0 mm-box--display-inline-flex mm-box--align-items-center mm-box--background-color-background-default mm-box--rounded-sm mm-box--border-width-1 box--border-style-solid"
-            >
-              <input
-                autocomplete="off"
-                class="mm-box mm-text mm-input mm-input--disable-state-styles mm-text-field__input mm-text--body-md mm-box--margin-0 mm-box--padding-0 mm-box--padding-right-4 mm-box--padding-left-4 mm-box--color-text-default mm-box--background-color-transparent mm-box--border-style-none"
-                data-testid="from-amount"
-                focused="true"
-                placeholder="0"
-                type="number"
-                value=""
-              />
             </div>
           </div>
-        </div>
+          <span
+            class="mm-box mm-select-button__content mm-box--display-flex mm-box--flex-direction-column mm-box--width-full"
+          >
+            <label
+              class="mm-box mm-text mm-label mm-text--body-md mm-text--font-weight-medium mm-box--display-inline-flex mm-box--align-items-center mm-box--color-text-default"
+            >
+              <p
+                class="mm-box mm-text mm-text--body-lg-medium mm-text--ellipsis mm-box--color-text-default"
+              >
+                ETH
+              </p>
+            </label>
+          </span>
+          <span
+            class="mm-box mm-icon mm-icon--size-sm mm-box--display-inline-block mm-box--color-inherit"
+            style="mask-image: url('./images/icons/arrow-2-down.svg'); display: none;"
+          />
+        </button>
+      </div>
+      <div
+        class="mm-box mm-container mm-container--max-width-undefined mm-box--display-flex mm-box--flex-direction-row mm-box--flex-wrap-nowrap mm-box--justify-content-space-between mm-box--align-items-center"
+      >
         <div
-          class="mm-box prepare-bridge-page__amounts-row"
+          class="mm-box mm-container mm-container--max-width-undefined mm-box--display-flex mm-box--flex-direction-row mm-box--flex-wrap-nowrap mm-box--justify-content-space-between mm-box--align-items-center"
         >
           <p
-            class="mm-box mm-text mm-text--body-md mm-box--color-text-alternative"
+            class="mm-box mm-text mm-text--body-md mm-text--font-weight-normal mm-text--ellipsis mm-text--text-align-end mm-box--color-text-alternative-soft"
           >
-             
+            $0.00
           </p>
-          <div
-            class="mm-box currency-display-component mm-box--display-flex mm-box--flex-wrap-wrap mm-box--align-items-center"
-            title="$0.00"
-          >
-            <span
-              class="mm-box mm-text currency-display-component__text mm-text--inherit mm-text--ellipsis mm-box--color-text-default"
-              data-testid="account-value-and-suffix"
-            >
-              $0.00
-            </span>
-          </div>
         </div>
+        <p
+          class="mm-box mm-text mm-text--body-md mm-box--display-flex mm-box--gap-1 mm-box--color-text-alternative-soft"
+        />
       </div>
+    </div>
+    <div
+      class="mm-box mm-container mm-container--max-width-undefined mm-box--padding-top-8 mm-box--display-flex mm-box--flex-direction-column mm-box--width-full mm-box--height-full mm-box--background-color-background-alternative-soft"
+      style="position: relative;"
+    >
       <div
-        class="mm-box prepare-bridge-page__switch-tokens"
+        class="mm-box prepare-bridge-page__switch-tokens mm-box--display-flex mm-box--background-color-background-alternative-soft"
+        style="position: absolute; top: calc(-20px + 1px); right: calc(50% - 20px); border-radius: 100%; opacity: 1; width: 40px; height: 40px; justify-content: center;"
       >
         <button
           aria-label="switch-tokens"
-          class="mm-box mm-button-icon mm-button-icon--size-lg mm-button-icon--disabled mm-box--display-inline-flex mm-box--justify-content-center mm-box--align-items-center mm-box--width-full mm-box--color-icon-default mm-box--background-color-transparent mm-box--rounded-lg"
+          class="mm-box mm-button-icon mm-button-icon--size-lg mm-button-icon--disabled mm-box--display-inline-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-icon-alternative-soft mm-box--background-color-transparent mm-box--rounded-lg"
           data-testid="switch-tokens"
           disabled=""
+          style="align-self: center; border-radius: 100%; width: 100%; height: 100%;"
         >
           <span
             class="mm-box mm-icon mm-icon--size-lg mm-box--display-inline-block mm-box--color-inherit"
@@ -130,104 +114,69 @@ exports[`PrepareBridgePage should render the component, with initial state 1`] =
         </button>
       </div>
       <div
-        class="mm-box bridge-box"
+        class="mm-box mm-container mm-container--max-width-undefined mm-box--padding-inline-6 mm-box--display-flex mm-box--gap-1 mm-box--flex-direction-column mm-box--width-full"
       >
         <div
-          class="mm-box prepare-bridge-page__input-row"
+          class="mm-box mm-container mm-container--max-width-undefined mm-box--display-flex mm-box--gap-4 mm-box--flex-direction-row mm-box--flex-wrap-nowrap mm-box--justify-content-space-between mm-box--align-items-center"
         >
-          <button
-            class="mm-box mm-text mm-button-base mm-button-base--size-md asset-picker mm-text--body-md-medium mm-box--padding-2 mm-box--padding-right-2 mm-box--padding-left-2 mm-box--display-flex mm-box--gap-2 mm-box--align-items-center mm-box--color-text-default mm-box--background-color-transparent mm-box--rounded-pill"
-            data-testid="asset-picker-button"
+          <div
+            class="mm-box mm-text-field mm-text-field--size-md mm-text-field--disabled mm-text-field--truncate amount-input mm-box--padding-right-0 mm-box--padding-left-0 mm-box--display-flex mm-box--align-items-center mm-box--background-color-background-default mm-box--rounded-sm mm-box--border-width-1 box--border-style-solid"
+            style="min-width: 96px; max-width: 190px; opacity: 1;"
           >
-            <span
-              class="mm-box mm-text mm-text--inherit mm-box--color-text-default"
-            >
-              <div
-                class="mm-box mm-box--display-flex mm-box--gap-3 mm-box--align-items-center"
-              >
-                <div
-                  class="mm-box mm-box--display-flex"
-                >
-                  <div
-                    class="mm-box mm-badge-wrapper mm-box--display-inline-block"
-                  >
-                    <div
-                      class="mm-box mm-text mm-avatar-base mm-avatar-base--size-md mm-avatar-token mm-text--body-sm mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full"
-                    >
-                      ?
-                    </div>
-                    <div
-                      class="mm-box mm-badge-wrapper__badge-container mm-badge-wrapper__badge-container--rectangular-bottom-right"
-                    >
-                      <div
-                        class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-network mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-md mm-box--border-color-border-default mm-box--border-width-1 box--border-style-solid"
-                      >
-                        <img
-                          alt="Ethereum Mainnet logo"
-                          class="mm-avatar-network__network-image"
-                          src="./images/eth_logo.svg"
-                        />
-                      </div>
-                    </div>
-                  </div>
-                </div>
-                <div
-                  class="mm-box"
-                >
-                  <p
-                    class="mm-box mm-text asset-picker__symbol mm-text--body-md mm-box--color-text-default"
-                  />
-                </div>
-              </div>
-            </span>
-            <span
-              class="mm-box mm-icon mm-icon--size-sm mm-box--margin-inline-start-0 mm-box--display-inline-block mm-box--color-icon-default"
-              style="mask-image: url('./images/icons/arrow-down.svg');"
+            <input
+              autocomplete="off"
+              class="mm-box mm-text mm-input mm-input--disable-state-styles mm-input--disabled mm-text-field__input mm-text--body-md mm-text--text-align-start mm-box--margin-0 mm-box--padding-0 mm-box--padding-right-4 mm-box--padding-left-4 mm-box--color-text-default mm-box--background-color-transparent mm-box--border-style-none"
+              data-testid="to-amount"
+              disabled=""
+              focused="false"
+              placeholder="0"
+              readonly=""
+              style="font-weight: 400; font-size: 36px; transition: font-size 0.1s; padding: 0px;"
+              type="text"
+              value="0"
             />
-          </button>
-          <div>
-            <div
-              class="amount-tooltip"
-              style="display: inherit;"
-              tabindex="0"
-              title=""
-            >
-              <div
-                class="mm-box mm-text-field mm-text-field--size-md mm-text-field--disabled mm-text-field--truncate amount-input mm-box--padding-right-0 mm-box--padding-left-0 mm-box--display-inline-flex mm-box--align-items-center mm-box--background-color-background-default mm-box--rounded-sm mm-box--border-width-1 box--border-style-solid"
-              >
-                <input
-                  autocomplete="off"
-                  class="mm-box mm-text mm-input mm-input--disable-state-styles mm-input--disabled mm-text-field__input mm-text--body-md mm-box--margin-0 mm-box--padding-0 mm-box--padding-right-4 mm-box--padding-left-4 mm-box--color-text-default mm-box--background-color-transparent mm-box--border-style-none"
-                  data-testid="to-amount"
-                  disabled=""
-                  focused="false"
-                  placeholder="0"
-                  readonly=""
-                  type="number"
-                  value="0"
-                />
-              </div>
-            </div>
           </div>
+          <button
+            class="mm-box mm-text mm-button-base mm-button-base--size-lg mm-button-primary mm-text--body-md-medium mm-text--font-weight-normal mm-box--padding-0 mm-box--padding-right-6 mm-box--padding-left-6 mm-box--display-inline-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-primary-inverse mm-box--background-color-primary-default mm-box--rounded-pill"
+            data-theme="light"
+            style="white-space: nowrap;"
+          >
+            Bridge to
+          </button>
         </div>
         <div
-          class="mm-box prepare-bridge-page__amounts-row"
+          class="mm-box mm-container mm-container--max-width-undefined mm-box--display-flex mm-box--flex-direction-row mm-box--flex-wrap-nowrap mm-box--justify-content-space-between mm-box--align-items-center"
         >
-          <p
-            class="mm-box mm-text mm-text--body-md mm-box--color-text-alternative"
+          <div
+            class="mm-box mm-container mm-container--max-width-undefined mm-box--display-flex mm-box--flex-direction-row mm-box--flex-wrap-nowrap mm-box--justify-content-space-between mm-box--align-items-center"
           >
-             
-          </p>
+            <p
+              class="mm-box mm-text mm-text--body-md mm-text--font-weight-normal mm-text--ellipsis mm-text--text-align-end mm-box--color-text-alternative-soft"
+            />
+          </div>
+          <a
+            class="mm-box mm-text mm-text--body-md mm-box--display-flex mm-box--gap-1 mm-box--color-text-alternative-soft"
+          />
+        </div>
+      </div>
+      <div
+        class="mm-box mm-container mm-container--max-width-undefined mm-box--display-flex mm-box--flex-direction-column mm-box--justify-content-center mm-box--width-full mm-box--height-full"
+      />
+      <div
+        class="mm-box mm-container mm-container--max-width-undefined mm-box--padding-6 mm-box--display-flex mm-box--flex-direction-row mm-box--flex-wrap-nowrap mm-box--justify-content-space-between mm-box--align-items-center"
+      >
+        <div
+          class="mm-box mm-container mm-container--max-width-undefined mm-box--display-flex mm-box--gap-3 mm-box--flex-direction-column mm-box--width-full"
+          style="padding-inline: 16px; position: relative; overflow: hidden;"
+        >
           <div
-            class="mm-box currency-display-component mm-box--display-flex mm-box--flex-wrap-wrap mm-box--align-items-center"
-            title="$0.00"
+            class="mm-box multichain-page-footer mm-box--padding-0 mm-box--display-flex mm-box--gap-2 mm-box--flex-direction-column mm-box--width-full"
           >
-            <span
-              class="mm-box mm-text currency-display-component__text mm-text--inherit mm-text--ellipsis mm-box--color-text-default"
-              data-testid="account-value-and-suffix"
+            <p
+              class="mm-box mm-text mm-text--body-md mm-text--text-align-center mm-box--width-full mm-box--color-text-alternative-soft"
             >
-              $0.00
-            </span>
+              Select token and amount
+            </p>
           </div>
         </div>
       </div>
@@ -239,131 +188,109 @@ exports[`PrepareBridgePage should render the component, with initial state 1`] =
 exports[`PrepareBridgePage should render the component, with inputs set 1`] = `
 <div>
   <div
-    class="prepare-bridge-page"
+    class="mm-box mm-container mm-container--max-width-undefined prepare-bridge-page mm-box--display-flex mm-box--gap-8 mm-box--flex-direction-column mm-box--width-full"
   >
     <div
-      class="mm-box prepare-bridge-page__content"
+      class="mm-box mm-container mm-container--max-width-undefined mm-box--padding-inline-6 mm-box--display-flex mm-box--gap-1 mm-box--flex-direction-column mm-box--width-full"
     >
       <div
-        class="mm-box bridge-box"
+        class="mm-box mm-container mm-container--max-width-undefined mm-box--display-flex mm-box--gap-4 mm-box--flex-direction-row mm-box--flex-wrap-nowrap mm-box--justify-content-space-between mm-box--align-items-center"
       >
         <div
-          class="mm-box prepare-bridge-page__input-row"
+          class="mm-box mm-text-field mm-text-field--size-md mm-text-field--focused mm-text-field--truncate amount-input mm-box--padding-right-0 mm-box--padding-left-0 mm-box--display-flex mm-box--align-items-center mm-box--background-color-background-default mm-box--rounded-sm mm-box--border-width-1 box--border-style-solid"
+          style="min-width: 96px; max-width: 190px;"
         >
-          <button
-            class="mm-box mm-text mm-button-base mm-button-base--size-md asset-picker mm-text--body-md-medium mm-box--padding-2 mm-box--padding-right-2 mm-box--padding-left-2 mm-box--display-flex mm-box--gap-2 mm-box--align-items-center mm-box--color-text-default mm-box--background-color-transparent mm-box--rounded-pill"
-            data-testid="asset-picker-button"
+          <input
+            autocomplete="off"
+            class="mm-box mm-text mm-input mm-input--disable-state-styles mm-text-field__input mm-text--body-md mm-text--text-align-start mm-box--margin-0 mm-box--padding-0 mm-box--padding-right-4 mm-box--padding-left-4 mm-box--color-text-default mm-box--background-color-transparent mm-box--border-style-none"
+            data-testid="from-amount"
+            focused="true"
+            placeholder="0"
+            style="font-weight: 400; font-size: 36px; transition: font-size 0.1s; padding: 0px;"
+            type="text"
+            value="1"
+          />
+        </div>
+        <button
+          class="mm-box mm-text mm-select-button mm-select-button--size-lg mm-text--body-md mm-box--padding-top-3 mm-box--padding-right-4 mm-box--padding-bottom-3 mm-box--padding-left-4 mm-box--display-flex mm-box--gap-0 mm-box--justify-content-space-between mm-box--align-items-center mm-box--height-full mm-box--color-text-default mm-box--background-color-background-default mm-box--rounded-pill mm-box--border-color-border-muted box--border-style-solid box--border-width-1"
+          style="padding: 8px 11px 8px 8px; min-width: fit-content;"
+        >
+          <div
+            class="mm-box mm-badge-wrapper mm-box--margin-right-2 mm-box--display-inline-block"
           >
-            <span
-              class="mm-box mm-text mm-text--inherit mm-box--color-text-default"
+            <div
+              class="mm-box mm-text mm-avatar-base mm-avatar-base--size-md mm-avatar-token mm-text--body-sm mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-hover mm-box--rounded-full"
             >
-              <div
-                class="mm-box mm-box--display-flex mm-box--gap-3 mm-box--align-items-center"
-              >
-                <div
-                  class="mm-box mm-box--display-flex"
-                >
-                  <div
-                    class="mm-box mm-badge-wrapper mm-box--display-inline-block"
-                  >
-                    <div
-                      class="mm-box mm-text mm-avatar-base mm-avatar-base--size-md mm-avatar-token mm-text--body-sm mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full"
-                    >
-                      <img
-                        alt="ETH logo"
-                        class="mm-avatar-token__token-image"
-                        src="./images/eth_logo.svg"
-                      />
-                    </div>
-                    <div
-                      class="mm-box mm-badge-wrapper__badge-container mm-badge-wrapper__badge-container--rectangular-bottom-right"
-                    >
-                      <div
-                        class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-network mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-md mm-box--border-color-border-muted mm-box--border-width-1 box--border-style-solid"
-                      >
-                        <img
-                          alt="Ethereum Mainnet logo"
-                          class="mm-avatar-network__network-image"
-                          src="./images/eth_logo.svg"
-                        />
-                      </div>
-                    </div>
-                  </div>
-                </div>
-                <div
-                  class="mm-box"
-                >
-                  <div
-                    class=""
-                    style="display: inline;"
-                    tabindex="0"
-                    title=""
-                  >
-                    <p
-                      class="mm-box mm-text asset-picker__symbol mm-text--body-md mm-box--color-text-default"
-                    >
-                      ETH
-                    </p>
-                  </div>
-                </div>
-              </div>
-            </span>
-            <span
-              class="mm-box mm-icon mm-icon--size-sm mm-box--margin-inline-start-0 mm-box--display-inline-block mm-box--color-icon-default"
-              style="mask-image: url('./images/icons/arrow-down.svg');"
-            />
-          </button>
-          <div>
+              <img
+                alt="ETH logo"
+                class="mm-avatar-token__token-image"
+                src="./images/eth_logo.svg"
+              />
+            </div>
             <div
-              class="amount-tooltip"
-              style="display: inherit;"
-              tabindex="0"
-              title=""
+              class="mm-box mm-badge-wrapper__badge-container mm-badge-wrapper__badge-container--rectangular-bottom-right"
             >
               <div
-                class="mm-box mm-text-field mm-text-field--size-md mm-text-field--focused mm-text-field--truncate amount-input mm-box--padding-right-0 mm-box--padding-left-0 mm-box--display-inline-flex mm-box--align-items-center mm-box--background-color-background-default mm-box--rounded-sm mm-box--border-width-1 box--border-style-solid"
+                class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-network mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-md mm-box--border-color-background-default mm-box--border-width-1 box--border-style-solid"
               >
-                <input
-                  autocomplete="off"
-                  class="mm-box mm-text mm-input mm-input--disable-state-styles mm-text-field__input mm-text--body-md mm-box--margin-0 mm-box--padding-0 mm-box--padding-right-4 mm-box--padding-left-4 mm-box--color-text-default mm-box--background-color-transparent mm-box--border-style-none"
-                  data-testid="from-amount"
-                  focused="true"
-                  placeholder="0"
-                  type="number"
-                  value="1"
+                <img
+                  alt="Ethereum Mainnet logo"
+                  class="mm-avatar-network__network-image"
+                  src="./images/eth_logo.svg"
                 />
               </div>
             </div>
           </div>
-        </div>
+          <span
+            class="mm-box mm-select-button__content mm-box--display-flex mm-box--flex-direction-column mm-box--width-full"
+          >
+            <label
+              class="mm-box mm-text mm-label mm-text--body-md mm-text--font-weight-medium mm-box--display-inline-flex mm-box--align-items-center mm-box--color-text-default"
+            >
+              <p
+                class="mm-box mm-text mm-text--body-lg-medium mm-text--ellipsis mm-box--color-text-default"
+              >
+                ETH
+              </p>
+            </label>
+          </span>
+          <span
+            class="mm-box mm-icon mm-icon--size-sm mm-box--display-inline-block mm-box--color-inherit"
+            style="mask-image: url('./images/icons/arrow-2-down.svg'); display: none;"
+          />
+        </button>
+      </div>
+      <div
+        class="mm-box mm-container mm-container--max-width-undefined mm-box--display-flex mm-box--flex-direction-row mm-box--flex-wrap-nowrap mm-box--justify-content-space-between mm-box--align-items-center"
+      >
         <div
-          class="mm-box prepare-bridge-page__amounts-row"
+          class="mm-box mm-container mm-container--max-width-undefined mm-box--display-flex mm-box--flex-direction-row mm-box--flex-wrap-nowrap mm-box--justify-content-space-between mm-box--align-items-center"
         >
           <p
-            class="mm-box mm-text mm-text--body-md mm-box--color-text-alternative"
+            class="mm-box mm-text mm-text--body-md mm-text--font-weight-normal mm-text--ellipsis mm-text--text-align-end mm-box--color-text-alternative-soft"
           >
-             
+            $0.00
           </p>
-          <div
-            class="mm-box currency-display-component mm-box--display-flex mm-box--flex-wrap-wrap mm-box--align-items-center"
-            title="$5,805.77"
-          >
-            <span
-              class="mm-box mm-text currency-display-component__text mm-text--inherit mm-text--ellipsis mm-box--color-text-default"
-              data-testid="account-value-and-suffix"
-            >
-              $5,805.77
-            </span>
-          </div>
         </div>
+        <p
+          class="mm-box mm-text mm-text--body-md mm-box--display-flex mm-box--gap-1 mm-box--color-text-alternative-soft"
+        />
       </div>
+    </div>
+    <div
+      class="mm-box mm-container mm-container--max-width-undefined mm-box--padding-top-8 mm-box--display-flex mm-box--flex-direction-column mm-box--width-full mm-box--height-full mm-box--background-color-background-alternative-soft"
+      style="position: relative;"
+    >
       <div
-        class="mm-box prepare-bridge-page__switch-tokens"
+        class="mm-box prepare-bridge-page__switch-tokens mm-box--display-flex mm-box--background-color-background-alternative-soft"
+        style="position: absolute; top: calc(-20px + 1px); right: calc(50% - 20px); border-radius: 100%; opacity: 1; width: 40px; height: 40px; justify-content: center;"
       >
         <button
           aria-label="switch-tokens"
-          class="mm-box mm-button-icon mm-button-icon--size-lg mm-box--display-inline-flex mm-box--justify-content-center mm-box--align-items-center mm-box--width-full mm-box--color-icon-default mm-box--background-color-transparent mm-box--rounded-lg"
+          class="mm-box mm-button-icon mm-button-icon--size-lg mm-button-icon--disabled mm-box--display-inline-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-icon-alternative-soft mm-box--background-color-transparent mm-box--rounded-lg"
           data-testid="switch-tokens"
+          disabled=""
+          style="align-self: center; border-radius: 100%; width: 100%; height: 100%;"
         >
           <span
             class="mm-box mm-icon mm-icon--size-lg mm-box--display-inline-block mm-box--color-inherit"
@@ -372,117 +299,69 @@ exports[`PrepareBridgePage should render the component, with inputs set 1`] = `
         </button>
       </div>
       <div
-        class="mm-box bridge-box"
+        class="mm-box mm-container mm-container--max-width-undefined mm-box--padding-inline-6 mm-box--display-flex mm-box--gap-1 mm-box--flex-direction-column mm-box--width-full"
       >
         <div
-          class="mm-box prepare-bridge-page__input-row"
+          class="mm-box mm-container mm-container--max-width-undefined mm-box--display-flex mm-box--gap-4 mm-box--flex-direction-row mm-box--flex-wrap-nowrap mm-box--justify-content-space-between mm-box--align-items-center"
         >
-          <button
-            class="mm-box mm-text mm-button-base mm-button-base--size-md asset-picker mm-text--body-md-medium mm-box--padding-2 mm-box--padding-right-2 mm-box--padding-left-2 mm-box--display-flex mm-box--gap-2 mm-box--align-items-center mm-box--color-text-default mm-box--background-color-transparent mm-box--rounded-pill"
-            data-testid="asset-picker-button"
+          <div
+            class="mm-box mm-text-field mm-text-field--size-md mm-text-field--disabled mm-text-field--truncate amount-input mm-box--padding-right-0 mm-box--padding-left-0 mm-box--display-flex mm-box--align-items-center mm-box--background-color-background-default mm-box--rounded-sm mm-box--border-width-1 box--border-style-solid"
+            style="min-width: 96px; max-width: 190px; opacity: 1;"
           >
-            <span
-              class="mm-box mm-text mm-text--inherit mm-box--color-text-default"
-            >
-              <div
-                class="mm-box mm-box--display-flex mm-box--gap-3 mm-box--align-items-center"
-              >
-                <div
-                  class="mm-box mm-box--display-flex"
-                >
-                  <div
-                    class="mm-box mm-badge-wrapper mm-box--display-inline-block"
-                  >
-                    <div
-                      class="mm-box mm-text mm-avatar-base mm-avatar-base--size-md mm-avatar-token mm-text--body-sm mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full"
-                    >
-                      <img
-                        alt="UNI logo"
-                        class="mm-avatar-token__token-image"
-                        src="http://url"
-                      />
-                    </div>
-                    <div
-                      class="mm-box mm-badge-wrapper__badge-container mm-badge-wrapper__badge-container--rectangular-bottom-right"
-                    >
-                      <div
-                        class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-network mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-md mm-box--border-color-border-muted mm-box--border-width-1 box--border-style-solid"
-                      >
-                        <img
-                          alt="Linea Mainnet logo"
-                          class="mm-avatar-network__network-image"
-                          src="./images/linea-logo-mainnet.svg"
-                        />
-                      </div>
-                    </div>
-                  </div>
-                </div>
-                <div
-                  class="mm-box"
-                >
-                  <div
-                    class=""
-                    style="display: inline;"
-                    tabindex="0"
-                    title=""
-                  >
-                    <p
-                      class="mm-box mm-text asset-picker__symbol mm-text--body-md mm-box--color-text-default"
-                    >
-                      UNI
-                    </p>
-                  </div>
-                </div>
-              </div>
-            </span>
-            <span
-              class="mm-box mm-icon mm-icon--size-sm mm-box--margin-inline-start-0 mm-box--display-inline-block mm-box--color-icon-default"
-              style="mask-image: url('./images/icons/arrow-down.svg');"
+            <input
+              autocomplete="off"
+              class="mm-box mm-text mm-input mm-input--disable-state-styles mm-input--disabled mm-text-field__input mm-text--body-md mm-text--text-align-start mm-box--margin-0 mm-box--padding-0 mm-box--padding-right-4 mm-box--padding-left-4 mm-box--color-text-default mm-box--background-color-transparent mm-box--border-style-none"
+              data-testid="to-amount"
+              disabled=""
+              focused="false"
+              placeholder="0"
+              readonly=""
+              style="font-weight: 400; font-size: 36px; transition: font-size 0.1s; padding: 0px;"
+              type="text"
+              value="0"
             />
-          </button>
-          <div>
-            <div
-              class="amount-tooltip"
-              style="display: inherit;"
-              tabindex="0"
-              title=""
-            >
-              <div
-                class="mm-box mm-text-field mm-text-field--size-md mm-text-field--disabled mm-text-field--truncate amount-input mm-box--padding-right-0 mm-box--padding-left-0 mm-box--display-inline-flex mm-box--align-items-center mm-box--background-color-background-default mm-box--rounded-sm mm-box--border-width-1 box--border-style-solid"
-              >
-                <input
-                  autocomplete="off"
-                  class="mm-box mm-text mm-input mm-input--disable-state-styles mm-input--disabled mm-text-field__input mm-text--body-md mm-box--margin-0 mm-box--padding-0 mm-box--padding-right-4 mm-box--padding-left-4 mm-box--color-text-default mm-box--background-color-transparent mm-box--border-style-none"
-                  data-testid="to-amount"
-                  disabled=""
-                  focused="false"
-                  placeholder="0"
-                  readonly=""
-                  type="number"
-                  value="0"
-                />
-              </div>
-            </div>
           </div>
+          <button
+            class="mm-box mm-text mm-button-base mm-button-base--size-lg mm-button-primary mm-text--body-md-medium mm-text--font-weight-normal mm-box--padding-0 mm-box--padding-right-6 mm-box--padding-left-6 mm-box--display-inline-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-primary-inverse mm-box--background-color-primary-default mm-box--rounded-pill"
+            data-theme="light"
+            style="white-space: nowrap;"
+          >
+            Bridge to
+          </button>
         </div>
         <div
-          class="mm-box prepare-bridge-page__amounts-row"
+          class="mm-box mm-container mm-container--max-width-undefined mm-box--display-flex mm-box--flex-direction-row mm-box--flex-wrap-nowrap mm-box--justify-content-space-between mm-box--align-items-center"
         >
-          <p
-            class="mm-box mm-text mm-text--body-md mm-box--color-text-alternative"
+          <div
+            class="mm-box mm-container mm-container--max-width-undefined mm-box--display-flex mm-box--flex-direction-row mm-box--flex-wrap-nowrap mm-box--justify-content-space-between mm-box--align-items-center"
           >
-             
-          </p>
+            <p
+              class="mm-box mm-text mm-text--body-md mm-text--font-weight-normal mm-text--ellipsis mm-text--text-align-end mm-box--color-text-alternative-soft"
+            />
+          </div>
+          <a
+            class="mm-box mm-text mm-text--body-md mm-box--display-flex mm-box--gap-1 mm-box--color-text-alternative-soft"
+          />
+        </div>
+      </div>
+      <div
+        class="mm-box mm-container mm-container--max-width-undefined mm-box--display-flex mm-box--flex-direction-column mm-box--justify-content-center mm-box--width-full mm-box--height-full"
+      />
+      <div
+        class="mm-box mm-container mm-container--max-width-undefined mm-box--padding-6 mm-box--display-flex mm-box--flex-direction-row mm-box--flex-wrap-nowrap mm-box--justify-content-space-between mm-box--align-items-center"
+      >
+        <div
+          class="mm-box mm-container mm-container--max-width-undefined mm-box--display-flex mm-box--gap-3 mm-box--flex-direction-column mm-box--width-full"
+          style="padding-inline: 16px; position: relative; overflow: hidden;"
+        >
           <div
-            class="mm-box currency-display-component mm-box--display-flex mm-box--flex-wrap-wrap mm-box--align-items-center"
-            title="$0.00"
+            class="mm-box multichain-page-footer mm-box--padding-0 mm-box--display-flex mm-box--gap-2 mm-box--flex-direction-column mm-box--width-full"
           >
-            <span
-              class="mm-box mm-text currency-display-component__text mm-text--inherit mm-text--ellipsis mm-box--color-text-default"
-              data-testid="account-value-and-suffix"
+            <p
+              class="mm-box mm-text mm-text--body-md mm-text--text-align-center mm-box--width-full mm-box--color-text-alternative-soft"
             >
-              $0.00
-            </span>
+              Select token and amount
+            </p>
           </div>
         </div>
       </div>
diff --git a/ui/pages/bridge/prepare/bridge-cta-button.test.tsx b/ui/pages/bridge/prepare/bridge-cta-button.test.tsx
index c4ff26f6c743..d4e0fd0855c5 100644
--- a/ui/pages/bridge/prepare/bridge-cta-button.test.tsx
+++ b/ui/pages/bridge/prepare/bridge-cta-button.test.tsx
@@ -22,7 +22,7 @@ describe('BridgeCTAButton', () => {
       },
       bridgeSliceOverrides: { fromTokenInputValue: 1 },
     });
-    const { container, getByText, getByRole } = renderWithProvider(
+    const { container, getByText } = renderWithProvider(
       <BridgeCTAButton />,
       configureStore(mockStore),
     );
@@ -30,7 +30,6 @@ describe('BridgeCTAButton', () => {
     expect(container).toMatchSnapshot();
 
     expect(getByText('Select token')).toBeInTheDocument();
-    expect(getByRole('button')).toBeDisabled();
   });
 
   it('should render the component when amount is missing', () => {
@@ -54,13 +53,12 @@ describe('BridgeCTAButton', () => {
         toChainId: CHAIN_IDS.LINEA_MAINNET,
       },
     });
-    const { getByText, getByRole } = renderWithProvider(
+    const { getByText } = renderWithProvider(
       <BridgeCTAButton />,
       configureStore(mockStore),
     );
 
-    expect(getByText('Enter amount')).toBeInTheDocument();
-    expect(getByRole('button')).toBeDisabled();
+    expect(getByText('Select amount')).toBeInTheDocument();
   });
 
   it('should render the component when amount and dest token is missing', () => {
@@ -84,13 +82,13 @@ describe('BridgeCTAButton', () => {
         toChainId: CHAIN_IDS.LINEA_MAINNET,
       },
     });
-    const { getByText, getByRole } = renderWithProvider(
+    const { getByText, container } = renderWithProvider(
       <BridgeCTAButton />,
       configureStore(mockStore),
     );
 
     expect(getByText('Select token and amount')).toBeInTheDocument();
-    expect(getByRole('button')).toBeDisabled();
+    expect(container).toMatchSnapshot();
   });
 
   it('should render the component when tx is submittable', () => {
@@ -124,7 +122,7 @@ describe('BridgeCTAButton', () => {
       configureStore(mockStore),
     );
 
-    expect(getByText('Confirm')).toBeInTheDocument();
+    expect(getByText('Submit')).toBeInTheDocument();
     expect(getByRole('button')).not.toBeDisabled();
   });
 
@@ -160,13 +158,12 @@ describe('BridgeCTAButton', () => {
         quotesLoadingStatus: RequestStatus.LOADING,
       },
     });
-    const { getByText, getByRole } = renderWithProvider(
+    const { container } = renderWithProvider(
       <BridgeCTAButton />,
       configureStore(mockStore),
     );
 
-    expect(getByText('Fetching quotes...')).toBeInTheDocument();
-    expect(getByRole('button')).toBeDisabled();
+    expect(container).toMatchSnapshot();
   });
 
   it('should enable the component when quotes are loading and there are existing quotes', () => {
@@ -201,12 +198,13 @@ describe('BridgeCTAButton', () => {
         quotesLoadingStatus: RequestStatus.LOADING,
       },
     });
-    const { getByText, getByRole } = renderWithProvider(
+    const { getByText, getByRole, container } = renderWithProvider(
       <BridgeCTAButton />,
       configureStore(mockStore),
     );
 
-    expect(getByText('Confirm')).toBeInTheDocument();
+    expect(getByText('Submit')).toBeInTheDocument();
     expect(getByRole('button')).not.toBeDisabled();
+    expect(container).toMatchSnapshot();
   });
 });
diff --git a/ui/pages/bridge/prepare/bridge-cta-button.tsx b/ui/pages/bridge/prepare/bridge-cta-button.tsx
index dd76ed2a7466..8812e26eb099 100644
--- a/ui/pages/bridge/prepare/bridge-cta-button.tsx
+++ b/ui/pages/bridge/prepare/bridge-cta-button.tsx
@@ -1,6 +1,10 @@
 import React, { useEffect, useMemo, useState } from 'react';
 import { useSelector } from 'react-redux';
-import { Button } from '../../../components/component-library';
+import {
+  ButtonPrimary,
+  ButtonPrimarySize,
+  Text,
+} from '../../../components/component-library';
 import {
   getFromAmount,
   getFromChain,
@@ -9,9 +13,16 @@ import {
   getBridgeQuotes,
   getValidationErrors,
   getBridgeQuotesConfig,
+  getWasTxDeclined,
 } from '../../../ducks/bridge/selectors';
 import { useI18nContext } from '../../../hooks/useI18nContext';
 import useSubmitBridgeTransaction from '../hooks/useSubmitBridgeTransaction';
+import {
+  BlockSize,
+  TextAlign,
+  TextColor,
+  TextVariant,
+} from '../../../helpers/constants/design-system';
 import useLatestBalance from '../../../hooks/bridge/useLatestBalance';
 import { useIsTxSubmittable } from '../../../hooks/bridge/useIsTxSubmittable';
 import { useCrossChainSwapsEventTracker } from '../../../hooks/bridge/useCrossChainSwapsEventTracker';
@@ -19,6 +30,8 @@ import { useRequestProperties } from '../../../hooks/bridge/events/useRequestPro
 import { useRequestMetadataProperties } from '../../../hooks/bridge/events/useRequestMetadataProperties';
 import { useTradeProperties } from '../../../hooks/bridge/events/useTradeProperties';
 import { MetaMetricsEventName } from '../../../../shared/constants/metametrics';
+import { SWAPS_CHAINID_DEFAULT_TOKEN_MAP } from '../../../../shared/constants/swaps';
+import { getNativeCurrency } from '../../../ducks/metamask/metamask';
 
 export const BridgeCTAButton = () => {
   const t = useI18nContext();
@@ -37,10 +50,24 @@ export const BridgeCTAButton = () => {
   const { submitBridgeTransaction } = useSubmitBridgeTransaction();
   const [isSubmitting, setIsSubmitting] = useState(false);
 
-  const { isNoQuotesAvailable, isInsufficientBalance } =
-    useSelector(getValidationErrors);
+  const {
+    isNoQuotesAvailable,
+    isInsufficientBalance: isInsufficientBalance_,
+    isInsufficientGasBalance: isInsufficientGasBalance_,
+    isInsufficientGasForQuote: isInsufficientGasForQuote_,
+  } = useSelector(getValidationErrors);
+
+  const wasTxDeclined = useSelector(getWasTxDeclined);
 
   const { balanceAmount } = useLatestBalance(fromToken, fromChain?.chainId);
+  const { balanceAmount: nativeAssetBalance } = useLatestBalance(
+    fromChain?.chainId
+      ? SWAPS_CHAINID_DEFAULT_TOKEN_MAP[
+          fromChain.chainId as keyof typeof SWAPS_CHAINID_DEFAULT_TOKEN_MAP
+        ]
+      : null,
+    fromChain?.chainId,
+  );
 
   const isTxSubmittable = useIsTxSubmittable();
   const trackCrossChainSwapsEvent = useCrossChainSwapsEventTracker();
@@ -48,7 +75,16 @@ export const BridgeCTAButton = () => {
   const requestMetadataProperties = useRequestMetadataProperties();
   const tradeProperties = useTradeProperties();
 
+  const ticker = useSelector(getNativeCurrency);
   const [isQuoteExpired, setIsQuoteExpired] = useState(false);
+
+  const isInsufficientBalance = isInsufficientBalance_(balanceAmount);
+
+  const isInsufficientGasBalance =
+    isInsufficientGasBalance_(nativeAssetBalance);
+  const isInsufficientGasForQuote =
+    isInsufficientGasForQuote_(nativeAssetBalance);
+
   useEffect(() => {
     let timeout: NodeJS.Timeout;
     // Reset the isQuoteExpired if quote fethching restarts
@@ -66,19 +102,23 @@ export const BridgeCTAButton = () => {
   }, [isQuoteGoingToRefresh, quotesRefreshCount]);
 
   const label = useMemo(() => {
-    if (isQuoteExpired) {
+    if (wasTxDeclined) {
+      return t('youDeclinedTheTransaction');
+    }
+
+    if (isQuoteExpired && !isNoQuotesAvailable) {
       return t('bridgeQuoteExpired');
     }
 
-    if (isLoading && !isTxSubmittable) {
-      return t('swapFetchingQuotes');
+    if (isLoading && !isTxSubmittable && !activeQuote) {
+      return '';
     }
 
-    if (isNoQuotesAvailable) {
-      return t('swapQuotesNotAvailableErrorTitle');
+    if (isInsufficientGasBalance || isNoQuotesAvailable) {
+      return '';
     }
 
-    if (isInsufficientBalance(balanceAmount)) {
+    if (isInsufficientBalance || isInsufficientGasForQuote) {
       return t('alertReasonInsufficientBalance');
     }
 
@@ -90,7 +130,7 @@ export const BridgeCTAButton = () => {
     }
 
     if (isTxSubmittable) {
-      return t('confirm');
+      return t('submit');
     }
 
     return t('swapSelectToken');
@@ -98,17 +138,26 @@ export const BridgeCTAButton = () => {
     isLoading,
     fromAmount,
     toToken,
+    ticker,
     isTxSubmittable,
     balanceAmount,
     isInsufficientBalance,
     isQuoteExpired,
+    isInsufficientGasBalance,
+    isInsufficientGasForQuote,
+    wasTxDeclined,
+    isQuoteExpired,
   ]);
 
-  return (
-    <Button
+  return activeQuote && !wasTxDeclined ? (
+    <ButtonPrimary
+      width={BlockSize.Full}
+      size={activeQuote ? ButtonPrimarySize.Md : ButtonPrimarySize.Lg}
+      variant={TextVariant.bodyMd}
       data-testid="bridge-cta-button"
+      style={{ boxShadow: 'none' }}
       onClick={() => {
-        if (activeQuote && isTxSubmittable) {
+        if (activeQuote && isTxSubmittable && !isSubmitting) {
           try {
             // We don't need to worry about setting to false if the tx submission succeeds
             // because we route immediately to Activity list page
@@ -135,6 +184,15 @@ export const BridgeCTAButton = () => {
       disabled={!isTxSubmittable || isQuoteExpired || isSubmitting}
     >
       {label}
-    </Button>
+    </ButtonPrimary>
+  ) : (
+    <Text
+      variant={TextVariant.bodyMd}
+      width={BlockSize.Full}
+      textAlign={TextAlign.Center}
+      color={TextColor.textAlternativeSoft}
+    >
+      {label}
+    </Text>
   );
 };
diff --git a/ui/pages/bridge/prepare/bridge-input-group.tsx b/ui/pages/bridge/prepare/bridge-input-group.tsx
index 2f8ea8fda1c9..c4502725c1ea 100644
--- a/ui/pages/bridge/prepare/bridge-input-group.tsx
+++ b/ui/pages/bridge/prepare/bridge-input-group.tsx
@@ -1,185 +1,270 @@
-import React from 'react';
-import { Hex } from '@metamask/utils';
+import React, { useEffect, useRef, useState } from 'react';
 import { useSelector } from 'react-redux';
-import { SwapsTokenObject } from '../../../../shared/constants/swaps';
+import { BigNumber } from 'bignumber.js';
+import { getAddress } from 'ethers/lib/utils';
 import {
-  Box,
   Text,
   TextField,
   TextFieldType,
+  ButtonLink,
+  PopoverPosition,
+  Button,
+  ButtonSize,
 } from '../../../components/component-library';
 import { AssetPicker } from '../../../components/multichain/asset-picker-amount/asset-picker';
 import { TabName } from '../../../components/multichain/asset-picker-amount/asset-picker-modal/asset-picker-modal-tabs';
-import CurrencyDisplay from '../../../components/ui/currency-display';
 import { useI18nContext } from '../../../hooks/useI18nContext';
-import { useTokenFiatAmount } from '../../../hooks/useTokenFiatAmount';
-import { useEthFiatAmount } from '../../../hooks/useEthFiatAmount';
-import { isSwapsDefaultTokenSymbol } from '../../../../shared/modules/swaps.utils';
-import Tooltip from '../../../components/ui/tooltip';
-import { SwapsEthToken } from '../../../selectors';
+import { getCurrentCurrency, getLocale } from '../../../selectors';
+import { formatCurrencyAmount, formatTokenAmount } from '../utils/quote';
+import { Column, Row, Tooltip } from '../layout';
 import {
-  ERC20Asset,
-  NativeAsset,
-} from '../../../components/multichain/asset-picker-amount/asset-picker-modal/types';
-import { zeroAddress } from '../../../__mocks__/ethereumjs-util';
+  Display,
+  FontWeight,
+  TextAlign,
+  JustifyContent,
+  TextVariant,
+  TextColor,
+} from '../../../helpers/constants/design-system';
 import { AssetType } from '../../../../shared/constants/transaction';
-import {
-  CHAIN_ID_TO_CURRENCY_SYMBOL_MAP,
-  CHAIN_ID_TOKEN_IMAGE_MAP,
-} from '../../../../shared/constants/network';
+import { BRIDGE_QUOTE_MAX_RETURN_DIFFERENCE_PERCENTAGE } from '../../../../shared/constants/bridge';
 import useLatestBalance from '../../../hooks/bridge/useLatestBalance';
 import {
   getBridgeQuotes,
   getValidationErrors,
 } from '../../../ducks/bridge/selectors';
-import { TextColor } from '../../../helpers/constants/design-system';
-
-const generateAssetFromToken = (
-  chainId: Hex,
-  tokenDetails: SwapsTokenObject | SwapsEthToken,
-): ERC20Asset | NativeAsset => {
-  if ('iconUrl' in tokenDetails && tokenDetails.address !== zeroAddress()) {
-    return {
-      type: AssetType.token,
-      image: tokenDetails.iconUrl,
-      symbol: tokenDetails.symbol,
-      address: tokenDetails.address,
-      chainId,
-    };
-  }
-
-  return {
-    type: AssetType.native,
-    image:
-      CHAIN_ID_TOKEN_IMAGE_MAP[
-        chainId as keyof typeof CHAIN_ID_TOKEN_IMAGE_MAP
-      ],
-    symbol:
-      CHAIN_ID_TO_CURRENCY_SYMBOL_MAP[
-        chainId as keyof typeof CHAIN_ID_TO_CURRENCY_SYMBOL_MAP
-      ],
-    chainId,
-  };
-};
+import { shortenString } from '../../../helpers/utils/util';
+import { BridgeToken } from '../types';
+import { useCopyToClipboard } from '../../../hooks/useCopyToClipboard';
+import { MINUTE } from '../../../../shared/constants/time';
+import { BridgeAssetPickerButton } from './components/bridge-asset-picker-button';
 
 export const BridgeInputGroup = ({
-  className,
   header,
   token,
   onAssetChange,
   onAmountChange,
   networkProps,
+  isTokenListLoading,
   customTokenListGenerator,
+  amountFieldProps,
+  amountInFiat,
+  onMaxButtonClick,
   isMultiselectEnabled,
-  amountFieldProps = {},
 }: {
-  className: string;
+  amountInFiat?: BigNumber;
   onAmountChange?: (value: string) => void;
-  token: SwapsTokenObject | SwapsEthToken | null;
-  amountFieldProps?: Pick<
+  token: BridgeToken | null;
+  amountFieldProps: Pick<
     React.ComponentProps<typeof TextField>,
     'testId' | 'autoFocus' | 'value' | 'readOnly' | 'disabled' | 'className'
   >;
+  onMaxButtonClick?: (value: string) => void;
 } & Pick<
   React.ComponentProps<typeof AssetPicker>,
   | 'networkProps'
   | 'header'
   | 'customTokenListGenerator'
   | 'onAssetChange'
+  | 'isTokenListLoading'
   | 'isMultiselectEnabled'
 >) => {
   const t = useI18nContext();
 
-  const { isLoading, activeQuote } = useSelector(getBridgeQuotes);
-  const { isInsufficientBalance } = useSelector(getValidationErrors);
+  const { isLoading } = useSelector(getBridgeQuotes);
+  const { isInsufficientBalance, isEstimatedReturnLow } =
+    useSelector(getValidationErrors);
+  const currency = useSelector(getCurrentCurrency);
+  const locale = useSelector(getLocale);
 
-  const tokenFiatValue = useTokenFiatAmount(
-    token?.address || undefined,
-    amountFieldProps?.value?.toString() || '0x0',
-    token?.symbol,
-    {
-      showFiat: true,
-    },
-    true,
-  );
-  const ethFiatValue = useEthFiatAmount(
-    amountFieldProps?.value?.toString() || '0x0',
-    { showFiat: true },
-    true,
-  );
+  const selectedChainId = networkProps?.network?.chainId;
+  const { balanceAmount } = useLatestBalance(token, selectedChainId);
 
-  const { formattedBalance, balanceAmount } = useLatestBalance(
-    token,
-    networkProps?.network?.chainId,
-  );
+  const [, handleCopy] = useCopyToClipboard(MINUTE) as [
+    boolean,
+    (text: string) => void,
+  ];
+
+  const inputRef = useRef<HTMLInputElement | null>(null);
+
+  const [isLowReturnTooltipOpen, setIsLowReturnTooltipOpen] = useState(true);
+
+  useEffect(() => {
+    if (inputRef.current) {
+      inputRef.current.value = amountFieldProps?.value?.toString() ?? '';
+      inputRef.current.focus();
+    }
+  }, [amountFieldProps]);
 
   const isAmountReadOnly =
     amountFieldProps?.readOnly || amountFieldProps?.disabled;
 
   return (
-    <Box className={className}>
-      <Box className="prepare-bridge-page__input-row">
+    <Column paddingInline={6} gap={1}>
+      <Row gap={4}>
+        <TextField
+          inputProps={{
+            disableStateStyles: true,
+            textAlign: TextAlign.Start,
+            style: {
+              fontWeight: 400,
+              fontSize: Math.max(
+                14, // Minimum font size
+                36 * // Maximum font size
+                  // Up to 9 characters, use 36px
+                  (9 /
+                    // Otherwise, shrink the font size down to 14
+                    Math.max(
+                      9,
+                      (amountFieldProps?.value ?? '').toString().length,
+                    )),
+              ),
+              transition: 'font-size 0.1s',
+              padding: 0,
+            },
+          }}
+          style={{
+            minWidth: 96,
+            maxWidth: 190,
+            opacity:
+              isAmountReadOnly && amountFieldProps?.value ? 1 : undefined,
+          }}
+          display={Display.Flex}
+          inputRef={inputRef}
+          type={TextFieldType.Text}
+          className="amount-input"
+          placeholder={'0'}
+          onKeyPress={(e?: React.KeyboardEvent<HTMLDivElement>) => {
+            // Only allow numbers and at most one decimal point
+            if (
+              e &&
+              !/^[0-9]*\.{0,1}[0-9]*$/u.test(
+                `${amountFieldProps.value ?? ''}${e.key}`,
+              )
+            ) {
+              e.preventDefault();
+            }
+          }}
+          onChange={(e) => {
+            // Remove characters that are not numbers or decimal points if rendering a controlled or pasted value
+            const cleanedValue = e.target.value.replace(/[^0-9.]+/gu, '');
+            onAmountChange?.(cleanedValue);
+          }}
+          {...amountFieldProps}
+        />
         <AssetPicker
           header={header}
           visibleTabs={[TabName.TOKENS]}
-          asset={
-            networkProps?.network?.chainId && token
-              ? generateAssetFromToken(networkProps.network.chainId, token)
-              : undefined
-          }
+          asset={(token as never) ?? undefined}
           onAssetChange={onAssetChange}
           networkProps={networkProps}
           customTokenListGenerator={customTokenListGenerator}
+          isTokenListLoading={isTokenListLoading}
           isMultiselectEnabled={isMultiselectEnabled}
-        />
-        <Tooltip
-          containerClassName="amount-tooltip"
-          position="top"
-          title={amountFieldProps.value}
-          disabled={(amountFieldProps.value?.toString()?.length ?? 0) < 12}
-          arrow
-          hideOnClick={false}
-          // explicitly inherit display since Tooltip will default to block
-          style={{ display: 'inherit' }}
+          autoFocus={false}
         >
-          <TextField
-            type={TextFieldType.Number}
-            className="amount-input"
-            placeholder={
-              isLoading && !activeQuote ? t('bridgeCalculatingAmount') : '0'
+          {(onClickHandler, networkImageSrc) =>
+            isAmountReadOnly && !token ? (
+              <Button
+                onClick={onClickHandler}
+                size={ButtonSize.Lg}
+                paddingLeft={6}
+                paddingRight={6}
+                fontWeight={FontWeight.Normal}
+                style={{ whiteSpace: 'nowrap' }}
+              >
+                {t('bridgeTo')}
+              </Button>
+            ) : (
+              <BridgeAssetPickerButton
+                onClick={onClickHandler}
+                networkImageSrc={networkImageSrc}
+                asset={(token as never) ?? undefined}
+                networkProps={networkProps}
+              />
+            )
+          }
+        </AssetPicker>
+      </Row>
+
+      <Row justifyContent={JustifyContent.spaceBetween}>
+        <Row>
+          {isAmountReadOnly &&
+            isEstimatedReturnLow &&
+            isLowReturnTooltipOpen && (
+              <Tooltip
+                title={t('lowEstimatedReturnTooltipTitle')}
+                position={PopoverPosition.TopStart}
+                isOpen={isLowReturnTooltipOpen}
+                onClose={() => setIsLowReturnTooltipOpen(false)}
+                triggerElement={<span />}
+                flip={false}
+                offset={[0, 80]}
+              >
+                {t('lowEstimatedReturnTooltipMessage', [
+                  BRIDGE_QUOTE_MAX_RETURN_DIFFERENCE_PERCENTAGE * 100,
+                ])}
+              </Tooltip>
+            )}
+          <Text
+            variant={TextVariant.bodyMd}
+            fontWeight={FontWeight.Normal}
+            color={
+              isAmountReadOnly && isEstimatedReturnLow
+                ? TextColor.warningDefault
+                : TextColor.textAlternativeSoft
             }
-            onChange={(e) => {
-              onAmountChange?.(e.target.value);
-            }}
-            {...amountFieldProps}
-          />
-        </Tooltip>
-      </Box>
-      <Box className="prepare-bridge-page__amounts-row">
+            textAlign={TextAlign.End}
+            ellipsis
+          >
+            {isAmountReadOnly && isLoading && amountFieldProps.value === '0'
+              ? t('bridgeCalculatingAmount')
+              : undefined}
+            {amountInFiat && formatCurrencyAmount(amountInFiat, currency, 2)}
+          </Text>
+        </Row>
         <Text
+          display={Display.Flex}
+          gap={1}
+          variant={TextVariant.bodyMd}
           color={
             !isAmountReadOnly && isInsufficientBalance(balanceAmount)
               ? TextColor.errorDefault
-              : TextColor.textAlternative
+              : TextColor.textAlternativeSoft
           }
+          onClick={() => {
+            if (isAmountReadOnly && token && selectedChainId) {
+              handleCopy(getAddress(token.address));
+            }
+          }}
+          as={isAmountReadOnly ? 'a' : 'p'}
         >
-          {formattedBalance ? `${t('balance')}: ${formattedBalance}` : ' '}
+          {isAmountReadOnly &&
+          token &&
+          selectedChainId &&
+          token.type === AssetType.token
+            ? shortenString(token.address, {
+                truncatedCharLimit: 11,
+                truncatedStartChars: 4,
+                truncatedEndChars: 4,
+                skipCharacterInEnd: false,
+              })
+            : undefined}
+          {!isAmountReadOnly && balanceAmount
+            ? formatTokenAmount(locale, balanceAmount, token?.symbol)
+            : undefined}
+          {onMaxButtonClick &&
+            token &&
+            token.type !== AssetType.native &&
+            balanceAmount && (
+              <ButtonLink
+                variant={TextVariant.bodyMd}
+                onClick={() => onMaxButtonClick(balanceAmount?.toFixed())}
+              >
+                {t('max')}
+              </ButtonLink>
+            )}
         </Text>
-        <CurrencyDisplay
-          currency="usd"
-          displayValue={
-            token?.symbol &&
-            networkProps?.network?.chainId &&
-            isSwapsDefaultTokenSymbol(
-              token.symbol,
-              networkProps.network.chainId,
-            )
-              ? ethFiatValue
-              : tokenFiatValue
-          }
-          hideLabel
-        />
-      </Box>
-    </Box>
+      </Row>
+    </Column>
   );
 };
diff --git a/ui/pages/bridge/prepare/bridge-transaction-settings-modal.stories.tsx b/ui/pages/bridge/prepare/bridge-transaction-settings-modal.stories.tsx
new file mode 100644
index 000000000000..9802ecce9e6f
--- /dev/null
+++ b/ui/pages/bridge/prepare/bridge-transaction-settings-modal.stories.tsx
@@ -0,0 +1,51 @@
+import React from 'react';
+import { Provider } from 'react-redux';
+import configureStore from '../../../store/store';
+import { createBridgeMockStore } from '../../../../test/jest/mock-store';
+import { BridgeTransactionSettingsModal } from './bridge-transaction-settings-modal';
+
+const storybook = {
+  title: 'Pages/Bridge/TransactionSettingsModal',
+  component: BridgeTransactionSettingsModal,
+};
+
+export const DefaultStory = () => {
+  return <BridgeTransactionSettingsModal isOpen={true} onClose={() => {}} />;
+};
+
+DefaultStory.storyName = 'Default';
+DefaultStory.decorators = [
+  (Story) => (
+    <Provider
+      store={configureStore(
+        createBridgeMockStore(
+          {},
+          {
+            toNativeExchangeRate: 1,
+            toTokenExchangeRate: 0.99,
+            slippage: 0.5,
+          },
+          { quotes: [] },
+          {
+            currencyRates: {
+              ETH: { conversionRate: 2514.5 },
+            },
+            marketData: {
+              '0x1': {
+                ['0x0b2C639c533813f4Aa9D7837CAf62653d097Ff85']: {
+                  price: 0.00039762010419237126,
+                  contractPercentChange1d: 0.004,
+                  priceChange1d: 0.00004,
+                },
+              },
+            },
+          },
+        ),
+      )}
+    >
+      <Story />
+    </Provider>
+  ),
+];
+
+export default storybook;
diff --git a/ui/pages/bridge/prepare/bridge-transaction-settings-modal.tsx b/ui/pages/bridge/prepare/bridge-transaction-settings-modal.tsx
new file mode 100644
index 000000000000..8e03827103de
--- /dev/null
+++ b/ui/pages/bridge/prepare/bridge-transaction-settings-modal.tsx
@@ -0,0 +1,217 @@
+import React, { useState } from 'react';
+import { useDispatch, useSelector } from 'react-redux';
+import {
+  Button,
+  ButtonPrimary,
+  ButtonPrimarySize,
+  ButtonSize,
+  ButtonVariant,
+  IconName,
+  Modal,
+  ModalContent,
+  ModalFooter,
+  ModalHeader,
+  ModalOverlay,
+  PopoverPosition,
+  Text,
+  TextField,
+  TextFieldType,
+} from '../../../components/component-library';
+import { useI18nContext } from '../../../hooks/useI18nContext';
+import {
+  BackgroundColor,
+  BlockSize,
+  BorderColor,
+  BorderRadius,
+  JustifyContent,
+  TextColor,
+  TextVariant,
+} from '../../../helpers/constants/design-system';
+import { getSlippage } from '../../../ducks/bridge/selectors';
+import { setSlippage } from '../../../ducks/bridge/actions';
+import { useCrossChainSwapsEventTracker } from '../../../hooks/bridge/useCrossChainSwapsEventTracker';
+import { MetaMetricsEventName } from '../../../../shared/constants/metametrics';
+import { BRIDGE_DEFAULT_SLIPPAGE } from '../../../../shared/constants/bridge';
+import { Column, Row, Tooltip } from '../layout';
+
+const HARDCODED_SLIPPAGE_OPTIONS = [BRIDGE_DEFAULT_SLIPPAGE, 3];
+
+export const BridgeTransactionSettingsModal = ({
+  onClose,
+  isOpen,
+}: Omit<React.ComponentProps<typeof Modal>, 'children'>) => {
+  const t = useI18nContext();
+  const trackCrossChainSwapsEvent = useCrossChainSwapsEventTracker();
+
+  const dispatch = useDispatch();
+
+  const slippage = useSelector(getSlippage);
+
+  const [localSlippage, setLocalSlippage] = useState<number | undefined>(
+    slippage,
+  );
+  const [customSlippage, setCustomSlippage] = useState<number | undefined>(
+    slippage && HARDCODED_SLIPPAGE_OPTIONS.includes(slippage)
+      ? undefined
+      : slippage,
+  );
+  const [showCustomButton, setShowCustomButton] = useState(true);
+
+  return (
+    <Modal isOpen={isOpen} onClose={onClose} className="bridge-settings-modal">
+      <ModalOverlay />
+      <ModalContent>
+        <ModalHeader onClose={onClose}>{t('transactionSettings')}</ModalHeader>
+        <Column gap={3} padding={4}>
+          <Row gap={1} justifyContent={JustifyContent.flexStart}>
+            <Text>{t('swapsMaxSlippage')}</Text>
+            <Tooltip
+              position={PopoverPosition.Top}
+              iconName={IconName.Info}
+              style={{ zIndex: 1051 }}
+            >
+              {t('swapSlippageTooltip')}
+            </Tooltip>
+          </Row>
+          <Row gap={2} justifyContent={JustifyContent.flexStart}>
+            {HARDCODED_SLIPPAGE_OPTIONS.map((hardcodedSlippage) => {
+              return (
+                <Button
+                  key={hardcodedSlippage}
+                  size={ButtonSize.Sm}
+                  onClick={(e: React.MouseEvent<HTMLAnchorElement>) => {
+                    e.preventDefault();
+                    e.stopPropagation();
+                    setLocalSlippage(hardcodedSlippage);
+                    setCustomSlippage(undefined);
+                  }}
+                  variant={ButtonVariant.Secondary}
+                  borderColor={
+                    localSlippage === hardcodedSlippage && showCustomButton
+                      ? BorderColor.primaryDefault
+                      : BorderColor.borderDefault
+                  }
+                  borderWidth={
+                    localSlippage === hardcodedSlippage && showCustomButton
+                      ? 2
+                      : 1
+                  }
+                  backgroundColor={
+                    localSlippage === hardcodedSlippage && showCustomButton
+                      ? BackgroundColor.primaryMuted
+                      : BackgroundColor.backgroundDefault
+                  }
+                >
+                  <Text
+                    color={
+                      localSlippage === hardcodedSlippage && showCustomButton
+                        ? TextColor.primaryDefault
+                        : TextColor.textDefault
+                    }
+                  >
+                    {hardcodedSlippage}%
+                  </Text>
+                </Button>
+              );
+            })}
+            {showCustomButton && (
+              <Button
+                size={ButtonSize.Sm}
+                variant={ButtonVariant.Secondary}
+                borderColor={
+                  customSlippage === undefined
+                    ? BorderColor.borderDefault
+                    : BorderColor.primaryDefault
+                }
+                borderWidth={customSlippage === undefined ? 1 : 2}
+                backgroundColor={
+                  customSlippage === undefined
+                    ? BackgroundColor.backgroundDefault
+                    : BackgroundColor.primaryMuted
+                }
+                onClick={(e: React.MouseEvent<HTMLAnchorElement>) => {
+                  e.preventDefault();
+                  e.stopPropagation();
+                  setShowCustomButton(false);
+                }}
+              >
+                <Text
+                  color={
+                    customSlippage === undefined
+                      ? TextColor.textDefault
+                      : TextColor.primaryDefault
+                  }
+                >
+                  {customSlippage === undefined
+                    ? t('customSlippage')
+                    : `${customSlippage}%`}
+                </Text>
+              </Button>
+            )}
+            {!showCustomButton && (
+              <TextField
+                borderColor={BorderColor.primaryDefault}
+                borderWidth={2}
+                borderRadius={BorderRadius.pill}
+                type={TextFieldType.Text}
+                value={customSlippage}
+                onChange={(e) => {
+                  // Remove characters that are not numbers or decimal points if rendering a controlled or pasted value
+                  const cleanedValue = e.target.value.replace(/[^0-9.]+/gu, '');
+                  setLocalSlippage(undefined);
+                  setCustomSlippage(
+                    cleanedValue.length > 0 ? Number(cleanedValue) : undefined,
+                  );
+                }}
+                autoFocus={true}
+                onBlur={() => {
+                  console.log('====blur');
+                  setShowCustomButton(true);
+                }}
+                onFocus={() => {
+                  console.log('====focus');
+                  setShowCustomButton(false);
+                }}
+                onKeyPress={(e?: React.KeyboardEvent<HTMLDivElement>) => {
+                  // Only allow numbers and at most one decimal point
+                  if (
+                    e &&
+                    !/^[0-9]*\.{0,1}[0-9]*$/u.test(
+                      `${customSlippage ?? ''}${e.key}`,
+                    )
+                  ) {
+                    e.preventDefault();
+                  }
+                }}
+                endAccessory={<Text variant={TextVariant.bodyMd}>%</Text>}
+              />
+            )}
+          </Row>
+        </Column>
+        <ModalFooter>
+          <ButtonPrimary
+            width={BlockSize.Full}
+            size={ButtonPrimarySize.Md}
+            variant={TextVariant.bodyMd}
+            disabled={(localSlippage || customSlippage) === slippage}
+            onClick={() => {
+              const newSlippage = localSlippage || customSlippage;
+              newSlippage &&
+                trackCrossChainSwapsEvent({
+                  event: MetaMetricsEventName.InputChanged,
+                  properties: {
+                    input: 'slippage',
+                    value: newSlippage.toString(),
+                  },
+                });
+              dispatch(setSlippage(newSlippage));
+              onClose();
+            }}
+          >
+            {t('submit')}
+          </ButtonPrimary>
+        </ModalFooter>
+      </ModalContent>
+    </Modal>
+  );
+};
diff --git a/ui/pages/bridge/prepare/components/bridge-asset-picker-button.tsx b/ui/pages/bridge/prepare/components/bridge-asset-picker-button.tsx
new file mode 100644
index 000000000000..b04da2b981fa
--- /dev/null
+++ b/ui/pages/bridge/prepare/components/bridge-asset-picker-button.tsx
@@ -0,0 +1,93 @@
+import React from 'react';
+import {
+  SelectButtonProps,
+  SelectButtonSize,
+} from '../../../../components/component-library/select-button/select-button.types';
+import {
+  AvatarNetwork,
+  AvatarNetworkSize,
+  AvatarToken,
+  BadgeWrapper,
+  IconName,
+  SelectButton,
+  Text,
+} from '../../../../components/component-library';
+import {
+  AlignItems,
+  BackgroundColor,
+  BorderColor,
+  BorderRadius,
+  Display,
+  OverflowWrap,
+  TextVariant,
+} from '../../../../helpers/constants/design-system';
+import { useI18nContext } from '../../../../hooks/useI18nContext';
+import { AssetPicker } from '../../../../components/multichain/asset-picker-amount/asset-picker';
+
+export const BridgeAssetPickerButton = ({
+  asset,
+  networkProps,
+  networkImageSrc,
+  ...props
+}: {
+  networkImageSrc?: string;
+} & SelectButtonProps<'div'> &
+  Pick<React.ComponentProps<typeof AssetPicker>, 'asset' | 'networkProps'>) => {
+  const t = useI18nContext();
+
+  return (
+    <SelectButton
+      borderRadius={BorderRadius.pill}
+      backgroundColor={BackgroundColor.backgroundDefault}
+      borderColor={BorderColor.borderMuted}
+      style={{
+        padding: 8,
+        paddingRight: 11,
+        paddingInline: asset ? undefined : 24,
+        minWidth: 'fit-content',
+      }}
+      gap={0}
+      size={SelectButtonSize.Lg}
+      alignItems={AlignItems.center}
+      descriptionProps={{
+        variant: TextVariant.bodyMd,
+        overflowWrap: OverflowWrap.BreakWord,
+        ellipsis: false,
+      }}
+      caretIconProps={{
+        name: IconName.Arrow2Down,
+        style: { display: Display.None },
+      }}
+      label={
+        <Text variant={TextVariant.bodyLgMedium} ellipsis>
+          {asset?.symbol ?? t('bridgeTo')}
+        </Text>
+      }
+      startAccessory={
+        asset ? (
+          <BadgeWrapper
+            marginRight={2}
+            badge={
+              asset && networkProps?.network?.name ? (
+                <AvatarNetwork
+                  name={networkProps.network.name}
+                  src={networkImageSrc}
+                  size={AvatarNetworkSize.Xs}
+                />
+              ) : undefined
+            }
+          >
+            {asset ? (
+              <AvatarToken
+                src={asset.image || undefined}
+                backgroundColor={BackgroundColor.backgroundHover}
+                name={asset.symbol}
+              />
+            ) : undefined}
+          </BadgeWrapper>
+        ) : undefined
+      }
+      {...props}
+    />
+  );
+};
diff --git a/ui/pages/bridge/prepare/index.scss b/ui/pages/bridge/prepare/index.scss
index 079c057c59de..cfefc86e52e0 100644
--- a/ui/pages/bridge/prepare/index.scss
+++ b/ui/pages/bridge/prepare/index.scss
@@ -1,144 +1,38 @@
 @use "design-system";
 
 .prepare-bridge-page {
-  display: flex;
-  flex-flow: column;
   flex: 1;
-  width: 100%;
-  gap: 24px;
 
-  &__content {
-    display: flex;
-    flex-direction: column;
-    padding: 16px 0 16px 0;
-    border-radius: 8px;
-    border: 1px solid var(--color-border-muted);
-  }
-
-  .bridge-box {
-    display: flex;
-    flex-direction: column;
-    gap: 4px;
-    justify-content: center;
-    padding: 8px 16px 8px 16px;
-  }
-
-  &__input-row {
-    display: flex;
-    flex-direction: row;
-    justify-content: space-between;
-    width: 298px;
-    gap: 16px;
-
-    input[type="number"]::-webkit-inner-spin-button {
-      -webkit-appearance: none;
-      -moz-appearance: none;
-      display: none;
-    }
-
-    input[type="number"]:hover::-webkit-inner-spin-button {
-      -webkit-appearance: none;
-      -moz-appearance: none;
-      display: none;
-    }
-
-    .mm-text-field {
-      background-color: inherit;
-
-      &--focused {
-        outline: none;
-      }
-    }
-
-    .defined {
-      opacity: 1;
-
-      & > .mm-input--disabled {
-        opacity: 1;
-      }
-    }
-  }
-
-  .amount-input {
-    border: none;
-
-    input {
-      text-align: right;
-      padding-right: 0;
-      font-size: 24px;
-      font-weight: 700;
-
-      &:focus,
-      &:focus-visible {
-        outline: none;
-      }
-    }
+  .mm-text-field {
+    background-color: inherit;
 
-    .mm-text-field--focused {
+    &--focused {
       outline: none;
     }
   }
 
-  &__amounts-row {
-    display: flex;
-    flex-direction: row;
-    justify-content: space-between;
-    width: 298px;
-    height: 22px;
-
-    p,
-    span {
-      color: var(--color-text-alternative);
-      font-size: 12px;
-    }
-  }
-
-  .asset-picker {
-    border: 1px solid var(--color-border-muted);
-    height: 40px;
-    min-width: fit-content;
-    max-width: fit-content;
-    background-color: inherit;
-
+  .defined {
+    & > .mm-input--disabled,
     p {
-      font-size: 14px;
-      font-weight: 500;
+      opacity: 1;
     }
+  }
 
-    .mm-avatar-token {
-      height: 24px;
-      width: 24px;
-      border: 1px solid var(--color-border-muted);
-    }
+  .mm-select-button__content {
+    max-height: 100%;
+    overflow: hidden;
+  }
 
-    .mm-badge-wrapper__badge-container .mm-avatar-base {
-      height: 10px;
-      width: 10px;
-      border: none;
-    }
+  .amount-input {
+    border: none;
+    padding: 0;
+    width: 100%;
+    gap: 4px;
+    height: fit-content;
   }
 
   &__switch-tokens {
-    display: flex;
-    justify-content: center;
-    align-items: center;
-
-    &::before,
-    &::after {
-      content: '';
-      border-top: 1px solid var(--color-border-muted);
-      flex-grow: 1;
-    }
-
     button {
-      border-radius: 50%;
-      padding: 10px;
-      border: 1px solid var(--color-border-muted);
-      transition: all 0.3s ease-in-out;
-      cursor: pointer;
-      width: 40px;
-      height: 40px;
-
       &:hover:enabled {
         background: var(--color-background-default-hover);
 
@@ -161,12 +55,54 @@
     }
 
     .mm-icon {
-      color: var(--color-icon-alternative);
       transition: all 0.3s ease-in-out;
     }
+  }
+
+  .mascot-background-animation__animation {
+    margin-top: 24px;
+    margin-bottom: 16px;
+  }
+
+  .highlight {
+    padding: 16px;
+    background: var(--color-background-default);
+    border: none;
+    border-radius: 8px;
+
+    [data-theme='light'],
+    .light {
+      box-shadow: 0 0 2px 0 #e2e4e9, 0 0 16px 0 rgba(226, 228, 233, 0.16);
+    }
+
+    [data-theme='dark'],
+    .dark {
+      box-shadow: 0 0 2px 0 #18191b, 0 0 16px 0 #18191b;
+    }
+  }
+}
+
+.bridge-settings-modal {
+  .mm-button-secondary {
+    &:hover {
+      background-color: var(--color-background-default-hover);
+    }
+  }
+
+  .mm-text-field {
+    height: 32px;
+    width: 94px;
+
+    &--focused,
+    &:focus-visible {
+      outline: none;
+    }
 
-    &:disabled {
-      cursor: not-allowed;
+    input {
+      font-size: var(--font-size-2);
+      padding-top: 1px;
+      width: 100%;
+      height: 32px;
     }
   }
 }
diff --git a/ui/pages/bridge/prepare/prepare-bridge-page.stories.tsx b/ui/pages/bridge/prepare/prepare-bridge-page.stories.tsx
new file mode 100644
index 000000000000..3e955d3e34ef
--- /dev/null
+++ b/ui/pages/bridge/prepare/prepare-bridge-page.stories.tsx
@@ -0,0 +1,248 @@
+import React from 'react';
+import { Provider } from 'react-redux';
+import configureStore from '../../../store/store';
+import { createBridgeMockStore } from '../../../../test/jest/mock-store';
+import { CHAIN_IDS } from '../../../../shared/constants/network';
+import { RequestStatus } from '../../../../app/scripts/controllers/bridge/constants';
+import CrossChainSwap from '../index';
+import { MemoryRouter } from 'react-router-dom';
+import {
+  CROSS_CHAIN_SWAP_ROUTE,
+  PREPARE_SWAP_ROUTE,
+} from '../../../helpers/constants/routes';
+import mockBridgeQuotesErc20Erc20 from '../../../../test/data/bridge/mock-quotes-erc20-erc20.json';
+
+const storybook = {
+  title: 'Pages/Bridge/CrossChainSwapPage',
+  component: CrossChainSwap,
+};
+
+const Wrapper = ({ children }) => (
+  <div style={{ height: '600px' }}>
+    <MemoryRouter
+      initialEntries={[CROSS_CHAIN_SWAP_ROUTE + PREPARE_SWAP_ROUTE]}
+    >
+      {children}
+    </MemoryRouter>
+  </div>
+);
+
+const mockFeatureFlags = {
+  srcNetworkAllowlist: [CHAIN_IDS.MAINNET, CHAIN_IDS.LINEA_MAINNET],
+  destNetworkAllowlist: [CHAIN_IDS.MAINNET, CHAIN_IDS.LINEA_MAINNET],
+  extensionSupport: true,
+  extensionConfig: {
+    refreshRate: 30000,
+    maxRefreshCount: 5,
+  },
+};
+const mockBridgeSlice = {
+  toChainId: CHAIN_IDS.LINEA_MAINNET,
+  toNativeExchangeRate: 1,
+  toTokenExchangeRate: 0.99,
+  fromTokenInputValue: '1',
+};
+export const DefaultStory = () => {
+  return <CrossChainSwap />;
+};
+DefaultStory.storyName = 'Default';
+DefaultStory.decorators = [
+  (Story) => (
+    <Provider
+      store={configureStore(
+        createBridgeMockStore({
+          featureFlagOverrides: mockFeatureFlags,
+          bridgeSliceOverrides: mockBridgeSlice,
+          bridgeStateOverrides: {
+            quotes: [],
+            destTokens: {
+              '0x1234': { symbol: 'USDC', address: '0x1234', decimals: 6 },
+            },
+            srcTokens: {
+              '0x0b2C639c533813f4Aa9D7837CAf62653d097Ff85': {
+                symbol: 'USDC',
+                address: '0x0b2C639c533813f4Aa9D7837CAf62653d097Ff85',
+                decimals: 6,
+              },
+            },
+            quotesLastFetchedMs: Date.now(),
+          },
+          metamaskStateOverrides: {
+            useExternalServices: true,
+            currencyRates: {
+              ETH: { conversionRate: 2514.5 },
+            },
+            marketData: {
+              '0x1': {
+                ['0x0b2C639c533813f4Aa9D7837CAf62653d097Ff85']: {
+                  price: 0.00039762010419237126,
+                  contractPercentChange1d: 0.004,
+                  priceChange1d: 0.00004,
+                },
+              },
+            },
+          },
+        }),
+      )}
+    >
+      <Wrapper>
+        <Story />
+      </Wrapper>
+    </Provider>
+  ),
+];
+
+export const LoadingStory = () => {
+  return <CrossChainSwap />;
+};
+LoadingStory.storyName = 'Loading Quotes';
+LoadingStory.decorators = [
+  (Story) => (
+    <Wrapper>
+      <Provider
+        store={configureStore(
+          createBridgeMockStore({
+            featureFlagOverrides: mockFeatureFlags,
+            bridgeSliceOverrides: mockBridgeSlice,
+            bridgeStateOverrides: {
+              quotes: [],
+              quotesLastFetched: 134,
+              quotesLoadingStatus: RequestStatus.LOADING,
+              destTokens: {
+                '0x1234': { symbol: 'USDC', address: '0x1234', decimals: 6 },
+              },
+              srcTokens: {
+                '0x0b2C639c533813f4Aa9D7837CAf62653d097Ff85': {
+                  symbol: 'USDC',
+                  address: '0x0b2C639c533813f4Aa9D7837CAf62653d097Ff85',
+                  decimals: 6,
+                },
+              },
+            },
+            metamaskStateOverrides: {
+              useExternalServices: true,
+              currencyRates: {
+                ETH: { conversionRate: 2514.5 },
+              },
+              marketData: {
+                '0x1': {
+                  ['0x0b2C639c533813f4Aa9D7837CAf62653d097Ff85']: {
+                    price: 0.00039762010419237126,
+                    contractPercentChange1d: 0.004,
+                    priceChange1d: 0.00004,
+                  },
+                },
+              },
+            },
+          }),
+        )}
+      >
+        <Story />
+      </Provider>
+    </Wrapper>
+  ),
+];
+
+export const NoQuotesStory = () => {
+  return <CrossChainSwap />;
+};
+NoQuotesStory.storyName = 'No Quotes';
+NoQuotesStory.decorators = [
+  (Story) => (
+    <Wrapper>
+      <Provider
+        store={configureStore(
+          createBridgeMockStore({
+            featureFlagOverrides: mockFeatureFlags,
+            bridgeSliceOverrides: mockBridgeSlice,
+            bridgeStateOverrides: {
+              quotes: [],
+              quotesLastFetched: 134,
+              quotesLoadingStatus: RequestStatus.FETCHED,
+              destTokens: {
+                '0x1234': { symbol: 'USDC', address: '0x1234', decimals: 6 },
+              },
+              srcTokens: {
+                '0x0b2C639c533813f4Aa9D7837CAf62653d097Ff85': {
+                  symbol: 'USDC',
+                  address: '0x0b2C639c533813f4Aa9D7837CAf62653d097Ff85',
+                  decimals: 6,
+                },
+              },
+            },
+            metamaskStateOverrides: {
+              useExternalServices: true,
+              currencyRates: {
+                ETH: { conversionRate: 2514.5 },
+              },
+              marketData: {
+                '0x1': {
+                  ['0x0b2C639c533813f4Aa9D7837CAf62653d097Ff85']: {
+                    price: 0.00039762010419237126,
+                    contractPercentChange1d: 0.004,
+                    priceChange1d: 0.00004,
+                  },
+                },
+              },
+            },
+          }),
+        )}
+      >
+        <Story />
+      </Provider>
+    </Wrapper>
+  ),
+];
+
+export const QuotesFetchedStory = () => {
+  return <CrossChainSwap />;
+};
+QuotesFetchedStory.storyName = 'Quotes Available';
+QuotesFetchedStory.decorators = [
+  (Story) => (
+    <Wrapper>
+      <Provider
+        store={configureStore(
+          createBridgeMockStore({
+            featureFlagOverrides: mockFeatureFlags,
+            bridgeSliceOverrides: mockBridgeSlice,
+            bridgeStateOverrides: {
+              quotes: mockBridgeQuotesErc20Erc20,
+              quotesLastFetched: Date.now(),
+              quotesLoadingStatus: RequestStatus.FETCHED,
+              destTokens: {
+                '0x1234': { symbol: 'USDC', address: '0x1234', decimals: 6 },
+              },
+              srcTokens: {
+                '0x0b2C639c533813f4Aa9D7837CAf62653d097Ff85': {
+                  symbol: 'USDC',
+                  address: '0x0b2C639c533813f4Aa9D7837CAf62653d097Ff85',
+                  decimals: 6,
+                },
+              },
+            },
+            metamaskStateOverrides: {
+              useExternalServices: true,
+              currencyRates: {
+                ETH: { conversionRate: 2514.5 },
+              },
+              marketData: {
+                '0x1': {
+                  ['0x0b2C639c533813f4Aa9D7837CAf62653d097Ff85']: {
+                    price: 0.00039762010419237126,
+                    contractPercentChange1d: 0.004,
+                    priceChange1d: 0.00004,
+                  },
+                },
+              },
+            },
+          }),
+        )}
+      >
+        <Story />
+      </Provider>
+    </Wrapper>
+  ),
+];
+
+export default storybook;
diff --git a/ui/pages/bridge/prepare/prepare-bridge-page.test.tsx b/ui/pages/bridge/prepare/prepare-bridge-page.test.tsx
index 6803deb301aa..de8fdfc25b36 100644
--- a/ui/pages/bridge/prepare/prepare-bridge-page.test.tsx
+++ b/ui/pages/bridge/prepare/prepare-bridge-page.test.tsx
@@ -1,6 +1,7 @@
 import React from 'react';
 import { act } from '@testing-library/react';
 import * as reactRouterUtils from 'react-router-dom-v5-compat';
+import { zeroAddress } from 'ethereumjs-util';
 import { fireEvent, renderWithProvider } from '../../../../test/jest';
 import configureStore from '../../../store/store';
 import { createBridgeMockStore } from '../../../../test/jest/mock-store';
@@ -42,6 +43,34 @@ describe('PrepareBridgePage', () => {
           },
         },
       },
+      metamaskStateOverrides: {
+        completedOnboarding: true,
+        allDetectedTokens: {
+          '0x1': {
+            '0x0dcd5d886577d5081b0c52e242ef29e70be3e7bc': [
+              {
+                address: '0x1f9840a85d5af5bf1d1762f925bdaddc4201f984',
+                decimals: 6,
+              }, // USDC
+            ],
+          },
+        },
+      },
+      bridgeStateOverrides: {
+        srcTokens: {
+          '0x6b3595068778dd592e39a122f4f5a5cf09c90fe2': {
+            address: '0x6b3595068778dd592e39a122f4f5a5cf09c90fe2',
+          }, // UNI,
+          [zeroAddress()]: { address: zeroAddress() },
+          '0x1f9840a85d5af5bf1d1762f925bdaddc4201f984': {
+            address: '0x1f9840a85d5af5bf1d1762f925bdaddc4201f984',
+            decimals: 6,
+          }, // USDC
+        },
+        srcTopAssets: [
+          { address: '0x1f9840a85d5af5bf1d1762f925bdaddc4201f984' },
+        ],
+      },
     });
     const { container, getByRole, getByTestId } = renderWithProvider(
       <PrepareBridgePage />,
@@ -57,7 +86,7 @@ describe('PrepareBridgePage', () => {
     await act(() => {
       fireEvent.change(getByTestId('from-amount'), { target: { value: '2' } });
     });
-    expect(getByTestId('from-amount').closest('input')).toHaveValue(2);
+    expect(getByTestId('from-amount').closest('input')).toHaveValue('2');
 
     expect(getByTestId('to-amount')).toBeInTheDocument();
     expect(getByTestId('to-amount').closest('input')).toBeDisabled();
@@ -126,21 +155,25 @@ describe('PrepareBridgePage', () => {
     expect(container).toMatchSnapshot();
 
     expect(getByRole('button', { name: /ETH/u })).toBeInTheDocument();
-    expect(getByRole('button', { name: /UNI/u })).toBeInTheDocument();
+    expect(getByRole('button', { name: /Bridge to/u })).toBeInTheDocument();
 
     expect(getByTestId('from-amount')).toBeInTheDocument();
     expect(getByTestId('from-amount').closest('input')).not.toBeDisabled();
-    expect(getByTestId('from-amount').closest('input')).toHaveValue(1);
+
+    await act(() => {
+      fireEvent.change(getByTestId('from-amount'), { target: { value: '1' } });
+    });
+    expect(getByTestId('from-amount').closest('input')).toHaveValue('1');
 
     await act(() => {
       fireEvent.change(getByTestId('from-amount'), { target: { value: '2' } });
     });
-    expect(getByTestId('from-amount').closest('input')).toHaveValue(2);
+    expect(getByTestId('from-amount').closest('input')).toHaveValue('2');
 
     expect(getByTestId('to-amount')).toBeInTheDocument();
     expect(getByTestId('to-amount').closest('input')).toBeDisabled();
 
-    expect(getByTestId('switch-tokens').closest('button')).not.toBeDisabled();
+    expect(getByTestId('switch-tokens').closest('button')).toBeDisabled();
   });
 
   it('should throw an error if token decimals are not defined', async () => {
diff --git a/ui/pages/bridge/prepare/prepare-bridge-page.tsx b/ui/pages/bridge/prepare/prepare-bridge-page.tsx
index cb9f920b55ea..b4774ec5489a 100644
--- a/ui/pages/bridge/prepare/prepare-bridge-page.tsx
+++ b/ui/pages/bridge/prepare/prepare-bridge-page.tsx
@@ -1,8 +1,15 @@
-import React, { useCallback, useEffect, useMemo, useState } from 'react';
+import React, {
+  useCallback,
+  useEffect,
+  useMemo,
+  useRef,
+  useState,
+} from 'react';
 import { useSelector, useDispatch } from 'react-redux';
 import classnames from 'classnames';
 import { debounce } from 'lodash';
 import { useHistory, useLocation } from 'react-router-dom';
+import { BigNumber } from 'bignumber.js';
 import {
   setFromChain,
   setFromToken,
@@ -12,6 +19,7 @@ import {
   setToChainId,
   setToToken,
   updateQuoteRequestParams,
+  resetBridgeState,
 } from '../../../ducks/bridge/actions';
 import {
   getBridgeQuotes,
@@ -20,30 +28,46 @@ import {
   getFromChains,
   getFromToken,
   getFromTokens,
-  getFromTopAssets,
   getQuoteRequest,
+  getSlippage,
   getToChain,
   getToChains,
   getToToken,
   getToTokens,
-  getToTopAssets,
   getWasTxDeclined,
+  getFromAmountInCurrency,
+  getValidationErrors,
+  getBridgeQuotesConfig,
 } from '../../../ducks/bridge/selectors';
 import {
+  BannerAlert,
+  BannerAlertSeverity,
   Box,
   ButtonIcon,
   IconName,
+  PopoverPosition,
+  Text,
 } from '../../../components/component-library';
-import { BlockSize } from '../../../helpers/constants/design-system';
+import {
+  BackgroundColor,
+  BlockSize,
+  Display,
+  FlexDirection,
+  IconColor,
+  JustifyContent,
+  TextAlign,
+  TextColor,
+  TextVariant,
+} from '../../../helpers/constants/design-system';
 import { useI18nContext } from '../../../hooks/useI18nContext';
-import { TokenBucketPriority } from '../../../../shared/constants/swaps';
-import { useTokensWithFiltering } from '../../../hooks/useTokensWithFiltering';
+import { SWAPS_CHAINID_DEFAULT_TOKEN_MAP } from '../../../../shared/constants/swaps';
+import { useTokensWithFiltering } from '../../../hooks/bridge/useTokensWithFiltering';
 import { setActiveNetwork } from '../../../store/actions';
 import { hexToDecimal } from '../../../../shared/modules/conversion.utils';
 import { QuoteRequest } from '../types';
 import { calcTokenValue } from '../../../../shared/lib/swaps-utils';
 import { BridgeQuoteCard } from '../quotes/bridge-quote-card';
-import { isValidQuoteRequest } from '../utils/quote';
+import { formatTokenAmount, isValidQuoteRequest } from '../utils/quote';
 import { getProviderConfig } from '../../../../shared/modules/selectors/networks';
 import {
   CrossChainSwapsEventProperties,
@@ -52,7 +76,19 @@ import {
 import { useRequestProperties } from '../../../hooks/bridge/events/useRequestProperties';
 import { MetaMetricsEventName } from '../../../../shared/constants/metametrics';
 import { isNetworkAdded } from '../../../ducks/bridge/utils';
+import { Footer } from '../../../components/multichain/pages/page';
+import MascotBackgroundAnimation from '../../swaps/mascot-background-animation/mascot-background-animation';
+import { Column, Row, Tooltip } from '../layout';
+import useRamps from '../../../hooks/ramps/useRamps/useRamps';
+import { getNativeCurrency } from '../../../ducks/metamask/metamask';
+import useLatestBalance from '../../../hooks/bridge/useLatestBalance';
+import { useCountdownTimer } from '../../../hooks/bridge/useCountdownTimer';
+import { useBridgeTokens } from '../../../hooks/bridge/useBridgeTokens';
+import { getCurrentKeyring, getLocale } from '../../../selectors';
+import { isHardwareKeyring } from '../../../helpers/utils/hardware';
+import { SECOND } from '../../../../shared/constants/time';
 import { BridgeInputGroup } from './bridge-input-group';
+import { BridgeCTAButton } from './bridge-cta-button';
 
 const PrepareBridgePage = () => {
   const dispatch = useDispatch();
@@ -60,12 +96,18 @@ const PrepareBridgePage = () => {
   const t = useI18nContext();
 
   const fromToken = useSelector(getFromToken);
-  const fromTokens = useSelector(getFromTokens);
-  const fromTopAssets = useSelector(getFromTopAssets);
+  const {
+    fromTokens,
+    fromTopAssets,
+    isLoading: isFromTokensLoading,
+  } = useSelector(getFromTokens);
 
   const toToken = useSelector(getToToken);
-  const toTokens = useSelector(getToTokens);
-  const toTopAssets = useSelector(getToTopAssets);
+  const {
+    toTokens,
+    toTopAssets,
+    isLoading: isToTokensLoading,
+  } = useSelector(getToTokens);
 
   const fromChains = useSelector(getFromChains);
   const toChains = useSelector(getToChains);
@@ -73,39 +115,108 @@ const PrepareBridgePage = () => {
   const toChain = useSelector(getToChain);
 
   const fromAmount = useSelector(getFromAmount);
+  const fromAmountInFiat = useSelector(getFromAmountInCurrency);
 
   const providerConfig = useSelector(getProviderConfig);
+  const slippage = useSelector(getSlippage);
 
   const quoteRequest = useSelector(getQuoteRequest);
-  const { activeQuote } = useSelector(getBridgeQuotes);
+  const { isLoading, activeQuote, isQuoteGoingToRefresh } =
+    useSelector(getBridgeQuotes);
+
+  const { refreshRate } = useSelector(getBridgeQuotesConfig);
 
   const wasTxDeclined = useSelector(getWasTxDeclined);
 
+  const keyring = useSelector(getCurrentKeyring);
+  // @ts-expect-error keyring type is wrong maybe?
+  const isUsingHardwareWallet = isHardwareKeyring(keyring.type);
+  const locale = useSelector(getLocale);
+
+  const ticker = useSelector(getNativeCurrency);
+  const {
+    isNoQuotesAvailable,
+    isInsufficientGasForQuote,
+    isInsufficientBalance,
+  } = useSelector(getValidationErrors);
+  const { openBuyCryptoInPdapp } = useRamps();
+
+  const { balanceAmount: nativeAssetBalance } = useLatestBalance(
+    SWAPS_CHAINID_DEFAULT_TOKEN_MAP[
+      fromChain?.chainId as keyof typeof SWAPS_CHAINID_DEFAULT_TOKEN_MAP
+    ],
+    fromChain?.chainId,
+  );
+
+  const { balanceAmount: srcTokenBalance } = useLatestBalance(
+    fromToken,
+    fromChain?.chainId,
+  );
+
+  const tokenAddressAllowlistByChainId = useBridgeTokens();
   const fromTokenListGenerator = useTokensWithFiltering(
     fromTokens,
     fromTopAssets,
-    TokenBucketPriority.owned,
+    tokenAddressAllowlistByChainId,
     fromChain?.chainId,
   );
   const toTokenListGenerator = useTokensWithFiltering(
     toTokens,
     toTopAssets,
-    TokenBucketPriority.top,
+    tokenAddressAllowlistByChainId,
     toChain?.chainId,
   );
 
   const { flippedRequestProperties } = useRequestProperties();
   const trackCrossChainSwapsEvent = useCrossChainSwapsEventTracker();
 
+  const millisecondsUntilNextRefresh = useCountdownTimer();
+
   const [rotateSwitchTokens, setRotateSwitchTokens] = useState(false);
 
+  // Background updates are debounced when the switch button is clicked
+  // To prevent putting the frontend in an unexpected state, prevent the user
+  // from switching tokens within the debounce period
+  const [isSwitchingTemporarilyDisabled, setIsSwitchingTemporarilyDisabled] =
+    useState(false);
+  useEffect(() => {
+    setIsSwitchingTemporarilyDisabled(true);
+    const switchButtonTimer = setTimeout(() => {
+      setIsSwitchingTemporarilyDisabled(false);
+    }, SECOND);
+
+    return () => {
+      clearTimeout(switchButtonTimer);
+    };
+  }, [rotateSwitchTokens]);
+
+  useEffect(() => {
+    // Reset controller and inputs on load
+    dispatch(resetBridgeState());
+  }, []);
+
+  const scrollRef = useRef<HTMLDivElement>(null);
+
+  useEffect(() => {
+    if (isInsufficientGasForQuote(nativeAssetBalance)) {
+      scrollRef.current?.scrollIntoView({
+        behavior: 'smooth',
+        block: 'start',
+      });
+    }
+  }, [isInsufficientGasForQuote(nativeAssetBalance)]);
+
   const quoteParams = useMemo(
     () => ({
       srcTokenAddress: fromToken?.address,
       destTokenAddress: toToken?.address || undefined,
       srcTokenAmount:
-        fromAmount && fromAmount !== '' && fromToken?.decimals
-          ? calcTokenValue(fromAmount, fromToken.decimals).toString()
+        fromAmount && fromToken?.decimals
+          ? calcTokenValue(
+              // Treat empty or incomplete amount as 0 to reject NaN
+              ['', '.'].includes(fromAmount) ? '0' : fromAmount,
+              fromToken.decimals,
+            ).toFixed()
           : undefined,
       srcChainId: fromChain?.chainId
         ? Number(hexToDecimal(fromChain.chainId))
@@ -117,6 +228,7 @@ const PrepareBridgePage = () => {
       // Otherwise quotes get filtered out by the bridge-api when the wallet's real
       // balance is less than the tenderly balance
       insufficientBal: Boolean(providerConfig?.rpcUrl?.includes('tenderly')),
+      slippage,
     }),
     [
       fromToken,
@@ -125,6 +237,7 @@ const PrepareBridgePage = () => {
       toChain?.chainId,
       fromAmount,
       providerConfig,
+      slippage,
     ],
   );
 
@@ -182,7 +295,9 @@ const PrepareBridgePage = () => {
       case fromTokens[tokenAddressFromUrl]?.address?.toLowerCase(): {
         // If there is a matching fromToken, set it as the fromToken
         const matchedToken = fromTokens[tokenAddressFromUrl];
-        dispatch(setFromToken(matchedToken));
+        dispatch(
+          setFromToken({ ...matchedToken, image: matchedToken.iconUrl }),
+        );
         removeTokenFromUrl();
         break;
       }
@@ -194,74 +309,117 @@ const PrepareBridgePage = () => {
   }, [fromChain, fromToken, fromTokens, search]);
 
   return (
-    <div className="prepare-bridge-page">
-      <Box className="prepare-bridge-page__content">
-        <BridgeInputGroup
-          className="bridge-box"
-          header={t('swapSelectToken')}
-          token={fromToken}
-          onAmountChange={(e) => {
-            dispatch(setFromTokenInputValue(e));
-          }}
-          onAssetChange={(token) => {
-            token?.address &&
-              trackInputEvent({
-                input: 'token_source',
-                value: token.address,
-              });
-            dispatch(setFromToken(token));
-            dispatch(setFromTokenInputValue(null));
-          }}
-          networkProps={{
-            network: fromChain,
-            networks: fromChains,
-            onNetworkChange: (networkConfig) => {
+    <Column className="prepare-bridge-page" gap={8}>
+      <BridgeInputGroup
+        header={t('bridgeFrom')}
+        token={fromToken}
+        onAmountChange={(e) => {
+          dispatch(setFromTokenInputValue(e));
+        }}
+        onAssetChange={(token) => {
+          dispatch(setFromToken(token));
+          dispatch(setFromTokenInputValue(null));
+          token?.address &&
+            trackInputEvent({
+              input: 'token_source',
+              value: token.address,
+            });
+          dispatch(setFromToken(token));
+          dispatch(setFromTokenInputValue(null));
+        }}
+        networkProps={{
+          network: fromChain,
+          networks: fromChains,
+          onNetworkChange: (networkConfig) => {
+            networkConfig.chainId !== fromChain?.chainId &&
               trackInputEvent({
                 input: 'chain_source',
                 value: networkConfig.chainId,
               });
-              if (networkConfig.chainId === toChain?.chainId) {
-                dispatch(setToChainId(null));
-              }
-              if (isNetworkAdded(networkConfig)) {
-                dispatch(
-                  setActiveNetwork(
-                    networkConfig.rpcEndpoints[
-                      networkConfig.defaultRpcEndpointIndex
-                    ].networkClientId,
-                  ),
-                );
-              }
-              dispatch(setFromChain(networkConfig.chainId));
-              dispatch(setFromToken(null));
-              dispatch(setFromTokenInputValue(null));
-            },
-            header: t('bridgeFrom'),
-          }}
-          customTokenListGenerator={
-            fromTokens && fromTopAssets ? fromTokenListGenerator : undefined
-          }
-          amountFieldProps={{
-            testId: 'from-amount',
-            autoFocus: true,
-            value: fromAmount || undefined,
-          }}
-          isMultiselectEnabled={true}
-        />
+            if (networkConfig.chainId === toChain?.chainId) {
+              dispatch(setToChainId(null));
+              dispatch(setToToken(null));
+            }
+            if (isNetworkAdded(networkConfig)) {
+              dispatch(
+                setActiveNetwork(
+                  networkConfig.rpcEndpoints[
+                    networkConfig.defaultRpcEndpointIndex
+                  ].networkClientId,
+                ),
+              );
+            }
+            dispatch(setFromChain(networkConfig.chainId));
+            dispatch(setFromToken(null));
+            dispatch(setFromTokenInputValue(null));
+          },
+          header: t('yourNetworks'),
+        }}
+        isMultiselectEnabled
+        customTokenListGenerator={
+          fromTokens && fromTopAssets ? fromTokenListGenerator : undefined
+        }
+        onMaxButtonClick={(value: string) => {
+          dispatch(setFromTokenInputValue(value));
+        }}
+        amountInFiat={fromAmountInFiat}
+        amountFieldProps={{
+          testId: 'from-amount',
+          autoFocus: true,
+          value: fromAmount || undefined,
+        }}
+        isTokenListLoading={isFromTokensLoading}
+      />
 
-        <Box className="prepare-bridge-page__switch-tokens">
+      <Column
+        height={BlockSize.Full}
+        paddingTop={8}
+        backgroundColor={BackgroundColor.backgroundAlternativeSoft}
+        style={{
+          position: 'relative',
+        }}
+      >
+        <Box
+          className="prepare-bridge-page__switch-tokens"
+          display={Display.Flex}
+          backgroundColor={BackgroundColor.backgroundAlternativeSoft}
+          style={{
+            position: 'absolute',
+            top: 'calc(-20px + 1px)',
+            right: 'calc(50% - 20px)',
+            border: '2px solid var(--color-background-default)',
+            borderRadius: '100%',
+            opacity: 1,
+            width: 40,
+            height: 40,
+            justifyContent: JustifyContent.center,
+          }}
+        >
           <ButtonIcon
             iconProps={{
               className: classnames({
                 rotate: rotateSwitchTokens,
               }),
             }}
-            width={BlockSize.Full}
+            style={{
+              alignSelf: 'center',
+              borderRadius: '100%',
+              width: '100%',
+              height: '100%',
+            }}
             data-testid="switch-tokens"
             ariaLabel="switch-tokens"
             iconName={IconName.Arrow2Down}
-            disabled={!isValidQuoteRequest(quoteRequest, false)}
+            color={IconColor.iconAlternativeSoft}
+            disabled={
+              isSwitchingTemporarilyDisabled ||
+              !isValidQuoteRequest(quoteRequest, false) ||
+              !isNetworkAdded(toChain)
+            }
             onClick={() => {
+              if (!isNetworkAdded(toChain)) {
+                return;
+              }
               setRotateSwitchTokens(!rotateSwitchTokens);
               flippedRequestProperties &&
                 trackCrossChainSwapsEvent({
@@ -286,7 +444,6 @@ const PrepareBridgePage = () => {
         </Box>
 
         <BridgeInputGroup
-          className="bridge-box"
           header={t('swapSelectToken')}
           token={toToken}
           onAssetChange={(token) => {
@@ -301,33 +458,153 @@ const PrepareBridgePage = () => {
             network: toChain,
             networks: toChains,
             onNetworkChange: (networkConfig) => {
-              trackInputEvent({
-                input: 'chain_destination',
-                value: networkConfig.chainId,
-              });
+              networkConfig.chainId !== toChain?.chainId &&
+                trackInputEvent({
+                  input: 'chain_destination',
+                  value: networkConfig.chainId,
+                });
               dispatch(setToChainId(networkConfig.chainId));
               dispatch(setToChain(networkConfig.chainId));
+              dispatch(setToToken(null));
             },
             header: t('bridgeTo'),
+            shouldDisableNetwork: ({ chainId }) =>
+              chainId === fromChain?.chainId,
           }}
           customTokenListGenerator={
             toChain && toTokens && toTopAssets
               ? toTokenListGenerator
-              : fromTokenListGenerator
+              : undefined
+          }
+          amountInFiat={
+            activeQuote?.toTokenAmount?.valueInCurrency || undefined
           }
           amountFieldProps={{
             testId: 'to-amount',
             readOnly: true,
             disabled: true,
-            value: activeQuote?.toTokenAmount?.amount.toFixed() ?? '0',
-            className: activeQuote?.toTokenAmount.amount
+            value: activeQuote?.toTokenAmount?.amount
+              ? formatTokenAmount(locale, activeQuote.toTokenAmount.amount)
+              : '0',
+            autoFocus: false,
+            className: activeQuote?.toTokenAmount?.amount
               ? 'amount-input defined'
               : 'amount-input',
           }}
+          isTokenListLoading={isToTokensLoading}
         />
-      </Box>
-      {!wasTxDeclined && <BridgeQuoteCard />}
-    </div>
+        <Column height={BlockSize.Full} justifyContent={JustifyContent.center}>
+          {isLoading && !activeQuote ? (
+            <>
+              <Text
+                textAlign={TextAlign.Center}
+                color={TextColor.textAlternativeSoft}
+              >
+                {t('swapFetchingQuotes')}
+              </Text>
+              <MascotBackgroundAnimation height="64" width="64" />
+            </>
+          ) : null}
+        </Column>
+
+        <Row padding={6}>
+          <Column
+            gap={3}
+            className={activeQuote ? 'highlight' : ''}
+            style={{
+              paddingBottom: activeQuote?.approval ? 16 : 'revert-layer',
+              paddingTop: activeQuote?.approval ? 16 : undefined,
+              paddingInline: 16,
+              position: 'relative',
+              overflow: 'hidden',
+            }}
+          >
+            {activeQuote && isQuoteGoingToRefresh && (
+              <Row
+                style={{
+                  position: 'absolute',
+                  left: 0,
+                  top: 0,
+                  width: `calc(100% * (${refreshRate} - ${millisecondsUntilNextRefresh}) / ${refreshRate})`,
+                  height: 4,
+                  maxWidth: '100%',
+                  transition: 'width 1s linear',
+                }}
+                backgroundColor={BackgroundColor.primaryMuted}
+              />
+            )}
+            {!wasTxDeclined && <BridgeQuoteCard />}
+            <Footer padding={0} flexDirection={FlexDirection.Column} gap={2}>
+              <BridgeCTAButton />
+              {activeQuote?.approval && fromAmount && fromToken ? (
+                <Row justifyContent={JustifyContent.center} gap={1}>
+                  <Text
+                    color={TextColor.textAlternativeSoft}
+                    variant={TextVariant.bodyXs}
+                    textAlign={TextAlign.Center}
+                  >
+                    {isUsingHardwareWallet
+                      ? t('willApproveAmountForBridgingHardware')
+                      : t('willApproveAmountForBridging', [
+                          formatTokenAmount(
+                            locale,
+                            new BigNumber(fromAmount),
+                            fromToken.symbol,
+                          ),
+                        ])}
+                  </Text>
+                  {fromAmount && (
+                    <Tooltip
+                      display={Display.InlineBlock}
+                      position={PopoverPosition.Top}
+                      offset={[-48, 8]}
+                      title={t('grantExactAccess')}
+                    >
+                      {isUsingHardwareWallet
+                        ? t('bridgeApprovalWarningForHardware', [
+                            fromAmount,
+                            fromToken.symbol,
+                          ])
+                        : t('bridgeApprovalWarning', [
+                            fromAmount,
+                            fromToken.symbol,
+                          ])}
+                    </Tooltip>
+                  )}
+                </Row>
+              ) : null}
+            </Footer>
+          </Column>
+        </Row>
+        {isNoQuotesAvailable && (
+          <BannerAlert
+            marginInline={4}
+            marginBottom={10}
+            severity={BannerAlertSeverity.Danger}
+            description={t('noOptionsAvailableMessage')}
+            textAlign={TextAlign.Left}
+          />
+        )}
+        {!isLoading &&
+          activeQuote &&
+          !isInsufficientBalance(srcTokenBalance) &&
+          isInsufficientGasForQuote(nativeAssetBalance) && (
+            <BannerAlert
+              ref={scrollRef}
+              marginInline={4}
+              marginBottom={3}
+              title={t('bridgeValidationInsufficientGasTitle', [ticker])}
+              severity={BannerAlertSeverity.Danger}
+              description={t('bridgeValidationInsufficientGasMessage', [
+                ticker,
+              ])}
+              textAlign={TextAlign.Left}
+              actionButtonLabel={t('buyMoreAsset', [ticker])}
+              actionButtonOnClick={() => openBuyCryptoInPdapp()}
+            />
+          )}
+      </Column>
+    </Column>
   );
 };
 
diff --git a/ui/pages/bridge/quotes/__snapshots__/bridge-quote-card.test.tsx.snap b/ui/pages/bridge/quotes/__snapshots__/bridge-quote-card.test.tsx.snap
index 6b69b8ec9a6c..a138eea0b882 100644
--- a/ui/pages/bridge/quotes/__snapshots__/bridge-quote-card.test.tsx.snap
+++ b/ui/pages/bridge/quotes/__snapshots__/bridge-quote-card.test.tsx.snap
@@ -7,177 +7,162 @@ exports[`BridgeQuoteCard should not render when there is no quote 1`] = `<div />
 exports[`BridgeQuoteCard should render the recommended quote 1`] = `
 <div>
   <div
-    class="mm-box quote-card"
+    class="mm-box mm-container mm-container--max-width-undefined mm-box--display-flex mm-box--gap-3 mm-box--flex-direction-column mm-box--width-full"
   >
     <div
-      class="mm-box bridge-box quote-card__timer"
-    >
-      <p
-        class="mm-box mm-text mm-text--body-md mm-box--color-text-default"
-      >
-        New quotes in 0:30
-      </p>
-    </div>
-    <div
-      class="mm-box bridge-box prepare-bridge-page__content quote-card__content"
+      class="mm-box mm-container mm-container--max-width-undefined mm-box--display-flex mm-box--flex-direction-row mm-box--flex-wrap-nowrap mm-box--justify-content-space-between mm-box--align-items-center"
     >
       <div
-        class="mm-box quote-card__info-row"
+        class="mm-box mm-container mm-container--max-width-undefined mm-box--display-flex mm-box--gap-1 mm-box--flex-direction-row mm-box--flex-wrap-nowrap mm-box--justify-content-flex-start mm-box--align-items-center"
+        style="white-space: nowrap;"
       >
-        <div
-          class="mm-box quote-card__info-row__label"
+        <p
+          class="mm-box mm-text mm-text--body-lg-medium mm-box--color-text-default"
         >
-          <p
-            class="mm-box mm-text mm-text--body-md mm-box--color-text-default"
-          >
-            Estimated time
-          </p>
-          <div>
-            <div
-              aria-describedby="tippy-tooltip-1"
-              class="quote-card__info-row__label__tooltip"
-              data-original-title="This is the estimated time it will take for the bridging to be complete."
-              data-tooltipped=""
-              style="display: flex;"
-              tabindex="0"
-            >
-              <span
-                class="mm-box mm-icon mm-icon--size-sm mm-box--display-inline-block mm-box--color-icon-muted"
-                style="mask-image: url('./images/icons/question.svg');"
-              />
-            </div>
-          </div>
-        </div>
+          Best price
+        </p>
         <div
-          class="mm-box quote-card__info-row__description"
+          class="mm-box"
         >
           <div
-            class="mm-box quote-card__info-row__description__secondary"
+            class="mm-box mm-box--display-flex"
           >
-            <p
-              class="mm-box mm-text mm-text--body-md mm-box--color-text-default"
+            <span
+              class="mm-box mm-icon mm-icon--size-sm mm-box--display-inline-block mm-box--color-icon-alternative-soft"
+              style="mask-image: url('./images/icons/question.svg');"
             />
           </div>
-          <p
-            class="mm-box mm-text mm-text--body-md mm-box--color-text-default"
-          >
-            1 min
-          </p>
         </div>
       </div>
       <div
-        class="mm-box quote-card__info-row"
+        class="mm-box mm-container mm-container--max-width-undefined mm-box--display-flex mm-box--flex-direction-column mm-box--align-items-flex-end mm-box--width-full mm-box--height-full"
+      >
+        <a
+          class="mm-box mm-text mm-text--body-md mm-box--color-primary-default"
+        >
+          More quotes
+        </a>
+      </div>
+    </div>
+    <div
+      class="mm-box mm-container mm-container--max-width-undefined mm-box--display-flex mm-box--gap-1 mm-box--flex-direction-column mm-box--width-full"
+    >
+      <div
+        class="mm-box mm-container mm-container--max-width-undefined mm-box--display-flex mm-box--flex-direction-row mm-box--flex-wrap-nowrap mm-box--justify-content-space-between mm-box--align-items-center"
       >
+        <p
+          class="mm-box mm-text mm-text--body-md-medium mm-box--color-text-alternative-soft"
+        >
+          Bridging
+        </p>
         <div
-          class="mm-box quote-card__info-row__label"
+          class="mm-box mm-container mm-container--max-width-undefined mm-box--display-flex mm-box--gap-1 mm-box--flex-direction-row mm-box--flex-wrap-nowrap mm-box--justify-content-space-between mm-box--align-items-center"
         >
+          <div
+            class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-network mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-transparent mm-box--rounded-md mm-box--border-color-background-default mm-box--border-width-1 box--border-style-solid"
+          >
+            <img
+              alt="Ethereum Mainnet logo"
+              class="mm-avatar-network__network-image"
+              src="./images/optimism.svg"
+            />
+          </div>
           <p
             class="mm-box mm-text mm-text--body-md mm-box--color-text-default"
+            style="white-space: nowrap;"
           >
-            Quote rate
+            OP Mainnet
           </p>
-        </div>
-        <div
-          class="mm-box quote-card__info-row__description"
-        >
+          <span
+            class="mm-box mm-icon mm-icon--size-xs mm-box--display-inline-block mm-box--color-inherit"
+            style="mask-image: url('./images/icons/arrow-2-right.svg');"
+          />
           <div
-            class="mm-box quote-card__info-row__description__secondary"
+            class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-network mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-transparent mm-box--rounded-md mm-box--border-color-background-default mm-box--border-width-1 box--border-style-solid"
           >
-            <p
-              class="mm-box mm-text mm-text--body-md mm-box--color-text-default"
+            <img
+              alt="network logo"
+              class="mm-avatar-network__network-image"
+              src="./images/pol-token.svg"
             />
           </div>
           <p
             class="mm-box mm-text mm-text--body-md mm-box--color-text-default"
+            style="white-space: nowrap;"
           >
-            1 USDC = 1.00 USDC
+            Polygon
           </p>
         </div>
       </div>
       <div
-        class="mm-box quote-card__info-row"
+        class="mm-box mm-container mm-container--max-width-undefined mm-box--display-flex mm-box--flex-direction-row mm-box--flex-wrap-nowrap mm-box--justify-content-space-between mm-box--align-items-center"
       >
+        <p
+          class="mm-box mm-text mm-text--body-md-medium mm-box--color-text-alternative-soft"
+        >
+          Network fees
+        </p>
         <div
-          class="mm-box quote-card__info-row__label"
+          class="mm-box mm-container mm-container--max-width-undefined mm-box--display-flex mm-box--gap-1 mm-box--flex-direction-row mm-box--flex-wrap-nowrap mm-box--justify-content-space-between mm-box--align-items-center"
         >
           <p
             class="mm-box mm-text mm-text--body-md mm-box--color-text-default"
           >
-            Total fees
+            $2.52
           </p>
-          <div>
-            <div
-              aria-describedby="tippy-tooltip-2"
-              class="quote-card__info-row__label__tooltip"
-              data-original-title="This includes gas fees (paid to crypto miners) and relayer fees (paid to power complex services like bridging).
-Fees are based on network traffic and transaction complexity. MetaMask does not profit from either fee."
-              data-tooltipped=""
-              style="display: flex;"
-              tabindex="0"
-            >
-              <span
-                class="mm-box mm-icon mm-icon--size-sm mm-box--display-inline-block mm-box--color-icon-muted"
-                style="mask-image: url('./images/icons/question.svg');"
-              />
-            </div>
-          </div>
-        </div>
-        <div
-          class="mm-box quote-card__info-row__description"
-        >
-          <div
-            class="mm-box quote-card__info-row__description__secondary"
+          <p
+            class="mm-box mm-text mm-text--body-md mm-box--color-text-default"
           >
-            <p
-              class="mm-box mm-text mm-text--body-md mm-box--color-text-default"
-            >
-              0.001000 ETH
-            </p>
-          </div>
+            -
+          </p>
           <p
             class="mm-box mm-text mm-text--body-md mm-box--color-text-default"
           >
             $2.52
           </p>
+          <span
+            class="mm-box mm-icon mm-icon--size-md mm-box--display-inline-block mm-box--color-icon-alternative-soft"
+            style="mask-image: url('./images/icons/swap-vertical.svg'); cursor: pointer;"
+          />
         </div>
       </div>
-    </div>
-    <div
-      class="mm-box bridge-box quote-card__footer"
-    >
-      <span>
+      <div
+        class="mm-box mm-container mm-container--max-width-undefined mm-box--display-flex mm-box--flex-direction-row mm-box--flex-wrap-nowrap mm-box--justify-content-space-between mm-box--align-items-center"
+      >
         <p
-          class="mm-box mm-text mm-text--body-md mm-box--color-text-default"
+          class="mm-box mm-text mm-text--body-md-medium mm-box--color-text-alternative-soft"
         >
-          Includes a 0.875% MetaMask fee.
+          Time
         </p>
-        <button
-          class="mm-box mm-text mm-button-base mm-button-link mm-button-link--size-auto mm-text--body-md-medium mm-box--padding-0 mm-box--padding-right-0 mm-box--padding-left-0 mm-box--display-inline-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-primary-default mm-box--background-color-transparent"
+        <p
+          class="mm-box mm-text mm-text--body-md mm-box--color-text-default"
         >
-          <span
-            class="mm-box mm-text mm-text--inherit mm-box--color-primary-default"
-          >
-            <p
-              class="mm-box mm-text mm-text--body-md mm-box--color-text-default"
-            >
-              view all quotes
-            </p>
-          </span>
-        </button>
-      </span>
-      <button
-        class="mm-box mm-text mm-button-base mm-button-link mm-button-link--size-auto mm-text--body-md-medium mm-box--padding-0 mm-box--padding-right-0 mm-box--padding-left-0 mm-box--display-inline-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-primary-default mm-box--background-color-transparent"
+          1 min
+        </p>
+      </div>
+      <div
+        class="mm-box mm-container mm-container--max-width-undefined mm-box--display-flex mm-box--gap-2 mm-box--flex-direction-row mm-box--flex-wrap-nowrap mm-box--justify-content-flex-start mm-box--align-items-center"
       >
-        <span
-          class="mm-box mm-text mm-text--inherit mm-box--color-primary-default"
+        <p
+          class="mm-box mm-text mm-text--body-md mm-box--color-text-alternative-soft"
         >
-          <p
-            class="mm-box mm-text mm-text--body-md mm-box--color-text-default"
-          >
-            Terms of service
-          </p>
-        </span>
-      </button>
+          Rate includes 0.875% fee
+        </p>
+        <p
+          class="mm-box mm-text mm-text--body-md mm-box--color-text-alternative-soft"
+        >
+          ·
+        </p>
+        <a
+          class="mm-box mm-text mm-button-base mm-button-link mm-button-link--size-auto mm-text--body-md mm-box--padding-0 mm-box--padding-right-0 mm-box--padding-left-0 mm-box--display-inline-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-alternative-soft mm-box--background-color-transparent"
+          href="https://consensys.io/terms-of-use/"
+          rel="noopener noreferrer"
+          style="text-decoration: underline;"
+          target="_blank"
+        >
+          Terms
+        </a>
+      </div>
     </div>
   </div>
 </div>
@@ -186,171 +171,162 @@ Fees are based on network traffic and transaction complexity. MetaMask does not
 exports[`BridgeQuoteCard should render the recommended quote while loading new quotes 1`] = `
 <div>
   <div
-    class="mm-box quote-card"
+    class="mm-box mm-container mm-container--max-width-undefined mm-box--display-flex mm-box--gap-3 mm-box--flex-direction-column mm-box--width-full"
   >
     <div
-      class="mm-box bridge-box quote-card__timer"
-    />
-    <div
-      class="mm-box bridge-box prepare-bridge-page__content quote-card__content"
+      class="mm-box mm-container mm-container--max-width-undefined mm-box--display-flex mm-box--flex-direction-row mm-box--flex-wrap-nowrap mm-box--justify-content-space-between mm-box--align-items-center"
     >
       <div
-        class="mm-box quote-card__info-row"
+        class="mm-box mm-container mm-container--max-width-undefined mm-box--display-flex mm-box--gap-1 mm-box--flex-direction-row mm-box--flex-wrap-nowrap mm-box--justify-content-flex-start mm-box--align-items-center"
+        style="white-space: nowrap;"
       >
-        <div
-          class="mm-box quote-card__info-row__label"
+        <p
+          class="mm-box mm-text mm-text--body-lg-medium mm-box--color-text-default"
         >
-          <p
-            class="mm-box mm-text mm-text--body-md mm-box--color-text-default"
-          >
-            Estimated time
-          </p>
-          <div>
-            <div
-              aria-describedby="tippy-tooltip-3"
-              class="quote-card__info-row__label__tooltip"
-              data-original-title="This is the estimated time it will take for the bridging to be complete."
-              data-tooltipped=""
-              style="display: flex;"
-              tabindex="0"
-            >
-              <span
-                class="mm-box mm-icon mm-icon--size-sm mm-box--display-inline-block mm-box--color-icon-muted"
-                style="mask-image: url('./images/icons/question.svg');"
-              />
-            </div>
-          </div>
-        </div>
+          Best price
+        </p>
         <div
-          class="mm-box quote-card__info-row__description"
+          class="mm-box"
         >
           <div
-            class="mm-box quote-card__info-row__description__secondary"
+            class="mm-box mm-box--display-flex"
           >
-            <p
-              class="mm-box mm-text mm-text--body-md mm-box--color-text-default"
+            <span
+              class="mm-box mm-icon mm-icon--size-sm mm-box--display-inline-block mm-box--color-icon-alternative-soft"
+              style="mask-image: url('./images/icons/question.svg');"
             />
           </div>
-          <p
-            class="mm-box mm-text mm-text--body-md mm-box--color-text-default"
-          >
-            1 min
-          </p>
         </div>
       </div>
       <div
-        class="mm-box quote-card__info-row"
+        class="mm-box mm-container mm-container--max-width-undefined mm-box--display-flex mm-box--flex-direction-column mm-box--align-items-flex-end mm-box--width-full mm-box--height-full"
+      >
+        <a
+          class="mm-box mm-text mm-text--body-md mm-box--color-primary-default"
+        >
+          More quotes
+        </a>
+      </div>
+    </div>
+    <div
+      class="mm-box mm-container mm-container--max-width-undefined mm-box--display-flex mm-box--gap-1 mm-box--flex-direction-column mm-box--width-full"
+    >
+      <div
+        class="mm-box mm-container mm-container--max-width-undefined mm-box--display-flex mm-box--flex-direction-row mm-box--flex-wrap-nowrap mm-box--justify-content-space-between mm-box--align-items-center"
       >
+        <p
+          class="mm-box mm-text mm-text--body-md-medium mm-box--color-text-alternative-soft"
+        >
+          Bridging
+        </p>
         <div
-          class="mm-box quote-card__info-row__label"
+          class="mm-box mm-container mm-container--max-width-undefined mm-box--display-flex mm-box--gap-1 mm-box--flex-direction-row mm-box--flex-wrap-nowrap mm-box--justify-content-space-between mm-box--align-items-center"
         >
+          <div
+            class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-network mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-transparent mm-box--rounded-md mm-box--border-color-background-default mm-box--border-width-1 box--border-style-solid"
+          >
+            <img
+              alt="Ethereum Mainnet logo"
+              class="mm-avatar-network__network-image"
+              src="./images/optimism.svg"
+            />
+          </div>
           <p
             class="mm-box mm-text mm-text--body-md mm-box--color-text-default"
+            style="white-space: nowrap;"
           >
-            Quote rate
+            OP Mainnet
           </p>
-        </div>
-        <div
-          class="mm-box quote-card__info-row__description"
-        >
+          <span
+            class="mm-box mm-icon mm-icon--size-xs mm-box--display-inline-block mm-box--color-inherit"
+            style="mask-image: url('./images/icons/arrow-2-right.svg');"
+          />
           <div
-            class="mm-box quote-card__info-row__description__secondary"
+            class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-network mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-transparent mm-box--rounded-md mm-box--border-color-background-default mm-box--border-width-1 box--border-style-solid"
           >
-            <p
-              class="mm-box mm-text mm-text--body-md mm-box--color-text-default"
+            <img
+              alt="network logo"
+              class="mm-avatar-network__network-image"
+              src="./images/pol-token.svg"
             />
           </div>
           <p
             class="mm-box mm-text mm-text--body-md mm-box--color-text-default"
+            style="white-space: nowrap;"
           >
-            1 ETH = 2443.89 USDC
+            Polygon
           </p>
         </div>
       </div>
       <div
-        class="mm-box quote-card__info-row"
+        class="mm-box mm-container mm-container--max-width-undefined mm-box--display-flex mm-box--flex-direction-row mm-box--flex-wrap-nowrap mm-box--justify-content-space-between mm-box--align-items-center"
       >
+        <p
+          class="mm-box mm-text mm-text--body-md-medium mm-box--color-text-alternative-soft"
+        >
+          Network fees
+        </p>
         <div
-          class="mm-box quote-card__info-row__label"
+          class="mm-box mm-container mm-container--max-width-undefined mm-box--display-flex mm-box--gap-1 mm-box--flex-direction-row mm-box--flex-wrap-nowrap mm-box--justify-content-space-between mm-box--align-items-center"
         >
           <p
             class="mm-box mm-text mm-text--body-md mm-box--color-text-default"
           >
-            Total fees
+            $2.52
           </p>
-          <div>
-            <div
-              aria-describedby="tippy-tooltip-4"
-              class="quote-card__info-row__label__tooltip"
-              data-original-title="This includes gas fees (paid to crypto miners) and relayer fees (paid to power complex services like bridging).
-Fees are based on network traffic and transaction complexity. MetaMask does not profit from either fee."
-              data-tooltipped=""
-              style="display: flex;"
-              tabindex="0"
-            >
-              <span
-                class="mm-box mm-icon mm-icon--size-sm mm-box--display-inline-block mm-box--color-icon-muted"
-                style="mask-image: url('./images/icons/question.svg');"
-              />
-            </div>
-          </div>
-        </div>
-        <div
-          class="mm-box quote-card__info-row__description"
-        >
-          <div
-            class="mm-box quote-card__info-row__description__secondary"
+          <p
+            class="mm-box mm-text mm-text--body-md mm-box--color-text-default"
           >
-            <p
-              class="mm-box mm-text mm-text--body-md mm-box--color-text-default"
-            >
-              0.001000 ETH
-            </p>
-          </div>
+            -
+          </p>
           <p
             class="mm-box mm-text mm-text--body-md mm-box--color-text-default"
           >
             $2.52
           </p>
+          <span
+            class="mm-box mm-icon mm-icon--size-md mm-box--display-inline-block mm-box--color-icon-alternative-soft"
+            style="mask-image: url('./images/icons/swap-vertical.svg'); cursor: pointer;"
+          />
         </div>
       </div>
-    </div>
-    <div
-      class="mm-box bridge-box quote-card__footer"
-    >
-      <span>
+      <div
+        class="mm-box mm-container mm-container--max-width-undefined mm-box--display-flex mm-box--flex-direction-row mm-box--flex-wrap-nowrap mm-box--justify-content-space-between mm-box--align-items-center"
+      >
         <p
-          class="mm-box mm-text mm-text--body-md mm-box--color-text-default"
+          class="mm-box mm-text mm-text--body-md-medium mm-box--color-text-alternative-soft"
         >
-          Includes a 0.875% MetaMask fee.
+          Time
         </p>
-        <button
-          class="mm-box mm-text mm-button-base mm-button-link mm-button-link--size-auto mm-text--body-md-medium mm-box--padding-0 mm-box--padding-right-0 mm-box--padding-left-0 mm-box--display-inline-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-primary-default mm-box--background-color-transparent"
+        <p
+          class="mm-box mm-text mm-text--body-md mm-box--color-text-default"
         >
-          <span
-            class="mm-box mm-text mm-text--inherit mm-box--color-primary-default"
-          >
-            <p
-              class="mm-box mm-text mm-text--body-md mm-box--color-text-default"
-            >
-              view all quotes
-            </p>
-          </span>
-        </button>
-      </span>
-      <button
-        class="mm-box mm-text mm-button-base mm-button-link mm-button-link--size-auto mm-text--body-md-medium mm-box--padding-0 mm-box--padding-right-0 mm-box--padding-left-0 mm-box--display-inline-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-primary-default mm-box--background-color-transparent"
+          1 min
+        </p>
+      </div>
+      <div
+        class="mm-box mm-container mm-container--max-width-undefined mm-box--display-flex mm-box--gap-2 mm-box--flex-direction-row mm-box--flex-wrap-nowrap mm-box--justify-content-flex-start mm-box--align-items-center"
       >
-        <span
-          class="mm-box mm-text mm-text--inherit mm-box--color-primary-default"
+        <p
+          class="mm-box mm-text mm-text--body-md mm-box--color-text-alternative-soft"
         >
-          <p
-            class="mm-box mm-text mm-text--body-md mm-box--color-text-default"
-          >
-            Terms of service
-          </p>
-        </span>
-      </button>
+          Rate includes 0.875% fee
+        </p>
+        <p
+          class="mm-box mm-text mm-text--body-md mm-box--color-text-alternative-soft"
+        >
+          ·
+        </p>
+        <a
+          class="mm-box mm-text mm-button-base mm-button-link mm-button-link--size-auto mm-text--body-md mm-box--padding-0 mm-box--padding-right-0 mm-box--padding-left-0 mm-box--display-inline-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-alternative-soft mm-box--background-color-transparent"
+          href="https://consensys.io/terms-of-use/"
+          rel="noopener noreferrer"
+          style="text-decoration: underline;"
+          target="_blank"
+        >
+          Terms
+        </a>
+      </div>
     </div>
   </div>
 </div>
diff --git a/ui/pages/bridge/quotes/__snapshots__/bridge-quotes-modal.test.tsx.snap b/ui/pages/bridge/quotes/__snapshots__/bridge-quotes-modal.test.tsx.snap
index 137dc246864e..2c401feffa78 100644
--- a/ui/pages/bridge/quotes/__snapshots__/bridge-quotes-modal.test.tsx.snap
+++ b/ui/pages/bridge/quotes/__snapshots__/bridge-quotes-modal.test.tsx.snap
@@ -66,7 +66,7 @@ exports[`BridgeQuotesModal should render the modal 1`] = `
                 class="mm-box mm-text mm-text--inherit mm-box--color-primary-default"
               >
                 <p
-                  class="mm-box mm-text mm-text--body-sm mm-box--color-primary-default"
+                  class="mm-box mm-text mm-text--body-sm-medium mm-box--color-primary-default"
                 >
                   Net cost
                 </p>
@@ -77,13 +77,13 @@ exports[`BridgeQuotesModal should render the modal 1`] = `
               />
             </button>
             <button
-              class="mm-box mm-text mm-button-base mm-button-link mm-button-link--size-auto mm-text--body-md-medium mm-box--padding-0 mm-box--padding-right-0 mm-box--padding-left-0 mm-box--display-inline-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-alternative mm-box--background-color-transparent"
+              class="mm-box mm-text mm-button-base mm-button-link mm-button-link--size-auto mm-text--body-md-medium mm-box--padding-0 mm-box--padding-right-0 mm-box--padding-left-0 mm-box--display-inline-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-alternative-soft mm-box--background-color-transparent"
             >
               <span
-                class="mm-box mm-text mm-text--inherit mm-box--color-text-alternative"
+                class="mm-box mm-text mm-text--inherit mm-box--color-text-alternative-soft"
               >
                 <p
-                  class="mm-box mm-text mm-text--body-sm mm-box--color-text-alternative"
+                  class="mm-box mm-text mm-text--body-sm mm-box--color-text-alternative-soft"
                 >
                   Time
                 </p>
@@ -96,11 +96,11 @@ exports[`BridgeQuotesModal should render the modal 1`] = `
           >
             <div
               class="mm-box mm-container mm-container--max-width-undefined mm-box--padding-top-3 mm-box--padding-bottom-3 mm-box--padding-inline-4 mm-box--display-flex mm-box--flex-direction-row mm-box--flex-wrap-nowrap mm-box--justify-content-space-between mm-box--align-items-flex-start mm-box--background-color-primary-muted"
-              style="position: relative; height: 78px;"
+              style="position: relative;"
             >
               <div
                 class="mm-box mm-container mm-container--max-width-undefined mm-box--display-flex mm-box--flex-direction-column mm-box--width-full mm-box--background-color-primary-default"
-                style="position: absolute; left: 4px; top: 4px; height: 70px; width: 4px; border-radius: 8px;"
+                style="position: absolute; left: 4px; top: 4px; height: calc(100% - 8px); width: 4px; border-radius: 8px;"
               />
               <div
                 class="mm-box mm-container mm-container--max-width-undefined mm-box--display-flex mm-box--flex-direction-column mm-box--width-full"
@@ -111,12 +111,12 @@ exports[`BridgeQuotesModal should render the modal 1`] = `
                 <p
                   class="mm-box mm-text mm-text--body-xs-medium mm-box--color-text-alternative"
                 >
-                  $3 network fee
+                  $14 total cost
                 </p>
                 <p
                   class="mm-box mm-text mm-text--body-xs-medium mm-box--color-text-alternative"
                 >
-                  14 USDC receive amount
+                  13.98 USDC receive amount
                 </p>
               </div>
               <div
@@ -136,7 +136,7 @@ exports[`BridgeQuotesModal should render the modal 1`] = `
             </div>
             <div
               class="mm-box mm-container mm-container--max-width-undefined mm-box--padding-top-3 mm-box--padding-bottom-3 mm-box--padding-inline-4 mm-box--display-flex mm-box--flex-direction-row mm-box--flex-wrap-nowrap mm-box--justify-content-space-between mm-box--align-items-flex-start"
-              style="position: relative; height: 78px;"
+              style="position: relative;"
             >
               <div
                 class="mm-box mm-container mm-container--max-width-undefined mm-box--display-flex mm-box--flex-direction-column mm-box--width-full"
@@ -147,12 +147,12 @@ exports[`BridgeQuotesModal should render the modal 1`] = `
                 <p
                   class="mm-box mm-text mm-text--body-xs-medium mm-box--color-text-alternative"
                 >
-                  $3 network fee
+                  $14 total cost
                 </p>
                 <p
                   class="mm-box mm-text mm-text--body-xs-medium mm-box--color-text-alternative"
                 >
-                  14 USDC receive amount
+                  13.8 USDC receive amount
                 </p>
               </div>
               <div
diff --git a/ui/pages/bridge/quotes/bridge-quote-card.tsx b/ui/pages/bridge/quotes/bridge-quote-card.tsx
index 72c09403f033..b08b86b24597 100644
--- a/ui/pages/bridge/quotes/bridge-quote-card.tsx
+++ b/ui/pages/bridge/quotes/bridge-quote-card.tsx
@@ -1,137 +1,287 @@
 import React, { useState } from 'react';
 import { useSelector } from 'react-redux';
 import {
-  Box,
-  Button,
-  ButtonVariant,
   Text,
+  PopoverPosition,
+  IconName,
+  ButtonLink,
+  Icon,
+  IconSize,
+  AvatarNetwork,
+  AvatarNetworkSize,
 } from '../../../components/component-library';
-import { getBridgeQuotes } from '../../../ducks/bridge/selectors';
+import {
+  getBridgeQuotes,
+  getFromChain,
+  getToChain,
+} from '../../../ducks/bridge/selectors';
 import { useI18nContext } from '../../../hooks/useI18nContext';
 import {
   formatCurrencyAmount,
   formatTokenAmount,
   formatEtaInMinutes,
 } from '../utils/quote';
-import { useCountdownTimer } from '../../../hooks/bridge/useCountdownTimer';
-import MascotBackgroundAnimation from '../../swaps/mascot-background-animation/mascot-background-animation';
-import { getCurrentCurrency } from '../../../selectors';
+import { getCurrentCurrency, getLocale } from '../../../selectors';
 import { getNativeCurrency } from '../../../ducks/metamask/metamask';
 import { useCrossChainSwapsEventTracker } from '../../../hooks/bridge/useCrossChainSwapsEventTracker';
 import { useRequestProperties } from '../../../hooks/bridge/events/useRequestProperties';
 import { useRequestMetadataProperties } from '../../../hooks/bridge/events/useRequestMetadataProperties';
 import { useQuoteProperties } from '../../../hooks/bridge/events/useQuoteProperties';
 import { MetaMetricsEventName } from '../../../../shared/constants/metametrics';
+import {
+  AlignItems,
+  BackgroundColor,
+  BlockSize,
+  IconColor,
+  JustifyContent,
+  TextColor,
+  TextVariant,
+} from '../../../helpers/constants/design-system';
+import { Row, Column, Tooltip } from '../layout';
+import {
+  BRIDGE_MM_FEE_RATE,
+  NETWORK_TO_SHORT_NETWORK_NAME_MAP,
+} from '../../../../shared/constants/bridge';
+import { CHAIN_ID_TO_NETWORK_IMAGE_URL_MAP } from '../../../../shared/constants/network';
+import { decimalToPrefixedHex } from '../../../../shared/modules/conversion.utils';
+import { TERMS_OF_USE_LINK } from '../../../../shared/constants/terms';
 import { BridgeQuotesModal } from './bridge-quotes-modal';
-import { QuoteInfoRow } from './quote-info-row';
 
 export const BridgeQuoteCard = () => {
   const t = useI18nContext();
-  const { isLoading, isQuoteGoingToRefresh, activeQuote } =
-    useSelector(getBridgeQuotes);
+  const { activeQuote } = useSelector(getBridgeQuotes);
   const currency = useSelector(getCurrentCurrency);
   const ticker = useSelector(getNativeCurrency);
 
-  const secondsUntilNextRefresh = useCountdownTimer();
-
   const trackCrossChainSwapsEvent = useCrossChainSwapsEventTracker();
   const { quoteRequestProperties } = useRequestProperties();
   const requestMetadataProperties = useRequestMetadataProperties();
   const quoteListProperties = useQuoteProperties();
 
-  const [showAllQuotes, setShowAllQuotes] = useState(false);
+  const fromChain = useSelector(getFromChain);
+  const toChain = useSelector(getToChain);
+  const locale = useSelector(getLocale);
 
-  if (isLoading && !activeQuote) {
-    return (
-      <Box>
-        <MascotBackgroundAnimation />
-      </Box>
-    );
-  }
+  const [showAllQuotes, setShowAllQuotes] = useState(false);
+  const [shouldShowNetworkFeesInGasToken, setShouldShowNetworkFeesInGasToken] =
+    useState(false);
 
-  return activeQuote ? (
-    <Box className="quote-card">
+  return (
+    <>
       <BridgeQuotesModal
         isOpen={showAllQuotes}
         onClose={() => setShowAllQuotes(false)}
       />
-      <Box className="bridge-box quote-card__timer">
-        {!isLoading && isQuoteGoingToRefresh && (
-          <Text>{t('swapNewQuoteIn', [secondsUntilNextRefresh])}</Text>
-        )}
-      </Box>
+      {activeQuote ? (
+        <Column gap={3}>
+          <Row justifyContent={JustifyContent.spaceBetween}>
+            <Row
+              gap={1}
+              justifyContent={JustifyContent.flexStart}
+              style={{ whiteSpace: 'nowrap' }}
+            >
+              <Text variant={TextVariant.bodyLgMedium}>{t('bestPrice')}</Text>
+              <Tooltip
+                title={t('howQuotesWork')}
+                position={PopoverPosition.TopStart}
+                offset={[-16, 16]}
+                iconName={IconName.Question}
+              >
+                {t('howQuotesWorkExplanation', [BRIDGE_MM_FEE_RATE])}
+              </Tooltip>
+            </Row>
+            <Column height={BlockSize.Full} alignItems={AlignItems.flexEnd}>
+              <Text
+                as={'a'}
+                variant={TextVariant.bodyMd}
+                color={TextColor.primaryDefault}
+                onClick={() => {
+                  quoteRequestProperties &&
+                    requestMetadataProperties &&
+                    quoteListProperties &&
+                    trackCrossChainSwapsEvent({
+                      event: MetaMetricsEventName.AllQuotesOpened,
+                      properties: {
+                        ...quoteRequestProperties,
+                        ...requestMetadataProperties,
+                        ...quoteListProperties,
+                      },
+                    });
+                  setShowAllQuotes(true);
+                }}
+              >
+                {t('moreQuotes')}
+              </Text>
+            </Column>
+          </Row>
+          <Column gap={1}>
+            <Row>
+              <Text
+                variant={TextVariant.bodyMdMedium}
+                color={TextColor.textAlternativeSoft}
+              >
+                {t('bridging')}
+              </Text>
+              <Row gap={1}>
+                <AvatarNetwork
+                  name={fromChain?.name ?? ''}
+                  src={
+                    CHAIN_ID_TO_NETWORK_IMAGE_URL_MAP[
+                      decimalToPrefixedHex(
+                        activeQuote.quote.srcChainId,
+                      ) as keyof typeof CHAIN_ID_TO_NETWORK_IMAGE_URL_MAP
+                    ]
+                  }
+                  size={AvatarNetworkSize.Xs}
+                  backgroundColor={BackgroundColor.transparent}
+                />
+                <Text style={{ whiteSpace: 'nowrap' }}>
+                  {
+                    NETWORK_TO_SHORT_NETWORK_NAME_MAP[
+                      decimalToPrefixedHex(
+                        activeQuote.quote.srcChainId,
+                      ) as keyof typeof NETWORK_TO_SHORT_NETWORK_NAME_MAP
+                    ]
+                  }
+                </Text>
+                <Icon name={IconName.Arrow2Right} size={IconSize.Xs} />
+                <AvatarNetwork
+                  name={toChain?.name ?? ''}
+                  src={
+                    CHAIN_ID_TO_NETWORK_IMAGE_URL_MAP[
+                      decimalToPrefixedHex(
+                        activeQuote.quote.destChainId,
+                      ) as keyof typeof CHAIN_ID_TO_NETWORK_IMAGE_URL_MAP
+                    ]
+                  }
+                  size={AvatarNetworkSize.Xs}
+                  backgroundColor={BackgroundColor.transparent}
+                />
+                <Text style={{ whiteSpace: 'nowrap' }}>
+                  {
+                    NETWORK_TO_SHORT_NETWORK_NAME_MAP[
+                      decimalToPrefixedHex(
+                        activeQuote.quote.destChainId,
+                      ) as keyof typeof NETWORK_TO_SHORT_NETWORK_NAME_MAP
+                    ]
+                  }
+                </Text>
+              </Row>
+            </Row>
 
-      <Box className="bridge-box prepare-bridge-page__content quote-card__content">
-        <QuoteInfoRow
-          label={t('estimatedTime')}
-          tooltipText={t('bridgeTimingTooltipText')}
-          description={t('bridgeTimingMinutes', [
-            formatEtaInMinutes(activeQuote.estimatedProcessingTimeInSeconds),
-          ])}
-        />
-        {activeQuote.swapRate && (
-          <QuoteInfoRow
-            label={t('quoteRate')}
-            description={`1 ${
-              activeQuote.quote.srcAsset.symbol
-            } = ${formatTokenAmount(
-              activeQuote.swapRate,
-              activeQuote.quote.destAsset.symbol,
-            )}`}
-          />
-        )}
-        {activeQuote.totalNetworkFee && (
-          <QuoteInfoRow
-            label={t('totalFees')}
-            tooltipText={t('bridgeTotalFeesTooltipText')}
-            description={
-              formatCurrencyAmount(
-                activeQuote.totalNetworkFee?.valueInCurrency,
-                currency,
-                2,
-              ) ??
-              formatTokenAmount(activeQuote.totalNetworkFee?.amount, ticker, 6)
-            }
-            secondaryDescription={
-              activeQuote.totalNetworkFee?.valueInCurrency
-                ? formatTokenAmount(
-                    activeQuote.totalNetworkFee?.amount,
-                    ticker,
-                    6,
-                  )
-                : undefined
-            }
-          />
-        )}
-      </Box>
+            <Row>
+              <Text
+                variant={TextVariant.bodyMdMedium}
+                color={TextColor.textAlternativeSoft}
+              >
+                {t('networkFees')}
+              </Text>
+              <Row gap={1}>
+                {shouldShowNetworkFeesInGasToken ? (
+                  <>
+                    {/* Network fee in gas token amounts  */}
+                    <Text>
+                      {activeQuote.totalNetworkFee?.valueInCurrency
+                        ? formatTokenAmount(
+                            locale,
+                            activeQuote.totalNetworkFee?.amount,
+                            ticker,
+                          )
+                        : undefined}
+                    </Text>
+                    <Text>-</Text>
+                    <Text>
+                      {activeQuote.totalMaxNetworkFee?.valueInCurrency
+                        ? formatTokenAmount(
+                            locale,
+                            activeQuote.totalMaxNetworkFee?.amount,
+                            ticker,
+                          )
+                        : undefined}
+                    </Text>
+                  </>
+                ) : (
+                  <>
+                    {/* Network fee in display currency */}
+                    <Text>
+                      {formatCurrencyAmount(
+                        activeQuote.totalNetworkFee?.valueInCurrency,
+                        currency,
+                        2,
+                      ) ??
+                        formatTokenAmount(
+                          locale,
+                          activeQuote.totalNetworkFee?.amount,
+                          ticker,
+                        )}
+                    </Text>
+                    <Text>-</Text>
+                    <Text>
+                      {formatCurrencyAmount(
+                        activeQuote.totalMaxNetworkFee?.valueInCurrency,
+                        currency,
+                        2,
+                      ) ??
+                        formatTokenAmount(
+                          locale,
+                          activeQuote.totalMaxNetworkFee?.amount,
+                          ticker,
+                        )}
+                    </Text>
+                  </>
+                )}
+                <Icon
+                  style={{ cursor: 'pointer' }}
+                  color={IconColor.iconAlternativeSoft}
+                  name={IconName.SwapVertical}
+                  size={IconSize.Md}
+                  onClick={() =>
+                    setShouldShowNetworkFeesInGasToken(
+                      !shouldShowNetworkFeesInGasToken,
+                    )
+                  }
+                />
+              </Row>
+            </Row>
 
-      <Box className="bridge-box quote-card__footer">
-        <span>
-          <Text>{t('swapIncludesMMFee', [0.875])}</Text>
-          <Button
-            variant={ButtonVariant.Link}
-            onClick={() => {
-              quoteRequestProperties &&
-                requestMetadataProperties &&
-                quoteListProperties &&
-                trackCrossChainSwapsEvent({
-                  event: MetaMetricsEventName.AllQuotesOpened,
-                  properties: {
-                    ...quoteRequestProperties,
-                    ...requestMetadataProperties,
-                    ...quoteListProperties,
-                  },
-                });
-              setShowAllQuotes(true);
-            }}
-          >
-            <Text>{t('viewAllQuotes')}</Text>
-          </Button>
-        </span>
-        <Button variant={ButtonVariant.Link}>
-          <Text>{t('termsOfService')}</Text>
-        </Button>
-      </Box>
-    </Box>
-  ) : null;
+            <Row>
+              <Text
+                variant={TextVariant.bodyMdMedium}
+                color={TextColor.textAlternativeSoft}
+              >
+                {t('time')}
+              </Text>
+              <Text>
+                {t('bridgeTimingMinutes', [
+                  formatEtaInMinutes(
+                    activeQuote.estimatedProcessingTimeInSeconds,
+                  ),
+                ])}
+              </Text>
+            </Row>
+            <Row justifyContent={JustifyContent.flexStart} gap={2}>
+              <Text
+                variant={TextVariant.bodyMd}
+                color={TextColor.textAlternativeSoft}
+              >
+                {t('rateIncludesMMFee', [BRIDGE_MM_FEE_RATE])}
+              </Text>
+              <Text color={TextColor.textAlternativeSoft}>
+                {t('bulletpoint')}
+              </Text>
+              <ButtonLink
+                variant={TextVariant.bodyMd}
+                color={TextColor.textAlternativeSoft}
+                href={TERMS_OF_USE_LINK}
+                externalLink
+                style={{ textDecoration: 'underline' }}
+              >
+                {t('bridgeTerms')}
+              </ButtonLink>
+            </Row>
+          </Column>
+        </Column>
+      ) : null}
+    </>
+  );
 };
diff --git a/ui/pages/bridge/quotes/bridge-quotes-modal.test.tsx b/ui/pages/bridge/quotes/bridge-quotes-modal.test.tsx
index 42c5968bb5b0..ac5e384413d8 100644
--- a/ui/pages/bridge/quotes/bridge-quotes-modal.test.tsx
+++ b/ui/pages/bridge/quotes/bridge-quotes-modal.test.tsx
@@ -6,6 +6,8 @@ import mockBridgeQuotesErc20Erc20 from '../../../../test/data/bridge/mock-quotes
 import { createBridgeMockStore } from '../../../../test/jest/mock-store';
 import { renderWithProvider } from '../../../../test/lib/render-helpers';
 import configureStore from '../../../store/store';
+import { CHAIN_IDS } from '../../../../shared/constants/network';
+import { mockNetworkState } from '../../../../test/stub/networks';
 import { BridgeQuotesModal } from './bridge-quotes-modal';
 
 describe('BridgeQuotesModal', () => {
@@ -16,6 +18,27 @@ describe('BridgeQuotesModal', () => {
         getQuotesLastFetched: Date.now(),
         quotesLoadingStatus: RequestStatus.FETCHED,
       },
+      bridgeSliceOverrides: {
+        fromTokenExchangeRate: 1,
+        toTokenExchangeRate: 0.99,
+      },
+      metamaskStateOverrides: {
+        currencyRates: {
+          ETH: {
+            conversionRate: 1,
+          },
+          POL: {
+            conversionRate: 1,
+            usdConversionRate: 1,
+          },
+        },
+        ...mockNetworkState(
+          { chainId: CHAIN_IDS.MAINNET },
+          { chainId: CHAIN_IDS.LINEA_MAINNET },
+          { chainId: CHAIN_IDS.POLYGON },
+          { chainId: CHAIN_IDS.OPTIMISM },
+        ),
+      },
     });
 
     const { baseElement } = renderWithProvider(
diff --git a/ui/pages/bridge/quotes/bridge-quotes-modal.tsx b/ui/pages/bridge/quotes/bridge-quotes-modal.tsx
index d50a2ad3bbd9..c9faa50bceb4 100644
--- a/ui/pages/bridge/quotes/bridge-quotes-modal.tsx
+++ b/ui/pages/bridge/quotes/bridge-quotes-modal.tsx
@@ -24,7 +24,7 @@ import {
   formatTokenAmount,
 } from '../utils/quote';
 import { useI18nContext } from '../../../hooks/useI18nContext';
-import { getCurrentCurrency } from '../../../selectors';
+import { getCurrentCurrency, getLocale } from '../../../selectors';
 import { setSelectedQuote, setSortOrder } from '../../../ducks/bridge/actions';
 import { QuoteMetadata, QuoteResponse, SortOrder } from '../types';
 import {
@@ -52,6 +52,7 @@ export const BridgeQuotesModal = ({
   const sortOrder = useSelector(getBridgeSortOrder);
   const currency = useSelector(getCurrentCurrency);
   const nativeCurrency = useSelector(getNativeCurrency);
+  const locale = useSelector(getLocale);
 
   const trackCrossChainSwapsEvent = useCrossChainSwapsEventTracker();
   const { quoteRequestProperties } = useRequestProperties();
@@ -117,15 +118,19 @@ export const BridgeQuotesModal = ({
               color={
                 sortOrder === sortOrderOption
                   ? TextColor.primaryDefault
-                  : TextColor.textAlternative
+                  : TextColor.textAlternativeSoft
               }
             >
               <Text
-                variant={TextVariant.bodySm}
+                variant={
+                  sortOrder === sortOrderOption
+                    ? TextVariant.bodySmMedium
+                    : TextVariant.bodySm
+                }
                 color={
                   sortOrder === sortOrderOption
                     ? TextColor.primaryDefault
-                    : TextColor.textAlternative
+                    : TextColor.textAlternativeSoft
                 }
               >
                 {label}
@@ -142,6 +147,7 @@ export const BridgeQuotesModal = ({
                 estimatedProcessingTimeInSeconds,
                 toTokenAmount,
                 cost,
+                sentAmount,
                 quote: { destAsset, bridges, requestId },
               } = quote;
               const isQuoteActive = requestId === activeQuote?.quote.requestId;
@@ -177,7 +183,7 @@ export const BridgeQuotesModal = ({
                   paddingInline={4}
                   paddingTop={3}
                   paddingBottom={3}
-                  style={{ position: 'relative', height: 78 }}
+                  style={{ position: 'relative' }}
                 >
                   {isQuoteActive && (
                     <Column
@@ -185,7 +191,7 @@ export const BridgeQuotesModal = ({
                         position: 'absolute',
                         left: 4,
                         top: 4,
-                        height: 70,
+                        height: 'calc(100% - 8px)',
                         width: 4,
                         borderRadius: 8,
                       }}
@@ -198,48 +204,45 @@ export const BridgeQuotesModal = ({
                         formatCurrencyAmount(cost.valueInCurrency, currency, 0)}
                     </Text>
                     {[
-                      totalNetworkFee?.valueInCurrency
-                        ? t('quotedNetworkFee', [
+                      totalNetworkFee?.valueInCurrency &&
+                      sentAmount?.valueInCurrency
+                        ? t('quotedTotalCost', [
                             formatCurrencyAmount(
-                              totalNetworkFee.valueInCurrency,
+                              totalNetworkFee.valueInCurrency.plus(
+                                sentAmount.valueInCurrency,
+                              ),
                               currency,
                               0,
                             ),
                           ])
-                        : t('quotedNetworkFee', [
+                        : t('quotedTotalCost', [
                             formatTokenAmount(
+                              locale,
                               totalNetworkFee.amount,
                               nativeCurrency,
                             ),
                           ]),
-                      t(
-                        sortOrder === SortOrder.ETA_ASC
-                          ? 'quotedReceivingAmount'
-                          : 'quotedReceiveAmount',
-                        [
-                          formatCurrencyAmount(
-                            toTokenAmount.valueInCurrency,
-                            currency,
-                            0,
-                          ) ??
-                            formatTokenAmount(
-                              toTokenAmount.amount,
-                              destAsset.symbol,
-                              0,
-                            ),
-                        ],
-                      ),
-                    ]
-                      [sortOrder === SortOrder.ETA_ASC ? 'reverse' : 'slice']()
-                      .map((content) => (
-                        <Text
-                          key={content}
-                          variant={TextVariant.bodyXsMedium}
-                          color={TextColor.textAlternative}
-                        >
-                          {content}
-                        </Text>
-                      ))}
+                      t('quotedReceiveAmount', [
+                        formatCurrencyAmount(
+                          toTokenAmount.valueInCurrency,
+                          currency,
+                          0,
+                        ) ??
+                          formatTokenAmount(
+                            locale,
+                            toTokenAmount.amount,
+                            destAsset.symbol,
+                          ),
+                      ]),
+                    ].map((content) => (
+                      <Text
+                        key={content}
+                        variant={TextVariant.bodyXsMedium}
+                        color={TextColor.textAlternative}
+                      >
+                        {content}
+                      </Text>
+                    ))}
                   </Column>
                   <Column alignItems={AlignItems.flexEnd}>
                     <Text variant={TextVariant.bodyMd}>
diff --git a/ui/pages/bridge/quotes/index.scss b/ui/pages/bridge/quotes/index.scss
index 0d9eafa9ad69..ffd58f48d8fe 100644
--- a/ui/pages/bridge/quotes/index.scss
+++ b/ui/pages/bridge/quotes/index.scss
@@ -1,68 +1,5 @@
 @use "design-system";
 
-.quote-card {
-  flex-direction: column;
-  display: flex;
-  text-align: center;
-
-  p {
-    font-size: 12px;
-  }
-
-
-  &__content {
-    padding: 16px;
-    gap: 4px;
-  }
-
-  &__timer {
-    height: 32px;
-
-    p {
-      color: var(--color-text-alternative);
-    }
-  }
-
-  .bridge-box > &__footer {
-    gap: 0;
-
-    p {
-      color: var(--color-text-alternative);
-    }
-  }
-
-  &__info-row {
-    display: flex;
-    flex-direction: row;
-    justify-content: space-between;
-
-    &__label {
-      display: inline-flex;
-      gap: 4px;
-
-      p {
-        font-weight: var(--font-weight-medium);
-        font-size: 14px;
-        white-space: nowrap;
-      }
-
-      &__tooltip {
-        align-items: center;
-        height: 100%;
-      }
-    }
-
-    &__description {
-      display: inline-flex;
-      gap: 4px;
-
-      &__secondary {
-        color: var(--color-text-alternative);
-      }
-    }
-  }
-}
-
 .quotes-modal {
   .mm-modal-content__dialog {
     display: flex;
diff --git a/ui/pages/bridge/quotes/quote-info-row.tsx b/ui/pages/bridge/quotes/quote-info-row.tsx
deleted file mode 100644
index d1cccc62ed8e..000000000000
--- a/ui/pages/bridge/quotes/quote-info-row.tsx
+++ /dev/null
@@ -1,51 +0,0 @@
-import React from 'react';
-import {
-  Box,
-  Icon,
-  IconName,
-  IconSize,
-  Text,
-} from '../../../components/component-library';
-import Tooltip from '../../../components/ui/tooltip';
-import { IconColor } from '../../../helpers/constants/design-system';
-
-export const QuoteInfoRow = ({
-  label,
-  tooltipText,
-  description,
-  secondaryDescription,
-}: {
-  label: string;
-  tooltipText?: string;
-  description: string;
-  secondaryDescription?: string;
-}) => {
-  return (
-    <Box className="quote-card__info-row">
-      <Box className="quote-card__info-row__label">
-        <Text>{label}</Text>
-        {tooltipText && (
-          <Tooltip
-            position="top"
-            title={tooltipText}
-            containerClassName="quote-card__info-row__label__tooltip"
-            style={{ display: 'flex' }}
-          >
-            <Icon
-              color={IconColor.iconMuted}
-              name={IconName.Question}
-              size={IconSize.Sm}
-            />
-          </Tooltip>
-        )}
-      </Box>
-
-      <Box className="quote-card__info-row__description">
-        <Box className="quote-card__info-row__description__secondary">
-          <Text>{secondaryDescription}</Text>
-        </Box>
-        <Text>{description}</Text>
-      </Box>
-    </Box>
-  );
-};
diff --git a/ui/pages/bridge/types.ts b/ui/pages/bridge/types.ts
index 1216e447a6a3..d0eb45fa71a5 100644
--- a/ui/pages/bridge/types.ts
+++ b/ui/pages/bridge/types.ts
@@ -1,5 +1,7 @@
 import { BigNumber } from 'bignumber.js';
+import { Hex } from '@metamask/utils';
 import { ChainConfiguration } from '../../../shared/types/bridge';
+import type { AssetType } from '../../../shared/constants/transaction';
 
 export type L1GasFees = {
   l1GasFeesInHexWei?: string; // l1 fees for approval and trade in hex wei, appended by controller
@@ -24,6 +26,18 @@ export enum SortOrder {
   ETA_ASC = 'time_descending',
 }
 
+export type BridgeToken = {
+  type: AssetType.native | AssetType.token;
+  address: string;
+  symbol: string;
+  image: string;
+  decimals: number;
+  chainId: Hex;
+  balance: string; // raw balance
+  string: string | undefined; // normalized balance as a stringified number
+  tokenFiatAmount?: number | null;
+} | null;
+
 // Types copied from Metabridge API
 export enum BridgeFlag {
   EXTENSION_CONFIG = 'extension-config',
diff --git a/ui/pages/bridge/utils/quote.ts b/ui/pages/bridge/utils/quote.ts
index 60faacacba20..b41898167a52 100644
--- a/ui/pages/bridge/utils/quote.ts
+++ b/ui/pages/bridge/utils/quote.ts
@@ -10,8 +10,10 @@ import { formatCurrency } from '../../../helpers/utils/confirm-tx.util';
 import { Numeric } from '../../../../shared/modules/Numeric';
 import { EtherDenomination } from '../../../../shared/constants/common';
 import { DEFAULT_PRECISION } from '../../../hooks/useCurrencyDisplay';
+import { formatAmount } from '../../confirmations/components/simulation-details/formatAmount';
 
-export const isNativeAddress = (address?: string) => address === zeroAddress();
+export const isNativeAddress = (address?: string | null) =>
+  address === zeroAddress() || address === '' || !address;
 
 export const isValidQuoteRequest = (
   partialRequest: Partial<QuoteRequest>,
@@ -205,14 +207,24 @@ export const calcCost = (
       : null,
 });
 
-export const formatEtaInMinutes = (estimatedProcessingTimeInSeconds: number) =>
-  (estimatedProcessingTimeInSeconds / 60).toFixed();
+export const formatEtaInMinutes = (
+  estimatedProcessingTimeInSeconds: number,
+) => {
+  if (estimatedProcessingTimeInSeconds < 60) {
+    return `< 1`;
+  }
+  return (estimatedProcessingTimeInSeconds / 60).toFixed();
+};
 
 export const formatTokenAmount = (
+  locale: string,
   amount: BigNumber,
-  symbol: string,
-  precision: number = 2,
-) => `${amount.toFixed(precision)} ${symbol}`;
+  symbol: string = '',
+) => {
+  const stringifiedAmount = formatAmount(locale, amount);
+
+  return [stringifiedAmount, symbol].join(' ').trim();
+};
 
 export const formatCurrencyAmount = (
   amount: BigNumber | null,
@@ -224,7 +236,7 @@ export const formatCurrencyAmount = (
   }
   if (precision === 0) {
     if (amount.lt(0.01)) {
-      return `<${formatCurrency('0', currency, precision)}`;
+      return '<$0.01';
     }
     if (amount.lt(1)) {
       return formatCurrency(amount.toString(), currency, 2);
diff --git a/ui/pages/bridge/utils/validators.ts b/ui/pages/bridge/utils/validators.ts
index a07eae493c79..08fc3519ef52 100644
--- a/ui/pages/bridge/utils/validators.ts
+++ b/ui/pages/bridge/utils/validators.ts
@@ -16,8 +16,9 @@ export const validateResponse = <ExpectedResponse>(
   validators: Validator<ExpectedResponse>[],
   data: unknown,
   urlUsed: string,
+  logError = true,
 ): data is ExpectedResponse => {
-  return validateData(validators, data, urlUsed);
+  return validateData(validators, data, urlUsed, logError);
 };
 
 export const isValidNumber = (v: unknown): v is number => typeof v === 'number';
@@ -53,6 +54,15 @@ export const FEATURE_FLAG_VALIDATORS = [
   },
 ];
 
+export const TOKEN_AGGREGATOR_VALIDATORS = [
+  {
+    property: 'aggregators',
+    type: 'object',
+    validator: (v: unknown): v is number[] =>
+      isValidObject(v) && Object.values(v).every(isValidString),
+  },
+];
+
 export const TOKEN_VALIDATORS = [
   { property: 'decimals', type: 'number' },
   { property: 'address', type: 'string', validator: isValidHexAddress },
diff --git a/ui/pages/swaps/mascot-background-animation/mascot-background-animation.js b/ui/pages/swaps/mascot-background-animation/mascot-background-animation.js
index a8fddf9943d7..b5e8a04dbc5a 100644
--- a/ui/pages/swaps/mascot-background-animation/mascot-background-animation.js
+++ b/ui/pages/swaps/mascot-background-animation/mascot-background-animation.js
@@ -1,10 +1,11 @@
 /* eslint-disable @metamask/design-tokens/color-no-hex*/
 import EventEmitter from 'events';
 import React, { useRef } from 'react';
+import PropTypes from 'prop-types';
 
 import Mascot from '../../../components/ui/mascot';
 
-export default function MascotBackgroundAnimation() {
+export default function MascotBackgroundAnimation({ height, width }) {
   const animationEventEmitter = useRef(new EventEmitter());
 
   return (
@@ -220,11 +221,16 @@ export default function MascotBackgroundAnimation() {
       >
         <Mascot
           animationEventEmitter={animationEventEmitter.current}
-          width="42"
-          height="42"
+          width={width ?? '42'}
+          height={height ?? '42'}
           followMouse={false}
         />
       </div>
     </div>
   );
 }
+
+MascotBackgroundAnimation.propTypes = {
+  height: PropTypes.string,
+  width: PropTypes.string,
+};

From 37e79458f3fb8299be2c5d583796fd79f28cb60b Mon Sep 17 00:00:00 2001
From: chloeYue <105063779+chloeYue@users.noreply.github.com>
Date: Tue, 17 Dec 2024 09:14:17 +0100
Subject: [PATCH 144/175] test:  [POM] Create permission pages base classes and
 methods for e2e tests (#29097)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## **Description**

- Create permission pages base classes  and methods
- Migrate permission e2e tests to TS and Page Object Model

```
test/e2e/tests/multichain/all-permissions-page.spec.js
test/e2e/tests/multichain/permission-page.spec.js
```

[![Open in GitHub
Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/27155?quickstart=1)

## **Related issues**

Fixes: https://github.com/MetaMask/metamask-extension/issues/29099

## **Manual testing steps**
Check code readability, make sure tests pass.

## **Screenshots/Recordings**

<!-- If applicable, add screenshots and/or recordings to visualize the
before and after of your change. -->

### **Before**

<!-- [screenshots/recordings] -->

### **After**

<!-- [screenshots/recordings] -->

## **Pre-merge author checklist**

- [x] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension Coding
Standards](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/CODING_GUIDELINES.md).
- [x] I've completed the PR template to the best of my ability
- [x] I’ve included tests if applicable
- [x] I’ve documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [x] I’ve applied the right labels on the PR (see [labeling
guidelines](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.

## **Pre-merge reviewer checklist**

- [x] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed).
- [x] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.

---------

Co-authored-by: seaona <54408225+seaona@users.noreply.github.com>
---
 test/e2e/page-objects/pages/header-navbar.ts  |  9 ++
 .../pages/permission/permission-list-page.ts  | 50 +++++++++++
 .../pages/permission/site-permission-page.ts  | 36 ++++++++
 .../pages/settings/experimental-settings.ts   |  8 ++
 test/e2e/tests/account/import-flow.spec.ts    |  4 +-
 .../multichain/all-permissions-page.spec.js   | 90 -------------------
 .../multichain/all-permissions-page.spec.ts   | 75 ++++++++++++++++
 .../tests/multichain/permission-page.spec.js  | 80 -----------------
 .../tests/multichain/permission-page.spec.ts  | 33 +++++++
 9 files changed, 213 insertions(+), 172 deletions(-)
 create mode 100644 test/e2e/page-objects/pages/permission/permission-list-page.ts
 create mode 100644 test/e2e/page-objects/pages/permission/site-permission-page.ts
 delete mode 100644 test/e2e/tests/multichain/all-permissions-page.spec.js
 create mode 100644 test/e2e/tests/multichain/all-permissions-page.spec.ts
 delete mode 100644 test/e2e/tests/multichain/permission-page.spec.js
 create mode 100644 test/e2e/tests/multichain/permission-page.spec.ts

diff --git a/test/e2e/page-objects/pages/header-navbar.ts b/test/e2e/page-objects/pages/header-navbar.ts
index 100c23b851e4..5c0808eea93a 100644
--- a/test/e2e/page-objects/pages/header-navbar.ts
+++ b/test/e2e/page-objects/pages/header-navbar.ts
@@ -5,6 +5,9 @@ class HeaderNavbar {
 
   private readonly accountMenuButton = '[data-testid="account-menu-icon"]';
 
+  private readonly allPermissionsButton =
+    '[data-testid="global-menu-connected-sites"]';
+
   private readonly threeDotMenuButton =
     '[data-testid="account-options-menu-button"]';
 
@@ -54,6 +57,12 @@ class HeaderNavbar {
     }
   }
 
+  async openPermissionsPage(): Promise<void> {
+    console.log('Open permissions page in header navbar');
+    await this.openThreeDotMenu();
+    await this.driver.clickElement(this.allPermissionsButton);
+  }
+
   async openSnapListPage(): Promise<void> {
     console.log('Open account snap page');
     await this.openThreeDotMenu();
diff --git a/test/e2e/page-objects/pages/permission/permission-list-page.ts b/test/e2e/page-objects/pages/permission/permission-list-page.ts
new file mode 100644
index 000000000000..10f214fd8da6
--- /dev/null
+++ b/test/e2e/page-objects/pages/permission/permission-list-page.ts
@@ -0,0 +1,50 @@
+import { Driver } from '../../../webdriver/driver';
+
+/**
+ * Represents the permissions list page.
+ * This page allows users to view permissions for connected sites.
+ */
+class PermissionListPage {
+  private driver: Driver;
+
+  private readonly permissionsPage = '[data-testid="permissions-page"]';
+
+  constructor(driver: Driver) {
+    this.driver = driver;
+  }
+
+  async check_pageIsLoaded(): Promise<void> {
+    try {
+      await this.driver.waitForSelector(this.permissionsPage);
+    } catch (e) {
+      console.log(
+        'Timeout while waiting for permission list page to be loaded',
+        e,
+      );
+      throw e;
+    }
+    console.log('Permission list page is loaded');
+  }
+
+  /**
+   * Open permission page for site
+   *
+   * @param site - Site to open
+   */
+  async openPermissionPageForSite(site: string): Promise<void> {
+    console.log('Open permission page for site', site);
+    await this.driver.clickElement({ text: site, tag: 'p' });
+  }
+
+  /**
+   * Check if account is connected to site
+   *
+   * @param site - Site to check
+   */
+  async check_connectedToSite(site: string): Promise<void> {
+    console.log('Check if account is connected to site', site);
+    await this.driver.waitForSelector({ text: site, tag: 'p' });
+  }
+}
+
+export default PermissionListPage;
diff --git a/test/e2e/page-objects/pages/permission/site-permission-page.ts b/test/e2e/page-objects/pages/permission/site-permission-page.ts
new file mode 100644
index 000000000000..bc5eee61c781
--- /dev/null
+++ b/test/e2e/page-objects/pages/permission/site-permission-page.ts
@@ -0,0 +1,36 @@
+import { Driver } from '../../../webdriver/driver';
+
+/**
+ * Represents the site permission page.
+ * This page allows users to view and manage permissions for a connected site.
+ */
+class SitePermissionPage {
+  private driver: Driver;
+
+  private readonly permissionPage = '[data-testid ="connections-page"]';
+
+  constructor(driver: Driver) {
+    this.driver = driver;
+  }
+
+  /**
+   * Check if site permission page is loaded
+   *
+   * @param site - Site to check
+   */
+  async check_pageIsLoaded(site: string): Promise<void> {
+    try {
+      await this.driver.waitForSelector(this.permissionPage);
+      await this.driver.waitForSelector({ text: site, tag: 'span' });
+    } catch (e) {
+      console.log(
+        'Timeout while waiting for site permission page to be loaded',
+        e,
+      );
+      throw e;
+    }
+    console.log('Site permission page is loaded');
+  }
+}
+
+export default SitePermissionPage;
diff --git a/test/e2e/page-objects/pages/settings/experimental-settings.ts b/test/e2e/page-objects/pages/settings/experimental-settings.ts
index 3af5c8a538e4..c3f81d99bf23 100644
--- a/test/e2e/page-objects/pages/settings/experimental-settings.ts
+++ b/test/e2e/page-objects/pages/settings/experimental-settings.ts
@@ -15,6 +15,9 @@ class ExperimentalSettings {
   private readonly redesignedSignatureToggle =
     '[data-testid="toggle-redesigned-confirmations-container"]';
 
+  private readonly requestQueueToggle =
+    '[data-testid="experimental-setting-toggle-request-queue"] label';
+
   constructor(driver: Driver) {
     this.driver = driver;
   }
@@ -41,6 +44,11 @@ class ExperimentalSettings {
     console.log('Toggle Redesigned Signature on experimental setting page');
     await this.driver.clickElement(this.redesignedSignatureToggle);
   }
+
+  async toggleRequestQueue(): Promise<void> {
+    console.log('Toggle Request Queue on experimental setting page');
+    await this.driver.clickElement(this.requestQueueToggle);
+  }
 }
 
 export default ExperimentalSettings;
diff --git a/test/e2e/tests/account/import-flow.spec.ts b/test/e2e/tests/account/import-flow.spec.ts
index 2a8bd0256999..dbb7b2f85d49 100644
--- a/test/e2e/tests/account/import-flow.spec.ts
+++ b/test/e2e/tests/account/import-flow.spec.ts
@@ -1,4 +1,5 @@
 import path from 'path';
+import { DEFAULT_FIXTURE_ACCOUNT } from '../../constants';
 import { withFixtures } from '../../helpers';
 import FixtureBuilder from '../../fixture-builder';
 import AccountListPage from '../../page-objects/pages/account-list-page';
@@ -9,7 +10,6 @@ import { completeImportSRPOnboardingFlow } from '../../page-objects/flows/onboar
 
 describe('Import flow @no-mmi', function () {
   it('Import wallet using Secret Recovery Phrase with pasting word by word', async function () {
-    const testAddress = '0x5CfE73b6021E818B776b421B1c4Db2474086a7e1';
     await withFixtures(
       {
         fixtures: new FixtureBuilder({ onboarding: true }).build(),
@@ -33,7 +33,7 @@ describe('Import flow @no-mmi', function () {
         await accountListPage.check_pageIsLoaded();
         await accountListPage.openAccountDetailsModal('Account 1');
         await accountListPage.check_addressInAccountDetailsModal(
-          testAddress.toLowerCase(),
+          DEFAULT_FIXTURE_ACCOUNT.toLowerCase(),
         );
       },
     );
diff --git a/test/e2e/tests/multichain/all-permissions-page.spec.js b/test/e2e/tests/multichain/all-permissions-page.spec.js
deleted file mode 100644
index 47601c58bb2f..000000000000
--- a/test/e2e/tests/multichain/all-permissions-page.spec.js
+++ /dev/null
@@ -1,90 +0,0 @@
-const { strict: assert } = require('assert');
-const {
-  withFixtures,
-  WINDOW_TITLES,
-  connectToDapp,
-  logInWithBalanceValidation,
-  defaultGanacheOptions,
-} = require('../../helpers');
-const FixtureBuilder = require('../../fixture-builder');
-
-describe('Permissions Page', function () {
-  it('should show connected site permissions when a single dapp is connected', async function () {
-    await withFixtures(
-      {
-        dapp: true,
-        fixtures: new FixtureBuilder().build(),
-        title: this.test.fullTitle(),
-        ganacheOptions: defaultGanacheOptions,
-      },
-      async ({ driver, ganacheServer }) => {
-        await logInWithBalanceValidation(driver, ganacheServer);
-        await connectToDapp(driver);
-
-        // close test dapp window to avoid future confusion
-        const windowHandles = await driver.getAllWindowHandles();
-        await driver.closeWindowHandle(windowHandles[1]);
-        // disconnect dapp in fullscreen view
-        await driver.switchToWindowWithTitle(
-          WINDOW_TITLES.ExtensionInFullScreenView,
-        );
-        await driver.clickElement(
-          '[data-testid ="account-options-menu-button"]',
-        );
-        await driver.clickElement({ text: 'All Permissions', tag: 'div' });
-        const connectedDapp = await driver.isElementPresent({
-          text: '127.0.0.1:8080',
-          tag: 'p',
-        });
-        assert.ok(connectedDapp, 'Account connected to Dapp1');
-      },
-    );
-  });
-
-  it('should show all permissions listed when experimental settings toggle is off', async function () {
-    await withFixtures(
-      {
-        dapp: true,
-        fixtures: new FixtureBuilder().build(),
-        title: this.test.fullTitle(),
-        ganacheOptions: defaultGanacheOptions,
-      },
-      async ({ driver, ganacheServer }) => {
-        await logInWithBalanceValidation(driver, ganacheServer);
-        await connectToDapp(driver);
-
-        // close test dapp window to avoid future confusion
-        const windowHandles = await driver.getAllWindowHandles();
-        await driver.closeWindowHandle(windowHandles[1]);
-        // disconnect dapp in fullscreen view
-        await driver.switchToWindowWithTitle(
-          WINDOW_TITLES.ExtensionInFullScreenView,
-        );
-        await driver.clickElement(
-          '[data-testid="account-options-menu-button"]',
-        );
-        await driver.clickElement({ text: 'Settings', tag: 'div' });
-        await driver.clickElement({
-          text: 'Experimental',
-          tag: 'div',
-        });
-
-        await driver.clickElement(
-          '[data-testid="experimental-setting-toggle-request-queue"] label',
-        );
-        await driver.clickElement(
-          '.settings-page__header__title-container__close-button',
-        );
-        await driver.clickElement(
-          '[data-testid ="account-options-menu-button"]',
-        );
-        await driver.clickElement({ text: 'All Permissions', tag: 'div' });
-        const connectedDapp = await driver.isElementPresent({
-          text: '127.0.0.1:8080',
-          tag: 'p',
-        });
-        assert.ok(connectedDapp, 'Account connected to Dapp1');
-      },
-    );
-  });
-});
diff --git a/test/e2e/tests/multichain/all-permissions-page.spec.ts b/test/e2e/tests/multichain/all-permissions-page.spec.ts
new file mode 100644
index 000000000000..756bae735f15
--- /dev/null
+++ b/test/e2e/tests/multichain/all-permissions-page.spec.ts
@@ -0,0 +1,75 @@
+import { DEFAULT_FIXTURE_ACCOUNT, DAPP_HOST_ADDRESS } from '../../constants';
+import { withFixtures, WINDOW_TITLES } from '../../helpers';
+import FixtureBuilder from '../../fixture-builder';
+import ExperimentalSettings from '../../page-objects/pages/settings/experimental-settings';
+import HeaderNavbar from '../../page-objects/pages/header-navbar';
+import Homepage from '../../page-objects/pages/home/homepage';
+import PermissionListPage from '../../page-objects/pages/permission/permission-list-page';
+import SettingsPage from '../../page-objects/pages/settings/settings-page';
+import TestDapp from '../../page-objects/pages/test-dapp';
+import { loginWithoutBalanceValidation } from '../../page-objects/flows/login.flow';
+
+describe('Permissions Page', function () {
+  it('should show connected site permissions when a single dapp is connected', async function () {
+    await withFixtures(
+      {
+        dapp: true,
+        fixtures: new FixtureBuilder().build(),
+        title: this.test?.fullTitle(),
+      },
+      async ({ driver }) => {
+        await loginWithoutBalanceValidation(driver);
+        const testDapp = new TestDapp(driver);
+        await testDapp.openTestDappPage();
+        await testDapp.connectAccount(DEFAULT_FIXTURE_ACCOUNT);
+
+        // switch to extension window and check the site permissions
+        await driver.switchToWindowWithTitle(
+          WINDOW_TITLES.ExtensionInFullScreenView,
+        );
+        const homepage = new Homepage(driver);
+        await homepage.check_pageIsLoaded();
+        await homepage.check_expectedBalanceIsDisplayed();
+        await homepage.headerNavbar.openPermissionsPage();
+
+        const permissionListPage = new PermissionListPage(driver);
+        await permissionListPage.check_pageIsLoaded();
+        await permissionListPage.check_connectedToSite(DAPP_HOST_ADDRESS);
+      },
+    );
+  });
+
+  it('should show all permissions listed when experimental settings toggle is off', async function () {
+    await withFixtures(
+      {
+        dapp: true,
+        fixtures: new FixtureBuilder()
+          .withPermissionControllerConnectedToTestDapp()
+          .build(),
+        title: this.test?.fullTitle(),
+      },
+      async ({ driver }) => {
+        await loginWithoutBalanceValidation(driver);
+        const headerNavbar = new HeaderNavbar(driver);
+        await headerNavbar.openSettingsPage();
+
+        // go to experimental settings page and toggle request queue
+        const settingsPage = new SettingsPage(driver);
+        await settingsPage.check_pageIsLoaded();
+        await settingsPage.goToExperimentalSettings();
+
+        const experimentalSettings = new ExperimentalSettings(driver);
+        await experimentalSettings.check_pageIsLoaded();
+        await experimentalSettings.toggleRequestQueue();
+        await settingsPage.closeSettingsPage();
+
+        // go to homepage and check site permissions
+        await new Homepage(driver).check_pageIsLoaded();
+        await headerNavbar.openPermissionsPage();
+        const permissionListPage = new PermissionListPage(driver);
+        await permissionListPage.check_pageIsLoaded();
+        await permissionListPage.check_connectedToSite(DAPP_HOST_ADDRESS);
+      },
+    );
+  });
+});
diff --git a/test/e2e/tests/multichain/permission-page.spec.js b/test/e2e/tests/multichain/permission-page.spec.js
deleted file mode 100644
index e2b7208045e0..000000000000
--- a/test/e2e/tests/multichain/permission-page.spec.js
+++ /dev/null
@@ -1,80 +0,0 @@
-const { strict: assert } = require('assert');
-const {
-  withFixtures,
-  WINDOW_TITLES,
-  connectToDapp,
-  logInWithBalanceValidation,
-  defaultGanacheOptions,
-} = require('../../helpers');
-const FixtureBuilder = require('../../fixture-builder');
-
-describe('Permissions Page', function () {
-  it('should show connected site permissions when a single dapp is connected', async function () {
-    await withFixtures(
-      {
-        dapp: true,
-        fixtures: new FixtureBuilder().build(),
-        title: this.test.fullTitle(),
-        ganacheOptions: defaultGanacheOptions,
-      },
-      async ({ driver, ganacheServer }) => {
-        await logInWithBalanceValidation(driver, ganacheServer);
-        await connectToDapp(driver);
-
-        // close test dapp window to avoid future confusion
-        const windowHandles = await driver.getAllWindowHandles();
-        await driver.closeWindowHandle(windowHandles[1]);
-        // disconnect dapp in fullscreen view
-        await driver.switchToWindowWithTitle(
-          WINDOW_TITLES.ExtensionInFullScreenView,
-        );
-        await driver.clickElement(
-          '[data-testid ="account-options-menu-button"]',
-        );
-        await driver.clickElement({ text: 'All Permissions', tag: 'div' });
-        const connectedDapp = await driver.isElementPresent({
-          text: '127.0.0.1:8080',
-          tag: 'p',
-        });
-        assert.ok(connectedDapp, 'Account connected to Dapp1');
-      },
-    );
-  });
-
-  it('should redirect users to connections page when users click on connected permission', async function () {
-    await withFixtures(
-      {
-        dapp: true,
-        fixtures: new FixtureBuilder().build(),
-        title: this.test.fullTitle(),
-        ganacheOptions: defaultGanacheOptions,
-      },
-      async ({ driver, ganacheServer }) => {
-        await logInWithBalanceValidation(driver, ganacheServer);
-        await connectToDapp(driver);
-
-        // close test dapp window to avoid future confusion
-        const windowHandles = await driver.getAllWindowHandles();
-        await driver.closeWindowHandle(windowHandles[1]);
-        // disconnect dapp in fullscreen view
-        await driver.switchToWindowWithTitle(
-          WINDOW_TITLES.ExtensionInFullScreenView,
-        );
-        await driver.clickElement(
-          '[data-testid ="account-options-menu-button"]',
-        );
-        await driver.clickElement({ text: 'All Permissions', tag: 'div' });
-        await driver.clickElement({
-          text: '127.0.0.1:8080',
-          tag: 'p',
-        });
-        await driver.clickElement('[data-testid ="connections-page"]');
-        const connectionsPage = await driver.isElementPresent({
-          text: '127.0.0.1:8080',
-          tag: 'span',
-        });
-        assert.ok(connectionsPage, 'Connections Page is defined');
-      },
-    );
-  });
-});
diff --git a/test/e2e/tests/multichain/permission-page.spec.ts b/test/e2e/tests/multichain/permission-page.spec.ts
new file mode 100644
index 000000000000..a85e4f9ba1a4
--- /dev/null
+++ b/test/e2e/tests/multichain/permission-page.spec.ts
@@ -0,0 +1,33 @@
+import { DAPP_HOST_ADDRESS } from '../../constants';
+import { withFixtures } from '../../helpers';
+import FixtureBuilder from '../../fixture-builder';
+import HeaderNavbar from '../../page-objects/pages/header-navbar';
+import PermissionListPage from '../../page-objects/pages/permission/permission-list-page';
+import SitePermissionPage from '../../page-objects/pages/permission/site-permission-page';
+import { loginWithoutBalanceValidation } from '../../page-objects/flows/login.flow';
+
+describe('Permissions Page', function () {
+  it('should redirect users to connections page when users click on connected permission', async function () {
+    await withFixtures(
+      {
+        dapp: true,
+        fixtures: new FixtureBuilder()
+          .withPermissionControllerConnectedToTestDapp()
+          .build(),
+        title: this.test?.fullTitle(),
+      },
+      async ({ driver }) => {
+        await loginWithoutBalanceValidation(driver);
+        const headerNavbar = new HeaderNavbar(driver);
+        await headerNavbar.openPermissionsPage();
+        const permissionListPage = new PermissionListPage(driver);
+        await permissionListPage.check_pageIsLoaded();
+
+        await permissionListPage.openPermissionPageForSite(DAPP_HOST_ADDRESS);
+        await new SitePermissionPage(driver).check_pageIsLoaded(
+          DAPP_HOST_ADDRESS,
+        );
+      },
+    );
+  });
+});

From 0e10bab6bc28bb83916c14426fa0439f69903418 Mon Sep 17 00:00:00 2001
From: Alejandro Garcia Anglada <aganglada@gmail.com>
Date: Tue, 17 Dec 2024 12:39:47 +0100
Subject: [PATCH 145/175] fix: nanoid audit issue (#29268)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<!--
Please submit this PR as a draft initially.
Do not mark it as "Ready for review" until the template has been
completely filled out, and PR status checks have passed at least once.
-->

## **Description**

Fixes `nanoid` audit

<!--
Write a short description of the changes included in this pull request,
also include relevant motivation and context. Have in mind the following
questions:
1. What is the reason for the change?
2. What is the improvement/solution?
-->

[![Open in GitHub
Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/29268?quickstart=1)

## **Related issues**

Fixes:

## **Manual testing steps**

1. Go to this page...
2.
3.

## **Screenshots/Recordings**

<!-- If applicable, add screenshots and/or recordings to visualize the
before and after of your change. -->

### **Before**

<!-- [screenshots/recordings] -->

### **After**

<!-- [screenshots/recordings] -->

## **Pre-merge author checklist**

- [ ] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension Coding
Standards](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/CODING_GUIDELINES.md).
- [ ] I've completed the PR template to the best of my ability
- [ ] I’ve included tests if applicable
- [ ] I’ve documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [ ] I’ve applied the right labels on the PR (see [labeling
guidelines](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.

## **Pre-merge reviewer checklist**

- [ ] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed).
- [ ] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.

---------

Co-authored-by: MetaMask Bot <metamaskbot@users.noreply.github.com>
---
 .../controllers/permissions/background-api.js      |  2 +-
 app/scripts/metamask-controller.js                 |  2 +-
 lavamoat/browserify/beta/policy.json               | 14 ++++++--------
 lavamoat/browserify/flask/policy.json              | 14 ++++++--------
 lavamoat/browserify/main/policy.json               | 14 ++++++--------
 lavamoat/browserify/mmi/policy.json                | 14 ++++++--------
 lavamoat/build-system/policy.json                  |  2 +-
 package.json                                       |  2 +-
 yarn.lock                                          | 12 ++++++------
 9 files changed, 34 insertions(+), 42 deletions(-)

diff --git a/app/scripts/controllers/permissions/background-api.js b/app/scripts/controllers/permissions/background-api.js
index b778ff42385d..8a0942667f17 100644
--- a/app/scripts/controllers/permissions/background-api.js
+++ b/app/scripts/controllers/permissions/background-api.js
@@ -1,4 +1,4 @@
-import nanoid from 'nanoid';
+import { nanoid } from 'nanoid';
 import {
   CaveatTypes,
   RestrictedMethods,
diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
index e3a223da4e02..8ab78f2c7e92 100644
--- a/app/scripts/metamask-controller.js
+++ b/app/scripts/metamask-controller.js
@@ -47,7 +47,7 @@ import { rawChainData } from 'eth-chainlist';
 import { MetaMaskKeyring as QRHardwareKeyring } from '@keystonehq/metamask-airgapped-keyring';
 import EthQuery from '@metamask/eth-query';
 import EthJSQuery from '@metamask/ethjs-query';
-import nanoid from 'nanoid';
+import { nanoid } from 'nanoid';
 import { captureException } from '@sentry/browser';
 import { AddressBookController } from '@metamask/address-book-controller';
 import {
diff --git a/lavamoat/browserify/beta/policy.json b/lavamoat/browserify/beta/policy.json
index bed94b6bf3c6..42c0b3ff7385 100644
--- a/lavamoat/browserify/beta/policy.json
+++ b/lavamoat/browserify/beta/policy.json
@@ -637,9 +637,9 @@
         "console.info": true
       },
       "packages": {
-        "@metamask/approval-controller>nanoid": true,
         "@metamask/base-controller": true,
-        "@metamask/rpc-errors": true
+        "@metamask/rpc-errors": true,
+        "nanoid": true
       }
     },
     "@metamask/approval-controller>nanoid": {
@@ -1959,11 +1959,11 @@
         "@metamask/base-controller": true,
         "@metamask/controller-utils": true,
         "@metamask/json-rpc-engine": true,
-        "@metamask/permission-controller>nanoid": true,
         "@metamask/rpc-errors": true,
         "@metamask/utils": true,
         "deep-freeze-strict": true,
-        "immer": true
+        "immer": true,
+        "nanoid": true
       }
     },
     "@metamask/permission-controller>nanoid": {
@@ -2446,7 +2446,6 @@
         "@metamask/snaps-controllers>@xstate/fsm": true,
         "@metamask/snaps-controllers>concat-stream": true,
         "@metamask/snaps-controllers>get-npm-tarball-url": true,
-        "@metamask/snaps-controllers>nanoid": true,
         "@metamask/snaps-controllers>readable-web-to-node-stream": true,
         "@metamask/snaps-controllers>tar-stream": true,
         "@metamask/snaps-rpc-methods": true,
@@ -2457,6 +2456,7 @@
         "browserify>browserify-zlib": true,
         "eslint>fast-deep-equal": true,
         "immer": true,
+        "nanoid": true,
         "readable-stream": true,
         "semver": true
       }
@@ -4514,9 +4514,7 @@
     },
     "nanoid": {
       "globals": {
-        "crypto": true,
-        "msCrypto": true,
-        "navigator": true
+        "crypto.getRandomValues": true
       }
     },
     "nock>debug": {
diff --git a/lavamoat/browserify/flask/policy.json b/lavamoat/browserify/flask/policy.json
index bed94b6bf3c6..42c0b3ff7385 100644
--- a/lavamoat/browserify/flask/policy.json
+++ b/lavamoat/browserify/flask/policy.json
@@ -637,9 +637,9 @@
         "console.info": true
       },
       "packages": {
-        "@metamask/approval-controller>nanoid": true,
         "@metamask/base-controller": true,
-        "@metamask/rpc-errors": true
+        "@metamask/rpc-errors": true,
+        "nanoid": true
       }
     },
     "@metamask/approval-controller>nanoid": {
@@ -1959,11 +1959,11 @@
         "@metamask/base-controller": true,
         "@metamask/controller-utils": true,
         "@metamask/json-rpc-engine": true,
-        "@metamask/permission-controller>nanoid": true,
         "@metamask/rpc-errors": true,
         "@metamask/utils": true,
         "deep-freeze-strict": true,
-        "immer": true
+        "immer": true,
+        "nanoid": true
       }
     },
     "@metamask/permission-controller>nanoid": {
@@ -2446,7 +2446,6 @@
         "@metamask/snaps-controllers>@xstate/fsm": true,
         "@metamask/snaps-controllers>concat-stream": true,
         "@metamask/snaps-controllers>get-npm-tarball-url": true,
-        "@metamask/snaps-controllers>nanoid": true,
         "@metamask/snaps-controllers>readable-web-to-node-stream": true,
         "@metamask/snaps-controllers>tar-stream": true,
         "@metamask/snaps-rpc-methods": true,
@@ -2457,6 +2456,7 @@
         "browserify>browserify-zlib": true,
         "eslint>fast-deep-equal": true,
         "immer": true,
+        "nanoid": true,
         "readable-stream": true,
         "semver": true
       }
@@ -4514,9 +4514,7 @@
     },
     "nanoid": {
       "globals": {
-        "crypto": true,
-        "msCrypto": true,
-        "navigator": true
+        "crypto.getRandomValues": true
       }
     },
     "nock>debug": {
diff --git a/lavamoat/browserify/main/policy.json b/lavamoat/browserify/main/policy.json
index bed94b6bf3c6..42c0b3ff7385 100644
--- a/lavamoat/browserify/main/policy.json
+++ b/lavamoat/browserify/main/policy.json
@@ -637,9 +637,9 @@
         "console.info": true
       },
       "packages": {
-        "@metamask/approval-controller>nanoid": true,
         "@metamask/base-controller": true,
-        "@metamask/rpc-errors": true
+        "@metamask/rpc-errors": true,
+        "nanoid": true
       }
     },
     "@metamask/approval-controller>nanoid": {
@@ -1959,11 +1959,11 @@
         "@metamask/base-controller": true,
         "@metamask/controller-utils": true,
         "@metamask/json-rpc-engine": true,
-        "@metamask/permission-controller>nanoid": true,
         "@metamask/rpc-errors": true,
         "@metamask/utils": true,
         "deep-freeze-strict": true,
-        "immer": true
+        "immer": true,
+        "nanoid": true
       }
     },
     "@metamask/permission-controller>nanoid": {
@@ -2446,7 +2446,6 @@
         "@metamask/snaps-controllers>@xstate/fsm": true,
         "@metamask/snaps-controllers>concat-stream": true,
         "@metamask/snaps-controllers>get-npm-tarball-url": true,
-        "@metamask/snaps-controllers>nanoid": true,
         "@metamask/snaps-controllers>readable-web-to-node-stream": true,
         "@metamask/snaps-controllers>tar-stream": true,
         "@metamask/snaps-rpc-methods": true,
@@ -2457,6 +2456,7 @@
         "browserify>browserify-zlib": true,
         "eslint>fast-deep-equal": true,
         "immer": true,
+        "nanoid": true,
         "readable-stream": true,
         "semver": true
       }
@@ -4514,9 +4514,7 @@
     },
     "nanoid": {
       "globals": {
-        "crypto": true,
-        "msCrypto": true,
-        "navigator": true
+        "crypto.getRandomValues": true
       }
     },
     "nock>debug": {
diff --git a/lavamoat/browserify/mmi/policy.json b/lavamoat/browserify/mmi/policy.json
index 8d54d36f2abd..cd8c3a1c7396 100644
--- a/lavamoat/browserify/mmi/policy.json
+++ b/lavamoat/browserify/mmi/policy.json
@@ -729,9 +729,9 @@
         "console.info": true
       },
       "packages": {
-        "@metamask/approval-controller>nanoid": true,
         "@metamask/base-controller": true,
-        "@metamask/rpc-errors": true
+        "@metamask/rpc-errors": true,
+        "nanoid": true
       }
     },
     "@metamask/approval-controller>nanoid": {
@@ -2051,11 +2051,11 @@
         "@metamask/base-controller": true,
         "@metamask/controller-utils": true,
         "@metamask/json-rpc-engine": true,
-        "@metamask/permission-controller>nanoid": true,
         "@metamask/rpc-errors": true,
         "@metamask/utils": true,
         "deep-freeze-strict": true,
-        "immer": true
+        "immer": true,
+        "nanoid": true
       }
     },
     "@metamask/permission-controller>nanoid": {
@@ -2538,7 +2538,6 @@
         "@metamask/snaps-controllers>@xstate/fsm": true,
         "@metamask/snaps-controllers>concat-stream": true,
         "@metamask/snaps-controllers>get-npm-tarball-url": true,
-        "@metamask/snaps-controllers>nanoid": true,
         "@metamask/snaps-controllers>readable-web-to-node-stream": true,
         "@metamask/snaps-controllers>tar-stream": true,
         "@metamask/snaps-rpc-methods": true,
@@ -2549,6 +2548,7 @@
         "browserify>browserify-zlib": true,
         "eslint>fast-deep-equal": true,
         "immer": true,
+        "nanoid": true,
         "readable-stream": true,
         "semver": true
       }
@@ -4606,9 +4606,7 @@
     },
     "nanoid": {
       "globals": {
-        "crypto": true,
-        "msCrypto": true,
-        "navigator": true
+        "crypto.getRandomValues": true
       }
     },
     "nock>debug": {
diff --git a/lavamoat/build-system/policy.json b/lavamoat/build-system/policy.json
index 9874c5915d8e..59a807e7313f 100644
--- a/lavamoat/build-system/policy.json
+++ b/lavamoat/build-system/policy.json
@@ -6510,7 +6510,7 @@
         "process.env.NODE_ENV": true
       },
       "packages": {
-        "postcss>nanoid": true,
+        "nanoid": true,
         "postcss>picocolors": true,
         "postcss>source-map-js": true
       }
diff --git a/package.json b/package.json
index 1072a40599f4..cca9f509c9b5 100644
--- a/package.json
+++ b/package.json
@@ -398,7 +398,7 @@
     "loglevel": "^1.8.1",
     "lottie-web": "^5.12.2",
     "luxon": "^3.2.1",
-    "nanoid": "^2.1.6",
+    "nanoid": "^3.3.8",
     "pify": "^5.0.0",
     "promise-to-callback": "^1.0.0",
     "prop-types": "^15.6.1",
diff --git a/yarn.lock b/yarn.lock
index f670242e47b3..0359c83c1da9 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -26801,7 +26801,7 @@ __metadata:
     mocha: "npm:^10.2.0"
     mocha-junit-reporter: "npm:^2.2.1"
     mockttp: "npm:^3.10.1"
-    nanoid: "npm:^2.1.6"
+    nanoid: "npm:^3.3.8"
     nock: "patch:nock@npm%3A13.5.4#~/.yarn/patches/nock-npm-13.5.4-2c4f77b249.patch"
     node-fetch: "npm:^2.6.1"
     nyc: "npm:^15.1.0"
@@ -27953,19 +27953,19 @@ __metadata:
   languageName: node
   linkType: hard
 
-"nanoid@npm:^2.0.0, nanoid@npm:^2.1.6":
+"nanoid@npm:^2.0.0":
   version: 2.1.11
   resolution: "nanoid@npm:2.1.11"
   checksum: 10/cf2a2eedcf9d8893a4687f11743ccf8381f047bc2b3d3887a23721bbef8fe64c5759b9cba6eb945e40efeb4a7e7379b3417e4dc5f6cc03050322d2c24a7ff69b
   languageName: node
   linkType: hard
 
-"nanoid@npm:^3.1.31, nanoid@npm:^3.3.7":
-  version: 3.3.7
-  resolution: "nanoid@npm:3.3.7"
+"nanoid@npm:^3.1.31, nanoid@npm:^3.3.7, nanoid@npm:^3.3.8":
+  version: 3.3.8
+  resolution: "nanoid@npm:3.3.8"
   bin:
     nanoid: bin/nanoid.cjs
-  checksum: 10/ac1eb60f615b272bccb0e2b9cd933720dad30bf9708424f691b8113826bb91aca7e9d14ef5d9415a6ba15c266b37817256f58d8ce980c82b0ba3185352565679
+  checksum: 10/2d1766606cf0d6f47b6f0fdab91761bb81609b2e3d367027aff45e6ee7006f660fb7e7781f4a34799fe6734f1268eeed2e37a5fdee809ade0c2d4eb11b0f9c40
   languageName: node
   linkType: hard
 

From b9c57634048694a8cfba9e6794747a49bbd0a768 Mon Sep 17 00:00:00 2001
From: seaona <54408225+seaona@users.noreply.github.com>
Date: Tue, 17 Dec 2024 14:45:38 +0100
Subject: [PATCH 146/175] test: [POM] Privacy Mode spec (#29263)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<!--
Please submit this PR as a draft initially.
Do not mark it as "Ready for review" until the template has been
completely filled out, and PR status checks have passed at least once.
-->

## **Description**

- Migrates `test/e2e/tests/privacy-mode/privacy-mode.spec.js` spec to
POM and ts
- Updates method classes to accommodate new functions needed in this
spec
- Fixes several spec issues that where found during the migration (see
comments)

[![Open in GitHub
Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/29263?quickstart=1)

## **Related issues**

Fixes: https://github.com/MetaMask/metamask-extension/issues/29262

## **Manual testing steps**

1. Check ci is green
2. Run test `yarn test:e2e:single
test/e2e/tests/privacy-mode/privacy-mode.spec.ts --browser=chrome
--leave-running=true`

## **Screenshots/Recordings**

<!-- If applicable, add screenshots and/or recordings to visualize the
before and after of your change. -->

### **Before**

<!-- [screenshots/recordings] -->

### **After**

<!-- [screenshots/recordings] -->

## **Pre-merge author checklist**

- [x] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension Coding
Standards](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/CODING_GUIDELINES.md).
- [x] I've completed the PR template to the best of my ability
- [x] I’ve included tests if applicable
- [x] I’ve documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [x] I’ve applied the right labels on the PR (see [labeling
guidelines](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.

## **Pre-merge reviewer checklist**

- [ ] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed).
- [ ] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.
---
 .../page-objects/pages/account-list-page.ts   |  13 +++
 test/e2e/page-objects/pages/header-navbar.ts  |  19 ++--
 test/e2e/page-objects/pages/home/homepage.ts  |  37 ++++--
 .../tests/privacy-mode/privacy-mode.spec.js   | 106 ------------------
 .../tests/privacy-mode/privacy-mode.spec.ts   |  74 ++++++++++++
 5 files changed, 128 insertions(+), 121 deletions(-)
 delete mode 100644 test/e2e/tests/privacy-mode/privacy-mode.spec.js
 create mode 100644 test/e2e/tests/privacy-mode/privacy-mode.spec.ts

diff --git a/test/e2e/page-objects/pages/account-list-page.ts b/test/e2e/page-objects/pages/account-list-page.ts
index bbf25013f607..981955eb19cd 100644
--- a/test/e2e/page-objects/pages/account-list-page.ts
+++ b/test/e2e/page-objects/pages/account-list-page.ts
@@ -547,6 +547,19 @@ class AccountListPage {
     });
   }
 
+  /**
+   * Verifies that all occurrences of the account balance value and symbol are displayed as private.
+   *
+   */
+  async check_balanceIsPrivateEverywhere(): Promise<void> {
+    console.log(`Verify all account balance occurrences are private`);
+    const balanceSelectors = {
+      tag: 'span',
+      text: '••••••',
+    };
+    await this.driver.elementCountBecomesN(balanceSelectors, 6);
+  }
+
   async check_currentAccountIsImported(): Promise<void> {
     console.log(`Check that current account is an imported account`);
     await this.driver.waitForSelector({
diff --git a/test/e2e/page-objects/pages/header-navbar.ts b/test/e2e/page-objects/pages/header-navbar.ts
index 5c0808eea93a..65d4cbd48358 100644
--- a/test/e2e/page-objects/pages/header-navbar.ts
+++ b/test/e2e/page-objects/pages/header-navbar.ts
@@ -80,13 +80,6 @@ class HeaderNavbar {
     await this.driver.clickElement(this.switchNetworkDropDown);
   }
 
-  async check_currentSelectedNetwork(networkName: string): Promise<void> {
-    console.log(`Validate the Switch network to ${networkName}`);
-    await this.driver.waitForSelector(
-      `button[data-testid="network-display"][aria-label="Network Menu ${networkName}"]`,
-    );
-  }
-
   /**
    * Verifies that the displayed account label in header matches the expected label.
    *
@@ -101,6 +94,18 @@ class HeaderNavbar {
       text: expectedLabel,
     });
   }
+
+  /**
+   * Validates that the currently selected network matches the expected network name.
+   *
+   * @param networkName - The expected name of the currently selected network.
+   */
+  async check_currentSelectedNetwork(networkName: string): Promise<void> {
+    console.log(`Validate the Switch network to ${networkName}`);
+    await this.driver.waitForSelector(
+      `button[data-testid="network-display"][aria-label="Network Menu ${networkName}"]`,
+    );
+  }
 }
 
 export default HeaderNavbar;
diff --git a/test/e2e/page-objects/pages/home/homepage.ts b/test/e2e/page-objects/pages/home/homepage.ts
index 8240e51f736c..6b3f7c9f2a87 100644
--- a/test/e2e/page-objects/pages/home/homepage.ts
+++ b/test/e2e/page-objects/pages/home/homepage.ts
@@ -8,8 +8,9 @@ class HomePage {
 
   public headerNavbar: HeaderNavbar;
 
-  private readonly activityTab =
-    '[data-testid="account-overview__activity-tab"]';
+  private readonly activityTab = {
+    testId: 'account-overview__activity-tab',
+  };
 
   private readonly balance = '[data-testid="eth-overview__primary-currency"]';
 
@@ -23,19 +24,35 @@ class HomePage {
     tag: 'h6',
   };
 
-  private readonly erc20TokenDropdown = '[data-testid="import-token-button"]';
+  private readonly erc20TokenDropdown = {
+    testId: 'import-token-button',
+  };
 
-  private readonly nftTab = '[data-testid="account-overview__nfts-tab"]';
+  private readonly nftTab = {
+    testId: 'account-overview__nfts-tab',
+  };
 
   private readonly popoverBackground = '.popover-bg';
 
-  private readonly popoverCloseButton = '[data-testid="popover-close"]';
+  private readonly popoverCloseButton = {
+    testId: 'popover-close',
+  };
 
-  private readonly refreshErc20Tokens = '[data-testid="refreshList"]';
+  private readonly privacyBalanceToggle = {
+    testId: 'sensitive-toggle',
+  };
 
-  private readonly sendButton = '[data-testid="eth-overview-send"]';
+  private readonly refreshErc20Tokens = {
+    testId: 'refreshList',
+  };
 
-  private readonly tokensTab = '[data-testid="account-overview__asset-tab"]';
+  private readonly sendButton = {
+    testId: 'eth-overview-send',
+  };
+
+  private readonly tokensTab = {
+    testId: 'account-overview__asset-tab',
+  };
 
   constructor(driver: Driver) {
     this.driver = driver;
@@ -93,6 +110,10 @@ class HomePage {
     await this.driver.clickElement(this.sendButton);
   }
 
+  async togglePrivacyBalance(): Promise<void> {
+    await this.driver.clickElement(this.privacyBalanceToggle);
+  }
+
   /**
    * Checks if the toaster message for adding a network is displayed on the homepage.
    *
diff --git a/test/e2e/tests/privacy-mode/privacy-mode.spec.js b/test/e2e/tests/privacy-mode/privacy-mode.spec.js
deleted file mode 100644
index ede37f900e66..000000000000
--- a/test/e2e/tests/privacy-mode/privacy-mode.spec.js
+++ /dev/null
@@ -1,106 +0,0 @@
-const { strict: assert } = require('assert');
-const {
-  withFixtures,
-  unlockWallet,
-  defaultGanacheOptions,
-} = require('../../helpers');
-const FixtureBuilder = require('../../fixture-builder');
-
-describe('Privacy Mode', function () {
-  it('should activate privacy mode, then deactivate it', async function () {
-    await withFixtures(
-      {
-        dapp: true,
-        fixtures: new FixtureBuilder().withPreferencesController().build(),
-        ganacheOptions: defaultGanacheOptions,
-        title: this.test.fullTitle(),
-      },
-      async ({ driver }) => {
-        async function checkForHeaderValue(value) {
-          const balanceElement = await driver.findElement(
-            '[data-testid="account-value-and-suffix"]',
-          );
-          const surveyText = await balanceElement.getText();
-          assert.equal(
-            surveyText,
-            value,
-            `Header balance should be "${value}"`,
-          );
-        }
-
-        async function checkForTokenValue(value) {
-          const balanceElement = await driver.findElement(
-            '[data-testid="multichain-token-list-item-value"]',
-          );
-          const surveyText = await balanceElement.getText();
-          assert.equal(surveyText, value, `Token balance should be "${value}"`);
-        }
-
-        async function checkForPrivacy() {
-          await checkForHeaderValue('••••••');
-          await checkForTokenValue('••••••');
-        }
-
-        async function checkForNoPrivacy() {
-          await checkForHeaderValue('25');
-          await checkForTokenValue('25 ETH');
-        }
-
-        async function togglePrivacy() {
-          const balanceElement = await driver.findElement(
-            '[data-testid="account-value-and-suffix"]',
-          );
-          const initialText = await balanceElement.getText();
-
-          await driver.clickElement('[data-testid="sensitive-toggle"]');
-          await driver.wait(async () => {
-            const currentText = await balanceElement.getText();
-            return currentText !== initialText;
-          }, 2e3);
-        }
-
-        await unlockWallet(driver);
-        await checkForNoPrivacy();
-        await togglePrivacy();
-        await checkForPrivacy();
-        await togglePrivacy();
-        await checkForNoPrivacy();
-      },
-    );
-  });
-
-  it('should hide fiat balance and token balance when privacy mode is activated', async function () {
-    await withFixtures(
-      {
-        fixtures: new FixtureBuilder().withPreferencesController().build(),
-        ganacheOptions: defaultGanacheOptions,
-        title: this.test.fullTitle(),
-      },
-      async ({ driver }) => {
-        await unlockWallet(driver);
-
-        async function togglePrivacy() {
-          const balanceElement = await driver.findElement(
-            '[data-testid="account-value-and-suffix"]',
-          );
-          const initialText = await balanceElement.getText();
-
-          await driver.clickElement('[data-testid="sensitive-toggle"]');
-          await driver.wait(async () => {
-            const currentText = await balanceElement.getText();
-            return currentText !== initialText;
-          }, 2e3);
-        }
-
-        await togglePrivacy();
-        await driver.clickElement('[data-testid="account-menu-icon"]');
-        const valueText = await driver.findElement(
-          '[data-testid="account-value-and-suffix"]',
-        );
-        const valueTextContent = await valueText.getText();
-
-        assert.equal(valueTextContent, '••••••');
-      },
-    );
-  });
-});
diff --git a/test/e2e/tests/privacy-mode/privacy-mode.spec.ts b/test/e2e/tests/privacy-mode/privacy-mode.spec.ts
new file mode 100644
index 000000000000..60d9faedc080
--- /dev/null
+++ b/test/e2e/tests/privacy-mode/privacy-mode.spec.ts
@@ -0,0 +1,74 @@
+import { Driver } from '../../webdriver/driver';
+import { defaultGanacheOptions, withFixtures } from '../../helpers';
+import FixtureBuilder from '../../fixture-builder';
+import AccountListPage from '../../page-objects/pages/account-list-page';
+import HeaderNavbar from '../../page-objects/pages/header-navbar';
+import HomePage from '../../page-objects/pages/home/homepage';
+import {
+  loginWithBalanceValidation,
+  loginWithoutBalanceValidation,
+} from '../../page-objects/flows/login.flow';
+import { Ganache } from '../../seeder/ganache';
+
+describe('Privacy Mode', function () {
+  it('should hide fiat balance and token balance when privacy mode is activated', async function () {
+    await withFixtures(
+      {
+        fixtures: new FixtureBuilder().build(),
+        ganacheOptions: defaultGanacheOptions,
+        title: this.test?.fullTitle(),
+      },
+      async ({
+        driver,
+        ganacheServer,
+      }: {
+        driver: Driver;
+        ganacheServer: Ganache;
+      }) => {
+        await loginWithBalanceValidation(driver, ganacheServer);
+        const homePage = new HomePage(driver);
+        await homePage.check_pageIsLoaded();
+        await homePage.togglePrivacyBalance();
+        await homePage.check_expectedBalanceIsDisplayed('••••••', '••••••');
+
+        const headerNavbar = new HeaderNavbar(driver);
+        await headerNavbar.openAccountMenu();
+
+        const accountList = new AccountListPage(driver);
+        await accountList.check_pageIsLoaded();
+        await accountList.check_balanceIsPrivateEverywhere();
+      },
+    );
+  });
+
+  it('should show fiat balance and token balance when privacy mode is deactivated', async function () {
+    await withFixtures(
+      {
+        fixtures: new FixtureBuilder()
+          .withPreferencesController({
+            preferences: {
+              privacyMode: true,
+            },
+          })
+          .build(),
+        ganacheOptions: defaultGanacheOptions,
+        title: this.test?.fullTitle(),
+      },
+      async ({ driver }: { driver: Driver }) => {
+        await loginWithoutBalanceValidation(driver);
+
+        const homePage = new HomePage(driver);
+        await homePage.check_pageIsLoaded();
+        await homePage.togglePrivacyBalance();
+        await homePage.check_expectedBalanceIsDisplayed('25 ETH');
+
+        const headerNavbar = new HeaderNavbar(driver);
+        await headerNavbar.openAccountMenu();
+
+        const accountList = new AccountListPage(driver);
+        await accountList.check_pageIsLoaded();
+        await accountList.check_accountBalanceDisplayed('25');
+      },
+    );
+  });
+});

From 0ef0d54f5c0e1cafad3dd8c18391f192dc1da61e Mon Sep 17 00:00:00 2001
From: Vinicius Stevam <45455812+vinistevam@users.noreply.github.com>
Date: Tue, 17 Dec 2024 14:55:15 +0000
Subject: [PATCH 147/175] fix: increase gas limit validation threshold (#29264)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<!--
Please submit this PR as a draft initially.
Do not mark it as "Ready for review" until the template has been
completely filled out, and PR status checks have passed at least once.
-->

## **Description**

This PR aims to increase the gas limit validation threshold to 30M.


<!--
Write a short description of the changes included in this pull request,
also include relevant motivation and context. Have in mind the following
questions:
1. What is the reason for the change?
2. What is the improvement/solution?
-->

[![Open in GitHub
Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/29264?quickstart=1)

## **Related issues**

Fixes: https://github.com/MetaMask/metamask-extension/issues/21927

## **Manual testing steps**

1. send a transaction
2. edit gaslimit on advance tab

## **Screenshots/Recordings**

[Screencast from 17-12-2024
08:51:19.webm](https://github.com/user-attachments/assets/a8ff1e67-681f-4d6f-9dd8-b0ff79d86baa)

<!-- If applicable, add screenshots and/or recordings to visualize the
before and after of your change. -->

### **Before**

<!-- [screenshots/recordings] -->

### **After**

<!-- [screenshots/recordings] -->

## **Pre-merge author checklist**

- [x] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension Coding
Standards](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/CODING_GUIDELINES.md).
- [x] I've completed the PR template to the best of my ability
- [x] I’ve included tests if applicable
- [x] I’ve documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [x] I’ve applied the right labels on the PR (see [labeling
guidelines](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.

## **Pre-merge reviewer checklist**

- [ ] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed).
- [ ] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.
---
 .../advanced-gas-fee-gas-limit.test.js                        | 4 ++--
 ui/pages/confirmations/send/send.constants.js                 | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ui/pages/confirmations/components/advanced-gas-fee-popover/advanced-gas-fee-gas-limit/advanced-gas-fee-gas-limit.test.js b/ui/pages/confirmations/components/advanced-gas-fee-popover/advanced-gas-fee-gas-limit/advanced-gas-fee-gas-limit.test.js
index 0f91cdfbb781..e8529f01b8b4 100644
--- a/ui/pages/confirmations/components/advanced-gas-fee-popover/advanced-gas-fee-gas-limit/advanced-gas-fee-gas-limit.test.js
+++ b/ui/pages/confirmations/components/advanced-gas-fee-popover/advanced-gas-fee-gas-limit/advanced-gas-fee-gas-limit.test.js
@@ -101,7 +101,7 @@ describe('AdvancedGasFeeGasLimit', () => {
       ),
     ).toBeInTheDocument();
     fireEvent.change(document.getElementsByTagName('input')[0], {
-      target: { value: 8000000 },
+      target: { value: 80000000 },
     });
     expect(
       screen.queryByText(
@@ -154,7 +154,7 @@ describe('AdvancedGasFeeGasLimit', () => {
     );
     expect(
       screen.queryByText(
-        `Gas limit must be greater than 29999 and less than 7920050`,
+        `Gas limit must be greater than 29999 and less than 30000000`,
       ),
     ).toBeInTheDocument();
   });
diff --git a/ui/pages/confirmations/send/send.constants.js b/ui/pages/confirmations/send/send.constants.js
index acf129412135..7fc3aa02484a 100644
--- a/ui/pages/confirmations/send/send.constants.js
+++ b/ui/pages/confirmations/send/send.constants.js
@@ -5,7 +5,7 @@ import { EtherDenomination } from '../../../../shared/constants/common';
 const MIN_GAS_PRICE_DEC = '0';
 const MIN_GAS_PRICE_HEX = parseInt(MIN_GAS_PRICE_DEC, 10).toString(16);
 const MIN_GAS_LIMIT_DEC = new Numeric('21000', 10);
-const MAX_GAS_LIMIT_DEC = '7920027';
+const MAX_GAS_LIMIT_DEC = '30000000';
 
 const HIGH_FEE_WARNING_MULTIPLIER = 1.5;
 const MIN_GAS_PRICE_GWEI = new Numeric(

From a31d80803815fd5c7ec22f0ca2a887ee68bd17a3 Mon Sep 17 00:00:00 2001
From: seaona <54408225+seaona@users.noreply.github.com>
Date: Tue, 17 Dec 2024 16:18:39 +0100
Subject: [PATCH 148/175] test: [POM] Migrate Send tx Revoke Permissions spec
 (#29273)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<!--
Please submit this PR as a draft initially.
Do not mark it as "Ready for review" until the template has been
completely filled out, and PR status checks have passed at least once.
-->

## **Description**

- Migrates
`test/e2e/tests/request-queuing/sendTx-revokePermissions.spec.js` spec
to POM and ts
- Updates method classes to accommodate new functions needed in this
spec
- [A new
bug](https://github.com/MetaMask/metamask-extension/issues/29272) has
been discovered thanks to this migration, and a new TODO has been added,
to add a new spec to cover that flow, once the bug is fixed

[![Open in GitHub
Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/29273?quickstart=1)

## **Related issues**

Fixes: https://github.com/MetaMask/metamask-extension/issues/29276

## **Manual testing steps**

1. Check ci
2. Run test ` yarn test:e2e:single
test/e2e/tests/request-queuing/sendTx-revokePermissions.spec.ts
--browser=chrome --leave-running=true`

## **Screenshots/Recordings**

<!-- If applicable, add screenshots and/or recordings to visualize the
before and after of your change. -->

### **Before**

<!-- [screenshots/recordings] -->

### **After**

<!-- [screenshots/recordings] -->

## **Pre-merge author checklist**

- [ ] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension Coding
Standards](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/CODING_GUIDELINES.md).
- [ ] I've completed the PR template to the best of my ability
- [ ] I’ve included tests if applicable
- [ ] I’ve documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [ ] I’ve applied the right labels on the PR (see [labeling
guidelines](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.

## **Pre-merge reviewer checklist**

- [ ] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed).
- [ ] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.
---
 test/e2e/page-objects/pages/test-dapp.ts      | 20 +++++
 .../sendTx-revokePermissions.spec.js          | 58 --------------
 .../sendTx-revokePermissions.spec.ts          | 78 +++++++++++++++++++
 3 files changed, 98 insertions(+), 58 deletions(-)
 delete mode 100644 test/e2e/tests/request-queuing/sendTx-revokePermissions.spec.js
 create mode 100644 test/e2e/tests/request-queuing/sendTx-revokePermissions.spec.ts

diff --git a/test/e2e/page-objects/pages/test-dapp.ts b/test/e2e/page-objects/pages/test-dapp.ts
index 5155707663b6..ef5aca0c6bf7 100644
--- a/test/e2e/page-objects/pages/test-dapp.ts
+++ b/test/e2e/page-objects/pages/test-dapp.ts
@@ -321,6 +321,26 @@ class TestDapp {
     });
   }
 
+  /**
+   * Verifies the accounts connected to the test dapp.
+   *
+   * @param connectedAccounts - The expected connected accounts separated by a comma. If no accounts are connected we can omit the param.
+   */
+  async check_connectedAccounts(connectedAccounts: string = '') {
+    console.log('Verify connected accounts');
+    if (connectedAccounts) {
+      await this.driver.waitForSelector({
+        css: this.connectedAccount,
+        text: connectedAccounts,
+      });
+    } else {
+      await this.driver.waitForSelector({
+        css: this.connectedAccount,
+        text: ' ',
+      });
+    }
+  }
+
   /**
    * Verify the failed personal sign signature.
    *
diff --git a/test/e2e/tests/request-queuing/sendTx-revokePermissions.spec.js b/test/e2e/tests/request-queuing/sendTx-revokePermissions.spec.js
deleted file mode 100644
index 363f7c94cc74..000000000000
--- a/test/e2e/tests/request-queuing/sendTx-revokePermissions.spec.js
+++ /dev/null
@@ -1,58 +0,0 @@
-const FixtureBuilder = require('../../fixture-builder');
-const {
-  withFixtures,
-  openDapp,
-  unlockWallet,
-  DAPP_URL,
-  defaultGanacheOptions,
-} = require('../../helpers');
-const { PAGES } = require('../../webdriver/driver');
-
-describe('Request Queuing', function () {
-  it('should clear tx confirmation when revokePermission is called from origin dapp', async function () {
-    await withFixtures(
-      {
-        dapp: true,
-        fixtures: new FixtureBuilder()
-          .withPermissionControllerConnectedToTestDapp()
-          .withPreferencesControllerUseRequestQueueEnabled()
-          .withSelectedNetworkControllerPerDomain()
-          .build(),
-        ganacheOptions: {
-          ...defaultGanacheOptions,
-        },
-        title: this.test.fullTitle(),
-      },
-      async ({ driver }) => {
-        await unlockWallet(driver);
-
-        // Navigate to extension home screen
-        await driver.navigate(PAGES.HOME);
-
-        // Open Dapp One
-        await openDapp(driver, undefined, DAPP_URL);
-
-        // wallet_revokePermissions request
-        const revokePermissionsRequest = JSON.stringify({
-          jsonrpc: '2.0',
-          method: 'wallet_revokePermissions',
-          params: [
-            {
-              eth_accounts: {},
-            },
-          ],
-        });
-
-        await driver.executeScript(
-          `return window.ethereum.request(${revokePermissionsRequest})`,
-        );
-
-        // Should have cleared the tx confirmation
-        await driver.waitUntilXWindowHandles(2);
-
-        // Cleared eth_accounts account label
-        await driver.findElement({ xpath: '//span[@id="accounts"][.=""]' });
-      },
-    );
-  });
-});
diff --git a/test/e2e/tests/request-queuing/sendTx-revokePermissions.spec.ts b/test/e2e/tests/request-queuing/sendTx-revokePermissions.spec.ts
new file mode 100644
index 000000000000..c5ff864df99c
--- /dev/null
+++ b/test/e2e/tests/request-queuing/sendTx-revokePermissions.spec.ts
@@ -0,0 +1,78 @@
+import { loginWithBalanceValidation } from '../../page-objects/flows/login.flow';
+import TestDapp from '../../page-objects/pages/test-dapp';
+import TransactionConfirmation from '../../page-objects/pages/confirmations/redesign/transaction-confirmation';
+import { Ganache } from '../../seeder/ganache';
+import { Driver } from '../../webdriver/driver';
+import { DEFAULT_FIXTURE_ACCOUNT } from '../../constants';
+import FixtureBuilder from '../../fixture-builder';
+import {
+  withFixtures,
+  defaultGanacheOptions,
+  WINDOW_TITLES,
+} from '../../helpers';
+
+describe('Request Queuing', function () {
+  // TODO: add a new spec which checks that after revoking and connecting again
+  // a pending tx is still closed when using revokePermissions.
+  // To be done once this bug is fixed: #29272
+  it('should clear tx confirmation when revokePermission is called from origin dapp', async function () {
+    await withFixtures(
+      {
+        dapp: true,
+        fixtures: new FixtureBuilder()
+          .withPermissionControllerConnectedToTestDapp()
+          .withPreferencesControllerUseRequestQueueEnabled()
+          .withSelectedNetworkControllerPerDomain()
+          .build(),
+        ganacheOptions: {
+          ...defaultGanacheOptions,
+        },
+        title: this.test?.fullTitle(),
+      },
+      async ({
+        driver,
+        ganacheServer,
+      }: {
+        driver: Driver;
+        ganacheServer?: Ganache;
+      }) => {
+        await loginWithBalanceValidation(driver, ganacheServer);
+
+        // Open test dapp
+        const testDapp = new TestDapp(driver);
+        await testDapp.openTestDappPage();
+        await testDapp.check_connectedAccounts(
+          DEFAULT_FIXTURE_ACCOUNT.toLowerCase(),
+        );
+
+        // Trigger a tx
+        await testDapp.clickSimpleSendButton();
+        await driver.switchToWindowWithTitle(WINDOW_TITLES.Dialog);
+
+        const transactionConfirmation = new TransactionConfirmation(driver);
+        await transactionConfirmation.check_dappInitiatedHeadingTitle();
+
+        // wallet_revokePermissions request
+        const revokePermissionsRequest = JSON.stringify({
+          jsonrpc: '2.0',
+          method: 'wallet_revokePermissions',
+          params: [
+            {
+              eth_accounts: {},
+            },
+          ],
+        });
+        await driver.switchToWindowWithTitle(WINDOW_TITLES.TestDApp);
+        await driver.executeScript(
+          `return window.ethereum.request(${revokePermissionsRequest})`,
+        );
+
+        // Should have cleared the tx confirmation
+        await driver.waitUntilXWindowHandles(2);
+
+        // Cleared eth_accounts account label
+        await testDapp.check_connectedAccounts();
+      },
+    );
+  });
+});

From 18bcad9eb83d03f6bb69a312975881503d3aae21 Mon Sep 17 00:00:00 2001
From: Jyoti Puri <jyotipuri@gmail.com>
Date: Tue, 17 Dec 2024 21:12:35 +0530
Subject: [PATCH 149/175] fix: Fix low gas display label in speed-up modal
 (#29277)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## **Description**

Fix issue that `undefined` is sometime visible on speedup modal. It was
actually visible in edge case when `10% low` is less than low estimate.

## **Related issues**

Fixes: https://github.com/MetaMask/metamask-extension/issues/28840

## **Manual testing steps**

1. Go to test dapp
2. Submit a transaction with less gas so that it takes longer to
complete
3. Open speedup modal and switch to `10% less` gas estimate
4. You should not see undefined string

## **Screenshots/Recordings**

<img width="427" alt="Screenshot 2024-12-17 at 7 05 58 PM"
src="https://github.com/user-attachments/assets/f3f34910-da94-4190-8229-b29a350cad25"
/>

## **Pre-merge author checklist**

- [X] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension Coding
Standards](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/CODING_GUIDELINES.md).
- [X] I've completed the PR template to the best of my ability
- [X] I’ve included tests if applicable
- [X] I’ve documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [X] I’ve applied the right labels on the PR (see [labeling
guidelines](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.

## **Pre-merge reviewer checklist**

- [ ] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed).
- [ ] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.
---
 .../gas-timing/gas-timing.component.js           | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/ui/pages/confirmations/components/gas-timing/gas-timing.component.js b/ui/pages/confirmations/components/gas-timing/gas-timing.component.js
index 5c8e054647c3..dc495468d11c 100644
--- a/ui/pages/confirmations/components/gas-timing/gas-timing.component.js
+++ b/ui/pages/confirmations/components/gas-timing/gas-timing.component.js
@@ -178,13 +178,15 @@ export default function GasTiming({
 
   return (
     <Box display={Display.Flex} flexWrap={FlexWrap.Wrap}>
-      <Text
-        color={TextColor.textAlternative}
-        variant={TextVariant.bodyMd}
-        paddingInlineEnd={1}
-      >
-        {text}
-      </Text>
+      {text && (
+        <Text
+          color={TextColor.textAlternative}
+          variant={TextVariant.bodyMd}
+          paddingInlineEnd={1}
+        >
+          {text}
+        </Text>
+      )}
 
       {time && (
         <Text variant={TextVariant.bodyMd} color={TextColor.textDefault}>

From 8ca78e7fcbbf921c24abf8e415089e5a45f7e7fe Mon Sep 17 00:00:00 2001
From: Danica Shen <zhaodanica@gmail.com>
Date: Tue, 17 Dec 2024 16:04:04 +0000
Subject: [PATCH 150/175] fix(27140): fix styles for Slippage Tolerance Button
 Group in Transaction Settings Modal (#29246)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This PR aims to fix a broken visual display for Slippage Tolerance
Button Group in Transaction Settings Modal.
After inspecting the styles for `ButtonGroup`, which is the component
applies to this part of UI, has overwritten issues of styles between
`button-group__button` and `radio-button`. Hence the solution is to
specify css based on variant more clearly and avoid the overwrite
problem.
<img width="321" alt="Screenshot 2024-12-16 at 18 59 19"
src="https://github.com/user-attachments/assets/09a9cce7-a308-4049-a0c6-a001659c301e"
/>



<!--
Please submit this PR as a draft initially.
Do not mark it as "Ready for review" until the template has been
completely filled out, and PR status checks have passed at least once.
-->

## **Description**

<!--
Write a short description of the changes included in this pull request,
also include relevant motivation and context. Have in mind the following
questions:
1. What is the reason for the change?
2. What is the improvement/solution?
-->

[![Open in GitHub
Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/29246?quickstart=1)

## **Related issues**

Fixes: https://github.com/MetaMask/metamask-extension/issues/27140

## **Manual testing steps**

1. Click "Swap" from the home screen.
2. In the swap interface, click the cog icon in the top right to open
the transaction settings modal.
3. Observe the slippage tolerance button group—it's visually broken.

## **Screenshots/Recordings**

<!-- If applicable, add screenshots and/or recordings to visualize the
before and after of your change. -->

### **Before**
<img width="339" alt="1"
src="https://github.com/user-attachments/assets/187e1024-0c0c-42fd-9fda-bc72725a7483"
/>


<!-- [screenshots/recordings] -->

### **After**
<img width="766" alt="Screenshot 2024-12-16 at 19 19 04"
src="https://github.com/user-attachments/assets/ee4f1eb5-ee47-4ac0-aaee-df65b7346cae"
/>


<!-- [screenshots/recordings] -->

## **Pre-merge author checklist**

- [x] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension Coding
Standards](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/CODING_GUIDELINES.md).
- [x] I've completed the PR template to the best of my ability
- [x] I’ve included tests if applicable
- [x] I’ve documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [x] I’ve applied the right labels on the PR (see [labeling
guidelines](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.

## **Pre-merge reviewer checklist**

- [ ] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed).
- [ ] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.
---
 .../button-group-component.test.js.snap       |  35 +++-
 .../button-group-component.test.js            |  16 +-
 .../ui/button-group/button-group.component.js |   7 +-
 ui/components/ui/button-group/index.scss      |   2 +-
 .../transaction-settings.test.js.snap         |   8 +-
 .../swaps/transaction-settings/index.scss     |   4 +-
 .../transaction-settings.js                   | 171 +++++++++---------
 7 files changed, 143 insertions(+), 100 deletions(-)

diff --git a/ui/components/ui/button-group/__snapshots__/button-group-component.test.js.snap b/ui/components/ui/button-group/__snapshots__/button-group-component.test.js.snap
index 7e8116227458..b04aa2fbd4f1 100644
--- a/ui/components/ui/button-group/__snapshots__/button-group-component.test.js.snap
+++ b/ui/components/ui/button-group/__snapshots__/button-group-component.test.js.snap
@@ -1,6 +1,6 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`ButtonGroup Component should match snapshot 1`] = `
+exports[`ButtonGroup Component should match snapshot with default variant 1`] = `
 <div>
   <div
     class="someClassName"
@@ -28,3 +28,36 @@ exports[`ButtonGroup Component should match snapshot 1`] = `
   </div>
 </div>
 `;
+
+exports[`ButtonGroup Component should match snapshot with radiogroup variant 1`] = `
+<div>
+  <div
+    class="someClassName radio-button-group"
+    role="radiogroup"
+    style="color: red;"
+  >
+    <button
+      aria-checked="false"
+      class="radio-button-group__button"
+      data-testid="button-group__button0"
+      role="radio"
+    >
+      <div
+        class="mockClass"
+      />
+    </button>
+    <button
+      aria-checked="true"
+      class="radio-button-group__button button-group__button--active radio-button-group__button--active"
+      data-testid="button-group__button1"
+      role="radio"
+    />
+    <button
+      aria-checked="false"
+      class="radio-button-group__button"
+      data-testid="button-group__button2"
+      role="radio"
+    />
+  </div>
+</div>
+`;
diff --git a/ui/components/ui/button-group/button-group-component.test.js b/ui/components/ui/button-group/button-group-component.test.js
index 2aaccad78a0c..584042491867 100644
--- a/ui/components/ui/button-group/button-group-component.test.js
+++ b/ui/components/ui/button-group/button-group-component.test.js
@@ -16,15 +16,25 @@ describe('ButtonGroup Component', () => {
     <button key="a">
       <div className="mockClass" />
     </button>,
-    <button key="b"></button>,
-    <button key="c"></button>,
+    <button key="b" />,
+    <button key="c" />,
   ];
 
-  it('should match snapshot', () => {
+  it('should match snapshot with default variant', () => {
     const { container } = renderWithProvider(
       <ButtonGroup {...props}>{mockButtons}</ButtonGroup>,
     );
 
     expect(container).toMatchSnapshot();
   });
+
+  it('should match snapshot with radiogroup variant', () => {
+    const { container } = renderWithProvider(
+      <ButtonGroup {...props} variant="radiogroup">
+        {mockButtons}
+      </ButtonGroup>,
+    );
+
+    expect(container).toMatchSnapshot();
+  });
 });
diff --git a/ui/components/ui/button-group/button-group.component.js b/ui/components/ui/button-group/button-group.component.js
index 65f005ac2b45..e1410740810b 100644
--- a/ui/components/ui/button-group/button-group.component.js
+++ b/ui/components/ui/button-group/button-group.component.js
@@ -74,13 +74,14 @@ export default class ButtonGroup extends PureComponent {
             role={variant === 'radiogroup' ? 'radio' : undefined}
             aria-checked={index === this.state.activeButtonIndex}
             className={classnames(
-              'button-group__button',
+              variant === 'radiogroup'
+                ? 'radio-button-group__button'
+                : 'button-group__button',
               child.props.className,
               {
-                'radio-button': variant === 'radiogroup',
                 'button-group__button--active':
                   index === this.state.activeButtonIndex,
-                'radio-button--active':
+                'radio-button-group__button--active':
                   variant === 'radiogroup' &&
                   index === this.state.activeButtonIndex,
               },
diff --git a/ui/components/ui/button-group/index.scss b/ui/components/ui/button-group/index.scss
index 38ad03ff4d50..d2650048ef27 100644
--- a/ui/components/ui/button-group/index.scss
+++ b/ui/components/ui/button-group/index.scss
@@ -38,7 +38,7 @@
 }
 
 .radio-button-group {
-  .radio-button {
+  &__button {
     @include design-system.H7;
 
     color: var(--color-text-alternative);
diff --git a/ui/pages/swaps/transaction-settings/__snapshots__/transaction-settings.test.js.snap b/ui/pages/swaps/transaction-settings/__snapshots__/transaction-settings.test.js.snap
index b9e19665bf99..d2c64cd70b38 100644
--- a/ui/pages/swaps/transaction-settings/__snapshots__/transaction-settings.test.js.snap
+++ b/ui/pages/swaps/transaction-settings/__snapshots__/transaction-settings.test.js.snap
@@ -2,12 +2,12 @@
 
 exports[`TransactionSettings renders the component with initial props 1`] = `
 <div
-  class="button-group transaction-settings__button-group radio-button-group"
+  class="transaction-settings__button-group radio-button-group"
   role="radiogroup"
 >
   <button
     aria-checked="false"
-    class="button-group__button radio-button"
+    class="radio-button-group__button"
     data-testid="button-group__button0"
     role="radio"
   >
@@ -15,7 +15,7 @@ exports[`TransactionSettings renders the component with initial props 1`] = `
   </button>
   <button
     aria-checked="true"
-    class="button-group__button radio-button button-group__button--active radio-button--active"
+    class="radio-button-group__button button-group__button--active radio-button-group__button--active"
     data-testid="button-group__button1"
     role="radio"
   >
@@ -23,7 +23,7 @@ exports[`TransactionSettings renders the component with initial props 1`] = `
   </button>
   <button
     aria-checked="false"
-    class="button-group__button transaction-settings__button-group-custom-button radio-button"
+    class="radio-button-group__button transaction-settings__button-group-custom-button"
     data-testid="button-group__button2"
     role="radio"
   >
diff --git a/ui/pages/swaps/transaction-settings/index.scss b/ui/pages/swaps/transaction-settings/index.scss
index 0efb4883d6d4..527bec00ac76 100644
--- a/ui/pages/swaps/transaction-settings/index.scss
+++ b/ui/pages/swaps/transaction-settings/index.scss
@@ -8,6 +8,9 @@
   }
 
   &__button-group {
+    display: flex;
+    flex-direction: row;
+
     & &-custom-button {
       cursor: text;
       display: flex;
@@ -15,7 +18,6 @@
       justify-content: center;
       position: relative;
       min-width: 72px;
-      margin-right: 0;
     }
   }
 
diff --git a/ui/pages/swaps/transaction-settings/transaction-settings.js b/ui/pages/swaps/transaction-settings/transaction-settings.js
index 51b35718d8f3..371977b76e4b 100644
--- a/ui/pages/swaps/transaction-settings/transaction-settings.js
+++ b/ui/pages/swaps/transaction-settings/transaction-settings.js
@@ -16,6 +16,7 @@ import {
   DISPLAY,
   SEVERITIES,
   FlexDirection,
+  BlockSize,
 } from '../../../helpers/constants/design-system';
 import {
   Slippage,
@@ -168,97 +169,93 @@ export default function TransactionSettings({
                       contentText={t('swapSlippageTooltip')}
                     />
                   </Box>
-                  <Box display={DISPLAY.FLEX}>
-                    <ButtonGroup
-                      defaultActiveButtonIndex={
-                        activeButtonIndex === 2 && !customValue
-                          ? 1
-                          : activeButtonIndex
-                      }
-                      variant="radiogroup"
-                      newActiveButtonIndex={activeButtonIndex}
+                  <ButtonGroup
+                    defaultActiveButtonIndex={
+                      activeButtonIndex === 2 && !customValue
+                        ? 1
+                        : activeButtonIndex
+                    }
+                    variant="radiogroup"
+                    newActiveButtonIndex={activeButtonIndex}
+                    className={classnames('transaction-settings__button-group')}
+                    style={{ width: BlockSize.Half }}
+                  >
+                    <Button
+                      onClick={() => {
+                        setCustomValue('');
+                        setEnteringCustomValue(false);
+                        setActiveButtonIndex(0);
+                        setNewSlippage(Slippage.default);
+                      }}
+                    >
+                      {t('swapSlippagePercent', [Slippage.default])}
+                    </Button>
+                    <Button
+                      onClick={() => {
+                        setCustomValue('');
+                        setEnteringCustomValue(false);
+                        setActiveButtonIndex(1);
+                        setNewSlippage(Slippage.high);
+                      }}
+                    >
+                      {t('swapSlippagePercent', [Slippage.high])}
+                    </Button>
+                    <Button
                       className={classnames(
-                        'button-group',
-                        'transaction-settings__button-group',
+                        'transaction-settings__button-group-custom-button',
+                        {
+                          'radio-button--danger': isDangerSeverity,
+                        },
                       )}
+                      onClick={() => {
+                        setActiveButtonIndex(2);
+                        setEnteringCustomValue(true);
+                      }}
                     >
-                      <Button
-                        onClick={() => {
-                          setCustomValue('');
-                          setEnteringCustomValue(false);
-                          setActiveButtonIndex(0);
-                          setNewSlippage(Slippage.default);
-                        }}
-                      >
-                        {t('swapSlippagePercent', [Slippage.default])}
-                      </Button>
-                      <Button
-                        onClick={() => {
-                          setCustomValue('');
-                          setEnteringCustomValue(false);
-                          setActiveButtonIndex(1);
-                          setNewSlippage(Slippage.high);
-                        }}
-                      >
-                        {t('swapSlippagePercent', [Slippage.high])}
-                      </Button>
-                      <Button
-                        className={classnames(
-                          'transaction-settings__button-group-custom-button',
-                          {
-                            'radio-button--danger': isDangerSeverity,
-                          },
-                        )}
-                        onClick={() => {
-                          setActiveButtonIndex(2);
-                          setEnteringCustomValue(true);
-                        }}
-                      >
-                        {enteringCustomValue ? (
-                          <div
-                            className={classnames(
-                              'transaction-settings__custom-input',
-                              {
-                                'transaction-settings__custom-input--danger':
-                                  isDangerSeverity,
-                              },
-                            )}
-                          >
-                            <input
-                              data-testid="transaction-settings-custom-slippage"
-                              onChange={(event) => {
-                                const { value } = event.target;
-                                const isValueNumeric = !isNaN(Number(value));
-                                if (isValueNumeric) {
-                                  setCustomValue(value);
-                                  setNewSlippage(Number(value));
-                                }
-                              }}
-                              type="text"
-                              maxLength="4"
-                              ref={setInputRef}
-                              onBlur={() => {
+                      {enteringCustomValue ? (
+                        <div
+                          className={classnames(
+                            'transaction-settings__custom-input',
+                            {
+                              'transaction-settings__custom-input--danger':
+                                isDangerSeverity,
+                            },
+                          )}
+                        >
+                          <input
+                            data-testid="transaction-settings-custom-slippage"
+                            onChange={(event) => {
+                              const { value } = event.target;
+                              const isValueNumeric = !isNaN(Number(value));
+                              if (isValueNumeric) {
+                                setCustomValue(value);
+                                setNewSlippage(Number(value));
+                              }
+                            }}
+                            type="text"
+                            maxLength="4"
+                            ref={setInputRef}
+                            onBlur={() => {
+                              setEnteringCustomValue(false);
+                            }}
+                            onKeyDown={(event) => {
+                              if (event.key === 'Enter') {
                                 setEnteringCustomValue(false);
-                              }}
-                              onKeyDown={(event) => {
-                                if (event.key === 'Enter') {
-                                  setEnteringCustomValue(false);
-                                }
-                              }}
-                              value={customValue || ''}
-                            />
-                          </div>
-                        ) : (
-                          customValueText
-                        )}
-                        {(customValue || enteringCustomValue) && (
-                          <div className="transaction-settings__percentage-suffix">
-                            %
-                          </div>
-                        )}
-                      </Button>
-                    </ButtonGroup>
-                  </Box>
+                              }
+                            }}
+                            value={customValue || ''}
+                          />
+                        </div>
+                      ) : (
+                        customValueText
+                      )}
+                      {(customValue || enteringCustomValue) && (
+                        <div className="transaction-settings__percentage-suffix">
+                          %
+                        </div>
+                      )}
+                    </Button>
+                  </ButtonGroup>
                 </>
               )}
             </>

From fe809431e6cbfdd7d18a2d5ba90570d6c5ae1337 Mon Sep 17 00:00:00 2001
From: George Marshall <george.marshall@consensys.net>
Date: Tue, 17 Dec 2024 08:40:14 -0800
Subject: [PATCH 151/175] fix: add focus state to swaps input for improved
 accessibility (#29252)

## **Description**

The current swaps input implementation hides the focus indicator, making
it inaccessible for users with vision impairments and those relying on
keyboard navigation. This creates barriers for:
- Users with low vision who need clear visual indicators
- Users with motor impairments who navigate via keyboard
- Users of screen magnification tools who need to track their position

This PR improves accessibility by:
1. Removing 'outline: none' from the swaps input to restore focus
visibility
2. Adjusting padding (from 0 to 4px) and margins to maintain visual
consistency
3. Adding proper focus visibility for keyboard navigation

These changes ensure compliance with [WCAG 2.1 Success Criterion 2.4.7
(Focus
Visible)](https://www.w3.org/WAI/WCAG21/Understanding/focus-visible.html),
which requires that keyboard focus indicators be visible and
distinguishable.

## **Related issues**

Fixes: https://github.com/MetaMask/metamask-extension/issues/26662

## **Manual testing steps**

1. Navigate to the swaps page
2. Use Tab key to move focus to the input field
3. Verify that a visible focus indicator appears around the input
4. Ensure the text alignment and spacing remain consistent
5. Test that the input remains right-aligned with the new padding

## **Screenshots/Recordings**

### **Before**
Input field shows no focus indicator when navigating with keyboard



https://github.com/user-attachments/assets/961ea815-2014-47e3-b4f2-514197fae9dd


### **After**
Input field shows clear focus indicator when navigating with keyboard,
with padding-right: 4px


https://github.com/user-attachments/assets/27a27dd5-51f3-473a-ad5b-bbde22caa7e2

## **Pre-merge author checklist**

- [x] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension Coding
Standards](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/CODING_GUIDELINES.md)
- [x] I've completed the PR template to the best of my ability
- [x] I've included tests if applicable
- [x] I've documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [x] I've applied the right labels on the PR

## **Pre-merge reviewer checklist**

- [ ] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed)
- [ ] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots
---
 ui/pages/swaps/prepare-swap-page/index.scss           | 4 ++--
 ui/pages/swaps/prepare-swap-page/prepare-swap-page.js | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/ui/pages/swaps/prepare-swap-page/index.scss b/ui/pages/swaps/prepare-swap-page/index.scss
index b443006330d3..a6e027c84830 100644
--- a/ui/pages/swaps/prepare-swap-page/index.scss
+++ b/ui/pages/swaps/prepare-swap-page/index.scss
@@ -133,10 +133,10 @@
 
   &__from-token-amount {
     border: 0;
-    outline: none;
+    margin-right: -4px;
 
     input {
-      padding-right: 0;
+      padding-right: 4px;
       text-align: right;
       font-weight: var(--typography-s-heading-lg-font-weight);
       font-size: var(--typography-s-heading-lg-font-size);
diff --git a/ui/pages/swaps/prepare-swap-page/prepare-swap-page.js b/ui/pages/swaps/prepare-swap-page/prepare-swap-page.js
index a100b490b4d6..2bcc2672e335 100644
--- a/ui/pages/swaps/prepare-swap-page/prepare-swap-page.js
+++ b/ui/pages/swaps/prepare-swap-page/prepare-swap-page.js
@@ -893,6 +893,7 @@ export default function PrepareSwapPage({
             display={DISPLAY.FLEX}
             justifyContent={JustifyContent.spaceBetween}
             alignItems={AlignItems.center}
+            gap={4}
           >
             <SelectedToken
               onClick={onSwapFromOpen}

From 6fe17a04cb37b9b54999a071b3a55982a30533fa Mon Sep 17 00:00:00 2001
From: micaelae <100321200+micaelae@users.noreply.github.com>
Date: Tue, 17 Dec 2024 08:40:22 -0800
Subject: [PATCH 152/175] chore: quote timeout treatment for bridging (#29172)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<!--
Please submit this PR as a draft initially.
Do not mark it as "Ready for review" until the template has been
completely filled out, and PR status checks have passed at least once.
-->

## **Description**
when the quote is older than 30s
- if the user has sufficient balance, hide quote and show a button that
restarts polling on click
- if the user doesn't have sufficient balance, keep showing the quote
quote but display a button that restarts polling on click

<!--
Write a short description of the changes included in this pull request,
also include relevant motivation and context. Have in mind the following
questions:
1. What is the reason for the change?
2. What is the improvement/solution?
-->

[![Open in GitHub
Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/29172?quickstart=1)

## **Related issues**

Fixes: N/A

## **Manual testing steps**

1. Request quotes
2. Wait for ~3 minutes after fetching starts
3. Quote should time out
4. Clicking the Fetch button should restart polling

## **Screenshots/Recordings**

<!-- If applicable, add screenshots and/or recordings to visualize the
before and after of your change. -->

### **Before**

N/A

### **After**

![Screenshot 2024-12-12 at 1 50
40 PM](https://github.com/user-attachments/assets/1a0e2c1e-1260-40fb-bd10-2f78ac61b1e1)
![Screenshot 2024-12-12 at 1 46
18 PM](https://github.com/user-attachments/assets/5836cc59-dd32-4afe-9213-6cadad3e7fab)



## **Pre-merge author checklist**

- [X] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension Coding
Standards](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/CODING_GUIDELINES.md).
- [X] I've completed the PR template to the best of my ability
- [X] I’ve included tests if applicable
- [X] I’ve documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [X] I’ve applied the right labels on the PR (see [labeling
guidelines](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.

## **Pre-merge reviewer checklist**

- [ ] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed).
- [ ] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.
---
 app/_locales/en/messages.json                 |  5 +-
 .../bridge/__snapshots__/index.test.tsx.snap  | 12 ++-
 .../bridge-cta-button.test.tsx.snap           | 34 +++++---
 .../prepare-bridge-page.test.tsx.snap         | 24 ++++--
 .../bridge/prepare/bridge-cta-button.test.tsx | 12 +--
 ui/pages/bridge/prepare/bridge-cta-button.tsx | 82 ++++++++++++-------
 .../bridge/prepare/prepare-bridge-page.tsx    | 32 ++++++--
 ui/pages/bridge/utils/quote.ts                | 11 +++
 8 files changed, 145 insertions(+), 67 deletions(-)

diff --git a/app/_locales/en/messages.json b/app/_locales/en/messages.json
index 12df50e257d7..1ff278090f61 100644
--- a/app/_locales/en/messages.json
+++ b/app/_locales/en/messages.json
@@ -883,6 +883,9 @@
   "bridgeExplorerLinkViewOn": {
     "message": "View on $1"
   },
+  "bridgeFetchNewQuotes": {
+    "message": "Fetch a new one?"
+  },
   "bridgeFrom": {
     "message": "Bridge from"
   },
@@ -897,7 +900,7 @@
     "message": "Net cost"
   },
   "bridgeQuoteExpired": {
-    "message": "Quotes expired - please request again"
+    "message": "Your quote timed out."
   },
   "bridgeSelectNetwork": {
     "message": "Select network"
diff --git a/ui/pages/bridge/__snapshots__/index.test.tsx.snap b/ui/pages/bridge/__snapshots__/index.test.tsx.snap
index 51473d6fefa0..072c7d7eee6b 100644
--- a/ui/pages/bridge/__snapshots__/index.test.tsx.snap
+++ b/ui/pages/bridge/__snapshots__/index.test.tsx.snap
@@ -222,11 +222,15 @@ exports[`Bridge renders the component with initial props 1`] = `
                 <div
                   class="mm-box multichain-page-footer mm-box--padding-0 mm-box--display-flex mm-box--gap-2 mm-box--flex-direction-column mm-box--width-full"
                 >
-                  <p
-                    class="mm-box mm-text mm-text--body-md mm-text--text-align-center mm-box--width-full mm-box--color-text-alternative-soft"
+                  <div
+                    class="mm-box mm-container mm-container--max-width-undefined mm-box--display-flex mm-box--gap-1 mm-box--flex-direction-row mm-box--flex-wrap-nowrap mm-box--justify-content-center mm-box--align-items-center"
                   >
-                    Select token and amount
-                  </p>
+                    <p
+                      class="mm-box mm-text mm-text--body-md mm-text--text-align-center mm-box--color-text-alternative-soft"
+                    >
+                      Select token and amount
+                    </p>
+                  </div>
                 </div>
               </div>
             </div>
diff --git a/ui/pages/bridge/prepare/__snapshots__/bridge-cta-button.test.tsx.snap b/ui/pages/bridge/prepare/__snapshots__/bridge-cta-button.test.tsx.snap
index 0b46d2764523..6014dbaddb23 100644
--- a/ui/pages/bridge/prepare/__snapshots__/bridge-cta-button.test.tsx.snap
+++ b/ui/pages/bridge/prepare/__snapshots__/bridge-cta-button.test.tsx.snap
@@ -2,9 +2,13 @@
 
 exports[`BridgeCTAButton should disable the component when quotes are loading and there are no existing quotes 1`] = `
 <div>
-  <p
-    class="mm-box mm-text mm-text--body-md mm-text--text-align-center mm-box--width-full mm-box--color-text-alternative-soft"
-  />
+  <div
+    class="mm-box mm-container mm-container--max-width-undefined mm-box--display-flex mm-box--gap-1 mm-box--flex-direction-row mm-box--flex-wrap-nowrap mm-box--justify-content-center mm-box--align-items-center"
+  >
+    <p
+      class="mm-box mm-text mm-text--body-md mm-text--text-align-center mm-box--color-text-alternative-soft"
+    />
+  </div>
 </div>
 `;
 
@@ -23,20 +27,28 @@ exports[`BridgeCTAButton should enable the component when quotes are loading and
 
 exports[`BridgeCTAButton should render the component when amount and dest token is missing 1`] = `
 <div>
-  <p
-    class="mm-box mm-text mm-text--body-md mm-text--text-align-center mm-box--width-full mm-box--color-text-alternative-soft"
+  <div
+    class="mm-box mm-container mm-container--max-width-undefined mm-box--display-flex mm-box--gap-1 mm-box--flex-direction-row mm-box--flex-wrap-nowrap mm-box--justify-content-center mm-box--align-items-center"
   >
-    Select token and amount
-  </p>
+    <p
+      class="mm-box mm-text mm-text--body-md mm-text--text-align-center mm-box--color-text-alternative-soft"
+    >
+      Select token and amount
+    </p>
+  </div>
 </div>
 `;
 
 exports[`BridgeCTAButton should render the component's initial state 1`] = `
 <div>
-  <p
-    class="mm-box mm-text mm-text--body-md mm-text--text-align-center mm-box--width-full mm-box--color-text-alternative-soft"
+  <div
+    class="mm-box mm-container mm-container--max-width-undefined mm-box--display-flex mm-box--gap-1 mm-box--flex-direction-row mm-box--flex-wrap-nowrap mm-box--justify-content-center mm-box--align-items-center"
   >
-    Select token
-  </p>
+    <p
+      class="mm-box mm-text mm-text--body-md mm-text--text-align-center mm-box--color-text-alternative-soft"
+    >
+      Select token
+    </p>
+  </div>
 </div>
 `;
diff --git a/ui/pages/bridge/prepare/__snapshots__/prepare-bridge-page.test.tsx.snap b/ui/pages/bridge/prepare/__snapshots__/prepare-bridge-page.test.tsx.snap
index d5b980d13fd6..c69368d0b88e 100644
--- a/ui/pages/bridge/prepare/__snapshots__/prepare-bridge-page.test.tsx.snap
+++ b/ui/pages/bridge/prepare/__snapshots__/prepare-bridge-page.test.tsx.snap
@@ -172,11 +172,15 @@ exports[`PrepareBridgePage should render the component, with initial state 1`] =
           <div
             class="mm-box multichain-page-footer mm-box--padding-0 mm-box--display-flex mm-box--gap-2 mm-box--flex-direction-column mm-box--width-full"
           >
-            <p
-              class="mm-box mm-text mm-text--body-md mm-text--text-align-center mm-box--width-full mm-box--color-text-alternative-soft"
+            <div
+              class="mm-box mm-container mm-container--max-width-undefined mm-box--display-flex mm-box--gap-1 mm-box--flex-direction-row mm-box--flex-wrap-nowrap mm-box--justify-content-center mm-box--align-items-center"
             >
-              Select token and amount
-            </p>
+              <p
+                class="mm-box mm-text mm-text--body-md mm-text--text-align-center mm-box--color-text-alternative-soft"
+              >
+                Select token and amount
+              </p>
+            </div>
           </div>
         </div>
       </div>
@@ -357,11 +361,15 @@ exports[`PrepareBridgePage should render the component, with inputs set 1`] = `
           <div
             class="mm-box multichain-page-footer mm-box--padding-0 mm-box--display-flex mm-box--gap-2 mm-box--flex-direction-column mm-box--width-full"
           >
-            <p
-              class="mm-box mm-text mm-text--body-md mm-text--text-align-center mm-box--width-full mm-box--color-text-alternative-soft"
+            <div
+              class="mm-box mm-container mm-container--max-width-undefined mm-box--display-flex mm-box--gap-1 mm-box--flex-direction-row mm-box--flex-wrap-nowrap mm-box--justify-content-center mm-box--align-items-center"
             >
-              Select token and amount
-            </p>
+              <p
+                class="mm-box mm-text mm-text--body-md mm-text--text-align-center mm-box--color-text-alternative-soft"
+              >
+                Select token and amount
+              </p>
+            </div>
           </div>
         </div>
       </div>
diff --git a/ui/pages/bridge/prepare/bridge-cta-button.test.tsx b/ui/pages/bridge/prepare/bridge-cta-button.test.tsx
index d4e0fd0855c5..5dc368043d3a 100644
--- a/ui/pages/bridge/prepare/bridge-cta-button.test.tsx
+++ b/ui/pages/bridge/prepare/bridge-cta-button.test.tsx
@@ -23,7 +23,7 @@ describe('BridgeCTAButton', () => {
       bridgeSliceOverrides: { fromTokenInputValue: 1 },
     });
     const { container, getByText } = renderWithProvider(
-      <BridgeCTAButton />,
+      <BridgeCTAButton onFetchNewQuotes={jest.fn()} />,
       configureStore(mockStore),
     );
 
@@ -54,7 +54,7 @@ describe('BridgeCTAButton', () => {
       },
     });
     const { getByText } = renderWithProvider(
-      <BridgeCTAButton />,
+      <BridgeCTAButton onFetchNewQuotes={jest.fn()} />,
       configureStore(mockStore),
     );
 
@@ -83,7 +83,7 @@ describe('BridgeCTAButton', () => {
       },
     });
     const { getByText, container } = renderWithProvider(
-      <BridgeCTAButton />,
+      <BridgeCTAButton onFetchNewQuotes={jest.fn()} />,
       configureStore(mockStore),
     );
 
@@ -118,7 +118,7 @@ describe('BridgeCTAButton', () => {
       },
     });
     const { getByText, getByRole } = renderWithProvider(
-      <BridgeCTAButton />,
+      <BridgeCTAButton onFetchNewQuotes={jest.fn()} />,
       configureStore(mockStore),
     );
 
@@ -159,7 +159,7 @@ describe('BridgeCTAButton', () => {
       },
     });
     const { container } = renderWithProvider(
-      <BridgeCTAButton />,
+      <BridgeCTAButton onFetchNewQuotes={jest.fn()} />,
       configureStore(mockStore),
     );
 
@@ -199,7 +199,7 @@ describe('BridgeCTAButton', () => {
       },
     });
     const { getByText, getByRole, container } = renderWithProvider(
-      <BridgeCTAButton />,
+      <BridgeCTAButton onFetchNewQuotes={jest.fn()} />,
       configureStore(mockStore),
     );
 
diff --git a/ui/pages/bridge/prepare/bridge-cta-button.tsx b/ui/pages/bridge/prepare/bridge-cta-button.tsx
index 8812e26eb099..8e45f90cd1db 100644
--- a/ui/pages/bridge/prepare/bridge-cta-button.tsx
+++ b/ui/pages/bridge/prepare/bridge-cta-button.tsx
@@ -1,6 +1,7 @@
-import React, { useEffect, useMemo, useState } from 'react';
+import React, { useMemo, useState } from 'react';
 import { useSelector } from 'react-redux';
 import {
+  ButtonLink,
   ButtonPrimary,
   ButtonPrimarySize,
   Text,
@@ -18,7 +19,9 @@ import {
 import { useI18nContext } from '../../../hooks/useI18nContext';
 import useSubmitBridgeTransaction from '../hooks/useSubmitBridgeTransaction';
 import {
+  AlignItems,
   BlockSize,
+  JustifyContent,
   TextAlign,
   TextColor,
   TextVariant,
@@ -32,8 +35,14 @@ import { useTradeProperties } from '../../../hooks/bridge/events/useTradePropert
 import { MetaMetricsEventName } from '../../../../shared/constants/metametrics';
 import { SWAPS_CHAINID_DEFAULT_TOKEN_MAP } from '../../../../shared/constants/swaps';
 import { getNativeCurrency } from '../../../ducks/metamask/metamask';
-
-export const BridgeCTAButton = () => {
+import { Row } from '../layout';
+import { isQuoteExpired as isQuoteExpiredUtil } from '../utils/quote';
+
+export const BridgeCTAButton = ({
+  onFetchNewQuotes,
+}: {
+  onFetchNewQuotes: () => void;
+}) => {
   const t = useI18nContext();
 
   const fromToken = useSelector(getFromToken);
@@ -43,9 +52,14 @@ export const BridgeCTAButton = () => {
 
   const fromAmount = useSelector(getFromAmount);
 
-  const { isLoading, activeQuote, isQuoteGoingToRefresh, quotesRefreshCount } =
+  const { isLoading, activeQuote, isQuoteGoingToRefresh, quotesLastFetchedMs } =
     useSelector(getBridgeQuotes);
-  const { maxRefreshCount, refreshRate } = useSelector(getBridgeQuotesConfig);
+  const { refreshRate } = useSelector(getBridgeQuotesConfig);
+  const isQuoteExpired = isQuoteExpiredUtil(
+    isQuoteGoingToRefresh,
+    refreshRate,
+    quotesLastFetchedMs,
+  );
 
   const { submitBridgeTransaction } = useSubmitBridgeTransaction();
   const [isSubmitting, setIsSubmitting] = useState(false);
@@ -76,7 +90,6 @@ export const BridgeCTAButton = () => {
   const tradeProperties = useTradeProperties();
 
   const ticker = useSelector(getNativeCurrency);
-  const [isQuoteExpired, setIsQuoteExpired] = useState(false);
 
   const isInsufficientBalance = isInsufficientBalance_(balanceAmount);
 
@@ -85,28 +98,12 @@ export const BridgeCTAButton = () => {
   const isInsufficientGasForQuote =
     isInsufficientGasForQuote_(nativeAssetBalance);
 
-  useEffect(() => {
-    let timeout: NodeJS.Timeout;
-    // Reset the isQuoteExpired if quote fethching restarts
-    if (quotesRefreshCount === 0) {
-      setIsQuoteExpired(false);
-      return () => clearTimeout(timeout);
-    }
-    // After the last quote refresh, set a timeout to expire the quote and disable the CTA
-    if (quotesRefreshCount >= maxRefreshCount && !isQuoteGoingToRefresh) {
-      timeout = setTimeout(() => {
-        setIsQuoteExpired(true);
-      }, refreshRate);
-    }
-    return () => clearTimeout(timeout);
-  }, [isQuoteGoingToRefresh, quotesRefreshCount]);
-
   const label = useMemo(() => {
     if (wasTxDeclined) {
       return t('youDeclinedTheTransaction');
     }
 
-    if (isQuoteExpired && !isNoQuotesAvailable) {
+    if (isQuoteExpired) {
       return t('bridgeQuoteExpired');
     }
 
@@ -149,7 +146,15 @@ export const BridgeCTAButton = () => {
     isQuoteExpired,
   ]);
 
-  return activeQuote && !wasTxDeclined ? (
+  // Label for the secondary button that re-starts quote fetching
+  const secondaryButtonLabel = useMemo(() => {
+    if (wasTxDeclined || isQuoteExpired) {
+      return t('bridgeFetchNewQuotes');
+    }
+    return undefined;
+  }, [wasTxDeclined, isQuoteExpired]);
+
+  return activeQuote && !secondaryButtonLabel ? (
     <ButtonPrimary
       width={BlockSize.Full}
       size={activeQuote ? ButtonPrimarySize.Md : ButtonPrimarySize.Lg}
@@ -186,13 +191,28 @@ export const BridgeCTAButton = () => {
       {label}
     </ButtonPrimary>
   ) : (
-    <Text
-      variant={TextVariant.bodyMd}
-      width={BlockSize.Full}
-      textAlign={TextAlign.Center}
-      color={TextColor.textAlternativeSoft}
+    <Row
+      alignItems={AlignItems.center}
+      justifyContent={JustifyContent.center}
+      gap={1}
     >
-      {label}
-    </Text>
+      <Text
+        variant={TextVariant.bodyMd}
+        textAlign={TextAlign.Center}
+        color={TextColor.textAlternativeSoft}
+      >
+        {label}
+      </Text>
+      {secondaryButtonLabel && (
+        <ButtonLink
+          as="a"
+          variant={TextVariant.bodyMd}
+          style={{ whiteSpace: 'nowrap' }}
+          onClick={onFetchNewQuotes}
+        >
+          {secondaryButtonLabel}
+        </ButtonLink>
+      )}
+    </Row>
   );
 };
diff --git a/ui/pages/bridge/prepare/prepare-bridge-page.tsx b/ui/pages/bridge/prepare/prepare-bridge-page.tsx
index b4774ec5489a..fc076b73629b 100644
--- a/ui/pages/bridge/prepare/prepare-bridge-page.tsx
+++ b/ui/pages/bridge/prepare/prepare-bridge-page.tsx
@@ -67,7 +67,11 @@ import { hexToDecimal } from '../../../../shared/modules/conversion.utils';
 import { QuoteRequest } from '../types';
 import { calcTokenValue } from '../../../../shared/lib/swaps-utils';
 import { BridgeQuoteCard } from '../quotes/bridge-quote-card';
-import { formatTokenAmount, isValidQuoteRequest } from '../utils/quote';
+import {
+  formatTokenAmount,
+  isQuoteExpired as isQuoteExpiredUtil,
+  isValidQuoteRequest,
+} from '../utils/quote';
 import { getProviderConfig } from '../../../../shared/modules/selectors/networks';
 import {
   CrossChainSwapsEventProperties,
@@ -121,12 +125,24 @@ const PrepareBridgePage = () => {
   const slippage = useSelector(getSlippage);
 
   const quoteRequest = useSelector(getQuoteRequest);
-  const { isLoading, activeQuote, isQuoteGoingToRefresh } =
-    useSelector(getBridgeQuotes);
-
+  const {
+    isLoading,
+    activeQuote: activeQuote_,
+    isQuoteGoingToRefresh,
+    quotesLastFetchedMs,
+  } = useSelector(getBridgeQuotes);
   const { refreshRate } = useSelector(getBridgeQuotesConfig);
 
   const wasTxDeclined = useSelector(getWasTxDeclined);
+  // If latest quote is expired and user has sufficient balance
+  // set activeQuote to undefined to hide stale quotes but keep inputs filled
+  const isQuoteExpired = isQuoteExpiredUtil(
+    isQuoteGoingToRefresh,
+    refreshRate,
+    quotesLastFetchedMs,
+  );
+  const activeQuote =
+    isQuoteExpired && !quoteRequest.insufficientBal ? undefined : activeQuote_;
 
   const keyring = useSelector(getCurrentKeyring);
   // @ts-expect-error keyring type is wrong maybe?
@@ -533,9 +549,13 @@ const PrepareBridgePage = () => {
                 backgroundColor={BackgroundColor.primaryMuted}
               />
             )}
-            {!wasTxDeclined && <BridgeQuoteCard />}
+            {!wasTxDeclined && activeQuote && <BridgeQuoteCard />}
             <Footer padding={0} flexDirection={FlexDirection.Column} gap={2}>
-              <BridgeCTAButton />
+              <BridgeCTAButton
+                onFetchNewQuotes={() => {
+                  debouncedUpdateQuoteRequestInController(quoteParams);
+                }}
+              />
               {activeQuote?.approval && fromAmount && fromToken ? (
                 <Row justifyContent={JustifyContent.center} gap={1}>
                   <Text
diff --git a/ui/pages/bridge/utils/quote.ts b/ui/pages/bridge/utils/quote.ts
index b41898167a52..25555a216c7f 100644
--- a/ui/pages/bridge/utils/quote.ts
+++ b/ui/pages/bridge/utils/quote.ts
@@ -12,6 +12,17 @@ import { EtherDenomination } from '../../../../shared/constants/common';
 import { DEFAULT_PRECISION } from '../../../hooks/useCurrencyDisplay';
 import { formatAmount } from '../../confirmations/components/simulation-details/formatAmount';
 
+export const isQuoteExpired = (
+  isQuoteGoingToRefresh: boolean,
+  refreshRate: number,
+  quotesLastFetchedMs?: number,
+) =>
+  Boolean(
+    !isQuoteGoingToRefresh &&
+      quotesLastFetchedMs &&
+      Date.now() - quotesLastFetchedMs > refreshRate,
+  );
+
 export const isNativeAddress = (address?: string | null) =>
   address === zeroAddress() || address === '' || !address;
 

From da16971b40660d5eaeea5818091c717fb8f685c5 Mon Sep 17 00:00:00 2001
From: David Murdoch <187813+davidmurdoch@users.noreply.github.com>
Date: Tue, 17 Dec 2024 12:18:50 -0500
Subject: [PATCH 153/175] refactor: move `getCurrentCurrency` from
 `ui/selectors/selectors.js` to `ui/ducks/metamask/metamask.js` (#27648)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This change is related to circular dependency work; no runtime code has
changed. QA is not required.

This PR moves `getCurrentCurrency` into `ui/ducks/` instead of keeping
it in `ui/selectors/` because `ui/ducks/metamask/metamask.js` already
exports a `getNativeCurrency`, so it seems to fit in well there.


<!--
Please submit this PR as a draft initially.
Do not mark it as "Ready for review" until the template has been
completely filled out, and PR status checks have passed at least once.


## **Description**



[![Open in GitHub
Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/27648?quickstart=1)

## **Related issues**

Fixes:

## **Manual testing steps**

1. Go to this page...
2.
3.

## **Screenshots/Recordings**


### **Before**

### **After**


## **Pre-merge author checklist**

- [ ] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension Coding
Standards](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/CODING_GUIDELINES.md).
- [ ] I've completed the PR template to the best of my ability
- [ ] I’ve included tests if applicable
- [ ] I’ve documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [ ] I’ve applied the right labels on the PR (see [labeling
guidelines](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.

## **Pre-merge reviewer checklist**

- [ ] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed).
- [ ] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.
-->
---
 .../native-token/use-native-token-balance.ts          |  2 +-
 .../asset-list/sort-control/sort-control.test.tsx     |  3 ++-
 .../assets/asset-list/sort-control/sort-control.tsx   |  3 ++-
 .../app/assets/nfts/nft-details/nft-details.tsx       | 11 +++++------
 .../app/assets/token-cell/token-cell.test.tsx         |  2 +-
 ui/components/app/assets/token-cell/token-cell.tsx    |  2 +-
 ui/components/app/currency-input/currency-input.js    |  7 +++++--
 ...gregated-percentage-overview-cross-chains.test.tsx |  7 +++++--
 .../aggregated-percentage-overview-cross-chains.tsx   |  2 +-
 .../aggregated-percentage-overview.test.tsx           |  7 +++++--
 .../aggregated-percentage-overview.tsx                |  2 +-
 .../asset-balance/asset-balance-text.tsx              |  6 ++----
 .../asset-picker-amount/asset-picker-modal/Asset.tsx  |  2 +-
 .../asset-picker-modal/AssetList.tsx                  |  6 ++++--
 .../asset-picker-modal/asset-picker-modal-network.tsx |  2 +-
 .../asset-picker-modal/asset-picker-modal.test.tsx    |  2 +-
 .../asset-picker-modal/asset-picker-modal.tsx         |  2 +-
 .../quote-card/hooks/useEthFeeData.test.tsx           |  2 +-
 .../components/quote-card/hooks/useEthFeeData.tsx     |  2 +-
 .../percentage-and-amount-change.test.tsx             |  4 ++--
 .../percentage-and-amount-change.tsx                  |  2 +-
 ui/ducks/metamask/metamask.js                         |  4 ++++
 ui/ducks/metamask/metamask.test.js                    |  9 +++++++++
 ui/hooks/bridge/events/useConvertedUsdAmounts.ts      |  3 ++-
 ui/hooks/bridge/useBridgeExchangeRates.ts             |  7 ++-----
 ui/hooks/bridge/useTokensWithFiltering.ts             |  6 ++++--
 ui/hooks/useAccountTotalCrossChainFiatBalance.test.ts |  8 +++++---
 ui/hooks/useAccountTotalCrossChainFiatBalance.ts      |  4 +++-
 ui/hooks/useAccountTotalFiatBalance.js                |  2 +-
 ui/hooks/useEthFiatAmount.js                          |  7 +++++--
 ui/hooks/useFiatFormatter.test.ts                     |  4 ++--
 ui/hooks/useFiatFormatter.ts                          |  2 +-
 ui/hooks/useTokenFiatAmount.js                        |  6 ++++--
 ui/hooks/useTokensToSearch.js                         |  7 ++++---
 ui/pages/asset/components/asset-page.tsx              |  6 ++++--
 ui/pages/bridge/prepare/bridge-input-group.tsx        |  3 ++-
 ui/pages/bridge/quotes/bridge-quote-card.tsx          |  7 +++++--
 ui/pages/bridge/quotes/bridge-quotes-modal.tsx        |  7 +++++--
 .../confirm/info/hooks/useFeeCalculations.ts          |  6 ++----
 .../signature-request-header.js                       |  2 +-
 .../simulation-details/useBalanceChanges.test.ts      |  6 ++++--
 .../simulation-details/useBalanceChanges.ts           |  6 ++----
 .../confirmations/confirm-approve/confirm-approve.js  |  6 ++++--
 .../confirm-send-token/confirm-send-token.js          |  2 +-
 .../confirm-token-transaction-base.js                 |  2 +-
 ui/pages/confirmations/hooks/test-utils.js            |  2 +-
 ui/pages/swaps/awaiting-swap/awaiting-swap.js         |  2 +-
 ui/pages/swaps/prepare-swap-page/prepare-swap-page.js |  7 +++++--
 ui/pages/swaps/prepare-swap-page/review-quote.js      |  7 +++++--
 ui/selectors/multichain.test.ts                       | 11 +++++------
 ui/selectors/multichain.ts                            |  2 +-
 ui/selectors/selectors.js                             |  4 ----
 ui/selectors/selectors.test.js                        |  5 -----
 53 files changed, 139 insertions(+), 101 deletions(-)

diff --git a/ui/components/app/assets/asset-list/native-token/use-native-token-balance.ts b/ui/components/app/assets/asset-list/native-token/use-native-token-balance.ts
index 7e7c94e9e1dc..1aa86f3af337 100644
--- a/ui/components/app/assets/asset-list/native-token/use-native-token-balance.ts
+++ b/ui/components/app/assets/asset-list/native-token/use-native-token-balance.ts
@@ -8,10 +8,10 @@ import {
   getMultichainShouldShowFiat,
 } from '../../../../../selectors/multichain';
 import {
-  getCurrentCurrency,
   getPreferences,
   getSelectedInternalAccount,
 } from '../../../../../selectors';
+import { getCurrentCurrency } from '../../../../../ducks/metamask/metamask';
 import { useIsOriginalNativeTokenSymbol } from '../../../../../hooks/useIsOriginalNativeTokenSymbol';
 import { PRIMARY, SECONDARY } from '../../../../../helpers/constants/common';
 import { useUserPreferencedCurrency } from '../../../../../hooks/useUserPreferencedCurrency';
diff --git a/ui/components/app/assets/asset-list/sort-control/sort-control.test.tsx b/ui/components/app/assets/asset-list/sort-control/sort-control.test.tsx
index 4aac598bd838..a74adca65ce9 100644
--- a/ui/components/app/assets/asset-list/sort-control/sort-control.test.tsx
+++ b/ui/components/app/assets/asset-list/sort-control/sort-control.test.tsx
@@ -4,7 +4,8 @@ import { useSelector } from 'react-redux';
 import { setTokenSortConfig } from '../../../../../store/actions';
 import { renderWithProvider } from '../../../../../../test/lib/render-helpers';
 import { MetaMetricsContext } from '../../../../../contexts/metametrics';
-import { getCurrentCurrency, getPreferences } from '../../../../../selectors';
+import { getPreferences } from '../../../../../selectors';
+import { getCurrentCurrency } from '../../../../../ducks/metamask/metamask';
 import SortControl from './sort-control';
 
 // Mock the sortAssets utility
diff --git a/ui/components/app/assets/asset-list/sort-control/sort-control.tsx b/ui/components/app/assets/asset-list/sort-control/sort-control.tsx
index cf7285c9115b..ddded6c1c027 100644
--- a/ui/components/app/assets/asset-list/sort-control/sort-control.tsx
+++ b/ui/components/app/assets/asset-list/sort-control/sort-control.tsx
@@ -18,7 +18,8 @@ import {
   MetaMetricsEventName,
   MetaMetricsUserTrait,
 } from '../../../../../../shared/constants/metametrics';
-import { getCurrentCurrency, getPreferences } from '../../../../../selectors';
+import { getPreferences } from '../../../../../selectors';
+import { getCurrentCurrency } from '../../../../../ducks/metamask/metamask';
 import { useI18nContext } from '../../../../../hooks/useI18nContext';
 import { getCurrencySymbol } from '../../../../../helpers/utils/common.util';
 
diff --git a/ui/components/app/assets/nfts/nft-details/nft-details.tsx b/ui/components/app/assets/nfts/nft-details/nft-details.tsx
index 49408dfd5fa4..3f421615c3cf 100644
--- a/ui/components/app/assets/nfts/nft-details/nft-details.tsx
+++ b/ui/components/app/assets/nfts/nft-details/nft-details.tsx
@@ -21,11 +21,7 @@ import { useI18nContext } from '../../../../../hooks/useI18nContext';
 import { shortenAddress } from '../../../../../helpers/utils/util';
 import { getNftImageAlt } from '../../../../../helpers/utils/nfts';
 import { getCurrentChainId } from '../../../../../../shared/modules/selectors/networks';
-import {
-  getCurrentCurrency,
-  getCurrentNetwork,
-  getIpfsGateway,
-} from '../../../../../selectors';
+import { getCurrentNetwork, getIpfsGateway } from '../../../../../selectors';
 import {
   ASSET_ROUTE,
   DEFAULT_ROUTE,
@@ -67,7 +63,10 @@ import { Content, Footer, Page } from '../../../../multichain/pages/page';
 import { formatCurrency } from '../../../../../helpers/utils/confirm-tx.util';
 import { getShortDateFormatterV2 } from '../../../../../pages/asset/util';
 import { CHAINID_DEFAULT_BLOCK_EXPLORER_URL_MAP } from '../../../../../../shared/constants/common';
-import { getConversionRate } from '../../../../../ducks/metamask/metamask';
+import {
+  getConversionRate,
+  getCurrentCurrency,
+} from '../../../../../ducks/metamask/metamask';
 import { Numeric } from '../../../../../../shared/modules/Numeric';
 // TODO: Remove restricted import
 // eslint-disable-next-line import/no-restricted-paths
diff --git a/ui/components/app/assets/token-cell/token-cell.test.tsx b/ui/components/app/assets/token-cell/token-cell.test.tsx
index 285c3dfac778..d80996776c49 100644
--- a/ui/components/app/assets/token-cell/token-cell.test.tsx
+++ b/ui/components/app/assets/token-cell/token-cell.test.tsx
@@ -5,10 +5,10 @@ import { fireEvent } from '@testing-library/react';
 import { useSelector } from 'react-redux';
 import { renderWithProvider } from '../../../../../test/lib/render-helpers';
 import { useTokenFiatAmount } from '../../../../hooks/useTokenFiatAmount';
+import { getCurrentCurrency } from '../../../../ducks/metamask/metamask';
 import {
   getTokenList,
   getPreferences,
-  getCurrentCurrency,
   getCurrencyRates,
 } from '../../../../selectors';
 import {
diff --git a/ui/components/app/assets/token-cell/token-cell.tsx b/ui/components/app/assets/token-cell/token-cell.tsx
index d470ef3dc21a..c194bdca485c 100644
--- a/ui/components/app/assets/token-cell/token-cell.tsx
+++ b/ui/components/app/assets/token-cell/token-cell.tsx
@@ -1,8 +1,8 @@
 import React from 'react';
 import { useSelector } from 'react-redux';
 import { BigNumber } from 'bignumber.js';
+import { getCurrentCurrency } from '../../../../ducks/metamask/metamask';
 import {
-  getCurrentCurrency,
   getTokenList,
   selectERC20TokensByChain,
   getNativeCurrencyForChain,
diff --git a/ui/components/app/currency-input/currency-input.js b/ui/components/app/currency-input/currency-input.js
index 83bd3c2edce8..e16d95b8bfb7 100644
--- a/ui/components/app/currency-input/currency-input.js
+++ b/ui/components/app/currency-input/currency-input.js
@@ -5,12 +5,15 @@ import { Box } from '../../component-library';
 import { BlockSize } from '../../../helpers/constants/design-system';
 import UnitInput from '../../ui/unit-input';
 import CurrencyDisplay from '../../ui/currency-display';
-import { getNativeCurrency } from '../../../ducks/metamask/metamask';
+import {
+  getNativeCurrency,
+  getCurrentCurrency,
+} from '../../../ducks/metamask/metamask';
 import {
   getProviderConfig,
   getCurrentChainId,
 } from '../../../../shared/modules/selectors/networks';
-import { getCurrentCurrency, getShouldShowFiat } from '../../../selectors';
+import { getShouldShowFiat } from '../../../selectors';
 import { EtherDenomination } from '../../../../shared/constants/common';
 import { Numeric } from '../../../../shared/modules/Numeric';
 import { useIsOriginalNativeTokenSymbol } from '../../../hooks/useIsOriginalNativeTokenSymbol';
diff --git a/ui/components/app/wallet-overview/aggregated-percentage-overview-cross-chains.test.tsx b/ui/components/app/wallet-overview/aggregated-percentage-overview-cross-chains.test.tsx
index 72b2e89e49c6..5f6926f5f616 100644
--- a/ui/components/app/wallet-overview/aggregated-percentage-overview-cross-chains.test.tsx
+++ b/ui/components/app/wallet-overview/aggregated-percentage-overview-cross-chains.test.tsx
@@ -3,7 +3,6 @@ import { render, screen } from '@testing-library/react';
 import '@testing-library/jest-dom';
 import { getIntlLocale } from '../../../ducks/locale/locale';
 import {
-  getCurrentCurrency,
   getSelectedAccount,
   getShouldHideZeroBalanceTokens,
   getPreferences,
@@ -11,6 +10,7 @@ import {
   getAllTokens,
   getChainIdsToPoll,
 } from '../../../selectors';
+import { getCurrentCurrency } from '../../../ducks/metamask/metamask';
 import { useAccountTotalCrossChainFiatBalance } from '../../../hooks/useAccountTotalCrossChainFiatBalance';
 import { getNetworkConfigurationsByChainId } from '../../../../shared/modules/selectors/networks';
 import { AggregatedPercentageOverviewCrossChains } from './aggregated-percentage-overview-cross-chains';
@@ -31,7 +31,6 @@ jest.mock('../../../ducks/locale/locale', () => ({
 }));
 
 jest.mock('../../../selectors', () => ({
-  getCurrentCurrency: jest.fn(),
   getSelectedAccount: jest.fn(),
   getPreferences: jest.fn(),
   getShouldHideZeroBalanceTokens: jest.fn(),
@@ -40,6 +39,10 @@ jest.mock('../../../selectors', () => ({
   getChainIdsToPoll: jest.fn(),
 }));
 
+jest.mock('../../../ducks/metamask/metamask', () => ({
+  getCurrentCurrency: jest.fn(),
+}));
+
 jest.mock('../../../../shared/modules/selectors/networks', () => ({
   getNetworkConfigurationsByChainId: jest.fn(),
 }));
diff --git a/ui/components/app/wallet-overview/aggregated-percentage-overview-cross-chains.tsx b/ui/components/app/wallet-overview/aggregated-percentage-overview-cross-chains.tsx
index 6f7de0c95c7c..5a321c35cf0f 100644
--- a/ui/components/app/wallet-overview/aggregated-percentage-overview-cross-chains.tsx
+++ b/ui/components/app/wallet-overview/aggregated-percentage-overview-cross-chains.tsx
@@ -5,13 +5,13 @@ import { toChecksumAddress } from 'ethereumjs-util';
 import { getNativeTokenAddress } from '@metamask/assets-controllers';
 import { Hex } from '@metamask/utils';
 import {
-  getCurrentCurrency,
   getSelectedAccount,
   getShouldHideZeroBalanceTokens,
   getPreferences,
   getMarketData,
   getChainIdsToPoll,
 } from '../../../selectors';
+import { getCurrentCurrency } from '../../../ducks/metamask/metamask';
 
 // TODO: Remove restricted import
 // eslint-disable-next-line import/no-restricted-paths
diff --git a/ui/components/app/wallet-overview/aggregated-percentage-overview.test.tsx b/ui/components/app/wallet-overview/aggregated-percentage-overview.test.tsx
index 10fd24ec550c..cb6efa2516a9 100644
--- a/ui/components/app/wallet-overview/aggregated-percentage-overview.test.tsx
+++ b/ui/components/app/wallet-overview/aggregated-percentage-overview.test.tsx
@@ -2,8 +2,8 @@ import React from 'react';
 import { render, screen } from '@testing-library/react';
 import '@testing-library/jest-dom';
 import { getIntlLocale } from '../../../ducks/locale/locale';
+import { getCurrentCurrency } from '../../../ducks/metamask/metamask';
 import {
-  getCurrentCurrency,
   getSelectedAccount,
   getShouldHideZeroBalanceTokens,
   getTokensMarketData,
@@ -21,8 +21,11 @@ jest.mock('../../../ducks/locale/locale', () => ({
   getIntlLocale: jest.fn(),
 }));
 
-jest.mock('../../../selectors', () => ({
+jest.mock('../../../ducks/metamask/metamask', () => ({
   getCurrentCurrency: jest.fn(),
+}));
+
+jest.mock('../../../selectors', () => ({
   getSelectedAccount: jest.fn(),
   getPreferences: jest.fn(),
   getShouldHideZeroBalanceTokens: jest.fn(),
diff --git a/ui/components/app/wallet-overview/aggregated-percentage-overview.tsx b/ui/components/app/wallet-overview/aggregated-percentage-overview.tsx
index d50feebbbd74..ad837ccd322c 100644
--- a/ui/components/app/wallet-overview/aggregated-percentage-overview.tsx
+++ b/ui/components/app/wallet-overview/aggregated-percentage-overview.tsx
@@ -3,8 +3,8 @@ import { useSelector } from 'react-redux';
 
 import { toChecksumAddress } from 'ethereumjs-util';
 import { getNativeTokenAddress } from '@metamask/assets-controllers';
+import { getCurrentCurrency } from '../../../ducks/metamask/metamask';
 import {
-  getCurrentCurrency,
   getSelectedAccount,
   getShouldHideZeroBalanceTokens,
   getTokensMarketData,
diff --git a/ui/components/multichain/asset-picker-amount/asset-balance/asset-balance-text.tsx b/ui/components/multichain/asset-picker-amount/asset-balance/asset-balance-text.tsx
index 67def7ee82b1..e5197d50b6b0 100644
--- a/ui/components/multichain/asset-picker-amount/asset-balance/asset-balance-text.tsx
+++ b/ui/components/multichain/asset-picker-amount/asset-balance/asset-balance-text.tsx
@@ -4,10 +4,8 @@ import { Text } from '../../../component-library';
 import UserPreferencedCurrencyDisplay from '../../../app/user-preferenced-currency-display';
 import { PRIMARY } from '../../../../helpers/constants/common';
 import { Asset } from '../../../../ducks/send';
-import {
-  getCurrentCurrency,
-  getSelectedAccountCachedBalance,
-} from '../../../../selectors';
+import { getSelectedAccountCachedBalance } from '../../../../selectors';
+import { getCurrentCurrency } from '../../../../ducks/metamask/metamask';
 import { AssetType } from '../../../../../shared/constants/transaction';
 import {
   TextColor,
diff --git a/ui/components/multichain/asset-picker-amount/asset-picker-modal/Asset.tsx b/ui/components/multichain/asset-picker-amount/asset-picker-modal/Asset.tsx
index 5561af182dc0..e247409f848e 100644
--- a/ui/components/multichain/asset-picker-amount/asset-picker-modal/Asset.tsx
+++ b/ui/components/multichain/asset-picker-amount/asset-picker-modal/Asset.tsx
@@ -1,8 +1,8 @@
 import React from 'react';
 import { useSelector } from 'react-redux';
 import { BigNumber } from 'bignumber.js';
+import { getCurrentCurrency } from '../../../../ducks/metamask/metamask';
 import {
-  getCurrentCurrency,
   getNetworkConfigurationIdByChainId,
   getTokenList,
 } from '../../../../selectors';
diff --git a/ui/components/multichain/asset-picker-amount/asset-picker-modal/AssetList.tsx b/ui/components/multichain/asset-picker-amount/asset-picker-modal/AssetList.tsx
index ece3d7046fde..740425114ab6 100644
--- a/ui/components/multichain/asset-picker-amount/asset-picker-modal/AssetList.tsx
+++ b/ui/components/multichain/asset-picker-amount/asset-picker-modal/AssetList.tsx
@@ -7,11 +7,13 @@ import {
 } from '@metamask/network-controller';
 import { getCurrentChainId } from '../../../../../shared/modules/selectors/networks';
 import {
-  getCurrentCurrency,
   getCurrentNetwork,
   getSelectedAccountCachedBalance,
 } from '../../../../selectors';
-import { getNativeCurrency } from '../../../../ducks/metamask/metamask';
+import {
+  getCurrentCurrency,
+  getNativeCurrency,
+} from '../../../../ducks/metamask/metamask';
 import { useCurrencyDisplay } from '../../../../hooks/useCurrencyDisplay';
 import { AssetType } from '../../../../../shared/constants/transaction';
 import { Box } from '../../../component-library';
diff --git a/ui/components/multichain/asset-picker-amount/asset-picker-modal/asset-picker-modal-network.tsx b/ui/components/multichain/asset-picker-amount/asset-picker-modal/asset-picker-modal-network.tsx
index 7d6963240619..862e8e842b8d 100644
--- a/ui/components/multichain/asset-picker-amount/asset-picker-modal/asset-picker-modal-network.tsx
+++ b/ui/components/multichain/asset-picker-amount/asset-picker-modal/asset-picker-modal-network.tsx
@@ -32,7 +32,7 @@ import { useI18nContext } from '../../../../hooks/useI18nContext';
 ///: END:ONLY_INCLUDE_IF
 import { NetworkListItem } from '../../network-list-item';
 import { getNetworkConfigurationsByChainId } from '../../../../../shared/modules/selectors/networks';
-import { getCurrentCurrency } from '../../../../selectors';
+import { getCurrentCurrency } from '../../../../ducks/metamask/metamask';
 import { formatCurrency } from '../../../../helpers/utils/confirm-tx.util';
 import { useMultichainBalances } from '../../../../hooks/useMultichainBalances';
 import { NETWORK_TO_SHORT_NETWORK_NAME_MAP } from '../../../../../shared/constants/bridge';
diff --git a/ui/components/multichain/asset-picker-amount/asset-picker-modal/asset-picker-modal.test.tsx b/ui/components/multichain/asset-picker-amount/asset-picker-modal/asset-picker-modal.test.tsx
index 8fb933ed2fbb..dfff37c45ad1 100644
--- a/ui/components/multichain/asset-picker-amount/asset-picker-modal/asset-picker-modal.test.tsx
+++ b/ui/components/multichain/asset-picker-amount/asset-picker-modal/asset-picker-modal.test.tsx
@@ -12,7 +12,6 @@ import { renderWithProvider } from '../../../../../test/lib/render-helpers';
 import mockState from '../../../../../test/data/mock-send-state.json';
 import { AssetType } from '../../../../../shared/constants/transaction';
 import {
-  getCurrentCurrency,
   getNativeCurrencyImage,
   getSelectedAccountCachedBalance,
   getSelectedInternalAccount,
@@ -24,6 +23,7 @@ import {
   getConversionRate,
   getNativeCurrency,
   getTokens,
+  getCurrentCurrency,
 } from '../../../../ducks/metamask/metamask';
 import { getTopAssets } from '../../../../ducks/swaps/swaps';
 import { getRenderableTokenData } from '../../../../hooks/useTokensToSearch';
diff --git a/ui/components/multichain/asset-picker-amount/asset-picker-modal/asset-picker-modal.tsx b/ui/components/multichain/asset-picker-amount/asset-picker-modal/asset-picker-modal.tsx
index b8bf0a70d7f5..d3daf33afc84 100644
--- a/ui/components/multichain/asset-picker-amount/asset-picker-modal/asset-picker-modal.tsx
+++ b/ui/components/multichain/asset-picker-amount/asset-picker-modal/asset-picker-modal.tsx
@@ -36,7 +36,6 @@ import {
 } from '../../../../../shared/modules/selectors/networks';
 import {
   getAllTokens,
-  getCurrentCurrency,
   getNativeCurrencyImage,
   getSelectedAccountCachedBalance,
   getSelectedInternalAccount,
@@ -46,6 +45,7 @@ import {
 } from '../../../../selectors';
 import {
   getConversionRate,
+  getCurrentCurrency,
   getNativeCurrency,
 } from '../../../../ducks/metamask/metamask';
 import { useTokenTracker } from '../../../../hooks/useTokenTracker';
diff --git a/ui/components/multichain/pages/send/components/quote-card/hooks/useEthFeeData.test.tsx b/ui/components/multichain/pages/send/components/quote-card/hooks/useEthFeeData.test.tsx
index 1ef3347e3133..9fa58e610bba 100644
--- a/ui/components/multichain/pages/send/components/quote-card/hooks/useEthFeeData.test.tsx
+++ b/ui/components/multichain/pages/send/components/quote-card/hooks/useEthFeeData.test.tsx
@@ -4,10 +4,10 @@ import {
   getNativeCurrency,
   getConversionRate,
   getGasFeeEstimates,
+  getCurrentCurrency,
 } from '../../../../../../../ducks/metamask/metamask';
 import { getUsedSwapsGasPrice } from '../../../../../../../ducks/swaps/swaps';
 import {
-  getCurrentCurrency,
   checkNetworkAndAccountSupports1559,
   getIsSwapsChain,
 } from '../../../../../../../selectors';
diff --git a/ui/components/multichain/pages/send/components/quote-card/hooks/useEthFeeData.tsx b/ui/components/multichain/pages/send/components/quote-card/hooks/useEthFeeData.tsx
index 04fa59ce072a..f08ab47086a9 100644
--- a/ui/components/multichain/pages/send/components/quote-card/hooks/useEthFeeData.tsx
+++ b/ui/components/multichain/pages/send/components/quote-card/hooks/useEthFeeData.tsx
@@ -6,10 +6,10 @@ import {
   getConversionRate,
   getGasFeeEstimates,
   getNativeCurrency,
+  getCurrentCurrency,
 } from '../../../../../../../ducks/metamask/metamask';
 import { EtherDenomination } from '../../../../../../../../shared/constants/common';
 import {
-  getCurrentCurrency,
   checkNetworkAndAccountSupports1559,
   getIsSwapsChain,
 } from '../../../../../../../selectors/selectors';
diff --git a/ui/components/multichain/token-list-item/price/percentage-and-amount-change/percentage-and-amount-change.test.tsx b/ui/components/multichain/token-list-item/price/percentage-and-amount-change/percentage-and-amount-change.test.tsx
index f157afa64d8b..53ff99bd5d06 100644
--- a/ui/components/multichain/token-list-item/price/percentage-and-amount-change/percentage-and-amount-change.test.tsx
+++ b/ui/components/multichain/token-list-item/price/percentage-and-amount-change/percentage-and-amount-change.test.tsx
@@ -5,13 +5,13 @@ import { zeroAddress } from 'ethereumjs-util';
 import { MarketDataDetails } from '@metamask/assets-controllers';
 import { getIntlLocale } from '../../../../../ducks/locale/locale';
 import {
-  getCurrentCurrency,
   getSelectedAccountCachedBalance,
   getTokensMarketData,
 } from '../../../../../selectors';
 import { getCurrentChainId } from '../../../../../../shared/modules/selectors/networks';
 import {
   getConversionRate,
+  getCurrentCurrency,
   getNativeCurrency,
 } from '../../../../../ducks/metamask/metamask';
 import { PercentageAndAmountChange } from './percentage-and-amount-change';
@@ -25,7 +25,6 @@ jest.mock('../../../../../ducks/locale/locale', () => ({
 }));
 
 jest.mock('../../../../../selectors', () => ({
-  getCurrentCurrency: jest.fn(),
   getSelectedAccountCachedBalance: jest.fn(),
   getTokensMarketData: jest.fn(),
 }));
@@ -35,6 +34,7 @@ jest.mock('../../../../../../shared/modules/selectors/networks', () => ({
 }));
 
 jest.mock('../../../../../ducks/metamask/metamask', () => ({
+  getCurrentCurrency: jest.fn(),
   getConversionRate: jest.fn(),
   getNativeCurrency: jest.fn(),
 }));
diff --git a/ui/components/multichain/token-list-item/price/percentage-and-amount-change/percentage-and-amount-change.tsx b/ui/components/multichain/token-list-item/price/percentage-and-amount-change/percentage-and-amount-change.tsx
index dc0aeaa5a25c..c0c3e83addb7 100644
--- a/ui/components/multichain/token-list-item/price/percentage-and-amount-change/percentage-and-amount-change.tsx
+++ b/ui/components/multichain/token-list-item/price/percentage-and-amount-change/percentage-and-amount-change.tsx
@@ -11,7 +11,6 @@ import {
 } from '../../../../../helpers/constants/design-system';
 import { getCurrentChainId } from '../../../../../../shared/modules/selectors/networks';
 import {
-  getCurrentCurrency,
   getSelectedAccountCachedBalance,
   getTokensMarketData,
 } from '../../../../../selectors';
@@ -20,6 +19,7 @@ import { EtherDenomination } from '../../../../../../shared/constants/common';
 import { Numeric } from '../../../../../../shared/modules/Numeric';
 import {
   getConversionRate,
+  getCurrentCurrency,
   getNativeCurrency,
 } from '../../../../../ducks/metamask/metamask';
 import {
diff --git a/ui/ducks/metamask/metamask.js b/ui/ducks/metamask/metamask.js
index 93550d45fc10..f3453b77e7d9 100644
--- a/ui/ducks/metamask/metamask.js
+++ b/ui/ducks/metamask/metamask.js
@@ -604,3 +604,7 @@ export function doesUserHaveALedgerAccount(state) {
     return kr.type === KeyringType.ledger;
   });
 }
+
+export function getCurrentCurrency(state) {
+  return state.metamask.currentCurrency;
+}
diff --git a/ui/ducks/metamask/metamask.test.js b/ui/ducks/metamask/metamask.test.js
index 5f3021297c96..5d5a5ea3030f 100644
--- a/ui/ducks/metamask/metamask.test.js
+++ b/ui/ducks/metamask/metamask.test.js
@@ -21,6 +21,7 @@ import reduceMetamask, {
   getSendHexDataFeatureFlagState,
   getSendToAccounts,
   isNotEIP1559Network,
+  getCurrentCurrency,
 } from './metamask';
 
 jest.mock('@metamask/transaction-controller', () => ({
@@ -126,6 +127,7 @@ describe('MetaMask Reducers', () => {
             conversionRate: 1200.88200327,
           },
         },
+        currentCurrency: 'usd',
         ...mockNetworkState({ chainId: CHAIN_IDS.GOERLI }),
         accounts: {
           '0xfdea65c8e26263f6d9a1b5de9555d2931a33b825': {
@@ -384,6 +386,13 @@ describe('MetaMask Reducers', () => {
       });
     });
 
+    describe('getCurrentCurrency', () => {
+      it('should return the `currentCurrency`', () => {
+        const currentCurrency = getCurrentCurrency(mockState);
+        expect(currentCurrency).toStrictEqual('usd');
+      });
+    });
+
     describe('getSendHexDataFeatureFlagState()', () => {
       it('should return the sendHexData feature flag state', () => {
         expect(getSendHexDataFeatureFlagState(mockState)).toStrictEqual(true);
diff --git a/ui/hooks/bridge/events/useConvertedUsdAmounts.ts b/ui/hooks/bridge/events/useConvertedUsdAmounts.ts
index 7ad432579c43..5afbfa6d0e23 100644
--- a/ui/hooks/bridge/events/useConvertedUsdAmounts.ts
+++ b/ui/hooks/bridge/events/useConvertedUsdAmounts.ts
@@ -8,7 +8,8 @@ import {
   getToTokenConversionRate,
   getFromAmount,
 } from '../../../ducks/bridge/selectors';
-import { getCurrentCurrency, getUSDConversionRate } from '../../../selectors';
+import { getCurrentCurrency } from '../../../ducks/metamask/metamask';
+import { getUSDConversionRate } from '../../../selectors';
 import { tokenAmountToCurrency } from '../../../ducks/bridge/utils';
 
 const USD_CURRENCY_CODE = 'usd';
diff --git a/ui/hooks/bridge/useBridgeExchangeRates.ts b/ui/hooks/bridge/useBridgeExchangeRates.ts
index 20f70b17dfd6..c2755ffda9ee 100644
--- a/ui/hooks/bridge/useBridgeExchangeRates.ts
+++ b/ui/hooks/bridge/useBridgeExchangeRates.ts
@@ -5,11 +5,8 @@ import {
   getQuoteRequest,
   getToChain,
 } from '../../ducks/bridge/selectors';
-import {
-  getCurrentCurrency,
-  getMarketData,
-  getParticipateInMetaMetrics,
-} from '../../selectors';
+import { getMarketData, getParticipateInMetaMetrics } from '../../selectors';
+import { getCurrentCurrency } from '../../ducks/metamask/metamask';
 import { decimalToPrefixedHex } from '../../../shared/modules/conversion.utils';
 import { getCurrentChainId } from '../../../shared/modules/selectors/networks';
 import {
diff --git a/ui/hooks/bridge/useTokensWithFiltering.ts b/ui/hooks/bridge/useTokensWithFiltering.ts
index 56b16ddc4b68..61a92b7b9190 100644
--- a/ui/hooks/bridge/useTokensWithFiltering.ts
+++ b/ui/hooks/bridge/useTokensWithFiltering.ts
@@ -7,11 +7,13 @@ import { useParams } from 'react-router-dom';
 import { zeroAddress } from 'ethereumjs-util';
 import {
   getAllDetectedTokensForSelectedAddress,
-  getCurrentCurrency,
   getSelectedInternalAccountWithBalance,
   getTokenExchangeRates,
 } from '../../selectors';
-import { getConversionRate } from '../../ducks/metamask/metamask';
+import {
+  getConversionRate,
+  getCurrentCurrency,
+} from '../../ducks/metamask/metamask';
 import { SwapsTokenObject } from '../../../shared/constants/swaps';
 import {
   AssetWithDisplayData,
diff --git a/ui/hooks/useAccountTotalCrossChainFiatBalance.test.ts b/ui/hooks/useAccountTotalCrossChainFiatBalance.test.ts
index b41fc38a9930..978b3ef8f098 100644
--- a/ui/hooks/useAccountTotalCrossChainFiatBalance.test.ts
+++ b/ui/hooks/useAccountTotalCrossChainFiatBalance.test.ts
@@ -2,11 +2,13 @@
 import { renderHook } from '@testing-library/react-hooks';
 import { act } from 'react-dom/test-utils';
 import {
-  getCurrentCurrency,
   getCrossChainTokenExchangeRates,
   getCrossChainMetaMaskCachedBalances,
 } from '../selectors';
-import { getCurrencyRates } from '../ducks/metamask/metamask';
+import {
+  getCurrentCurrency,
+  getCurrencyRates,
+} from '../ducks/metamask/metamask';
 import { getNetworkConfigurationsByChainId } from '../../shared/modules/selectors/networks';
 import {
   FormattedTokensWithBalances,
@@ -18,11 +20,11 @@ jest.mock('react-redux', () => ({
 }));
 
 jest.mock('../selectors', () => ({
-  getCurrentCurrency: jest.fn(),
   getCrossChainTokenExchangeRates: jest.fn(),
   getCrossChainMetaMaskCachedBalances: jest.fn(),
 }));
 jest.mock('../ducks/metamask/metamask', () => ({
+  getCurrentCurrency: jest.fn(),
   getCurrencyRates: jest.fn(),
 }));
 jest.mock('../../shared/modules/selectors/networks', () => ({
diff --git a/ui/hooks/useAccountTotalCrossChainFiatBalance.ts b/ui/hooks/useAccountTotalCrossChainFiatBalance.ts
index ac5658278946..aa82f7823f44 100644
--- a/ui/hooks/useAccountTotalCrossChainFiatBalance.ts
+++ b/ui/hooks/useAccountTotalCrossChainFiatBalance.ts
@@ -2,6 +2,9 @@ import { shallowEqual, useSelector } from 'react-redux';
 import { toChecksumAddress } from 'ethereumjs-util';
 import {
   getCurrentCurrency,
+  getCurrencyRates,
+} from '../ducks/metamask/metamask';
+import {
   getCrossChainTokenExchangeRates,
   getCrossChainMetaMaskCachedBalances,
 } from '../selectors';
@@ -9,7 +12,6 @@ import {
   getValueFromWeiHex,
   sumDecimals,
 } from '../../shared/modules/conversion.utils';
-import { getCurrencyRates } from '../ducks/metamask/metamask';
 import { getTokenFiatAmount } from '../helpers/utils/token-util';
 import { TokenWithBalance } from '../components/app/assets/asset-list/asset-list';
 import { getNetworkConfigurationsByChainId } from '../../shared/modules/selectors/networks';
diff --git a/ui/hooks/useAccountTotalFiatBalance.js b/ui/hooks/useAccountTotalFiatBalance.js
index 1c86b29ea8ea..08c2f9eeb5f2 100644
--- a/ui/hooks/useAccountTotalFiatBalance.js
+++ b/ui/hooks/useAccountTotalFiatBalance.js
@@ -3,7 +3,6 @@ import { toChecksumAddress } from 'ethereumjs-util';
 import { getCurrentChainId } from '../../shared/modules/selectors/networks';
 import {
   getAllTokens,
-  getCurrentCurrency,
   getMetaMaskCachedBalances,
   getTokenExchangeRates,
   getConfirmationExchangeRates,
@@ -18,6 +17,7 @@ import {
 import {
   getConversionRate,
   getNativeCurrency,
+  getCurrentCurrency,
 } from '../ducks/metamask/metamask';
 import { formatCurrency } from '../helpers/utils/confirm-tx.util';
 import { getTokenFiatAmount } from '../helpers/utils/token-util';
diff --git a/ui/hooks/useEthFiatAmount.js b/ui/hooks/useEthFiatAmount.js
index de6d4488e84f..dadb634cdf86 100644
--- a/ui/hooks/useEthFiatAmount.js
+++ b/ui/hooks/useEthFiatAmount.js
@@ -1,8 +1,11 @@
 import { useMemo } from 'react';
 import { useSelector } from 'react-redux';
-import { getCurrentCurrency, getShouldShowFiat } from '../selectors';
+import { getShouldShowFiat } from '../selectors';
 import { formatCurrency } from '../helpers/utils/confirm-tx.util';
-import { getConversionRate } from '../ducks/metamask/metamask';
+import {
+  getConversionRate,
+  getCurrentCurrency,
+} from '../ducks/metamask/metamask';
 import { decEthToConvertedCurrency } from '../../shared/modules/conversion.utils';
 
 /**
diff --git a/ui/hooks/useFiatFormatter.test.ts b/ui/hooks/useFiatFormatter.test.ts
index 7e6423f1df34..51b896e5bc10 100644
--- a/ui/hooks/useFiatFormatter.test.ts
+++ b/ui/hooks/useFiatFormatter.test.ts
@@ -1,6 +1,6 @@
 import { renderHook } from '@testing-library/react-hooks';
 import { getIntlLocale } from '../ducks/locale/locale';
-import { getCurrentCurrency } from '../selectors';
+import { getCurrentCurrency } from '../ducks/metamask/metamask';
 import { useFiatFormatter } from './useFiatFormatter';
 
 jest.mock('react-redux', () => ({
@@ -11,7 +11,7 @@ jest.mock('../ducks/locale/locale', () => ({
   getIntlLocale: jest.fn(),
 }));
 
-jest.mock('../selectors', () => ({
+jest.mock('../ducks/metamask/metamask', () => ({
   getCurrentCurrency: jest.fn(),
 }));
 
diff --git a/ui/hooks/useFiatFormatter.ts b/ui/hooks/useFiatFormatter.ts
index 0c9bd33ffee5..c671db5668b5 100644
--- a/ui/hooks/useFiatFormatter.ts
+++ b/ui/hooks/useFiatFormatter.ts
@@ -1,6 +1,6 @@
 import { useSelector } from 'react-redux';
 import { getIntlLocale } from '../ducks/locale/locale';
-import { getCurrentCurrency } from '../selectors';
+import { getCurrentCurrency } from '../ducks/metamask/metamask';
 import { shortenString } from '../helpers/utils/util';
 
 /**
diff --git a/ui/hooks/useTokenFiatAmount.js b/ui/hooks/useTokenFiatAmount.js
index 325dbf5eea22..6f48715b7fae 100644
--- a/ui/hooks/useTokenFiatAmount.js
+++ b/ui/hooks/useTokenFiatAmount.js
@@ -2,7 +2,6 @@ import { useMemo } from 'react';
 import { shallowEqual, useSelector } from 'react-redux';
 import {
   getTokenExchangeRates,
-  getCurrentCurrency,
   getShouldShowFiat,
   getConfirmationExchangeRates,
   getMarketData,
@@ -10,7 +9,10 @@ import {
 } from '../selectors';
 import { getNetworkConfigurationsByChainId } from '../../shared/modules/selectors/networks';
 import { getTokenFiatAmount } from '../helpers/utils/token-util';
-import { getConversionRate } from '../ducks/metamask/metamask';
+import {
+  getConversionRate,
+  getCurrentCurrency,
+} from '../ducks/metamask/metamask';
 import { isEqualCaseInsensitive } from '../../shared/modules/string-utils';
 
 /**
diff --git a/ui/hooks/useTokensToSearch.js b/ui/hooks/useTokensToSearch.js
index bf37f6cb08fe..657bb0afed09 100644
--- a/ui/hooks/useTokensToSearch.js
+++ b/ui/hooks/useTokensToSearch.js
@@ -6,13 +6,14 @@ import { formatIconUrlWithProxy } from '@metamask/assets-controllers';
 import { getTokenFiatAmount } from '../helpers/utils/token-util';
 import {
   getTokenExchangeRates,
-  getCurrentCurrency,
   getSwapsDefaultToken,
   getTokenList,
 } from '../selectors';
 import { getCurrentChainId } from '../../shared/modules/selectors/networks';
-import { getConversionRate } from '../ducks/metamask/metamask';
-
+import {
+  getConversionRate,
+  getCurrentCurrency,
+} from '../ducks/metamask/metamask';
 import { getSwapsTokens } from '../ducks/swaps/swaps';
 import { isSwapsDefaultTokenSymbol } from '../../shared/modules/swaps.utils';
 import { toChecksumHexAddress } from '../../shared/modules/hexstring-utils';
diff --git a/ui/pages/asset/components/asset-page.tsx b/ui/pages/asset/components/asset-page.tsx
index 566a85d3c02e..79cf2510f015 100644
--- a/ui/pages/asset/components/asset-page.tsx
+++ b/ui/pages/asset/components/asset-page.tsx
@@ -6,7 +6,6 @@ import { isEqual } from 'lodash';
 import { getNativeTokenAddress } from '@metamask/assets-controllers';
 import { Hex } from '@metamask/utils';
 import {
-  getCurrentCurrency,
   getDataCollectionForMarketing,
   getIsBridgeChain,
   getIsSwapsChain,
@@ -45,7 +44,10 @@ import TokenCell from '../../../components/app/assets/token-cell';
 import TransactionList from '../../../components/app/transaction-list';
 import { getPricePrecision, localizeLargeNumber } from '../util';
 import { DEFAULT_ROUTE } from '../../../helpers/constants/routes';
-import { getConversionRate } from '../../../ducks/metamask/metamask';
+import {
+  getConversionRate,
+  getCurrentCurrency,
+} from '../../../ducks/metamask/metamask';
 import { toChecksumHexAddress } from '../../../../shared/modules/hexstring-utils';
 import CoinButtons from '../../../components/app/wallet-overview/coin-buttons';
 import { getIsNativeTokenBuyable } from '../../../ducks/ramps';
diff --git a/ui/pages/bridge/prepare/bridge-input-group.tsx b/ui/pages/bridge/prepare/bridge-input-group.tsx
index c4502725c1ea..1734624b7dcc 100644
--- a/ui/pages/bridge/prepare/bridge-input-group.tsx
+++ b/ui/pages/bridge/prepare/bridge-input-group.tsx
@@ -14,7 +14,8 @@ import {
 import { AssetPicker } from '../../../components/multichain/asset-picker-amount/asset-picker';
 import { TabName } from '../../../components/multichain/asset-picker-amount/asset-picker-modal/asset-picker-modal-tabs';
 import { useI18nContext } from '../../../hooks/useI18nContext';
-import { getCurrentCurrency, getLocale } from '../../../selectors';
+import { getLocale } from '../../../selectors';
+import { getCurrentCurrency } from '../../../ducks/metamask/metamask';
 import { formatCurrencyAmount, formatTokenAmount } from '../utils/quote';
 import { Column, Row, Tooltip } from '../layout';
 import {
diff --git a/ui/pages/bridge/quotes/bridge-quote-card.tsx b/ui/pages/bridge/quotes/bridge-quote-card.tsx
index b08b86b24597..27bea89bec18 100644
--- a/ui/pages/bridge/quotes/bridge-quote-card.tsx
+++ b/ui/pages/bridge/quotes/bridge-quote-card.tsx
@@ -21,8 +21,10 @@ import {
   formatTokenAmount,
   formatEtaInMinutes,
 } from '../utils/quote';
-import { getCurrentCurrency, getLocale } from '../../../selectors';
-import { getNativeCurrency } from '../../../ducks/metamask/metamask';
+import {
+  getCurrentCurrency,
+  getNativeCurrency,
+} from '../../../ducks/metamask/metamask';
 import { useCrossChainSwapsEventTracker } from '../../../hooks/bridge/useCrossChainSwapsEventTracker';
 import { useRequestProperties } from '../../../hooks/bridge/events/useRequestProperties';
 import { useRequestMetadataProperties } from '../../../hooks/bridge/events/useRequestMetadataProperties';
@@ -45,6 +47,7 @@ import {
 import { CHAIN_ID_TO_NETWORK_IMAGE_URL_MAP } from '../../../../shared/constants/network';
 import { decimalToPrefixedHex } from '../../../../shared/modules/conversion.utils';
 import { TERMS_OF_USE_LINK } from '../../../../shared/constants/terms';
+import { getLocale } from '../../../selectors';
 import { BridgeQuotesModal } from './bridge-quotes-modal';
 
 export const BridgeQuoteCard = () => {
diff --git a/ui/pages/bridge/quotes/bridge-quotes-modal.tsx b/ui/pages/bridge/quotes/bridge-quotes-modal.tsx
index c9faa50bceb4..aaabfe8f5ddb 100644
--- a/ui/pages/bridge/quotes/bridge-quotes-modal.tsx
+++ b/ui/pages/bridge/quotes/bridge-quotes-modal.tsx
@@ -24,7 +24,7 @@ import {
   formatTokenAmount,
 } from '../utils/quote';
 import { useI18nContext } from '../../../hooks/useI18nContext';
-import { getCurrentCurrency, getLocale } from '../../../selectors';
+import { getLocale } from '../../../selectors';
 import { setSelectedQuote, setSortOrder } from '../../../ducks/bridge/actions';
 import { QuoteMetadata, QuoteResponse, SortOrder } from '../types';
 import {
@@ -32,7 +32,10 @@ import {
   getBridgeSortOrder,
 } from '../../../ducks/bridge/selectors';
 import { Column, Row } from '../layout';
-import { getNativeCurrency } from '../../../ducks/metamask/metamask';
+import {
+  getCurrentCurrency,
+  getNativeCurrency,
+} from '../../../ducks/metamask/metamask';
 import { useQuoteProperties } from '../../../hooks/bridge/events/useQuoteProperties';
 import { useRequestMetadataProperties } from '../../../hooks/bridge/events/useRequestMetadataProperties';
 import { useRequestProperties } from '../../../hooks/bridge/events/useRequestProperties';
diff --git a/ui/pages/confirmations/components/confirm/info/hooks/useFeeCalculations.ts b/ui/pages/confirmations/components/confirm/info/hooks/useFeeCalculations.ts
index 47dda13f9511..5f6fa8eed278 100644
--- a/ui/pages/confirmations/components/confirm/info/hooks/useFeeCalculations.ts
+++ b/ui/pages/confirmations/components/confirm/info/hooks/useFeeCalculations.ts
@@ -14,10 +14,8 @@ import {
 import { Numeric } from '../../../../../../../shared/modules/Numeric';
 import { useFiatFormatter } from '../../../../../../hooks/useFiatFormatter';
 import { useGasFeeEstimates } from '../../../../../../hooks/useGasFeeEstimates';
-import {
-  getCurrentCurrency,
-  selectConversionRateByChainId,
-} from '../../../../../../selectors';
+import { getCurrentCurrency } from '../../../../../../ducks/metamask/metamask';
+import { selectConversionRateByChainId } from '../../../../../../selectors';
 import { getMultichainNetwork } from '../../../../../../selectors/multichain';
 import { HEX_ZERO } from '../shared/constants';
 import { useEIP1559TxFees } from './useEIP1559TxFees';
diff --git a/ui/pages/confirmations/components/signature-request-header/signature-request-header.js b/ui/pages/confirmations/components/signature-request-header/signature-request-header.js
index 61cbfe13e290..db08d11b55b9 100644
--- a/ui/pages/confirmations/components/signature-request-header/signature-request-header.js
+++ b/ui/pages/confirmations/components/signature-request-header/signature-request-header.js
@@ -5,9 +5,9 @@ import { RpcEndpointType } from '@metamask/network-controller';
 import { NetworkType } from '@metamask/controller-utils';
 import { useI18nContext } from '../../../../hooks/useI18nContext';
 
+import { getCurrentCurrency } from '../../../../ducks/metamask/metamask';
 import {
   accountsWithSendEtherInfoSelector,
-  getCurrentCurrency,
   selectDefaultRpcEndpointByChainId,
   selectNetworkConfigurationByChainId,
 } from '../../../../selectors';
diff --git a/ui/pages/confirmations/components/simulation-details/useBalanceChanges.test.ts b/ui/pages/confirmations/components/simulation-details/useBalanceChanges.test.ts
index 5f2e1dcbfd16..4fd5f75e8d8f 100644
--- a/ui/pages/confirmations/components/simulation-details/useBalanceChanges.test.ts
+++ b/ui/pages/confirmations/components/simulation-details/useBalanceChanges.test.ts
@@ -17,9 +17,11 @@ jest.mock('react-redux', () => ({
   useSelector: jest.fn((selector) => selector()),
 }));
 
-jest.mock('../../../../selectors', () => ({
-  getCurrentChainId: jest.fn(),
+jest.mock('../../../../ducks/metamask/metamask', () => ({
   getCurrentCurrency: jest.fn(),
+}));
+
+jest.mock('../../../../selectors', () => ({
   selectConversionRateByChainId: jest.fn(),
 }));
 
diff --git a/ui/pages/confirmations/components/simulation-details/useBalanceChanges.ts b/ui/pages/confirmations/components/simulation-details/useBalanceChanges.ts
index 666682c95c76..7ca29f9a58d6 100644
--- a/ui/pages/confirmations/components/simulation-details/useBalanceChanges.ts
+++ b/ui/pages/confirmations/components/simulation-details/useBalanceChanges.ts
@@ -10,10 +10,8 @@ import { BigNumber } from 'bignumber.js';
 import { ContractExchangeRates } from '@metamask/assets-controllers';
 import { useAsyncResultOrThrow } from '../../../../hooks/useAsyncResult';
 import { TokenStandard } from '../../../../../shared/constants/transaction';
-import {
-  getCurrentCurrency,
-  selectConversionRateByChainId,
-} from '../../../../selectors';
+import { getCurrentCurrency } from '../../../../ducks/metamask/metamask';
+import { selectConversionRateByChainId } from '../../../../selectors';
 import { fetchTokenExchangeRates } from '../../../../helpers/utils/util';
 import { ERC20_DEFAULT_DECIMALS, fetchErc20Decimals } from '../../utils/token';
 
diff --git a/ui/pages/confirmations/confirm-approve/confirm-approve.js b/ui/pages/confirmations/confirm-approve/confirm-approve.js
index e167c15196ba..aa7cc1216393 100644
--- a/ui/pages/confirmations/confirm-approve/confirm-approve.js
+++ b/ui/pages/confirmations/confirm-approve/confirm-approve.js
@@ -12,10 +12,12 @@ import { getTokenApprovedParam } from '../../../helpers/utils/token-util';
 import { readAddressAsContract } from '../../../../shared/modules/contract-utils';
 import { GasFeeContextProvider } from '../../../contexts/gasFee';
 import { TransactionModalContextProvider } from '../../../contexts/transaction-modal';
-import { isAddressLedger } from '../../../ducks/metamask/metamask';
-import ConfirmContractInteraction from '../confirm-contract-interaction';
 import {
+  isAddressLedger,
   getCurrentCurrency,
+} from '../../../ducks/metamask/metamask';
+import ConfirmContractInteraction from '../confirm-contract-interaction';
+import {
   getSubjectMetadata,
   getUseNonceField,
   getCustomNonceValue,
diff --git a/ui/pages/confirmations/confirm-send-token/confirm-send-token.js b/ui/pages/confirmations/confirm-send-token/confirm-send-token.js
index 4e68783e9be7..b3b13622ea3e 100644
--- a/ui/pages/confirmations/confirm-send-token/confirm-send-token.js
+++ b/ui/pages/confirmations/confirm-send-token/confirm-send-token.js
@@ -7,10 +7,10 @@ import { SEND_ROUTE } from '../../../helpers/constants/routes';
 import { editExistingTransaction } from '../../../ducks/send';
 import {
   contractExchangeRateSelector,
-  getCurrentCurrency,
   selectConversionRateByChainId,
   selectNetworkConfigurationByChainId,
 } from '../../../selectors';
+import { getCurrentCurrency } from '../../../ducks/metamask/metamask';
 import { clearConfirmTransaction } from '../../../ducks/confirm-transaction/confirm-transaction.duck';
 import { showSendTokenPage } from '../../../store/actions';
 import {
diff --git a/ui/pages/confirmations/confirm-token-transaction-base/confirm-token-transaction-base.js b/ui/pages/confirmations/confirm-token-transaction-base/confirm-token-transaction-base.js
index 077d5c757dcb..d5af4bdf8cad 100644
--- a/ui/pages/confirmations/confirm-token-transaction-base/confirm-token-transaction-base.js
+++ b/ui/pages/confirmations/confirm-token-transaction-base/confirm-token-transaction-base.js
@@ -15,12 +15,12 @@ import {
 import { PRIMARY } from '../../../helpers/constants/common';
 import {
   contractExchangeRateSelector,
-  getCurrentCurrency,
   getSelectedInternalAccount,
   selectConversionRateByChainId,
   selectNetworkConfigurationByChainId,
   selectNftContractsByChainId,
 } from '../../../selectors';
+import { getCurrentCurrency } from '../../../ducks/metamask/metamask';
 import { TokenStandard } from '../../../../shared/constants/transaction';
 import {
   getWeiHexFromDecimalValue,
diff --git a/ui/pages/confirmations/hooks/test-utils.js b/ui/pages/confirmations/hooks/test-utils.js
index 0cda95770107..e4749f40e194 100644
--- a/ui/pages/confirmations/hooks/test-utils.js
+++ b/ui/pages/confirmations/hooks/test-utils.js
@@ -3,8 +3,8 @@ import { useSelector } from 'react-redux';
 import { useMultichainSelector } from '../../../hooks/useMultichainSelector';
 
 import { GasEstimateTypes } from '../../../../shared/constants/gas';
+import { getCurrentCurrency } from '../../../ducks/metamask/metamask';
 import {
-  getCurrentCurrency,
   getShouldShowFiat,
   txDataSelector,
   getCurrentKeyring,
diff --git a/ui/pages/swaps/awaiting-swap/awaiting-swap.js b/ui/pages/swaps/awaiting-swap/awaiting-swap.js
index d39608d49d2b..8f5f74a907bc 100644
--- a/ui/pages/swaps/awaiting-swap/awaiting-swap.js
+++ b/ui/pages/swaps/awaiting-swap/awaiting-swap.js
@@ -13,8 +13,8 @@ import {
   MetaMetricsEventName,
 } from '../../../../shared/constants/metametrics';
 import { getCurrentChainId } from '../../../../shared/modules/selectors/networks';
+import { getCurrentCurrency } from '../../../ducks/metamask/metamask';
 import {
-  getCurrentCurrency,
   getRpcPrefsForCurrentProvider,
   getUSDConversionRate,
   isHardwareWallet,
diff --git a/ui/pages/swaps/prepare-swap-page/prepare-swap-page.js b/ui/pages/swaps/prepare-swap-page/prepare-swap-page.js
index 2bcc2672e335..e85cbfc6eb09 100644
--- a/ui/pages/swaps/prepare-swap-page/prepare-swap-page.js
+++ b/ui/pages/swaps/prepare-swap-page/prepare-swap-page.js
@@ -14,7 +14,11 @@ import {
 } from '../../../hooks/useTokensToSearch';
 import { useEqualityCheck } from '../../../hooks/useEqualityCheck';
 import { I18nContext } from '../../../contexts/i18n';
-import { getTokens, getConversionRate } from '../../../ducks/metamask/metamask';
+import {
+  getTokens,
+  getConversionRate,
+  getCurrentCurrency,
+} from '../../../ducks/metamask/metamask';
 import Box from '../../../components/ui/box';
 import {
   DISPLAY,
@@ -58,7 +62,6 @@ import { getCurrentChainId } from '../../../../shared/modules/selectors/networks
 import {
   getSwapsDefaultToken,
   getTokenExchangeRates,
-  getCurrentCurrency,
   getRpcPrefsForCurrentProvider,
   getTokenList,
   isHardwareWallet,
diff --git a/ui/pages/swaps/prepare-swap-page/review-quote.js b/ui/pages/swaps/prepare-swap-page/review-quote.js
index 96c7cf9ac4c8..6575878d9992 100644
--- a/ui/pages/swaps/prepare-swap-page/review-quote.js
+++ b/ui/pages/swaps/prepare-swap-page/review-quote.js
@@ -49,7 +49,6 @@ import { getCurrentChainId } from '../../../../shared/modules/selectors/networks
 import {
   conversionRateSelector,
   getSelectedAccount,
-  getCurrentCurrency,
   getTokenExchangeRates,
   getSwapsDefaultToken,
   isHardwareWallet,
@@ -62,7 +61,11 @@ import {
   getSmartTransactionsEnabled,
   getSmartTransactionsPreferenceEnabled,
 } from '../../../../shared/modules/selectors';
-import { getNativeCurrency, getTokens } from '../../../ducks/metamask/metamask';
+import {
+  getNativeCurrency,
+  getTokens,
+  getCurrentCurrency,
+} from '../../../ducks/metamask/metamask';
 import {
   setCustomApproveTxData,
   showModal,
diff --git a/ui/selectors/multichain.test.ts b/ui/selectors/multichain.test.ts
index 50f735aa9212..110fdc3a5174 100644
--- a/ui/selectors/multichain.test.ts
+++ b/ui/selectors/multichain.test.ts
@@ -2,7 +2,10 @@ import { Cryptocurrency } from '@metamask/assets-controllers';
 import { InternalAccount } from '@metamask/keyring-api';
 import { Hex } from '@metamask/utils';
 import { NetworkConfiguration } from '@metamask/network-controller';
-import { getNativeCurrency } from '../ducks/metamask/metamask';
+import {
+  getCurrentCurrency,
+  getNativeCurrency,
+} from '../ducks/metamask/metamask';
 import {
   MULTICHAIN_PROVIDER_CONFIGS,
   MultichainNetworks,
@@ -40,11 +43,7 @@ import {
   getMultichainSelectedAccountCachedBalanceIsZero,
   getMultichainIsTestnet,
 } from './multichain';
-import {
-  getCurrentCurrency,
-  getSelectedAccountCachedBalance,
-  getShouldShowFiat,
-} from '.';
+import { getSelectedAccountCachedBalance, getShouldShowFiat } from '.';
 
 type TestState = MultichainState &
   AccountsState & {
diff --git a/ui/selectors/multichain.ts b/ui/selectors/multichain.ts
index 129021e0c4c1..2fd366ed4263 100644
--- a/ui/selectors/multichain.ts
+++ b/ui/selectors/multichain.ts
@@ -15,6 +15,7 @@ import {
   getCompletedOnboarding,
   getConversionRate,
   getNativeCurrency,
+  getCurrentCurrency,
 } from '../ducks/metamask/metamask';
 // TODO: Remove restricted import
 // eslint-disable-next-line import/no-restricted-paths
@@ -33,7 +34,6 @@ import {
 } from '../../shared/modules/selectors/networks';
 import { AccountsState, getSelectedInternalAccount } from './accounts';
 import {
-  getCurrentCurrency,
   getIsMainnet,
   getMaybeSelectedInternalAccount,
   getNativeCurrencyImage,
diff --git a/ui/selectors/selectors.js b/ui/selectors/selectors.js
index 02adf1241e30..383f9c0dd683 100644
--- a/ui/selectors/selectors.js
+++ b/ui/selectors/selectors.js
@@ -963,10 +963,6 @@ export function getNftIsStillFetchingIndication(state) {
   return state.appState.isNftStillFetchingIndication;
 }
 
-export function getCurrentCurrency(state) {
-  return state.metamask.currentCurrency;
-}
-
 export function getTotalUnapprovedCount(state) {
   return state.metamask.pendingApprovalCount ?? 0;
 }
diff --git a/ui/selectors/selectors.test.js b/ui/selectors/selectors.test.js
index cfee47dfafe2..aa6ae125bd4b 100644
--- a/ui/selectors/selectors.test.js
+++ b/ui/selectors/selectors.test.js
@@ -1088,11 +1088,6 @@ describe('Selectors', () => {
     expect(gasIsLoading).toStrictEqual(false);
   });
 
-  it('#getCurrentCurrency', () => {
-    const currentCurrency = selectors.getCurrentCurrency(mockState);
-    expect(currentCurrency).toStrictEqual('usd');
-  });
-
   it('#getTotalUnapprovedCount', () => {
     const totalUnapprovedCount = selectors.getTotalUnapprovedCount(mockState);
     expect(totalUnapprovedCount).toStrictEqual(1);

From ae1520db53e8281a79f7f6d257441bb6632e41b0 Mon Sep 17 00:00:00 2001
From: Alejandro Garcia Anglada <aganglada@gmail.com>
Date: Tue, 17 Dec 2024 17:59:17 +0100
Subject: [PATCH 154/175] fix: remove network picker from non evm accounts
 (#29247)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<!--
Please submit this PR as a draft initially.
Do not mark it as "Ready for review" until the template has been
completely filled out, and PR status checks have passed at least once.
-->

## **Description**

Removes the new network picker from the non-EVM accounts token list


<!--
Write a short description of the changes included in this pull request,
also include relevant motivation and context. Have in mind the following
questions:
1. What is the reason for the change?
2. What is the improvement/solution?
-->

[![Open in GitHub
Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/29247?quickstart=1)

## **Related issues**

Fixes:

## **Manual testing steps**

1. Enable the Solana account via Settings > Experimental > Enable Solana
account
2. Create a Solana account from the account-list menu

## **Screenshots/Recordings**

<!-- If applicable, add screenshots and/or recordings to visualize the
before and after of your change. -->

### **Before**

<img width="354" alt="Screenshot 2024-12-16 at 20 53 34"
src="https://github.com/user-attachments/assets/e64ee96f-bf0a-4357-91cb-95cc6b12d186"
/>

### **After**

<img width="360" alt="Screenshot 2024-12-16 at 21 02 08"
src="https://github.com/user-attachments/assets/f4d3734a-4fe6-4e7b-a586-d4a52e6d6eb9"
/>

<!-- [screenshots/recordings] -->

## **Pre-merge author checklist**

- [x] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension Coding
Standards](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/CODING_GUIDELINES.md).
- [x] I've completed the PR template to the best of my ability
- [ ] I’ve included tests if applicable
- [ ] I’ve documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [x] I’ve applied the right labels on the PR (see [labeling
guidelines](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.

## **Pre-merge reviewer checklist**

- [x] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed).
- [ ] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.
---
 .../asset-list-control-bar.tsx                      | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/ui/components/app/assets/asset-list/asset-list-control-bar/asset-list-control-bar.tsx b/ui/components/app/assets/asset-list/asset-list-control-bar/asset-list-control-bar.tsx
index 348fd82fbdaa..c61815a9ab0a 100644
--- a/ui/components/app/assets/asset-list/asset-list-control-bar/asset-list-control-bar.tsx
+++ b/ui/components/app/assets/asset-list/asset-list-control-bar/asset-list-control-bar.tsx
@@ -3,6 +3,7 @@ import { useDispatch, useSelector } from 'react-redux';
 import {
   getCurrentNetwork,
   getIsTokenNetworkFilterEqualCurrentNetwork,
+  getSelectedInternalAccount,
   getTokenNetworkFilter,
 } from '../../../../../selectors';
 import { getNetworkConfigurationsByChainId } from '../../../../../../shared/modules/selectors/networks';
@@ -49,6 +50,8 @@ import {
   showImportTokensModal,
 } from '../../../../../store/actions';
 import Tooltip from '../../../../ui/tooltip';
+import { useMultichainSelector } from '../../../../../hooks/useMultichainSelector';
+import { getMultichainNetwork } from '../../../../../selectors/multichain';
 
 type AssetListControlBarProps = {
   showTokensLinks?: boolean;
@@ -72,6 +75,9 @@ const AssetListControlBar = ({ showTokensLinks }: AssetListControlBarProps) => {
   const [isNetworkFilterPopoverOpen, setIsNetworkFilterPopoverOpen] =
     useState(false);
 
+  const account = useSelector(getSelectedInternalAccount);
+  const { isEvmNetwork } = useMultichainSelector(getMultichainNetwork, account);
+
   const isTestNetwork = useMemo(() => {
     return (TEST_CHAINS as string[]).includes(currentNetwork.chainId);
   }, [currentNetwork.chainId, TEST_CHAINS]);
@@ -166,12 +172,13 @@ const AssetListControlBar = ({ showTokensLinks }: AssetListControlBarProps) => {
       <Box
         display={Display.Flex}
         justifyContent={
-          process.env.PORTFOLIO_VIEW
+          process.env.PORTFOLIO_VIEW && isEvmNetwork
             ? JustifyContent.spaceBetween
             : JustifyContent.flexEnd
         }
       >
-        {process.env.PORTFOLIO_VIEW && (
+        {/* TODO: Remove isEvmNetwork check when we are ready to show the network filter in all networks including non-EVM */}
+        {process.env.PORTFOLIO_VIEW && isEvmNetwork ? (
           <ButtonBase
             data-testid="sort-by-networks"
             variant={TextVariant.bodyMdMedium}
@@ -196,7 +203,7 @@ const AssetListControlBar = ({ showTokensLinks }: AssetListControlBarProps) => {
               ? currentNetwork?.nickname ?? t('currentNetwork')
               : t('popularNetworks')}
           </ButtonBase>
-        )}
+        ) : null}
 
         <Box
           className="asset-list-control-bar__buttons"

From 460536a587b34022969d928df604f16a22ce6e1d Mon Sep 17 00:00:00 2001
From: chloeYue <105063779+chloeYue@users.noreply.github.com>
Date: Tue, 17 Dec 2024 18:02:27 +0100
Subject: [PATCH 155/175] test: [POM] Create base classes and methods for
 bitcoin e2e tests (#29235)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## **Description**

- Create a Bitcoin home page class and methods. The locators on homepage
for Bitcoin accounts are different from the locators for other accounts.
I think the best way to implement this is to create a `BitcoinHomepage`
class that extends from `Homepage`. This approach will be flexible and
easier to implement when we have new modifications for Bitcoin account
functionalities.
- Migrate bitcoin account e2e tests to TS and Page Object Model

```
test/e2e/flask/btc/btc-account-overview.spec.ts
test/e2e/flask/btc/btc-dapp-connection.spec.ts
test/e2e/flask/btc/btc-experimental-settings.spec.ts
```

[![Open in GitHub
Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/27155?quickstart=1)

## **Related issues**


## **Manual testing steps**
Check code readability, make sure tests pass.

## **Screenshots/Recordings**

<!-- If applicable, add screenshots and/or recordings to visualize the
before and after of your change. -->

### **Before**

<!-- [screenshots/recordings] -->

### **After**

<!-- [screenshots/recordings] -->

## **Pre-merge author checklist**

- [x] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension Coding
Standards](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/CODING_GUIDELINES.md).
- [x] I've completed the PR template to the best of my ability
- [x] I’ve included tests if applicable
- [x] I’ve documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [x] I’ve applied the right labels on the PR (see [labeling
guidelines](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.

## **Pre-merge reviewer checklist**

- [x] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed).
- [x] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.

---------

Co-authored-by: seaona <54408225+seaona@users.noreply.github.com>
---
 .../flask/btc/btc-account-overview.spec.ts    |  63 ++--------
 .../e2e/flask/btc/btc-dapp-connection.spec.ts |  19 +--
 .../btc/btc-experimental-settings.spec.ts     |  54 ++++-----
 .../page-objects/pages/account-list-page.ts   |  16 +++
 test/e2e/page-objects/pages/header-navbar.ts  |   2 +-
 .../pages/home/bitcoin-homepage.ts            | 112 ++++++++++++++++++
 test/e2e/page-objects/pages/home/homepage.ts  |   9 +-
 .../pages/settings/experimental-settings.ts   |  13 ++
 test/e2e/page-objects/pages/test-dapp.ts      |  39 ++++--
 ...account-signatures-and-disconnects.spec.ts |   4 +-
 .../multichain/all-permissions-page.spec.ts   |   4 +-
 .../tokens/custom-token-send-transfer.spec.js |  48 +++-----
 test/e2e/webdriver/driver.js                  |  14 ++-
 13 files changed, 253 insertions(+), 144 deletions(-)
 create mode 100644 test/e2e/page-objects/pages/home/bitcoin-homepage.ts

diff --git a/test/e2e/flask/btc/btc-account-overview.spec.ts b/test/e2e/flask/btc/btc-account-overview.spec.ts
index 418c9d736078..93ff6ef07ad3 100644
--- a/test/e2e/flask/btc/btc-account-overview.spec.ts
+++ b/test/e2e/flask/btc/btc-account-overview.spec.ts
@@ -1,63 +1,24 @@
+import { strict as assert } from 'assert';
 import { Suite } from 'mocha';
 import { DEFAULT_BTC_BALANCE } from '../../constants';
+import BitcoinHomepage from '../../page-objects/pages/home/bitcoin-homepage';
 import { withBtcAccountSnap } from './common-btc';
 
 describe('BTC Account - Overview', function (this: Suite) {
-  it('has portfolio button enabled for BTC accounts', async function () {
+  it('has balance displayed and has portfolio button enabled for BTC accounts', async function () {
     await withBtcAccountSnap(
       { title: this.test?.fullTitle() },
       async (driver) => {
-        await driver.findElement({
-          css: '[data-testid="account-menu-icon"]',
-          text: 'Bitcoin Account',
-        });
-
-        await driver.waitForSelector({
-          text: 'Send',
-          tag: 'button',
-          css: '[data-testid="coin-overview-send"]',
-        });
-
-        await driver.waitForSelector({
-          text: 'Swap',
-          tag: 'button',
-          css: '[disabled]',
-        });
-
-        await driver.waitForSelector({
-          text: 'Bridge',
-          tag: 'button',
-          css: '[disabled]',
-        });
-
-        // buy sell button
-        await driver.findClickableElement('[data-testid="coin-overview-buy"]');
-
-        // receive button
-        await driver.findClickableElement(
-          '[data-testid="coin-overview-receive"]',
+        const homePage = new BitcoinHomepage(driver);
+        await homePage.check_pageIsLoaded();
+        await homePage.headerNavbar.check_accountLabel('Bitcoin Account');
+        await homePage.check_isExpectedBitcoinBalanceDisplayed(
+          DEFAULT_BTC_BALANCE,
         );
-      },
-    );
-  });
-
-  it('has balance', async function () {
-    await withBtcAccountSnap(
-      { title: this.test?.fullTitle() },
-      async (driver) => {
-        await driver.waitForSelector({
-          testId: 'account-value-and-suffix',
-          text: `${DEFAULT_BTC_BALANCE}`,
-        });
-        await driver.waitForSelector({
-          css: '.currency-display-component__suffix',
-          text: 'BTC',
-        });
-
-        await driver.waitForSelector({
-          tag: 'p',
-          text: `${DEFAULT_BTC_BALANCE} BTC`,
-        });
+        assert.equal(await homePage.check_isBridgeButtonEnabled(), false);
+        assert.equal(await homePage.check_isSwapButtonEnabled(), false);
+        assert.equal(await homePage.check_isBuySellButtonEnabled(), true);
+        assert.equal(await homePage.check_isReceiveButtonEnabled(), true);
       },
     );
   });
diff --git a/test/e2e/flask/btc/btc-dapp-connection.spec.ts b/test/e2e/flask/btc/btc-dapp-connection.spec.ts
index 2eb33a4b7d74..2a9b413f60b0 100644
--- a/test/e2e/flask/btc/btc-dapp-connection.spec.ts
+++ b/test/e2e/flask/btc/btc-dapp-connection.spec.ts
@@ -1,5 +1,6 @@
 import { Suite } from 'mocha';
-import { openDapp, WINDOW_TITLES } from '../../helpers';
+import BitcoinHomepage from '../../page-objects/pages/home/bitcoin-homepage';
+import TestDapp from '../../page-objects/pages/test-dapp';
 import { withBtcAccountSnap } from './common-btc';
 
 describe('BTC Account - Dapp Connection', function (this: Suite) {
@@ -7,14 +8,16 @@ describe('BTC Account - Dapp Connection', function (this: Suite) {
     await withBtcAccountSnap(
       { title: this.test?.fullTitle() },
       async (driver) => {
-        await openDapp(driver);
-        await driver.clickElement('#connectButton');
-        await driver.waitUntilXWindowHandles(3);
-        await driver.switchToWindowWithTitle(WINDOW_TITLES.Dialog);
+        const homePage = new BitcoinHomepage(driver);
+        await homePage.check_pageIsLoaded();
+        await homePage.headerNavbar.check_accountLabel('Bitcoin Account');
 
-        await driver.assertElementNotPresent(
-          '[data-testid="choose-account-list-1"]',
-        );
+        const testDapp = new TestDapp(driver);
+        await testDapp.openTestDappPage();
+        await testDapp.check_pageIsLoaded();
+        await testDapp.connectAccount({
+          connectAccountButtonEnabled: false,
+        });
       },
     );
   });
diff --git a/test/e2e/flask/btc/btc-experimental-settings.spec.ts b/test/e2e/flask/btc/btc-experimental-settings.spec.ts
index 45bc7d0d1701..10a183bf87bb 100644
--- a/test/e2e/flask/btc/btc-experimental-settings.spec.ts
+++ b/test/e2e/flask/btc/btc-experimental-settings.spec.ts
@@ -1,47 +1,45 @@
 import { Suite } from 'mocha';
-
-import messages from '../../../../app/_locales/en/messages.json';
 import FixtureBuilder from '../../fixture-builder';
-import {
-  defaultGanacheOptions,
-  unlockWallet,
-  withFixtures,
-} from '../../helpers';
+import { withFixtures } from '../../helpers';
 import { Driver } from '../../webdriver/driver';
+import AccountListPage from '../../page-objects/pages/account-list-page';
+import ExperimentalSettings from '../../page-objects/pages/settings/experimental-settings';
+import HomePage from '../../page-objects/pages/home/homepage';
+import HeaderNavbar from '../../page-objects/pages/header-navbar';
+import SettingsPage from '../../page-objects/pages/settings/settings-page';
+import { loginWithBalanceValidation } from '../../page-objects/flows/login.flow';
 
 describe('BTC Experimental Settings', function (this: Suite) {
   it('will show `Add a new Bitcoin account (Beta)` option when setting is enabled', async function () {
     await withFixtures(
       {
         fixtures: new FixtureBuilder().build(),
-        ganacheOptions: defaultGanacheOptions,
         title: this.test?.fullTitle(),
       },
       async ({ driver }: { driver: Driver }) => {
-        await unlockWallet(driver);
-        await driver.clickElement(
-          '[data-testid="account-options-menu-button"]',
-        );
-        await driver.clickElement({ text: 'Settings', tag: 'div' });
-        await driver.clickElement({ text: 'Experimental', tag: 'div' });
+        await loginWithBalanceValidation(driver);
 
-        await driver.waitForSelector({
-          text: messages.bitcoinSupportToggleTitle.message,
-          tag: 'span',
-        });
+        // go to experimental settings page and enable add new Bitcoin account toggle
+        const homePage = new HomePage(driver);
+        await homePage.check_pageIsLoaded();
+        await homePage.check_expectedBalanceIsDisplayed();
 
-        await driver.clickElement('[data-testid="bitcoin-support-toggle-div"]');
+        await new HeaderNavbar(driver).openSettingsPage();
+        const settingsPage = new SettingsPage(driver);
+        await settingsPage.check_pageIsLoaded();
+        await settingsPage.goToExperimentalSettings();
 
-        await driver.clickElement('button[aria-label="Close"]');
+        const experimentalSettings = new ExperimentalSettings(driver);
+        await experimentalSettings.check_pageIsLoaded();
+        await experimentalSettings.toggleBitcoinAccount();
+        await settingsPage.closeSettingsPage();
 
-        await driver.clickElement('[data-testid="account-menu-icon"]');
-        await driver.clickElement(
-          '[data-testid="multichain-account-menu-popover-action-button"]',
-        );
-        await driver.waitForSelector({
-          text: messages.addNewBitcoinAccount.message,
-          tag: 'button',
-        });
+        // check add new Bitcoin account button is displayed
+        await homePage.check_pageIsLoaded();
+        await new HeaderNavbar(driver).openAccountMenu();
+        const accountListPage = new AccountListPage(driver);
+        await accountListPage.check_pageIsLoaded();
+        await accountListPage.check_addBitcoinAccountAvailable(true);
       },
     );
   });
diff --git a/test/e2e/page-objects/pages/account-list-page.ts b/test/e2e/page-objects/pages/account-list-page.ts
index 981955eb19cd..50eb70ce553c 100644
--- a/test/e2e/page-objects/pages/account-list-page.ts
+++ b/test/e2e/page-objects/pages/account-list-page.ts
@@ -374,6 +374,22 @@ class AccountListPage {
     });
   }
 
+  async check_addBitcoinAccountAvailable(
+    expectedAvailability: boolean,
+  ): Promise<void> {
+    console.log(
+      `Check add bitcoin account button is ${
+        expectedAvailability ? 'displayed ' : 'not displayed'
+      }`,
+    );
+    await this.openAddAccountModal();
+    if (expectedAvailability) {
+      await this.driver.waitForSelector(this.addBtcAccountButton);
+    } else {
+      await this.driver.assertElementNotPresent(this.addBtcAccountButton);
+    }
+  }
+
   async openAccountOptionsMenu(): Promise<void> {
     console.log(`Open account option menu`);
     await this.driver.waitForSelector(this.accountListItem);
diff --git a/test/e2e/page-objects/pages/header-navbar.ts b/test/e2e/page-objects/pages/header-navbar.ts
index 65d4cbd48358..df45ecd0277d 100644
--- a/test/e2e/page-objects/pages/header-navbar.ts
+++ b/test/e2e/page-objects/pages/header-navbar.ts
@@ -1,7 +1,7 @@
 import { Driver } from '../../webdriver/driver';
 
 class HeaderNavbar {
-  private driver: Driver;
+  protected driver: Driver;
 
   private readonly accountMenuButton = '[data-testid="account-menu-icon"]';
 
diff --git a/test/e2e/page-objects/pages/home/bitcoin-homepage.ts b/test/e2e/page-objects/pages/home/bitcoin-homepage.ts
new file mode 100644
index 000000000000..19b235636405
--- /dev/null
+++ b/test/e2e/page-objects/pages/home/bitcoin-homepage.ts
@@ -0,0 +1,112 @@
+import HomePage from './homepage';
+
+class BitcoinHomepage extends HomePage {
+  protected readonly balance =
+    '[data-testid="coin-overview__primary-currency"]';
+
+  private readonly bridgeButton = {
+    text: 'Bridge',
+    tag: 'button',
+  };
+
+  private readonly buySellButton = '[data-testid="coin-overview-buy"]';
+
+  private readonly receiveButton = '[data-testid="coin-overview-receive"]';
+
+  protected readonly sendButton = '[data-testid="coin-overview-send"]';
+
+  private readonly swapButton = {
+    text: 'Swap',
+    tag: 'button',
+  };
+
+  async check_pageIsLoaded(): Promise<void> {
+    try {
+      await this.driver.waitForMultipleSelectors([
+        this.sendButton,
+        this.buySellButton,
+        this.receiveButton,
+      ]);
+    } catch (e) {
+      console.log('Timeout while waiting for bitcoin homepage to be loaded', e);
+      throw e;
+    }
+    console.log('Bitcoin homepage is loaded');
+  }
+
+  /**
+   * Checks if the bridge button is enabled on bitcoin account homepage.
+   *
+   */
+  async check_isBridgeButtonEnabled(): Promise<boolean> {
+    try {
+      await this.driver.findClickableElement(this.bridgeButton, 1000);
+    } catch (e) {
+      console.log('Bridge button not enabled', e);
+      return false;
+    }
+    console.log('Bridge button is enabled');
+    return true;
+  }
+
+  /**
+   * Checks if the buy/sell button is enabled on bitcoin account homepage.
+   */
+  async check_isBuySellButtonEnabled(): Promise<boolean> {
+    try {
+      await this.driver.findClickableElement(this.buySellButton, 1000);
+    } catch (e) {
+      console.log('Buy/Sell button not enabled', e);
+      return false;
+    }
+    console.log('Buy/Sell button is enabled');
+    return true;
+  }
+
+  /**
+   * Checks if the expected bitcoin balance is displayed on homepage.
+   *
+   * @param expectedBalance - The expected bitcoin balance to be displayed. Defaults to '0'.
+   */
+  async check_isExpectedBitcoinBalanceDisplayed(
+    expectedBalance: number = 0,
+  ): Promise<void> {
+    console.log(
+      `Check if expected bitcoin balance is displayed: ${expectedBalance} BTC`,
+    );
+    await this.driver.waitForSelector({
+      css: this.balance,
+      text: `${expectedBalance}BTC`,
+    });
+  }
+
+  /**
+   * Checks if the receive button is enabled on bitcoin account homepage.
+   */
+  async check_isReceiveButtonEnabled(): Promise<boolean> {
+    try {
+      await this.driver.findClickableElement(this.receiveButton, 1000);
+    } catch (e) {
+      console.log('Receive button not enabled', e);
+      return false;
+    }
+    console.log('Receive button is enabled');
+    return true;
+  }
+
+  /**
+   * Checks if the swap button is enabled on bitcoin account homepage.
+   */
+  async check_isSwapButtonEnabled(): Promise<boolean> {
+    try {
+      await this.driver.findClickableElement(this.swapButton, 1000);
+    } catch (e) {
+      console.log('Swap button not enabled', e);
+      return false;
+    }
+    console.log('Swap button is enabled');
+    return true;
+  }
+}
+
+export default BitcoinHomepage;
diff --git a/test/e2e/page-objects/pages/home/homepage.ts b/test/e2e/page-objects/pages/home/homepage.ts
index 6b3f7c9f2a87..1da2349752cb 100644
--- a/test/e2e/page-objects/pages/home/homepage.ts
+++ b/test/e2e/page-objects/pages/home/homepage.ts
@@ -4,7 +4,7 @@ import { getCleanAppState } from '../../../helpers';
 import HeaderNavbar from '../header-navbar';
 
 class HomePage {
-  private driver: Driver;
+  protected driver: Driver;
 
   public headerNavbar: HeaderNavbar;
 
@@ -12,7 +12,8 @@ class HomePage {
     testId: 'account-overview__activity-tab',
   };
 
-  private readonly balance = '[data-testid="eth-overview__primary-currency"]';
+  protected readonly balance: string =
+    '[data-testid="eth-overview__primary-currency"]';
 
   private readonly basicFunctionalityOffWarningMessage = {
     text: 'Basic functionality is off',
@@ -46,9 +47,7 @@ class HomePage {
     testId: 'refreshList',
   };
 
-  private readonly sendButton = {
-    testId: 'eth-overview-send',
-  };
+  protected readonly sendButton: string = '[data-testid="eth-overview-send"]';
 
   private readonly tokensTab = {
     testId: 'account-overview__asset-tab',
diff --git a/test/e2e/page-objects/pages/settings/experimental-settings.ts b/test/e2e/page-objects/pages/settings/experimental-settings.ts
index c3f81d99bf23..f551db6d47c5 100644
--- a/test/e2e/page-objects/pages/settings/experimental-settings.ts
+++ b/test/e2e/page-objects/pages/settings/experimental-settings.ts
@@ -1,4 +1,5 @@
 import { Driver } from '../../../webdriver/driver';
+import messages from '../../../../../app/_locales/en/messages.json';
 
 class ExperimentalSettings {
   private readonly driver: Driver;
@@ -7,6 +8,9 @@ class ExperimentalSettings {
   private readonly addAccountSnapToggle =
     '[data-testid="add-account-snap-toggle-div"]';
 
+  private readonly addBitcoinAccountToggle =
+    '[data-testid="bitcoin-support-toggle-div"]';
+
   private readonly experimentalPageTitle = {
     text: 'Experimental',
     tag: 'h4',
@@ -35,6 +39,15 @@ class ExperimentalSettings {
     console.log('Experimental Settings page is loaded');
   }
 
+  async toggleBitcoinAccount(): Promise<void> {
+    console.log('Toggle Add new Bitcoin account on experimental setting page');
+    await this.driver.waitForSelector({
+      text: messages.bitcoinSupportToggleTitle.message,
+      tag: 'span',
+    });
+    await this.driver.clickElement(this.addBitcoinAccountToggle);
+  }
+
   async toggleAddAccountSnap(): Promise<void> {
     console.log('Toggle Add Account Snap on experimental setting page');
     await this.driver.clickElement(this.addAccountSnapToggle);
diff --git a/test/e2e/page-objects/pages/test-dapp.ts b/test/e2e/page-objects/pages/test-dapp.ts
index ef5aca0c6bf7..4eff00462351 100644
--- a/test/e2e/page-objects/pages/test-dapp.ts
+++ b/test/e2e/page-objects/pages/test-dapp.ts
@@ -276,23 +276,40 @@ class TestDapp {
   /**
    * Connect account to test dapp.
    *
-   * @param publicAddress - The public address to connect to test dapp.
+   * @param options - Options for connecting account to test dapp.
+   * @param [options.connectAccountButtonEnabled] - Indicates if the connect account button should be enabled.
+   * @param options.publicAddress - The public address to connect to test dapp.
    */
-  async connectAccount(publicAddress: string) {
+  async connectAccount({
+    connectAccountButtonEnabled = true,
+    publicAddress,
+  }: {
+    connectAccountButtonEnabled?: boolean;
+    publicAddress?: string;
+  }) {
     console.log('Connect account to test dapp');
     await this.driver.clickElement(this.connectAccountButton);
     await this.driver.switchToWindowWithTitle(WINDOW_TITLES.Dialog);
     await this.driver.waitForSelector(this.connectMetaMaskMessage);
+    if (connectAccountButtonEnabled) {
+      await this.driver.clickElementAndWaitForWindowToClose(
+        this.confirmDialogButton,
+      );
+    } else {
+      const confirmConnectDialogButton = await this.driver.findElement(
+        this.confirmDialogButton,
+      );
+      assert.equal(await confirmConnectDialogButton.isEnabled(), false);
+    }
 
-    await this.driver.clickElementAndWaitForWindowToClose(
-      this.confirmDialogButton,
-    );
-    await this.driver.switchToWindowWithTitle(WINDOW_TITLES.TestDApp);
-    await this.driver.waitForSelector({
-      css: this.connectedAccount,
-      text: publicAddress.toLowerCase(),
-    });
-    await this.driver.waitForSelector(this.localhostNetworkMessage);
+    if (publicAddress) {
+      await this.driver.switchToWindowWithTitle(WINDOW_TITLES.TestDApp);
+      await this.driver.waitForSelector({
+        css: this.connectedAccount,
+        text: publicAddress.toLowerCase(),
+      });
+      await this.driver.waitForSelector(this.localhostNetworkMessage);
+    }
   }
 
   async createDepositTransaction() {
diff --git a/test/e2e/tests/account/snap-account-signatures-and-disconnects.spec.ts b/test/e2e/tests/account/snap-account-signatures-and-disconnects.spec.ts
index 7e355302212a..d3c177ff7fdd 100644
--- a/test/e2e/tests/account/snap-account-signatures-and-disconnects.spec.ts
+++ b/test/e2e/tests/account/snap-account-signatures-and-disconnects.spec.ts
@@ -56,7 +56,9 @@ describe('Snap Account Signatures and Disconnects @no-mmi', function (this: Suit
 
         // Disconnect from Test Dapp and reconnect to Test Dapp
         await testDapp.disconnectAccount(newPublicKey);
-        await testDapp.connectAccount(newPublicKey);
+        await testDapp.connectAccount({
+          publicAddress: newPublicKey,
+        });
 
         // SignTypedDataV4 with Test Dapp
         await signTypedDataV4WithSnapAccount(driver, newPublicKey, false, true);
diff --git a/test/e2e/tests/multichain/all-permissions-page.spec.ts b/test/e2e/tests/multichain/all-permissions-page.spec.ts
index 756bae735f15..eca4052fdbf7 100644
--- a/test/e2e/tests/multichain/all-permissions-page.spec.ts
+++ b/test/e2e/tests/multichain/all-permissions-page.spec.ts
@@ -21,7 +21,9 @@ describe('Permissions Page', function () {
         await loginWithoutBalanceValidation(driver);
         const testDapp = new TestDapp(driver);
         await testDapp.openTestDappPage();
-        await testDapp.connectAccount(DEFAULT_FIXTURE_ACCOUNT);
+        await testDapp.connectAccount({
+          publicAddress: DEFAULT_FIXTURE_ACCOUNT,
+        });
 
         // switch to extension window and check the site permissions
         await driver.switchToWindowWithTitle(
diff --git a/test/e2e/tests/tokens/custom-token-send-transfer.spec.js b/test/e2e/tests/tokens/custom-token-send-transfer.spec.js
index 3774af82ae1c..16ba368e16ce 100644
--- a/test/e2e/tests/tokens/custom-token-send-transfer.spec.js
+++ b/test/e2e/tests/tokens/custom-token-send-transfer.spec.js
@@ -158,14 +158,10 @@ describe('Transfer custom tokens @no-mmi', function () {
 
           // check token amount is correct after transaction
           await clickNestedButton(driver, 'Tokens');
-          const tokenAmount = await driver.findElement(
-            {
-              css: '[data-testid="multichain-token-list-item-value"]',
-              text: '8.5 TST',
-            },
-            { timeout: 10000 },
-          );
-          assert.ok(tokenAmount, 'Token amount is not correct');
+          await driver.waitForSelector({
+            css: '[data-testid="multichain-token-list-item-value"]',
+            text: '8.5 TST',
+          });
         },
       );
     });
@@ -223,14 +219,10 @@ describe('Transfer custom tokens @no-mmi', function () {
 
           // check token amount is correct after transaction
           await clickNestedButton(driver, 'Tokens');
-          const tokenAmount = await driver.findElement(
-            {
-              css: '[data-testid="multichain-token-list-item-value"]',
-              text: '8.5 TST',
-            },
-            { timeout: 10000 },
-          );
-          assert.ok(tokenAmount, 'Token amount is not correct');
+          await driver.waitForSelector({
+            css: '[data-testid="multichain-token-list-item-value"]',
+            text: '8.5 TST',
+          });
         },
       );
     });
@@ -346,14 +338,10 @@ describe('Transfer custom tokens @no-mmi', function () {
 
           // check token amount is correct after transaction
           await clickNestedButton(driver, 'Tokens');
-          const tokenAmount = await driver.findElement(
-            {
-              css: '[data-testid="multichain-token-list-item-value"]',
-              text: '8.5 TST',
-            },
-            { timeout: 10000 },
-          );
-          assert.ok(tokenAmount, 'Token amount is not correct');
+          await driver.waitForSelector({
+            css: '[data-testid="multichain-token-list-item-value"]',
+            text: '8.5 TST',
+          });
         },
       );
     });
@@ -410,14 +398,10 @@ describe('Transfer custom tokens @no-mmi', function () {
 
           // check token amount is correct after transaction
           await clickNestedButton(driver, 'Tokens');
-          const tokenAmount = await driver.findElement(
-            {
-              css: '[data-testid="multichain-token-list-item-value"]',
-              text: '8.5 TST',
-            },
-            { timeout: 10000 },
-          );
-          assert.ok(tokenAmount, 'Token amount is not correct');
+          await driver.waitForSelector({
+            css: '[data-testid="multichain-token-list-item-value"]',
+            text: '8.5 TST',
+          });
         },
       );
     });
diff --git a/test/e2e/webdriver/driver.js b/test/e2e/webdriver/driver.js
index b0a335eb0d64..c16ef3999490 100644
--- a/test/e2e/webdriver/driver.js
+++ b/test/e2e/webdriver/driver.js
@@ -499,13 +499,14 @@ class Driver {
    * and returns a reference to the first matching element.
    *
    * @param {string | object} rawLocator - Element locator
+   * @param {number} timeout - Timeout in milliseconds
    * @returns {Promise<WebElement>} A promise that resolves to the found element.
    */
-  async findElement(rawLocator) {
+  async findElement(rawLocator, timeout = this.timeout) {
     const locator = this.buildLocator(rawLocator);
     const element = await this.driver.wait(
       until.elementLocated(locator),
-      this.timeout,
+      timeout,
     );
     return wrapElementWithAPI(element, this);
   }
@@ -540,13 +541,14 @@ class Driver {
    * Finds a clickable element on the page using the given locator.
    *
    * @param {string | object} rawLocator - Element locator
+   * @param {number} timeout - Timeout in milliseconds
    * @returns {Promise<WebElement>} A promise that resolves to the found clickable element.
    */
-  async findClickableElement(rawLocator) {
-    const element = await this.findElement(rawLocator);
+  async findClickableElement(rawLocator, timeout = this.timeout) {
+    const element = await this.findElement(rawLocator, timeout);
     await Promise.all([
-      this.driver.wait(until.elementIsVisible(element), this.timeout),
-      this.driver.wait(until.elementIsEnabled(element), this.timeout),
+      this.driver.wait(until.elementIsVisible(element), timeout),
+      this.driver.wait(until.elementIsEnabled(element), timeout),
     ]);
     return wrapElementWithAPI(element, this);
   }

From 241c9d8b9ac386c6b9a5d934bb17ff3fe7872f17 Mon Sep 17 00:00:00 2001
From: micaelae <100321200+micaelae@users.noreply.github.com>
Date: Tue, 17 Dec 2024 10:19:15 -0800
Subject: [PATCH 156/175] fix: sentry e2e test for bridge tokens loading status
 (#29285)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<!--
Please submit this PR as a draft initially.
Do not mark it as "Ready for review" until the template has been
completely filled out, and PR status checks have passed at least once.
-->

## **Description**
Fixes sentry tests for bridge token loading status in Firefox
<!--
Write a short description of the changes included in this pull request,
also include relevant motivation and context. Have in mind the following
questions:
1. What is the reason for the change?
2. What is the improvement/solution?
-->

[![Open in GitHub
Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/29285?quickstart=1)

## **Related issues**

Fixes:

## **Manual testing steps**

1. Go to this page...
2.
3.

## **Screenshots/Recordings**

<!-- If applicable, add screenshots and/or recordings to visualize the
before and after of your change. -->

### **Before**

<!-- [screenshots/recordings] -->

### **After**

<!-- [screenshots/recordings] -->

## **Pre-merge author checklist**

- [X] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension Coding
Standards](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/CODING_GUIDELINES.md).
- [X] I've completed the PR template to the best of my ability
- [X] I’ve included tests if applicable
- [X] I’ve documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [X] I’ve applied the right labels on the PR (see [labeling
guidelines](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.

## **Pre-merge reviewer checklist**

- [ ] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed).
- [ ] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.
---
 app/scripts/constants/sentry-state.ts                         | 4 ++--
 .../errors-after-init-opt-in-background-state.json            | 2 --
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/app/scripts/constants/sentry-state.ts b/app/scripts/constants/sentry-state.ts
index 68926c02dc89..ab53ffb3f22d 100644
--- a/app/scripts/constants/sentry-state.ts
+++ b/app/scripts/constants/sentry-state.ts
@@ -104,10 +104,10 @@ export const SENTRY_BACKGROUND_STATE = {
       },
       destTokens: {},
       destTopAssets: [],
-      destTokensLoadingStatus: false,
+      destTokensLoadingStatus: true,
       srcTokens: {},
       srcTopAssets: [],
-      srcTokensLoadingStatus: false,
+      srcTokensLoadingStatus: true,
       quoteRequest: {
         walletAddress: false,
         srcTokenAddress: true,
diff --git a/test/e2e/tests/metrics/state-snapshots/errors-after-init-opt-in-background-state.json b/test/e2e/tests/metrics/state-snapshots/errors-after-init-opt-in-background-state.json
index b00f37993b78..cae1a6ae8951 100644
--- a/test/e2e/tests/metrics/state-snapshots/errors-after-init-opt-in-background-state.json
+++ b/test/e2e/tests/metrics/state-snapshots/errors-after-init-opt-in-background-state.json
@@ -76,8 +76,6 @@
       "srcTokens": {},
       "srcTopAssets": {},
       "destTokens": {},
-      "destTokensLoadingStatus": "undefined",
-      "srcTokensLoadingStatus": "undefined",
       "destTopAssets": {},
       "quoteRequest": {
         "srcTokenAddress": "0x0000000000000000000000000000000000000000",

From 80ec747c335cb7c932bc5ae4f4b8982ef21664dd Mon Sep 17 00:00:00 2001
From: Nidhi Kumari <nidhi.kumari@consensys.net>
Date: Tue, 17 Dec 2024 22:42:39 +0000
Subject: [PATCH 157/175] fix: updated message string in onboarding screen
 (#29286)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This PR is to update the onboarding screen message with proper
punctuation

## **Related issues**

Fixes: #26763

## **Manual testing steps**

1. Go to onboarding
2. Check the message has proper punctuation on this screen

## **Screenshots/Recordings**

<!-- If applicable, add screenshots and/or recordings to visualize the
before and after of your change. -->

### **Before**
![Screenshot 2024-12-17 at 4 40
06 PM](https://github.com/user-attachments/assets/94bf0296-b412-460f-a136-034264d07140)


### **After**

![Screenshot 2024-12-17 at 4 39
51 PM](https://github.com/user-attachments/assets/bea72254-5479-4252-b2dc-03f0dac2316f)

## **Pre-merge author checklist**

- [ ] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension Coding
Standards](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/CODING_GUIDELINES.md).
- [ ] I've completed the PR template to the best of my ability
- [ ] I’ve included tests if applicable
- [ ] I’ve documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [ ] I’ve applied the right labels on the PR (see [labeling
guidelines](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.

## **Pre-merge reviewer checklist**

- [ ] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed).
- [ ] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.
---
 app/_locales/en/messages.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/_locales/en/messages.json b/app/_locales/en/messages.json
index 1ff278090f61..cded0c5205c8 100644
--- a/app/_locales/en/messages.json
+++ b/app/_locales/en/messages.json
@@ -6828,7 +6828,7 @@
     "message": "Welcome back!"
   },
   "welcomeExploreDescription": {
-    "message": "Store, send and spend crypto currencies and assets."
+    "message": "Store, send, and spend crypto currencies and assets."
   },
   "welcomeExploreTitle": {
     "message": "Explore decentralized apps"

From 9020abff2bbe13d489f68d5eea27ec1a6dc9d263 Mon Sep 17 00:00:00 2001
From: Danica Shen <zhaodanica@gmail.com>
Date: Wed, 18 Dec 2024 00:16:10 +0000
Subject: [PATCH 158/175] fix(26772): improve helptext for sending NFTs
 (#29296)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<!--
Please submit this PR as a draft initially.
Do not mark it as "Ready for review" until the template has been
completely filled out, and PR status checks have passed at least once.
-->

## **Description**
Helper text for sending NFTs to another address is not accurate. We got
feedback from design to implement the following:
```
Balance: 1 NFT  or
Balance: [2-1000000] NFTs
```

<!--
Write a short description of the changes included in this pull request,
also include relevant motivation and context. Have in mind the following
questions:
1. What is the reason for the change?
2. What is the improvement/solution?
-->

[![Open in GitHub
Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/29296?quickstart=1)

## **Related issues**

Fixes: https://github.com/MetaMask/metamask-extension/issues/26772

## **Manual testing steps**

1. Select an NFT
2. Send NFT to another address
3. Check the message

## **Screenshots/Recordings**

<!-- If applicable, add screenshots and/or recordings to visualize the
before and after of your change. -->

### **Before**
<img width="360" alt="2"
src="https://github.com/user-attachments/assets/be2e04b3-dc5d-489d-bc38-94d9000bbf4a"
/>

<!-- [screenshots/recordings] -->

### **After**
<img width="600" alt="Screenshot 2024-12-17 at 16 34 22"
src="https://github.com/user-attachments/assets/def0c6ce-58ec-4051-b01a-3b8d4cff8b70"
/>
<img width="611" alt="Screenshot 2024-12-17 at 16 34 42"
src="https://github.com/user-attachments/assets/ced50aa6-c132-4965-abbc-e770c476b3ee"
/>

<!-- [screenshots/recordings] -->

## **Pre-merge author checklist**

- [ ] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension Coding
Standards](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/CODING_GUIDELINES.md).
- [ ] I've completed the PR template to the best of my ability
- [ ] I’ve included tests if applicable
- [ ] I’ve documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [ ] I’ve applied the right labels on the PR (see [labeling
guidelines](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.

## **Pre-merge reviewer checklist**

- [ ] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed).
- [ ] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.
---
 app/_locales/en/messages.json                 |   6 +
 test/e2e/tests/tokens/nft/send-nft.spec.js    |   2 +-
 .../asset-balance/asset-balance-text.test.tsx | 155 +++++++++++++-----
 .../asset-balance/asset-balance-text.tsx      |  12 +-
 4 files changed, 124 insertions(+), 51 deletions(-)

diff --git a/app/_locales/en/messages.json b/app/_locales/en/messages.json
index cded0c5205c8..3bfd303e5dd0 100644
--- a/app/_locales/en/messages.json
+++ b/app/_locales/en/messages.json
@@ -633,9 +633,15 @@
   "asset": {
     "message": "Asset"
   },
+  "assetMultipleNFTsBalance": {
+    "message": "$1 NFTs"
+  },
   "assetOptions": {
     "message": "Asset options"
   },
+  "assetSingleNFTBalance": {
+    "message": "$1 NFT"
+  },
   "assets": {
     "message": "Assets"
   },
diff --git a/test/e2e/tests/tokens/nft/send-nft.spec.js b/test/e2e/tests/tokens/nft/send-nft.spec.js
index 13cb310f1416..af0d0d596337 100644
--- a/test/e2e/tests/tokens/nft/send-nft.spec.js
+++ b/test/e2e/tests/tokens/nft/send-nft.spec.js
@@ -177,7 +177,7 @@ describe('Send NFT', function () {
         await driver.fill('input[placeholder="0"]', '0');
         assert.ok(
           await driver.findElement({
-            text: '1 token. Cannot send negative or zero amounts of asset.',
+            text: '1 NFT. Cannot send negative or zero amounts of asset.',
             tag: 'p',
           }),
         );
diff --git a/ui/components/multichain/asset-picker-amount/asset-balance/asset-balance-text.test.tsx b/ui/components/multichain/asset-picker-amount/asset-balance/asset-balance-text.test.tsx
index be9d58f23968..88db613fd837 100644
--- a/ui/components/multichain/asset-picker-amount/asset-balance/asset-balance-text.test.tsx
+++ b/ui/components/multichain/asset-picker-amount/asset-balance/asset-balance-text.test.tsx
@@ -1,10 +1,9 @@
 import React from 'react';
-import { Provider } from 'react-redux';
-import { render } from '@testing-library/react';
 import { AssetType } from '../../../../../shared/constants/transaction';
 import mockSendState from '../../../../../test/data/mock-send-state.json';
 import configureStore from '../../../../store/store';
 import { TextColor } from '../../../../helpers/constants/design-system';
+import { renderWithProvider } from '../../../../../test/jest/rendering';
 import { AssetBalanceText } from './asset-balance-text';
 
 const store = configureStore({
@@ -41,17 +40,22 @@ jest.mock('../utils', () => ({
   getIsFiatPrimary: () => mockGetIsFiatPrimary(),
 }));
 
+const MOCK_TOKEN_WITH_BALANCES_ONE = {
+  tokensWithBalances: [
+    { string: "doesn't matter", symbol: "doesn't matter", address: '0x01' },
+  ],
+};
+const MOCK_TOKEN_WITH_BALANCES_TWO = {
+  tokensWithBalances: [{ string: '100', address: '0x01' }],
+};
+
 describe('AssetBalanceText', () => {
   beforeEach(() => {
     jest.clearAllMocks();
   });
 
   it('matches snapshot', () => {
-    mockUseTokenTracker.mockReturnValue({
-      tokensWithBalances: [
-        { string: "doesn't matter", symbol: "doesn't matter", address: '0x01' },
-      ],
-    });
+    mockUseTokenTracker.mockReturnValue(MOCK_TOKEN_WITH_BALANCES_ONE);
     mockUseCurrencyDisplay.mockReturnValue([
       'undefined',
       { value: 'fiat value', suffix: 'suffix', prefix: 'prefix-' },
@@ -64,21 +68,18 @@ describe('AssetBalanceText', () => {
       type: AssetType.native,
       balance: '1000000',
     };
-    const { asFragment } = render(
-      <Provider store={store}>
-        <AssetBalanceText
-          asset={asset}
-          balanceColor={'textColor' as TextColor}
-        />
-      </Provider>,
+    const { asFragment } = renderWithProvider(
+      <AssetBalanceText
+        asset={asset}
+        balanceColor={'textColor' as TextColor}
+      />,
+      store,
     );
     expect(asFragment()).toMatchSnapshot();
   });
 
   it('renders fiat primary correctly', () => {
-    mockUseTokenTracker.mockReturnValue({
-      tokensWithBalances: [{ string: "doesn't matter", address: '0x01' }],
-    });
+    mockUseTokenTracker.mockReturnValue(MOCK_TOKEN_WITH_BALANCES_ONE);
     mockUseCurrencyDisplay.mockReturnValue([
       'title',
       { value: '$1.23', symbol: "doesn't matter" },
@@ -92,20 +93,18 @@ describe('AssetBalanceText', () => {
       details: { address: '0x01', decimals: 2 },
       balance: '100',
     };
-    const { getByText } = render(
-      <Provider store={store}>
-        {/* Replace `any` with type */}
-        {/* eslint-disable-next-line @typescript-eslint/no-explicit-any */}
-        <AssetBalanceText asset={asset} balanceColor={'textColor' as any} />
-      </Provider>,
+    const { getByText } = renderWithProvider(
+      <AssetBalanceText
+        asset={asset}
+        balanceColor={'textColor' as TextColor}
+      />,
+      store,
     );
     expect(getByText('$1.23')).toBeInTheDocument();
   });
 
   it('renders native asset type correctly', () => {
-    mockUseTokenTracker.mockReturnValue({
-      tokensWithBalances: [{ string: '100', address: '0x01' }],
-    });
+    mockUseTokenTracker.mockReturnValue(MOCK_TOKEN_WITH_BALANCES_TWO);
     mockUseCurrencyDisplay.mockReturnValue([
       'title',
       { value: 'test_balance' },
@@ -119,21 +118,86 @@ describe('AssetBalanceText', () => {
       balance: '10000',
     };
 
-    const { getByText } = render(
-      <Provider store={store}>
-        {/* Replace `any` with type */}
-        {/* eslint-disable-next-line @typescript-eslint/no-explicit-any */}
-        <AssetBalanceText asset={asset} balanceColor={'textColor' as any} />
-      </Provider>,
+    const { getByText } = renderWithProvider(
+      <AssetBalanceText
+        asset={asset}
+        balanceColor={'textColor' as TextColor}
+      />,
+      store,
     );
 
     expect(getByText('test_balance')).toBeInTheDocument();
   });
 
-  it('renders error correctly', () => {
-    mockUseTokenTracker.mockReturnValue({
-      tokensWithBalances: [{ string: '100', address: '0x01' }],
-    });
+  it('renders a single NFT correctly', () => {
+    mockUseTokenTracker.mockReturnValue(MOCK_TOKEN_WITH_BALANCES_TWO);
+    const asset = {
+      type: AssetType.NFT,
+      balance: '0x1',
+    };
+    mockUseCurrencyDisplay.mockReturnValue([
+      'title',
+      { value: 'test_balance' },
+    ]);
+    const { getByTestId } = renderWithProvider(
+      <AssetBalanceText
+        asset={asset}
+        balanceColor={'textColor' as TextColor}
+      />,
+      store,
+    );
+    expect(
+      getByTestId('asset-balance-nft-display').textContent,
+    ).toMatchInlineSnapshot(`"1 NFT"`);
+  });
+
+  it('renders multiple NFTs correctly', () => {
+    mockUseTokenTracker.mockReturnValue(MOCK_TOKEN_WITH_BALANCES_TWO);
+    const asset = {
+      type: AssetType.NFT,
+      balance: '0x3',
+    };
+    mockUseCurrencyDisplay.mockReturnValue([
+      'title',
+      { value: 'test_balance' },
+    ]);
+    const { getByTestId } = renderWithProvider(
+      <AssetBalanceText
+        asset={asset}
+        balanceColor={'textColor' as TextColor}
+      />,
+      store,
+    );
+    expect(
+      getByTestId('asset-balance-nft-display').textContent,
+    ).toMatchInlineSnapshot(`"3 NFTs"`);
+  });
+
+  it('renders NFT with error message', () => {
+    mockUseTokenTracker.mockReturnValue(MOCK_TOKEN_WITH_BALANCES_TWO);
+    const asset = {
+      type: AssetType.NFT,
+      balance: '0x3',
+    };
+    mockUseCurrencyDisplay.mockReturnValue([
+      'title',
+      { value: 'test_balance' },
+    ]);
+    const { getByTestId } = renderWithProvider(
+      <AssetBalanceText
+        asset={asset}
+        balanceColor={'textColor' as TextColor}
+        error="insufficientFundsForGas"
+      />,
+      store,
+    );
+    expect(
+      getByTestId('asset-balance-nft-display').textContent,
+    ).toMatchInlineSnapshot(`"3 NFTs. Insufficient funds for gas"`);
+  });
+
+  it('renders error message correctly', () => {
+    mockUseTokenTracker.mockReturnValue(MOCK_TOKEN_WITH_BALANCES_TWO);
     mockUseCurrencyDisplay.mockReturnValue([
       'title',
       { value: 'test_balance' },
@@ -147,17 +211,18 @@ describe('AssetBalanceText', () => {
       balance: '10000',
     };
 
-    const { getByText } = render(
-      <Provider store={store}>
-        <AssetBalanceText
-          asset={asset}
-          balanceColor={'textColor' as TextColor}
-          error="errorText"
-        />
-      </Provider>,
+    const { getByText, getByTestId } = renderWithProvider(
+      <AssetBalanceText
+        asset={asset}
+        balanceColor={'textColor' as TextColor}
+        error="insufficientFundsForGas"
+      />,
+      store,
     );
 
     expect(getByText('test_balance')).toBeInTheDocument();
-    expect(getByText('. [errorText]')).toBeInTheDocument();
+    expect(
+      getByTestId('send-page-amount-error').textContent,
+    ).toMatchInlineSnapshot(`". Insufficient funds for gas"`);
   });
 });
diff --git a/ui/components/multichain/asset-picker-amount/asset-balance/asset-balance-text.tsx b/ui/components/multichain/asset-picker-amount/asset-balance/asset-balance-text.tsx
index e5197d50b6b0..3aec458341bd 100644
--- a/ui/components/multichain/asset-picker-amount/asset-balance/asset-balance-text.tsx
+++ b/ui/components/multichain/asset-picker-amount/asset-balance/asset-balance-text.tsx
@@ -82,16 +82,18 @@ export function AssetBalanceText({
       variant: TextVariant.bodySm,
     },
   };
-
   const errorText = error ? `. ${t(error)}` : '';
 
   if (asset.type === AssetType.NFT) {
     const numberOfTokens = hexToDecimal(asset.balance || '0x0');
     return (
-      <Text {...commonProps.textProps}>
-        {`${numberOfTokens} ${t(
-          numberOfTokens === '1' ? 'token' : 'tokens',
-        )?.toLowerCase()}${errorText}`}
+      <Text {...commonProps.textProps} data-testid="asset-balance-nft-display">
+        {`${t(
+          numberOfTokens === '1'
+            ? 'assetSingleNFTBalance'
+            : 'assetMultipleNFTsBalance',
+          [numberOfTokens],
+        )}${errorText}`}
       </Text>
     );
   }

From d630827718010c559d678909324b5cf04d503dca Mon Sep 17 00:00:00 2001
From: Brian Bergeron <brian.e.bergeron@gmail.com>
Date: Wed, 18 Dec 2024 00:53:54 -0800
Subject: [PATCH 159/175] feat: add eth native icon for zora network (#29257)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## **Description**

The zora network uses ETH as its native token, so it can have an ETH
icon.

[![Open in GitHub
Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/29257?quickstart=1)

## **Related issues**

Fixes:

## **Manual testing steps**

1. Add zora network
2. Verify native eth asset has eth icon

## **Screenshots/Recordings**

<!-- If applicable, add screenshots and/or recordings to visualize the
before and after of your change. -->

### **Before**
<img width="156" alt="Screenshot 2024-12-16 at 2 55 29 PM"
src="https://github.com/user-attachments/assets/897a1d93-46c1-4d27-af4e-26c2fb41202f"
/>

### **After**

<img width="157" alt="Screenshot 2024-12-16 at 2 55 08 PM"
src="https://github.com/user-attachments/assets/6e7b7d5a-4849-41d7-9080-ff5ac15913b3"
/>


## **Pre-merge author checklist**

- [ ] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension Coding
Standards](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/CODING_GUIDELINES.md).
- [ ] I've completed the PR template to the best of my ability
- [ ] I’ve included tests if applicable
- [ ] I’ve documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [ ] I’ve applied the right labels on the PR (see [labeling
guidelines](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.

## **Pre-merge reviewer checklist**

- [ ] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed).
- [ ] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.
---
 shared/constants/network.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/shared/constants/network.ts b/shared/constants/network.ts
index 30f59c156dda..787322d79dac 100644
--- a/shared/constants/network.ts
+++ b/shared/constants/network.ts
@@ -867,6 +867,7 @@ export const CHAIN_ID_TOKEN_IMAGE_MAP = {
   [CHAIN_IDS.GRAVITY_ALPHA_MAINNET]: GRAVITY_ALPHA_MAINNET_IMAGE_URL,
   [CHAIN_IDS.GRAVITY_ALPHA_TESTNET_SEPOLIA]:
     GRAVITY_ALPHA_TESTNET_SEPOLIA_IMAGE_URL,
+  [CHAINLIST_CHAIN_IDS_MAP.ZORA_MAINNET]: ETH_TOKEN_IMAGE_URL,
 } as const;
 
 export const INFURA_BLOCKED_KEY = 'countryBlocked';

From 26f7c5adffb1b30d9d896f262bd2818abc299d1e Mon Sep 17 00:00:00 2001
From: Brian Bergeron <brian.e.bergeron@gmail.com>
Date: Wed, 18 Dec 2024 00:54:12 -0800
Subject: [PATCH 160/175] fix: 'Metamask' casing on token details page (#29250)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## **Description**

Fixes the casing of 'Metamask' to 'MetaMask' on the token details page.

[![Open in GitHub
Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/29250?quickstart=1)

## **Related issues**

Fixes: https://consensyssoftware.atlassian.net/browse/MMASSETS-399

## **Manual testing steps**

1. Click on an erc20 token
2. Verify token lists section uses casing 'MetaMask'

## **Screenshots/Recordings**

<!-- If applicable, add screenshots and/or recordings to visualize the
before and after of your change. -->

### **Before**

<img width="327" alt="Screenshot 2024-12-16 at 1 27 31 PM"
src="https://github.com/user-attachments/assets/5faee32d-21a2-474f-b1a2-bf8eebd03297"
/>

### **After**

<img width="325" alt="Screenshot 2024-12-16 at 1 27 09 PM"
src="https://github.com/user-attachments/assets/d3090007-e72f-4ee6-83c9-8006596c53bf"
/>

## **Pre-merge author checklist**

- [ ] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension Coding
Standards](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/CODING_GUIDELINES.md).
- [ ] I've completed the PR template to the best of my ability
- [ ] I’ve included tests if applicable
- [ ] I’ve documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [ ] I’ve applied the right labels on the PR (see [labeling
guidelines](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.

## **Pre-merge reviewer checklist**

- [ ] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed).
- [ ] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.
---
 ui/pages/asset/components/asset-page.tsx | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/ui/pages/asset/components/asset-page.tsx b/ui/pages/asset/components/asset-page.tsx
index 79cf2510f015..aef098bfd9d2 100644
--- a/ui/pages/asset/components/asset-page.tsx
+++ b/ui/pages/asset/components/asset-page.tsx
@@ -75,7 +75,7 @@ export type Asset = (
       /** The number of decimal places to move left when displaying balances */
       decimals: number;
       /** An array of token list sources the asset appears in, e.g. [1inch,Sushiswap]  */
-      aggregators?: [];
+      aggregators?: string[];
     }
 ) & {
   /** The hexadecimal chain id */
@@ -332,7 +332,13 @@ const AssetPage = ({
                           >
                             {t('tokenList')}
                           </Text>
-                          <Text>{asset.aggregators.join(', ')}</Text>
+                          <Text>
+                            {asset.aggregators
+                              .map((agg) =>
+                                agg.replace(/^metamask$/iu, 'MetaMask'),
+                              )
+                              .join(', ')}
+                          </Text>
                         </Box>
                       )}
                     </Box>

From b018c81fb51c796294da8ea0f4ec618b30793981 Mon Sep 17 00:00:00 2001
From: Jyoti Puri <jyotipuri@gmail.com>
Date: Wed, 18 Dec 2024 14:59:35 +0530
Subject: [PATCH 161/175] fix: Fix icon alignment in signature pages message
 section (#29284)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## **Description**

Fix icon alignment in signature pages message section.

## **Related issues**

Fixes: https://github.com/MetaMask/metamask-extension/issues/28793

## **Manual testing steps**

1. Go to test dapp
2. Submit permit
3. Check expand and copy icons position in message section

## **Screenshots/Recordings**
<img width="360" alt="Screenshot 2024-12-17 at 9 06 53 PM"
src="https://github.com/user-attachments/assets/48961c2a-b5c6-4b38-b005-0accb4ff3f3d"
/>

## **Pre-merge author checklist**

- [X] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension Coding
Standards](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/CODING_GUIDELINES.md).
- [X] I've completed the PR template to the best of my ability
- [X] I’ve included tests if applicable
- [X] I’ve documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [X] I’ve applied the right labels on the PR (see [labeling
guidelines](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.

## **Pre-merge reviewer checklist**

- [ ] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed).
- [ ] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.
---
 .../info/row/__snapshots__/row.test.tsx.snap  |  2 +-
 ui/components/app/confirm/info/row/row.tsx    |  3 +--
 .../info/__snapshots__/info.test.tsx.snap     |  6 ++---
 .../__snapshots__/approve.test.tsx.snap       |  2 +-
 .../__snapshots__/personal-sign.test.tsx.snap |  8 +++----
 .../__snapshots__/siwe-sign.test.tsx.snap     |  8 +++----
 .../transaction-data.test.tsx.snap            |  8 +++----
 .../__snapshots__/typed-sign-v1.test.tsx.snap |  4 ++--
 .../__snapshots__/typed-sign.test.tsx.snap    | 14 ++++++------
 .../__snapshots__/confirm.test.tsx.snap       | 22 +++++++++----------
 10 files changed, 38 insertions(+), 39 deletions(-)

diff --git a/ui/components/app/confirm/info/row/__snapshots__/row.test.tsx.snap b/ui/components/app/confirm/info/row/__snapshots__/row.test.tsx.snap
index a6a52806b2cf..5014d138a242 100644
--- a/ui/components/app/confirm/info/row/__snapshots__/row.test.tsx.snap
+++ b/ui/components/app/confirm/info/row/__snapshots__/row.test.tsx.snap
@@ -37,7 +37,7 @@ exports[`ConfirmInfoRow should match snapshot when copy is enabled 1`] = `
     <button
       aria-label="copy-button"
       class="mm-box mm-button-icon mm-button-icon--size-sm mm-box--display-inline-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-icon-muted mm-box--background-color-transparent mm-box--rounded-lg"
-      style="cursor: pointer; position: absolute; right: 4px; top: 4px;"
+      style="cursor: pointer; position: absolute; right: 4px; top: 2px;"
     >
       <span
         class="mm-box mm-icon mm-icon--size-sm mm-box--display-inline-block mm-box--color-inherit"
diff --git a/ui/components/app/confirm/info/row/row.tsx b/ui/components/app/confirm/info/row/row.tsx
index 193e62a5f2f3..5a19fe8e3bdc 100644
--- a/ui/components/app/confirm/info/row/row.tsx
+++ b/ui/components/app/confirm/info/row/row.tsx
@@ -117,7 +117,7 @@ export const ConfirmInfoRow: React.FC<ConfirmInfoRowProps> = ({
         {copyEnabled && (
           <CopyIcon
             copyText={copyText ?? ''}
-            style={{ right: isCollapsible ? 32 : 4, top: 4 }}
+            style={{ right: isCollapsible ? 32 : 4 }}
             color={IconColor.iconMuted}
           />
         )}
@@ -130,7 +130,6 @@ export const ConfirmInfoRow: React.FC<ConfirmInfoRowProps> = ({
               cursor: 'pointer',
               position: 'absolute',
               right: 8,
-              top: 4,
             }}
             onClick={() => setExpanded(!expanded)}
             data-testid="sectionCollapseButton"
diff --git a/ui/pages/confirmations/components/confirm/info/__snapshots__/info.test.tsx.snap b/ui/pages/confirmations/components/confirm/info/__snapshots__/info.test.tsx.snap
index 2ff281c5186e..04a9f5951226 100644
--- a/ui/pages/confirmations/components/confirm/info/__snapshots__/info.test.tsx.snap
+++ b/ui/pages/confirmations/components/confirm/info/__snapshots__/info.test.tsx.snap
@@ -570,7 +570,7 @@ exports[`Info renders info section for personal sign request 1`] = `
       <button
         aria-label="copy-button"
         class="mm-box mm-button-icon mm-button-icon--size-sm mm-box--display-inline-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-icon-muted mm-box--background-color-transparent mm-box--rounded-lg"
-        style="cursor: pointer; position: absolute; right: 32px; top: 4px;"
+        style="cursor: pointer; position: absolute; right: 32px; top: 2px;"
       >
         <span
           class="mm-box mm-icon mm-icon--size-sm mm-box--display-inline-block mm-box--color-inherit"
@@ -581,7 +581,7 @@ exports[`Info renders info section for personal sign request 1`] = `
         aria-label="collapse-button"
         class="mm-box mm-button-icon mm-button-icon--size-sm mm-box--display-inline-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-icon-muted mm-box--background-color-transparent mm-box--rounded-lg"
         data-testid="sectionCollapseButton"
-        style="cursor: pointer; position: absolute; right: 8px; top: 4px;"
+        style="cursor: pointer; position: absolute; right: 8px;"
       >
         <span
           class="mm-box mm-icon mm-icon--size-sm mm-box--display-inline-block mm-box--color-inherit"
@@ -1019,7 +1019,7 @@ exports[`Info renders info section for typed sign request 1`] = `
       <button
         aria-label="copy-button"
         class="mm-box mm-button-icon mm-button-icon--size-sm mm-box--display-inline-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-icon-muted mm-box--background-color-transparent mm-box--rounded-lg"
-        style="cursor: pointer; position: absolute; right: 4px; top: 4px;"
+        style="cursor: pointer; position: absolute; right: 4px; top: 2px;"
       >
         <span
           class="mm-box mm-icon mm-icon--size-sm mm-box--display-inline-block mm-box--color-inherit"
diff --git a/ui/pages/confirmations/components/confirm/info/approve/__snapshots__/approve.test.tsx.snap b/ui/pages/confirmations/components/confirm/info/approve/__snapshots__/approve.test.tsx.snap
index bc8acf758720..8e13a0885858 100644
--- a/ui/pages/confirmations/components/confirm/info/approve/__snapshots__/approve.test.tsx.snap
+++ b/ui/pages/confirmations/components/confirm/info/approve/__snapshots__/approve.test.tsx.snap
@@ -654,7 +654,7 @@ exports[`<ApproveInfo /> renders component for approve request 1`] = `
       <button
         aria-label="copy-button"
         class="mm-box mm-button-icon mm-button-icon--size-sm mm-box--display-inline-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-icon-muted mm-box--background-color-transparent mm-box--rounded-lg"
-        style="cursor: pointer; position: absolute; right: 4px; top: 4px;"
+        style="cursor: pointer; position: absolute; right: 4px; top: 2px;"
       >
         <span
           class="mm-box mm-icon mm-icon--size-sm mm-box--display-inline-block mm-box--color-inherit"
diff --git a/ui/pages/confirmations/components/confirm/info/personal-sign/__snapshots__/personal-sign.test.tsx.snap b/ui/pages/confirmations/components/confirm/info/personal-sign/__snapshots__/personal-sign.test.tsx.snap
index 8932bc3bb41d..151144320ba0 100644
--- a/ui/pages/confirmations/components/confirm/info/personal-sign/__snapshots__/personal-sign.test.tsx.snap
+++ b/ui/pages/confirmations/components/confirm/info/personal-sign/__snapshots__/personal-sign.test.tsx.snap
@@ -58,7 +58,7 @@ exports[`PersonalSignInfo handle reverse string properly 1`] = `
       <button
         aria-label="copy-button"
         class="mm-box mm-button-icon mm-button-icon--size-sm mm-box--display-inline-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-icon-muted mm-box--background-color-transparent mm-box--rounded-lg"
-        style="cursor: pointer; position: absolute; right: 32px; top: 4px;"
+        style="cursor: pointer; position: absolute; right: 32px; top: 2px;"
       >
         <span
           class="mm-box mm-icon mm-icon--size-sm mm-box--display-inline-block mm-box--color-inherit"
@@ -69,7 +69,7 @@ exports[`PersonalSignInfo handle reverse string properly 1`] = `
         aria-label="collapse-button"
         class="mm-box mm-button-icon mm-button-icon--size-sm mm-box--display-inline-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-icon-muted mm-box--background-color-transparent mm-box--rounded-lg"
         data-testid="sectionCollapseButton"
-        style="cursor: pointer; position: absolute; right: 8px; top: 4px;"
+        style="cursor: pointer; position: absolute; right: 8px;"
       >
         <span
           class="mm-box mm-icon mm-icon--size-sm mm-box--display-inline-block mm-box--color-inherit"
@@ -162,7 +162,7 @@ exports[`PersonalSignInfo renders correctly for personal sign request 1`] = `
       <button
         aria-label="copy-button"
         class="mm-box mm-button-icon mm-button-icon--size-sm mm-box--display-inline-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-icon-muted mm-box--background-color-transparent mm-box--rounded-lg"
-        style="cursor: pointer; position: absolute; right: 32px; top: 4px;"
+        style="cursor: pointer; position: absolute; right: 32px; top: 2px;"
       >
         <span
           class="mm-box mm-icon mm-icon--size-sm mm-box--display-inline-block mm-box--color-inherit"
@@ -173,7 +173,7 @@ exports[`PersonalSignInfo renders correctly for personal sign request 1`] = `
         aria-label="collapse-button"
         class="mm-box mm-button-icon mm-button-icon--size-sm mm-box--display-inline-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-icon-muted mm-box--background-color-transparent mm-box--rounded-lg"
         data-testid="sectionCollapseButton"
-        style="cursor: pointer; position: absolute; right: 8px; top: 4px;"
+        style="cursor: pointer; position: absolute; right: 8px;"
       >
         <span
           class="mm-box mm-icon mm-icon--size-sm mm-box--display-inline-block mm-box--color-inherit"
diff --git a/ui/pages/confirmations/components/confirm/info/personal-sign/siwe-sign/__snapshots__/siwe-sign.test.tsx.snap b/ui/pages/confirmations/components/confirm/info/personal-sign/siwe-sign/__snapshots__/siwe-sign.test.tsx.snap
index 054bbb94a1aa..ca27aec44f21 100644
--- a/ui/pages/confirmations/components/confirm/info/personal-sign/siwe-sign/__snapshots__/siwe-sign.test.tsx.snap
+++ b/ui/pages/confirmations/components/confirm/info/personal-sign/siwe-sign/__snapshots__/siwe-sign.test.tsx.snap
@@ -9,7 +9,7 @@ exports[`SIWESignInfo renders correctly for SIWE signature request 1`] = `
     <button
       aria-label="copy-button"
       class="mm-box mm-button-icon mm-button-icon--size-sm mm-box--display-inline-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-icon-muted mm-box--background-color-transparent mm-box--rounded-lg"
-      style="cursor: pointer; position: absolute; right: 32px; top: 4px;"
+      style="cursor: pointer; position: absolute; right: 32px; top: 2px;"
     >
       <span
         class="mm-box mm-icon mm-icon--size-sm mm-box--display-inline-block mm-box--color-inherit"
@@ -20,7 +20,7 @@ exports[`SIWESignInfo renders correctly for SIWE signature request 1`] = `
       aria-label="collapse-button"
       class="mm-box mm-button-icon mm-button-icon--size-sm mm-box--display-inline-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-icon-muted mm-box--background-color-transparent mm-box--rounded-lg"
       data-testid="sectionCollapseButton"
-      style="cursor: pointer; position: absolute; right: 8px; top: 4px;"
+      style="cursor: pointer; position: absolute; right: 8px;"
     >
       <span
         class="mm-box mm-icon mm-icon--size-sm mm-box--display-inline-block mm-box--color-inherit"
@@ -53,7 +53,7 @@ exports[`SIWESignInfo renders correctly for SIWE signature request with resource
     <button
       aria-label="copy-button"
       class="mm-box mm-button-icon mm-button-icon--size-sm mm-box--display-inline-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-icon-muted mm-box--background-color-transparent mm-box--rounded-lg"
-      style="cursor: pointer; position: absolute; right: 32px; top: 4px;"
+      style="cursor: pointer; position: absolute; right: 32px; top: 2px;"
     >
       <span
         class="mm-box mm-icon mm-icon--size-sm mm-box--display-inline-block mm-box--color-inherit"
@@ -64,7 +64,7 @@ exports[`SIWESignInfo renders correctly for SIWE signature request with resource
       aria-label="collapse-button"
       class="mm-box mm-button-icon mm-button-icon--size-sm mm-box--display-inline-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-icon-muted mm-box--background-color-transparent mm-box--rounded-lg"
       data-testid="sectionCollapseButton"
-      style="cursor: pointer; position: absolute; right: 8px; top: 4px;"
+      style="cursor: pointer; position: absolute; right: 8px;"
     >
       <span
         class="mm-box mm-icon mm-icon--size-sm mm-box--display-inline-block mm-box--color-inherit"
diff --git a/ui/pages/confirmations/components/confirm/info/shared/transaction-data/__snapshots__/transaction-data.test.tsx.snap b/ui/pages/confirmations/components/confirm/info/shared/transaction-data/__snapshots__/transaction-data.test.tsx.snap
index 2e1d65d57972..af131cf7cafe 100644
--- a/ui/pages/confirmations/components/confirm/info/shared/transaction-data/__snapshots__/transaction-data.test.tsx.snap
+++ b/ui/pages/confirmations/components/confirm/info/shared/transaction-data/__snapshots__/transaction-data.test.tsx.snap
@@ -13,7 +13,7 @@ exports[`TransactionData renders decoded data with names and descriptions 1`] =
       <button
         aria-label="copy-button"
         class="mm-box mm-button-icon mm-button-icon--size-sm mm-box--display-inline-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-icon-muted mm-box--background-color-transparent mm-box--rounded-lg"
-        style="cursor: pointer; position: absolute; right: 4px; top: 4px;"
+        style="cursor: pointer; position: absolute; right: 4px; top: 2px;"
       >
         <span
           class="mm-box mm-icon mm-icon--size-sm mm-box--display-inline-block mm-box--color-inherit"
@@ -1024,7 +1024,7 @@ exports[`TransactionData renders decoded data with no names 1`] = `
       <button
         aria-label="copy-button"
         class="mm-box mm-button-icon mm-button-icon--size-sm mm-box--display-inline-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-icon-muted mm-box--background-color-transparent mm-box--rounded-lg"
-        style="cursor: pointer; position: absolute; right: 4px; top: 4px;"
+        style="cursor: pointer; position: absolute; right: 4px; top: 2px;"
       >
         <span
           class="mm-box mm-icon mm-icon--size-sm mm-box--display-inline-block mm-box--color-inherit"
@@ -1246,7 +1246,7 @@ exports[`TransactionData renders decoded data with tuples and arrays 1`] = `
       <button
         aria-label="copy-button"
         class="mm-box mm-button-icon mm-button-icon--size-sm mm-box--display-inline-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-icon-muted mm-box--background-color-transparent mm-box--rounded-lg"
-        style="cursor: pointer; position: absolute; right: 4px; top: 4px;"
+        style="cursor: pointer; position: absolute; right: 4px; top: 2px;"
       >
         <span
           class="mm-box mm-icon mm-icon--size-sm mm-box--display-inline-block mm-box--color-inherit"
@@ -2314,7 +2314,7 @@ exports[`TransactionData renders raw hexadecimal if no decoded data 1`] = `
       <button
         aria-label="copy-button"
         class="mm-box mm-button-icon mm-button-icon--size-sm mm-box--display-inline-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-icon-muted mm-box--background-color-transparent mm-box--rounded-lg"
-        style="cursor: pointer; position: absolute; right: 4px; top: 4px;"
+        style="cursor: pointer; position: absolute; right: 4px; top: 2px;"
       >
         <span
           class="mm-box mm-icon mm-icon--size-sm mm-box--display-inline-block mm-box--color-inherit"
diff --git a/ui/pages/confirmations/components/confirm/info/typed-sign-v1/__snapshots__/typed-sign-v1.test.tsx.snap b/ui/pages/confirmations/components/confirm/info/typed-sign-v1/__snapshots__/typed-sign-v1.test.tsx.snap
index 441b05c888f0..5b1b7ffe36ac 100644
--- a/ui/pages/confirmations/components/confirm/info/typed-sign-v1/__snapshots__/typed-sign-v1.test.tsx.snap
+++ b/ui/pages/confirmations/components/confirm/info/typed-sign-v1/__snapshots__/typed-sign-v1.test.tsx.snap
@@ -58,7 +58,7 @@ exports[`TypedSignInfo correctly renders typed sign data request 1`] = `
       <button
         aria-label="copy-button"
         class="mm-box mm-button-icon mm-button-icon--size-sm mm-box--display-inline-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-icon-muted mm-box--background-color-transparent mm-box--rounded-lg"
-        style="cursor: pointer; position: absolute; right: 32px; top: 4px;"
+        style="cursor: pointer; position: absolute; right: 32px; top: 2px;"
       >
         <span
           class="mm-box mm-icon mm-icon--size-sm mm-box--display-inline-block mm-box--color-inherit"
@@ -69,7 +69,7 @@ exports[`TypedSignInfo correctly renders typed sign data request 1`] = `
         aria-label="collapse-button"
         class="mm-box mm-button-icon mm-button-icon--size-sm mm-box--display-inline-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-icon-muted mm-box--background-color-transparent mm-box--rounded-lg"
         data-testid="sectionCollapseButton"
-        style="cursor: pointer; position: absolute; right: 8px; top: 4px;"
+        style="cursor: pointer; position: absolute; right: 8px;"
       >
         <span
           class="mm-box mm-icon mm-icon--size-sm mm-box--display-inline-block mm-box--color-inherit"
diff --git a/ui/pages/confirmations/components/confirm/info/typed-sign/__snapshots__/typed-sign.test.tsx.snap b/ui/pages/confirmations/components/confirm/info/typed-sign/__snapshots__/typed-sign.test.tsx.snap
index 7ee5cbe5b4c4..644b2f0df24c 100644
--- a/ui/pages/confirmations/components/confirm/info/typed-sign/__snapshots__/typed-sign.test.tsx.snap
+++ b/ui/pages/confirmations/components/confirm/info/typed-sign/__snapshots__/typed-sign.test.tsx.snap
@@ -339,7 +339,7 @@ exports[`TypedSignInfo correctly renders permit sign type 1`] = `
       <button
         aria-label="copy-button"
         class="mm-box mm-button-icon mm-button-icon--size-sm mm-box--display-inline-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-icon-muted mm-box--background-color-transparent mm-box--rounded-lg"
-        style="cursor: pointer; position: absolute; right: 32px; top: 4px;"
+        style="cursor: pointer; position: absolute; right: 32px; top: 2px;"
       >
         <span
           class="mm-box mm-icon mm-icon--size-sm mm-box--display-inline-block mm-box--color-inherit"
@@ -350,7 +350,7 @@ exports[`TypedSignInfo correctly renders permit sign type 1`] = `
         aria-label="collapse-button"
         class="mm-box mm-button-icon mm-button-icon--size-sm mm-box--display-inline-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-icon-muted mm-box--background-color-transparent mm-box--rounded-lg"
         data-testid="sectionCollapseButton"
-        style="cursor: pointer; position: absolute; right: 8px; top: 4px;"
+        style="cursor: pointer; position: absolute; right: 8px;"
       >
         <span
           class="mm-box mm-icon mm-icon--size-sm mm-box--display-inline-block mm-box--color-inherit"
@@ -714,7 +714,7 @@ exports[`TypedSignInfo correctly renders permit sign type with no deadline 1`] =
       <button
         aria-label="copy-button"
         class="mm-box mm-button-icon mm-button-icon--size-sm mm-box--display-inline-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-icon-muted mm-box--background-color-transparent mm-box--rounded-lg"
-        style="cursor: pointer; position: absolute; right: 32px; top: 4px;"
+        style="cursor: pointer; position: absolute; right: 32px; top: 2px;"
       >
         <span
           class="mm-box mm-icon mm-icon--size-sm mm-box--display-inline-block mm-box--color-inherit"
@@ -725,7 +725,7 @@ exports[`TypedSignInfo correctly renders permit sign type with no deadline 1`] =
         aria-label="collapse-button"
         class="mm-box mm-button-icon mm-button-icon--size-sm mm-box--display-inline-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-icon-muted mm-box--background-color-transparent mm-box--rounded-lg"
         data-testid="sectionCollapseButton"
-        style="cursor: pointer; position: absolute; right: 8px; top: 4px;"
+        style="cursor: pointer; position: absolute; right: 8px;"
       >
         <span
           class="mm-box mm-icon mm-icon--size-sm mm-box--display-inline-block mm-box--color-inherit"
@@ -888,7 +888,7 @@ exports[`TypedSignInfo renders origin for typed sign data request 1`] = `
       <button
         aria-label="copy-button"
         class="mm-box mm-button-icon mm-button-icon--size-sm mm-box--display-inline-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-icon-muted mm-box--background-color-transparent mm-box--rounded-lg"
-        style="cursor: pointer; position: absolute; right: 4px; top: 4px;"
+        style="cursor: pointer; position: absolute; right: 4px; top: 2px;"
       >
         <span
           class="mm-box mm-icon mm-icon--size-sm mm-box--display-inline-block mm-box--color-inherit"
@@ -1754,7 +1754,7 @@ exports[`TypedSignInfo should render message for typed sign v3 request 1`] = `
       <button
         aria-label="copy-button"
         class="mm-box mm-button-icon mm-button-icon--size-sm mm-box--display-inline-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-icon-muted mm-box--background-color-transparent mm-box--rounded-lg"
-        style="cursor: pointer; position: absolute; right: 4px; top: 4px;"
+        style="cursor: pointer; position: absolute; right: 4px; top: 2px;"
       >
         <span
           class="mm-box mm-icon mm-icon--size-sm mm-box--display-inline-block mm-box--color-inherit"
@@ -2243,7 +2243,7 @@ exports[`TypedSignInfo should render message for typed sign v4 request 1`] = `
       <button
         aria-label="copy-button"
         class="mm-box mm-button-icon mm-button-icon--size-sm mm-box--display-inline-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-icon-muted mm-box--background-color-transparent mm-box--rounded-lg"
-        style="cursor: pointer; position: absolute; right: 4px; top: 4px;"
+        style="cursor: pointer; position: absolute; right: 4px; top: 2px;"
       >
         <span
           class="mm-box mm-icon mm-icon--size-sm mm-box--display-inline-block mm-box--color-inherit"
diff --git a/ui/pages/confirmations/confirm/__snapshots__/confirm.test.tsx.snap b/ui/pages/confirmations/confirm/__snapshots__/confirm.test.tsx.snap
index ecfc0522fd18..23e0030109ee 100644
--- a/ui/pages/confirmations/confirm/__snapshots__/confirm.test.tsx.snap
+++ b/ui/pages/confirmations/confirm/__snapshots__/confirm.test.tsx.snap
@@ -190,7 +190,7 @@ exports[`Confirm matches snapshot for signature - personal sign type 1`] = `
               <button
                 aria-label="copy-button"
                 class="mm-box mm-button-icon mm-button-icon--size-sm mm-box--display-inline-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-icon-muted mm-box--background-color-transparent mm-box--rounded-lg"
-                style="cursor: pointer; position: absolute; right: 32px; top: 4px;"
+                style="cursor: pointer; position: absolute; right: 32px; top: 2px;"
               >
                 <span
                   class="mm-box mm-icon mm-icon--size-sm mm-box--display-inline-block mm-box--color-inherit"
@@ -201,7 +201,7 @@ exports[`Confirm matches snapshot for signature - personal sign type 1`] = `
                 aria-label="collapse-button"
                 class="mm-box mm-button-icon mm-button-icon--size-sm mm-box--display-inline-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-icon-muted mm-box--background-color-transparent mm-box--rounded-lg"
                 data-testid="sectionCollapseButton"
-                style="cursor: pointer; position: absolute; right: 8px; top: 4px;"
+                style="cursor: pointer; position: absolute; right: 8px;"
               >
                 <span
                   class="mm-box mm-icon mm-icon--size-sm mm-box--display-inline-block mm-box--color-inherit"
@@ -783,7 +783,7 @@ exports[`Confirm should match snapshot for signature - typed sign - V4 - PermitB
               <button
                 aria-label="copy-button"
                 class="mm-box mm-button-icon mm-button-icon--size-sm mm-box--display-inline-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-icon-muted mm-box--background-color-transparent mm-box--rounded-lg"
-                style="cursor: pointer; position: absolute; right: 32px; top: 4px;"
+                style="cursor: pointer; position: absolute; right: 32px; top: 2px;"
               >
                 <span
                   class="mm-box mm-icon mm-icon--size-sm mm-box--display-inline-block mm-box--color-inherit"
@@ -794,7 +794,7 @@ exports[`Confirm should match snapshot for signature - typed sign - V4 - PermitB
                 aria-label="collapse-button"
                 class="mm-box mm-button-icon mm-button-icon--size-sm mm-box--display-inline-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-icon-muted mm-box--background-color-transparent mm-box--rounded-lg"
                 data-testid="sectionCollapseButton"
-                style="cursor: pointer; position: absolute; right: 8px; top: 4px;"
+                style="cursor: pointer; position: absolute; right: 8px;"
               >
                 <span
                   class="mm-box mm-icon mm-icon--size-sm mm-box--display-inline-block mm-box--color-inherit"
@@ -1313,7 +1313,7 @@ exports[`Confirm should match snapshot for signature - typed sign - V4 - PermitS
               <button
                 aria-label="copy-button"
                 class="mm-box mm-button-icon mm-button-icon--size-sm mm-box--display-inline-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-icon-muted mm-box--background-color-transparent mm-box--rounded-lg"
-                style="cursor: pointer; position: absolute; right: 32px; top: 4px;"
+                style="cursor: pointer; position: absolute; right: 32px; top: 2px;"
               >
                 <span
                   class="mm-box mm-icon mm-icon--size-sm mm-box--display-inline-block mm-box--color-inherit"
@@ -1324,7 +1324,7 @@ exports[`Confirm should match snapshot for signature - typed sign - V4 - PermitS
                 aria-label="collapse-button"
                 class="mm-box mm-button-icon mm-button-icon--size-sm mm-box--display-inline-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-icon-muted mm-box--background-color-transparent mm-box--rounded-lg"
                 data-testid="sectionCollapseButton"
-                style="cursor: pointer; position: absolute; right: 8px; top: 4px;"
+                style="cursor: pointer; position: absolute; right: 8px;"
               >
                 <span
                   class="mm-box mm-icon mm-icon--size-sm mm-box--display-inline-block mm-box--color-inherit"
@@ -1638,7 +1638,7 @@ exports[`Confirm should match snapshot for signature - typed sign - V4 1`] = `
               <button
                 aria-label="copy-button"
                 class="mm-box mm-button-icon mm-button-icon--size-sm mm-box--display-inline-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-icon-muted mm-box--background-color-transparent mm-box--rounded-lg"
-                style="cursor: pointer; position: absolute; right: 4px; top: 4px;"
+                style="cursor: pointer; position: absolute; right: 4px; top: 2px;"
               >
                 <span
                   class="mm-box mm-icon mm-icon--size-sm mm-box--display-inline-block mm-box--color-inherit"
@@ -2858,7 +2858,7 @@ exports[`Confirm should match snapshot for signature - typed sign - permit 1`] =
               <button
                 aria-label="copy-button"
                 class="mm-box mm-button-icon mm-button-icon--size-sm mm-box--display-inline-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-icon-muted mm-box--background-color-transparent mm-box--rounded-lg"
-                style="cursor: pointer; position: absolute; right: 32px; top: 4px;"
+                style="cursor: pointer; position: absolute; right: 32px; top: 2px;"
               >
                 <span
                   class="mm-box mm-icon mm-icon--size-sm mm-box--display-inline-block mm-box--color-inherit"
@@ -2869,7 +2869,7 @@ exports[`Confirm should match snapshot for signature - typed sign - permit 1`] =
                 aria-label="collapse-button"
                 class="mm-box mm-button-icon mm-button-icon--size-sm mm-box--display-inline-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-icon-muted mm-box--background-color-transparent mm-box--rounded-lg"
                 data-testid="sectionCollapseButton"
-                style="cursor: pointer; position: absolute; right: 8px; top: 4px;"
+                style="cursor: pointer; position: absolute; right: 8px;"
               >
                 <span
                   class="mm-box mm-icon mm-icon--size-sm mm-box--display-inline-block mm-box--color-inherit"
@@ -3181,7 +3181,7 @@ exports[`Confirm should match snapshot signature - typed sign - order 1`] = `
               <button
                 aria-label="copy-button"
                 class="mm-box mm-button-icon mm-button-icon--size-sm mm-box--display-inline-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-icon-muted mm-box--background-color-transparent mm-box--rounded-lg"
-                style="cursor: pointer; position: absolute; right: 32px; top: 4px;"
+                style="cursor: pointer; position: absolute; right: 32px; top: 2px;"
               >
                 <span
                   class="mm-box mm-icon mm-icon--size-sm mm-box--display-inline-block mm-box--color-inherit"
@@ -3192,7 +3192,7 @@ exports[`Confirm should match snapshot signature - typed sign - order 1`] = `
                 aria-label="collapse-button"
                 class="mm-box mm-button-icon mm-button-icon--size-sm mm-box--display-inline-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-icon-muted mm-box--background-color-transparent mm-box--rounded-lg"
                 data-testid="sectionCollapseButton"
-                style="cursor: pointer; position: absolute; right: 8px; top: 4px;"
+                style="cursor: pointer; position: absolute; right: 8px;"
               >
                 <span
                   class="mm-box mm-icon mm-icon--size-sm mm-box--display-inline-block mm-box--color-inherit"

From c4429bc98352e5021e06e47a747f8555f8cb3cdd Mon Sep 17 00:00:00 2001
From: Charly Chevalier <charly.chevalier@consensys.net>
Date: Wed, 18 Dec 2024 11:57:18 +0100
Subject: [PATCH 162/175] refactor: use new `@metamask/keyring-api` layout
 (split packages) (#28861)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## **Description**

Bumping accounts related dependencies + use the new `keyring-api`
layout.

Those tests requires a higher timeout (which might not be true once
merged to `main`)

`flags = {"circleci": {"timeoutMinutes": 35}}`

[![Open in GitHub
Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/28861?quickstart=1)

## **Related issues**

N/A

## **Manual testing steps**

N/A

## **Screenshots/Recordings**

### **Before**

### **After**

## **Pre-merge author checklist**

- [x] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension Coding
Standards](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/CODING_GUIDELINES.md).
- [x] I've completed the PR template to the best of my ability
- [x] I’ve included tests if applicable
- [x] I’ve documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [x] I’ve applied the right labels on the PR (see [labeling
guidelines](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.

## **Pre-merge reviewer checklist**

- [ ] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed).
- [ ] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.

---------

Co-authored-by: Howard Braham <howrad@gmail.com>
Co-authored-by: MetaMask Bot <metamaskbot@users.noreply.github.com>
Co-authored-by: Gustavo Antunes <17601467+gantunesr@users.noreply.github.com>
---
 .../account-tracker-controller.test.ts        |  2 +-
 .../controllers/account-tracker-controller.ts |  2 +-
 .../metametrics-controller.test.ts            |  2 +-
 app/scripts/controllers/mmi-controller.ts     |  2 +-
 .../controllers/permissions/specifications.js |  6 +-
 .../lib/AccountIdentitiesPetnamesBridge.ts    |  2 +-
 .../lib/accounts/BalancesController.test.ts   |  8 +-
 .../lib/accounts/BalancesController.ts        |  8 +-
 .../lib/snap-keyring/snap-keyring.test.ts     |  3 +-
 app/scripts/lib/transaction/util.test.ts      |  2 +-
 app/scripts/lib/transaction/util.ts           |  3 +-
 app/scripts/migrations/105.test.ts            |  2 +-
 app/scripts/migrations/105.ts                 |  3 +-
 app/scripts/migrations/119.ts                 |  2 +-
 lavamoat/browserify/beta/policy.json          | 96 ++++++++-----------
 lavamoat/browserify/flask/policy.json         | 96 ++++++++-----------
 lavamoat/browserify/main/policy.json          | 96 ++++++++-----------
 lavamoat/browserify/mmi/policy.json           | 96 ++++++++-----------
 package.json                                  | 10 +-
 shared/lib/multichain.ts                      |  3 +-
 test/data/mock-accounts.ts                    |  2 +-
 test/jest/mocks.ts                            |  2 +-
 ui/components/app/contact-list/utils.ts       |  2 +-
 ui/components/app/toast-master/selectors.ts   |  3 +-
 ...referenced-currency-display.component.d.ts |  2 +-
 .../app/wallet-overview/coin-buttons.tsx      |  3 +-
 .../app/wallet-overview/coin-overview.tsx     |  2 +-
 .../account-list-menu/account-list-menu.tsx   |  2 +-
 .../app-header-unlocked-content.tsx           |  2 +-
 .../connect-account-modal.types.ts            |  2 +-
 .../connect-accounts-modal.tsx                |  3 +-
 .../connected-accounts-menu.types.ts          |  2 +-
 .../create-account/create-account.tsx         |  2 +-
 .../create-named-snap-account.tsx             |  2 +-
 .../menu-items/view-explorer-menu-item.tsx    |  2 +-
 .../components/connections.types.tsx          |  2 +-
 .../review-permission.types.tsx               |  2 +-
 .../review-permissions-page.tsx               |  3 +-
 .../pages/send/components/your-accounts.tsx   |  7 +-
 ui/components/multichain/toast/toast.test.tsx |  2 +-
 ui/helpers/utils/permissions.test.ts          |  7 +-
 ui/helpers/utils/permissions.ts               |  3 +-
 .../accounts/useMultichainWalletSnapClient.ts |  2 +-
 .../useNotifications.ts                       |  2 +-
 ...MultichainAccountTotalFiatBalance.test.tsx |  3 +-
 .../useMultichainAccountTotalFiatBalance.ts   |  3 +-
 ui/hooks/useMultichainSelector.test.ts        |  2 +-
 ui/hooks/useMultichainSelector.ts             |  2 +-
 .../connect-page/connect-page.tsx             |  3 +-
 ...nap-account-transaction-loading-screen.tsx |  2 +-
 ui/selectors/accounts.ts                      |  7 +-
 ui/selectors/multichain.test.ts               |  2 +-
 ui/selectors/multichain.ts                    |  3 +-
 ui/selectors/selectors.types.ts               |  2 +-
 ui/store/store.ts                             |  2 +-
 yarn.lock                                     | 94 +++++++++++-------
 56 files changed, 306 insertions(+), 326 deletions(-)

diff --git a/app/scripts/controllers/account-tracker-controller.test.ts b/app/scripts/controllers/account-tracker-controller.test.ts
index 7456244fc5a4..d9090c2e67f8 100644
--- a/app/scripts/controllers/account-tracker-controller.test.ts
+++ b/app/scripts/controllers/account-tracker-controller.test.ts
@@ -1,6 +1,6 @@
 import EventEmitter from 'events';
 import { ControllerMessenger } from '@metamask/base-controller';
-import { InternalAccount } from '@metamask/keyring-api';
+import { InternalAccount } from '@metamask/keyring-internal-api';
 import { BlockTracker, Provider } from '@metamask/network-controller';
 
 import { flushPromises } from '../../../test/lib/timer-helpers';
diff --git a/app/scripts/controllers/account-tracker-controller.ts b/app/scripts/controllers/account-tracker-controller.ts
index 5f509a1901bf..ec6ba74ceec2 100644
--- a/app/scripts/controllers/account-tracker-controller.ts
+++ b/app/scripts/controllers/account-tracker-controller.ts
@@ -36,7 +36,7 @@ import {
   AccountsControllerSelectedEvmAccountChangeEvent,
 } from '@metamask/accounts-controller';
 import { KeyringControllerAccountRemovedEvent } from '@metamask/keyring-controller';
-import { InternalAccount } from '@metamask/keyring-api';
+import { InternalAccount } from '@metamask/keyring-internal-api';
 
 import { LOCALHOST_RPC_URL } from '../../../shared/constants/network';
 import { SINGLE_CALL_BALANCES_ADDRESSES } from '../constants/contracts';
diff --git a/app/scripts/controllers/metametrics-controller.test.ts b/app/scripts/controllers/metametrics-controller.test.ts
index bee3c3c323d2..939d8e506070 100644
--- a/app/scripts/controllers/metametrics-controller.test.ts
+++ b/app/scripts/controllers/metametrics-controller.test.ts
@@ -10,7 +10,7 @@ import {
   Token,
   TokensControllerState,
 } from '@metamask/assets-controllers';
-import { InternalAccount } from '@metamask/keyring-api';
+import { InternalAccount } from '@metamask/keyring-internal-api';
 import { Browser } from 'webextension-polyfill';
 import { ControllerMessenger } from '@metamask/base-controller';
 import { merge } from 'lodash';
diff --git a/app/scripts/controllers/mmi-controller.ts b/app/scripts/controllers/mmi-controller.ts
index f94388aa5e8f..7378585a7e8f 100644
--- a/app/scripts/controllers/mmi-controller.ts
+++ b/app/scripts/controllers/mmi-controller.ts
@@ -27,8 +27,8 @@ import {
   OriginalRequest,
   SignatureController,
 } from '@metamask/signature-controller';
-import { InternalAccount } from '@metamask/keyring-api';
 import { toHex } from '@metamask/controller-utils';
+import { InternalAccount } from '@metamask/keyring-internal-api';
 import { toChecksumHexAddress } from '../../../shared/modules/hexstring-utils';
 // TODO: Remove restricted import
 // eslint-disable-next-line import/no-restricted-paths
diff --git a/app/scripts/controllers/permissions/specifications.js b/app/scripts/controllers/permissions/specifications.js
index b0b2051b10f5..38a2bb002523 100644
--- a/app/scripts/controllers/permissions/specifications.js
+++ b/app/scripts/controllers/permissions/specifications.js
@@ -47,7 +47,7 @@ export const CaveatFactories = Object.freeze({
  * PermissionController.
  *
  * @param {{
- *   getInternalAccounts: () => Record<string, import('@metamask/keyring-api').InternalAccount>,
+ *   getInternalAccounts: () => Record<string, import('@metamask/keyring-internal-api').InternalAccount>,
  * }} options - Options bag.
  */
 export const getCaveatSpecifications = ({
@@ -96,7 +96,7 @@ export const getCaveatSpecifications = ({
  *
  * @param {{
  *   getAllAccounts: () => Promise<string[]>,
- *   getInternalAccounts: () => Record<string, import('@metamask/keyring-api').InternalAccount>,
+ *   getInternalAccounts: () => Record<string, import('@metamask/keyring-internal-api').InternalAccount>,
  * }} options - Options bag.
  * @param options.getAllAccounts - A function that returns all Ethereum accounts
  * in the current MetaMask instance.
@@ -254,7 +254,7 @@ export const getPermissionSpecifications = ({
  * corresponds to a PreferencesController identity.
  *
  * @param {string[]} accounts - The accounts associated with the caveat.
- * @param {() => Record<string, import('@metamask/keyring-api').InternalAccount>} getInternalAccounts -
+ * @param {() => Record<string, import('@metamask/keyring-internal-api').InternalAccount>} getInternalAccounts -
  * Gets all AccountsController InternalAccounts.
  */
 function validateCaveatAccounts(accounts, getInternalAccounts) {
diff --git a/app/scripts/lib/AccountIdentitiesPetnamesBridge.ts b/app/scripts/lib/AccountIdentitiesPetnamesBridge.ts
index 87f4d114eabb..dac123744772 100644
--- a/app/scripts/lib/AccountIdentitiesPetnamesBridge.ts
+++ b/app/scripts/lib/AccountIdentitiesPetnamesBridge.ts
@@ -4,7 +4,7 @@ import {
   NameType,
   NameOrigin,
 } from '@metamask/name-controller';
-import { InternalAccount } from '@metamask/keyring-api';
+import { InternalAccount } from '@metamask/keyring-internal-api';
 import {
   AccountsControllerChangeEvent,
   AccountsControllerListAccountsAction,
diff --git a/app/scripts/lib/accounts/BalancesController.test.ts b/app/scripts/lib/accounts/BalancesController.test.ts
index 982df0289fea..e18fbc1e7be8 100644
--- a/app/scripts/lib/accounts/BalancesController.test.ts
+++ b/app/scripts/lib/accounts/BalancesController.test.ts
@@ -1,10 +1,6 @@
 import { ControllerMessenger } from '@metamask/base-controller';
-import {
-  Balance,
-  BtcAccountType,
-  CaipAssetType,
-  InternalAccount,
-} from '@metamask/keyring-api';
+import { Balance, BtcAccountType, CaipAssetType } from '@metamask/keyring-api';
+import { InternalAccount } from '@metamask/keyring-internal-api';
 import { createMockInternalAccount } from '../../../../test/jest/mocks';
 import { MultichainNetworks } from '../../../../shared/constants/multichain/networks';
 import {
diff --git a/app/scripts/lib/accounts/BalancesController.ts b/app/scripts/lib/accounts/BalancesController.ts
index 588053d6ea2a..4b9616fac35f 100644
--- a/app/scripts/lib/accounts/BalancesController.ts
+++ b/app/scripts/lib/accounts/BalancesController.ts
@@ -8,13 +8,13 @@ import {
 } from '@metamask/base-controller';
 import {
   BtcAccountType,
-  KeyringClient,
+  SolAccountType,
+  isEvmAccountType,
   type Balance,
   type CaipAssetType,
-  type InternalAccount,
-  isEvmAccountType,
-  SolAccountType,
 } from '@metamask/keyring-api';
+import { type InternalAccount } from '@metamask/keyring-internal-api';
+import { KeyringClient } from '@metamask/keyring-snap-client';
 import type { HandleSnapRequest } from '@metamask/snaps-controllers';
 import type { SnapId } from '@metamask/snaps-sdk';
 import { HandlerType } from '@metamask/snaps-utils';
diff --git a/app/scripts/lib/snap-keyring/snap-keyring.test.ts b/app/scripts/lib/snap-keyring/snap-keyring.test.ts
index 4136fd1fd1fc..0e778b2268d7 100644
--- a/app/scripts/lib/snap-keyring/snap-keyring.test.ts
+++ b/app/scripts/lib/snap-keyring/snap-keyring.test.ts
@@ -1,5 +1,6 @@
 import { ControllerMessenger } from '@metamask/base-controller';
-import { EthAccountType, InternalAccount } from '@metamask/keyring-api';
+import { EthAccountType } from '@metamask/keyring-api';
+import { InternalAccount } from '@metamask/keyring-internal-api';
 import { SNAP_MANAGE_ACCOUNTS_CONFIRMATION_TYPES } from '../../../../shared/constants/app';
 import {
   MetaMetricsEventCategory,
diff --git a/app/scripts/lib/transaction/util.test.ts b/app/scripts/lib/transaction/util.test.ts
index 4d78ea51cfa5..0a941968d802 100644
--- a/app/scripts/lib/transaction/util.test.ts
+++ b/app/scripts/lib/transaction/util.test.ts
@@ -1,4 +1,4 @@
-import { InternalAccount } from '@metamask/keyring-api';
+import { InternalAccount } from '@metamask/keyring-internal-api';
 import { TransactionParams } from '@metamask/eth-json-rpc-middleware';
 import {
   TransactionController,
diff --git a/app/scripts/lib/transaction/util.ts b/app/scripts/lib/transaction/util.ts
index 34f27d321e0b..a3d0b929aff8 100644
--- a/app/scripts/lib/transaction/util.ts
+++ b/app/scripts/lib/transaction/util.ts
@@ -1,4 +1,5 @@
-import { EthAccountType, InternalAccount } from '@metamask/keyring-api';
+import { EthAccountType } from '@metamask/keyring-api';
+import { InternalAccount } from '@metamask/keyring-internal-api';
 import {
   TransactionController,
   TransactionMeta,
diff --git a/app/scripts/migrations/105.test.ts b/app/scripts/migrations/105.test.ts
index 168fe8dd0916..b7d5ac0303e6 100644
--- a/app/scripts/migrations/105.test.ts
+++ b/app/scripts/migrations/105.test.ts
@@ -1,6 +1,6 @@
 import { v4 as uuid } from 'uuid';
 import { sha256FromString } from 'ethereumjs-util';
-import { InternalAccount } from '@metamask/keyring-api';
+import { InternalAccount } from '@metamask/keyring-internal-api';
 import { ETH_EOA_METHODS } from '../../../shared/constants/eth-methods';
 import { migrate } from './105';
 
diff --git a/app/scripts/migrations/105.ts b/app/scripts/migrations/105.ts
index a54b3e6457a7..5febcb0479f2 100644
--- a/app/scripts/migrations/105.ts
+++ b/app/scripts/migrations/105.ts
@@ -1,4 +1,5 @@
-import { EthAccountType, InternalAccount } from '@metamask/keyring-api';
+import { EthAccountType } from '@metamask/keyring-api';
+import { InternalAccount } from '@metamask/keyring-internal-api';
 import { sha256FromString } from 'ethereumjs-util';
 import { v4 as uuid } from 'uuid';
 import { cloneDeep } from 'lodash';
diff --git a/app/scripts/migrations/119.ts b/app/scripts/migrations/119.ts
index 8cb0d2c04b97..606a9e38a31d 100644
--- a/app/scripts/migrations/119.ts
+++ b/app/scripts/migrations/119.ts
@@ -1,7 +1,7 @@
 import { cloneDeep, isObject } from 'lodash';
 import { hasProperty } from '@metamask/utils';
 import { AccountsControllerState } from '@metamask/accounts-controller';
-import { InternalAccount } from '@metamask/keyring-api';
+import { InternalAccount } from '@metamask/keyring-internal-api';
 
 type VersionedData = {
   meta: { version: number };
diff --git a/lavamoat/browserify/beta/policy.json b/lavamoat/browserify/beta/policy.json
index 42c0b3ff7385..542d38004de3 100644
--- a/lavamoat/browserify/beta/policy.json
+++ b/lavamoat/browserify/beta/policy.json
@@ -1051,6 +1051,7 @@
       "packages": {
         "@ethereumjs/tx": true,
         "@metamask/eth-snap-keyring>@metamask/eth-sig-util": true,
+        "@metamask/eth-snap-keyring>@metamask/keyring-internal-snap-client": true,
         "@metamask/eth-snap-keyring>@metamask/utils": true,
         "@metamask/eth-snap-keyring>uuid": true,
         "@metamask/keyring-api": true,
@@ -1069,6 +1070,11 @@
         "browserify>buffer": true
       }
     },
+    "@metamask/eth-snap-keyring>@metamask/keyring-internal-snap-client": {
+      "packages": {
+        "@metamask/keyring-snap-client": true
+      }
+    },
     "@metamask/eth-snap-keyring>@metamask/utils": {
       "globals": {
         "TextDecoder": true,
@@ -1434,17 +1440,23 @@
       }
     },
     "@metamask/keyring-api": {
+      "packages": {
+        "@metamask/keyring-api>@metamask/keyring-utils": true,
+        "@metamask/keyring-api>@metamask/utils": true,
+        "@metamask/keyring-api>bech32": true,
+        "@metamask/utils>@metamask/superstruct": true
+      }
+    },
+    "@metamask/keyring-api>@metamask/keyring-utils": {
       "globals": {
         "URL": true
       },
       "packages": {
-        "@metamask/keyring-api>@metamask/utils": true,
-        "@metamask/keyring-api>bech32": true,
-        "@metamask/keyring-api>uuid": true,
+        "@metamask/keyring-api>@metamask/keyring-utils>@metamask/utils": true,
         "@metamask/utils>@metamask/superstruct": true
       }
     },
-    "@metamask/keyring-api>@metamask/utils": {
+    "@metamask/keyring-api>@metamask/keyring-utils>@metamask/utils": {
       "globals": {
         "TextDecoder": true,
         "TextEncoder": true
@@ -1459,9 +1471,19 @@
         "semver": true
       }
     },
-    "@metamask/keyring-api>uuid": {
+    "@metamask/keyring-api>@metamask/utils": {
       "globals": {
-        "crypto": true
+        "TextDecoder": true,
+        "TextEncoder": true
+      },
+      "packages": {
+        "@metamask/utils>@metamask/superstruct": true,
+        "@metamask/utils>@scure/base": true,
+        "@metamask/utils>pony-cause": true,
+        "@noble/hashes": true,
+        "browserify>buffer": true,
+        "nock>debug": true,
+        "semver": true
       }
     },
     "@metamask/keyring-controller": {
@@ -1556,30 +1578,6 @@
         "semver": true
       }
     },
-    "@metamask/keyring-controller>@metamask/keyring-api>@metamask/keyring-utils": {
-      "globals": {
-        "URL": true
-      },
-      "packages": {
-        "@metamask/keyring-controller>@metamask/keyring-api>@metamask/keyring-utils>@metamask/utils": true,
-        "@metamask/utils>@metamask/superstruct": true
-      }
-    },
-    "@metamask/keyring-controller>@metamask/keyring-api>@metamask/keyring-utils>@metamask/utils": {
-      "globals": {
-        "TextDecoder": true,
-        "TextEncoder": true
-      },
-      "packages": {
-        "@metamask/utils>@metamask/superstruct": true,
-        "@metamask/utils>@scure/base": true,
-        "@metamask/utils>pony-cause": true,
-        "@noble/hashes": true,
-        "browserify>buffer": true,
-        "nock>debug": true,
-        "semver": true
-      }
-    },
     "@metamask/keyring-controller>ethereumjs-wallet": {
       "packages": {
         "@metamask/keyring-controller>ethereumjs-wallet>ethereum-cryptography": true,
@@ -1624,6 +1622,19 @@
         "browserify>buffer": true
       }
     },
+    "@metamask/keyring-snap-client": {
+      "packages": {
+        "@metamask/keyring-api": true,
+        "@metamask/keyring-api>@metamask/keyring-utils": true,
+        "@metamask/keyring-snap-client>uuid": true,
+        "@metamask/utils>@metamask/superstruct": true
+      }
+    },
+    "@metamask/keyring-snap-client>uuid": {
+      "globals": {
+        "crypto": true
+      }
+    },
     "@metamask/logging-controller": {
       "packages": {
         "@metamask/base-controller": true,
@@ -2127,9 +2138,9 @@
       },
       "packages": {
         "@metamask/base-controller": true,
+        "@metamask/keyring-api": true,
         "@metamask/keyring-controller": true,
         "@metamask/network-controller": true,
-        "@metamask/profile-sync-controller>@metamask/keyring-api": true,
         "@metamask/profile-sync-controller>@noble/ciphers": true,
         "@metamask/profile-sync-controller>siwe": true,
         "@noble/hashes": true,
@@ -2137,29 +2148,6 @@
         "loglevel": true
       }
     },
-    "@metamask/profile-sync-controller>@metamask/keyring-api": {
-      "packages": {
-        "@metamask/keyring-api>bech32": true,
-        "@metamask/keyring-controller>@metamask/keyring-api>@metamask/keyring-utils": true,
-        "@metamask/profile-sync-controller>@metamask/keyring-api>@metamask/utils": true,
-        "@metamask/utils>@metamask/superstruct": true
-      }
-    },
-    "@metamask/profile-sync-controller>@metamask/keyring-api>@metamask/utils": {
-      "globals": {
-        "TextDecoder": true,
-        "TextEncoder": true
-      },
-      "packages": {
-        "@metamask/utils>@metamask/superstruct": true,
-        "@metamask/utils>@scure/base": true,
-        "@metamask/utils>pony-cause": true,
-        "@noble/hashes": true,
-        "browserify>buffer": true,
-        "nock>debug": true,
-        "semver": true
-      }
-    },
     "@metamask/profile-sync-controller>@noble/ciphers": {
       "globals": {
         "TextDecoder": true,
diff --git a/lavamoat/browserify/flask/policy.json b/lavamoat/browserify/flask/policy.json
index 42c0b3ff7385..542d38004de3 100644
--- a/lavamoat/browserify/flask/policy.json
+++ b/lavamoat/browserify/flask/policy.json
@@ -1051,6 +1051,7 @@
       "packages": {
         "@ethereumjs/tx": true,
         "@metamask/eth-snap-keyring>@metamask/eth-sig-util": true,
+        "@metamask/eth-snap-keyring>@metamask/keyring-internal-snap-client": true,
         "@metamask/eth-snap-keyring>@metamask/utils": true,
         "@metamask/eth-snap-keyring>uuid": true,
         "@metamask/keyring-api": true,
@@ -1069,6 +1070,11 @@
         "browserify>buffer": true
       }
     },
+    "@metamask/eth-snap-keyring>@metamask/keyring-internal-snap-client": {
+      "packages": {
+        "@metamask/keyring-snap-client": true
+      }
+    },
     "@metamask/eth-snap-keyring>@metamask/utils": {
       "globals": {
         "TextDecoder": true,
@@ -1434,17 +1440,23 @@
       }
     },
     "@metamask/keyring-api": {
+      "packages": {
+        "@metamask/keyring-api>@metamask/keyring-utils": true,
+        "@metamask/keyring-api>@metamask/utils": true,
+        "@metamask/keyring-api>bech32": true,
+        "@metamask/utils>@metamask/superstruct": true
+      }
+    },
+    "@metamask/keyring-api>@metamask/keyring-utils": {
       "globals": {
         "URL": true
       },
       "packages": {
-        "@metamask/keyring-api>@metamask/utils": true,
-        "@metamask/keyring-api>bech32": true,
-        "@metamask/keyring-api>uuid": true,
+        "@metamask/keyring-api>@metamask/keyring-utils>@metamask/utils": true,
         "@metamask/utils>@metamask/superstruct": true
       }
     },
-    "@metamask/keyring-api>@metamask/utils": {
+    "@metamask/keyring-api>@metamask/keyring-utils>@metamask/utils": {
       "globals": {
         "TextDecoder": true,
         "TextEncoder": true
@@ -1459,9 +1471,19 @@
         "semver": true
       }
     },
-    "@metamask/keyring-api>uuid": {
+    "@metamask/keyring-api>@metamask/utils": {
       "globals": {
-        "crypto": true
+        "TextDecoder": true,
+        "TextEncoder": true
+      },
+      "packages": {
+        "@metamask/utils>@metamask/superstruct": true,
+        "@metamask/utils>@scure/base": true,
+        "@metamask/utils>pony-cause": true,
+        "@noble/hashes": true,
+        "browserify>buffer": true,
+        "nock>debug": true,
+        "semver": true
       }
     },
     "@metamask/keyring-controller": {
@@ -1556,30 +1578,6 @@
         "semver": true
       }
     },
-    "@metamask/keyring-controller>@metamask/keyring-api>@metamask/keyring-utils": {
-      "globals": {
-        "URL": true
-      },
-      "packages": {
-        "@metamask/keyring-controller>@metamask/keyring-api>@metamask/keyring-utils>@metamask/utils": true,
-        "@metamask/utils>@metamask/superstruct": true
-      }
-    },
-    "@metamask/keyring-controller>@metamask/keyring-api>@metamask/keyring-utils>@metamask/utils": {
-      "globals": {
-        "TextDecoder": true,
-        "TextEncoder": true
-      },
-      "packages": {
-        "@metamask/utils>@metamask/superstruct": true,
-        "@metamask/utils>@scure/base": true,
-        "@metamask/utils>pony-cause": true,
-        "@noble/hashes": true,
-        "browserify>buffer": true,
-        "nock>debug": true,
-        "semver": true
-      }
-    },
     "@metamask/keyring-controller>ethereumjs-wallet": {
       "packages": {
         "@metamask/keyring-controller>ethereumjs-wallet>ethereum-cryptography": true,
@@ -1624,6 +1622,19 @@
         "browserify>buffer": true
       }
     },
+    "@metamask/keyring-snap-client": {
+      "packages": {
+        "@metamask/keyring-api": true,
+        "@metamask/keyring-api>@metamask/keyring-utils": true,
+        "@metamask/keyring-snap-client>uuid": true,
+        "@metamask/utils>@metamask/superstruct": true
+      }
+    },
+    "@metamask/keyring-snap-client>uuid": {
+      "globals": {
+        "crypto": true
+      }
+    },
     "@metamask/logging-controller": {
       "packages": {
         "@metamask/base-controller": true,
@@ -2127,9 +2138,9 @@
       },
       "packages": {
         "@metamask/base-controller": true,
+        "@metamask/keyring-api": true,
         "@metamask/keyring-controller": true,
         "@metamask/network-controller": true,
-        "@metamask/profile-sync-controller>@metamask/keyring-api": true,
         "@metamask/profile-sync-controller>@noble/ciphers": true,
         "@metamask/profile-sync-controller>siwe": true,
         "@noble/hashes": true,
@@ -2137,29 +2148,6 @@
         "loglevel": true
       }
     },
-    "@metamask/profile-sync-controller>@metamask/keyring-api": {
-      "packages": {
-        "@metamask/keyring-api>bech32": true,
-        "@metamask/keyring-controller>@metamask/keyring-api>@metamask/keyring-utils": true,
-        "@metamask/profile-sync-controller>@metamask/keyring-api>@metamask/utils": true,
-        "@metamask/utils>@metamask/superstruct": true
-      }
-    },
-    "@metamask/profile-sync-controller>@metamask/keyring-api>@metamask/utils": {
-      "globals": {
-        "TextDecoder": true,
-        "TextEncoder": true
-      },
-      "packages": {
-        "@metamask/utils>@metamask/superstruct": true,
-        "@metamask/utils>@scure/base": true,
-        "@metamask/utils>pony-cause": true,
-        "@noble/hashes": true,
-        "browserify>buffer": true,
-        "nock>debug": true,
-        "semver": true
-      }
-    },
     "@metamask/profile-sync-controller>@noble/ciphers": {
       "globals": {
         "TextDecoder": true,
diff --git a/lavamoat/browserify/main/policy.json b/lavamoat/browserify/main/policy.json
index 42c0b3ff7385..542d38004de3 100644
--- a/lavamoat/browserify/main/policy.json
+++ b/lavamoat/browserify/main/policy.json
@@ -1051,6 +1051,7 @@
       "packages": {
         "@ethereumjs/tx": true,
         "@metamask/eth-snap-keyring>@metamask/eth-sig-util": true,
+        "@metamask/eth-snap-keyring>@metamask/keyring-internal-snap-client": true,
         "@metamask/eth-snap-keyring>@metamask/utils": true,
         "@metamask/eth-snap-keyring>uuid": true,
         "@metamask/keyring-api": true,
@@ -1069,6 +1070,11 @@
         "browserify>buffer": true
       }
     },
+    "@metamask/eth-snap-keyring>@metamask/keyring-internal-snap-client": {
+      "packages": {
+        "@metamask/keyring-snap-client": true
+      }
+    },
     "@metamask/eth-snap-keyring>@metamask/utils": {
       "globals": {
         "TextDecoder": true,
@@ -1434,17 +1440,23 @@
       }
     },
     "@metamask/keyring-api": {
+      "packages": {
+        "@metamask/keyring-api>@metamask/keyring-utils": true,
+        "@metamask/keyring-api>@metamask/utils": true,
+        "@metamask/keyring-api>bech32": true,
+        "@metamask/utils>@metamask/superstruct": true
+      }
+    },
+    "@metamask/keyring-api>@metamask/keyring-utils": {
       "globals": {
         "URL": true
       },
       "packages": {
-        "@metamask/keyring-api>@metamask/utils": true,
-        "@metamask/keyring-api>bech32": true,
-        "@metamask/keyring-api>uuid": true,
+        "@metamask/keyring-api>@metamask/keyring-utils>@metamask/utils": true,
         "@metamask/utils>@metamask/superstruct": true
       }
     },
-    "@metamask/keyring-api>@metamask/utils": {
+    "@metamask/keyring-api>@metamask/keyring-utils>@metamask/utils": {
       "globals": {
         "TextDecoder": true,
         "TextEncoder": true
@@ -1459,9 +1471,19 @@
         "semver": true
       }
     },
-    "@metamask/keyring-api>uuid": {
+    "@metamask/keyring-api>@metamask/utils": {
       "globals": {
-        "crypto": true
+        "TextDecoder": true,
+        "TextEncoder": true
+      },
+      "packages": {
+        "@metamask/utils>@metamask/superstruct": true,
+        "@metamask/utils>@scure/base": true,
+        "@metamask/utils>pony-cause": true,
+        "@noble/hashes": true,
+        "browserify>buffer": true,
+        "nock>debug": true,
+        "semver": true
       }
     },
     "@metamask/keyring-controller": {
@@ -1556,30 +1578,6 @@
         "semver": true
       }
     },
-    "@metamask/keyring-controller>@metamask/keyring-api>@metamask/keyring-utils": {
-      "globals": {
-        "URL": true
-      },
-      "packages": {
-        "@metamask/keyring-controller>@metamask/keyring-api>@metamask/keyring-utils>@metamask/utils": true,
-        "@metamask/utils>@metamask/superstruct": true
-      }
-    },
-    "@metamask/keyring-controller>@metamask/keyring-api>@metamask/keyring-utils>@metamask/utils": {
-      "globals": {
-        "TextDecoder": true,
-        "TextEncoder": true
-      },
-      "packages": {
-        "@metamask/utils>@metamask/superstruct": true,
-        "@metamask/utils>@scure/base": true,
-        "@metamask/utils>pony-cause": true,
-        "@noble/hashes": true,
-        "browserify>buffer": true,
-        "nock>debug": true,
-        "semver": true
-      }
-    },
     "@metamask/keyring-controller>ethereumjs-wallet": {
       "packages": {
         "@metamask/keyring-controller>ethereumjs-wallet>ethereum-cryptography": true,
@@ -1624,6 +1622,19 @@
         "browserify>buffer": true
       }
     },
+    "@metamask/keyring-snap-client": {
+      "packages": {
+        "@metamask/keyring-api": true,
+        "@metamask/keyring-api>@metamask/keyring-utils": true,
+        "@metamask/keyring-snap-client>uuid": true,
+        "@metamask/utils>@metamask/superstruct": true
+      }
+    },
+    "@metamask/keyring-snap-client>uuid": {
+      "globals": {
+        "crypto": true
+      }
+    },
     "@metamask/logging-controller": {
       "packages": {
         "@metamask/base-controller": true,
@@ -2127,9 +2138,9 @@
       },
       "packages": {
         "@metamask/base-controller": true,
+        "@metamask/keyring-api": true,
         "@metamask/keyring-controller": true,
         "@metamask/network-controller": true,
-        "@metamask/profile-sync-controller>@metamask/keyring-api": true,
         "@metamask/profile-sync-controller>@noble/ciphers": true,
         "@metamask/profile-sync-controller>siwe": true,
         "@noble/hashes": true,
@@ -2137,29 +2148,6 @@
         "loglevel": true
       }
     },
-    "@metamask/profile-sync-controller>@metamask/keyring-api": {
-      "packages": {
-        "@metamask/keyring-api>bech32": true,
-        "@metamask/keyring-controller>@metamask/keyring-api>@metamask/keyring-utils": true,
-        "@metamask/profile-sync-controller>@metamask/keyring-api>@metamask/utils": true,
-        "@metamask/utils>@metamask/superstruct": true
-      }
-    },
-    "@metamask/profile-sync-controller>@metamask/keyring-api>@metamask/utils": {
-      "globals": {
-        "TextDecoder": true,
-        "TextEncoder": true
-      },
-      "packages": {
-        "@metamask/utils>@metamask/superstruct": true,
-        "@metamask/utils>@scure/base": true,
-        "@metamask/utils>pony-cause": true,
-        "@noble/hashes": true,
-        "browserify>buffer": true,
-        "nock>debug": true,
-        "semver": true
-      }
-    },
     "@metamask/profile-sync-controller>@noble/ciphers": {
       "globals": {
         "TextDecoder": true,
diff --git a/lavamoat/browserify/mmi/policy.json b/lavamoat/browserify/mmi/policy.json
index cd8c3a1c7396..8c76cb6df139 100644
--- a/lavamoat/browserify/mmi/policy.json
+++ b/lavamoat/browserify/mmi/policy.json
@@ -1143,6 +1143,7 @@
       "packages": {
         "@ethereumjs/tx": true,
         "@metamask/eth-snap-keyring>@metamask/eth-sig-util": true,
+        "@metamask/eth-snap-keyring>@metamask/keyring-internal-snap-client": true,
         "@metamask/eth-snap-keyring>@metamask/utils": true,
         "@metamask/eth-snap-keyring>uuid": true,
         "@metamask/keyring-api": true,
@@ -1161,6 +1162,11 @@
         "browserify>buffer": true
       }
     },
+    "@metamask/eth-snap-keyring>@metamask/keyring-internal-snap-client": {
+      "packages": {
+        "@metamask/keyring-snap-client": true
+      }
+    },
     "@metamask/eth-snap-keyring>@metamask/utils": {
       "globals": {
         "TextDecoder": true,
@@ -1526,17 +1532,23 @@
       }
     },
     "@metamask/keyring-api": {
+      "packages": {
+        "@metamask/keyring-api>@metamask/keyring-utils": true,
+        "@metamask/keyring-api>@metamask/utils": true,
+        "@metamask/keyring-api>bech32": true,
+        "@metamask/utils>@metamask/superstruct": true
+      }
+    },
+    "@metamask/keyring-api>@metamask/keyring-utils": {
       "globals": {
         "URL": true
       },
       "packages": {
-        "@metamask/keyring-api>@metamask/utils": true,
-        "@metamask/keyring-api>bech32": true,
-        "@metamask/keyring-api>uuid": true,
+        "@metamask/keyring-api>@metamask/keyring-utils>@metamask/utils": true,
         "@metamask/utils>@metamask/superstruct": true
       }
     },
-    "@metamask/keyring-api>@metamask/utils": {
+    "@metamask/keyring-api>@metamask/keyring-utils>@metamask/utils": {
       "globals": {
         "TextDecoder": true,
         "TextEncoder": true
@@ -1551,9 +1563,19 @@
         "semver": true
       }
     },
-    "@metamask/keyring-api>uuid": {
+    "@metamask/keyring-api>@metamask/utils": {
       "globals": {
-        "crypto": true
+        "TextDecoder": true,
+        "TextEncoder": true
+      },
+      "packages": {
+        "@metamask/utils>@metamask/superstruct": true,
+        "@metamask/utils>@scure/base": true,
+        "@metamask/utils>pony-cause": true,
+        "@noble/hashes": true,
+        "browserify>buffer": true,
+        "nock>debug": true,
+        "semver": true
       }
     },
     "@metamask/keyring-controller": {
@@ -1648,30 +1670,6 @@
         "semver": true
       }
     },
-    "@metamask/keyring-controller>@metamask/keyring-api>@metamask/keyring-utils": {
-      "globals": {
-        "URL": true
-      },
-      "packages": {
-        "@metamask/keyring-controller>@metamask/keyring-api>@metamask/keyring-utils>@metamask/utils": true,
-        "@metamask/utils>@metamask/superstruct": true
-      }
-    },
-    "@metamask/keyring-controller>@metamask/keyring-api>@metamask/keyring-utils>@metamask/utils": {
-      "globals": {
-        "TextDecoder": true,
-        "TextEncoder": true
-      },
-      "packages": {
-        "@metamask/utils>@metamask/superstruct": true,
-        "@metamask/utils>@scure/base": true,
-        "@metamask/utils>pony-cause": true,
-        "@noble/hashes": true,
-        "browserify>buffer": true,
-        "nock>debug": true,
-        "semver": true
-      }
-    },
     "@metamask/keyring-controller>ethereumjs-wallet": {
       "packages": {
         "@metamask/keyring-controller>ethereumjs-wallet>ethereum-cryptography": true,
@@ -1716,6 +1714,19 @@
         "browserify>buffer": true
       }
     },
+    "@metamask/keyring-snap-client": {
+      "packages": {
+        "@metamask/keyring-api": true,
+        "@metamask/keyring-api>@metamask/keyring-utils": true,
+        "@metamask/keyring-snap-client>uuid": true,
+        "@metamask/utils>@metamask/superstruct": true
+      }
+    },
+    "@metamask/keyring-snap-client>uuid": {
+      "globals": {
+        "crypto": true
+      }
+    },
     "@metamask/logging-controller": {
       "packages": {
         "@metamask/base-controller": true,
@@ -2219,9 +2230,9 @@
       },
       "packages": {
         "@metamask/base-controller": true,
+        "@metamask/keyring-api": true,
         "@metamask/keyring-controller": true,
         "@metamask/network-controller": true,
-        "@metamask/profile-sync-controller>@metamask/keyring-api": true,
         "@metamask/profile-sync-controller>@noble/ciphers": true,
         "@metamask/profile-sync-controller>siwe": true,
         "@noble/hashes": true,
@@ -2229,29 +2240,6 @@
         "loglevel": true
       }
     },
-    "@metamask/profile-sync-controller>@metamask/keyring-api": {
-      "packages": {
-        "@metamask/keyring-api>bech32": true,
-        "@metamask/keyring-controller>@metamask/keyring-api>@metamask/keyring-utils": true,
-        "@metamask/profile-sync-controller>@metamask/keyring-api>@metamask/utils": true,
-        "@metamask/utils>@metamask/superstruct": true
-      }
-    },
-    "@metamask/profile-sync-controller>@metamask/keyring-api>@metamask/utils": {
-      "globals": {
-        "TextDecoder": true,
-        "TextEncoder": true
-      },
-      "packages": {
-        "@metamask/utils>@metamask/superstruct": true,
-        "@metamask/utils>@scure/base": true,
-        "@metamask/utils>pony-cause": true,
-        "@noble/hashes": true,
-        "browserify>buffer": true,
-        "nock>debug": true,
-        "semver": true
-      }
-    },
     "@metamask/profile-sync-controller>@noble/ciphers": {
       "globals": {
         "TextDecoder": true,
diff --git a/package.json b/package.json
index cca9f509c9b5..0cc3222a7d1d 100644
--- a/package.json
+++ b/package.json
@@ -282,7 +282,7 @@
     "@metamask-institutional/types": "^1.2.0",
     "@metamask/abi-utils": "^2.0.2",
     "@metamask/account-watcher": "^4.1.2",
-    "@metamask/accounts-controller": "^20.0.0",
+    "@metamask/accounts-controller": "^20.0.2",
     "@metamask/address-book-controller": "^6.0.0",
     "@metamask/announcement-controller": "^7.0.0",
     "@metamask/approval-controller": "^7.0.0",
@@ -300,7 +300,7 @@
     "@metamask/eth-ledger-bridge-keyring": "^5.0.1",
     "@metamask/eth-query": "^4.0.0",
     "@metamask/eth-sig-util": "^7.0.1",
-    "@metamask/eth-snap-keyring": "^5.0.1",
+    "@metamask/eth-snap-keyring": "^7.0.0",
     "@metamask/eth-token-tracker": "^9.0.0",
     "@metamask/eth-trezor-keyring": "^3.1.3",
     "@metamask/etherscan-link": "^3.0.0",
@@ -311,8 +311,10 @@
     "@metamask/jazzicon": "^2.0.0",
     "@metamask/json-rpc-engine": "^10.0.0",
     "@metamask/json-rpc-middleware-stream": "^8.0.4",
-    "@metamask/keyring-api": "^10.1.0",
-    "@metamask/keyring-controller": "^19.0.0",
+    "@metamask/keyring-api": "^12.0.0",
+    "@metamask/keyring-controller": "^19.0.2",
+    "@metamask/keyring-internal-api": "^1.0.0",
+    "@metamask/keyring-snap-client": "^1.0.0",
     "@metamask/logging-controller": "^6.0.0",
     "@metamask/logo": "^3.1.2",
     "@metamask/message-manager": "^11.0.0",
diff --git a/shared/lib/multichain.ts b/shared/lib/multichain.ts
index 26111a0970a2..49dc1add445b 100644
--- a/shared/lib/multichain.ts
+++ b/shared/lib/multichain.ts
@@ -6,7 +6,8 @@ import {
 } from '@metamask/utils';
 import { validate, Network } from 'bitcoin-address-validation';
 import { isAddress } from '@solana/addresses';
-import { InternalAccount, isEvmAccountType } from '@metamask/keyring-api';
+import { isEvmAccountType } from '@metamask/keyring-api';
+import { InternalAccount } from '@metamask/keyring-internal-api';
 
 /**
  * Returns whether an address is on the Bitcoin mainnet.
diff --git a/test/data/mock-accounts.ts b/test/data/mock-accounts.ts
index b956dbadd6bb..eab4cd4aa74d 100644
--- a/test/data/mock-accounts.ts
+++ b/test/data/mock-accounts.ts
@@ -1,6 +1,6 @@
 import { KeyringTypes } from '@metamask/keyring-controller';
+import { InternalAccount } from '@metamask/keyring-internal-api';
 import {
-  InternalAccount,
   EthAccountType,
   BtcMethod,
   BtcAccountType,
diff --git a/test/jest/mocks.ts b/test/jest/mocks.ts
index 8822b96315b6..9fdc6538d9d6 100644
--- a/test/jest/mocks.ts
+++ b/test/jest/mocks.ts
@@ -3,9 +3,9 @@ import {
   EthMethod,
   BtcMethod,
   BtcAccountType,
-  InternalAccount,
   isEvmAccountType,
 } from '@metamask/keyring-api';
+import { InternalAccount } from '@metamask/keyring-internal-api';
 import { KeyringTypes } from '@metamask/keyring-controller';
 import { v4 as uuidv4 } from 'uuid';
 import { keyringTypeToName } from '@metamask/accounts-controller';
diff --git a/ui/components/app/contact-list/utils.ts b/ui/components/app/contact-list/utils.ts
index 4254988e4af6..fe40d3fd6437 100644
--- a/ui/components/app/contact-list/utils.ts
+++ b/ui/components/app/contact-list/utils.ts
@@ -1,5 +1,5 @@
 import { AddressBookEntry } from '@metamask/address-book-controller';
-import { InternalAccount } from '@metamask/keyring-api';
+import { InternalAccount } from '@metamask/keyring-internal-api';
 
 export const buildDuplicateContactMap = (
   addressBook: AddressBookEntry[],
diff --git a/ui/components/app/toast-master/selectors.ts b/ui/components/app/toast-master/selectors.ts
index b88762c3bc19..80b574c05d90 100644
--- a/ui/components/app/toast-master/selectors.ts
+++ b/ui/components/app/toast-master/selectors.ts
@@ -1,4 +1,5 @@
-import { InternalAccount, isEvmAccountType } from '@metamask/keyring-api';
+import { isEvmAccountType } from '@metamask/keyring-api';
+import { InternalAccount } from '@metamask/keyring-internal-api';
 import { getAlertEnabledness } from '../../../ducks/metamask/metamask';
 import { PRIVACY_POLICY_DATE } from '../../../helpers/constants/privacy-policy';
 import {
diff --git a/ui/components/app/user-preferenced-currency-display/user-preferenced-currency-display.component.d.ts b/ui/components/app/user-preferenced-currency-display/user-preferenced-currency-display.component.d.ts
index 779309858a18..50402436f960 100644
--- a/ui/components/app/user-preferenced-currency-display/user-preferenced-currency-display.component.d.ts
+++ b/ui/components/app/user-preferenced-currency-display/user-preferenced-currency-display.component.d.ts
@@ -1,4 +1,4 @@
-import { InternalAccount } from '@metamask/keyring-api';
+import { InternalAccount } from '@metamask/keyring-internal-api';
 import type { CurrencyDisplayProps } from '../../ui/currency-display/currency-display.component';
 import type { PRIMARY, SECONDARY } from '../../../helpers/constants/common';
 
diff --git a/ui/components/app/wallet-overview/coin-buttons.tsx b/ui/components/app/wallet-overview/coin-buttons.tsx
index 2819e24cad0b..0a3c23ef7e9c 100644
--- a/ui/components/app/wallet-overview/coin-buttons.tsx
+++ b/ui/components/app/wallet-overview/coin-buttons.tsx
@@ -24,7 +24,8 @@ import {
 } from '@metamask/utils';
 
 ///: BEGIN:ONLY_INCLUDE_IF(build-flask)
-import { InternalAccount, isEvmAccountType } from '@metamask/keyring-api';
+import { isEvmAccountType } from '@metamask/keyring-api';
+import { InternalAccount } from '@metamask/keyring-internal-api';
 import { SnapId } from '@metamask/snaps-sdk';
 ///: END:ONLY_INCLUDE_IF
 ///: BEGIN:ONLY_INCLUDE_IF(build-main,build-beta,build-flask)
diff --git a/ui/components/app/wallet-overview/coin-overview.tsx b/ui/components/app/wallet-overview/coin-overview.tsx
index 3be53776581d..ff820da55f98 100644
--- a/ui/components/app/wallet-overview/coin-overview.tsx
+++ b/ui/components/app/wallet-overview/coin-overview.tsx
@@ -10,7 +10,7 @@ import classnames from 'classnames';
 import { CaipChainId } from '@metamask/utils';
 import type { Hex } from '@metamask/utils';
 
-import { InternalAccount } from '@metamask/keyring-api';
+import { InternalAccount } from '@metamask/keyring-internal-api';
 import { getNativeTokenAddress } from '@metamask/assets-controllers';
 import {
   Box,
diff --git a/ui/components/multichain/account-list-menu/account-list-menu.tsx b/ui/components/multichain/account-list-menu/account-list-menu.tsx
index d278b5745423..ca9852af1474 100644
--- a/ui/components/multichain/account-list-menu/account-list-menu.tsx
+++ b/ui/components/multichain/account-list-menu/account-list-menu.tsx
@@ -19,11 +19,11 @@ import {
   EthAccountType,
   SolAccountType,
   ///: BEGIN:ONLY_INCLUDE_IF(build-flask)
-  InternalAccount,
   KeyringAccountType,
   ///: END:ONLY_INCLUDE_IF
 } from '@metamask/keyring-api';
 ///: BEGIN:ONLY_INCLUDE_IF(build-flask)
+import { InternalAccount } from '@metamask/keyring-internal-api';
 import {
   BITCOIN_WALLET_NAME,
   BITCOIN_WALLET_SNAP_ID,
diff --git a/ui/components/multichain/app-header/app-header-unlocked-content.tsx b/ui/components/multichain/app-header/app-header-unlocked-content.tsx
index 69ffca3f71c3..84f6ccf8159a 100644
--- a/ui/components/multichain/app-header/app-header-unlocked-content.tsx
+++ b/ui/components/multichain/app-header/app-header-unlocked-content.tsx
@@ -1,7 +1,7 @@
 import React, { useContext, useState } from 'react';
 import browser from 'webextension-polyfill';
 
-import { InternalAccount } from '@metamask/keyring-api';
+import { InternalAccount } from '@metamask/keyring-internal-api';
 import { useDispatch, useSelector } from 'react-redux';
 import { useHistory } from 'react-router-dom';
 import {
diff --git a/ui/components/multichain/connect-accounts-modal/connect-account-modal.types.ts b/ui/components/multichain/connect-accounts-modal/connect-account-modal.types.ts
index 392d5b210dd4..4f9b4e56b4a2 100644
--- a/ui/components/multichain/connect-accounts-modal/connect-account-modal.types.ts
+++ b/ui/components/multichain/connect-accounts-modal/connect-account-modal.types.ts
@@ -1,4 +1,4 @@
-import { type InternalAccount } from '@metamask/keyring-api';
+import { type InternalAccount } from '@metamask/keyring-internal-api';
 
 export enum ConnectAccountsType {
   Account = 'disconnectAllAccountsText',
diff --git a/ui/components/multichain/connect-accounts-modal/connect-accounts-modal.tsx b/ui/components/multichain/connect-accounts-modal/connect-accounts-modal.tsx
index 457e15b0141d..ff48f416e29d 100644
--- a/ui/components/multichain/connect-accounts-modal/connect-accounts-modal.tsx
+++ b/ui/components/multichain/connect-accounts-modal/connect-accounts-modal.tsx
@@ -1,6 +1,7 @@
 import React, { useState } from 'react';
 import { useSelector } from 'react-redux';
-import { InternalAccount, isEvmAccountType } from '@metamask/keyring-api';
+import { isEvmAccountType } from '@metamask/keyring-api';
+import { InternalAccount } from '@metamask/keyring-internal-api';
 import { getUnconnectedAccounts } from '../../../selectors/selectors';
 import { ConnectAccountsModalList } from './connect-accounts-modal-list';
 
diff --git a/ui/components/multichain/connected-accounts-menu/connected-accounts-menu.types.ts b/ui/components/multichain/connected-accounts-menu/connected-accounts-menu.types.ts
index c5c28678e689..4c510166d48f 100644
--- a/ui/components/multichain/connected-accounts-menu/connected-accounts-menu.types.ts
+++ b/ui/components/multichain/connected-accounts-menu/connected-accounts-menu.types.ts
@@ -1,4 +1,4 @@
-import { InternalAccount } from '@metamask/keyring-api';
+import { InternalAccount } from '@metamask/keyring-internal-api';
 
 export type KeyringMetadata = {
   type: string;
diff --git a/ui/components/multichain/create-account/create-account.tsx b/ui/components/multichain/create-account/create-account.tsx
index 446d487482e5..81e63ff60b39 100644
--- a/ui/components/multichain/create-account/create-account.tsx
+++ b/ui/components/multichain/create-account/create-account.tsx
@@ -8,7 +8,7 @@ import React, {
 } from 'react';
 import { useSelector } from 'react-redux';
 import { useHistory } from 'react-router-dom';
-import { InternalAccount } from '@metamask/keyring-api';
+import { InternalAccount } from '@metamask/keyring-internal-api';
 import {
   Box,
   ButtonPrimary,
diff --git a/ui/components/multichain/create-named-snap-account/create-named-snap-account.tsx b/ui/components/multichain/create-named-snap-account/create-named-snap-account.tsx
index 194a8c6399df..d04763902247 100644
--- a/ui/components/multichain/create-named-snap-account/create-named-snap-account.tsx
+++ b/ui/components/multichain/create-named-snap-account/create-named-snap-account.tsx
@@ -1,7 +1,7 @@
 import React, { useCallback } from 'react';
 import { useSelector } from 'react-redux';
 import { useHistory } from 'react-router-dom';
-import { InternalAccount } from '@metamask/keyring-api';
+import { InternalAccount } from '@metamask/keyring-internal-api';
 import { KeyringTypes } from '@metamask/keyring-controller';
 import { CreateAccount } from '..';
 import { Box, ModalHeader } from '../../component-library';
diff --git a/ui/components/multichain/menu-items/view-explorer-menu-item.tsx b/ui/components/multichain/menu-items/view-explorer-menu-item.tsx
index d29b679d3111..b6c1d23eb07b 100644
--- a/ui/components/multichain/menu-items/view-explorer-menu-item.tsx
+++ b/ui/components/multichain/menu-items/view-explorer-menu-item.tsx
@@ -3,7 +3,7 @@ import { useSelector } from 'react-redux';
 import { useHistory } from 'react-router-dom';
 
 import { parseCaipChainId } from '@metamask/utils';
-import { InternalAccount } from '@metamask/keyring-api';
+import { InternalAccount } from '@metamask/keyring-internal-api';
 import {
   getMultichainAccountUrl,
   getMultichainBlockExplorerUrl,
diff --git a/ui/components/multichain/pages/connections/components/connections.types.tsx b/ui/components/multichain/pages/connections/components/connections.types.tsx
index 9bdbf86d9d95..2d459e047f46 100644
--- a/ui/components/multichain/pages/connections/components/connections.types.tsx
+++ b/ui/components/multichain/pages/connections/components/connections.types.tsx
@@ -1,4 +1,4 @@
-import { type InternalAccount } from '@metamask/keyring-api';
+import { type InternalAccount } from '@metamask/keyring-internal-api';
 
 // Define ConnectedSite interface
 export type ConnectedSite = {
diff --git a/ui/components/multichain/pages/review-permissions-page/review-permission.types.tsx b/ui/components/multichain/pages/review-permissions-page/review-permission.types.tsx
index 6111dd8d946f..a92aba300c1a 100644
--- a/ui/components/multichain/pages/review-permissions-page/review-permission.types.tsx
+++ b/ui/components/multichain/pages/review-permissions-page/review-permission.types.tsx
@@ -1,4 +1,4 @@
-import { type InternalAccount } from '@metamask/keyring-api';
+import { type InternalAccount } from '@metamask/keyring-internal-api';
 
 // Define ConnectedSite interface
 export type ConnectedSite = {
diff --git a/ui/components/multichain/pages/review-permissions-page/review-permissions-page.tsx b/ui/components/multichain/pages/review-permissions-page/review-permissions-page.tsx
index 95a8ea394000..d71bc499717e 100644
--- a/ui/components/multichain/pages/review-permissions-page/review-permissions-page.tsx
+++ b/ui/components/multichain/pages/review-permissions-page/review-permissions-page.tsx
@@ -2,7 +2,8 @@ import React, { useEffect, useMemo, useState } from 'react';
 import { useDispatch, useSelector } from 'react-redux';
 import { useHistory, useParams } from 'react-router-dom';
 import { NonEmptyArray } from '@metamask/utils';
-import { InternalAccount, isEvmAccountType } from '@metamask/keyring-api';
+import { isEvmAccountType } from '@metamask/keyring-api';
+import { InternalAccount } from '@metamask/keyring-internal-api';
 import { NetworkConfiguration } from '@metamask/network-controller';
 import {
   AlignItems,
diff --git a/ui/components/multichain/pages/send/components/your-accounts.tsx b/ui/components/multichain/pages/send/components/your-accounts.tsx
index e59d0aa2d5a1..a0d431919ce6 100644
--- a/ui/components/multichain/pages/send/components/your-accounts.tsx
+++ b/ui/components/multichain/pages/send/components/your-accounts.tsx
@@ -1,10 +1,7 @@
 import React, { useContext, useMemo } from 'react';
 import { useDispatch, useSelector } from 'react-redux';
-import {
-  EthAccountType,
-  InternalAccount,
-  KeyringAccountType,
-} from '@metamask/keyring-api';
+import { EthAccountType, KeyringAccountType } from '@metamask/keyring-api';
+import { InternalAccount } from '@metamask/keyring-internal-api';
 import {
   getUpdatedAndSortedAccounts,
   getInternalAccounts,
diff --git a/ui/components/multichain/toast/toast.test.tsx b/ui/components/multichain/toast/toast.test.tsx
index eb208d41e122..65e40bc243d8 100644
--- a/ui/components/multichain/toast/toast.test.tsx
+++ b/ui/components/multichain/toast/toast.test.tsx
@@ -1,7 +1,7 @@
 /* eslint-disable jest/require-top-level-describe */
 import React from 'react';
 import { fireEvent, render } from '@testing-library/react';
-import { InternalAccount } from '@metamask/keyring-api';
+import { InternalAccount } from '@metamask/keyring-internal-api';
 import { AvatarAccount, AvatarAccountSize } from '../../component-library';
 import { BorderColor } from '../../../helpers/constants/design-system';
 import { createMockInternalAccount } from '../../../../test/jest/mocks';
diff --git a/ui/helpers/utils/permissions.test.ts b/ui/helpers/utils/permissions.test.ts
index 43857afb1815..7dd37d3a6c96 100644
--- a/ui/helpers/utils/permissions.test.ts
+++ b/ui/helpers/utils/permissions.test.ts
@@ -1,8 +1,5 @@
-import {
-  BtcAccountType,
-  BtcMethod,
-  InternalAccount,
-} from '@metamask/keyring-api';
+import { BtcAccountType, BtcMethod } from '@metamask/keyring-api';
+import { InternalAccount } from '@metamask/keyring-internal-api';
 import { createMockInternalAccount } from '../../../test/jest/mocks';
 import { containsEthPermissionsAndNonEvmAccount } from './permissions';
 
diff --git a/ui/helpers/utils/permissions.ts b/ui/helpers/utils/permissions.ts
index 2e9d25a065f9..605f4e721d48 100644
--- a/ui/helpers/utils/permissions.ts
+++ b/ui/helpers/utils/permissions.ts
@@ -1,4 +1,5 @@
-import { InternalAccount, isEvmAccountType } from '@metamask/keyring-api';
+import { InternalAccount } from '@metamask/keyring-internal-api';
+import { isEvmAccountType } from '@metamask/keyring-api';
 import { RestrictedEthMethods } from '../../../shared/constants/permissions';
 
 export const containsEthPermissionsAndNonEvmAccount = (
diff --git a/ui/hooks/accounts/useMultichainWalletSnapClient.ts b/ui/hooks/accounts/useMultichainWalletSnapClient.ts
index 98dfa9b429d3..702f07771a28 100644
--- a/ui/hooks/accounts/useMultichainWalletSnapClient.ts
+++ b/ui/hooks/accounts/useMultichainWalletSnapClient.ts
@@ -1,4 +1,4 @@
-import { KeyringClient, Sender } from '@metamask/keyring-api';
+import { KeyringClient, Sender } from '@metamask/keyring-snap-client';
 import { HandlerType } from '@metamask/snaps-utils';
 import { CaipChainId, Json, JsonRpcRequest } from '@metamask/utils';
 import { SnapId } from '@metamask/snaps-sdk';
diff --git a/ui/hooks/metamask-notifications/useNotifications.ts b/ui/hooks/metamask-notifications/useNotifications.ts
index 60eb154bc75e..b2ada59c2f7a 100644
--- a/ui/hooks/metamask-notifications/useNotifications.ts
+++ b/ui/hooks/metamask-notifications/useNotifications.ts
@@ -1,6 +1,6 @@
 import { useState, useCallback } from 'react';
 import { useDispatch } from 'react-redux';
-import type { InternalAccount } from '@metamask/keyring-api';
+import type { InternalAccount } from '@metamask/keyring-internal-api';
 import log from 'loglevel';
 
 import { type MarkAsReadNotificationsParam } from '@metamask/notification-services-controller/notification-services';
diff --git a/ui/hooks/useMultichainAccountTotalFiatBalance.test.tsx b/ui/hooks/useMultichainAccountTotalFiatBalance.test.tsx
index 921baaebab08..9b6cd5e51455 100644
--- a/ui/hooks/useMultichainAccountTotalFiatBalance.test.tsx
+++ b/ui/hooks/useMultichainAccountTotalFiatBalance.test.tsx
@@ -1,7 +1,8 @@
 import React from 'react';
 import { renderHook } from '@testing-library/react-hooks';
 import { Provider } from 'react-redux';
-import { BtcAccountType, InternalAccount } from '@metamask/keyring-api';
+import { BtcAccountType } from '@metamask/keyring-api';
+import { InternalAccount } from '@metamask/keyring-internal-api';
 import mockState from '../../test/data/mock-state.json';
 import configureStore from '../store/store';
 import { createMockInternalAccount } from '../../test/jest/mocks';
diff --git a/ui/hooks/useMultichainAccountTotalFiatBalance.ts b/ui/hooks/useMultichainAccountTotalFiatBalance.ts
index 335b8399c6d5..816be806142c 100644
--- a/ui/hooks/useMultichainAccountTotalFiatBalance.ts
+++ b/ui/hooks/useMultichainAccountTotalFiatBalance.ts
@@ -1,5 +1,6 @@
 import { useSelector } from 'react-redux';
-import { InternalAccount, isEvmAccountType } from '@metamask/keyring-api';
+import { InternalAccount } from '@metamask/keyring-internal-api';
+import { isEvmAccountType } from '@metamask/keyring-api';
 import {
   getMultichainCurrencyImage,
   getMultichainBalances,
diff --git a/ui/hooks/useMultichainSelector.test.ts b/ui/hooks/useMultichainSelector.test.ts
index e5d7f197ffcb..f04fef64783a 100644
--- a/ui/hooks/useMultichainSelector.test.ts
+++ b/ui/hooks/useMultichainSelector.test.ts
@@ -1,4 +1,4 @@
-import { InternalAccount } from '@metamask/keyring-api';
+import { InternalAccount } from '@metamask/keyring-internal-api';
 import { createMockInternalAccount } from '../../test/jest/mocks';
 import { renderHookWithProvider } from '../../test/lib/render-helpers';
 import { getSelectedNetworkClientId } from '../../shared/modules/selectors/networks';
diff --git a/ui/hooks/useMultichainSelector.ts b/ui/hooks/useMultichainSelector.ts
index 9bd979df7e7e..286e8b111cd7 100644
--- a/ui/hooks/useMultichainSelector.ts
+++ b/ui/hooks/useMultichainSelector.ts
@@ -1,5 +1,5 @@
 import { useSelector, DefaultRootState } from 'react-redux';
-import { InternalAccount } from '@metamask/keyring-api';
+import { InternalAccount } from '@metamask/keyring-internal-api';
 import { getSelectedInternalAccount } from '../selectors';
 
 export function useMultichainSelector<
diff --git a/ui/pages/permissions-connect/connect-page/connect-page.tsx b/ui/pages/permissions-connect/connect-page/connect-page.tsx
index 32001a75d3a7..741629b3d4d7 100644
--- a/ui/pages/permissions-connect/connect-page/connect-page.tsx
+++ b/ui/pages/permissions-connect/connect-page/connect-page.tsx
@@ -1,6 +1,7 @@
 import React, { useMemo, useState } from 'react';
 import { useSelector } from 'react-redux';
-import { InternalAccount, isEvmAccountType } from '@metamask/keyring-api';
+import { InternalAccount } from '@metamask/keyring-internal-api';
+import { isEvmAccountType } from '@metamask/keyring-api';
 import { NetworkConfiguration } from '@metamask/network-controller';
 import { useI18nContext } from '../../../hooks/useI18nContext';
 import {
diff --git a/ui/pages/snap-account-transaction-loading-screen/snap-account-transaction-loading-screen.tsx b/ui/pages/snap-account-transaction-loading-screen/snap-account-transaction-loading-screen.tsx
index cf2e0b222dd9..03b8c36f1265 100644
--- a/ui/pages/snap-account-transaction-loading-screen/snap-account-transaction-loading-screen.tsx
+++ b/ui/pages/snap-account-transaction-loading-screen/snap-account-transaction-loading-screen.tsx
@@ -1,5 +1,5 @@
 import React, { useContext, useEffect } from 'react';
-import { InternalAccount } from '@metamask/keyring-api';
+import { InternalAccount } from '@metamask/keyring-internal-api';
 import { useI18nContext } from '../../hooks/useI18nContext';
 import { MetaMetricsContext } from '../../contexts/metametrics';
 import {
diff --git a/ui/selectors/accounts.ts b/ui/selectors/accounts.ts
index af977b7511da..1646c4759552 100644
--- a/ui/selectors/accounts.ts
+++ b/ui/selectors/accounts.ts
@@ -1,8 +1,5 @@
-import {
-  EthAccountType,
-  BtcAccountType,
-  InternalAccount,
-} from '@metamask/keyring-api';
+import { EthAccountType, BtcAccountType } from '@metamask/keyring-api';
+import { InternalAccount } from '@metamask/keyring-internal-api';
 import { AccountsControllerState } from '@metamask/accounts-controller';
 import {
   isBtcMainnetAddress,
diff --git a/ui/selectors/multichain.test.ts b/ui/selectors/multichain.test.ts
index 110fdc3a5174..5b4b07a93a57 100644
--- a/ui/selectors/multichain.test.ts
+++ b/ui/selectors/multichain.test.ts
@@ -1,7 +1,7 @@
 import { Cryptocurrency } from '@metamask/assets-controllers';
-import { InternalAccount } from '@metamask/keyring-api';
 import { Hex } from '@metamask/utils';
 import { NetworkConfiguration } from '@metamask/network-controller';
+import { InternalAccount } from '@metamask/keyring-internal-api';
 import {
   getCurrentCurrency,
   getNativeCurrency,
diff --git a/ui/selectors/multichain.ts b/ui/selectors/multichain.ts
index 2fd366ed4263..3fdea53414e9 100644
--- a/ui/selectors/multichain.ts
+++ b/ui/selectors/multichain.ts
@@ -1,5 +1,6 @@
 import PropTypes from 'prop-types';
-import { InternalAccount, isEvmAccountType } from '@metamask/keyring-api';
+import { isEvmAccountType } from '@metamask/keyring-api';
+import { InternalAccount } from '@metamask/keyring-internal-api';
 import type { RatesControllerState } from '@metamask/assets-controllers';
 import { CaipChainId, Hex, KnownCaipNamespace } from '@metamask/utils';
 import { createSelector } from 'reselect';
diff --git a/ui/selectors/selectors.types.ts b/ui/selectors/selectors.types.ts
index 15e06b8262e9..4d2404e10f7c 100644
--- a/ui/selectors/selectors.types.ts
+++ b/ui/selectors/selectors.types.ts
@@ -1,4 +1,4 @@
-import type { InternalAccount } from '@metamask/keyring-api';
+import type { InternalAccount } from '@metamask/keyring-internal-api';
 import { SubjectMetadata } from '@metamask/permission-controller';
 
 type KeyringType = {
diff --git a/ui/store/store.ts b/ui/store/store.ts
index 8433511380e7..2d461a85eace 100644
--- a/ui/store/store.ts
+++ b/ui/store/store.ts
@@ -4,12 +4,12 @@ import devtoolsEnhancer from 'remote-redux-devtools';
 import { ApprovalControllerState } from '@metamask/approval-controller';
 import { GasEstimateType, GasFeeEstimates } from '@metamask/gas-fee-controller';
 import { TransactionMeta } from '@metamask/transaction-controller';
-import { InternalAccount } from '@metamask/keyring-api';
 import {
   NftControllerState,
   TokensControllerState,
 } from '@metamask/assets-controllers';
 import { NotificationServicesControllerState } from '@metamask/notification-services-controller/notification-services';
+import { InternalAccount } from '@metamask/keyring-internal-api';
 import rootReducer from '../ducks';
 import { LedgerTransportTypes } from '../../shared/constants/hardware-wallets';
 import type { NetworkStatus } from '../../shared/constants/network';
diff --git a/yarn.lock b/yarn.lock
index 0359c83c1da9..033ff849acd8 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4877,14 +4877,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/accounts-controller@npm:^20.0.0":
-  version: 20.0.0
-  resolution: "@metamask/accounts-controller@npm:20.0.0"
+"@metamask/accounts-controller@npm:^20.0.2":
+  version: 20.0.2
+  resolution: "@metamask/accounts-controller@npm:20.0.2"
   dependencies:
     "@ethereumjs/util": "npm:^8.1.0"
     "@metamask/base-controller": "npm:^7.0.2"
-    "@metamask/eth-snap-keyring": "npm:^5.0.1"
-    "@metamask/keyring-api": "npm:^10.1.0"
+    "@metamask/eth-snap-keyring": "npm:^7.0.0"
+    "@metamask/keyring-api": "npm:^12.0.0"
+    "@metamask/keyring-internal-api": "npm:^1.0.0"
     "@metamask/snaps-sdk": "npm:^6.7.0"
     "@metamask/snaps-utils": "npm:^8.3.0"
     "@metamask/utils": "npm:^10.0.0"
@@ -4894,8 +4895,10 @@ __metadata:
     uuid: "npm:^8.3.2"
   peerDependencies:
     "@metamask/keyring-controller": ^19.0.0
+    "@metamask/providers": ^18.1.0
     "@metamask/snaps-controllers": ^9.7.0
-  checksum: 10/36f42d5d7db47c15eef4a7b72d8b19bcd08579a26db452974e76b527e47ef71e63bea47a4f1992fd2eadce44be4020f596dc7049f59766d6aa1b857c4518664f
+    webextension-polyfill: ^0.10.0 || ^0.11.0 || ^0.12.0
+  checksum: 10/4376418913fcdebda251c00a2f373ada5c5b26e45617ece3a5624bb0d7440bbfb1fb8332cae0f5f4fa04751fe2ffd8cea40fab342d54591fe21d8cd34c14744c
   languageName: node
   linkType: hard
 
@@ -5363,22 +5366,27 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/eth-snap-keyring@npm:^5.0.1":
-  version: 5.0.1
-  resolution: "@metamask/eth-snap-keyring@npm:5.0.1"
+"@metamask/eth-snap-keyring@npm:^7.0.0":
+  version: 7.0.0
+  resolution: "@metamask/eth-snap-keyring@npm:7.0.0"
   dependencies:
     "@ethereumjs/tx": "npm:^4.2.0"
     "@metamask/eth-sig-util": "npm:^8.0.0"
+    "@metamask/keyring-api": "npm:^12.0.0"
+    "@metamask/keyring-internal-api": "npm:^1.0.0"
+    "@metamask/keyring-internal-snap-client": "npm:^1.0.0"
     "@metamask/snaps-controllers": "npm:^9.10.0"
     "@metamask/snaps-sdk": "npm:^6.7.0"
     "@metamask/snaps-utils": "npm:^8.3.0"
     "@metamask/superstruct": "npm:^3.1.0"
-    "@metamask/utils": "npm:^9.2.1"
+    "@metamask/utils": "npm:^9.3.0"
     "@types/uuid": "npm:^9.0.8"
     uuid: "npm:^9.0.1"
+    webextension-polyfill: "npm:^0.12.0"
   peerDependencies:
-    "@metamask/keyring-api": ^10.1.0
-  checksum: 10/4d9d700b7c2ecc1b17e92f716f7aeb04bbd03836601b5d37f639bed7fba4d5f00bafadf5359d2416c319cdf18eb2f9417c7353654737af87a6e8579d5e5bab79
+    "@metamask/keyring-api": ^12.0.0
+    "@metamask/providers": ^18.1.0
+  checksum: 10/7a82cd2c19204776d31e29716844ac6f304ce4b136b36728be8e7b19ac2be6b46d0c72cc9707c48669a7a342994ce401aafbfe3f0b47769748ab86ae2169cbbd
   languageName: node
   linkType: hard
 
@@ -5623,23 +5631,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/keyring-api@npm:^10.1.0":
-  version: 10.1.0
-  resolution: "@metamask/keyring-api@npm:10.1.0"
-  dependencies:
-    "@metamask/snaps-sdk": "npm:^6.7.0"
-    "@metamask/superstruct": "npm:^3.1.0"
-    "@metamask/utils": "npm:^9.2.1"
-    "@types/uuid": "npm:^9.0.8"
-    bech32: "npm:^2.0.0"
-    uuid: "npm:^9.0.1"
-    webextension-polyfill: "npm:^0.12.0"
-  peerDependencies:
-    "@metamask/providers": ^18.1.0
-  checksum: 10/de22b9f5f3aecc290210fa78161e157aa8358f8dad421a093c9f6dbe35c4755067472a732f10d1ddbfba789e871c64edd8ea1c4c7316a392b214a187efd46ebe
-  languageName: node
-  linkType: hard
-
 "@metamask/keyring-api@npm:^12.0.0":
   version: 12.0.0
   resolution: "@metamask/keyring-api@npm:12.0.0"
@@ -5652,7 +5643,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/keyring-controller@npm:^19.0.0, @metamask/keyring-controller@npm:^19.0.2":
+"@metamask/keyring-controller@npm:^19.0.2":
   version: 19.0.2
   resolution: "@metamask/keyring-controller@npm:19.0.2"
   dependencies:
@@ -5686,6 +5677,39 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@metamask/keyring-internal-snap-client@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "@metamask/keyring-internal-snap-client@npm:1.0.0"
+  dependencies:
+    "@metamask/keyring-api": "npm:^12.0.0"
+    "@metamask/keyring-snap-client": "npm:^1.0.0"
+    "@metamask/keyring-utils": "npm:^1.0.0"
+    "@metamask/snaps-controllers": "npm:^9.10.0"
+    "@metamask/snaps-sdk": "npm:^6.7.0"
+    "@metamask/snaps-utils": "npm:^8.3.0"
+    webextension-polyfill: "npm:^0.12.0"
+  peerDependencies:
+    "@metamask/providers": ^18.1.0
+  checksum: 10/4c02429235bf5b3609fe2d728f0f976fc87cc276483c092d155b181eeb1f167953a96226c4f6b64f6700084f8a66e5b02944ba0accf201e3514e83df205389e1
+  languageName: node
+  linkType: hard
+
+"@metamask/keyring-snap-client@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "@metamask/keyring-snap-client@npm:1.0.0"
+  dependencies:
+    "@metamask/keyring-api": "npm:^12.0.0"
+    "@metamask/keyring-utils": "npm:^1.0.0"
+    "@metamask/superstruct": "npm:^3.1.0"
+    "@types/uuid": "npm:^9.0.8"
+    uuid: "npm:^9.0.1"
+    webextension-polyfill: "npm:^0.12.0"
+  peerDependencies:
+    "@metamask/providers": ^18.1.0
+  checksum: 10/7b3ee4ab6b39f8e06d55dee2c29f778eeb2eeb8bb311eccaab07d1f8a855fa920bf52e78bd2be0f3ddcb66dc475282d740de0cc7337ccd99e956302a706d76a0
+  languageName: node
+  linkType: hard
+
 "@metamask/keyring-utils@npm:^1.0.0":
   version: 1.0.0
   resolution: "@metamask/keyring-utils@npm:1.0.0"
@@ -26521,7 +26545,7 @@ __metadata:
     "@metamask-institutional/types": "npm:^1.2.0"
     "@metamask/abi-utils": "npm:^2.0.2"
     "@metamask/account-watcher": "npm:^4.1.2"
-    "@metamask/accounts-controller": "npm:^20.0.0"
+    "@metamask/accounts-controller": "npm:^20.0.2"
     "@metamask/address-book-controller": "npm:^6.0.0"
     "@metamask/announcement-controller": "npm:^7.0.0"
     "@metamask/api-specs": "npm:^0.9.3"
@@ -26549,7 +26573,7 @@ __metadata:
     "@metamask/eth-ledger-bridge-keyring": "npm:^5.0.1"
     "@metamask/eth-query": "npm:^4.0.0"
     "@metamask/eth-sig-util": "npm:^7.0.1"
-    "@metamask/eth-snap-keyring": "npm:^5.0.1"
+    "@metamask/eth-snap-keyring": "npm:^7.0.0"
     "@metamask/eth-token-tracker": "npm:^9.0.0"
     "@metamask/eth-trezor-keyring": "npm:^3.1.3"
     "@metamask/etherscan-link": "npm:^3.0.0"
@@ -26561,8 +26585,10 @@ __metadata:
     "@metamask/jazzicon": "npm:^2.0.0"
     "@metamask/json-rpc-engine": "npm:^10.0.0"
     "@metamask/json-rpc-middleware-stream": "npm:^8.0.4"
-    "@metamask/keyring-api": "npm:^10.1.0"
-    "@metamask/keyring-controller": "npm:^19.0.0"
+    "@metamask/keyring-api": "npm:^12.0.0"
+    "@metamask/keyring-controller": "npm:^19.0.2"
+    "@metamask/keyring-internal-api": "npm:^1.0.0"
+    "@metamask/keyring-snap-client": "npm:^1.0.0"
     "@metamask/logging-controller": "npm:^6.0.0"
     "@metamask/logo": "npm:^3.1.2"
     "@metamask/message-manager": "npm:^11.0.0"

From 5aa29623c173e3fd2ae5c4a65f27e132716b902e Mon Sep 17 00:00:00 2001
From: Zbyszek Tenerowicz <naugtur@gmail.com>
Date: Wed, 18 Dec 2024 13:31:28 +0100
Subject: [PATCH 163/175] chore: Update lavamoat to a version with more
 diff-friendly policy ordering (#29311)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<!--
Please submit this PR as a draft initially.
Do not mark it as "Ready for review" until the template has been
completely filled out, and PR status checks have passed at least once.
-->

## **Description**

This lavamoat update brings a different sorting comparator for
policy.json files that will produce more readable diffs.
This PR has 2 commits - one that reorders the policy without making any
changes and another that updates lavamoat packages on top of that.

For better clarity on the policy.json files, inspect each commit
separately.

This is going to be hard to review and merge because conflict resolution
requires a redo. Gonna have to schedule it carefully.

[![Open in GitHub
Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/29311?quickstart=1)

## **Related issues**


## **Manual testing steps**

1. run a local policy update and verify the diff is not ridiculously
large (that would mean the update failed to apply properly after policy
got reordered here)

## **Screenshots/Recordings**

<!-- If applicable, add screenshots and/or recordings to visualize the
before and after of your change. -->

### **Before**

<!-- [screenshots/recordings] -->

### **After**

<!-- [screenshots/recordings] -->

## **Pre-merge author checklist**

- [x] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension Coding
Standards](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/CODING_GUIDELINES.md).
- [x] I've completed the PR template to the best of my ability
- [x] I’ve included tests if applicable
- [x] I’ve documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [x] I’ve applied the right labels on the PR (see [labeling
guidelines](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.

## **Pre-merge reviewer checklist**

- [ ] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed).
- [ ] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.

---------

Co-authored-by: MetaMask Bot <metamaskbot@users.noreply.github.com>
---
 lavamoat/browserify/beta/policy.json          |  6285 ++++-----
 lavamoat/browserify/flask/policy.json         |  6285 ++++-----
 lavamoat/browserify/main/policy.json          |  6285 ++++-----
 lavamoat/browserify/mmi/policy.json           |  6473 ++++-----
 lavamoat/build-system/policy.json             | 11183 ++++++++--------
 package.json                                  |    11 +-
 .../global/specs/protect-intrinsics.spec.ts   |     1 -
 yarn.lock                                     |   354 +-
 8 files changed, 18450 insertions(+), 18427 deletions(-)

diff --git a/lavamoat/browserify/beta/policy.json b/lavamoat/browserify/beta/policy.json
index 542d38004de3..82075f709022 100644
--- a/lavamoat/browserify/beta/policy.json
+++ b/lavamoat/browserify/beta/policy.json
@@ -5,144 +5,124 @@
         "regeneratorRuntime": "write"
       }
     },
-    "@ensdomains/content-hash": {
+    "eth-lattice-keyring>@ethereumjs/tx>@chainsafe/ssz>@chainsafe/persistent-merkle-tree": {
       "globals": {
-        "console.warn": true
+        "WeakRef": 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
+        "browserify": true
       }
     },
-    "@ensdomains/content-hash>cids": {
+    "eth-lattice-keyring>@ethereumjs/tx>@chainsafe/ssz": {
       "packages": {
-        "@ensdomains/content-hash>cids>multibase": true,
-        "@ensdomains/content-hash>cids>multihashes": true,
-        "@ensdomains/content-hash>cids>uint8arrays": true,
-        "@ensdomains/content-hash>multicodec": true
+        "eth-lattice-keyring>@ethereumjs/tx>@chainsafe/ssz>@chainsafe/persistent-merkle-tree": true,
+        "browserify": true,
+        "browserify>buffer": true,
+        "eth-lattice-keyring>@ethereumjs/tx>@chainsafe/ssz>case": true
       }
     },
-    "@ensdomains/content-hash>cids>multibase": {
+    "@metamask/notification-services-controller>@contentful/rich-text-html-renderer": {
       "globals": {
-        "TextDecoder": true,
-        "TextEncoder": true
+        "SuppressedError": true
+      }
+    },
+    "@ensdomains/content-hash": {
+      "globals": {
+        "console.warn": true
       },
       "packages": {
-        "@ensdomains/content-hash>cids>multibase>@multiformats/base-x": true
+        "browserify>buffer": true,
+        "@ensdomains/content-hash>cids": true,
+        "@ensdomains/content-hash>js-base64": true,
+        "@ensdomains/content-hash>multicodec": true,
+        "@ensdomains/content-hash>multihashes": true
       }
     },
-    "@ensdomains/content-hash>cids>multihashes": {
+    "@ethereumjs/tx>@ethereumjs/common": {
       "packages": {
-        "@ensdomains/content-hash>cids>multibase": true,
-        "@ensdomains/content-hash>cids>multihashes>varint": true,
-        "@ensdomains/content-hash>cids>uint8arrays": true
+        "@ethereumjs/tx>@ethereumjs/util": true,
+        "browserify>buffer": true,
+        "@ethereumjs/tx>@ethereumjs/common>crc-32": true,
+        "webpack>events": true
       }
     },
-    "@ensdomains/content-hash>cids>uint8arrays": {
-      "globals": {
-        "TextDecoder": true,
-        "TextEncoder": true
-      },
+    "@metamask/smart-transactions-controller>@ethereumjs/tx>@ethereumjs/common": {
       "packages": {
-        "@ensdomains/content-hash>cids>multibase": true
+        "@metamask/smart-transactions-controller>@ethereumjs/util": true,
+        "webpack>events": true
       }
     },
-    "@ensdomains/content-hash>js-base64": {
-      "globals": {
-        "Base64": "write",
-        "TextDecoder": true,
-        "TextEncoder": true,
-        "atob": true,
-        "btoa": true,
-        "define": true
-      },
+    "eth-lattice-keyring>gridplus-sdk>@ethereumjs/tx>@ethereumjs/common": {
       "packages": {
-        "browserify>buffer": true
+        "@ethereumjs/tx>@ethereumjs/util": true,
+        "browserify>buffer": true,
+        "@ethereumjs/tx>@ethereumjs/common>crc-32": true,
+        "webpack>events": true
       }
     },
-    "@ensdomains/content-hash>multicodec": {
+    "eth-lattice-keyring>gridplus-sdk>@ethereumjs/common": {
       "packages": {
-        "@ensdomains/content-hash>multicodec>uint8arrays": true,
-        "sass-embedded>varint": true
+        "@ethereumjs/tx>@ethereumjs/util": true,
+        "browserify>buffer": true,
+        "@ethereumjs/tx>@ethereumjs/common>crc-32": true,
+        "webpack>events": true
       }
     },
-    "@ensdomains/content-hash>multicodec>uint8arrays": {
+    "@ethereumjs/tx>@ethereumjs/rlp": {
       "globals": {
-        "Buffer": true,
-        "TextDecoder": true,
         "TextEncoder": true
-      },
-      "packages": {
-        "@ensdomains/content-hash>multicodec>uint8arrays>multiformats": true
       }
     },
-    "@ensdomains/content-hash>multicodec>uint8arrays>multiformats": {
+    "@metamask/smart-transactions-controller>@ethereumjs/tx>@ethereumjs/rlp": {
       "globals": {
-        "TextDecoder": true,
-        "TextEncoder": true,
-        "console.warn": true,
-        "crypto.subtle.digest": 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
+        "TextEncoder": true
       }
     },
-    "@ensdomains/content-hash>multihashes>multibase": {
-      "packages": {
-        "@ensdomains/content-hash>multihashes>multibase>base-x": true,
-        "@ensdomains/content-hash>multihashes>web-encoding": true,
-        "browserify>buffer": true
+    "@metamask/eth-ledger-bridge-keyring>@ethereumjs/rlp": {
+      "globals": {
+        "TextEncoder": true
       }
     },
-    "@ensdomains/content-hash>multihashes>multibase>base-x": {
+    "@ethereumjs/tx": {
       "packages": {
-        "koa>content-disposition>safe-buffer": true
+        "@ethereumjs/tx>@ethereumjs/common": true,
+        "@ethereumjs/tx>@ethereumjs/rlp": true,
+        "@ethereumjs/tx>@ethereumjs/util": true,
+        "browserify>buffer": true,
+        "@ethereumjs/tx>ethereum-cryptography": true,
+        "browserify>insert-module-globals>is-buffer": true
       }
     },
-    "@ensdomains/content-hash>multihashes>web-encoding": {
-      "globals": {
-        "TextDecoder": true,
-        "TextEncoder": true
-      },
+    "@metamask/smart-transactions-controller>@ethereumjs/tx": {
       "packages": {
-        "browserify>util": true
+        "@metamask/smart-transactions-controller>@ethereumjs/tx>@ethereumjs/common": true,
+        "@metamask/smart-transactions-controller>@ethereumjs/tx>@ethereumjs/rlp": true,
+        "@metamask/smart-transactions-controller>@ethereumjs/util": true,
+        "@ethereumjs/tx>ethereum-cryptography": true
       }
     },
-    "@ethereumjs/tx": {
+    "eth-lattice-keyring>@ethereumjs/tx": {
       "packages": {
+        "eth-lattice-keyring>@ethereumjs/tx>@chainsafe/ssz": true,
         "@ethereumjs/tx>@ethereumjs/common": true,
         "@ethereumjs/tx>@ethereumjs/rlp": true,
         "@ethereumjs/tx>@ethereumjs/util": true,
-        "@ethereumjs/tx>ethereum-cryptography": true,
+        "@ethersproject/providers": true,
         "browserify>buffer": true,
+        "eth-lattice-keyring>@ethereumjs/tx>ethereum-cryptography": true,
         "browserify>insert-module-globals>is-buffer": true
       }
     },
-    "@ethereumjs/tx>@ethereumjs/common": {
+    "eth-lattice-keyring>gridplus-sdk>@ethereumjs/tx": {
       "packages": {
-        "@ethereumjs/tx>@ethereumjs/common>crc-32": true,
+        "eth-lattice-keyring>@ethereumjs/tx>@chainsafe/ssz": true,
+        "eth-lattice-keyring>gridplus-sdk>@ethereumjs/tx>@ethereumjs/common": true,
+        "@ethereumjs/tx>@ethereumjs/rlp": true,
         "@ethereumjs/tx>@ethereumjs/util": true,
+        "@ethersproject/providers": true,
         "browserify>buffer": true,
-        "webpack>events": true
-      }
-    },
-    "@ethereumjs/tx>@ethereumjs/common>crc-32": {
-      "globals": {
-        "DO_NOT_EXPORT_CRC": true,
-        "define": true
-      }
-    },
-    "@ethereumjs/tx>@ethereumjs/rlp": {
-      "globals": {
-        "TextEncoder": true
+        "eth-lattice-keyring>gridplus-sdk>@ethereumjs/tx>ethereum-cryptography": true,
+        "browserify>insert-module-globals>is-buffer": true
       }
     },
     "@ethereumjs/tx>@ethereumjs/util": {
@@ -151,78 +131,83 @@
       },
       "packages": {
         "@ethereumjs/tx>@ethereumjs/rlp": true,
-        "@ethereumjs/tx>@ethereumjs/util>micro-ftch": true,
-        "@ethereumjs/tx>ethereum-cryptography": true,
         "browserify>buffer": true,
+        "@ethereumjs/tx>ethereum-cryptography": true,
+        "webpack>events": true,
         "browserify>insert-module-globals>is-buffer": true,
-        "webpack>events": true
+        "@ethereumjs/tx>@ethereumjs/util>micro-ftch": true
       }
     },
-    "@ethereumjs/tx>@ethereumjs/util>micro-ftch": {
+    "@metamask/smart-transactions-controller>@ethereumjs/util": {
       "globals": {
-        "Headers": true,
-        "TextDecoder": true,
-        "URL": true,
-        "btoa": true,
+        "console.warn": true,
         "fetch": true
       },
       "packages": {
-        "browserify>browserify-zlib": true,
-        "browserify>buffer": true,
-        "browserify>url": true,
-        "browserify>util": true,
-        "https-browserify": true,
-        "process": true,
-        "stream-http": true
+        "@metamask/smart-transactions-controller>@ethereumjs/tx>@ethereumjs/rlp": true,
+        "@ethereumjs/tx>ethereum-cryptography": true,
+        "webpack>events": true
       }
     },
-    "@ethereumjs/tx>ethereum-cryptography": {
+    "@ethersproject/abi": {
       "globals": {
-        "TextDecoder": true,
-        "crypto": true
+        "console.log": true
       },
       "packages": {
-        "@ethereumjs/tx>ethereum-cryptography>@noble/curves": true,
-        "@ethereumjs/tx>ethereum-cryptography>@scure/bip32": true,
-        "@noble/hashes": true
+        "ethers>@ethersproject/address": true,
+        "@ethersproject/bignumber": true,
+        "@ethersproject/bytes": true,
+        "ethers>@ethersproject/constants": true,
+        "@ethersproject/hash": true,
+        "ethers>@ethersproject/keccak256": true,
+        "ethers>@ethersproject/logger": true,
+        "ethers>@ethersproject/properties": true,
+        "ethers>@ethersproject/strings": true
       }
     },
-    "@ethereumjs/tx>ethereum-cryptography>@noble/curves": {
-      "globals": {
-        "TextEncoder": true
-      },
+    "ethers>@ethersproject/abstract-provider": {
       "packages": {
-        "@noble/hashes": true
+        "@ethersproject/bignumber": true,
+        "@ethersproject/bytes": true,
+        "ethers>@ethersproject/logger": true,
+        "ethers>@ethersproject/properties": true
       }
     },
-    "@ethereumjs/tx>ethereum-cryptography>@scure/bip32": {
+    "ethers>@ethersproject/abstract-signer": {
       "packages": {
-        "@ethereumjs/tx>ethereum-cryptography>@noble/curves": true,
-        "@metamask/utils>@scure/base": true,
-        "@noble/hashes": true
+        "ethers>@ethersproject/logger": true,
+        "ethers>@ethersproject/properties": true
       }
     },
-    "@ethersproject/abi": {
-      "globals": {
-        "console.log": true
-      },
+    "ethers>@ethersproject/address": {
       "packages": {
         "@ethersproject/bignumber": true,
         "@ethersproject/bytes": true,
-        "@ethersproject/hash": true,
-        "ethers>@ethersproject/address": true,
-        "ethers>@ethersproject/constants": true,
         "ethers>@ethersproject/keccak256": true,
         "ethers>@ethersproject/logger": true,
-        "ethers>@ethersproject/properties": true,
-        "ethers>@ethersproject/strings": true
+        "ethers>@ethersproject/rlp": true
+      }
+    },
+    "ethers>@ethersproject/base64": {
+      "globals": {
+        "atob": true,
+        "btoa": true
+      },
+      "packages": {
+        "@ethersproject/bytes": true
+      }
+    },
+    "ethers>@ethersproject/basex": {
+      "packages": {
+        "@ethersproject/bytes": true,
+        "ethers>@ethersproject/properties": true
       }
     },
     "@ethersproject/bignumber": {
       "packages": {
         "@ethersproject/bytes": true,
-        "bn.js": true,
-        "ethers>@ethersproject/logger": true
+        "ethers>@ethersproject/logger": true,
+        "bn.js": true
       }
     },
     "@ethersproject/bytes": {
@@ -230,17 +215,22 @@
         "ethers>@ethersproject/logger": true
       }
     },
+    "ethers>@ethersproject/constants": {
+      "packages": {
+        "@ethersproject/bignumber": true
+      }
+    },
     "@ethersproject/contracts": {
       "globals": {
         "setTimeout": true
       },
       "packages": {
         "@ethersproject/abi": true,
-        "@ethersproject/bignumber": true,
-        "@ethersproject/bytes": true,
         "ethers>@ethersproject/abstract-provider": true,
         "ethers>@ethersproject/abstract-signer": true,
         "ethers>@ethersproject/address": true,
+        "@ethersproject/bignumber": true,
+        "@ethersproject/bytes": true,
         "ethers>@ethersproject/logger": true,
         "ethers>@ethersproject/properties": true,
         "ethers>@ethersproject/transactions": true
@@ -248,10 +238,10 @@
     },
     "@ethersproject/hash": {
       "packages": {
-        "@ethersproject/bignumber": true,
-        "@ethersproject/bytes": true,
         "ethers>@ethersproject/address": true,
         "ethers>@ethersproject/base64": true,
+        "@ethersproject/bignumber": true,
+        "@ethersproject/bytes": true,
         "ethers>@ethersproject/keccak256": true,
         "ethers>@ethersproject/logger": true,
         "ethers>@ethersproject/properties": true,
@@ -260,9 +250,9 @@
     },
     "@ethersproject/hdnode": {
       "packages": {
+        "ethers>@ethersproject/basex": true,
         "@ethersproject/bignumber": true,
         "@ethersproject/bytes": true,
-        "ethers>@ethersproject/basex": true,
         "ethers>@ethersproject/logger": true,
         "ethers>@ethersproject/pbkdf2": true,
         "ethers>@ethersproject/properties": true,
@@ -273,586 +263,428 @@
         "ethers>@ethersproject/wordlists": true
       }
     },
-    "@ethersproject/providers": {
-      "globals": {
-        "WebSocket": true,
-        "clearInterval": true,
-        "clearTimeout": true,
-        "console.log": true,
-        "console.warn": true,
-        "setInterval": true,
-        "setTimeout": true
-      },
+    "ethers>@ethersproject/json-wallets": {
       "packages": {
-        "@ethersproject/bignumber": true,
+        "ethers>@ethersproject/address": true,
         "@ethersproject/bytes": true,
-        "@ethersproject/hash": true,
-        "@ethersproject/providers>@ethersproject/web": true,
-        "@ethersproject/providers>bech32": true,
-        "@metamask/test-bundler>@ethersproject/networks": true,
-        "ethers>@ethersproject/abstract-provider": true,
-        "ethers>@ethersproject/abstract-signer": true,
-        "ethers>@ethersproject/address": true,
-        "ethers>@ethersproject/base64": true,
-        "ethers>@ethersproject/basex": true,
-        "ethers>@ethersproject/constants": true,
+        "@ethersproject/hdnode": true,
+        "ethers>@ethersproject/keccak256": true,
         "ethers>@ethersproject/logger": true,
+        "ethers>@ethersproject/pbkdf2": true,
         "ethers>@ethersproject/properties": true,
         "ethers>@ethersproject/random": true,
-        "ethers>@ethersproject/sha2": true,
         "ethers>@ethersproject/strings": true,
-        "ethers>@ethersproject/transactions": true
-      }
-    },
-    "@ethersproject/providers>@ethersproject/random": {
-      "globals": {
-        "crypto.getRandomValues": true
-      }
-    },
-    "@ethersproject/providers>@ethersproject/web": {
-      "globals": {
-        "clearTimeout": true,
-        "fetch": true,
-        "setTimeout": true
-      },
-      "packages": {
-        "@ethersproject/bytes": true,
-        "ethers>@ethersproject/base64": true,
-        "ethers>@ethersproject/logger": true,
-        "ethers>@ethersproject/properties": true,
-        "ethers>@ethersproject/strings": true
+        "ethers>@ethersproject/transactions": true,
+        "ethers>@ethersproject/json-wallets>aes-js": true,
+        "ethers>@ethersproject/json-wallets>scrypt-js": true
       }
     },
-    "@ethersproject/wallet": {
+    "ethers>@ethersproject/keccak256": {
       "packages": {
         "@ethersproject/bytes": true,
-        "@ethersproject/hash": true,
-        "@ethersproject/hdnode": true,
-        "ethers>@ethersproject/abstract-provider": true,
-        "ethers>@ethersproject/abstract-signer": true,
-        "ethers>@ethersproject/address": true,
-        "ethers>@ethersproject/json-wallets": true,
-        "ethers>@ethersproject/keccak256": true,
-        "ethers>@ethersproject/logger": true,
-        "ethers>@ethersproject/properties": true,
-        "ethers>@ethersproject/random": true,
-        "ethers>@ethersproject/signing-key": true,
-        "ethers>@ethersproject/transactions": true
+        "@metamask/ethjs>js-sha3": true
       }
     },
-    "@keystonehq/bc-ur-registry-eth": {
-      "packages": {
-        "@ethereumjs/tx>@ethereumjs/util": true,
-        "@keystonehq/bc-ur-registry-eth>@keystonehq/bc-ur-registry": true,
-        "@metamask/eth-trezor-keyring>hdkey": true,
-        "browserify>buffer": true,
-        "uuid": true
+    "ethers>@ethersproject/logger": {
+      "globals": {
+        "console": true
       }
     },
-    "@keystonehq/bc-ur-registry-eth>@keystonehq/bc-ur-registry": {
-      "globals": {
-        "define": true
-      },
+    "ethers>@ethersproject/providers>@ethersproject/networks": {
       "packages": {
-        "@ngraveio/bc-ur": true,
-        "@swc/helpers>tslib": true,
-        "browserify>buffer": true,
-        "buffer": true,
-        "ethereumjs-util>ethereum-cryptography>bs58check": true
+        "ethers>@ethersproject/logger": true
       }
     },
-    "@keystonehq/metamask-airgapped-keyring": {
+    "@metamask/test-bundler>@ethersproject/networks": {
       "packages": {
-        "@ethereumjs/tx": true,
-        "@keystonehq/bc-ur-registry-eth": true,
-        "@keystonehq/metamask-airgapped-keyring>@keystonehq/base-eth-keyring": true,
-        "@keystonehq/metamask-airgapped-keyring>rlp": true,
-        "@metamask/obs-store": true,
-        "browserify>buffer": true,
-        "uuid": true,
-        "webpack>events": true
+        "ethers>@ethersproject/logger": true
       }
     },
-    "@keystonehq/metamask-airgapped-keyring>@keystonehq/base-eth-keyring": {
+    "ethers>@ethersproject/pbkdf2": {
       "packages": {
-        "@ethereumjs/tx": true,
-        "@ethereumjs/tx>@ethereumjs/util": true,
-        "@keystonehq/bc-ur-registry-eth": true,
-        "@metamask/eth-trezor-keyring>hdkey": true,
-        "browserify>buffer": true,
-        "eth-lattice-keyring>rlp": true,
-        "uuid": true
+        "@ethersproject/bytes": true,
+        "ethers>@ethersproject/sha2": true
       }
     },
-    "@keystonehq/metamask-airgapped-keyring>rlp": {
+    "ethers>@ethersproject/properties": {
       "packages": {
-        "bn.js": true,
-        "browserify>buffer": true
+        "ethers>@ethersproject/logger": true
       }
     },
-    "@lavamoat/lavadome-react": {
+    "@ethersproject/providers": {
       "globals": {
-        "Document.prototype": true,
-        "DocumentFragment.prototype": true,
-        "Element.prototype": true,
-        "Node.prototype": true,
+        "WebSocket": true,
+        "clearInterval": true,
+        "clearTimeout": true,
+        "console.log": true,
         "console.warn": true,
-        "document": true
+        "setInterval": true,
+        "setTimeout": true
       },
       "packages": {
-        "react": true
+        "ethers>@ethersproject/abstract-provider": true,
+        "ethers>@ethersproject/abstract-signer": true,
+        "ethers>@ethersproject/address": true,
+        "ethers>@ethersproject/base64": true,
+        "ethers>@ethersproject/basex": true,
+        "@ethersproject/bignumber": true,
+        "@ethersproject/bytes": true,
+        "ethers>@ethersproject/constants": true,
+        "@ethersproject/hash": true,
+        "ethers>@ethersproject/logger": true,
+        "@metamask/test-bundler>@ethersproject/networks": true,
+        "ethers>@ethersproject/properties": true,
+        "ethers>@ethersproject/random": true,
+        "ethers>@ethersproject/sha2": true,
+        "ethers>@ethersproject/strings": true,
+        "ethers>@ethersproject/transactions": true,
+        "@ethersproject/providers>@ethersproject/web": true,
+        "@ethersproject/providers>bech32": true
       }
     },
-    "@material-ui/core": {
+    "ethers>@ethersproject/providers": {
       "globals": {
-        "Image": true,
-        "_formatMuiErrorMessage": true,
-        "addEventListener": true,
+        "WebSocket": true,
         "clearInterval": true,
         "clearTimeout": true,
-        "console.error": true,
+        "console.log": 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
+        "ethers>@ethersproject/abstract-provider": true,
+        "ethers>@ethersproject/abstract-signer": true,
+        "ethers>@ethersproject/address": true,
+        "ethers>@ethersproject/base64": true,
+        "ethers>@ethersproject/basex": true,
+        "@ethersproject/bignumber": true,
+        "@ethersproject/bytes": true,
+        "ethers>@ethersproject/constants": true,
+        "@ethersproject/hash": true,
+        "ethers>@ethersproject/logger": true,
+        "ethers>@ethersproject/providers>@ethersproject/networks": true,
+        "ethers>@ethersproject/properties": true,
+        "ethers>@ethersproject/random": true,
+        "ethers>@ethersproject/sha2": true,
+        "ethers>@ethersproject/strings": true,
+        "ethers>@ethersproject/transactions": true,
+        "ethers>@ethersproject/providers>@ethersproject/web": true,
+        "ethers>@ethersproject/providers>bech32": true
       }
     },
-    "@material-ui/core>@material-ui/styles": {
+    "@ethersproject/providers>@ethersproject/random": {
       "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
+        "crypto.getRandomValues": true
       }
     },
-    "@material-ui/core>@material-ui/styles>jss": {
-      "globals": {
-        "CSS": true,
-        "document.createElement": true,
-        "document.querySelector": true
-      },
+    "ethers>@ethersproject/random": {
       "packages": {
-        "@babel/runtime": true,
-        "@material-ui/core>@material-ui/styles>jss>is-in-browser": true,
-        "react-router-dom>tiny-warning": true
+        "@ethersproject/bytes": true,
+        "ethers>@ethersproject/logger": true
       }
     },
-    "@material-ui/core>@material-ui/styles>jss-plugin-camel-case": {
+    "ethers>@ethersproject/rlp": {
       "packages": {
-        "@material-ui/core>@material-ui/styles>jss-plugin-camel-case>hyphenate-style-name": true
+        "@ethersproject/bytes": true,
+        "ethers>@ethersproject/logger": true
       }
     },
-    "@material-ui/core>@material-ui/styles>jss-plugin-default-unit": {
-      "globals": {
-        "CSS": true
-      },
+    "ethers>@ethersproject/sha2": {
       "packages": {
-        "@material-ui/core>@material-ui/styles>jss": true
+        "@ethersproject/bytes": true,
+        "ethers>@ethersproject/logger": true,
+        "ethers>@ethersproject/sha2>hash.js": true
       }
     },
-    "@material-ui/core>@material-ui/styles>jss-plugin-global": {
+    "ethers>@ethersproject/signing-key": {
       "packages": {
-        "@babel/runtime": true,
-        "@material-ui/core>@material-ui/styles>jss": true
+        "@ethersproject/bytes": true,
+        "ethers>@ethersproject/logger": true,
+        "ethers>@ethersproject/properties": true,
+        "ethers>@ethersproject/signing-key>elliptic": true
       }
     },
-    "@material-ui/core>@material-ui/styles>jss-plugin-nested": {
+    "ethers>@ethersproject/solidity": {
       "packages": {
-        "@babel/runtime": true,
-        "react-router-dom>tiny-warning": true
+        "@ethersproject/bignumber": true,
+        "@ethersproject/bytes": true,
+        "ethers>@ethersproject/keccak256": true,
+        "ethers>@ethersproject/logger": true,
+        "ethers>@ethersproject/sha2": true,
+        "ethers>@ethersproject/strings": true
       }
     },
-    "@material-ui/core>@material-ui/styles>jss-plugin-rule-value-function": {
+    "ethers>@ethersproject/strings": {
       "packages": {
-        "@material-ui/core>@material-ui/styles>jss": true,
-        "react-router-dom>tiny-warning": true
+        "@ethersproject/bytes": true,
+        "ethers>@ethersproject/constants": true,
+        "ethers>@ethersproject/logger": true
       }
     },
-    "@material-ui/core>@material-ui/styles>jss-plugin-vendor-prefixer": {
+    "ethers>@ethersproject/transactions": {
       "packages": {
-        "@material-ui/core>@material-ui/styles>jss": true,
-        "@material-ui/core>@material-ui/styles>jss-plugin-vendor-prefixer>css-vendor": true
+        "ethers>@ethersproject/address": true,
+        "@ethersproject/bignumber": true,
+        "@ethersproject/bytes": true,
+        "ethers>@ethersproject/constants": true,
+        "ethers>@ethersproject/keccak256": true,
+        "ethers>@ethersproject/logger": true,
+        "ethers>@ethersproject/properties": true,
+        "ethers>@ethersproject/rlp": true,
+        "ethers>@ethersproject/signing-key": true
       }
     },
-    "@material-ui/core>@material-ui/styles>jss-plugin-vendor-prefixer>css-vendor": {
-      "globals": {
-        "document.createElement": true,
-        "document.documentElement": true,
-        "getComputedStyle": true
-      },
+    "ethers>@ethersproject/units": {
       "packages": {
-        "@babel/runtime": true,
-        "@material-ui/core>@material-ui/styles>jss>is-in-browser": true
+        "@ethersproject/bignumber": true,
+        "ethers>@ethersproject/logger": true
       }
     },
-    "@material-ui/core>@material-ui/styles>jss>is-in-browser": {
-      "globals": {
-        "document": true
+    "@ethersproject/wallet": {
+      "packages": {
+        "ethers>@ethersproject/abstract-provider": true,
+        "ethers>@ethersproject/abstract-signer": true,
+        "ethers>@ethersproject/address": true,
+        "@ethersproject/bytes": true,
+        "@ethersproject/hash": true,
+        "@ethersproject/hdnode": true,
+        "ethers>@ethersproject/json-wallets": true,
+        "ethers>@ethersproject/keccak256": true,
+        "ethers>@ethersproject/logger": true,
+        "ethers>@ethersproject/properties": true,
+        "ethers>@ethersproject/random": true,
+        "ethers>@ethersproject/signing-key": true,
+        "ethers>@ethersproject/transactions": true
       }
     },
-    "@material-ui/core>@material-ui/system": {
+    "@ethersproject/providers>@ethersproject/web": {
       "globals": {
-        "console.error": true
+        "clearTimeout": true,
+        "fetch": true,
+        "setTimeout": 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
+        "ethers>@ethersproject/base64": true,
+        "@ethersproject/bytes": true,
+        "ethers>@ethersproject/logger": true,
+        "ethers>@ethersproject/properties": true,
+        "ethers>@ethersproject/strings": true
       }
     },
-    "@material-ui/core>popper.js": {
+    "ethers>@ethersproject/providers>@ethersproject/web": {
       "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,
+        "clearTimeout": true,
+        "fetch": true,
         "setTimeout": true
+      },
+      "packages": {
+        "ethers>@ethersproject/base64": true,
+        "@ethersproject/bytes": true,
+        "ethers>@ethersproject/logger": true,
+        "ethers>@ethersproject/properties": true,
+        "ethers>@ethersproject/strings": true
       }
     },
-    "@material-ui/core>react-transition-group": {
+    "ethers>@ethersproject/web": {
       "globals": {
-        "Element": true,
+        "clearTimeout": true,
+        "fetch": 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
+        "ethers>@ethersproject/base64": true,
+        "@ethersproject/bytes": true,
+        "ethers>@ethersproject/logger": true,
+        "ethers>@ethersproject/properties": true,
+        "ethers>@ethersproject/strings": true
       }
     },
-    "@metamask/abi-utils": {
+    "ethers>@ethersproject/wordlists": {
       "packages": {
-        "@metamask/abi-utils>@metamask/utils": true,
-        "@metamask/utils>@metamask/superstruct": true
+        "@ethersproject/bytes": true,
+        "@ethersproject/hash": true,
+        "ethers>@ethersproject/logger": true,
+        "ethers>@ethersproject/properties": true,
+        "ethers>@ethersproject/strings": true
       }
     },
-    "@metamask/abi-utils>@metamask/utils": {
+    "@metamask/notification-services-controller>firebase>@firebase/app": {
       "globals": {
-        "TextDecoder": true,
-        "TextEncoder": true
+        "FinalizationRegistry": true,
+        "console.warn": true
       },
       "packages": {
-        "@metamask/utils>@metamask/superstruct": true,
-        "@metamask/utils>@scure/base": true,
-        "@metamask/utils>pony-cause": true,
-        "@noble/hashes": true,
-        "browserify>buffer": true,
-        "nock>debug": true,
-        "semver": true
-      }
-    },
-    "@metamask/accounts-controller": {
-      "packages": {
-        "@ethereumjs/tx>@ethereumjs/util": true,
-        "@ethereumjs/tx>ethereum-cryptography": true,
-        "@metamask/base-controller": true,
-        "@metamask/eth-snap-keyring": true,
-        "@metamask/keyring-api": true,
-        "@metamask/keyring-controller": true,
-        "@metamask/utils": true,
-        "uuid": true
-      }
-    },
-    "@metamask/address-book-controller": {
-      "packages": {
-        "@metamask/base-controller": true,
-        "@metamask/controller-utils": true
+        "@metamask/notification-services-controller>firebase>@firebase/app>@firebase/component": true,
+        "@metamask/notification-services-controller>firebase>@firebase/app>@firebase/logger": true,
+        "@metamask/notification-services-controller>firebase>@firebase/util": true,
+        "@metamask/notification-services-controller>firebase>@firebase/app>idb": true
       }
     },
-    "@metamask/announcement-controller": {
+    "@metamask/notification-services-controller>firebase>@firebase/app>@firebase/component": {
       "packages": {
-        "@metamask/announcement-controller>@metamask/base-controller": true
+        "@metamask/notification-services-controller>firebase>@firebase/util": true
       }
     },
-    "@metamask/announcement-controller>@metamask/base-controller": {
+    "@metamask/notification-services-controller>firebase>@firebase/installations": {
       "globals": {
+        "BroadcastChannel": true,
+        "Headers": true,
+        "btoa": true,
+        "console.error": true,
+        "crypto": true,
+        "fetch": true,
+        "msCrypto": true,
+        "navigator.onLine": true,
         "setTimeout": true
       },
       "packages": {
-        "immer": true
+        "@metamask/notification-services-controller>firebase>@firebase/app": true,
+        "@metamask/notification-services-controller>firebase>@firebase/app>@firebase/component": true,
+        "@metamask/notification-services-controller>firebase>@firebase/util": true,
+        "@metamask/notification-services-controller>firebase>@firebase/app>idb": true
       }
     },
-    "@metamask/approval-controller": {
+    "@metamask/notification-services-controller>firebase>@firebase/app>@firebase/logger": {
       "globals": {
-        "console.info": true
+        "console": true
       },
       "packages": {
-        "@metamask/base-controller": true,
-        "@metamask/rpc-errors": true,
-        "nanoid": true
-      }
-    },
-    "@metamask/approval-controller>nanoid": {
-      "globals": {
-        "crypto.getRandomValues": true
+        "@swc/helpers>tslib": true
       }
     },
-    "@metamask/assets-controllers": {
+    "@metamask/notification-services-controller>firebase>@firebase/messaging": {
       "globals": {
-        "AbortController": true,
         "Headers": true,
+        "Notification.maxActions": true,
+        "Notification.permission": true,
+        "Notification.requestPermission": true,
+        "PushSubscription.prototype.hasOwnProperty": true,
+        "ServiceWorkerRegistration": true,
         "URL": true,
-        "URLSearchParams": true,
-        "clearInterval": true,
-        "clearTimeout": true,
-        "console.error": true,
-        "console.log": true,
-        "setInterval": true,
-        "setTimeout": true
-      },
-      "packages": {
-        "@ensdomains/content-hash>multicodec>uint8arrays>multiformats": true,
-        "@ethereumjs/tx>@ethereumjs/util": true,
-        "@ethersproject/bignumber": true,
-        "@ethersproject/contracts": true,
-        "@ethersproject/providers": true,
-        "@metamask/abi-utils": true,
-        "@metamask/base-controller": true,
-        "@metamask/contract-metadata": true,
-        "@metamask/controller-utils": true,
-        "@metamask/eth-query": true,
-        "@metamask/metamask-eth-abis": true,
-        "@metamask/name-controller>async-mutex": true,
-        "@metamask/polling-controller": true,
-        "@metamask/rpc-errors": true,
-        "@metamask/utils": true,
-        "bn.js": true,
-        "cockatiel": true,
-        "ethers>@ethersproject/address": true,
-        "lodash": true,
-        "single-call-balance-checker-abi": true,
-        "uuid": true
-      }
-    },
-    "@metamask/base-controller": {
-      "globals": {
+        "addEventListener": true,
+        "atob": true,
+        "btoa": true,
+        "clients.matchAll": true,
+        "clients.openWindow": true,
+        "console.warn": true,
+        "document": true,
+        "fetch": true,
+        "indexedDB": true,
+        "location.href": true,
+        "location.origin": true,
+        "navigator": true,
+        "origin.replace": true,
+        "registration.showNotification": true,
         "setTimeout": true
       },
       "packages": {
-        "immer": true
+        "@metamask/notification-services-controller>firebase>@firebase/app": true,
+        "@metamask/notification-services-controller>firebase>@firebase/app>@firebase/component": true,
+        "@metamask/notification-services-controller>firebase>@firebase/installations": true,
+        "@metamask/notification-services-controller>firebase>@firebase/util": true,
+        "@metamask/notification-services-controller>firebase>@firebase/app>idb": true,
+        "@swc/helpers>tslib": true
       }
     },
-    "@metamask/browser-passworder": {
+    "@metamask/notification-services-controller>firebase>@firebase/util": {
       "globals": {
-        "CryptoKey": true,
+        "atob": true,
+        "browser": true,
         "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
+        "chrome": true,
+        "console": true,
+        "document": true,
+        "indexedDB": true,
+        "navigator": true,
+        "process": true,
+        "self": true,
+        "setTimeout": true
       },
       "packages": {
-        "@metamask/browser-passworder>@metamask/utils": true,
-        "browserify>buffer": true
+        "process": true
       }
     },
-    "@metamask/browser-passworder>@metamask/utils": {
-      "globals": {
-        "TextDecoder": true,
-        "TextEncoder": true
-      },
+    "@keystonehq/metamask-airgapped-keyring>@keystonehq/base-eth-keyring": {
       "packages": {
-        "@metamask/utils>@metamask/superstruct": true,
-        "@metamask/utils>@scure/base": true,
-        "@metamask/utils>pony-cause": true,
-        "@noble/hashes": true,
+        "@ethereumjs/tx": true,
+        "@ethereumjs/tx>@ethereumjs/util": true,
+        "@keystonehq/bc-ur-registry-eth": true,
         "browserify>buffer": true,
-        "nock>debug": true,
-        "semver": true
+        "@metamask/eth-trezor-keyring>hdkey": true,
+        "eth-lattice-keyring>rlp": true,
+        "uuid": true
       }
     },
-    "@metamask/controller-utils": {
-      "globals": {
-        "URL": true,
-        "console.error": true,
-        "fetch": true,
-        "setTimeout": true
-      },
+    "@keystonehq/bc-ur-registry-eth": {
       "packages": {
         "@ethereumjs/tx>@ethereumjs/util": true,
-        "@metamask/controller-utils>@spruceid/siwe-parser": true,
-        "@metamask/ethjs>@metamask/ethjs-unit": true,
-        "@metamask/utils": true,
-        "bn.js": true,
+        "@keystonehq/bc-ur-registry-eth>@keystonehq/bc-ur-registry": true,
         "browserify>buffer": true,
-        "eslint>fast-deep-equal": true,
-        "eth-ens-namehash": true
+        "@metamask/eth-trezor-keyring>hdkey": true,
+        "uuid": true
       }
     },
-    "@metamask/controller-utils>@spruceid/siwe-parser": {
+    "@keystonehq/bc-ur-registry-eth>@keystonehq/bc-ur-registry": {
       "globals": {
-        "console.error": true,
-        "console.log": true
+        "define": true
       },
       "packages": {
-        "@metamask/controller-utils>@spruceid/siwe-parser>apg-js": true,
-        "@noble/hashes": true
-      }
-    },
-    "@metamask/controller-utils>@spruceid/siwe-parser>apg-js": {
-      "packages": {
-        "browserify>buffer": 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/ens-controller": {
-      "packages": {
-        "@ethersproject/providers": true,
-        "@metamask/base-controller": true,
-        "@metamask/controller-utils": true,
-        "@metamask/utils": true,
-        "punycode": true
+        "@ngraveio/bc-ur": true,
+        "ethereumjs-util>ethereum-cryptography>bs58check": true,
+        "buffer": true,
+        "browserify>buffer": true,
+        "@swc/helpers>tslib": true
       }
     },
-    "@metamask/eth-json-rpc-filters": {
-      "globals": {
-        "console.error": true
-      },
+    "@keystonehq/metamask-airgapped-keyring": {
       "packages": {
-        "@metamask/eth-query": true,
-        "@metamask/json-rpc-engine": true,
-        "@metamask/name-controller>async-mutex": true,
-        "@metamask/safe-event-emitter": true,
-        "pify": true
+        "@ethereumjs/tx": true,
+        "@keystonehq/metamask-airgapped-keyring>@keystonehq/base-eth-keyring": true,
+        "@keystonehq/bc-ur-registry-eth": true,
+        "@metamask/obs-store": true,
+        "browserify>buffer": true,
+        "webpack>events": true,
+        "@keystonehq/metamask-airgapped-keyring>rlp": true,
+        "uuid": true
       }
     },
-    "@metamask/eth-json-rpc-middleware": {
+    "chart.js>@kurkle/color": {
       "globals": {
-        "URL": true,
-        "console.error": true,
-        "setTimeout": true
-      },
-      "packages": {
-        "@metamask/eth-json-rpc-middleware>@metamask/utils": true,
-        "@metamask/eth-json-rpc-middleware>klona": true,
-        "@metamask/eth-json-rpc-middleware>safe-stable-stringify": true,
-        "@metamask/eth-sig-util": true,
-        "@metamask/json-rpc-engine": true,
-        "@metamask/rpc-errors": true
+        "define": true
       }
     },
-    "@metamask/eth-json-rpc-middleware>@metamask/utils": {
+    "@lavamoat/lavadome-react": {
       "globals": {
-        "TextDecoder": true,
-        "TextEncoder": true
+        "Document.prototype": true,
+        "DocumentFragment.prototype": true,
+        "Element.prototype": true,
+        "Node.prototype": true,
+        "console.warn": true,
+        "document": true
       },
       "packages": {
-        "@metamask/utils>@metamask/superstruct": true,
-        "@metamask/utils>@scure/base": true,
-        "@metamask/utils>pony-cause": true,
-        "@noble/hashes": true,
-        "browserify>buffer": true,
-        "nock>debug": true,
-        "semver": true
+        "react": true
       }
     },
-    "@metamask/eth-json-rpc-provider": {
+    "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth>@ledgerhq/domain-service": {
       "packages": {
-        "@metamask/json-rpc-engine": true,
-        "@metamask/rpc-errors": true,
-        "@metamask/safe-event-emitter": true,
-        "uuid": true
+        "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth>@ledgerhq/logs": true,
+        "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth>@ledgerhq/domain-service>axios": true
       }
     },
-    "@metamask/eth-ledger-bridge-keyring": {
+    "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth>@ledgerhq/errors": {
       "globals": {
-        "addEventListener": true,
-        "console.error": true,
-        "document.createElement": true,
-        "document.head.appendChild": true,
-        "fetch": true,
-        "removeEventListener": true
-      },
-      "packages": {
-        "@ethereumjs/tx": true,
-        "@ethereumjs/tx>@ethereumjs/util": true,
-        "@metamask/eth-ledger-bridge-keyring>@ethereumjs/rlp": true,
-        "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth": true,
-        "@metamask/eth-sig-util": true,
-        "@metamask/eth-trezor-keyring>hdkey": true,
-        "browserify>buffer": true,
-        "webpack>events": true
+        "console.warn": true
       }
     },
-    "@metamask/eth-ledger-bridge-keyring>@ethereumjs/rlp": {
-      "globals": {
-        "TextEncoder": true
+    "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth>@ledgerhq/evm-tools": {
+      "packages": {
+        "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth>@ledgerhq/cryptoassets-evm-signatures": true,
+        "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth>@ledgerhq/evm-tools>@ledgerhq/live-env": true,
+        "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth>@ledgerhq/evm-tools>axios": true,
+        "@metamask/ppom-validator>crypto-js": true,
+        "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth>@ledgerhq/evm-tools>ethers": true
       }
     },
     "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth": {
@@ -861,6 +693,7 @@
       },
       "packages": {
         "@ethersproject/abi": true,
+        "ethers>@ethersproject/rlp": true,
         "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth>@ledgerhq/cryptoassets-evm-signatures": true,
         "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth>@ledgerhq/domain-service": true,
         "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth>@ledgerhq/errors": true,
@@ -869,361 +702,451 @@
         "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth>axios": true,
         "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth>bignumber.js": true,
         "browserify>buffer": true,
-        "ethers>@ethersproject/rlp": true,
         "semver": true
       }
     },
-    "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth>@ledgerhq/domain-service": {
+    "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth>@ledgerhq/evm-tools>@ledgerhq/live-env": {
+      "globals": {
+        "console.warn": true
+      },
       "packages": {
-        "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth>@ledgerhq/domain-service>axios": true,
-        "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth>@ledgerhq/logs": true
+        "wait-on>rxjs": true
       }
     },
-    "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth>@ledgerhq/domain-service>axios": {
+    "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth>@ledgerhq/logs": {
       "globals": {
-        "Blob": true,
-        "FormData": true,
-        "URLSearchParams": true,
-        "XMLHttpRequest": true,
-        "btoa": true,
+        "__ledgerLogsListen": "write",
+        "console.error": true
+      }
+    },
+    "@material-ui/core": {
+      "globals": {
+        "Image": true,
+        "_formatMuiErrorMessage": true,
+        "addEventListener": true,
+        "clearInterval": true,
+        "clearTimeout": true,
+        "console.error": true,
         "console.warn": true,
         "document": true,
-        "location.href": 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": {
-        "axios>form-data": true,
-        "browserify>buffer": true,
-        "process": true
+        "@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,
+        "react-redux>hoist-non-react-statics": true,
+        "@material-ui/core>popper.js": true,
+        "prop-types": true,
+        "react": true,
+        "react-dom": true,
+        "prop-types>react-is": true,
+        "@material-ui/core>react-transition-group": true
       }
     },
-    "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth>@ledgerhq/errors": {
+    "@material-ui/core>@material-ui/styles": {
       "globals": {
-        "console.warn": true
-      }
-    },
-    "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth>@ledgerhq/evm-tools": {
+        "console.error": true,
+        "console.warn": true,
+        "document.createComment": true,
+        "document.head": true
+      },
       "packages": {
-        "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth>@ledgerhq/cryptoassets-evm-signatures": true,
-        "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth>@ledgerhq/evm-tools>@ledgerhq/live-env": true,
-        "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth>@ledgerhq/evm-tools>axios": true,
-        "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth>@ledgerhq/evm-tools>ethers": true,
-        "@metamask/ppom-validator>crypto-js": true
+        "@babel/runtime": true,
+        "@material-ui/core>@material-ui/utils": true,
+        "@material-ui/core>clsx": true,
+        "react-redux>hoist-non-react-statics": 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/styles>jss": true,
+        "prop-types": true,
+        "react": true
       }
     },
-    "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth>@ledgerhq/evm-tools>@ledgerhq/live-env": {
+    "@material-ui/core>@material-ui/system": {
       "globals": {
-        "console.warn": true
+        "console.error": true
       },
       "packages": {
-        "wait-on>rxjs": true
+        "@babel/runtime": true,
+        "@material-ui/core>@material-ui/utils": true,
+        "prop-types": true
       }
     },
-    "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth>@ledgerhq/evm-tools>axios": {
-      "globals": {
-        "Blob": true,
-        "FormData": true,
-        "URLSearchParams": true,
-        "XMLHttpRequest": true,
-        "btoa": true,
-        "console.warn": true,
-        "document": true,
-        "location.href": true,
-        "navigator": true,
-        "setTimeout": true
-      },
+    "@material-ui/core>@material-ui/utils": {
       "packages": {
-        "axios>form-data": true,
-        "browserify>buffer": true,
-        "process": true
+        "@babel/runtime": true,
+        "prop-types": true,
+        "prop-types>react-is": true
       }
     },
-    "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth>@ledgerhq/evm-tools>ethers": {
+    "@metamask/abi-utils": {
       "packages": {
-        "@ethersproject/abi": true,
-        "@ethersproject/bignumber": true,
-        "@ethersproject/bytes": true,
-        "@ethersproject/contracts": true,
-        "@ethersproject/hash": true,
-        "@ethersproject/hdnode": true,
-        "@ethersproject/providers": true,
-        "@ethersproject/providers>@ethersproject/web": true,
-        "@ethersproject/wallet": true,
-        "ethers>@ethersproject/abstract-signer": true,
-        "ethers>@ethersproject/address": true,
-        "ethers>@ethersproject/base64": true,
-        "ethers>@ethersproject/basex": true,
-        "ethers>@ethersproject/constants": true,
-        "ethers>@ethersproject/json-wallets": true,
-        "ethers>@ethersproject/keccak256": true,
-        "ethers>@ethersproject/logger": true,
-        "ethers>@ethersproject/properties": true,
-        "ethers>@ethersproject/random": true,
-        "ethers>@ethersproject/rlp": true,
-        "ethers>@ethersproject/sha2": true,
-        "ethers>@ethersproject/signing-key": true,
-        "ethers>@ethersproject/solidity": true,
-        "ethers>@ethersproject/strings": true,
-        "ethers>@ethersproject/transactions": true,
-        "ethers>@ethersproject/units": true,
-        "ethers>@ethersproject/wordlists": true
+        "@metamask/utils>@metamask/superstruct": true,
+        "@metamask/abi-utils>@metamask/utils": true
       }
     },
-    "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth>@ledgerhq/logs": {
-      "globals": {
-        "__ledgerLogsListen": "write",
-        "console.error": true
+    "@metamask/accounts-controller": {
+      "packages": {
+        "@ethereumjs/tx>@ethereumjs/util": true,
+        "@metamask/base-controller": true,
+        "@metamask/eth-snap-keyring": true,
+        "@metamask/keyring-api": true,
+        "@metamask/keyring-controller": true,
+        "@metamask/utils": true,
+        "@ethereumjs/tx>ethereum-cryptography": true,
+        "uuid": true
       }
     },
-    "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth>axios": {
-      "globals": {
-        "Blob": true,
-        "FormData": true,
-        "URLSearchParams": true,
-        "XMLHttpRequest": true,
-        "btoa": true,
-        "console.warn": true,
-        "document": true,
-        "location.href": true,
-        "navigator": true,
-        "setTimeout": true
-      },
+    "@metamask/address-book-controller": {
       "packages": {
-        "axios>form-data": true,
-        "browserify>buffer": true,
-        "process": true
+        "@metamask/base-controller": true,
+        "@metamask/controller-utils": true
       }
     },
-    "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth>bignumber.js": {
-      "globals": {
-        "crypto": true,
-        "define": true
+    "@metamask/announcement-controller": {
+      "packages": {
+        "@metamask/announcement-controller>@metamask/base-controller": true
       }
     },
-    "@metamask/eth-query": {
+    "@metamask/approval-controller": {
+      "globals": {
+        "console.info": true
+      },
       "packages": {
-        "@metamask/eth-query>json-rpc-random-id": true,
-        "watchify>xtend": true
+        "@metamask/base-controller": true,
+        "@metamask/rpc-errors": true,
+        "nanoid": true
       }
     },
-    "@metamask/eth-sig-util": {
+    "@metamask/assets-controllers": {
+      "globals": {
+        "AbortController": true,
+        "Headers": true,
+        "URL": true,
+        "URLSearchParams": true,
+        "clearInterval": true,
+        "clearTimeout": true,
+        "console.error": true,
+        "console.log": true,
+        "setInterval": true,
+        "setTimeout": true
+      },
       "packages": {
         "@ethereumjs/tx>@ethereumjs/util": true,
-        "@ethereumjs/tx>ethereum-cryptography": true,
+        "ethers>@ethersproject/address": true,
+        "@ethersproject/bignumber": true,
+        "@ethersproject/contracts": true,
+        "@ethersproject/providers": true,
         "@metamask/abi-utils": true,
-        "@metamask/eth-sig-util>@metamask/utils": true,
-        "@metamask/eth-sig-util>tweetnacl": true,
-        "@metamask/utils>@scure/base": true,
-        "browserify>buffer": true
+        "@metamask/base-controller": true,
+        "@metamask/contract-metadata": true,
+        "@metamask/controller-utils": true,
+        "@metamask/eth-query": true,
+        "@metamask/metamask-eth-abis": true,
+        "@metamask/polling-controller": true,
+        "@metamask/rpc-errors": true,
+        "@metamask/utils": true,
+        "@metamask/name-controller>async-mutex": true,
+        "bn.js": true,
+        "cockatiel": true,
+        "lodash": true,
+        "@ensdomains/content-hash>multicodec>uint8arrays>multiformats": true,
+        "single-call-balance-checker-abi": true,
+        "uuid": true
       }
     },
-    "@metamask/eth-sig-util>@metamask/utils": {
+    "@metamask/base-controller": {
       "globals": {
-        "TextDecoder": true,
-        "TextEncoder": true
+        "setTimeout": true
       },
       "packages": {
-        "@metamask/utils>@metamask/superstruct": true,
-        "@metamask/utils>@scure/base": true,
-        "@metamask/utils>pony-cause": true,
-        "@noble/hashes": true,
-        "browserify>buffer": true,
-        "nock>debug": true,
-        "semver": true
+        "immer": true
       }
     },
-    "@metamask/eth-sig-util>tweetnacl": {
+    "@metamask/announcement-controller>@metamask/base-controller": {
       "globals": {
-        "crypto": true,
-        "msCrypto": true,
-        "nacl": "write"
+        "setTimeout": true
+      },
+      "packages": {
+        "immer": true
+      }
+    },
+    "@metamask/name-controller>@metamask/base-controller": {
+      "globals": {
+        "setTimeout": true
       },
       "packages": {
-        "browserify>browser-resolve": true
+        "immer": true
       }
     },
-    "@metamask/eth-snap-keyring": {
+    "@metamask/rate-limit-controller>@metamask/base-controller": {
       "globals": {
-        "URL": true,
-        "console.error": true
+        "setTimeout": true
       },
       "packages": {
-        "@ethereumjs/tx": true,
-        "@metamask/eth-snap-keyring>@metamask/eth-sig-util": true,
-        "@metamask/eth-snap-keyring>@metamask/keyring-internal-snap-client": true,
-        "@metamask/eth-snap-keyring>@metamask/utils": true,
-        "@metamask/eth-snap-keyring>uuid": true,
-        "@metamask/keyring-api": true,
-        "@metamask/utils>@metamask/superstruct": true,
-        "webpack>events": true
+        "immer": true
       }
     },
-    "@metamask/eth-snap-keyring>@metamask/eth-sig-util": {
+    "@metamask/browser-passworder": {
+      "globals": {
+        "CryptoKey": true,
+        "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": {
-        "@ethereumjs/tx>@ethereumjs/util": true,
-        "@ethereumjs/tx>ethereum-cryptography": true,
-        "@metamask/abi-utils": true,
-        "@metamask/eth-sig-util>tweetnacl": true,
-        "@metamask/eth-snap-keyring>@metamask/utils": true,
-        "@metamask/utils>@scure/base": true,
+        "@metamask/browser-passworder>@metamask/utils": true,
         "browserify>buffer": true
       }
     },
-    "@metamask/eth-snap-keyring>@metamask/keyring-internal-snap-client": {
-      "packages": {
-        "@metamask/keyring-snap-client": true
+    "eth-keyring-controller>@metamask/browser-passworder": {
+      "globals": {
+        "crypto": true
       }
     },
-    "@metamask/eth-snap-keyring>@metamask/utils": {
+    "@metamask/controller-utils": {
       "globals": {
-        "TextDecoder": true,
-        "TextEncoder": true
+        "URL": true,
+        "console.error": true,
+        "fetch": true,
+        "setTimeout": true
       },
       "packages": {
-        "@metamask/utils>@metamask/superstruct": true,
-        "@metamask/utils>@scure/base": true,
-        "@metamask/utils>pony-cause": true,
-        "@noble/hashes": true,
+        "@ethereumjs/tx>@ethereumjs/util": true,
+        "@metamask/ethjs>@metamask/ethjs-unit": true,
+        "@metamask/utils": true,
+        "@metamask/controller-utils>@spruceid/siwe-parser": true,
+        "bn.js": true,
         "browserify>buffer": true,
-        "nock>debug": true,
-        "semver": true
+        "eth-ens-namehash": true,
+        "eslint>fast-deep-equal": true
       }
     },
-    "@metamask/eth-snap-keyring>uuid": {
-      "globals": {
-        "crypto": true
+    "@metamask/ens-controller": {
+      "packages": {
+        "@ethersproject/providers": true,
+        "@metamask/base-controller": true,
+        "@metamask/controller-utils": true,
+        "@metamask/utils": true,
+        "punycode": true
       }
     },
-    "@metamask/eth-token-tracker": {
+    "@metamask/eth-token-tracker>@metamask/eth-block-tracker": {
       "globals": {
-        "console.warn": true
+        "clearTimeout": true,
+        "console.error": true,
+        "setTimeout": true
       },
       "packages": {
-        "@babel/runtime": true,
-        "@metamask/eth-token-tracker>@metamask/eth-block-tracker": true,
-        "@metamask/eth-token-tracker>deep-equal": true,
-        "@metamask/ethjs-contract": true,
-        "@metamask/ethjs-query": true,
         "@metamask/safe-event-emitter": true,
-        "bn.js": true,
-        "human-standard-token-abi": true
+        "@metamask/eth-token-tracker>@metamask/eth-block-tracker>@metamask/utils": true,
+        "@metamask/eth-query>json-rpc-random-id": true,
+        "pify": true
       }
     },
-    "@metamask/eth-token-tracker>@metamask/eth-block-tracker": {
+    "@metamask/network-controller>@metamask/eth-block-tracker": {
       "globals": {
         "clearTimeout": true,
         "console.error": true,
         "setTimeout": true
       },
       "packages": {
-        "@metamask/eth-query>json-rpc-random-id": true,
-        "@metamask/eth-token-tracker>@metamask/eth-block-tracker>@metamask/utils": true,
         "@metamask/safe-event-emitter": true,
-        "pify": true
+        "@metamask/network-controller>@metamask/eth-block-tracker>@metamask/utils": true,
+        "@metamask/eth-query>json-rpc-random-id": true
       }
     },
-    "@metamask/eth-token-tracker>@metamask/eth-block-tracker>@metamask/utils": {
+    "@metamask/keyring-controller>@metamask/eth-hd-keyring": {
       "globals": {
-        "TextDecoder": true,
         "TextEncoder": true
       },
       "packages": {
-        "@metamask/utils>@metamask/superstruct": true,
-        "@metamask/utils>@scure/base": true,
-        "@metamask/utils>pony-cause": true,
-        "@noble/hashes": true,
+        "@ethereumjs/tx>@ethereumjs/util": true,
+        "@metamask/eth-sig-util": true,
+        "@metamask/scure-bip39": true,
+        "@metamask/keyring-controller>@metamask/eth-hd-keyring>@metamask/utils": true,
         "browserify>buffer": true,
-        "nock>debug": true,
-        "semver": true
+        "@ethereumjs/tx>ethereum-cryptography": true
       }
     },
-    "@metamask/eth-token-tracker>deep-equal": {
+    "@metamask/eth-json-rpc-filters": {
+      "globals": {
+        "console.error": true
+      },
       "packages": {
-        "@lavamoat/lavapack>json-stable-stringify>isarray": true,
-        "@lavamoat/lavapack>json-stable-stringify>object-keys": true,
-        "@metamask/eth-token-tracker>deep-equal>es-get-iterator": true,
-        "@metamask/eth-token-tracker>deep-equal>is-date-object": true,
-        "@metamask/eth-token-tracker>deep-equal>which-boxed-primitive": true,
-        "@metamask/eth-token-tracker>deep-equal>which-collection": true,
-        "@ngraveio/bc-ur>assert>object-is": true,
-        "browserify>util>is-arguments": true,
-        "browserify>util>which-typed-array": true,
-        "gulp>vinyl-fs>object.assign": true,
-        "string.prototype.matchall>call-bind": true,
-        "string.prototype.matchall>es-abstract>array-buffer-byte-length": true,
-        "string.prototype.matchall>es-abstract>is-array-buffer": true,
-        "string.prototype.matchall>es-abstract>is-regex": true,
-        "string.prototype.matchall>es-abstract>is-shared-array-buffer": true,
-        "string.prototype.matchall>get-intrinsic": true,
-        "string.prototype.matchall>regexp.prototype.flags": true,
-        "string.prototype.matchall>side-channel": true
+        "@metamask/eth-query": true,
+        "@metamask/json-rpc-engine": true,
+        "@metamask/safe-event-emitter": true,
+        "@metamask/name-controller>async-mutex": true,
+        "pify": true
       }
     },
-    "@metamask/eth-token-tracker>deep-equal>es-get-iterator": {
+    "@metamask/network-controller>@metamask/eth-json-rpc-infura": {
+      "globals": {
+        "fetch": true,
+        "setTimeout": true
+      },
       "packages": {
-        "@lavamoat/lavapack>json-stable-stringify>isarray": true,
-        "@metamask/eth-token-tracker>deep-equal>es-get-iterator>is-map": true,
-        "@metamask/eth-token-tracker>deep-equal>es-get-iterator>is-set": true,
-        "@metamask/eth-token-tracker>deep-equal>es-get-iterator>stop-iteration-iterator": true,
-        "browserify>util>is-arguments": true,
-        "eslint-plugin-react>array-includes>is-string": true,
-        "process": true,
-        "string.prototype.matchall>call-bind": true,
-        "string.prototype.matchall>get-intrinsic": true,
-        "string.prototype.matchall>has-symbols": true
+        "@metamask/eth-json-rpc-provider": true,
+        "@metamask/json-rpc-engine": true,
+        "@metamask/rpc-errors": true,
+        "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/utils": true
       }
     },
-    "@metamask/eth-token-tracker>deep-equal>es-get-iterator>stop-iteration-iterator": {
+    "@metamask/eth-json-rpc-middleware": {
       "globals": {
-        "StopIteration": true
+        "URL": true,
+        "console.error": true,
+        "setTimeout": true
       },
       "packages": {
-        "string.prototype.matchall>internal-slot": true
+        "@metamask/eth-sig-util": true,
+        "@metamask/json-rpc-engine": true,
+        "@metamask/rpc-errors": true,
+        "@metamask/eth-json-rpc-middleware>@metamask/utils": true,
+        "@metamask/eth-json-rpc-middleware>klona": true,
+        "@metamask/eth-json-rpc-middleware>safe-stable-stringify": true
       }
     },
-    "@metamask/eth-token-tracker>deep-equal>is-date-object": {
+    "@metamask/eth-json-rpc-provider": {
       "packages": {
-        "koa>is-generator-function>has-tostringtag": true
+        "@metamask/json-rpc-engine": true,
+        "@metamask/rpc-errors": true,
+        "@metamask/safe-event-emitter": true,
+        "uuid": true
       }
     },
-    "@metamask/eth-token-tracker>deep-equal>which-boxed-primitive": {
+    "@metamask/eth-ledger-bridge-keyring": {
+      "globals": {
+        "addEventListener": true,
+        "console.error": true,
+        "document.createElement": true,
+        "document.head.appendChild": true,
+        "fetch": true,
+        "removeEventListener": true
+      },
       "packages": {
-        "@metamask/eth-token-tracker>deep-equal>which-boxed-primitive>is-bigint": true,
-        "@metamask/eth-token-tracker>deep-equal>which-boxed-primitive>is-boolean-object": true,
-        "@metamask/eth-token-tracker>deep-equal>which-boxed-primitive>is-number-object": true,
-        "eslint-plugin-react>array-includes>is-string": true,
-        "string.prototype.matchall>es-abstract>es-to-primitive>is-symbol": true
+        "@metamask/eth-ledger-bridge-keyring>@ethereumjs/rlp": true,
+        "@ethereumjs/tx": true,
+        "@ethereumjs/tx>@ethereumjs/util": true,
+        "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth": true,
+        "@metamask/eth-sig-util": true,
+        "browserify>buffer": true,
+        "webpack>events": true,
+        "@metamask/eth-trezor-keyring>hdkey": true
       }
     },
-    "@metamask/eth-token-tracker>deep-equal>which-boxed-primitive>is-bigint": {
+    "@metamask/eth-query": {
       "packages": {
-        "string.prototype.matchall>es-abstract>unbox-primitive>has-bigints": true
+        "@metamask/eth-query>json-rpc-random-id": true,
+        "watchify>xtend": true
       }
     },
-    "@metamask/eth-token-tracker>deep-equal>which-boxed-primitive>is-boolean-object": {
+    "@metamask/eth-sig-util": {
       "packages": {
-        "koa>is-generator-function>has-tostringtag": true,
-        "string.prototype.matchall>call-bind": true
+        "@ethereumjs/tx>@ethereumjs/util": true,
+        "@metamask/abi-utils": true,
+        "@metamask/eth-sig-util>@metamask/utils": true,
+        "@metamask/utils>@scure/base": true,
+        "browserify>buffer": true,
+        "@ethereumjs/tx>ethereum-cryptography": true,
+        "@metamask/eth-sig-util>tweetnacl": true
       }
     },
-    "@metamask/eth-token-tracker>deep-equal>which-boxed-primitive>is-number-object": {
+    "@metamask/eth-snap-keyring>@metamask/eth-sig-util": {
       "packages": {
-        "koa>is-generator-function>has-tostringtag": true
+        "@ethereumjs/tx>@ethereumjs/util": true,
+        "@metamask/abi-utils": true,
+        "@metamask/eth-snap-keyring>@metamask/utils": true,
+        "@metamask/utils>@scure/base": true,
+        "browserify>buffer": true,
+        "@ethereumjs/tx>ethereum-cryptography": true,
+        "@metamask/eth-sig-util>tweetnacl": true
       }
     },
-    "@metamask/eth-token-tracker>deep-equal>which-collection": {
+    "@metamask/keyring-controller>@metamask/eth-sig-util": {
       "packages": {
-        "@metamask/eth-token-tracker>deep-equal>es-get-iterator>is-map": true,
-        "@metamask/eth-token-tracker>deep-equal>es-get-iterator>is-set": true,
-        "@metamask/eth-token-tracker>deep-equal>which-collection>is-weakmap": true,
-        "@metamask/eth-token-tracker>deep-equal>which-collection>is-weakset": true
+        "@ethereumjs/tx>@ethereumjs/util": true,
+        "@metamask/abi-utils": true,
+        "@metamask/keyring-controller>@metamask/eth-sig-util>@metamask/utils": true,
+        "@metamask/utils>@scure/base": true,
+        "browserify>buffer": true,
+        "@ethereumjs/tx>ethereum-cryptography": true,
+        "@metamask/eth-sig-util>tweetnacl": true
+      }
+    },
+    "@metamask/signature-controller>@metamask/eth-sig-util": {
+      "packages": {
+        "@ethereumjs/tx>@ethereumjs/util": true,
+        "@metamask/abi-utils": true,
+        "@metamask/signature-controller>@metamask/eth-sig-util>@metamask/utils": true,
+        "@metamask/utils>@scure/base": true,
+        "browserify>buffer": true,
+        "@ethereumjs/tx>ethereum-cryptography": true,
+        "@metamask/eth-sig-util>tweetnacl": true
+      }
+    },
+    "@metamask/keyring-controller>@metamask/eth-simple-keyring": {
+      "packages": {
+        "@ethereumjs/tx>@ethereumjs/util": true,
+        "@metamask/eth-sig-util": true,
+        "@metamask/keyring-controller>@metamask/eth-simple-keyring>@metamask/utils": true,
+        "browserify>buffer": true,
+        "@ethereumjs/tx>ethereum-cryptography": true,
+        "crypto-browserify>randombytes": true
+      }
+    },
+    "@metamask/eth-snap-keyring": {
+      "globals": {
+        "URL": true,
+        "console.error": true
+      },
+      "packages": {
+        "@ethereumjs/tx": true,
+        "@metamask/eth-snap-keyring>@metamask/eth-sig-util": true,
+        "@metamask/keyring-api": true,
+        "@metamask/eth-snap-keyring>@metamask/keyring-internal-snap-client": true,
+        "@metamask/utils>@metamask/superstruct": true,
+        "@metamask/eth-snap-keyring>@metamask/utils": true,
+        "webpack>events": true,
+        "@metamask/eth-snap-keyring>uuid": true
       }
     },
-    "@metamask/eth-token-tracker>deep-equal>which-collection>is-weakset": {
+    "@metamask/eth-token-tracker": {
+      "globals": {
+        "console.warn": true
+      },
       "packages": {
-        "string.prototype.matchall>call-bind": true,
-        "string.prototype.matchall>get-intrinsic": true
+        "@babel/runtime": true,
+        "@metamask/eth-token-tracker>@metamask/eth-block-tracker": true,
+        "@metamask/ethjs-contract": true,
+        "@metamask/ethjs-query": true,
+        "@metamask/safe-event-emitter": true,
+        "bn.js": true,
+        "@metamask/eth-token-tracker>deep-equal": true,
+        "human-standard-token-abi": true
       }
     },
     "@metamask/eth-trezor-keyring": {
@@ -1234,26 +1157,10 @@
         "@ethereumjs/tx": true,
         "@ethereumjs/tx>@ethereumjs/util": true,
         "@metamask/eth-trezor-keyring>@trezor/connect-plugin-ethereum": true,
-        "@metamask/eth-trezor-keyring>hdkey": true,
         "@trezor/connect-web": true,
         "browserify>buffer": true,
-        "webpack>events": true
-      }
-    },
-    "@metamask/eth-trezor-keyring>@trezor/connect-plugin-ethereum": {
-      "packages": {
-        "@metamask/eth-sig-util": true,
-        "@swc/helpers>tslib": true
-      }
-    },
-    "@metamask/eth-trezor-keyring>hdkey": {
-      "packages": {
-        "browserify>assert": true,
-        "crypto-browserify": true,
-        "ethereumjs-util>create-hash>ripemd160": true,
-        "ethereumjs-util>ethereum-cryptography>bs58check": true,
-        "ganache>secp256k1": true,
-        "koa>content-disposition>safe-buffer": true
+        "webpack>events": true,
+        "@metamask/eth-trezor-keyring>hdkey": true
       }
     },
     "@metamask/etherscan-link": {
@@ -1268,16 +1175,16 @@
       },
       "packages": {
         "@metamask/ethjs-contract": true,
-        "@metamask/ethjs-query": true,
         "@metamask/ethjs>@metamask/ethjs-filter": true,
         "@metamask/ethjs>@metamask/ethjs-provider-http": true,
+        "@metamask/ethjs-query": true,
         "@metamask/ethjs>@metamask/ethjs-unit": true,
         "@metamask/ethjs>@metamask/ethjs-util": true,
         "@metamask/ethjs>@metamask/number-to-bn": true,
-        "@metamask/ethjs>ethjs-abi": true,
-        "@metamask/ethjs>js-sha3": true,
         "bn.js": true,
-        "browserify>buffer": true
+        "browserify>buffer": true,
+        "@metamask/ethjs>ethjs-abi": true,
+        "@metamask/ethjs>js-sha3": true
       }
     },
     "@metamask/ethjs-contract": {
@@ -1290,43 +1197,38 @@
         "promise-to-callback": true
       }
     },
-    "@metamask/ethjs-query": {
+    "@metamask/ethjs>@metamask/ethjs-filter": {
       "globals": {
-        "console": true
-      },
-      "packages": {
-        "@metamask/ethjs-query>@metamask/ethjs-format": true,
-        "@metamask/ethjs-query>@metamask/ethjs-rpc": true,
-        "promise-to-callback": true
+        "clearInterval": true,
+        "setInterval": true
       }
     },
     "@metamask/ethjs-query>@metamask/ethjs-format": {
       "packages": {
-        "@metamask/ethjs-query>@metamask/ethjs-format>ethjs-schema": true,
         "@metamask/ethjs>@metamask/ethjs-util": true,
-        "@metamask/ethjs>@metamask/ethjs-util>strip-hex-prefix": true,
-        "@metamask/ethjs>@metamask/number-to-bn": true
+        "@metamask/ethjs>@metamask/number-to-bn": true,
+        "@metamask/ethjs-query>@metamask/ethjs-format>ethjs-schema": true,
+        "@metamask/ethjs>@metamask/ethjs-util>strip-hex-prefix": true
       }
     },
-    "@metamask/ethjs-query>@metamask/ethjs-rpc": {
+    "@metamask/ethjs>@metamask/ethjs-provider-http": {
       "packages": {
-        "promise-to-callback": true
+        "@metamask/ethjs>@metamask/ethjs-provider-http>xhr2": true
       }
     },
-    "@metamask/ethjs>@metamask/ethjs-filter": {
+    "@metamask/ethjs-query": {
       "globals": {
-        "clearInterval": true,
-        "setInterval": true
-      }
-    },
-    "@metamask/ethjs>@metamask/ethjs-provider-http": {
+        "console": true
+      },
       "packages": {
-        "@metamask/ethjs>@metamask/ethjs-provider-http>xhr2": true
+        "@metamask/ethjs-query>@metamask/ethjs-format": true,
+        "@metamask/ethjs-query>@metamask/ethjs-rpc": true,
+        "promise-to-callback": true
       }
     },
-    "@metamask/ethjs>@metamask/ethjs-provider-http>xhr2": {
-      "globals": {
-        "XMLHttpRequest": true
+    "@metamask/ethjs-query>@metamask/ethjs-rpc": {
+      "packages": {
+        "promise-to-callback": true
       }
     },
     "@metamask/ethjs>@metamask/ethjs-unit": {
@@ -1337,42 +1239,9 @@
     },
     "@metamask/ethjs>@metamask/ethjs-util": {
       "packages": {
+        "browserify>buffer": true,
         "@metamask/ethjs>@metamask/ethjs-util>is-hex-prefixed": true,
-        "@metamask/ethjs>@metamask/ethjs-util>strip-hex-prefix": true,
-        "browserify>buffer": true
-      }
-    },
-    "@metamask/ethjs>@metamask/ethjs-util>strip-hex-prefix": {
-      "packages": {
-        "@metamask/ethjs>@metamask/ethjs-util>is-hex-prefixed": true
-      }
-    },
-    "@metamask/ethjs>@metamask/number-to-bn": {
-      "packages": {
-        "@metamask/ethjs>@metamask/ethjs-util>strip-hex-prefix": true,
-        "bn.js": true
-      }
-    },
-    "@metamask/ethjs>ethjs-abi": {
-      "packages": {
-        "@metamask/ethjs>ethjs-abi>number-to-bn": true,
-        "@metamask/ethjs>js-sha3": true,
-        "bn.js": true,
-        "browserify>buffer": true
-      }
-    },
-    "@metamask/ethjs>ethjs-abi>number-to-bn": {
-      "packages": {
-        "@metamask/ethjs>@metamask/ethjs-util>strip-hex-prefix": true,
-        "bn.js": true
-      }
-    },
-    "@metamask/ethjs>js-sha3": {
-      "globals": {
-        "define": true
-      },
-      "packages": {
-        "process": true
+        "@metamask/ethjs>@metamask/ethjs-util>strip-hex-prefix": true
       }
     },
     "@metamask/gas-fee-controller": {
@@ -1399,28 +1268,6 @@
         "@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/json-rpc-engine": {
       "packages": {
         "@metamask/rpc-errors": true,
@@ -1433,206 +1280,65 @@
         "console.warn": true,
         "setTimeout": true
       },
-      "packages": {
-        "@metamask/safe-event-emitter": true,
-        "@metamask/utils": true,
-        "readable-stream": true
-      }
-    },
-    "@metamask/keyring-api": {
-      "packages": {
-        "@metamask/keyring-api>@metamask/keyring-utils": true,
-        "@metamask/keyring-api>@metamask/utils": true,
-        "@metamask/keyring-api>bech32": true,
-        "@metamask/utils>@metamask/superstruct": true
-      }
-    },
-    "@metamask/keyring-api>@metamask/keyring-utils": {
-      "globals": {
-        "URL": true
-      },
-      "packages": {
-        "@metamask/keyring-api>@metamask/keyring-utils>@metamask/utils": true,
-        "@metamask/utils>@metamask/superstruct": true
-      }
-    },
-    "@metamask/keyring-api>@metamask/keyring-utils>@metamask/utils": {
-      "globals": {
-        "TextDecoder": true,
-        "TextEncoder": true
-      },
-      "packages": {
-        "@metamask/utils>@metamask/superstruct": true,
-        "@metamask/utils>@scure/base": true,
-        "@metamask/utils>pony-cause": true,
-        "@noble/hashes": true,
-        "browserify>buffer": true,
-        "nock>debug": true,
-        "semver": true
-      }
-    },
-    "@metamask/keyring-api>@metamask/utils": {
-      "globals": {
-        "TextDecoder": true,
-        "TextEncoder": true
-      },
-      "packages": {
-        "@metamask/utils>@metamask/superstruct": true,
-        "@metamask/utils>@scure/base": true,
-        "@metamask/utils>pony-cause": true,
-        "@noble/hashes": true,
-        "browserify>buffer": true,
-        "nock>debug": true,
-        "semver": true
-      }
-    },
-    "@metamask/keyring-controller": {
-      "packages": {
-        "@ethereumjs/tx>@ethereumjs/util": true,
-        "@metamask/base-controller": true,
-        "@metamask/browser-passworder": true,
-        "@metamask/keyring-controller>@metamask/eth-hd-keyring": true,
-        "@metamask/keyring-controller>@metamask/eth-sig-util": true,
-        "@metamask/keyring-controller>@metamask/eth-simple-keyring": true,
-        "@metamask/keyring-controller>ethereumjs-wallet": true,
-        "@metamask/name-controller>async-mutex": true,
-        "@metamask/utils": true
-      }
-    },
-    "@metamask/keyring-controller>@metamask/eth-hd-keyring": {
-      "globals": {
-        "TextEncoder": true
-      },
-      "packages": {
-        "@ethereumjs/tx>@ethereumjs/util": true,
-        "@ethereumjs/tx>ethereum-cryptography": true,
-        "@metamask/eth-sig-util": true,
-        "@metamask/keyring-controller>@metamask/eth-hd-keyring>@metamask/utils": true,
-        "@metamask/scure-bip39": true,
-        "browserify>buffer": true
-      }
-    },
-    "@metamask/keyring-controller>@metamask/eth-hd-keyring>@metamask/utils": {
-      "globals": {
-        "TextDecoder": true,
-        "TextEncoder": true
-      },
-      "packages": {
-        "@metamask/utils>@metamask/superstruct": true,
-        "@metamask/utils>@scure/base": true,
-        "@metamask/utils>pony-cause": true,
-        "@noble/hashes": true,
-        "browserify>buffer": true,
-        "nock>debug": true,
-        "semver": true
-      }
-    },
-    "@metamask/keyring-controller>@metamask/eth-sig-util": {
-      "packages": {
-        "@ethereumjs/tx>@ethereumjs/util": true,
-        "@ethereumjs/tx>ethereum-cryptography": true,
-        "@metamask/abi-utils": true,
-        "@metamask/eth-sig-util>tweetnacl": true,
-        "@metamask/keyring-controller>@metamask/eth-sig-util>@metamask/utils": true,
-        "@metamask/utils>@scure/base": true,
-        "browserify>buffer": true
-      }
-    },
-    "@metamask/keyring-controller>@metamask/eth-sig-util>@metamask/utils": {
-      "globals": {
-        "TextDecoder": true,
-        "TextEncoder": true
-      },
-      "packages": {
-        "@metamask/utils>@metamask/superstruct": true,
-        "@metamask/utils>@scure/base": true,
-        "@metamask/utils>pony-cause": true,
-        "@noble/hashes": true,
-        "browserify>buffer": true,
-        "nock>debug": true,
-        "semver": true
-      }
-    },
-    "@metamask/keyring-controller>@metamask/eth-simple-keyring": {
-      "packages": {
-        "@ethereumjs/tx>@ethereumjs/util": true,
-        "@ethereumjs/tx>ethereum-cryptography": true,
-        "@metamask/eth-sig-util": true,
-        "@metamask/keyring-controller>@metamask/eth-simple-keyring>@metamask/utils": true,
-        "browserify>buffer": true,
-        "crypto-browserify>randombytes": true
+      "packages": {
+        "@metamask/safe-event-emitter": true,
+        "@metamask/utils": true,
+        "readable-stream": true
       }
     },
-    "@metamask/keyring-controller>@metamask/eth-simple-keyring>@metamask/utils": {
+    "@metamask/snaps-sdk>@metamask/key-tree": {
       "globals": {
-        "TextDecoder": true,
-        "TextEncoder": true
+        "crypto.subtle": true
       },
       "packages": {
-        "@metamask/utils>@metamask/superstruct": true,
-        "@metamask/utils>@scure/base": true,
-        "@metamask/utils>pony-cause": true,
+        "@metamask/scure-bip39": true,
+        "@metamask/utils": true,
+        "@ethereumjs/tx>ethereum-cryptography>@noble/curves": true,
         "@noble/hashes": true,
-        "browserify>buffer": true,
-        "nock>debug": true,
-        "semver": true
-      }
-    },
-    "@metamask/keyring-controller>ethereumjs-wallet": {
-      "packages": {
-        "@metamask/keyring-controller>ethereumjs-wallet>ethereum-cryptography": true,
-        "@metamask/keyring-controller>ethereumjs-wallet>ethereumjs-util": true,
-        "@metamask/keyring-controller>ethereumjs-wallet>utf8": true,
-        "browserify>buffer": true,
-        "crypto-browserify": true,
-        "crypto-browserify>randombytes": true,
-        "eth-lattice-keyring>gridplus-sdk>aes-js": true,
-        "ethereumjs-util>ethereum-cryptography>bs58check": true,
-        "ethers>@ethersproject/json-wallets>scrypt-js": true,
-        "uuid": true
+        "@metamask/utils>@scure/base": true
       }
     },
-    "@metamask/keyring-controller>ethereumjs-wallet>ethereum-cryptography": {
+    "@metamask/keyring-api": {
       "packages": {
-        "browserify>assert": true,
-        "browserify>buffer": true,
-        "crypto-browserify>create-hmac": true,
-        "crypto-browserify>randombytes": true,
-        "ethereumjs-util>ethereum-cryptography>bs58check": true,
-        "ethereumjs-util>ethereum-cryptography>keccak": true,
-        "ethers>@ethersproject/sha2>hash.js": true,
-        "ganache>secp256k1": true,
-        "koa>content-disposition>safe-buffer": true
+        "@metamask/keyring-api>@metamask/keyring-utils": true,
+        "@metamask/utils>@metamask/superstruct": true,
+        "@metamask/keyring-api>@metamask/utils": true,
+        "@metamask/keyring-api>bech32": true
       }
     },
-    "@metamask/keyring-controller>ethereumjs-wallet>ethereumjs-util": {
+    "@metamask/keyring-controller": {
       "packages": {
-        "@metamask/keyring-controller>ethereumjs-wallet>ethereum-cryptography": true,
-        "@metamask/keyring-controller>ethereumjs-wallet>ethereumjs-util>rlp": true,
-        "bn.js": true,
-        "browserify>assert": true,
-        "browserify>buffer": true,
-        "browserify>insert-module-globals>is-buffer": true,
-        "ethereumjs-util>create-hash": true
+        "@ethereumjs/tx>@ethereumjs/util": true,
+        "@metamask/base-controller": true,
+        "@metamask/browser-passworder": true,
+        "@metamask/keyring-controller>@metamask/eth-hd-keyring": true,
+        "@metamask/keyring-controller>@metamask/eth-sig-util": true,
+        "@metamask/keyring-controller>@metamask/eth-simple-keyring": true,
+        "@metamask/utils": true,
+        "@metamask/name-controller>async-mutex": true,
+        "@metamask/keyring-controller>ethereumjs-wallet": true
       }
     },
-    "@metamask/keyring-controller>ethereumjs-wallet>ethereumjs-util>rlp": {
+    "@metamask/eth-snap-keyring>@metamask/keyring-internal-snap-client": {
       "packages": {
-        "bn.js": true,
-        "browserify>buffer": true
+        "@metamask/keyring-snap-client": true
       }
     },
     "@metamask/keyring-snap-client": {
       "packages": {
         "@metamask/keyring-api": true,
         "@metamask/keyring-api>@metamask/keyring-utils": true,
-        "@metamask/keyring-snap-client>uuid": true,
-        "@metamask/utils>@metamask/superstruct": true
+        "@metamask/utils>@metamask/superstruct": true,
+        "@metamask/keyring-snap-client>uuid": true
       }
     },
-    "@metamask/keyring-snap-client>uuid": {
+    "@metamask/keyring-api>@metamask/keyring-utils": {
       "globals": {
-        "crypto": true
+        "URL": true
+      },
+      "packages": {
+        "@metamask/utils>@metamask/superstruct": true,
+        "@metamask/keyring-api>@metamask/keyring-utils>@metamask/utils": true
       }
     },
     "@metamask/logging-controller": {
@@ -1661,13 +1367,8 @@
         "@metamask/controller-utils": true,
         "@metamask/utils": true,
         "browserify>buffer": true,
-        "uuid": true,
-        "webpack>events": true
-      }
-    },
-    "@metamask/message-manager>jsonschema": {
-      "packages": {
-        "browserify>url": true
+        "webpack>events": true,
+        "uuid": true
       }
     },
     "@metamask/name-controller": {
@@ -1675,44 +1376,12 @@
         "fetch": true
       },
       "packages": {
-        "@metamask/controller-utils": true,
         "@metamask/name-controller>@metamask/base-controller": true,
+        "@metamask/controller-utils": true,
         "@metamask/name-controller>@metamask/utils": true,
         "@metamask/name-controller>async-mutex": true
       }
     },
-    "@metamask/name-controller>@metamask/base-controller": {
-      "globals": {
-        "setTimeout": true
-      },
-      "packages": {
-        "immer": true
-      }
-    },
-    "@metamask/name-controller>@metamask/utils": {
-      "globals": {
-        "TextDecoder": true,
-        "TextEncoder": true
-      },
-      "packages": {
-        "@metamask/utils>@metamask/superstruct": true,
-        "@metamask/utils>@scure/base": true,
-        "@metamask/utils>pony-cause": true,
-        "@noble/hashes": true,
-        "browserify>buffer": true,
-        "nock>debug": true,
-        "semver": true
-      }
-    },
-    "@metamask/name-controller>async-mutex": {
-      "globals": {
-        "clearTimeout": true,
-        "setTimeout": true
-      },
-      "packages": {
-        "@swc/helpers>tslib": true
-      }
-    },
     "@metamask/network-controller": {
       "globals": {
         "btoa": true,
@@ -1722,224 +1391,52 @@
       "packages": {
         "@metamask/base-controller": true,
         "@metamask/controller-utils": true,
+        "@metamask/network-controller>@metamask/eth-block-tracker": true,
+        "@metamask/network-controller>@metamask/eth-json-rpc-infura": true,
         "@metamask/eth-json-rpc-middleware": true,
         "@metamask/eth-json-rpc-provider": true,
         "@metamask/eth-query": true,
         "@metamask/json-rpc-engine": true,
-        "@metamask/network-controller>@metamask/eth-block-tracker": true,
-        "@metamask/network-controller>@metamask/eth-json-rpc-infura": true,
-        "@metamask/network-controller>@metamask/swappable-obj-proxy": true,
         "@metamask/rpc-errors": true,
+        "@metamask/network-controller>@metamask/swappable-obj-proxy": true,
         "@metamask/utils": true,
         "eslint>fast-deep-equal": true,
-        "reselect": true,
-        "uri-js": true,
-        "uuid": true
-      }
-    },
-    "@metamask/network-controller>@metamask/eth-block-tracker": {
-      "globals": {
-        "clearTimeout": true,
-        "console.error": true,
-        "setTimeout": true
-      },
-      "packages": {
-        "@metamask/eth-query>json-rpc-random-id": true,
-        "@metamask/network-controller>@metamask/eth-block-tracker>@metamask/utils": true,
-        "@metamask/safe-event-emitter": true
-      }
-    },
-    "@metamask/network-controller>@metamask/eth-block-tracker>@metamask/utils": {
-      "globals": {
-        "TextDecoder": true,
-        "TextEncoder": true
-      },
-      "packages": {
-        "@metamask/utils>@metamask/superstruct": true,
-        "@metamask/utils>@scure/base": true,
-        "@metamask/utils>pony-cause": true,
-        "@noble/hashes": true,
-        "browserify>buffer": true,
-        "nock>debug": true,
-        "semver": true
-      }
-    },
-    "@metamask/network-controller>@metamask/eth-json-rpc-infura": {
-      "globals": {
-        "fetch": true,
-        "setTimeout": true
-      },
-      "packages": {
-        "@metamask/eth-json-rpc-provider": true,
-        "@metamask/json-rpc-engine": true,
-        "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/utils": true,
-        "@metamask/rpc-errors": true
-      }
-    },
-    "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/utils": {
-      "globals": {
-        "TextDecoder": true,
-        "TextEncoder": true
-      },
-      "packages": {
-        "@metamask/utils>@metamask/superstruct": true,
-        "@metamask/utils>@scure/base": true,
-        "@metamask/utils>pony-cause": true,
-        "@noble/hashes": true,
-        "browserify>buffer": true,
-        "nock>debug": true,
-        "semver": true
-      }
-    },
-    "@metamask/notification-controller>nanoid": {
-      "globals": {
-        "crypto.getRandomValues": true
-      }
-    },
-    "@metamask/notification-services-controller": {
-      "globals": {
-        "Intl.NumberFormat": true,
-        "addEventListener": true,
-        "fetch": true,
-        "registration": true,
-        "removeEventListener": true
-      },
-      "packages": {
-        "@metamask/base-controller": true,
-        "@metamask/controller-utils": true,
-        "@metamask/notification-services-controller>@contentful/rich-text-html-renderer": true,
-        "@metamask/notification-services-controller>bignumber.js": true,
-        "@metamask/notification-services-controller>firebase": true,
-        "@metamask/profile-sync-controller": true,
-        "@metamask/utils": true,
-        "loglevel": true,
-        "uuid": true
-      }
-    },
-    "@metamask/notification-services-controller>@contentful/rich-text-html-renderer": {
-      "globals": {
-        "SuppressedError": true
-      }
-    },
-    "@metamask/notification-services-controller>bignumber.js": {
-      "globals": {
-        "crypto": true,
-        "define": true
-      }
-    },
-    "@metamask/notification-services-controller>firebase": {
-      "packages": {
-        "@metamask/notification-services-controller>firebase>@firebase/app": true,
-        "@metamask/notification-services-controller>firebase>@firebase/messaging": true
-      }
-    },
-    "@metamask/notification-services-controller>firebase>@firebase/app": {
-      "globals": {
-        "FinalizationRegistry": true,
-        "console.warn": true
-      },
-      "packages": {
-        "@metamask/notification-services-controller>firebase>@firebase/app>@firebase/component": true,
-        "@metamask/notification-services-controller>firebase>@firebase/app>@firebase/logger": true,
-        "@metamask/notification-services-controller>firebase>@firebase/app>idb": true,
-        "@metamask/notification-services-controller>firebase>@firebase/util": true
-      }
-    },
-    "@metamask/notification-services-controller>firebase>@firebase/app>@firebase/component": {
-      "packages": {
-        "@metamask/notification-services-controller>firebase>@firebase/util": true
-      }
-    },
-    "@metamask/notification-services-controller>firebase>@firebase/app>@firebase/logger": {
-      "globals": {
-        "console": true
-      },
-      "packages": {
-        "@swc/helpers>tslib": true
-      }
-    },
-    "@metamask/notification-services-controller>firebase>@firebase/app>idb": {
-      "globals": {
-        "DOMException": true,
-        "IDBCursor": true,
-        "IDBDatabase": true,
-        "IDBIndex": true,
-        "IDBObjectStore": true,
-        "IDBRequest": true,
-        "IDBTransaction": true,
-        "indexedDB.deleteDatabase": true,
-        "indexedDB.open": true
+        "reselect": true,
+        "uri-js": true,
+        "uuid": true
       }
     },
-    "@metamask/notification-services-controller>firebase>@firebase/installations": {
-      "globals": {
-        "BroadcastChannel": true,
-        "Headers": true,
-        "btoa": true,
-        "console.error": true,
-        "crypto": true,
-        "fetch": true,
-        "msCrypto": true,
-        "navigator.onLine": true,
-        "setTimeout": true
-      },
+    "@metamask/transaction-controller>@metamask/nonce-tracker": {
       "packages": {
-        "@metamask/notification-services-controller>firebase>@firebase/app": true,
-        "@metamask/notification-services-controller>firebase>@firebase/app>@firebase/component": true,
-        "@metamask/notification-services-controller>firebase>@firebase/app>idb": true,
-        "@metamask/notification-services-controller>firebase>@firebase/util": true
+        "@ethersproject/providers": true,
+        "browserify>assert": true,
+        "@metamask/transaction-controller>@metamask/nonce-tracker>async-mutex": true
       }
     },
-    "@metamask/notification-services-controller>firebase>@firebase/messaging": {
+    "@metamask/notification-services-controller": {
       "globals": {
-        "Headers": true,
-        "Notification.maxActions": true,
-        "Notification.permission": true,
-        "Notification.requestPermission": true,
-        "PushSubscription.prototype.hasOwnProperty": true,
-        "ServiceWorkerRegistration": true,
-        "URL": true,
+        "Intl.NumberFormat": true,
         "addEventListener": true,
-        "atob": true,
-        "btoa": true,
-        "clients.matchAll": true,
-        "clients.openWindow": true,
-        "console.warn": true,
-        "document": true,
         "fetch": true,
-        "indexedDB": true,
-        "location.href": true,
-        "location.origin": true,
-        "navigator": true,
-        "origin.replace": true,
-        "registration.showNotification": true,
-        "setTimeout": true
+        "registration": true,
+        "removeEventListener": true
       },
       "packages": {
-        "@metamask/notification-services-controller>firebase>@firebase/app": true,
-        "@metamask/notification-services-controller>firebase>@firebase/app>@firebase/component": true,
-        "@metamask/notification-services-controller>firebase>@firebase/app>idb": true,
-        "@metamask/notification-services-controller>firebase>@firebase/installations": true,
-        "@metamask/notification-services-controller>firebase>@firebase/util": true,
-        "@swc/helpers>tslib": true
+        "@metamask/notification-services-controller>@contentful/rich-text-html-renderer": true,
+        "@metamask/base-controller": true,
+        "@metamask/controller-utils": true,
+        "@metamask/profile-sync-controller": true,
+        "@metamask/utils": true,
+        "@metamask/notification-services-controller>bignumber.js": true,
+        "@metamask/notification-services-controller>firebase": true,
+        "loglevel": true,
+        "uuid": true
       }
     },
-    "@metamask/notification-services-controller>firebase>@firebase/util": {
-      "globals": {
-        "atob": true,
-        "browser": true,
-        "btoa": true,
-        "chrome": true,
-        "console": true,
-        "document": true,
-        "indexedDB": true,
-        "navigator": true,
-        "process": true,
-        "self": true,
-        "setTimeout": true
-      },
+    "@metamask/ethjs>@metamask/number-to-bn": {
       "packages": {
-        "process": true
+        "bn.js": true,
+        "@metamask/ethjs>@metamask/ethjs-util>strip-hex-prefix": true
       }
     },
     "@metamask/object-multiplex": {
@@ -1951,11 +1448,6 @@
         "readable-stream": true
       }
     },
-    "@metamask/object-multiplex>once": {
-      "packages": {
-        "@metamask/object-multiplex>once>wrappy": true
-      }
-    },
     "@metamask/obs-store": {
       "packages": {
         "@metamask/safe-event-emitter": true,
@@ -1977,32 +1469,12 @@
         "nanoid": true
       }
     },
-    "@metamask/permission-controller>nanoid": {
-      "globals": {
-        "crypto.getRandomValues": true
-      }
-    },
     "@metamask/permission-log-controller": {
       "packages": {
         "@metamask/base-controller": true,
         "@metamask/permission-log-controller>@metamask/utils": true
       }
     },
-    "@metamask/permission-log-controller>@metamask/utils": {
-      "globals": {
-        "TextDecoder": true,
-        "TextEncoder": true
-      },
-      "packages": {
-        "@metamask/utils>@metamask/superstruct": true,
-        "@metamask/utils>@scure/base": true,
-        "@metamask/utils>pony-cause": true,
-        "@noble/hashes": true,
-        "browserify>buffer": true,
-        "nock>debug": true,
-        "semver": true
-      }
-    },
     "@metamask/phishing-controller": {
       "globals": {
         "TextEncoder": true,
@@ -2011,12 +1483,12 @@
         "fetch": true
       },
       "packages": {
-        "@ethereumjs/tx>ethereum-cryptography": true,
         "@metamask/base-controller": true,
         "@metamask/controller-utils": true,
         "@noble/hashes": true,
-        "punycode": true,
-        "webpack-cli>fastest-levenshtein": true
+        "@ethereumjs/tx>ethereum-cryptography": true,
+        "webpack-cli>fastest-levenshtein": true,
+        "punycode": true
       }
     },
     "@metamask/polling-controller": {
@@ -2047,21 +1519,6 @@
         "readable-stream": true
       }
     },
-    "@metamask/post-message-stream>@metamask/utils": {
-      "globals": {
-        "TextDecoder": true,
-        "TextEncoder": true
-      },
-      "packages": {
-        "@metamask/utils>@metamask/superstruct": true,
-        "@metamask/utils>@scure/base": true,
-        "@metamask/utils>pony-cause": true,
-        "@noble/hashes": true,
-        "browserify>buffer": true,
-        "nock>debug": true,
-        "semver": true
-      }
-    },
     "@metamask/ppom-validator": {
       "globals": {
         "URL": true,
@@ -2071,48 +1528,11 @@
       "packages": {
         "@metamask/base-controller": true,
         "@metamask/controller-utils": true,
-        "@metamask/eth-query>json-rpc-random-id": true,
+        "await-semaphore": true,
+        "browserify>buffer": true,
         "@metamask/ppom-validator>crypto-js": true,
         "@metamask/ppom-validator>elliptic": true,
-        "await-semaphore": true,
-        "browserify>buffer": true
-      }
-    },
-    "@metamask/ppom-validator>crypto-js": {
-      "globals": {
-        "crypto": true,
-        "define": true,
-        "msCrypto": true
-      },
-      "packages": {
-        "browserify>browser-resolve": true
-      }
-    },
-    "@metamask/ppom-validator>elliptic": {
-      "packages": {
-        "@metamask/ppom-validator>elliptic>brorand": true,
-        "@metamask/ppom-validator>elliptic>hmac-drbg": true,
-        "@metamask/ppom-validator>elliptic>minimalistic-assert": true,
-        "@metamask/ppom-validator>elliptic>minimalistic-crypto-utils": true,
-        "bn.js": true,
-        "ethers>@ethersproject/sha2>hash.js": true,
-        "pumpify>inherits": true
-      }
-    },
-    "@metamask/ppom-validator>elliptic>brorand": {
-      "globals": {
-        "crypto": true,
-        "msCrypto": true
-      },
-      "packages": {
-        "browserify>browser-resolve": true
-      }
-    },
-    "@metamask/ppom-validator>elliptic>hmac-drbg": {
-      "packages": {
-        "@metamask/ppom-validator>elliptic>minimalistic-assert": true,
-        "@metamask/ppom-validator>elliptic>minimalistic-crypto-utils": true,
-        "ethers>@ethersproject/sha2>hash.js": true
+        "@metamask/eth-query>json-rpc-random-id": true
       }
     },
     "@metamask/preferences-controller": {
@@ -2142,55 +1562,10 @@
         "@metamask/keyring-controller": true,
         "@metamask/network-controller": true,
         "@metamask/profile-sync-controller>@noble/ciphers": true,
-        "@metamask/profile-sync-controller>siwe": true,
         "@noble/hashes": true,
         "browserify>buffer": true,
-        "loglevel": true
-      }
-    },
-    "@metamask/profile-sync-controller>@noble/ciphers": {
-      "globals": {
-        "TextDecoder": true,
-        "TextEncoder": true,
-        "crypto": true
-      }
-    },
-    "@metamask/profile-sync-controller>siwe": {
-      "globals": {
-        "console.error": true,
-        "console.warn": true
-      },
-      "packages": {
-        "@metamask/controller-utils>@spruceid/siwe-parser>valid-url": true,
-        "@metamask/profile-sync-controller>siwe>@spruceid/siwe-parser": true,
-        "@metamask/profile-sync-controller>siwe>@stablelib/random": true,
-        "ethers": true
-      }
-    },
-    "@metamask/profile-sync-controller>siwe>@spruceid/siwe-parser": {
-      "globals": {
-        "console.error": true,
-        "console.log": true
-      },
-      "packages": {
-        "@metamask/controller-utils>@spruceid/siwe-parser>apg-js": true,
-        "@noble/hashes": true
-      }
-    },
-    "@metamask/profile-sync-controller>siwe>@stablelib/random": {
-      "globals": {
-        "crypto": true,
-        "msCrypto": true
-      },
-      "packages": {
-        "@metamask/profile-sync-controller>siwe>@stablelib/random>@stablelib/binary": true,
-        "@metamask/profile-sync-controller>siwe>@stablelib/random>@stablelib/wipe": true,
-        "browserify>browser-resolve": true
-      }
-    },
-    "@metamask/profile-sync-controller>siwe>@stablelib/random>@stablelib/binary": {
-      "packages": {
-        "@metamask/profile-sync-controller>siwe>@stablelib/random>@stablelib/binary>@stablelib/int": true
+        "loglevel": true,
+        "@metamask/profile-sync-controller>siwe": true
       }
     },
     "@metamask/queued-request-controller": {
@@ -2203,57 +1578,13 @@
       }
     },
     "@metamask/rate-limit-controller": {
-      "globals": {
-        "setTimeout": true
-      },
-      "packages": {
-        "@metamask/rate-limit-controller>@metamask/base-controller": true,
-        "@metamask/rate-limit-controller>@metamask/rpc-errors": true,
-        "@metamask/rate-limit-controller>@metamask/utils": true
-      }
-    },
-    "@metamask/rate-limit-controller>@metamask/base-controller": {
-      "globals": {
-        "setTimeout": true
-      },
-      "packages": {
-        "immer": true
-      }
-    },
-    "@metamask/rate-limit-controller>@metamask/rpc-errors": {
-      "packages": {
-        "@metamask/rate-limit-controller>@metamask/rpc-errors>@metamask/utils": true,
-        "@metamask/rpc-errors>fast-safe-stringify": true
-      }
-    },
-    "@metamask/rate-limit-controller>@metamask/rpc-errors>@metamask/utils": {
-      "globals": {
-        "TextDecoder": true,
-        "TextEncoder": true
-      },
-      "packages": {
-        "@metamask/utils>@metamask/superstruct": true,
-        "@metamask/utils>@scure/base": true,
-        "@metamask/utils>pony-cause": true,
-        "@noble/hashes": true,
-        "browserify>buffer": true,
-        "nock>debug": true,
-        "semver": true
-      }
-    },
-    "@metamask/rate-limit-controller>@metamask/utils": {
-      "globals": {
-        "TextDecoder": true,
-        "TextEncoder": true
-      },
-      "packages": {
-        "@metamask/utils>@metamask/superstruct": true,
-        "@metamask/utils>@scure/base": true,
-        "@metamask/utils>pony-cause": true,
-        "@noble/hashes": true,
-        "browserify>buffer": true,
-        "nock>debug": true,
-        "semver": true
+      "globals": {
+        "setTimeout": true
+      },
+      "packages": {
+        "@metamask/rate-limit-controller>@metamask/base-controller": true,
+        "@metamask/rate-limit-controller>@metamask/rpc-errors": true,
+        "@metamask/rate-limit-controller>@metamask/utils": true
       }
     },
     "@metamask/remote-feature-flag-controller": {
@@ -2264,18 +1595,14 @@
     },
     "@metamask/rpc-errors": {
       "packages": {
-        "@metamask/rpc-errors>fast-safe-stringify": true,
-        "@metamask/utils": true
-      }
-    },
-    "@metamask/rpc-methods-flask>nanoid": {
-      "globals": {
-        "crypto.getRandomValues": true
+        "@metamask/utils": true,
+        "@metamask/rpc-errors>fast-safe-stringify": true
       }
     },
-    "@metamask/rpc-methods>nanoid": {
-      "globals": {
-        "crypto.getRandomValues": true
+    "@metamask/rate-limit-controller>@metamask/rpc-errors": {
+      "packages": {
+        "@metamask/rate-limit-controller>@metamask/rpc-errors>@metamask/utils": true,
+        "@metamask/rpc-errors>fast-safe-stringify": true
       }
     },
     "@metamask/safe-event-emitter": {
@@ -2295,12 +1622,6 @@
         "@metamask/utils>@scure/base": true
       }
     },
-    "@metamask/scure-bip39>@noble/hashes": {
-      "globals": {
-        "TextEncoder": true,
-        "crypto": true
-      }
-    },
     "@metamask/selected-network-controller": {
       "packages": {
         "@metamask/base-controller": true,
@@ -2314,40 +1635,14 @@
       "packages": {
         "@metamask/base-controller": true,
         "@metamask/controller-utils": true,
+        "@metamask/signature-controller>@metamask/eth-sig-util": true,
         "@metamask/keyring-controller": true,
         "@metamask/logging-controller": true,
-        "@metamask/message-manager>jsonschema": true,
-        "@metamask/signature-controller>@metamask/eth-sig-util": true,
         "@metamask/utils": true,
         "browserify>buffer": true,
-        "uuid": true,
-        "webpack>events": true
-      }
-    },
-    "@metamask/signature-controller>@metamask/eth-sig-util": {
-      "packages": {
-        "@ethereumjs/tx>@ethereumjs/util": true,
-        "@ethereumjs/tx>ethereum-cryptography": true,
-        "@metamask/abi-utils": true,
-        "@metamask/eth-sig-util>tweetnacl": true,
-        "@metamask/signature-controller>@metamask/eth-sig-util>@metamask/utils": true,
-        "@metamask/utils>@scure/base": true,
-        "browserify>buffer": true
-      }
-    },
-    "@metamask/signature-controller>@metamask/eth-sig-util>@metamask/utils": {
-      "globals": {
-        "TextDecoder": true,
-        "TextEncoder": true
-      },
-      "packages": {
-        "@metamask/utils>@metamask/superstruct": true,
-        "@metamask/utils>@scure/base": true,
-        "@metamask/utils>pony-cause": true,
-        "@noble/hashes": true,
-        "browserify>buffer": true,
-        "nock>debug": true,
-        "semver": true
+        "webpack>events": true,
+        "@metamask/message-manager>jsonschema": true,
+        "uuid": true
       }
     },
     "@metamask/smart-transactions-controller": {
@@ -2360,60 +1655,19 @@
         "setInterval": true
       },
       "packages": {
+        "@metamask/smart-transactions-controller>@ethereumjs/tx": true,
+        "@metamask/smart-transactions-controller>@ethereumjs/util": true,
         "@ethersproject/bytes": true,
         "@metamask/controller-utils": true,
         "@metamask/eth-query": true,
         "@metamask/polling-controller": true,
-        "@metamask/smart-transactions-controller>@ethereumjs/tx": true,
-        "@metamask/smart-transactions-controller>@ethereumjs/util": true,
-        "@metamask/smart-transactions-controller>bignumber.js": true,
         "@metamask/transaction-controller": true,
+        "@metamask/smart-transactions-controller>bignumber.js": true,
         "browserify>buffer": true,
         "fast-json-patch": true,
         "lodash": true
       }
     },
-    "@metamask/smart-transactions-controller>@ethereumjs/tx": {
-      "packages": {
-        "@ethereumjs/tx>ethereum-cryptography": true,
-        "@metamask/smart-transactions-controller>@ethereumjs/tx>@ethereumjs/common": true,
-        "@metamask/smart-transactions-controller>@ethereumjs/tx>@ethereumjs/rlp": true,
-        "@metamask/smart-transactions-controller>@ethereumjs/util": true
-      }
-    },
-    "@metamask/smart-transactions-controller>@ethereumjs/tx>@ethereumjs/common": {
-      "packages": {
-        "@metamask/smart-transactions-controller>@ethereumjs/util": true,
-        "webpack>events": true
-      }
-    },
-    "@metamask/smart-transactions-controller>@ethereumjs/tx>@ethereumjs/rlp": {
-      "globals": {
-        "TextEncoder": true
-      }
-    },
-    "@metamask/smart-transactions-controller>@ethereumjs/util": {
-      "globals": {
-        "console.warn": true,
-        "fetch": true
-      },
-      "packages": {
-        "@ethereumjs/tx>ethereum-cryptography": true,
-        "@metamask/smart-transactions-controller>@ethereumjs/tx>@ethereumjs/rlp": true,
-        "webpack>events": 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": {
         "DecompressionStream": true,
@@ -2431,337 +1685,498 @@
         "@metamask/permission-controller": true,
         "@metamask/post-message-stream": true,
         "@metamask/rpc-errors": true,
-        "@metamask/snaps-controllers>@xstate/fsm": true,
-        "@metamask/snaps-controllers>concat-stream": true,
-        "@metamask/snaps-controllers>get-npm-tarball-url": true,
-        "@metamask/snaps-controllers>readable-web-to-node-stream": true,
-        "@metamask/snaps-controllers>tar-stream": true,
+        "@metamask/snaps-utils>@metamask/snaps-registry": true,
         "@metamask/snaps-rpc-methods": true,
         "@metamask/snaps-sdk": true,
         "@metamask/snaps-utils": true,
-        "@metamask/snaps-utils>@metamask/snaps-registry": true,
         "@metamask/utils": true,
+        "@metamask/snaps-controllers>@xstate/fsm": true,
         "browserify>browserify-zlib": true,
+        "@metamask/snaps-controllers>concat-stream": true,
         "eslint>fast-deep-equal": true,
+        "@metamask/snaps-controllers>get-npm-tarball-url": true,
         "immer": true,
         "nanoid": true,
         "readable-stream": true,
-        "semver": true
+        "@metamask/snaps-controllers>readable-web-to-node-stream": true,
+        "semver": true,
+        "@metamask/snaps-controllers>tar-stream": true
       }
     },
-    "@metamask/snaps-controllers-flask>nanoid": {
+    "@metamask/snaps-execution-environments": {
       "globals": {
-        "crypto.getRandomValues": true
+        "document.getElementById": true
+      },
+      "packages": {
+        "@metamask/post-message-stream": true,
+        "@metamask/snaps-utils": true,
+        "@metamask/utils": true
       }
     },
-    "@metamask/snaps-controllers>concat-stream": {
+    "@metamask/snaps-utils>@metamask/snaps-registry": {
       "packages": {
-        "browserify>buffer": true,
-        "browserify>concat-stream>typedarray": true,
-        "pumpify>inherits": true,
-        "readable-stream": true,
-        "terser>source-map-support>buffer-from": true
+        "@metamask/utils>@metamask/superstruct": true,
+        "@metamask/utils": true,
+        "@ethereumjs/tx>ethereum-cryptography>@noble/curves": true,
+        "@noble/hashes": true
       }
     },
-    "@metamask/snaps-controllers>nanoid": {
+    "@metamask/snaps-rpc-methods": {
+      "packages": {
+        "@metamask/snaps-sdk>@metamask/key-tree": true,
+        "@metamask/permission-controller": true,
+        "@metamask/rpc-errors": true,
+        "@metamask/snaps-sdk": true,
+        "@metamask/snaps-utils": true,
+        "@metamask/utils>@metamask/superstruct": true,
+        "@metamask/utils": true,
+        "@noble/hashes": true
+      }
+    },
+    "@metamask/snaps-sdk": {
       "globals": {
-        "crypto.getRandomValues": true
+        "fetch": true
+      },
+      "packages": {
+        "@metamask/rpc-errors": true,
+        "@metamask/utils>@metamask/superstruct": true,
+        "@metamask/utils": true
       }
     },
-    "@metamask/snaps-controllers>readable-web-to-node-stream": {
+    "@metamask/snaps-utils": {
+      "globals": {
+        "File": true,
+        "FileReader": true,
+        "TextDecoder": true,
+        "TextEncoder": true,
+        "URL": true,
+        "console.error": true,
+        "console.log": true,
+        "console.warn": true,
+        "crypto": true,
+        "document.body.appendChild": true,
+        "document.createElement": true,
+        "fetch": true
+      },
       "packages": {
-        "readable-stream": true
+        "@metamask/snaps-sdk>@metamask/key-tree": true,
+        "@metamask/permission-controller": true,
+        "@metamask/rpc-errors": true,
+        "@metamask/snaps-utils>@metamask/slip44": true,
+        "@metamask/snaps-sdk": true,
+        "@metamask/utils>@metamask/superstruct": true,
+        "@metamask/utils": true,
+        "@noble/hashes": true,
+        "@metamask/utils>@scure/base": true,
+        "chalk": true,
+        "@metamask/snaps-utils>cron-parser": true,
+        "@metamask/snaps-utils>fast-json-stable-stringify": true,
+        "@metamask/snaps-utils>fast-xml-parser": true,
+        "@metamask/snaps-utils>marked": true,
+        "@metamask/snaps-utils>rfdc": true,
+        "semver": true,
+        "@metamask/snaps-utils>validate-npm-package-name": true
       }
     },
-    "@metamask/snaps-controllers>tar-stream": {
+    "@metamask/transaction-controller": {
+      "globals": {
+        "clearTimeout": true,
+        "console.error": true,
+        "fetch": true,
+        "setTimeout": true
+      },
       "packages": {
-        "@metamask/snaps-controllers>tar-stream>b4a": true,
-        "@metamask/snaps-controllers>tar-stream>fast-fifo": true,
-        "@metamask/snaps-controllers>tar-stream>streamx": true,
-        "browserify>browser-resolve": true
+        "@ethereumjs/tx>@ethereumjs/common": true,
+        "@ethereumjs/tx": true,
+        "@ethereumjs/tx>@ethereumjs/util": true,
+        "@ethersproject/abi": true,
+        "@ethersproject/contracts": true,
+        "@ethersproject/providers": true,
+        "@metamask/base-controller": true,
+        "@metamask/controller-utils": true,
+        "@metamask/eth-query": true,
+        "@metamask/gas-fee-controller": true,
+        "@metamask/metamask-eth-abis": true,
+        "@metamask/network-controller": true,
+        "@metamask/transaction-controller>@metamask/nonce-tracker": true,
+        "@metamask/rpc-errors": true,
+        "@metamask/utils": true,
+        "@metamask/name-controller>async-mutex": true,
+        "bn.js": true,
+        "browserify>buffer": true,
+        "eth-method-registry": true,
+        "webpack>events": true,
+        "fast-json-patch": true,
+        "lodash": true,
+        "uuid": true
       }
     },
-    "@metamask/snaps-controllers>tar-stream>b4a": {
+    "@metamask/user-operation-controller": {
+      "globals": {
+        "fetch": true
+      },
+      "packages": {
+        "@metamask/base-controller": true,
+        "@metamask/controller-utils": true,
+        "@metamask/eth-query": true,
+        "@metamask/gas-fee-controller": true,
+        "@metamask/polling-controller": true,
+        "@metamask/rpc-errors": true,
+        "@metamask/utils>@metamask/superstruct": true,
+        "@metamask/transaction-controller": true,
+        "@metamask/utils": true,
+        "bn.js": true,
+        "webpack>events": true,
+        "lodash": true,
+        "uuid": true
+      }
+    },
+    "@metamask/utils": {
+      "globals": {
+        "TextDecoder": true,
+        "TextEncoder": true
+      },
+      "packages": {
+        "@metamask/utils>@metamask/superstruct": true,
+        "@noble/hashes": true,
+        "@metamask/utils>@scure/base": true,
+        "browserify>buffer": true,
+        "nock>debug": true,
+        "@metamask/utils>pony-cause": true,
+        "semver": true
+      }
+    },
+    "@metamask/abi-utils>@metamask/utils": {
       "globals": {
         "TextDecoder": true,
         "TextEncoder": true
-      }
-    },
-    "@metamask/snaps-controllers>tar-stream>streamx": {
+      },
       "packages": {
-        "@metamask/snaps-controllers>tar-stream>fast-fifo": true,
-        "@metamask/snaps-controllers>tar-stream>streamx>queue-tick": true,
-        "webpack>events": true
-      }
-    },
-    "@metamask/snaps-controllers>tar-stream>streamx>queue-tick": {
-      "globals": {
-        "queueMicrotask": true
+        "@metamask/utils>@metamask/superstruct": true,
+        "@noble/hashes": true,
+        "@metamask/utils>@scure/base": true,
+        "browserify>buffer": true,
+        "nock>debug": true,
+        "@metamask/utils>pony-cause": true,
+        "semver": true
       }
     },
-    "@metamask/snaps-execution-environments": {
+    "@metamask/browser-passworder>@metamask/utils": {
       "globals": {
-        "document.getElementById": true
+        "TextDecoder": true,
+        "TextEncoder": true
       },
       "packages": {
-        "@metamask/post-message-stream": true,
-        "@metamask/snaps-utils": true,
-        "@metamask/utils": true
-      }
-    },
-    "@metamask/snaps-rpc-methods": {
-      "packages": {
-        "@metamask/permission-controller": true,
-        "@metamask/rpc-errors": true,
-        "@metamask/snaps-sdk": true,
-        "@metamask/snaps-sdk>@metamask/key-tree": true,
-        "@metamask/snaps-utils": true,
-        "@metamask/utils": true,
         "@metamask/utils>@metamask/superstruct": true,
-        "@noble/hashes": true
+        "@noble/hashes": true,
+        "@metamask/utils>@scure/base": true,
+        "browserify>buffer": true,
+        "nock>debug": true,
+        "@metamask/utils>pony-cause": true,
+        "semver": true
       }
     },
-    "@metamask/snaps-sdk": {
+    "@metamask/eth-token-tracker>@metamask/eth-block-tracker>@metamask/utils": {
       "globals": {
-        "fetch": true
+        "TextDecoder": true,
+        "TextEncoder": true
       },
       "packages": {
-        "@metamask/rpc-errors": true,
-        "@metamask/utils": true,
-        "@metamask/utils>@metamask/superstruct": true
+        "@metamask/utils>@metamask/superstruct": true,
+        "@noble/hashes": true,
+        "@metamask/utils>@scure/base": true,
+        "browserify>buffer": true,
+        "nock>debug": true,
+        "@metamask/utils>pony-cause": true,
+        "semver": true
       }
     },
-    "@metamask/snaps-sdk>@metamask/key-tree": {
+    "@metamask/network-controller>@metamask/eth-block-tracker>@metamask/utils": {
       "globals": {
-        "crypto.subtle": true
+        "TextDecoder": true,
+        "TextEncoder": true
       },
       "packages": {
-        "@ethereumjs/tx>ethereum-cryptography>@noble/curves": true,
-        "@metamask/scure-bip39": true,
-        "@metamask/utils": true,
+        "@metamask/utils>@metamask/superstruct": true,
+        "@noble/hashes": true,
         "@metamask/utils>@scure/base": true,
-        "@noble/hashes": true
+        "browserify>buffer": true,
+        "nock>debug": true,
+        "@metamask/utils>pony-cause": true,
+        "semver": true
       }
     },
-    "@metamask/snaps-utils": {
+    "@metamask/keyring-controller>@metamask/eth-hd-keyring>@metamask/utils": {
       "globals": {
-        "File": true,
-        "FileReader": true,
         "TextDecoder": true,
-        "TextEncoder": true,
-        "URL": true,
-        "console.error": true,
-        "console.log": true,
-        "console.warn": true,
-        "crypto": true,
-        "document.body.appendChild": true,
-        "document.createElement": true,
-        "fetch": true
+        "TextEncoder": true
       },
       "packages": {
-        "@metamask/permission-controller": true,
-        "@metamask/rpc-errors": true,
-        "@metamask/snaps-sdk": true,
-        "@metamask/snaps-sdk>@metamask/key-tree": true,
-        "@metamask/snaps-utils>@metamask/slip44": true,
-        "@metamask/snaps-utils>cron-parser": true,
-        "@metamask/snaps-utils>fast-json-stable-stringify": true,
-        "@metamask/snaps-utils>fast-xml-parser": true,
-        "@metamask/snaps-utils>marked": true,
-        "@metamask/snaps-utils>rfdc": true,
-        "@metamask/snaps-utils>validate-npm-package-name": true,
-        "@metamask/utils": true,
         "@metamask/utils>@metamask/superstruct": true,
-        "@metamask/utils>@scure/base": true,
         "@noble/hashes": true,
-        "chalk": true,
+        "@metamask/utils>@scure/base": true,
+        "browserify>buffer": true,
+        "nock>debug": true,
+        "@metamask/utils>pony-cause": true,
         "semver": true
       }
     },
-    "@metamask/snaps-utils>@metamask/snaps-registry": {
+    "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/utils": {
+      "globals": {
+        "TextDecoder": true,
+        "TextEncoder": true
+      },
       "packages": {
-        "@ethereumjs/tx>ethereum-cryptography>@noble/curves": true,
-        "@metamask/utils": true,
         "@metamask/utils>@metamask/superstruct": true,
-        "@noble/hashes": true
+        "@noble/hashes": true,
+        "@metamask/utils>@scure/base": true,
+        "browserify>buffer": true,
+        "nock>debug": true,
+        "@metamask/utils>pony-cause": true,
+        "semver": true
       }
     },
-    "@metamask/snaps-utils>cron-parser": {
+    "@metamask/eth-json-rpc-middleware>@metamask/utils": {
+      "globals": {
+        "TextDecoder": true,
+        "TextEncoder": true
+      },
       "packages": {
-        "browserify>browser-resolve": true,
-        "luxon": true
+        "@metamask/utils>@metamask/superstruct": true,
+        "@noble/hashes": true,
+        "@metamask/utils>@scure/base": true,
+        "browserify>buffer": true,
+        "nock>debug": true,
+        "@metamask/utils>pony-cause": true,
+        "semver": true
       }
     },
-    "@metamask/snaps-utils>fast-xml-parser": {
+    "@metamask/eth-sig-util>@metamask/utils": {
       "globals": {
-        "entityName": true,
-        "val": true
+        "TextDecoder": true,
+        "TextEncoder": true
       },
       "packages": {
-        "@metamask/snaps-utils>fast-xml-parser>strnum": true
+        "@metamask/utils>@metamask/superstruct": true,
+        "@noble/hashes": true,
+        "@metamask/utils>@scure/base": true,
+        "browserify>buffer": true,
+        "nock>debug": true,
+        "@metamask/utils>pony-cause": true,
+        "semver": true
       }
     },
-    "@metamask/snaps-utils>marked": {
+    "@metamask/keyring-controller>@metamask/eth-sig-util>@metamask/utils": {
       "globals": {
-        "console.error": true,
-        "console.warn": true,
-        "define": true
-      }
-    },
-    "@metamask/snaps-utils>rfdc": {
+        "TextDecoder": true,
+        "TextEncoder": true
+      },
       "packages": {
-        "browserify>buffer": true
+        "@metamask/utils>@metamask/superstruct": true,
+        "@noble/hashes": true,
+        "@metamask/utils>@scure/base": true,
+        "browserify>buffer": true,
+        "nock>debug": true,
+        "@metamask/utils>pony-cause": true,
+        "semver": true
       }
     },
-    "@metamask/snaps-utils>validate-npm-package-name": {
+    "@metamask/signature-controller>@metamask/eth-sig-util>@metamask/utils": {
+      "globals": {
+        "TextDecoder": true,
+        "TextEncoder": true
+      },
       "packages": {
-        "@metamask/snaps-utils>validate-npm-package-name>builtins": true
+        "@metamask/utils>@metamask/superstruct": true,
+        "@noble/hashes": true,
+        "@metamask/utils>@scure/base": true,
+        "browserify>buffer": true,
+        "nock>debug": true,
+        "@metamask/utils>pony-cause": true,
+        "semver": true
       }
     },
-    "@metamask/snaps-utils>validate-npm-package-name>builtins": {
+    "@metamask/keyring-controller>@metamask/eth-simple-keyring>@metamask/utils": {
+      "globals": {
+        "TextDecoder": true,
+        "TextEncoder": true
+      },
       "packages": {
-        "process": true,
+        "@metamask/utils>@metamask/superstruct": true,
+        "@noble/hashes": true,
+        "@metamask/utils>@scure/base": true,
+        "browserify>buffer": true,
+        "nock>debug": true,
+        "@metamask/utils>pony-cause": true,
         "semver": true
       }
     },
-    "@metamask/test-bundler>@ethersproject/networks": {
+    "@metamask/eth-snap-keyring>@metamask/utils": {
+      "globals": {
+        "TextDecoder": true,
+        "TextEncoder": true
+      },
       "packages": {
-        "ethers>@ethersproject/logger": true
+        "@metamask/utils>@metamask/superstruct": true,
+        "@noble/hashes": true,
+        "@metamask/utils>@scure/base": true,
+        "browserify>buffer": true,
+        "nock>debug": true,
+        "@metamask/utils>pony-cause": true,
+        "semver": true
       }
     },
-    "@metamask/transaction-controller": {
+    "@metamask/keyring-api>@metamask/utils": {
       "globals": {
-        "clearTimeout": true,
-        "console.error": true,
-        "fetch": true,
-        "setTimeout": true
+        "TextDecoder": true,
+        "TextEncoder": true
       },
       "packages": {
-        "@ethereumjs/tx": true,
-        "@ethereumjs/tx>@ethereumjs/common": true,
-        "@ethereumjs/tx>@ethereumjs/util": true,
-        "@ethersproject/abi": true,
-        "@ethersproject/contracts": true,
-        "@ethersproject/providers": true,
-        "@metamask/base-controller": true,
-        "@metamask/controller-utils": true,
-        "@metamask/eth-query": true,
-        "@metamask/gas-fee-controller": true,
-        "@metamask/metamask-eth-abis": true,
-        "@metamask/name-controller>async-mutex": true,
-        "@metamask/network-controller": true,
-        "@metamask/rpc-errors": true,
-        "@metamask/transaction-controller>@metamask/nonce-tracker": true,
-        "@metamask/utils": true,
-        "bn.js": true,
+        "@metamask/utils>@metamask/superstruct": true,
+        "@noble/hashes": true,
+        "@metamask/utils>@scure/base": true,
         "browserify>buffer": true,
-        "eth-method-registry": true,
-        "fast-json-patch": true,
-        "lodash": true,
-        "uuid": true,
-        "webpack>events": true
+        "nock>debug": true,
+        "@metamask/utils>pony-cause": true,
+        "semver": true
       }
     },
-    "@metamask/transaction-controller>@metamask/nonce-tracker": {
+    "@metamask/keyring-api>@metamask/keyring-utils>@metamask/utils": {
+      "globals": {
+        "TextDecoder": true,
+        "TextEncoder": true
+      },
       "packages": {
-        "@ethersproject/providers": true,
-        "@metamask/transaction-controller>@metamask/nonce-tracker>async-mutex": true,
-        "browserify>assert": true
+        "@metamask/utils>@metamask/superstruct": true,
+        "@noble/hashes": true,
+        "@metamask/utils>@scure/base": true,
+        "browserify>buffer": true,
+        "nock>debug": true,
+        "@metamask/utils>pony-cause": true,
+        "semver": true
       }
     },
-    "@metamask/transaction-controller>@metamask/nonce-tracker>async-mutex": {
+    "@metamask/name-controller>@metamask/utils": {
       "globals": {
-        "clearTimeout": true,
-        "setTimeout": true
+        "TextDecoder": true,
+        "TextEncoder": true
       },
       "packages": {
-        "@swc/helpers>tslib": true
+        "@metamask/utils>@metamask/superstruct": true,
+        "@noble/hashes": true,
+        "@metamask/utils>@scure/base": true,
+        "browserify>buffer": true,
+        "nock>debug": true,
+        "@metamask/utils>pony-cause": true,
+        "semver": true
       }
     },
-    "@metamask/user-operation-controller": {
+    "@metamask/permission-log-controller>@metamask/utils": {
       "globals": {
-        "fetch": true
+        "TextDecoder": true,
+        "TextEncoder": true
       },
       "packages": {
-        "@metamask/base-controller": true,
-        "@metamask/controller-utils": true,
-        "@metamask/eth-query": true,
-        "@metamask/gas-fee-controller": true,
-        "@metamask/polling-controller": true,
-        "@metamask/rpc-errors": true,
-        "@metamask/transaction-controller": true,
-        "@metamask/utils": true,
         "@metamask/utils>@metamask/superstruct": true,
-        "bn.js": true,
-        "lodash": true,
-        "uuid": true,
-        "webpack>events": true
+        "@noble/hashes": true,
+        "@metamask/utils>@scure/base": true,
+        "browserify>buffer": true,
+        "nock>debug": true,
+        "@metamask/utils>pony-cause": true,
+        "semver": true
       }
     },
-    "@metamask/utils": {
+    "@metamask/post-message-stream>@metamask/utils": {
       "globals": {
         "TextDecoder": true,
         "TextEncoder": true
       },
       "packages": {
         "@metamask/utils>@metamask/superstruct": true,
+        "@noble/hashes": true,
         "@metamask/utils>@scure/base": true,
+        "browserify>buffer": true,
+        "nock>debug": true,
         "@metamask/utils>pony-cause": true,
+        "semver": true
+      }
+    },
+    "@metamask/rate-limit-controller>@metamask/utils": {
+      "globals": {
+        "TextDecoder": true,
+        "TextEncoder": true
+      },
+      "packages": {
+        "@metamask/utils>@metamask/superstruct": true,
         "@noble/hashes": true,
+        "@metamask/utils>@scure/base": true,
         "browserify>buffer": true,
         "nock>debug": true,
+        "@metamask/utils>pony-cause": true,
         "semver": true
       }
     },
-    "@metamask/utils>@scure/base": {
+    "@metamask/rate-limit-controller>@metamask/rpc-errors>@metamask/utils": {
       "globals": {
         "TextDecoder": true,
         "TextEncoder": true
+      },
+      "packages": {
+        "@metamask/utils>@metamask/superstruct": true,
+        "@noble/hashes": true,
+        "@metamask/utils>@scure/base": true,
+        "browserify>buffer": true,
+        "nock>debug": true,
+        "@metamask/utils>pony-cause": true,
+        "semver": true
       }
     },
     "@ngraveio/bc-ur": {
       "packages": {
         "@ngraveio/bc-ur>@keystonehq/alias-sampling": true,
+        "browserify>assert": true,
         "@ngraveio/bc-ur>bignumber.js": true,
+        "browserify>buffer": true,
         "@ngraveio/bc-ur>cbor-sync": true,
         "@ngraveio/bc-ur>crc": true,
         "@ngraveio/bc-ur>jsbi": true,
-        "addons-linter>sha.js": true,
-        "browserify>assert": true,
-        "browserify>buffer": true
-      }
-    },
-    "@ngraveio/bc-ur>assert>object-is": {
-      "packages": {
-        "string.prototype.matchall>call-bind": true,
-        "string.prototype.matchall>define-properties": true
+        "addons-linter>sha.js": true
       }
     },
-    "@ngraveio/bc-ur>bignumber.js": {
+    "@metamask/profile-sync-controller>@noble/ciphers": {
       "globals": {
-        "crypto": true,
-        "define": true
+        "TextDecoder": true,
+        "TextEncoder": true,
+        "crypto": true
       }
     },
-    "@ngraveio/bc-ur>cbor-sync": {
+    "@ethereumjs/tx>ethereum-cryptography>@noble/curves": {
       "globals": {
-        "define": true
+        "TextEncoder": true
       },
       "packages": {
-        "browserify>buffer": true
+        "@noble/hashes": true
       }
     },
-    "@ngraveio/bc-ur>crc": {
-      "packages": {
-        "browserify>buffer": true
+    "@noble/hashes": {
+      "globals": {
+        "TextEncoder": true,
+        "crypto": true
       }
     },
-    "@ngraveio/bc-ur>jsbi": {
+    "@metamask/scure-bip39>@noble/hashes": {
       "globals": {
-        "define": true
+        "TextEncoder": true,
+        "crypto": true
       }
     },
-    "@noble/hashes": {
+    "eth-lattice-keyring>@ethereumjs/tx>ethereum-cryptography>@noble/hashes": {
+      "globals": {
+        "TextEncoder": true,
+        "crypto": true
+      }
+    },
+    "eth-lattice-keyring>gridplus-sdk>@ethereumjs/tx>ethereum-cryptography>@noble/hashes": {
       "globals": {
         "TextEncoder": true,
         "crypto": true
@@ -2778,6 +2193,20 @@
         "navigator.userAgent": true
       }
     },
+    "@trezor/connect-web>@trezor/connect>@trezor/protobuf>protobufjs>@protobufjs/codegen": {
+      "globals": {
+        "console.log": true
+      }
+    },
+    "@trezor/connect-web>@trezor/connect>@trezor/protobuf>protobufjs>@protobufjs/fetch": {
+      "globals": {
+        "XMLHttpRequest": true
+      },
+      "packages": {
+        "@trezor/connect-web>@trezor/connect>@trezor/protobuf>protobufjs>@protobufjs/aspromise": true,
+        "@trezor/connect-web>@trezor/connect>@trezor/protobuf>protobufjs>@protobufjs/inquire": true
+      }
+    },
     "@reduxjs/toolkit": {
       "globals": {
         "AbortController": true,
@@ -2789,42 +2218,46 @@
         "setTimeout": true
       },
       "packages": {
-        "@reduxjs/toolkit>reselect": true,
         "immer": true,
         "process": 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
+        "redux-thunk": true,
+        "@reduxjs/toolkit>reselect": true
       }
     },
-    "@sentry/browser": {
+    "react-router-dom-v5-compat>@remix-run/router": {
       "globals": {
-        "PerformanceObserver.supportedEntryTypes": true,
+        "AbortController": true,
+        "DOMException": true,
+        "FormData": true,
+        "Headers": true,
         "Request": true,
+        "Response": true,
         "URL": true,
-        "XMLHttpRequest.prototype": true,
-        "__SENTRY_DEBUG__": true,
-        "__SENTRY_RELEASE__": true,
-        "addEventListener": true,
-        "console.error": true,
-        "indexedDB.open": true,
-        "performance.timeOrigin": true,
-        "setTimeout": true
-      },
+        "URLSearchParams": true,
+        "console": true,
+        "document.defaultView": true
+      }
+    },
+    "@metamask/utils>@scure/base": {
+      "globals": {
+        "TextDecoder": true,
+        "TextEncoder": true
+      }
+    },
+    "@ethereumjs/tx>ethereum-cryptography>@scure/bip32": {
       "packages": {
-        "@sentry/browser>@sentry-internal/browser-utils": true,
-        "@sentry/browser>@sentry-internal/feedback": true,
-        "@sentry/browser>@sentry-internal/replay": true,
-        "@sentry/browser>@sentry-internal/replay-canvas": true,
-        "@sentry/browser>@sentry/core": true,
-        "@sentry/utils": true
+        "@ethereumjs/tx>ethereum-cryptography>@noble/curves": true,
+        "@noble/hashes": true,
+        "@metamask/utils>@scure/base": true
+      }
+    },
+    "@segment/loosely-validate-event": {
+      "packages": {
+        "browserify>assert": true,
+        "browserify>buffer": true,
+        "@segment/loosely-validate-event>component-type": true,
+        "@segment/loosely-validate-event>join-component": true
       }
     },
     "@sentry/browser>@sentry-internal/browser-utils": {
@@ -2863,6 +2296,25 @@
         "@sentry/utils": true
       }
     },
+    "@sentry/browser>@sentry-internal/replay-canvas": {
+      "globals": {
+        "Blob": true,
+        "HTMLCanvasElement": true,
+        "HTMLImageElement": true,
+        "ImageData": true,
+        "URL.createObjectURL": true,
+        "WeakRef": true,
+        "Worker": true,
+        "cancelAnimationFrame": true,
+        "console.error": true,
+        "createImageBitmap": true,
+        "document": true
+      },
+      "packages": {
+        "@sentry/browser>@sentry/core": true,
+        "@sentry/utils": true
+      }
+    },
     "@sentry/browser>@sentry-internal/replay": {
       "globals": {
         "Blob": true,
@@ -2912,21 +2364,25 @@
         "@sentry/utils": true
       }
     },
-    "@sentry/browser>@sentry-internal/replay-canvas": {
+    "@sentry/browser": {
       "globals": {
-        "Blob": true,
-        "HTMLCanvasElement": true,
-        "HTMLImageElement": true,
-        "ImageData": true,
-        "URL.createObjectURL": true,
-        "WeakRef": true,
-        "Worker": true,
-        "cancelAnimationFrame": true,
+        "PerformanceObserver.supportedEntryTypes": true,
+        "Request": true,
+        "URL": true,
+        "XMLHttpRequest.prototype": true,
+        "__SENTRY_DEBUG__": true,
+        "__SENTRY_RELEASE__": true,
+        "addEventListener": true,
         "console.error": true,
-        "createImageBitmap": true,
-        "document": true
+        "indexedDB.open": true,
+        "performance.timeOrigin": true,
+        "setTimeout": true
       },
       "packages": {
+        "@sentry/browser>@sentry-internal/browser-utils": true,
+        "@sentry/browser>@sentry-internal/feedback": true,
+        "@sentry/browser>@sentry-internal/replay-canvas": true,
+        "@sentry/browser>@sentry-internal/replay": true,
         "@sentry/browser>@sentry/core": true,
         "@sentry/utils": true
       }
@@ -2997,45 +2453,86 @@
         "isSecureContext": true
       },
       "packages": {
-        "@solana/addresses>@solana/errors": true
+        "@solana/addresses>@solana/errors": true
+      }
+    },
+    "@solana/addresses>@solana/codecs-core": {
+      "packages": {
+        "@solana/addresses>@solana/errors": true
+      }
+    },
+    "@solana/addresses>@solana/codecs-strings": {
+      "globals": {
+        "TextDecoder": true,
+        "TextEncoder": true,
+        "atob": true,
+        "btoa": true
+      },
+      "packages": {
+        "@solana/addresses>@solana/codecs-core": true,
+        "@solana/addresses>@solana/errors": true
+      }
+    },
+    "@solana/addresses>@solana/errors": {
+      "globals": {
+        "btoa": true
+      }
+    },
+    "@metamask/controller-utils>@spruceid/siwe-parser": {
+      "globals": {
+        "console.error": true,
+        "console.log": true
+      },
+      "packages": {
+        "@noble/hashes": true,
+        "@metamask/controller-utils>@spruceid/siwe-parser>apg-js": true
+      }
+    },
+    "@metamask/profile-sync-controller>siwe>@spruceid/siwe-parser": {
+      "globals": {
+        "console.error": true,
+        "console.log": true
+      },
+      "packages": {
+        "@noble/hashes": true,
+        "@metamask/controller-utils>@spruceid/siwe-parser>apg-js": true
       }
     },
-    "@solana/addresses>@solana/codecs-core": {
+    "@metamask/profile-sync-controller>siwe>@stablelib/random>@stablelib/binary": {
       "packages": {
-        "@solana/addresses>@solana/errors": true
+        "@metamask/profile-sync-controller>siwe>@stablelib/random>@stablelib/binary>@stablelib/int": true
       }
     },
-    "@solana/addresses>@solana/codecs-strings": {
+    "@metamask/profile-sync-controller>siwe>@stablelib/random": {
       "globals": {
-        "TextDecoder": true,
-        "TextEncoder": true,
-        "atob": true,
-        "btoa": true
+        "crypto": true,
+        "msCrypto": true
       },
       "packages": {
-        "@solana/addresses>@solana/codecs-core": true,
-        "@solana/addresses>@solana/errors": true
+        "@metamask/profile-sync-controller>siwe>@stablelib/random>@stablelib/binary": true,
+        "@metamask/profile-sync-controller>siwe>@stablelib/random>@stablelib/wipe": true,
+        "browserify>browser-resolve": true
       }
     },
-    "@solana/addresses>@solana/errors": {
+    "@trezor/connect-web>@trezor/connect-common": {
       "globals": {
-        "btoa": true
-      }
-    },
-    "@storybook/addon-docs>remark-external-links>mdast-util-definitions": {
+        "console.warn": true,
+        "localStorage.getItem": true,
+        "localStorage.setItem": true,
+        "navigator": true,
+        "setTimeout": true,
+        "window": true
+      },
       "packages": {
-        "react-markdown>unist-util-visit": true
+        "@trezor/connect-web>@trezor/connect-common>@trezor/env-utils": true,
+        "@trezor/connect-web>@trezor/utils": true,
+        "@swc/helpers>tslib": true
       }
     },
-    "@storybook/addon-knobs>qs": {
+    "@metamask/eth-trezor-keyring>@trezor/connect-plugin-ethereum": {
       "packages": {
-        "string.prototype.matchall>side-channel": true
-      }
-    },
-    "@swc/helpers>tslib": {
-      "globals": {
-        "SuppressedError": true,
-        "define": true
+        "@metamask/eth-sig-util": true,
+        "@swc/helpers>tslib": true
       }
     },
     "@trezor/connect-web": {
@@ -3062,35 +2559,20 @@
         "setTimeout": true
       },
       "packages": {
-        "@swc/helpers>tslib": true,
-        "@trezor/connect-web>@trezor/connect": true,
         "@trezor/connect-web>@trezor/connect-common": true,
+        "@trezor/connect-web>@trezor/connect": true,
         "@trezor/connect-web>@trezor/utils": true,
-        "webpack>events": true
+        "webpack>events": true,
+        "@swc/helpers>tslib": true
       }
     },
     "@trezor/connect-web>@trezor/connect": {
       "packages": {
-        "@swc/helpers>tslib": true,
         "@trezor/connect-web>@trezor/connect>@trezor/protobuf": true,
         "@trezor/connect-web>@trezor/connect>@trezor/schema-utils": true,
         "@trezor/connect-web>@trezor/connect>@trezor/transport": true,
-        "@trezor/connect-web>@trezor/utils": true
-      }
-    },
-    "@trezor/connect-web>@trezor/connect-common": {
-      "globals": {
-        "console.warn": true,
-        "localStorage.getItem": true,
-        "localStorage.setItem": true,
-        "navigator": true,
-        "setTimeout": true,
-        "window": true
-      },
-      "packages": {
-        "@swc/helpers>tslib": true,
-        "@trezor/connect-web>@trezor/connect-common>@trezor/env-utils": true,
-        "@trezor/connect-web>@trezor/utils": true
+        "@trezor/connect-web>@trezor/utils": true,
+        "@swc/helpers>tslib": true
       }
     },
     "@trezor/connect-web>@trezor/connect-common>@trezor/env-utils": {
@@ -3106,54 +2588,17 @@
         "screen.width": true
       },
       "packages": {
+        "process": true,
         "@swc/helpers>tslib": true,
-        "@trezor/connect-web>@trezor/connect-common>@trezor/env-utils>ua-parser-js": true,
-        "process": true
-      }
-    },
-    "@trezor/connect-web>@trezor/connect-common>@trezor/env-utils>ua-parser-js": {
-      "globals": {
-        "define": true
+        "@trezor/connect-web>@trezor/connect-common>@trezor/env-utils>ua-parser-js": true
       }
     },
     "@trezor/connect-web>@trezor/connect>@trezor/protobuf": {
       "packages": {
-        "@swc/helpers>tslib": true,
-        "@trezor/connect-web>@trezor/connect>@trezor/protobuf>protobufjs": true,
         "@trezor/connect-web>@trezor/connect>@trezor/schema-utils": true,
-        "browserify>buffer": true
-      }
-    },
-    "@trezor/connect-web>@trezor/connect>@trezor/protobuf>protobufjs": {
-      "globals": {
-        "process": true,
-        "setTimeout": true
-      },
-      "packages": {
-        "@trezor/connect-web>@trezor/connect>@trezor/protobuf>protobufjs>@protobufjs/aspromise": true,
-        "@trezor/connect-web>@trezor/connect>@trezor/protobuf>protobufjs>@protobufjs/base64": true,
-        "@trezor/connect-web>@trezor/connect>@trezor/protobuf>protobufjs>@protobufjs/codegen": true,
-        "@trezor/connect-web>@trezor/connect>@trezor/protobuf>protobufjs>@protobufjs/eventemitter": true,
-        "@trezor/connect-web>@trezor/connect>@trezor/protobuf>protobufjs>@protobufjs/fetch": true,
-        "@trezor/connect-web>@trezor/connect>@trezor/protobuf>protobufjs>@protobufjs/float": true,
-        "@trezor/connect-web>@trezor/connect>@trezor/protobuf>protobufjs>@protobufjs/inquire": true,
-        "@trezor/connect-web>@trezor/connect>@trezor/protobuf>protobufjs>@protobufjs/path": true,
-        "@trezor/connect-web>@trezor/connect>@trezor/protobuf>protobufjs>@protobufjs/pool": true,
-        "@trezor/connect-web>@trezor/connect>@trezor/protobuf>protobufjs>@protobufjs/utf8": true
-      }
-    },
-    "@trezor/connect-web>@trezor/connect>@trezor/protobuf>protobufjs>@protobufjs/codegen": {
-      "globals": {
-        "console.log": true
-      }
-    },
-    "@trezor/connect-web>@trezor/connect>@trezor/protobuf>protobufjs>@protobufjs/fetch": {
-      "globals": {
-        "XMLHttpRequest": true
-      },
-      "packages": {
-        "@trezor/connect-web>@trezor/connect>@trezor/protobuf>protobufjs>@protobufjs/aspromise": true,
-        "@trezor/connect-web>@trezor/connect>@trezor/protobuf>protobufjs>@protobufjs/inquire": true
+        "browserify>buffer": true,
+        "@trezor/connect-web>@trezor/connect>@trezor/protobuf>protobufjs": true,
+        "@swc/helpers>tslib": true
       }
     },
     "@trezor/connect-web>@trezor/connect>@trezor/schema-utils": {
@@ -3180,16 +2625,10 @@
         "setTimeout": true
       },
       "packages": {
-        "@swc/helpers>tslib": true,
         "@trezor/connect-web>@trezor/utils>bignumber.js": true,
         "browserify>buffer": true,
-        "webpack>events": true
-      }
-    },
-    "@trezor/connect-web>@trezor/utils>bignumber.js": {
-      "globals": {
-        "crypto": true,
-        "define": true
+        "webpack>events": true,
+        "@swc/helpers>tslib": true
       }
     },
     "@welldone-software/why-did-you-render": {
@@ -3204,59 +2643,193 @@
         "setTimeout": true
       },
       "packages": {
-        "lodash": true,
-        "react": true
+        "lodash": true,
+        "react": true
+      }
+    },
+    "@zxing/browser": {
+      "globals": {
+        "HTMLElement": true,
+        "HTMLImageElement": true,
+        "HTMLVideoElement": true,
+        "clearTimeout": true,
+        "console.error": true,
+        "console.warn": true,
+        "document": true,
+        "navigator": true,
+        "setTimeout": true
+      },
+      "packages": {
+        "@zxing/library": true
+      }
+    },
+    "@zxing/library": {
+      "globals": {
+        "HTMLImageElement": true,
+        "HTMLVideoElement": true,
+        "TextDecoder": true,
+        "TextEncoder": true,
+        "URL.createObjectURL": true,
+        "btoa": true,
+        "console.log": true,
+        "console.warn": true,
+        "document": true,
+        "navigator": true,
+        "setTimeout": true
+      },
+      "packages": {
+        "@zxing/library>ts-custom-error": true
+      }
+    },
+    "@lavamoat/lavapack>readable-stream>abort-controller": {
+      "globals": {
+        "AbortController": true
+      }
+    },
+    "currency-formatter>accounting": {
+      "globals": {
+        "define": true
+      }
+    },
+    "ethers>@ethersproject/json-wallets>aes-js": {
+      "globals": {
+        "define": true
+      }
+    },
+    "eth-lattice-keyring>gridplus-sdk>aes-js": {
+      "globals": {
+        "define": true
+      }
+    },
+    "chalk>ansi-styles": {
+      "packages": {
+        "chalk>ansi-styles>color-convert": true
+      }
+    },
+    "@metamask/controller-utils>@spruceid/siwe-parser>apg-js": {
+      "packages": {
+        "browserify>buffer": true
+      }
+    },
+    "string.prototype.matchall>es-abstract>array-buffer-byte-length": {
+      "packages": {
+        "string.prototype.matchall>call-bind": true,
+        "string.prototype.matchall>es-abstract>is-array-buffer": true
+      }
+    },
+    "crypto-browserify>public-encrypt>parse-asn1>asn1.js": {
+      "packages": {
+        "bn.js": true,
+        "browserify>buffer": true,
+        "pumpify>inherits": true,
+        "@metamask/ppom-validator>elliptic>minimalistic-assert": true,
+        "browserify>vm-browserify": true
+      }
+    },
+    "browserify>assert": {
+      "globals": {
+        "Buffer": true
+      },
+      "packages": {
+        "react>object-assign": true,
+        "browserify>assert>util": true
+      }
+    },
+    "@metamask/name-controller>async-mutex": {
+      "globals": {
+        "clearTimeout": true,
+        "setTimeout": true
+      },
+      "packages": {
+        "@swc/helpers>tslib": true
+      }
+    },
+    "@metamask/transaction-controller>@metamask/nonce-tracker>async-mutex": {
+      "globals": {
+        "clearTimeout": true,
+        "setTimeout": true
+      },
+      "packages": {
+        "@swc/helpers>tslib": true
+      }
+    },
+    "string.prototype.matchall>es-abstract>available-typed-arrays": {
+      "packages": {
+        "string.prototype.matchall>es-abstract>typed-array-length>possible-typed-array-names": true
+      }
+    },
+    "await-semaphore": {
+      "packages": {
+        "process": true,
+        "browserify>timers-browserify": true
+      }
+    },
+    "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth>@ledgerhq/domain-service>axios": {
+      "globals": {
+        "Blob": true,
+        "FormData": true,
+        "URLSearchParams": true,
+        "XMLHttpRequest": true,
+        "btoa": true,
+        "console.warn": true,
+        "document": true,
+        "location.href": true,
+        "navigator": true,
+        "setTimeout": true
+      },
+      "packages": {
+        "browserify>buffer": true,
+        "axios>form-data": true,
+        "process": true
       }
     },
-    "@zxing/browser": {
+    "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth>@ledgerhq/evm-tools>axios": {
       "globals": {
-        "HTMLElement": true,
-        "HTMLImageElement": true,
-        "HTMLVideoElement": true,
-        "clearTimeout": true,
-        "console.error": true,
+        "Blob": true,
+        "FormData": true,
+        "URLSearchParams": true,
+        "XMLHttpRequest": true,
+        "btoa": true,
         "console.warn": true,
         "document": true,
+        "location.href": true,
         "navigator": true,
         "setTimeout": true
       },
       "packages": {
-        "@zxing/library": true
+        "browserify>buffer": true,
+        "axios>form-data": true,
+        "process": true
       }
     },
-    "@zxing/library": {
+    "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth>axios": {
       "globals": {
-        "HTMLImageElement": true,
-        "HTMLVideoElement": true,
-        "TextDecoder": true,
-        "TextEncoder": true,
-        "URL.createObjectURL": true,
+        "Blob": true,
+        "FormData": true,
+        "URLSearchParams": true,
+        "XMLHttpRequest": true,
         "btoa": true,
-        "console.log": true,
         "console.warn": true,
         "document": true,
+        "location.href": true,
         "navigator": true,
         "setTimeout": true
       },
       "packages": {
-        "@zxing/library>ts-custom-error": true
+        "browserify>buffer": true,
+        "axios>form-data": true,
+        "process": true
       }
     },
-    "addons-linter>sha.js": {
-      "packages": {
-        "koa>content-disposition>safe-buffer": true,
-        "pumpify>inherits": true
+    "@metamask/snaps-controllers>tar-stream>b4a": {
+      "globals": {
+        "TextDecoder": true,
+        "TextEncoder": true
       }
     },
-    "await-semaphore": {
+    "@ensdomains/content-hash>multihashes>multibase>base-x": {
       "packages": {
-        "browserify>timers-browserify": true,
-        "process": true
-      }
-    },
-    "axios>form-data": {
-      "globals": {
-        "FormData": true
+        "koa>content-disposition>safe-buffer": true
       }
     },
     "base32-encode": {
@@ -3270,136 +2843,156 @@
         "define": true
       }
     },
-    "blo": {
+    "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth>bignumber.js": {
       "globals": {
-        "btoa": true
+        "crypto": true,
+        "define": true
       }
     },
-    "bn.js": {
+    "@metamask/notification-services-controller>bignumber.js": {
       "globals": {
-        "Buffer": true
-      },
-      "packages": {
-        "browserify>browser-resolve": true
+        "crypto": true,
+        "define": true
       }
     },
-    "bowser": {
+    "@metamask/smart-transactions-controller>bignumber.js": {
       "globals": {
+        "crypto": true,
         "define": true
       }
     },
-    "browserify>assert": {
+    "@ngraveio/bc-ur>bignumber.js": {
       "globals": {
-        "Buffer": true
-      },
-      "packages": {
-        "browserify>assert>util": true,
-        "react>object-assign": true
+        "crypto": true,
+        "define": true
       }
     },
-    "browserify>assert>util": {
+    "@trezor/connect-web>@trezor/utils>bignumber.js": {
       "globals": {
-        "console.error": true,
-        "console.log": true,
-        "console.trace": true,
-        "process": true
-      },
+        "crypto": true,
+        "define": true
+      }
+    },
+    "eth-lattice-keyring>gridplus-sdk>borc>bignumber.js": {
+      "globals": {
+        "crypto": true,
+        "define": true
+      }
+    },
+    "eth-lattice-keyring>gridplus-sdk>bignumber.js": {
+      "globals": {
+        "crypto": true,
+        "define": true
+      }
+    },
+    "eth-lattice-keyring>gridplus-sdk>bitwise": {
       "packages": {
-        "browserify>assert>util>inherits": true,
-        "process": true
+        "browserify>buffer": true
       }
     },
-    "browserify>browserify-zlib": {
+    "blo": {
+      "globals": {
+        "btoa": true
+      }
+    },
+    "bn.js": {
+      "globals": {
+        "Buffer": true
+      },
       "packages": {
-        "browserify>assert": true,
-        "browserify>browserify-zlib>pako": true,
-        "browserify>buffer": true,
-        "browserify>util": true,
-        "process": true,
-        "stream-browserify": true
+        "browserify>browser-resolve": true
       }
     },
-    "browserify>buffer": {
+    "eth-lattice-keyring>gridplus-sdk>borc": {
       "globals": {
         "console": true
       },
       "packages": {
-        "base64-js": true,
-        "buffer>ieee754": true
+        "eth-lattice-keyring>gridplus-sdk>borc>bignumber.js": true,
+        "browserify>buffer": true,
+        "buffer>ieee754": true,
+        "eth-lattice-keyring>gridplus-sdk>borc>iso-url": true
       }
     },
-    "browserify>punycode": {
+    "bowser": {
       "globals": {
         "define": true
       }
     },
-    "browserify>string_decoder": {
+    "@metamask/ppom-validator>elliptic>brorand": {
+      "globals": {
+        "crypto": true,
+        "msCrypto": true
+      },
       "packages": {
-        "koa>content-disposition>safe-buffer": true
+        "browserify>browser-resolve": true
       }
     },
-    "browserify>timers-browserify": {
-      "globals": {
-        "clearInterval": true,
-        "clearTimeout": true,
-        "setInterval": true,
-        "setTimeout": true
-      },
+    "ethereumjs-util>ethereum-cryptography>browserify-aes": {
       "packages": {
-        "process": true
+        "ethereumjs-util>ethereum-cryptography>browserify-aes>buffer-xor": true,
+        "browserify>buffer": true,
+        "ethereumjs-util>create-hash>cipher-base": true,
+        "crypto-browserify>browserify-cipher>evp_bytestokey": true,
+        "pumpify>inherits": true,
+        "koa>content-disposition>safe-buffer": true
       }
     },
-    "browserify>url": {
+    "crypto-browserify>browserify-cipher": {
       "packages": {
-        "@storybook/addon-knobs>qs": true,
-        "browserify>punycode": true
+        "ethereumjs-util>ethereum-cryptography>browserify-aes": true,
+        "crypto-browserify>browserify-cipher>browserify-des": true,
+        "crypto-browserify>browserify-cipher>evp_bytestokey": true
       }
     },
-    "browserify>util": {
-      "globals": {
-        "console.error": true,
-        "console.log": true,
-        "console.trace": true
-      },
+    "crypto-browserify>browserify-cipher>browserify-des": {
       "packages": {
-        "browserify>util>is-arguments": true,
-        "browserify>util>is-typed-array": true,
-        "browserify>util>which-typed-array": true,
-        "koa>is-generator-function": true,
-        "process": true,
+        "browserify>buffer": true,
+        "ethereumjs-util>create-hash>cipher-base": true,
+        "crypto-browserify>browserify-cipher>browserify-des>des.js": true,
         "pumpify>inherits": true
       }
     },
-    "browserify>util>is-arguments": {
+    "crypto-browserify>public-encrypt>browserify-rsa": {
       "packages": {
-        "koa>is-generator-function>has-tostringtag": true,
-        "string.prototype.matchall>call-bind": true
+        "bn.js": true,
+        "browserify>buffer": true,
+        "crypto-browserify>randombytes": true
       }
     },
-    "browserify>util>is-typed-array": {
+    "crypto-browserify>browserify-sign": {
       "packages": {
-        "browserify>util>which-typed-array": true
+        "bn.js": true,
+        "crypto-browserify>public-encrypt>browserify-rsa": true,
+        "browserify>buffer": true,
+        "ethereumjs-util>create-hash": true,
+        "crypto-browserify>create-hmac": true,
+        "@metamask/ppom-validator>elliptic": true,
+        "pumpify>inherits": true,
+        "crypto-browserify>public-encrypt>parse-asn1": true,
+        "stream-browserify": true
       }
     },
-    "browserify>util>which-typed-array": {
+    "browserify>browserify-zlib": {
       "packages": {
-        "browserify>util>which-typed-array>for-each": true,
-        "koa>is-generator-function>has-tostringtag": true,
-        "string.prototype.matchall>call-bind": true,
-        "string.prototype.matchall>es-abstract>available-typed-arrays": true,
-        "string.prototype.matchall>es-abstract>gopd": true
+        "browserify>assert": true,
+        "browserify>buffer": true,
+        "browserify>browserify-zlib>pako": true,
+        "process": true,
+        "stream-browserify": true,
+        "browserify>util": true
       }
     },
-    "browserify>util>which-typed-array>for-each": {
+    "ethereumjs-util>ethereum-cryptography>bs58check>bs58": {
       "packages": {
-        "string.prototype.matchall>es-abstract>is-callable": true
+        "@ensdomains/content-hash>multihashes>multibase>base-x": true
       }
     },
-    "browserify>vm-browserify": {
-      "globals": {
-        "document.body.appendChild": true,
-        "document.body.removeChild": true,
-        "document.createElement": true
+    "ethereumjs-util>ethereum-cryptography>bs58check": {
+      "packages": {
+        "ethereumjs-util>ethereum-cryptography>bs58check>bs58": true,
+        "ethereumjs-util>create-hash": true,
+        "koa>content-disposition>safe-buffer": true
       }
     },
     "buffer": {
@@ -3411,20 +3004,52 @@
         "buffer>ieee754": true
       }
     },
-    "chalk": {
+    "terser>source-map-support>buffer-from": {
       "packages": {
-        "chalk>ansi-styles": true,
-        "chalk>supports-color": true
+        "browserify>buffer": true
       }
     },
-    "chalk>ansi-styles": {
+    "ethereumjs-util>ethereum-cryptography>browserify-aes>buffer-xor": {
+      "packages": {
+        "browserify>buffer": true
+      }
+    },
+    "browserify>buffer": {
+      "globals": {
+        "console": true
+      },
+      "packages": {
+        "base64-js": true,
+        "buffer>ieee754": true
+      }
+    },
+    "@metamask/snaps-utils>validate-npm-package-name>builtins": {
+      "packages": {
+        "process": true,
+        "semver": true
+      }
+    },
+    "string.prototype.matchall>call-bind": {
+      "packages": {
+        "string.prototype.matchall>call-bind>es-define-property": true,
+        "string.prototype.matchall>call-bind>es-errors": true,
+        "browserify>has>function-bind": true,
+        "string.prototype.matchall>get-intrinsic": true,
+        "string.prototype.matchall>call-bind>set-function-length": true
+      }
+    },
+    "@ngraveio/bc-ur>cbor-sync": {
+      "globals": {
+        "define": true
+      },
       "packages": {
-        "chalk>ansi-styles>color-convert": true
+        "browserify>buffer": true
       }
     },
-    "chalk>ansi-styles>color-convert": {
+    "chalk": {
       "packages": {
-        "jest-canvas-mock>moo-color>color-name": true
+        "chalk>ansi-styles": true,
+        "chalk>supports-color": true
       }
     },
     "chart.js": {
@@ -3448,9 +3073,20 @@
         "chart.js>@kurkle/color": true
       }
     },
-    "chart.js>@kurkle/color": {
-      "globals": {
-        "define": true
+    "@ensdomains/content-hash>cids": {
+      "packages": {
+        "@ensdomains/content-hash>cids>multibase": true,
+        "@ensdomains/content-hash>multicodec": true,
+        "@ensdomains/content-hash>cids>multihashes": true,
+        "@ensdomains/content-hash>cids>uint8arrays": true
+      }
+    },
+    "ethereumjs-util>create-hash>cipher-base": {
+      "packages": {
+        "pumpify>inherits": true,
+        "koa>content-disposition>safe-buffer": true,
+        "stream-browserify": true,
+        "browserify>string_decoder": true
       }
     },
     "classnames": {
@@ -3459,6 +3095,11 @@
         "define": true
       }
     },
+    "@metamask/jazzicon>color>clone": {
+      "packages": {
+        "browserify>buffer": true
+      }
+    },
     "cockatiel": {
       "globals": {
         "AbortController": true,
@@ -3472,6 +3113,37 @@
         "process": true
       }
     },
+    "chalk>ansi-styles>color-convert": {
+      "packages": {
+        "jest-canvas-mock>moo-color>color-name": 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/jazzicon>color": {
+      "packages": {
+        "@metamask/jazzicon>color>clone": true,
+        "@metamask/jazzicon>color>color-convert": true,
+        "@metamask/jazzicon>color>color-string": true
+      }
+    },
+    "@metamask/snaps-controllers>concat-stream": {
+      "packages": {
+        "terser>source-map-support>buffer-from": true,
+        "browserify>buffer": true,
+        "pumpify>inherits": true,
+        "readable-stream": true,
+        "browserify>concat-stream>typedarray": true
+      }
+    },
     "copy-to-clipboard": {
       "globals": {
         "clipboardData": true,
@@ -3490,10 +3162,47 @@
         "copy-to-clipboard>toggle-selection": true
       }
     },
-    "copy-to-clipboard>toggle-selection": {
+    "@ethereumjs/tx>@ethereumjs/common>crc-32": {
       "globals": {
-        "document.activeElement": true,
-        "document.getSelection": true
+        "DO_NOT_EXPORT_CRC": true,
+        "define": true
+      }
+    },
+    "@ngraveio/bc-ur>crc": {
+      "packages": {
+        "browserify>buffer": true
+      }
+    },
+    "crypto-browserify>create-ecdh": {
+      "packages": {
+        "bn.js": true,
+        "browserify>buffer": true,
+        "@metamask/ppom-validator>elliptic": true
+      }
+    },
+    "ethereumjs-util>create-hash": {
+      "packages": {
+        "ethereumjs-util>create-hash>cipher-base": true,
+        "pumpify>inherits": true,
+        "ethereumjs-util>create-hash>md5.js": true,
+        "ethereumjs-util>create-hash>ripemd160": true,
+        "addons-linter>sha.js": true
+      }
+    },
+    "crypto-browserify>create-hmac": {
+      "packages": {
+        "ethereumjs-util>create-hash>cipher-base": true,
+        "ethereumjs-util>create-hash": true,
+        "pumpify>inherits": true,
+        "ethereumjs-util>create-hash>ripemd160": true,
+        "koa>content-disposition>safe-buffer": true,
+        "addons-linter>sha.js": true
+      }
+    },
+    "@metamask/snaps-utils>cron-parser": {
+      "packages": {
+        "browserify>browser-resolve": true,
+        "luxon": true
       }
     },
     "crypto-browserify": {
@@ -3501,303 +3210,484 @@
         "crypto-browserify>browserify-cipher": true,
         "crypto-browserify>browserify-sign": true,
         "crypto-browserify>create-ecdh": true,
+        "ethereumjs-util>create-hash": true,
         "crypto-browserify>create-hmac": true,
         "crypto-browserify>diffie-hellman": true,
         "crypto-browserify>pbkdf2": true,
         "crypto-browserify>public-encrypt": true,
         "crypto-browserify>randombytes": true,
-        "crypto-browserify>randomfill": true,
-        "ethereumjs-util>create-hash": true
+        "crypto-browserify>randomfill": true
       }
     },
-    "crypto-browserify>browserify-cipher": {
+    "@metamask/ppom-validator>crypto-js": {
+      "globals": {
+        "crypto": true,
+        "define": true,
+        "msCrypto": true
+      },
       "packages": {
-        "crypto-browserify>browserify-cipher>browserify-des": true,
-        "crypto-browserify>browserify-cipher>evp_bytestokey": true,
-        "ethereumjs-util>ethereum-cryptography>browserify-aes": true
+        "browserify>browser-resolve": true
       }
     },
-    "crypto-browserify>browserify-cipher>browserify-des": {
+    "react-beautiful-dnd>css-box-model": {
+      "globals": {
+        "getComputedStyle": true,
+        "pageXOffset": true,
+        "pageYOffset": true
+      },
       "packages": {
-        "browserify>buffer": true,
-        "crypto-browserify>browserify-cipher>browserify-des>des.js": true,
-        "ethereumjs-util>create-hash>cipher-base": true,
-        "pumpify>inherits": true
+        "react-router-dom>tiny-invariant": true
       }
     },
-    "crypto-browserify>browserify-cipher>browserify-des>des.js": {
+    "@material-ui/core>@material-ui/styles>jss-plugin-vendor-prefixer>css-vendor": {
+      "globals": {
+        "document.createElement": true,
+        "document.documentElement": true,
+        "getComputedStyle": true
+      },
       "packages": {
-        "@metamask/ppom-validator>elliptic>minimalistic-assert": true,
-        "pumpify>inherits": true
+        "@babel/runtime": true,
+        "@material-ui/core>@material-ui/styles>jss>is-in-browser": true
       }
     },
-    "crypto-browserify>browserify-cipher>evp_bytestokey": {
+    "currency-formatter": {
       "packages": {
-        "ethereumjs-util>create-hash>md5.js": true,
-        "koa>content-disposition>safe-buffer": true
+        "currency-formatter>accounting": true,
+        "currency-formatter>locale-currency": true,
+        "react>object-assign": true
       }
     },
-    "crypto-browserify>browserify-sign": {
+    "debounce-stream": {
+      "packages": {
+        "debounce-stream>debounce": true,
+        "debounce-stream>duplexer": true,
+        "debounce-stream>through": true
+      }
+    },
+    "debounce-stream>debounce": {
+      "globals": {
+        "clearTimeout": true,
+        "setTimeout": true
+      }
+    },
+    "nock>debug": {
+      "globals": {
+        "console": true,
+        "document": true,
+        "localStorage": true,
+        "navigator": true,
+        "process": true
+      },
+      "packages": {
+        "nock>debug>ms": true,
+        "process": true
+      }
+    },
+    "@metamask/eth-token-tracker>deep-equal": {
+      "packages": {
+        "string.prototype.matchall>es-abstract>array-buffer-byte-length": true,
+        "string.prototype.matchall>call-bind": true,
+        "@metamask/eth-token-tracker>deep-equal>es-get-iterator": true,
+        "string.prototype.matchall>get-intrinsic": true,
+        "browserify>util>is-arguments": true,
+        "string.prototype.matchall>es-abstract>is-array-buffer": true,
+        "@metamask/eth-token-tracker>deep-equal>is-date-object": true,
+        "string.prototype.matchall>es-abstract>is-regex": true,
+        "string.prototype.matchall>es-abstract>is-shared-array-buffer": true,
+        "@lavamoat/lavapack>json-stable-stringify>isarray": true,
+        "@ngraveio/bc-ur>assert>object-is": true,
+        "@lavamoat/lavapack>json-stable-stringify>object-keys": true,
+        "gulp>vinyl-fs>object.assign": true,
+        "string.prototype.matchall>regexp.prototype.flags": true,
+        "string.prototype.matchall>side-channel": true,
+        "@metamask/eth-token-tracker>deep-equal>which-boxed-primitive": true,
+        "@metamask/eth-token-tracker>deep-equal>which-collection": true,
+        "browserify>util>which-typed-array": true
+      }
+    },
+    "string.prototype.matchall>define-properties>define-data-property": {
+      "packages": {
+        "string.prototype.matchall>call-bind>es-define-property": true,
+        "string.prototype.matchall>call-bind>es-errors": true,
+        "string.prototype.matchall>es-abstract>gopd": true
+      }
+    },
+    "string.prototype.matchall>define-properties": {
+      "packages": {
+        "string.prototype.matchall>define-properties>define-data-property": true,
+        "string.prototype.matchall>es-abstract>has-property-descriptors": true,
+        "@lavamoat/lavapack>json-stable-stringify>object-keys": true
+      }
+    },
+    "crypto-browserify>browserify-cipher>browserify-des>des.js": {
+      "packages": {
+        "pumpify>inherits": true,
+        "@metamask/ppom-validator>elliptic>minimalistic-assert": true
+      }
+    },
+    "crypto-browserify>diffie-hellman": {
       "packages": {
-        "@metamask/ppom-validator>elliptic": true,
         "bn.js": true,
         "browserify>buffer": true,
-        "crypto-browserify>create-hmac": true,
-        "crypto-browserify>public-encrypt>browserify-rsa": true,
-        "crypto-browserify>public-encrypt>parse-asn1": true,
-        "ethereumjs-util>create-hash": true,
-        "pumpify>inherits": true,
+        "crypto-browserify>diffie-hellman>miller-rabin": true,
+        "crypto-browserify>randombytes": true
+      }
+    },
+    "@material-ui/core>react-transition-group>dom-helpers": {
+      "packages": {
+        "@babel/runtime": true
+      }
+    },
+    "debounce-stream>duplexer": {
+      "packages": {
         "stream-browserify": true
       }
     },
-    "crypto-browserify>create-ecdh": {
+    "ethers>@ethersproject/signing-key>elliptic": {
       "packages": {
-        "@metamask/ppom-validator>elliptic": true,
         "bn.js": true,
-        "browserify>buffer": true
+        "@metamask/ppom-validator>elliptic>brorand": true,
+        "ethers>@ethersproject/sha2>hash.js": true,
+        "@metamask/ppom-validator>elliptic>hmac-drbg": true,
+        "pumpify>inherits": true,
+        "@metamask/ppom-validator>elliptic>minimalistic-assert": true,
+        "@metamask/ppom-validator>elliptic>minimalistic-crypto-utils": true
       }
     },
-    "crypto-browserify>create-hmac": {
+    "@metamask/ppom-validator>elliptic": {
       "packages": {
-        "addons-linter>sha.js": true,
-        "ethereumjs-util>create-hash": true,
-        "ethereumjs-util>create-hash>cipher-base": true,
-        "ethereumjs-util>create-hash>ripemd160": true,
-        "koa>content-disposition>safe-buffer": true,
-        "pumpify>inherits": true
+        "bn.js": true,
+        "@metamask/ppom-validator>elliptic>brorand": true,
+        "ethers>@ethersproject/sha2>hash.js": true,
+        "@metamask/ppom-validator>elliptic>hmac-drbg": true,
+        "pumpify>inherits": true,
+        "@metamask/ppom-validator>elliptic>minimalistic-assert": true,
+        "@metamask/ppom-validator>elliptic>minimalistic-crypto-utils": true
       }
     },
-    "crypto-browserify>diffie-hellman": {
+    "eth-lattice-keyring>gridplus-sdk>elliptic": {
+      "packages": {
+        "bn.js": true,
+        "@metamask/ppom-validator>elliptic>brorand": true,
+        "ethers>@ethersproject/sha2>hash.js": true,
+        "@metamask/ppom-validator>elliptic>hmac-drbg": true,
+        "pumpify>inherits": true,
+        "@metamask/ppom-validator>elliptic>minimalistic-assert": true,
+        "@metamask/ppom-validator>elliptic>minimalistic-crypto-utils": true
+      }
+    },
+    "string.prototype.matchall>call-bind>es-define-property": {
       "packages": {
-        "bn.js": true,
-        "browserify>buffer": true,
-        "crypto-browserify>diffie-hellman>miller-rabin": true,
-        "crypto-browserify>randombytes": true
+        "string.prototype.matchall>get-intrinsic": true
       }
     },
-    "crypto-browserify>diffie-hellman>miller-rabin": {
+    "@metamask/eth-token-tracker>deep-equal>es-get-iterator": {
       "packages": {
-        "@metamask/ppom-validator>elliptic>brorand": true,
-        "bn.js": true
+        "string.prototype.matchall>call-bind": true,
+        "string.prototype.matchall>get-intrinsic": true,
+        "string.prototype.matchall>has-symbols": true,
+        "browserify>util>is-arguments": true,
+        "@metamask/eth-token-tracker>deep-equal>es-get-iterator>is-map": true,
+        "@metamask/eth-token-tracker>deep-equal>es-get-iterator>is-set": true,
+        "eslint-plugin-react>array-includes>is-string": true,
+        "@lavamoat/lavapack>json-stable-stringify>isarray": true,
+        "process": true,
+        "@metamask/eth-token-tracker>deep-equal>es-get-iterator>stop-iteration-iterator": true
       }
     },
-    "crypto-browserify>pbkdf2": {
+    "eth-lattice-keyring>gridplus-sdk>eth-eip712-util-browser": {
       "globals": {
-        "crypto": true,
-        "process": true,
-        "queueMicrotask": true,
-        "setImmediate": true,
-        "setTimeout": true
+        "intToBuffer": true
       },
       "packages": {
-        "addons-linter>sha.js": true,
-        "ethereumjs-util>create-hash": true,
-        "ethereumjs-util>create-hash>ripemd160": true,
-        "koa>content-disposition>safe-buffer": true,
-        "process": true
+        "bn.js": true,
+        "buffer": true,
+        "@metamask/ethjs>js-sha3": true
       }
     },
-    "crypto-browserify>public-encrypt": {
+    "eth-ens-namehash": {
+      "globals": {
+        "name": "write"
+      },
       "packages": {
-        "bn.js": true,
         "browserify>buffer": true,
-        "crypto-browserify>public-encrypt>browserify-rsa": true,
-        "crypto-browserify>public-encrypt>parse-asn1": true,
-        "crypto-browserify>randombytes": true,
-        "ethereumjs-util>create-hash": true
+        "eth-ens-namehash>idna-uts46-hx": true,
+        "@metamask/ethjs>js-sha3": true
       }
     },
-    "crypto-browserify>public-encrypt>browserify-rsa": {
+    "eth-lattice-keyring": {
+      "globals": {
+        "addEventListener": true,
+        "browser": true,
+        "clearInterval": true,
+        "fetch": true,
+        "open": true,
+        "setInterval": true
+      },
       "packages": {
+        "eth-lattice-keyring>@ethereumjs/tx": true,
+        "@ethereumjs/tx>@ethereumjs/util": true,
         "bn.js": true,
         "browserify>buffer": true,
-        "crypto-browserify>randombytes": true
+        "crypto-browserify": true,
+        "webpack>events": true,
+        "eth-lattice-keyring>gridplus-sdk": true,
+        "eth-lattice-keyring>rlp": true
       }
     },
-    "crypto-browserify>public-encrypt>parse-asn1": {
+    "eth-method-registry": {
       "packages": {
-        "browserify>buffer": true,
-        "crypto-browserify>browserify-cipher>evp_bytestokey": true,
-        "crypto-browserify>pbkdf2": true,
-        "crypto-browserify>public-encrypt>parse-asn1>asn1.js": true,
-        "ethereumjs-util>ethereum-cryptography>browserify-aes": true
+        "@metamask/ethjs-contract": true,
+        "@metamask/ethjs-query": true
       }
     },
-    "crypto-browserify>public-encrypt>parse-asn1>asn1.js": {
+    "@ethereumjs/tx>ethereum-cryptography": {
+      "globals": {
+        "TextDecoder": true,
+        "crypto": true
+      },
       "packages": {
-        "@metamask/ppom-validator>elliptic>minimalistic-assert": true,
-        "bn.js": true,
-        "browserify>buffer": true,
-        "browserify>vm-browserify": true,
-        "pumpify>inherits": true
+        "@ethereumjs/tx>ethereum-cryptography>@noble/curves": true,
+        "@noble/hashes": true,
+        "@ethereumjs/tx>ethereum-cryptography>@scure/bip32": true
       }
     },
-    "crypto-browserify>randombytes": {
+    "eth-lattice-keyring>@ethereumjs/tx>ethereum-cryptography": {
       "globals": {
-        "crypto": true,
-        "msCrypto": true
+        "TextDecoder": true,
+        "crypto": true
       },
       "packages": {
-        "koa>content-disposition>safe-buffer": true,
-        "process": true
+        "eth-lattice-keyring>@ethereumjs/tx>ethereum-cryptography>@noble/hashes": true
       }
     },
-    "crypto-browserify>randomfill": {
+    "eth-lattice-keyring>gridplus-sdk>@ethereumjs/tx>ethereum-cryptography": {
       "globals": {
-        "crypto": true,
-        "msCrypto": true
+        "TextDecoder": true,
+        "crypto": true
       },
       "packages": {
-        "crypto-browserify>randombytes": true,
-        "koa>content-disposition>safe-buffer": true,
-        "process": true
+        "eth-lattice-keyring>gridplus-sdk>@ethereumjs/tx>ethereum-cryptography>@noble/hashes": true
       }
     },
-    "currency-formatter": {
+    "ethereumjs-util>ethereum-cryptography": {
       "packages": {
-        "currency-formatter>accounting": true,
-        "currency-formatter>locale-currency": true,
-        "react>object-assign": true
-      }
-    },
-    "currency-formatter>accounting": {
-      "globals": {
-        "define": true
+        "browserify>buffer": true,
+        "ethereumjs-util>ethereum-cryptography>keccak": true,
+        "crypto-browserify>randombytes": true,
+        "ganache>secp256k1": true
       }
     },
-    "currency-formatter>locale-currency": {
-      "globals": {
-        "countryCode": true
+    "@metamask/keyring-controller>ethereumjs-wallet>ethereum-cryptography": {
+      "packages": {
+        "browserify>assert": true,
+        "ethereumjs-util>ethereum-cryptography>bs58check": true,
+        "browserify>buffer": true,
+        "crypto-browserify>create-hmac": true,
+        "ethers>@ethersproject/sha2>hash.js": true,
+        "ethereumjs-util>ethereum-cryptography>keccak": true,
+        "crypto-browserify>randombytes": true,
+        "koa>content-disposition>safe-buffer": true,
+        "ganache>secp256k1": true
       }
     },
-    "debounce-stream": {
+    "ethereumjs-util": {
       "packages": {
-        "debounce-stream>debounce": true,
-        "debounce-stream>duplexer": true,
-        "debounce-stream>through": true
+        "browserify>assert": true,
+        "bn.js": true,
+        "browserify>buffer": true,
+        "ethereumjs-util>create-hash": true,
+        "ethereumjs-util>ethereum-cryptography": true,
+        "browserify>insert-module-globals>is-buffer": true,
+        "ethereumjs-util>rlp": true
       }
     },
-    "debounce-stream>debounce": {
-      "globals": {
-        "clearTimeout": true,
-        "setTimeout": true
+    "@metamask/keyring-controller>ethereumjs-wallet>ethereumjs-util": {
+      "packages": {
+        "browserify>assert": true,
+        "bn.js": true,
+        "browserify>buffer": true,
+        "ethereumjs-util>create-hash": true,
+        "@metamask/keyring-controller>ethereumjs-wallet>ethereum-cryptography": true,
+        "browserify>insert-module-globals>is-buffer": true,
+        "@metamask/keyring-controller>ethereumjs-wallet>ethereumjs-util>rlp": true
       }
     },
-    "debounce-stream>duplexer": {
+    "@metamask/keyring-controller>ethereumjs-wallet": {
       "packages": {
-        "stream-browserify": true
+        "eth-lattice-keyring>gridplus-sdk>aes-js": true,
+        "ethereumjs-util>ethereum-cryptography>bs58check": true,
+        "browserify>buffer": true,
+        "crypto-browserify": true,
+        "@metamask/keyring-controller>ethereumjs-wallet>ethereum-cryptography": true,
+        "@metamask/keyring-controller>ethereumjs-wallet>ethereumjs-util": true,
+        "crypto-browserify>randombytes": true,
+        "ethers>@ethersproject/json-wallets>scrypt-js": true,
+        "@metamask/keyring-controller>ethereumjs-wallet>utf8": true,
+        "uuid": true
       }
     },
-    "debounce-stream>through": {
+    "ethers": {
       "packages": {
-        "process": true,
-        "stream-browserify": true
+        "@ethersproject/abi": true,
+        "ethers>@ethersproject/abstract-signer": true,
+        "ethers>@ethersproject/address": true,
+        "ethers>@ethersproject/base64": true,
+        "ethers>@ethersproject/basex": true,
+        "@ethersproject/bignumber": true,
+        "@ethersproject/bytes": true,
+        "ethers>@ethersproject/constants": true,
+        "@ethersproject/contracts": true,
+        "@ethersproject/hash": true,
+        "@ethersproject/hdnode": true,
+        "ethers>@ethersproject/json-wallets": true,
+        "ethers>@ethersproject/keccak256": true,
+        "ethers>@ethersproject/logger": true,
+        "ethers>@ethersproject/properties": true,
+        "ethers>@ethersproject/providers": true,
+        "ethers>@ethersproject/random": true,
+        "ethers>@ethersproject/rlp": true,
+        "ethers>@ethersproject/sha2": true,
+        "ethers>@ethersproject/signing-key": true,
+        "ethers>@ethersproject/solidity": true,
+        "ethers>@ethersproject/strings": true,
+        "ethers>@ethersproject/transactions": true,
+        "ethers>@ethersproject/units": true,
+        "@ethersproject/wallet": true,
+        "ethers>@ethersproject/web": true,
+        "ethers>@ethersproject/wordlists": true
       }
     },
-    "depcheck>@vue/compiler-sfc>postcss>nanoid": {
-      "globals": {
-        "crypto.getRandomValues": true
+    "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth>@ledgerhq/evm-tools>ethers": {
+      "packages": {
+        "@ethersproject/abi": true,
+        "ethers>@ethersproject/abstract-signer": true,
+        "ethers>@ethersproject/address": true,
+        "ethers>@ethersproject/base64": true,
+        "ethers>@ethersproject/basex": true,
+        "@ethersproject/bignumber": true,
+        "@ethersproject/bytes": true,
+        "ethers>@ethersproject/constants": true,
+        "@ethersproject/contracts": true,
+        "@ethersproject/hash": true,
+        "@ethersproject/hdnode": true,
+        "ethers>@ethersproject/json-wallets": true,
+        "ethers>@ethersproject/keccak256": true,
+        "ethers>@ethersproject/logger": true,
+        "ethers>@ethersproject/properties": true,
+        "@ethersproject/providers": true,
+        "ethers>@ethersproject/random": true,
+        "ethers>@ethersproject/rlp": true,
+        "ethers>@ethersproject/sha2": true,
+        "ethers>@ethersproject/signing-key": true,
+        "ethers>@ethersproject/solidity": true,
+        "ethers>@ethersproject/strings": true,
+        "ethers>@ethersproject/transactions": true,
+        "ethers>@ethersproject/units": true,
+        "@ethersproject/wallet": true,
+        "@ethersproject/providers>@ethersproject/web": true,
+        "ethers>@ethersproject/wordlists": true
       }
     },
-    "depcheck>is-core-module>hasown": {
+    "@metamask/ethjs>ethjs-abi": {
       "packages": {
-        "browserify>has>function-bind": true
+        "bn.js": true,
+        "browserify>buffer": true,
+        "@metamask/ethjs>js-sha3": true,
+        "@metamask/ethjs>ethjs-abi>number-to-bn": true
       }
     },
-    "dependency-tree>precinct>detective-postcss>postcss>nanoid": {
+    "webpack>events": {
       "globals": {
-        "crypto.getRandomValues": true
+        "console": true
       }
     },
-    "eslint-plugin-react>array-includes>is-string": {
+    "crypto-browserify>browserify-cipher>evp_bytestokey": {
       "packages": {
-        "koa>is-generator-function>has-tostringtag": true
+        "ethereumjs-util>create-hash>md5.js": true,
+        "koa>content-disposition>safe-buffer": true
       }
     },
-    "eth-ens-namehash": {
-      "globals": {
-        "name": "write"
-      },
+    "extension-port-stream": {
       "packages": {
-        "@metamask/ethjs>js-sha3": true,
         "browserify>buffer": true,
-        "eth-ens-namehash>idna-uts46-hx": true
+        "extension-port-stream>readable-stream": true
       }
     },
-    "eth-ens-namehash>idna-uts46-hx": {
+    "fast-json-patch": {
+      "globals": {
+        "addEventListener": true,
+        "clearTimeout": true,
+        "removeEventListener": true,
+        "setTimeout": true
+      }
+    },
+    "@metamask/snaps-utils>fast-xml-parser": {
       "globals": {
-        "define": true
+        "entityName": true,
+        "val": true
       },
       "packages": {
-        "browserify>punycode": true
+        "@metamask/snaps-utils>fast-xml-parser>strnum": true
       }
     },
-    "eth-keyring-controller>@metamask/browser-passworder": {
-      "globals": {
-        "crypto": true
+    "@metamask/notification-services-controller>firebase": {
+      "packages": {
+        "@metamask/notification-services-controller>firebase>@firebase/app": true,
+        "@metamask/notification-services-controller>firebase>@firebase/messaging": true
       }
     },
-    "eth-lattice-keyring": {
+    "react-focus-lock>focus-lock": {
       "globals": {
-        "addEventListener": true,
-        "browser": true,
-        "clearInterval": true,
-        "fetch": true,
-        "open": true,
-        "setInterval": true
+        "HTMLIFrameElement": true,
+        "Node.DOCUMENT_FRAGMENT_NODE": true,
+        "Node.DOCUMENT_NODE": true,
+        "Node.DOCUMENT_POSITION_CONTAINED_BY": true,
+        "Node.DOCUMENT_POSITION_CONTAINS": true,
+        "Node.ELEMENT_NODE": true,
+        "console.error": true,
+        "console.warn": true,
+        "document": true,
+        "getComputedStyle": true,
+        "setTimeout": true
       },
       "packages": {
-        "@ethereumjs/tx>@ethereumjs/util": true,
-        "bn.js": true,
-        "browserify>buffer": true,
-        "crypto-browserify": true,
-        "eth-lattice-keyring>@ethereumjs/tx": true,
-        "eth-lattice-keyring>gridplus-sdk": true,
-        "eth-lattice-keyring>rlp": true,
-        "webpack>events": true
+        "@swc/helpers>tslib": true
       }
     },
-    "eth-lattice-keyring>@ethereumjs/tx": {
+    "browserify>util>which-typed-array>for-each": {
       "packages": {
-        "@ethereumjs/tx>@ethereumjs/common": true,
-        "@ethereumjs/tx>@ethereumjs/rlp": true,
-        "@ethereumjs/tx>@ethereumjs/util": true,
-        "@ethersproject/providers": true,
-        "browserify>buffer": true,
-        "browserify>insert-module-globals>is-buffer": true,
-        "eth-lattice-keyring>@ethereumjs/tx>@chainsafe/ssz": true,
-        "eth-lattice-keyring>@ethereumjs/tx>ethereum-cryptography": true
+        "string.prototype.matchall>es-abstract>is-callable": true
       }
     },
-    "eth-lattice-keyring>@ethereumjs/tx>@chainsafe/ssz": {
-      "packages": {
-        "browserify": true,
-        "browserify>buffer": true,
-        "eth-lattice-keyring>@ethereumjs/tx>@chainsafe/ssz>@chainsafe/persistent-merkle-tree": true,
-        "eth-lattice-keyring>@ethereumjs/tx>@chainsafe/ssz>case": true
+    "axios>form-data": {
+      "globals": {
+        "FormData": true
       }
     },
-    "eth-lattice-keyring>@ethereumjs/tx>@chainsafe/ssz>@chainsafe/persistent-merkle-tree": {
+    "fuse.js": {
       "globals": {
-        "WeakRef": true
-      },
-      "packages": {
-        "browserify": true
+        "console": true,
+        "define": true
       }
     },
-    "eth-lattice-keyring>@ethereumjs/tx>ethereum-cryptography": {
+    "string.prototype.matchall>get-intrinsic": {
       "globals": {
-        "TextDecoder": true,
-        "crypto": true
+        "AggregateError": true,
+        "FinalizationRegistry": true,
+        "WeakRef": true
       },
       "packages": {
-        "eth-lattice-keyring>@ethereumjs/tx>ethereum-cryptography>@noble/hashes": true
+        "string.prototype.matchall>call-bind>es-errors": true,
+        "browserify>has>function-bind": true,
+        "string.prototype.matchall>es-abstract>has-proto": true,
+        "string.prototype.matchall>has-symbols": true,
+        "depcheck>is-core-module>hasown": true
       }
     },
-    "eth-lattice-keyring>@ethereumjs/tx>ethereum-cryptography>@noble/hashes": {
-      "globals": {
-        "TextEncoder": true,
-        "crypto": true
+    "string.prototype.matchall>es-abstract>gopd": {
+      "packages": {
+        "string.prototype.matchall>get-intrinsic": true
       }
     },
     "eth-lattice-keyring>gridplus-sdk": {
@@ -3815,230 +3705,307 @@
         "setTimeout": true
       },
       "packages": {
-        "@ethereumjs/tx>@ethereumjs/common>crc-32": true,
-        "@ethersproject/abi": true,
-        "@metamask/ethjs>js-sha3": true,
-        "@metamask/keyring-api>bech32": true,
-        "bn.js": true,
-        "browserify>buffer": true,
         "eth-lattice-keyring>gridplus-sdk>@ethereumjs/common": true,
         "eth-lattice-keyring>gridplus-sdk>@ethereumjs/tx": true,
+        "@ethersproject/abi": true,
         "eth-lattice-keyring>gridplus-sdk>aes-js": true,
+        "@metamask/keyring-api>bech32": true,
         "eth-lattice-keyring>gridplus-sdk>bignumber.js": true,
         "eth-lattice-keyring>gridplus-sdk>bitwise": true,
+        "bn.js": true,
         "eth-lattice-keyring>gridplus-sdk>borc": true,
+        "ethereumjs-util>ethereum-cryptography>bs58check": true,
+        "browserify>buffer": true,
+        "@ethereumjs/tx>@ethereumjs/common>crc-32": true,
         "eth-lattice-keyring>gridplus-sdk>elliptic": true,
         "eth-lattice-keyring>gridplus-sdk>eth-eip712-util-browser": true,
-        "eth-lattice-keyring>gridplus-sdk>uuid": true,
-        "eth-lattice-keyring>rlp": true,
-        "ethereumjs-util>ethereum-cryptography>bs58check": true,
         "ethers>@ethersproject/sha2>hash.js": true,
+        "@metamask/ethjs>js-sha3": true,
+        "lodash": true,
+        "eth-lattice-keyring>rlp": true,
         "ganache>secp256k1": true,
-        "lodash": true
+        "eth-lattice-keyring>gridplus-sdk>uuid": true
       }
     },
-    "eth-lattice-keyring>gridplus-sdk>@ethereumjs/common": {
+    "string.prototype.matchall>es-abstract>has-property-descriptors": {
       "packages": {
-        "@ethereumjs/tx>@ethereumjs/common>crc-32": true,
-        "@ethereumjs/tx>@ethereumjs/util": true,
-        "browserify>buffer": true,
-        "webpack>events": true
+        "string.prototype.matchall>call-bind>es-define-property": true
       }
     },
-    "eth-lattice-keyring>gridplus-sdk>@ethereumjs/tx": {
+    "koa>is-generator-function>has-tostringtag": {
       "packages": {
-        "@ethereumjs/tx>@ethereumjs/rlp": true,
-        "@ethereumjs/tx>@ethereumjs/util": true,
-        "@ethersproject/providers": true,
-        "browserify>buffer": true,
-        "browserify>insert-module-globals>is-buffer": true,
-        "eth-lattice-keyring>@ethereumjs/tx>@chainsafe/ssz": true,
-        "eth-lattice-keyring>gridplus-sdk>@ethereumjs/tx>@ethereumjs/common": true,
-        "eth-lattice-keyring>gridplus-sdk>@ethereumjs/tx>ethereum-cryptography": true
+        "string.prototype.matchall>has-symbols": true
       }
     },
-    "eth-lattice-keyring>gridplus-sdk>@ethereumjs/tx>@ethereumjs/common": {
+    "ethereumjs-util>create-hash>md5.js>hash-base": {
       "packages": {
-        "@ethereumjs/tx>@ethereumjs/common>crc-32": true,
-        "@ethereumjs/tx>@ethereumjs/util": true,
-        "browserify>buffer": true,
-        "webpack>events": true
+        "pumpify>inherits": true,
+        "readable-stream": true,
+        "koa>content-disposition>safe-buffer": true
       }
     },
-    "eth-lattice-keyring>gridplus-sdk>@ethereumjs/tx>ethereum-cryptography": {
+    "ethers>@ethersproject/sha2>hash.js": {
+      "packages": {
+        "pumpify>inherits": true,
+        "@metamask/ppom-validator>elliptic>minimalistic-assert": true
+      }
+    },
+    "depcheck>is-core-module>hasown": {
+      "packages": {
+        "browserify>has>function-bind": true
+      }
+    },
+    "@metamask/eth-trezor-keyring>hdkey": {
+      "packages": {
+        "browserify>assert": true,
+        "ethereumjs-util>ethereum-cryptography>bs58check": true,
+        "crypto-browserify": true,
+        "ethereumjs-util>create-hash>ripemd160": true,
+        "koa>content-disposition>safe-buffer": true,
+        "ganache>secp256k1": true
+      }
+    },
+    "he": {
       "globals": {
-        "TextDecoder": true,
-        "crypto": true
+        "define": true
+      }
+    },
+    "history": {
+      "globals": {
+        "console": true,
+        "define": true,
+        "document.defaultView": true,
+        "document.querySelector": true
+      }
+    },
+    "react-router-dom>history": {
+      "globals": {
+        "addEventListener": true,
+        "confirm": true,
+        "document": true,
+        "history": true,
+        "location": true,
+        "navigator.userAgent": true,
+        "removeEventListener": true
       },
       "packages": {
-        "eth-lattice-keyring>gridplus-sdk>@ethereumjs/tx>ethereum-cryptography>@noble/hashes": true
+        "react-router-dom>history>resolve-pathname": true,
+        "react-router-dom>tiny-invariant": true,
+        "react-router-dom>tiny-warning": true,
+        "react-router-dom>history>value-equal": true
       }
     },
-    "eth-lattice-keyring>gridplus-sdk>@ethereumjs/tx>ethereum-cryptography>@noble/hashes": {
+    "@metamask/ppom-validator>elliptic>hmac-drbg": {
+      "packages": {
+        "ethers>@ethersproject/sha2>hash.js": true,
+        "@metamask/ppom-validator>elliptic>minimalistic-assert": true,
+        "@metamask/ppom-validator>elliptic>minimalistic-crypto-utils": true
+      }
+    },
+    "react-redux>hoist-non-react-statics": {
+      "packages": {
+        "prop-types>react-is": true
+      }
+    },
+    "https-browserify": {
+      "packages": {
+        "stream-http": true,
+        "browserify>url": true
+      }
+    },
+    "@metamask/notification-services-controller>firebase>@firebase/app>idb": {
       "globals": {
-        "TextEncoder": true,
-        "crypto": true
+        "DOMException": true,
+        "IDBCursor": true,
+        "IDBDatabase": true,
+        "IDBIndex": true,
+        "IDBObjectStore": true,
+        "IDBRequest": true,
+        "IDBTransaction": true,
+        "indexedDB.deleteDatabase": true,
+        "indexedDB.open": true
       }
     },
-    "eth-lattice-keyring>gridplus-sdk>aes-js": {
+    "eth-ens-namehash>idna-uts46-hx": {
       "globals": {
         "define": true
+      },
+      "packages": {
+        "browserify>punycode": true
+      }
+    },
+    "string.prototype.matchall>internal-slot": {
+      "packages": {
+        "string.prototype.matchall>call-bind>es-errors": true,
+        "depcheck>is-core-module>hasown": true,
+        "string.prototype.matchall>side-channel": true
+      }
+    },
+    "browserify>util>is-arguments": {
+      "packages": {
+        "string.prototype.matchall>call-bind": true,
+        "koa>is-generator-function>has-tostringtag": true
+      }
+    },
+    "string.prototype.matchall>es-abstract>is-array-buffer": {
+      "packages": {
+        "string.prototype.matchall>call-bind": true,
+        "string.prototype.matchall>get-intrinsic": true
+      }
+    },
+    "@metamask/eth-token-tracker>deep-equal>which-boxed-primitive>is-bigint": {
+      "packages": {
+        "string.prototype.matchall>es-abstract>unbox-primitive>has-bigints": true
+      }
+    },
+    "@metamask/eth-token-tracker>deep-equal>which-boxed-primitive>is-boolean-object": {
+      "packages": {
+        "string.prototype.matchall>call-bind": true,
+        "koa>is-generator-function>has-tostringtag": true
+      }
+    },
+    "string.prototype.matchall>es-abstract>is-callable": {
+      "globals": {
+        "document": true
+      }
+    },
+    "@metamask/eth-token-tracker>deep-equal>is-date-object": {
+      "packages": {
+        "koa>is-generator-function>has-tostringtag": true
+      }
+    },
+    "koa>is-generator-function": {
+      "packages": {
+        "koa>is-generator-function>has-tostringtag": true
       }
     },
-    "eth-lattice-keyring>gridplus-sdk>bignumber.js": {
+    "@material-ui/core>@material-ui/styles>jss>is-in-browser": {
       "globals": {
-        "crypto": true,
-        "define": true
+        "document": true
       }
     },
-    "eth-lattice-keyring>gridplus-sdk>bitwise": {
+    "@metamask/eth-token-tracker>deep-equal>which-boxed-primitive>is-number-object": {
       "packages": {
-        "browserify>buffer": true
+        "koa>is-generator-function>has-tostringtag": true
       }
     },
-    "eth-lattice-keyring>gridplus-sdk>borc": {
-      "globals": {
-        "console": true
-      },
+    "string.prototype.matchall>es-abstract>is-regex": {
       "packages": {
-        "browserify>buffer": true,
-        "buffer>ieee754": true,
-        "eth-lattice-keyring>gridplus-sdk>borc>bignumber.js": true,
-        "eth-lattice-keyring>gridplus-sdk>borc>iso-url": true
+        "string.prototype.matchall>call-bind": true,
+        "koa>is-generator-function>has-tostringtag": true
       }
     },
-    "eth-lattice-keyring>gridplus-sdk>borc>bignumber.js": {
-      "globals": {
-        "crypto": true,
-        "define": true
+    "string.prototype.matchall>es-abstract>is-shared-array-buffer": {
+      "packages": {
+        "string.prototype.matchall>call-bind": true
       }
     },
-    "eth-lattice-keyring>gridplus-sdk>borc>iso-url": {
-      "globals": {
-        "URL": true,
-        "URLSearchParams": true,
-        "location": true
+    "eslint-plugin-react>array-includes>is-string": {
+      "packages": {
+        "koa>is-generator-function>has-tostringtag": true
       }
     },
-    "eth-lattice-keyring>gridplus-sdk>elliptic": {
+    "string.prototype.matchall>es-abstract>es-to-primitive>is-symbol": {
       "packages": {
-        "@metamask/ppom-validator>elliptic>brorand": true,
-        "@metamask/ppom-validator>elliptic>hmac-drbg": true,
-        "@metamask/ppom-validator>elliptic>minimalistic-assert": true,
-        "@metamask/ppom-validator>elliptic>minimalistic-crypto-utils": true,
-        "bn.js": true,
-        "ethers>@ethersproject/sha2>hash.js": true,
-        "pumpify>inherits": true
+        "string.prototype.matchall>has-symbols": true
       }
     },
-    "eth-lattice-keyring>gridplus-sdk>eth-eip712-util-browser": {
-      "globals": {
-        "intToBuffer": true
-      },
+    "browserify>util>is-typed-array": {
       "packages": {
-        "@metamask/ethjs>js-sha3": true,
-        "bn.js": true,
-        "buffer": true
+        "browserify>util>which-typed-array": true
       }
     },
-    "eth-lattice-keyring>gridplus-sdk>uuid": {
-      "globals": {
-        "crypto": true
+    "@metamask/eth-token-tracker>deep-equal>which-collection>is-weakset": {
+      "packages": {
+        "string.prototype.matchall>call-bind": true,
+        "string.prototype.matchall>get-intrinsic": true
       }
     },
-    "eth-lattice-keyring>rlp": {
+    "eth-lattice-keyring>gridplus-sdk>borc>iso-url": {
       "globals": {
-        "TextEncoder": true
-      }
-    },
-    "eth-method-registry": {
-      "packages": {
-        "@metamask/ethjs-contract": true,
-        "@metamask/ethjs-query": true
+        "URL": true,
+        "URLSearchParams": true,
+        "location": true
       }
     },
-    "ethereumjs-util": {
+    "@ensdomains/content-hash>js-base64": {
+      "globals": {
+        "Base64": "write",
+        "TextDecoder": true,
+        "TextEncoder": true,
+        "atob": true,
+        "btoa": true,
+        "define": true
+      },
       "packages": {
-        "bn.js": true,
-        "browserify>assert": true,
-        "browserify>buffer": true,
-        "browserify>insert-module-globals>is-buffer": true,
-        "ethereumjs-util>create-hash": true,
-        "ethereumjs-util>ethereum-cryptography": true,
-        "ethereumjs-util>rlp": true
+        "browserify>buffer": true
       }
     },
-    "ethereumjs-util>create-hash": {
+    "@metamask/ethjs>js-sha3": {
+      "globals": {
+        "define": true
+      },
       "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
+        "process": true
       }
     },
-    "ethereumjs-util>create-hash>cipher-base": {
-      "packages": {
-        "browserify>string_decoder": true,
-        "koa>content-disposition>safe-buffer": true,
-        "pumpify>inherits": true,
-        "stream-browserify": true
+    "@ngraveio/bc-ur>jsbi": {
+      "globals": {
+        "define": true
       }
     },
-    "ethereumjs-util>create-hash>md5.js": {
+    "@metamask/message-manager>jsonschema": {
       "packages": {
-        "ethereumjs-util>create-hash>md5.js>hash-base": true,
-        "koa>content-disposition>safe-buffer": true,
-        "pumpify>inherits": true
+        "browserify>url": true
       }
     },
-    "ethereumjs-util>create-hash>md5.js>hash-base": {
+    "@material-ui/core>@material-ui/styles>jss-plugin-camel-case": {
       "packages": {
-        "koa>content-disposition>safe-buffer": true,
-        "pumpify>inherits": true,
-        "readable-stream": true
+        "@material-ui/core>@material-ui/styles>jss-plugin-camel-case>hyphenate-style-name": true
       }
     },
-    "ethereumjs-util>create-hash>ripemd160": {
+    "@material-ui/core>@material-ui/styles>jss-plugin-default-unit": {
+      "globals": {
+        "CSS": true
+      },
       "packages": {
-        "browserify>buffer": true,
-        "ethereumjs-util>create-hash>md5.js>hash-base": true,
-        "pumpify>inherits": true
+        "@material-ui/core>@material-ui/styles>jss": true
       }
     },
-    "ethereumjs-util>ethereum-cryptography": {
+    "@material-ui/core>@material-ui/styles>jss-plugin-global": {
       "packages": {
-        "browserify>buffer": true,
-        "crypto-browserify>randombytes": true,
-        "ethereumjs-util>ethereum-cryptography>keccak": true,
-        "ganache>secp256k1": true
+        "@babel/runtime": true,
+        "@material-ui/core>@material-ui/styles>jss": true
       }
     },
-    "ethereumjs-util>ethereum-cryptography>browserify-aes": {
+    "@material-ui/core>@material-ui/styles>jss-plugin-nested": {
       "packages": {
-        "browserify>buffer": true,
-        "crypto-browserify>browserify-cipher>evp_bytestokey": true,
-        "ethereumjs-util>create-hash>cipher-base": true,
-        "ethereumjs-util>ethereum-cryptography>browserify-aes>buffer-xor": true,
-        "koa>content-disposition>safe-buffer": true,
-        "pumpify>inherits": true
+        "@babel/runtime": true,
+        "react-router-dom>tiny-warning": true
       }
     },
-    "ethereumjs-util>ethereum-cryptography>browserify-aes>buffer-xor": {
+    "@material-ui/core>@material-ui/styles>jss-plugin-rule-value-function": {
       "packages": {
-        "browserify>buffer": true
+        "@material-ui/core>@material-ui/styles>jss": true,
+        "react-router-dom>tiny-warning": true
       }
     },
-    "ethereumjs-util>ethereum-cryptography>bs58check": {
+    "@material-ui/core>@material-ui/styles>jss-plugin-vendor-prefixer": {
       "packages": {
-        "ethereumjs-util>create-hash": true,
-        "ethereumjs-util>ethereum-cryptography>bs58check>bs58": true,
-        "koa>content-disposition>safe-buffer": true
+        "@material-ui/core>@material-ui/styles>jss-plugin-vendor-prefixer>css-vendor": true,
+        "@material-ui/core>@material-ui/styles>jss": true
       }
     },
-    "ethereumjs-util>ethereum-cryptography>bs58check>bs58": {
+    "@material-ui/core>@material-ui/styles>jss": {
+      "globals": {
+        "CSS": true,
+        "document.createElement": true,
+        "document.querySelector": true
+      },
       "packages": {
-        "@ensdomains/content-hash>multihashes>multibase>base-x": true
+        "@babel/runtime": true,
+        "@material-ui/core>@material-ui/styles>jss>is-in-browser": true,
+        "react-router-dom>tiny-warning": true
       }
     },
     "ethereumjs-util>ethereum-cryptography>keccak": {
@@ -4047,536 +4014,496 @@
         "readable-stream": true
       }
     },
-    "ethereumjs-util>rlp": {
-      "packages": {
-        "bn.js": true,
-        "browserify>buffer": true
+    "currency-formatter>locale-currency": {
+      "globals": {
+        "countryCode": true
       }
     },
-    "ethereumjs-wallet>randombytes": {
+    "localforage": {
       "globals": {
-        "crypto.getRandomValues": true
+        "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
       }
     },
-    "ethers": {
-      "packages": {
-        "@ethersproject/abi": true,
-        "@ethersproject/bignumber": true,
-        "@ethersproject/bytes": true,
-        "@ethersproject/contracts": true,
-        "@ethersproject/hash": true,
-        "@ethersproject/hdnode": true,
-        "@ethersproject/wallet": true,
-        "ethers>@ethersproject/abstract-signer": true,
-        "ethers>@ethersproject/address": true,
-        "ethers>@ethersproject/base64": true,
-        "ethers>@ethersproject/basex": true,
-        "ethers>@ethersproject/constants": true,
-        "ethers>@ethersproject/json-wallets": true,
-        "ethers>@ethersproject/keccak256": true,
-        "ethers>@ethersproject/logger": true,
-        "ethers>@ethersproject/properties": true,
-        "ethers>@ethersproject/providers": true,
-        "ethers>@ethersproject/random": true,
-        "ethers>@ethersproject/rlp": true,
-        "ethers>@ethersproject/sha2": true,
-        "ethers>@ethersproject/signing-key": true,
-        "ethers>@ethersproject/solidity": true,
-        "ethers>@ethersproject/strings": true,
-        "ethers>@ethersproject/transactions": true,
-        "ethers>@ethersproject/units": true,
-        "ethers>@ethersproject/web": true,
-        "ethers>@ethersproject/wordlists": true
+    "lodash": {
+      "globals": {
+        "clearTimeout": true,
+        "define": true,
+        "setTimeout": true
       }
     },
-    "ethers>@ethersproject/abstract-provider": {
-      "packages": {
-        "@ethersproject/bignumber": true,
-        "@ethersproject/bytes": true,
-        "ethers>@ethersproject/logger": true,
-        "ethers>@ethersproject/properties": true
+    "loglevel": {
+      "globals": {
+        "console": true,
+        "define": true,
+        "document.cookie": true,
+        "localStorage": true,
+        "log": "write",
+        "navigator": true
       }
-    },
-    "ethers>@ethersproject/abstract-signer": {
-      "packages": {
-        "ethers>@ethersproject/logger": true,
-        "ethers>@ethersproject/properties": true
+    },
+    "lottie-web": {
+      "globals": {
+        "Blob": true,
+        "Howl": true,
+        "OffscreenCanvas": true,
+        "URL.createObjectURL": true,
+        "Worker": true,
+        "XMLHttpRequest": true,
+        "bodymovin": "write",
+        "clearInterval": true,
+        "console": true,
+        "define": true,
+        "document.body": true,
+        "document.createElement": true,
+        "document.createElementNS": true,
+        "document.getElementsByClassName": true,
+        "document.getElementsByTagName": true,
+        "document.querySelectorAll": true,
+        "document.readyState": true,
+        "location.origin": true,
+        "location.pathname": true,
+        "navigator": true,
+        "requestAnimationFrame": true,
+        "setInterval": true,
+        "setTimeout": true
       }
     },
-    "ethers>@ethersproject/address": {
-      "packages": {
-        "@ethersproject/bignumber": true,
-        "@ethersproject/bytes": true,
-        "ethers>@ethersproject/keccak256": true,
-        "ethers>@ethersproject/logger": true,
-        "ethers>@ethersproject/rlp": true
+    "luxon": {
+      "globals": {
+        "Intl": true
       }
     },
-    "ethers>@ethersproject/base64": {
+    "@metamask/snaps-utils>marked": {
       "globals": {
-        "atob": true,
-        "btoa": true
-      },
-      "packages": {
-        "@ethersproject/bytes": true
+        "console.error": true,
+        "console.warn": true,
+        "define": true
       }
     },
-    "ethers>@ethersproject/basex": {
+    "ethereumjs-util>create-hash>md5.js": {
       "packages": {
-        "@ethersproject/bytes": true,
-        "ethers>@ethersproject/properties": true
+        "ethereumjs-util>create-hash>md5.js>hash-base": true,
+        "pumpify>inherits": true,
+        "koa>content-disposition>safe-buffer": true
       }
     },
-    "ethers>@ethersproject/constants": {
+    "@storybook/addon-docs>remark-external-links>mdast-util-definitions": {
       "packages": {
-        "@ethersproject/bignumber": true
+        "react-markdown>unist-util-visit": true
       }
     },
-    "ethers>@ethersproject/json-wallets": {
+    "react-markdown>remark-parse>mdast-util-from-markdown": {
       "packages": {
-        "@ethersproject/bytes": true,
-        "@ethersproject/hdnode": true,
-        "ethers>@ethersproject/address": true,
-        "ethers>@ethersproject/json-wallets>aes-js": true,
-        "ethers>@ethersproject/json-wallets>scrypt-js": true,
-        "ethers>@ethersproject/keccak256": true,
-        "ethers>@ethersproject/logger": true,
-        "ethers>@ethersproject/pbkdf2": true,
-        "ethers>@ethersproject/properties": true,
-        "ethers>@ethersproject/random": true,
-        "ethers>@ethersproject/strings": true,
-        "ethers>@ethersproject/transactions": true
+        "react-markdown>remark-parse>mdast-util-from-markdown>mdast-util-to-string": true,
+        "react-markdown>remark-parse>mdast-util-from-markdown>micromark": true,
+        "react-syntax-highlighter>refractor>parse-entities": true,
+        "react-markdown>remark-parse>mdast-util-from-markdown>unist-util-stringify-position": true
       }
     },
-    "ethers>@ethersproject/json-wallets>aes-js": {
+    "react-markdown>remark-rehype>mdast-util-to-hast": {
       "globals": {
-        "define": true
+        "console.warn": true
+      },
+      "packages": {
+        "@storybook/addon-docs>remark-external-links>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
       }
     },
-    "ethers>@ethersproject/json-wallets>scrypt-js": {
+    "@ethereumjs/tx>@ethereumjs/util>micro-ftch": {
       "globals": {
-        "define": true,
-        "setTimeout": true
+        "Headers": true,
+        "TextDecoder": true,
+        "URL": true,
+        "btoa": true,
+        "fetch": true
       },
       "packages": {
-        "browserify>timers-browserify": true
+        "browserify>browserify-zlib": true,
+        "browserify>buffer": true,
+        "https-browserify": true,
+        "process": true,
+        "stream-http": true,
+        "browserify>url": true,
+        "browserify>util": true
       }
     },
-    "ethers>@ethersproject/keccak256": {
+    "react-markdown>remark-parse>mdast-util-from-markdown>micromark": {
       "packages": {
-        "@ethersproject/bytes": true,
-        "@metamask/ethjs>js-sha3": true
-      }
-    },
-    "ethers>@ethersproject/logger": {
-      "globals": {
-        "console": true
+        "react-syntax-highlighter>refractor>parse-entities": true
       }
     },
-    "ethers>@ethersproject/pbkdf2": {
+    "crypto-browserify>diffie-hellman>miller-rabin": {
       "packages": {
-        "@ethersproject/bytes": true,
-        "ethers>@ethersproject/sha2": true
+        "bn.js": true,
+        "@metamask/ppom-validator>elliptic>brorand": true
       }
     },
-    "ethers>@ethersproject/properties": {
+    "@ensdomains/content-hash>cids>multibase": {
+      "globals": {
+        "TextDecoder": true,
+        "TextEncoder": true
+      },
       "packages": {
-        "ethers>@ethersproject/logger": true
+        "@ensdomains/content-hash>cids>multibase>@multiformats/base-x": true
       }
     },
-    "ethers>@ethersproject/providers": {
-      "globals": {
-        "WebSocket": true,
-        "clearInterval": true,
-        "clearTimeout": true,
-        "console.log": true,
-        "console.warn": true,
-        "setInterval": true,
-        "setTimeout": true
-      },
+    "@ensdomains/content-hash>multihashes>multibase": {
       "packages": {
-        "@ethersproject/bignumber": true,
-        "@ethersproject/bytes": true,
-        "@ethersproject/hash": true,
-        "ethers>@ethersproject/abstract-provider": true,
-        "ethers>@ethersproject/abstract-signer": true,
-        "ethers>@ethersproject/address": true,
-        "ethers>@ethersproject/base64": true,
-        "ethers>@ethersproject/basex": true,
-        "ethers>@ethersproject/constants": true,
-        "ethers>@ethersproject/logger": true,
-        "ethers>@ethersproject/properties": true,
-        "ethers>@ethersproject/providers>@ethersproject/networks": true,
-        "ethers>@ethersproject/providers>@ethersproject/web": true,
-        "ethers>@ethersproject/providers>bech32": true,
-        "ethers>@ethersproject/random": true,
-        "ethers>@ethersproject/sha2": true,
-        "ethers>@ethersproject/strings": true,
-        "ethers>@ethersproject/transactions": true
+        "@ensdomains/content-hash>multihashes>multibase>base-x": true,
+        "browserify>buffer": true,
+        "@ensdomains/content-hash>multihashes>web-encoding": true
       }
     },
-    "ethers>@ethersproject/providers>@ethersproject/networks": {
+    "@ensdomains/content-hash>multicodec": {
       "packages": {
-        "ethers>@ethersproject/logger": true
+        "@ensdomains/content-hash>multicodec>uint8arrays": true,
+        "sass-embedded>varint": true
       }
     },
-    "ethers>@ethersproject/providers>@ethersproject/web": {
+    "@ensdomains/content-hash>multicodec>uint8arrays>multiformats": {
       "globals": {
-        "clearTimeout": true,
-        "fetch": true,
-        "setTimeout": true
-      },
-      "packages": {
-        "@ethersproject/bytes": true,
-        "ethers>@ethersproject/base64": true,
-        "ethers>@ethersproject/logger": true,
-        "ethers>@ethersproject/properties": true,
-        "ethers>@ethersproject/strings": true
+        "TextDecoder": true,
+        "TextEncoder": true,
+        "console.warn": true,
+        "crypto.subtle.digest": true
       }
     },
-    "ethers>@ethersproject/random": {
+    "@ensdomains/content-hash>multihashes": {
       "packages": {
-        "@ethersproject/bytes": true,
-        "ethers>@ethersproject/logger": true
+        "browserify>buffer": true,
+        "@ensdomains/content-hash>multihashes>multibase": true,
+        "@ensdomains/content-hash>multihashes>varint": true,
+        "@ensdomains/content-hash>multihashes>web-encoding": true
       }
     },
-    "ethers>@ethersproject/rlp": {
+    "@ensdomains/content-hash>cids>multihashes": {
       "packages": {
-        "@ethersproject/bytes": true,
-        "ethers>@ethersproject/logger": true
+        "@ensdomains/content-hash>cids>multibase": true,
+        "@ensdomains/content-hash>cids>uint8arrays": true,
+        "@ensdomains/content-hash>cids>multihashes>varint": true
       }
     },
-    "ethers>@ethersproject/sha2": {
-      "packages": {
-        "@ethersproject/bytes": true,
-        "ethers>@ethersproject/logger": true,
-        "ethers>@ethersproject/sha2>hash.js": true
+    "nanoid": {
+      "globals": {
+        "crypto.getRandomValues": true
       }
     },
-    "ethers>@ethersproject/sha2>hash.js": {
-      "packages": {
-        "@metamask/ppom-validator>elliptic>minimalistic-assert": true,
-        "pumpify>inherits": true
+    "@metamask/approval-controller>nanoid": {
+      "globals": {
+        "crypto.getRandomValues": true
       }
     },
-    "ethers>@ethersproject/signing-key": {
-      "packages": {
-        "@ethersproject/bytes": true,
-        "ethers>@ethersproject/logger": true,
-        "ethers>@ethersproject/properties": true,
-        "ethers>@ethersproject/signing-key>elliptic": true
+    "@metamask/smart-transactions-controller>@metamask/controllers>nanoid": {
+      "globals": {
+        "crypto.getRandomValues": true
       }
     },
-    "ethers>@ethersproject/signing-key>elliptic": {
-      "packages": {
-        "@metamask/ppom-validator>elliptic>brorand": true,
-        "@metamask/ppom-validator>elliptic>hmac-drbg": true,
-        "@metamask/ppom-validator>elliptic>minimalistic-assert": true,
-        "@metamask/ppom-validator>elliptic>minimalistic-crypto-utils": true,
-        "bn.js": true,
-        "ethers>@ethersproject/sha2>hash.js": true,
-        "pumpify>inherits": true
+    "@metamask/notification-controller>nanoid": {
+      "globals": {
+        "crypto.getRandomValues": true
       }
     },
-    "ethers>@ethersproject/solidity": {
-      "packages": {
-        "@ethersproject/bignumber": true,
-        "@ethersproject/bytes": true,
-        "ethers>@ethersproject/keccak256": true,
-        "ethers>@ethersproject/logger": true,
-        "ethers>@ethersproject/sha2": true,
-        "ethers>@ethersproject/strings": true
+    "@metamask/permission-controller>nanoid": {
+      "globals": {
+        "crypto.getRandomValues": true
       }
     },
-    "ethers>@ethersproject/strings": {
-      "packages": {
-        "@ethersproject/bytes": true,
-        "ethers>@ethersproject/constants": true,
-        "ethers>@ethersproject/logger": true
+    "@metamask/rpc-methods>nanoid": {
+      "globals": {
+        "crypto.getRandomValues": true
       }
     },
-    "ethers>@ethersproject/transactions": {
-      "packages": {
-        "@ethersproject/bignumber": true,
-        "@ethersproject/bytes": true,
-        "ethers>@ethersproject/address": true,
-        "ethers>@ethersproject/constants": true,
-        "ethers>@ethersproject/keccak256": true,
-        "ethers>@ethersproject/logger": true,
-        "ethers>@ethersproject/properties": true,
-        "ethers>@ethersproject/rlp": true,
-        "ethers>@ethersproject/signing-key": true
+    "@metamask/rpc-methods-flask>nanoid": {
+      "globals": {
+        "crypto.getRandomValues": true
       }
     },
-    "ethers>@ethersproject/units": {
-      "packages": {
-        "@ethersproject/bignumber": true,
-        "ethers>@ethersproject/logger": true
+    "@metamask/snaps-controllers>nanoid": {
+      "globals": {
+        "crypto.getRandomValues": true
       }
     },
-    "ethers>@ethersproject/web": {
+    "@metamask/snaps-controllers-flask>nanoid": {
       "globals": {
-        "clearTimeout": true,
-        "fetch": true,
-        "setTimeout": true
-      },
-      "packages": {
-        "@ethersproject/bytes": true,
-        "ethers>@ethersproject/base64": true,
-        "ethers>@ethersproject/logger": true,
-        "ethers>@ethersproject/properties": true,
-        "ethers>@ethersproject/strings": true
+        "crypto.getRandomValues": true
       }
     },
-    "ethers>@ethersproject/wordlists": {
-      "packages": {
-        "@ethersproject/bytes": true,
-        "@ethersproject/hash": true,
-        "ethers>@ethersproject/logger": true,
-        "ethers>@ethersproject/properties": true,
-        "ethers>@ethersproject/strings": true
+    "depcheck>@vue/compiler-sfc>postcss>nanoid": {
+      "globals": {
+        "crypto.getRandomValues": true
       }
     },
-    "extension-port-stream": {
-      "packages": {
-        "browserify>buffer": true,
-        "extension-port-stream>readable-stream": true
+    "dependency-tree>precinct>detective-postcss>postcss>nanoid": {
+      "globals": {
+        "crypto.getRandomValues": true
       }
     },
-    "extension-port-stream>readable-stream": {
+    "node-fetch": {
       "globals": {
-        "AbortController": true,
-        "AggregateError": true,
-        "Blob": true
-      },
-      "packages": {
-        "browserify>buffer": true,
-        "browserify>string_decoder": true,
-        "extension-port-stream>readable-stream>abort-controller": true,
-        "process": true,
-        "webpack>events": true
+        "Headers": true,
+        "Request": true,
+        "Response": true,
+        "fetch": true
       }
     },
-    "extension-port-stream>readable-stream>abort-controller": {
+    "@metamask/controllers>web3-provider-engine>cross-fetch>node-fetch": {
       "globals": {
-        "AbortController": true
+        "fetch": true
       }
     },
-    "fast-json-patch": {
+    "@metamask/controllers>web3-provider-engine>eth-json-rpc-middleware>node-fetch": {
       "globals": {
-        "addEventListener": true,
-        "clearTimeout": true,
-        "removeEventListener": true,
-        "setTimeout": true
+        "fetch": true
       }
     },
-    "fuse.js": {
+    "@metamask/ethjs>ethjs-abi>number-to-bn": {
+      "packages": {
+        "bn.js": true,
+        "@metamask/ethjs>@metamask/ethjs-util>strip-hex-prefix": true
+      }
+    },
+    "string.prototype.matchall>es-abstract>object-inspect": {
       "globals": {
-        "console": true,
-        "define": true
+        "HTMLElement": true,
+        "WeakRef": true
+      },
+      "packages": {
+        "browserify>browser-resolve": true
       }
     },
-    "ganache>secp256k1": {
+    "@ngraveio/bc-ur>assert>object-is": {
       "packages": {
-        "@metamask/ppom-validator>elliptic": true
+        "string.prototype.matchall>call-bind": true,
+        "string.prototype.matchall>define-properties": true
       }
     },
     "gulp>vinyl-fs>object.assign": {
       "packages": {
-        "@lavamoat/lavapack>json-stable-stringify>object-keys": true,
         "string.prototype.matchall>call-bind": true,
         "string.prototype.matchall>define-properties": true,
-        "string.prototype.matchall>has-symbols": true
+        "string.prototype.matchall>has-symbols": true,
+        "@lavamoat/lavapack>json-stable-stringify>object-keys": true
       }
     },
-    "he": {
-      "globals": {
-        "define": true
+    "@metamask/object-multiplex>once": {
+      "packages": {
+        "@metamask/object-multiplex>once>wrappy": true
       }
     },
-    "history": {
-      "globals": {
-        "console": true,
-        "define": true,
-        "document.defaultView": true,
-        "document.querySelector": true
+    "crypto-browserify>public-encrypt>parse-asn1": {
+      "packages": {
+        "crypto-browserify>public-encrypt>parse-asn1>asn1.js": true,
+        "ethereumjs-util>ethereum-cryptography>browserify-aes": true,
+        "browserify>buffer": true,
+        "crypto-browserify>browserify-cipher>evp_bytestokey": true,
+        "crypto-browserify>pbkdf2": true
       }
     },
-    "https-browserify": {
-      "packages": {
-        "browserify>url": true,
-        "stream-http": true
+    "react-syntax-highlighter>refractor>parse-entities": {
+      "globals": {
+        "document.createElement": true
       }
     },
-    "koa>content-disposition>safe-buffer": {
+    "path-browserify": {
       "packages": {
-        "browserify>buffer": true
+        "process": true
       }
     },
-    "koa>is-generator-function": {
+    "serve-handler>path-to-regexp": {
       "packages": {
-        "koa>is-generator-function>has-tostringtag": true
+        "serve-handler>path-to-regexp>isarray": true
       }
     },
-    "koa>is-generator-function>has-tostringtag": {
+    "crypto-browserify>pbkdf2": {
+      "globals": {
+        "crypto": true,
+        "process": true,
+        "queueMicrotask": true,
+        "setImmediate": true,
+        "setTimeout": true
+      },
       "packages": {
-        "string.prototype.matchall>has-symbols": true
+        "ethereumjs-util>create-hash": true,
+        "process": true,
+        "ethereumjs-util>create-hash>ripemd160": true,
+        "koa>content-disposition>safe-buffer": true,
+        "addons-linter>sha.js": true
       }
     },
-    "localforage": {
+    "@material-ui/core>popper.js": {
       "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,
+        "MSInputMethodContext": true,
+        "Node.DOCUMENT_POSITION_FOLLOWING": true,
+        "cancelAnimationFrame": 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
+        "devicePixelRatio": true,
+        "document": true,
+        "getComputedStyle": true,
+        "innerHeight": true,
+        "innerWidth": true,
+        "navigator": true,
+        "requestAnimationFrame": true,
+        "setTimeout": true
       }
     },
-    "lodash": {
+    "react-tippy>popper.js": {
       "globals": {
-        "clearTimeout": true,
+        "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
       }
     },
-    "loglevel": {
+    "process": {
       "globals": {
-        "console": true,
-        "define": true,
-        "document.cookie": true,
-        "localStorage": true,
-        "log": "write",
-        "navigator": true
+        "clearTimeout": true,
+        "setTimeout": true
       }
     },
-    "lottie-web": {
-      "globals": {
-        "Blob": true,
-        "Howl": true,
-        "OffscreenCanvas": true,
-        "URL.createObjectURL": true,
-        "Worker": true,
-        "XMLHttpRequest": true,
-        "bodymovin": "write",
-        "clearInterval": true,
-        "console": true,
-        "define": true,
-        "document.body": true,
-        "document.createElement": true,
-        "document.createElementNS": true,
-        "document.getElementsByClassName": true,
-        "document.getElementsByTagName": true,
-        "document.querySelectorAll": true,
-        "document.readyState": true,
-        "location.origin": true,
-        "location.pathname": true,
-        "navigator": true,
-        "requestAnimationFrame": true,
-        "setInterval": true,
-        "setTimeout": true
+    "promise-to-callback": {
+      "packages": {
+        "promise-to-callback>is-fn": true,
+        "promise-to-callback>set-immediate-shim": true
       }
     },
-    "luxon": {
+    "prop-types": {
       "globals": {
-        "Intl": true
+        "console": true
+      },
+      "packages": {
+        "react>object-assign": true,
+        "prop-types>react-is": true
       }
     },
-    "nanoid": {
-      "globals": {
-        "crypto.getRandomValues": true
+    "react-markdown>property-information": {
+      "packages": {
+        "watchify>xtend": true
       }
     },
-    "nock>debug": {
+    "@trezor/connect-web>@trezor/connect>@trezor/protobuf>protobufjs": {
       "globals": {
-        "console": true,
-        "document": true,
-        "localStorage": true,
-        "navigator": true,
-        "process": true
+        "process": true,
+        "setTimeout": true
       },
       "packages": {
-        "nock>debug>ms": true,
-        "process": true
+        "@trezor/connect-web>@trezor/connect>@trezor/protobuf>protobufjs>@protobufjs/aspromise": true,
+        "@trezor/connect-web>@trezor/connect>@trezor/protobuf>protobufjs>@protobufjs/base64": true,
+        "@trezor/connect-web>@trezor/connect>@trezor/protobuf>protobufjs>@protobufjs/codegen": true,
+        "@trezor/connect-web>@trezor/connect>@trezor/protobuf>protobufjs>@protobufjs/eventemitter": true,
+        "@trezor/connect-web>@trezor/connect>@trezor/protobuf>protobufjs>@protobufjs/fetch": true,
+        "@trezor/connect-web>@trezor/connect>@trezor/protobuf>protobufjs>@protobufjs/float": true,
+        "@trezor/connect-web>@trezor/connect>@trezor/protobuf>protobufjs>@protobufjs/inquire": true,
+        "@trezor/connect-web>@trezor/connect>@trezor/protobuf>protobufjs>@protobufjs/path": true,
+        "@trezor/connect-web>@trezor/connect>@trezor/protobuf>protobufjs>@protobufjs/pool": true,
+        "@trezor/connect-web>@trezor/connect>@trezor/protobuf>protobufjs>@protobufjs/utf8": true
+      }
+    },
+    "crypto-browserify>public-encrypt": {
+      "packages": {
+        "bn.js": true,
+        "crypto-browserify>public-encrypt>browserify-rsa": true,
+        "browserify>buffer": true,
+        "ethereumjs-util>create-hash": true,
+        "crypto-browserify>public-encrypt>parse-asn1": true,
+        "crypto-browserify>randombytes": true
       }
     },
-    "node-fetch": {
+    "browserify>punycode": {
       "globals": {
-        "Headers": true,
-        "Request": true,
-        "Response": true,
-        "fetch": true
+        "define": true
       }
     },
-    "path-browserify": {
-      "packages": {
-        "process": true
+    "qrcode-generator": {
+      "globals": {
+        "define": true
       }
     },
-    "process": {
+    "qrcode.react": {
       "globals": {
-        "clearTimeout": true,
-        "setTimeout": true
+        "Path2D": true,
+        "devicePixelRatio": true
+      },
+      "packages": {
+        "react": true
       }
     },
-    "promise-to-callback": {
+    "@storybook/addon-knobs>qs": {
       "packages": {
-        "promise-to-callback>is-fn": true,
-        "promise-to-callback>set-immediate-shim": true
+        "string.prototype.matchall>side-channel": true
       }
     },
-    "promise-to-callback>set-immediate-shim": {
+    "@metamask/snaps-controllers>tar-stream>streamx>queue-tick": {
       "globals": {
-        "setTimeout.apply": true
-      },
-      "packages": {
-        "browserify>timers-browserify": true
+        "queueMicrotask": true
       }
     },
-    "prop-types": {
+    "react-beautiful-dnd>raf-schd": {
       "globals": {
-        "console": true
-      },
-      "packages": {
-        "prop-types>react-is": true,
-        "react>object-assign": true
+        "cancelAnimationFrame": true,
+        "requestAnimationFrame": true
       }
     },
-    "prop-types>react-is": {
+    "crypto-browserify>randombytes": {
       "globals": {
-        "console": true
+        "crypto": true,
+        "msCrypto": true
+      },
+      "packages": {
+        "process": true,
+        "koa>content-disposition>safe-buffer": true
       }
     },
-    "qrcode-generator": {
+    "ethereumjs-wallet>randombytes": {
       "globals": {
-        "define": true
+        "crypto.getRandomValues": true
       }
     },
-    "qrcode.react": {
+    "crypto-browserify>randomfill": {
       "globals": {
-        "Path2D": true,
-        "devicePixelRatio": true
+        "crypto": true,
+        "msCrypto": true
       },
       "packages": {
-        "react": true
+        "process": true,
+        "crypto-browserify>randombytes": true,
+        "koa>content-disposition>safe-buffer": true
       }
     },
     "react": {
@@ -4584,8 +4511,8 @@
         "console": true
       },
       "packages": {
-        "prop-types": true,
-        "react>object-assign": true
+        "react>object-assign": true,
+        "prop-types": true
       }
     },
     "react-beautiful-dnd": {
@@ -4607,43 +4534,28 @@
       },
       "packages": {
         "@babel/runtime": true,
-        "react": true,
         "react-beautiful-dnd>css-box-model": true,
         "react-beautiful-dnd>memoize-one": true,
         "react-beautiful-dnd>raf-schd": true,
-        "react-beautiful-dnd>use-memo-one": true,
+        "react": true,
         "react-dom": true,
         "react-redux": true,
-        "redux": true
+        "redux": true,
+        "react-beautiful-dnd>use-memo-one": true
       }
     },
-    "react-beautiful-dnd>css-box-model": {
+    "react-chartjs-2": {
       "globals": {
-        "getComputedStyle": true,
-        "pageXOffset": true,
-        "pageYOffset": true
+        "setTimeout": true
       },
       "packages": {
-        "react-router-dom>tiny-invariant": true
-      }
-    },
-    "react-beautiful-dnd>raf-schd": {
-      "globals": {
-        "cancelAnimationFrame": true,
-        "requestAnimationFrame": true
-      }
-    },
-    "react-beautiful-dnd>use-memo-one": {
-      "packages": {
+        "chart.js": true,
         "react": true
       }
     },
-    "react-chartjs-2": {
-      "globals": {
-        "setTimeout": true
-      },
+    "react-focus-lock>react-clientside-effect": {
       "packages": {
-        "chart.js": true,
+        "@babel/runtime": true,
         "react": true
       }
     },
@@ -4688,22 +4600,28 @@
         "trustedTypes": true
       },
       "packages": {
+        "react>object-assign": true,
         "prop-types": true,
         "react": true,
-        "react-dom>scheduler": true,
-        "react>object-assign": true
+        "react-dom>scheduler": true
       }
     },
-    "react-dom>scheduler": {
+    "react-responsive-carousel>react-easy-swipe": {
       "globals": {
-        "MessageChannel": true,
-        "cancelAnimationFrame": true,
-        "clearTimeout": true,
-        "console": true,
-        "navigator": true,
-        "performance": true,
-        "requestAnimationFrame": true,
-        "setTimeout": true
+        "addEventListener": true,
+        "define": true,
+        "document.addEventListener": true,
+        "document.removeEventListener": true
+      },
+      "packages": {
+        "prop-types": true,
+        "react": true
+      }
+    },
+    "react-popper>react-fast-compare": {
+      "globals": {
+        "Element": true,
+        "console.warn": true
       }
     },
     "react-focus-lock": {
@@ -4717,667 +4635,726 @@
       },
       "packages": {
         "@babel/runtime": true,
+        "react-focus-lock>focus-lock": true,
         "prop-types": true,
         "react": true,
-        "react-focus-lock>focus-lock": true,
         "react-focus-lock>react-clientside-effect": true,
         "react-focus-lock>use-callback-ref": true,
         "react-focus-lock>use-sidecar": true
       }
     },
-    "react-focus-lock>focus-lock": {
+    "react-idle-timer": {
       "globals": {
-        "HTMLIFrameElement": true,
-        "Node.DOCUMENT_FRAGMENT_NODE": true,
-        "Node.DOCUMENT_NODE": true,
-        "Node.DOCUMENT_POSITION_CONTAINED_BY": true,
-        "Node.DOCUMENT_POSITION_CONTAINS": true,
-        "Node.ELEMENT_NODE": true,
-        "console.error": true,
+        "clearTimeout": true,
+        "document": true,
+        "setTimeout": true
+      },
+      "packages": {
+        "prop-types": true,
+        "react": true
+      }
+    },
+    "react-inspector": {
+      "globals": {
+        "Node": true,
+        "chromeDark": true,
+        "chromeLight": true
+      },
+      "packages": {
+        "react": true
+      }
+    },
+    "prop-types>react-is": {
+      "globals": {
+        "console": true
+      }
+    },
+    "react-markdown>react-is": {
+      "globals": {
+        "console": true
+      }
+    },
+    "react-redux>react-is": {
+      "globals": {
+        "console": true
+      }
+    },
+    "react-markdown": {
+      "globals": {
+        "console.warn": true
+      },
+      "packages": {
+        "react-markdown>comma-separated-tokens": true,
+        "prop-types": true,
+        "react-markdown>property-information": true,
+        "react": 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-popper": {
+      "globals": {
+        "document": true
+      },
+      "packages": {
+        "@popperjs/core": true,
+        "react": true,
+        "react-popper>react-fast-compare": true,
+        "react-popper>warning": true
+      }
+    },
+    "react-redux": {
+      "globals": {
+        "console": true,
+        "document": true
+      },
+      "packages": {
+        "@babel/runtime": true,
+        "react-redux>hoist-non-react-statics": true,
+        "prop-types": true,
+        "react": true,
+        "react-dom": true,
+        "react-redux>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-router-dom": {
+      "packages": {
+        "react-router-dom>history": true,
+        "prop-types": true,
+        "react": true,
+        "react-router-dom>react-router": true,
+        "react-router-dom>tiny-invariant": true,
+        "react-router-dom>tiny-warning": true
+      }
+    },
+    "react-router-dom-v5-compat": {
+      "globals": {
+        "FormData": true,
+        "URL": true,
+        "URLSearchParams": true,
+        "__reactRouterVersion": "write",
+        "addEventListener": true,
+        "confirm": true,
+        "define": true,
+        "document": true,
+        "history.scrollRestoration": true,
+        "location.href": true,
+        "removeEventListener": true,
+        "scrollTo": true,
+        "scrollY": true,
+        "sessionStorage.getItem": true,
+        "sessionStorage.setItem": true,
         "setTimeout": true
       },
       "packages": {
-        "@swc/helpers>tslib": true
+        "react-router-dom-v5-compat>@remix-run/router": true,
+        "history": true,
+        "react": true,
+        "react-dom": true,
+        "react-router-dom": true,
+        "react-router-dom-v5-compat>react-router": true
       }
     },
-    "react-focus-lock>react-clientside-effect": {
+    "react-router-dom>react-router": {
       "packages": {
-        "@babel/runtime": true,
-        "react": true
+        "react-router-dom>history": true,
+        "react-redux>hoist-non-react-statics": true,
+        "serve-handler>path-to-regexp": true,
+        "prop-types": true,
+        "react": true,
+        "prop-types>react-is": true,
+        "react-router-dom>tiny-invariant": true,
+        "react-router-dom>tiny-warning": true
       }
     },
-    "react-focus-lock>use-callback-ref": {
+    "react-router-dom-v5-compat>react-router": {
+      "globals": {
+        "console.error": true,
+        "define": true
+      },
       "packages": {
+        "react-router-dom-v5-compat>@remix-run/router": true,
         "react": true
       }
     },
-    "react-focus-lock>use-sidecar": {
+    "react-simple-file-input": {
       "globals": {
-        "console.error": true
+        "File": true,
+        "FileReader": true,
+        "console.warn": true
       },
       "packages": {
-        "@swc/helpers>tslib": true,
-        "react": true,
-        "react-focus-lock>use-sidecar>detect-node-es": true
+        "prop-types": true,
+        "react": true
       }
     },
-    "react-idle-timer": {
+    "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": {
-        "prop-types": true,
-        "react": true
+        "react-tippy>popper.js": true,
+        "react": true,
+        "react-dom": true
       }
     },
-    "react-inspector": {
+    "react-toggle-button": {
       "globals": {
-        "Node": true,
-        "chromeDark": true,
-        "chromeLight": true
+        "clearTimeout": true,
+        "console.warn": true,
+        "define": true,
+        "performance": true,
+        "setTimeout": true
       },
       "packages": {
         "react": true
       }
     },
-    "react-markdown": {
+    "@material-ui/core>react-transition-group": {
       "globals": {
-        "console.warn": true
+        "Element": true,
+        "setTimeout": true
       },
       "packages": {
+        "@material-ui/core>react-transition-group>dom-helpers": true,
         "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-dom": true
       }
     },
-    "react-markdown>property-information": {
+    "readable-stream": {
       "packages": {
-        "watchify>xtend": true
+        "browserify>browser-resolve": true,
+        "browserify>buffer": true,
+        "webpack>events": true,
+        "pumpify>inherits": true,
+        "process": true,
+        "browserify>string_decoder": true,
+        "readable-stream>util-deprecate": true
       }
     },
-    "react-markdown>react-is": {
+    "extension-port-stream>readable-stream": {
       "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>unist-util-stringify-position": true,
-        "react-syntax-highlighter>refractor>parse-entities": true
-      }
-    },
-    "react-markdown>remark-parse>mdast-util-from-markdown>micromark": {
+        "AbortController": true,
+        "AbortSignal": true,
+        "AggregateError": true,
+        "Blob": true,
+        "ERR_INVALID_ARG_TYPE": true,
+        "queueMicrotask": true
+      },
       "packages": {
-        "react-syntax-highlighter>refractor>parse-entities": true
+        "@lavamoat/lavapack>readable-stream>abort-controller": true,
+        "browserify>buffer": true,
+        "webpack>events": true,
+        "process": true,
+        "browserify>string_decoder": true
       }
     },
-    "react-markdown>remark-rehype": {
+    "@metamask/snaps-controllers>readable-web-to-node-stream": {
       "packages": {
-        "react-markdown>remark-rehype>mdast-util-to-hast": true
+        "readable-stream": true
       }
     },
-    "react-markdown>remark-rehype>mdast-util-to-hast": {
+    "redux": {
       "globals": {
-        "console.warn": true
+        "console": true
       },
       "packages": {
-        "@storybook/addon-docs>remark-external-links>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
+        "@babel/runtime": true
       }
     },
-    "react-markdown>style-to-object": {
+    "string.prototype.matchall>regexp.prototype.flags": {
       "packages": {
-        "react-markdown>style-to-object>inline-style-parser": true
+        "string.prototype.matchall>call-bind": true,
+        "string.prototype.matchall>define-properties": true,
+        "string.prototype.matchall>call-bind>es-errors": true,
+        "string.prototype.matchall>regexp.prototype.flags>set-function-name": true
       }
     },
-    "react-markdown>unified": {
+    "react-markdown>remark-parse": {
       "packages": {
-        "mocha>yargs-unparser>is-plain-obj": true,
-        "react-markdown>unified>bail": true,
-        "react-markdown>unified>extend": true,
-        "react-markdown>unified>is-buffer": true,
-        "react-markdown>unified>trough": true,
-        "react-markdown>vfile": true
+        "react-markdown>remark-parse>mdast-util-from-markdown": true
       }
     },
-    "react-markdown>unist-util-visit": {
+    "react-markdown>remark-rehype": {
       "packages": {
-        "react-markdown>unist-util-visit>unist-util-visit-parents": true
+        "react-markdown>remark-rehype>mdast-util-to-hast": true
       }
     },
-    "react-markdown>unist-util-visit>unist-util-visit-parents": {
+    "react-markdown>vfile>replace-ext": {
       "packages": {
-        "react-markdown>unist-util-visit>unist-util-is": true
+        "path-browserify": true
       }
     },
-    "react-markdown>vfile": {
-      "packages": {
-        "path-browserify": true,
-        "process": true,
-        "react-markdown>vfile>is-buffer": true,
-        "react-markdown>vfile>replace-ext": true,
-        "react-markdown>vfile>vfile-message": true
+    "reselect": {
+      "globals": {
+        "WeakRef": true,
+        "console.warn": true,
+        "unstable_autotrackMemoize": true
       }
     },
-    "react-markdown>vfile>replace-ext": {
+    "@metamask/snaps-utils>rfdc": {
       "packages": {
-        "path-browserify": true
+        "browserify>buffer": true
       }
     },
-    "react-markdown>vfile>vfile-message": {
+    "ethereumjs-util>create-hash>ripemd160": {
       "packages": {
-        "react-markdown>vfile>unist-util-stringify-position": true
+        "browserify>buffer": true,
+        "ethereumjs-util>create-hash>md5.js>hash-base": true,
+        "pumpify>inherits": true
       }
     },
-    "react-popper": {
-      "globals": {
-        "document": true
-      },
+    "@keystonehq/metamask-airgapped-keyring>rlp": {
       "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
+        "bn.js": true,
+        "browserify>buffer": true
       }
     },
-    "react-popper>warning": {
+    "eth-lattice-keyring>rlp": {
       "globals": {
-        "console": true
+        "TextEncoder": true
       }
     },
-    "react-redux": {
-      "globals": {
-        "console": true,
-        "document": true
-      },
+    "ethereumjs-util>rlp": {
       "packages": {
-        "@babel/runtime": true,
-        "prop-types": true,
-        "react": true,
-        "react-dom": true,
-        "react-redux>hoist-non-react-statics": true,
-        "react-redux>react-is": true
+        "bn.js": true,
+        "browserify>buffer": true
       }
     },
-    "react-redux>hoist-non-react-statics": {
+    "@metamask/keyring-controller>ethereumjs-wallet>ethereumjs-util>rlp": {
       "packages": {
-        "prop-types>react-is": true
+        "bn.js": true,
+        "browserify>buffer": true
       }
     },
-    "react-redux>react-is": {
+    "wait-on>rxjs": {
       "globals": {
-        "console": true
+        "cancelAnimationFrame": true,
+        "clearInterval": true,
+        "clearTimeout": true,
+        "performance": true,
+        "requestAnimationFrame": true,
+        "setInterval.apply": true,
+        "setTimeout.apply": true
       }
     },
-    "react-responsive-carousel": {
+    "koa>content-disposition>safe-buffer": {
+      "packages": {
+        "browserify>buffer": true
+      }
+    },
+    "react-dom>scheduler": {
       "globals": {
-        "HTMLElement": true,
-        "addEventListener": true,
+        "MessageChannel": true,
+        "cancelAnimationFrame": true,
         "clearTimeout": true,
-        "console.warn": true,
-        "document": true,
-        "getComputedStyle": true,
-        "removeEventListener": true,
+        "console": true,
+        "navigator": true,
+        "performance": true,
+        "requestAnimationFrame": true,
         "setTimeout": true
-      },
-      "packages": {
-        "classnames": true,
-        "react": true,
-        "react-dom": true,
-        "react-responsive-carousel>react-easy-swipe": true
       }
     },
-    "react-responsive-carousel>react-easy-swipe": {
+    "ethers>@ethersproject/json-wallets>scrypt-js": {
       "globals": {
-        "addEventListener": true,
         "define": true,
-        "document.addEventListener": true,
-        "document.removeEventListener": true
+        "setTimeout": true
       },
       "packages": {
-        "prop-types": true,
-        "react": true
+        "browserify>timers-browserify": true
       }
     },
-    "react-router-dom": {
+    "ganache>secp256k1": {
       "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
+        "@metamask/ppom-validator>elliptic": true
       }
     },
-    "react-router-dom-v5-compat": {
+    "semver": {
       "globals": {
-        "FormData": true,
-        "URL": true,
-        "URLSearchParams": true,
-        "__reactRouterVersion": "write",
-        "addEventListener": true,
-        "confirm": true,
-        "define": true,
-        "document": true,
-        "history.scrollRestoration": true,
-        "location.href": true,
-        "removeEventListener": true,
-        "scrollTo": true,
-        "scrollY": true,
-        "sessionStorage.getItem": true,
-        "sessionStorage.setItem": true,
-        "setTimeout": true
+        "console.error": true
       },
       "packages": {
-        "history": true,
-        "react": true,
-        "react-dom": true,
-        "react-router-dom": true,
-        "react-router-dom-v5-compat>@remix-run/router": true,
-        "react-router-dom-v5-compat>react-router": true
+        "process": true
       }
     },
-    "react-router-dom-v5-compat>@remix-run/router": {
-      "globals": {
-        "AbortController": true,
-        "DOMException": true,
-        "FormData": true,
-        "Headers": true,
-        "Request": true,
-        "Response": true,
-        "URL": true,
-        "URLSearchParams": true,
-        "console": true,
-        "document.defaultView": true
+    "string.prototype.matchall>call-bind>set-function-length": {
+      "packages": {
+        "string.prototype.matchall>define-properties>define-data-property": true,
+        "string.prototype.matchall>call-bind>es-errors": true,
+        "string.prototype.matchall>get-intrinsic": true,
+        "string.prototype.matchall>es-abstract>gopd": true,
+        "string.prototype.matchall>es-abstract>has-property-descriptors": true
       }
     },
-    "react-router-dom-v5-compat>react-router": {
-      "globals": {
-        "console.error": true,
-        "define": true
-      },
+    "string.prototype.matchall>regexp.prototype.flags>set-function-name": {
       "packages": {
-        "react": true,
-        "react-router-dom-v5-compat>@remix-run/router": true
+        "string.prototype.matchall>define-properties>define-data-property": true,
+        "string.prototype.matchall>call-bind>es-errors": true,
+        "string.prototype.matchall>es-abstract>function.prototype.name>functions-have-names": true,
+        "string.prototype.matchall>es-abstract>has-property-descriptors": true
       }
     },
-    "react-router-dom>history": {
+    "promise-to-callback>set-immediate-shim": {
       "globals": {
-        "addEventListener": true,
-        "confirm": true,
-        "document": true,
-        "history": true,
-        "location": true,
-        "navigator.userAgent": true,
-        "removeEventListener": true
+        "setTimeout.apply": 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
+        "browserify>timers-browserify": true
       }
     },
-    "react-router-dom>react-router": {
+    "addons-linter>sha.js": {
       "packages": {
-        "prop-types": true,
-        "prop-types>react-is": true,
-        "react": true,
-        "react-redux>hoist-non-react-statics": true,
-        "react-router-dom>history": true,
-        "react-router-dom>tiny-invariant": true,
-        "react-router-dom>tiny-warning": true,
-        "serve-handler>path-to-regexp": true
+        "pumpify>inherits": true,
+        "koa>content-disposition>safe-buffer": true
       }
     },
-    "react-router-dom>tiny-warning": {
-      "globals": {
-        "console": true
+    "string.prototype.matchall>side-channel": {
+      "packages": {
+        "string.prototype.matchall>call-bind": true,
+        "string.prototype.matchall>get-intrinsic": true,
+        "string.prototype.matchall>es-abstract>object-inspect": true
       }
     },
-    "react-simple-file-input": {
+    "@metamask/profile-sync-controller>siwe": {
       "globals": {
-        "File": true,
-        "FileReader": true,
+        "console.error": true,
         "console.warn": true
       },
       "packages": {
-        "prop-types": true,
-        "react": true
+        "@metamask/profile-sync-controller>siwe>@spruceid/siwe-parser": true,
+        "@metamask/profile-sync-controller>siwe>@stablelib/random": true,
+        "ethers": true,
+        "@metamask/controller-utils>@spruceid/siwe-parser>valid-url": true
       }
     },
-    "react-syntax-highlighter>refractor>parse-entities": {
+    "@metamask/eth-token-tracker>deep-equal>es-get-iterator>stop-iteration-iterator": {
       "globals": {
-        "document.createElement": true
+        "StopIteration": true
+      },
+      "packages": {
+        "string.prototype.matchall>internal-slot": true
       }
     },
-    "react-tippy": {
+    "stream-browserify": {
+      "packages": {
+        "webpack>events": true,
+        "pumpify>inherits": true,
+        "readable-stream": true
+      }
+    },
+    "stream-http": {
       "globals": {
-        "Element": true,
-        "MSStream": true,
-        "MutationObserver": true,
-        "addEventListener": true,
+        "AbortController": true,
+        "Blob": true,
+        "MSStreamReader": true,
+        "ReadableStream": true,
+        "WritableStream": true,
+        "XDomainRequest": true,
+        "XMLHttpRequest": 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,
+        "fetch": true,
+        "location.protocol.search": true,
         "setTimeout": true
       },
       "packages": {
-        "react": true,
-        "react-dom": true,
-        "react-tippy>popper.js": true
+        "browserify>buffer": true,
+        "stream-http>builtin-status-codes": true,
+        "pumpify>inherits": true,
+        "process": true,
+        "readable-stream": true,
+        "browserify>url": true,
+        "watchify>xtend": 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
+    "@metamask/snaps-controllers>tar-stream>streamx": {
+      "packages": {
+        "webpack>events": true,
+        "@metamask/snaps-controllers>tar-stream>fast-fifo": true,
+        "@metamask/snaps-controllers>tar-stream>streamx>queue-tick": true
       }
     },
-    "react-toggle-button": {
-      "globals": {
-        "clearTimeout": true,
-        "console.warn": true,
-        "define": true,
-        "performance": true,
-        "setTimeout": true
-      },
+    "browserify>string_decoder": {
       "packages": {
-        "react": true
+        "koa>content-disposition>safe-buffer": true
       }
     },
-    "readable-stream": {
+    "@metamask/ethjs>@metamask/ethjs-util>strip-hex-prefix": {
       "packages": {
-        "browserify>browser-resolve": true,
-        "browserify>buffer": true,
-        "browserify>string_decoder": true,
-        "process": true,
-        "pumpify>inherits": true,
-        "readable-stream>util-deprecate": true,
-        "webpack>events": true
+        "@metamask/ethjs>@metamask/ethjs-util>is-hex-prefixed": true
       }
     },
-    "readable-stream>util-deprecate": {
-      "globals": {
-        "console.trace": true,
-        "console.warn": true,
-        "localStorage": true
+    "react-markdown>style-to-object": {
+      "packages": {
+        "react-markdown>style-to-object>inline-style-parser": true
       }
     },
-    "redux": {
-      "globals": {
-        "console": true
-      },
+    "@metamask/snaps-controllers>tar-stream": {
       "packages": {
-        "@babel/runtime": true
+        "@metamask/snaps-controllers>tar-stream>b4a": true,
+        "browserify>browser-resolve": true,
+        "@metamask/snaps-controllers>tar-stream>fast-fifo": true,
+        "@metamask/snaps-controllers>tar-stream>streamx": true
       }
     },
-    "reselect": {
-      "globals": {
-        "WeakRef": true,
-        "console.warn": true,
-        "unstable_autotrackMemoize": true
+    "debounce-stream>through": {
+      "packages": {
+        "process": true,
+        "stream-browserify": true
       }
     },
-    "semver": {
+    "browserify>timers-browserify": {
       "globals": {
-        "console.error": true
+        "clearInterval": true,
+        "clearTimeout": true,
+        "setInterval": true,
+        "setTimeout": true
       },
       "packages": {
         "process": true
       }
     },
-    "serve-handler>path-to-regexp": {
-      "packages": {
-        "serve-handler>path-to-regexp>isarray": true
+    "react-router-dom>tiny-warning": {
+      "globals": {
+        "console": true
       }
     },
-    "stream-browserify": {
-      "packages": {
-        "pumpify>inherits": true,
-        "readable-stream": true,
-        "webpack>events": true
+    "copy-to-clipboard>toggle-selection": {
+      "globals": {
+        "document.activeElement": true,
+        "document.getSelection": true
       }
     },
-    "stream-http": {
+    "@swc/helpers>tslib": {
+      "globals": {
+        "SuppressedError": true,
+        "define": true
+      }
+    },
+    "@metamask/eth-sig-util>tweetnacl": {
       "globals": {
-        "AbortController": true,
-        "Blob": true,
-        "MSStreamReader": true,
-        "ReadableStream": true,
-        "WritableStream": true,
-        "XDomainRequest": true,
-        "XMLHttpRequest": true,
-        "clearTimeout": true,
-        "fetch": true,
-        "location.protocol.search": true,
-        "setTimeout": true
+        "crypto": true,
+        "msCrypto": true,
+        "nacl": "write"
       },
       "packages": {
-        "browserify>buffer": true,
-        "browserify>url": true,
-        "process": true,
-        "pumpify>inherits": true,
-        "readable-stream": true,
-        "stream-http>builtin-status-codes": true,
-        "watchify>xtend": true
+        "browserify>browser-resolve": true
       }
     },
-    "string.prototype.matchall>call-bind": {
-      "packages": {
-        "browserify>has>function-bind": true,
-        "string.prototype.matchall>call-bind>es-define-property": true,
-        "string.prototype.matchall>call-bind>es-errors": true,
-        "string.prototype.matchall>call-bind>set-function-length": true,
-        "string.prototype.matchall>get-intrinsic": true
+    "@trezor/connect-web>@trezor/connect-common>@trezor/env-utils>ua-parser-js": {
+      "globals": {
+        "define": true
       }
     },
-    "string.prototype.matchall>call-bind>es-define-property": {
+    "@ensdomains/content-hash>cids>uint8arrays": {
+      "globals": {
+        "TextDecoder": true,
+        "TextEncoder": true
+      },
       "packages": {
-        "string.prototype.matchall>get-intrinsic": true
+        "@ensdomains/content-hash>cids>multibase": true
       }
     },
-    "string.prototype.matchall>call-bind>set-function-length": {
+    "@ensdomains/content-hash>multicodec>uint8arrays": {
+      "globals": {
+        "Buffer": true,
+        "TextDecoder": true,
+        "TextEncoder": true
+      },
       "packages": {
-        "string.prototype.matchall>call-bind>es-errors": true,
-        "string.prototype.matchall>define-properties>define-data-property": true,
-        "string.prototype.matchall>es-abstract>gopd": true,
-        "string.prototype.matchall>es-abstract>has-property-descriptors": true,
-        "string.prototype.matchall>get-intrinsic": true
+        "@ensdomains/content-hash>multicodec>uint8arrays>multiformats": true
       }
     },
-    "string.prototype.matchall>define-properties": {
+    "react-markdown>unified": {
       "packages": {
-        "@lavamoat/lavapack>json-stable-stringify>object-keys": true,
-        "string.prototype.matchall>define-properties>define-data-property": true,
-        "string.prototype.matchall>es-abstract>has-property-descriptors": true
+        "react-markdown>unified>bail": true,
+        "react-markdown>unified>extend": true,
+        "react-markdown>unified>is-buffer": true,
+        "mocha>yargs-unparser>is-plain-obj": true,
+        "react-markdown>unified>trough": true,
+        "react-markdown>vfile": true
       }
     },
-    "string.prototype.matchall>define-properties>define-data-property": {
+    "react-markdown>unist-util-visit>unist-util-visit-parents": {
       "packages": {
-        "string.prototype.matchall>call-bind>es-define-property": true,
-        "string.prototype.matchall>call-bind>es-errors": true,
-        "string.prototype.matchall>es-abstract>gopd": true
+        "react-markdown>unist-util-visit>unist-util-is": true
       }
     },
-    "string.prototype.matchall>es-abstract>array-buffer-byte-length": {
+    "react-markdown>unist-util-visit": {
       "packages": {
-        "string.prototype.matchall>call-bind": true,
-        "string.prototype.matchall>es-abstract>is-array-buffer": true
+        "react-markdown>unist-util-visit>unist-util-visit-parents": true
       }
     },
-    "string.prototype.matchall>es-abstract>available-typed-arrays": {
-      "packages": {
-        "string.prototype.matchall>es-abstract>typed-array-length>possible-typed-array-names": true
+    "uri-js": {
+      "globals": {
+        "define": true
       }
     },
-    "string.prototype.matchall>es-abstract>es-to-primitive>is-symbol": {
+    "browserify>url": {
       "packages": {
-        "string.prototype.matchall>has-symbols": true
+        "browserify>punycode": true,
+        "@storybook/addon-knobs>qs": true
       }
     },
-    "string.prototype.matchall>es-abstract>gopd": {
+    "react-focus-lock>use-callback-ref": {
       "packages": {
-        "string.prototype.matchall>get-intrinsic": true
+        "react": true
       }
     },
-    "string.prototype.matchall>es-abstract>has-property-descriptors": {
+    "react-beautiful-dnd>use-memo-one": {
       "packages": {
-        "string.prototype.matchall>call-bind>es-define-property": true
+        "react": true
       }
     },
-    "string.prototype.matchall>es-abstract>is-array-buffer": {
+    "react-focus-lock>use-sidecar": {
+      "globals": {
+        "console.error": true
+      },
       "packages": {
-        "string.prototype.matchall>call-bind": true,
-        "string.prototype.matchall>get-intrinsic": true
+        "react-focus-lock>use-sidecar>detect-node-es": true,
+        "react": true,
+        "@swc/helpers>tslib": true
       }
     },
-    "string.prototype.matchall>es-abstract>is-callable": {
+    "readable-stream>util-deprecate": {
       "globals": {
-        "document": true
+        "console.trace": true,
+        "console.warn": true,
+        "localStorage": true
       }
     },
-    "string.prototype.matchall>es-abstract>is-regex": {
+    "browserify>assert>util": {
+      "globals": {
+        "console.error": true,
+        "console.log": true,
+        "console.trace": true,
+        "process": true
+      },
       "packages": {
-        "koa>is-generator-function>has-tostringtag": true,
-        "string.prototype.matchall>call-bind": true
+        "browserify>assert>util>inherits": true,
+        "process": true
       }
     },
-    "string.prototype.matchall>es-abstract>is-shared-array-buffer": {
+    "browserify>util": {
+      "globals": {
+        "console.error": true,
+        "console.log": true,
+        "console.trace": true
+      },
       "packages": {
-        "string.prototype.matchall>call-bind": true
+        "pumpify>inherits": true,
+        "browserify>util>is-arguments": true,
+        "koa>is-generator-function": true,
+        "browserify>util>is-typed-array": true,
+        "process": true,
+        "browserify>util>which-typed-array": true
       }
     },
-    "string.prototype.matchall>es-abstract>object-inspect": {
+    "uuid": {
       "globals": {
-        "HTMLElement": true,
-        "WeakRef": true
-      },
-      "packages": {
-        "browserify>browser-resolve": true
+        "crypto": true,
+        "msCrypto": true
       }
     },
-    "string.prototype.matchall>get-intrinsic": {
+    "@metamask/eth-snap-keyring>uuid": {
       "globals": {
-        "AggregateError": true,
-        "FinalizationRegistry": true,
-        "WeakRef": true
-      },
-      "packages": {
-        "browserify>has>function-bind": true,
-        "depcheck>is-core-module>hasown": true,
-        "string.prototype.matchall>call-bind>es-errors": true,
-        "string.prototype.matchall>es-abstract>has-proto": true,
-        "string.prototype.matchall>has-symbols": true
+        "crypto": true
       }
     },
-    "string.prototype.matchall>internal-slot": {
-      "packages": {
-        "depcheck>is-core-module>hasown": true,
-        "string.prototype.matchall>call-bind>es-errors": true,
-        "string.prototype.matchall>side-channel": true
+    "@metamask/keyring-snap-client>uuid": {
+      "globals": {
+        "crypto": true
       }
     },
-    "string.prototype.matchall>regexp.prototype.flags": {
-      "packages": {
-        "string.prototype.matchall>call-bind": true,
-        "string.prototype.matchall>call-bind>es-errors": true,
-        "string.prototype.matchall>define-properties": true,
-        "string.prototype.matchall>regexp.prototype.flags>set-function-name": true
+    "eth-lattice-keyring>gridplus-sdk>uuid": {
+      "globals": {
+        "crypto": true
       }
     },
-    "string.prototype.matchall>regexp.prototype.flags>set-function-name": {
+    "web3-stream-provider>uuid": {
+      "globals": {
+        "crypto": true
+      }
+    },
+    "@metamask/snaps-utils>validate-npm-package-name": {
       "packages": {
-        "string.prototype.matchall>call-bind>es-errors": true,
-        "string.prototype.matchall>define-properties>define-data-property": true,
-        "string.prototype.matchall>es-abstract>function.prototype.name>functions-have-names": true,
-        "string.prototype.matchall>es-abstract>has-property-descriptors": true
+        "@metamask/snaps-utils>validate-npm-package-name>builtins": true
       }
     },
-    "string.prototype.matchall>side-channel": {
+    "react-markdown>vfile>vfile-message": {
       "packages": {
-        "string.prototype.matchall>call-bind": true,
-        "string.prototype.matchall>es-abstract>object-inspect": true,
-        "string.prototype.matchall>get-intrinsic": true
+        "react-markdown>vfile>unist-util-stringify-position": true
       }
     },
-    "terser>source-map-support>buffer-from": {
+    "react-markdown>vfile": {
       "packages": {
-        "browserify>buffer": true
+        "react-markdown>vfile>is-buffer": true,
+        "path-browserify": true,
+        "process": true,
+        "react-markdown>vfile>replace-ext": true,
+        "react-markdown>vfile>vfile-message": true
       }
     },
-    "uri-js": {
+    "browserify>vm-browserify": {
       "globals": {
-        "define": true
+        "document.body.appendChild": true,
+        "document.body.removeChild": true,
+        "document.createElement": true
       }
     },
-    "uuid": {
+    "react-popper>warning": {
       "globals": {
-        "crypto": true,
-        "msCrypto": true
+        "console": true
       }
     },
-    "wait-on>rxjs": {
+    "@ensdomains/content-hash>multihashes>web-encoding": {
       "globals": {
-        "cancelAnimationFrame": true,
-        "clearInterval": true,
-        "clearTimeout": true,
-        "performance": true,
-        "requestAnimationFrame": true,
-        "setInterval.apply": true,
-        "setTimeout.apply": true
+        "TextDecoder": true,
+        "TextEncoder": true
+      },
+      "packages": {
+        "browserify>util": true
       }
     },
     "web3": {
@@ -5390,14 +5367,14 @@
         "setTimeout": true
       },
       "packages": {
-        "browserify>util": true,
         "readable-stream": true,
+        "browserify>util": true,
         "web3-stream-provider>uuid": true
       }
     },
-    "web3-stream-provider>uuid": {
+    "@metamask/controllers>web3": {
       "globals": {
-        "crypto": true
+        "XMLHttpRequest": true
       }
     },
     "webextension-polyfill": {
@@ -5409,9 +5386,35 @@
         "define": true
       }
     },
-    "webpack>events": {
+    "@metamask/eth-token-tracker>deep-equal>which-boxed-primitive": {
+      "packages": {
+        "@metamask/eth-token-tracker>deep-equal>which-boxed-primitive>is-bigint": true,
+        "@metamask/eth-token-tracker>deep-equal>which-boxed-primitive>is-boolean-object": true,
+        "@metamask/eth-token-tracker>deep-equal>which-boxed-primitive>is-number-object": true,
+        "eslint-plugin-react>array-includes>is-string": true,
+        "string.prototype.matchall>es-abstract>es-to-primitive>is-symbol": true
+      }
+    },
+    "@metamask/eth-token-tracker>deep-equal>which-collection": {
+      "packages": {
+        "@metamask/eth-token-tracker>deep-equal>es-get-iterator>is-map": true,
+        "@metamask/eth-token-tracker>deep-equal>es-get-iterator>is-set": true,
+        "@metamask/eth-token-tracker>deep-equal>which-collection>is-weakmap": true,
+        "@metamask/eth-token-tracker>deep-equal>which-collection>is-weakset": true
+      }
+    },
+    "browserify>util>which-typed-array": {
+      "packages": {
+        "string.prototype.matchall>es-abstract>available-typed-arrays": true,
+        "string.prototype.matchall>call-bind": true,
+        "browserify>util>which-typed-array>for-each": true,
+        "string.prototype.matchall>es-abstract>gopd": true,
+        "koa>is-generator-function>has-tostringtag": true
+      }
+    },
+    "@metamask/ethjs>@metamask/ethjs-provider-http>xhr2": {
       "globals": {
-        "console": true
+        "XMLHttpRequest": true
       }
     }
   }
diff --git a/lavamoat/browserify/flask/policy.json b/lavamoat/browserify/flask/policy.json
index 542d38004de3..82075f709022 100644
--- a/lavamoat/browserify/flask/policy.json
+++ b/lavamoat/browserify/flask/policy.json
@@ -5,144 +5,124 @@
         "regeneratorRuntime": "write"
       }
     },
-    "@ensdomains/content-hash": {
+    "eth-lattice-keyring>@ethereumjs/tx>@chainsafe/ssz>@chainsafe/persistent-merkle-tree": {
       "globals": {
-        "console.warn": true
+        "WeakRef": 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
+        "browserify": true
       }
     },
-    "@ensdomains/content-hash>cids": {
+    "eth-lattice-keyring>@ethereumjs/tx>@chainsafe/ssz": {
       "packages": {
-        "@ensdomains/content-hash>cids>multibase": true,
-        "@ensdomains/content-hash>cids>multihashes": true,
-        "@ensdomains/content-hash>cids>uint8arrays": true,
-        "@ensdomains/content-hash>multicodec": true
+        "eth-lattice-keyring>@ethereumjs/tx>@chainsafe/ssz>@chainsafe/persistent-merkle-tree": true,
+        "browserify": true,
+        "browserify>buffer": true,
+        "eth-lattice-keyring>@ethereumjs/tx>@chainsafe/ssz>case": true
       }
     },
-    "@ensdomains/content-hash>cids>multibase": {
+    "@metamask/notification-services-controller>@contentful/rich-text-html-renderer": {
       "globals": {
-        "TextDecoder": true,
-        "TextEncoder": true
+        "SuppressedError": true
+      }
+    },
+    "@ensdomains/content-hash": {
+      "globals": {
+        "console.warn": true
       },
       "packages": {
-        "@ensdomains/content-hash>cids>multibase>@multiformats/base-x": true
+        "browserify>buffer": true,
+        "@ensdomains/content-hash>cids": true,
+        "@ensdomains/content-hash>js-base64": true,
+        "@ensdomains/content-hash>multicodec": true,
+        "@ensdomains/content-hash>multihashes": true
       }
     },
-    "@ensdomains/content-hash>cids>multihashes": {
+    "@ethereumjs/tx>@ethereumjs/common": {
       "packages": {
-        "@ensdomains/content-hash>cids>multibase": true,
-        "@ensdomains/content-hash>cids>multihashes>varint": true,
-        "@ensdomains/content-hash>cids>uint8arrays": true
+        "@ethereumjs/tx>@ethereumjs/util": true,
+        "browserify>buffer": true,
+        "@ethereumjs/tx>@ethereumjs/common>crc-32": true,
+        "webpack>events": true
       }
     },
-    "@ensdomains/content-hash>cids>uint8arrays": {
-      "globals": {
-        "TextDecoder": true,
-        "TextEncoder": true
-      },
+    "@metamask/smart-transactions-controller>@ethereumjs/tx>@ethereumjs/common": {
       "packages": {
-        "@ensdomains/content-hash>cids>multibase": true
+        "@metamask/smart-transactions-controller>@ethereumjs/util": true,
+        "webpack>events": true
       }
     },
-    "@ensdomains/content-hash>js-base64": {
-      "globals": {
-        "Base64": "write",
-        "TextDecoder": true,
-        "TextEncoder": true,
-        "atob": true,
-        "btoa": true,
-        "define": true
-      },
+    "eth-lattice-keyring>gridplus-sdk>@ethereumjs/tx>@ethereumjs/common": {
       "packages": {
-        "browserify>buffer": true
+        "@ethereumjs/tx>@ethereumjs/util": true,
+        "browserify>buffer": true,
+        "@ethereumjs/tx>@ethereumjs/common>crc-32": true,
+        "webpack>events": true
       }
     },
-    "@ensdomains/content-hash>multicodec": {
+    "eth-lattice-keyring>gridplus-sdk>@ethereumjs/common": {
       "packages": {
-        "@ensdomains/content-hash>multicodec>uint8arrays": true,
-        "sass-embedded>varint": true
+        "@ethereumjs/tx>@ethereumjs/util": true,
+        "browserify>buffer": true,
+        "@ethereumjs/tx>@ethereumjs/common>crc-32": true,
+        "webpack>events": true
       }
     },
-    "@ensdomains/content-hash>multicodec>uint8arrays": {
+    "@ethereumjs/tx>@ethereumjs/rlp": {
       "globals": {
-        "Buffer": true,
-        "TextDecoder": true,
         "TextEncoder": true
-      },
-      "packages": {
-        "@ensdomains/content-hash>multicodec>uint8arrays>multiformats": true
       }
     },
-    "@ensdomains/content-hash>multicodec>uint8arrays>multiformats": {
+    "@metamask/smart-transactions-controller>@ethereumjs/tx>@ethereumjs/rlp": {
       "globals": {
-        "TextDecoder": true,
-        "TextEncoder": true,
-        "console.warn": true,
-        "crypto.subtle.digest": 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
+        "TextEncoder": true
       }
     },
-    "@ensdomains/content-hash>multihashes>multibase": {
-      "packages": {
-        "@ensdomains/content-hash>multihashes>multibase>base-x": true,
-        "@ensdomains/content-hash>multihashes>web-encoding": true,
-        "browserify>buffer": true
+    "@metamask/eth-ledger-bridge-keyring>@ethereumjs/rlp": {
+      "globals": {
+        "TextEncoder": true
       }
     },
-    "@ensdomains/content-hash>multihashes>multibase>base-x": {
+    "@ethereumjs/tx": {
       "packages": {
-        "koa>content-disposition>safe-buffer": true
+        "@ethereumjs/tx>@ethereumjs/common": true,
+        "@ethereumjs/tx>@ethereumjs/rlp": true,
+        "@ethereumjs/tx>@ethereumjs/util": true,
+        "browserify>buffer": true,
+        "@ethereumjs/tx>ethereum-cryptography": true,
+        "browserify>insert-module-globals>is-buffer": true
       }
     },
-    "@ensdomains/content-hash>multihashes>web-encoding": {
-      "globals": {
-        "TextDecoder": true,
-        "TextEncoder": true
-      },
+    "@metamask/smart-transactions-controller>@ethereumjs/tx": {
       "packages": {
-        "browserify>util": true
+        "@metamask/smart-transactions-controller>@ethereumjs/tx>@ethereumjs/common": true,
+        "@metamask/smart-transactions-controller>@ethereumjs/tx>@ethereumjs/rlp": true,
+        "@metamask/smart-transactions-controller>@ethereumjs/util": true,
+        "@ethereumjs/tx>ethereum-cryptography": true
       }
     },
-    "@ethereumjs/tx": {
+    "eth-lattice-keyring>@ethereumjs/tx": {
       "packages": {
+        "eth-lattice-keyring>@ethereumjs/tx>@chainsafe/ssz": true,
         "@ethereumjs/tx>@ethereumjs/common": true,
         "@ethereumjs/tx>@ethereumjs/rlp": true,
         "@ethereumjs/tx>@ethereumjs/util": true,
-        "@ethereumjs/tx>ethereum-cryptography": true,
+        "@ethersproject/providers": true,
         "browserify>buffer": true,
+        "eth-lattice-keyring>@ethereumjs/tx>ethereum-cryptography": true,
         "browserify>insert-module-globals>is-buffer": true
       }
     },
-    "@ethereumjs/tx>@ethereumjs/common": {
+    "eth-lattice-keyring>gridplus-sdk>@ethereumjs/tx": {
       "packages": {
-        "@ethereumjs/tx>@ethereumjs/common>crc-32": true,
+        "eth-lattice-keyring>@ethereumjs/tx>@chainsafe/ssz": true,
+        "eth-lattice-keyring>gridplus-sdk>@ethereumjs/tx>@ethereumjs/common": true,
+        "@ethereumjs/tx>@ethereumjs/rlp": true,
         "@ethereumjs/tx>@ethereumjs/util": true,
+        "@ethersproject/providers": true,
         "browserify>buffer": true,
-        "webpack>events": true
-      }
-    },
-    "@ethereumjs/tx>@ethereumjs/common>crc-32": {
-      "globals": {
-        "DO_NOT_EXPORT_CRC": true,
-        "define": true
-      }
-    },
-    "@ethereumjs/tx>@ethereumjs/rlp": {
-      "globals": {
-        "TextEncoder": true
+        "eth-lattice-keyring>gridplus-sdk>@ethereumjs/tx>ethereum-cryptography": true,
+        "browserify>insert-module-globals>is-buffer": true
       }
     },
     "@ethereumjs/tx>@ethereumjs/util": {
@@ -151,78 +131,83 @@
       },
       "packages": {
         "@ethereumjs/tx>@ethereumjs/rlp": true,
-        "@ethereumjs/tx>@ethereumjs/util>micro-ftch": true,
-        "@ethereumjs/tx>ethereum-cryptography": true,
         "browserify>buffer": true,
+        "@ethereumjs/tx>ethereum-cryptography": true,
+        "webpack>events": true,
         "browserify>insert-module-globals>is-buffer": true,
-        "webpack>events": true
+        "@ethereumjs/tx>@ethereumjs/util>micro-ftch": true
       }
     },
-    "@ethereumjs/tx>@ethereumjs/util>micro-ftch": {
+    "@metamask/smart-transactions-controller>@ethereumjs/util": {
       "globals": {
-        "Headers": true,
-        "TextDecoder": true,
-        "URL": true,
-        "btoa": true,
+        "console.warn": true,
         "fetch": true
       },
       "packages": {
-        "browserify>browserify-zlib": true,
-        "browserify>buffer": true,
-        "browserify>url": true,
-        "browserify>util": true,
-        "https-browserify": true,
-        "process": true,
-        "stream-http": true
+        "@metamask/smart-transactions-controller>@ethereumjs/tx>@ethereumjs/rlp": true,
+        "@ethereumjs/tx>ethereum-cryptography": true,
+        "webpack>events": true
       }
     },
-    "@ethereumjs/tx>ethereum-cryptography": {
+    "@ethersproject/abi": {
       "globals": {
-        "TextDecoder": true,
-        "crypto": true
+        "console.log": true
       },
       "packages": {
-        "@ethereumjs/tx>ethereum-cryptography>@noble/curves": true,
-        "@ethereumjs/tx>ethereum-cryptography>@scure/bip32": true,
-        "@noble/hashes": true
+        "ethers>@ethersproject/address": true,
+        "@ethersproject/bignumber": true,
+        "@ethersproject/bytes": true,
+        "ethers>@ethersproject/constants": true,
+        "@ethersproject/hash": true,
+        "ethers>@ethersproject/keccak256": true,
+        "ethers>@ethersproject/logger": true,
+        "ethers>@ethersproject/properties": true,
+        "ethers>@ethersproject/strings": true
       }
     },
-    "@ethereumjs/tx>ethereum-cryptography>@noble/curves": {
-      "globals": {
-        "TextEncoder": true
-      },
+    "ethers>@ethersproject/abstract-provider": {
       "packages": {
-        "@noble/hashes": true
+        "@ethersproject/bignumber": true,
+        "@ethersproject/bytes": true,
+        "ethers>@ethersproject/logger": true,
+        "ethers>@ethersproject/properties": true
       }
     },
-    "@ethereumjs/tx>ethereum-cryptography>@scure/bip32": {
+    "ethers>@ethersproject/abstract-signer": {
       "packages": {
-        "@ethereumjs/tx>ethereum-cryptography>@noble/curves": true,
-        "@metamask/utils>@scure/base": true,
-        "@noble/hashes": true
+        "ethers>@ethersproject/logger": true,
+        "ethers>@ethersproject/properties": true
       }
     },
-    "@ethersproject/abi": {
-      "globals": {
-        "console.log": true
-      },
+    "ethers>@ethersproject/address": {
       "packages": {
         "@ethersproject/bignumber": true,
         "@ethersproject/bytes": true,
-        "@ethersproject/hash": true,
-        "ethers>@ethersproject/address": true,
-        "ethers>@ethersproject/constants": true,
         "ethers>@ethersproject/keccak256": true,
         "ethers>@ethersproject/logger": true,
-        "ethers>@ethersproject/properties": true,
-        "ethers>@ethersproject/strings": true
+        "ethers>@ethersproject/rlp": true
+      }
+    },
+    "ethers>@ethersproject/base64": {
+      "globals": {
+        "atob": true,
+        "btoa": true
+      },
+      "packages": {
+        "@ethersproject/bytes": true
+      }
+    },
+    "ethers>@ethersproject/basex": {
+      "packages": {
+        "@ethersproject/bytes": true,
+        "ethers>@ethersproject/properties": true
       }
     },
     "@ethersproject/bignumber": {
       "packages": {
         "@ethersproject/bytes": true,
-        "bn.js": true,
-        "ethers>@ethersproject/logger": true
+        "ethers>@ethersproject/logger": true,
+        "bn.js": true
       }
     },
     "@ethersproject/bytes": {
@@ -230,17 +215,22 @@
         "ethers>@ethersproject/logger": true
       }
     },
+    "ethers>@ethersproject/constants": {
+      "packages": {
+        "@ethersproject/bignumber": true
+      }
+    },
     "@ethersproject/contracts": {
       "globals": {
         "setTimeout": true
       },
       "packages": {
         "@ethersproject/abi": true,
-        "@ethersproject/bignumber": true,
-        "@ethersproject/bytes": true,
         "ethers>@ethersproject/abstract-provider": true,
         "ethers>@ethersproject/abstract-signer": true,
         "ethers>@ethersproject/address": true,
+        "@ethersproject/bignumber": true,
+        "@ethersproject/bytes": true,
         "ethers>@ethersproject/logger": true,
         "ethers>@ethersproject/properties": true,
         "ethers>@ethersproject/transactions": true
@@ -248,10 +238,10 @@
     },
     "@ethersproject/hash": {
       "packages": {
-        "@ethersproject/bignumber": true,
-        "@ethersproject/bytes": true,
         "ethers>@ethersproject/address": true,
         "ethers>@ethersproject/base64": true,
+        "@ethersproject/bignumber": true,
+        "@ethersproject/bytes": true,
         "ethers>@ethersproject/keccak256": true,
         "ethers>@ethersproject/logger": true,
         "ethers>@ethersproject/properties": true,
@@ -260,9 +250,9 @@
     },
     "@ethersproject/hdnode": {
       "packages": {
+        "ethers>@ethersproject/basex": true,
         "@ethersproject/bignumber": true,
         "@ethersproject/bytes": true,
-        "ethers>@ethersproject/basex": true,
         "ethers>@ethersproject/logger": true,
         "ethers>@ethersproject/pbkdf2": true,
         "ethers>@ethersproject/properties": true,
@@ -273,586 +263,428 @@
         "ethers>@ethersproject/wordlists": true
       }
     },
-    "@ethersproject/providers": {
-      "globals": {
-        "WebSocket": true,
-        "clearInterval": true,
-        "clearTimeout": true,
-        "console.log": true,
-        "console.warn": true,
-        "setInterval": true,
-        "setTimeout": true
-      },
+    "ethers>@ethersproject/json-wallets": {
       "packages": {
-        "@ethersproject/bignumber": true,
+        "ethers>@ethersproject/address": true,
         "@ethersproject/bytes": true,
-        "@ethersproject/hash": true,
-        "@ethersproject/providers>@ethersproject/web": true,
-        "@ethersproject/providers>bech32": true,
-        "@metamask/test-bundler>@ethersproject/networks": true,
-        "ethers>@ethersproject/abstract-provider": true,
-        "ethers>@ethersproject/abstract-signer": true,
-        "ethers>@ethersproject/address": true,
-        "ethers>@ethersproject/base64": true,
-        "ethers>@ethersproject/basex": true,
-        "ethers>@ethersproject/constants": true,
+        "@ethersproject/hdnode": true,
+        "ethers>@ethersproject/keccak256": true,
         "ethers>@ethersproject/logger": true,
+        "ethers>@ethersproject/pbkdf2": true,
         "ethers>@ethersproject/properties": true,
         "ethers>@ethersproject/random": true,
-        "ethers>@ethersproject/sha2": true,
         "ethers>@ethersproject/strings": true,
-        "ethers>@ethersproject/transactions": true
-      }
-    },
-    "@ethersproject/providers>@ethersproject/random": {
-      "globals": {
-        "crypto.getRandomValues": true
-      }
-    },
-    "@ethersproject/providers>@ethersproject/web": {
-      "globals": {
-        "clearTimeout": true,
-        "fetch": true,
-        "setTimeout": true
-      },
-      "packages": {
-        "@ethersproject/bytes": true,
-        "ethers>@ethersproject/base64": true,
-        "ethers>@ethersproject/logger": true,
-        "ethers>@ethersproject/properties": true,
-        "ethers>@ethersproject/strings": true
+        "ethers>@ethersproject/transactions": true,
+        "ethers>@ethersproject/json-wallets>aes-js": true,
+        "ethers>@ethersproject/json-wallets>scrypt-js": true
       }
     },
-    "@ethersproject/wallet": {
+    "ethers>@ethersproject/keccak256": {
       "packages": {
         "@ethersproject/bytes": true,
-        "@ethersproject/hash": true,
-        "@ethersproject/hdnode": true,
-        "ethers>@ethersproject/abstract-provider": true,
-        "ethers>@ethersproject/abstract-signer": true,
-        "ethers>@ethersproject/address": true,
-        "ethers>@ethersproject/json-wallets": true,
-        "ethers>@ethersproject/keccak256": true,
-        "ethers>@ethersproject/logger": true,
-        "ethers>@ethersproject/properties": true,
-        "ethers>@ethersproject/random": true,
-        "ethers>@ethersproject/signing-key": true,
-        "ethers>@ethersproject/transactions": true
+        "@metamask/ethjs>js-sha3": true
       }
     },
-    "@keystonehq/bc-ur-registry-eth": {
-      "packages": {
-        "@ethereumjs/tx>@ethereumjs/util": true,
-        "@keystonehq/bc-ur-registry-eth>@keystonehq/bc-ur-registry": true,
-        "@metamask/eth-trezor-keyring>hdkey": true,
-        "browserify>buffer": true,
-        "uuid": true
+    "ethers>@ethersproject/logger": {
+      "globals": {
+        "console": true
       }
     },
-    "@keystonehq/bc-ur-registry-eth>@keystonehq/bc-ur-registry": {
-      "globals": {
-        "define": true
-      },
+    "ethers>@ethersproject/providers>@ethersproject/networks": {
       "packages": {
-        "@ngraveio/bc-ur": true,
-        "@swc/helpers>tslib": true,
-        "browserify>buffer": true,
-        "buffer": true,
-        "ethereumjs-util>ethereum-cryptography>bs58check": true
+        "ethers>@ethersproject/logger": true
       }
     },
-    "@keystonehq/metamask-airgapped-keyring": {
+    "@metamask/test-bundler>@ethersproject/networks": {
       "packages": {
-        "@ethereumjs/tx": true,
-        "@keystonehq/bc-ur-registry-eth": true,
-        "@keystonehq/metamask-airgapped-keyring>@keystonehq/base-eth-keyring": true,
-        "@keystonehq/metamask-airgapped-keyring>rlp": true,
-        "@metamask/obs-store": true,
-        "browserify>buffer": true,
-        "uuid": true,
-        "webpack>events": true
+        "ethers>@ethersproject/logger": true
       }
     },
-    "@keystonehq/metamask-airgapped-keyring>@keystonehq/base-eth-keyring": {
+    "ethers>@ethersproject/pbkdf2": {
       "packages": {
-        "@ethereumjs/tx": true,
-        "@ethereumjs/tx>@ethereumjs/util": true,
-        "@keystonehq/bc-ur-registry-eth": true,
-        "@metamask/eth-trezor-keyring>hdkey": true,
-        "browserify>buffer": true,
-        "eth-lattice-keyring>rlp": true,
-        "uuid": true
+        "@ethersproject/bytes": true,
+        "ethers>@ethersproject/sha2": true
       }
     },
-    "@keystonehq/metamask-airgapped-keyring>rlp": {
+    "ethers>@ethersproject/properties": {
       "packages": {
-        "bn.js": true,
-        "browserify>buffer": true
+        "ethers>@ethersproject/logger": true
       }
     },
-    "@lavamoat/lavadome-react": {
+    "@ethersproject/providers": {
       "globals": {
-        "Document.prototype": true,
-        "DocumentFragment.prototype": true,
-        "Element.prototype": true,
-        "Node.prototype": true,
+        "WebSocket": true,
+        "clearInterval": true,
+        "clearTimeout": true,
+        "console.log": true,
         "console.warn": true,
-        "document": true
+        "setInterval": true,
+        "setTimeout": true
       },
       "packages": {
-        "react": true
+        "ethers>@ethersproject/abstract-provider": true,
+        "ethers>@ethersproject/abstract-signer": true,
+        "ethers>@ethersproject/address": true,
+        "ethers>@ethersproject/base64": true,
+        "ethers>@ethersproject/basex": true,
+        "@ethersproject/bignumber": true,
+        "@ethersproject/bytes": true,
+        "ethers>@ethersproject/constants": true,
+        "@ethersproject/hash": true,
+        "ethers>@ethersproject/logger": true,
+        "@metamask/test-bundler>@ethersproject/networks": true,
+        "ethers>@ethersproject/properties": true,
+        "ethers>@ethersproject/random": true,
+        "ethers>@ethersproject/sha2": true,
+        "ethers>@ethersproject/strings": true,
+        "ethers>@ethersproject/transactions": true,
+        "@ethersproject/providers>@ethersproject/web": true,
+        "@ethersproject/providers>bech32": true
       }
     },
-    "@material-ui/core": {
+    "ethers>@ethersproject/providers": {
       "globals": {
-        "Image": true,
-        "_formatMuiErrorMessage": true,
-        "addEventListener": true,
+        "WebSocket": true,
         "clearInterval": true,
         "clearTimeout": true,
-        "console.error": true,
+        "console.log": 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
+        "ethers>@ethersproject/abstract-provider": true,
+        "ethers>@ethersproject/abstract-signer": true,
+        "ethers>@ethersproject/address": true,
+        "ethers>@ethersproject/base64": true,
+        "ethers>@ethersproject/basex": true,
+        "@ethersproject/bignumber": true,
+        "@ethersproject/bytes": true,
+        "ethers>@ethersproject/constants": true,
+        "@ethersproject/hash": true,
+        "ethers>@ethersproject/logger": true,
+        "ethers>@ethersproject/providers>@ethersproject/networks": true,
+        "ethers>@ethersproject/properties": true,
+        "ethers>@ethersproject/random": true,
+        "ethers>@ethersproject/sha2": true,
+        "ethers>@ethersproject/strings": true,
+        "ethers>@ethersproject/transactions": true,
+        "ethers>@ethersproject/providers>@ethersproject/web": true,
+        "ethers>@ethersproject/providers>bech32": true
       }
     },
-    "@material-ui/core>@material-ui/styles": {
+    "@ethersproject/providers>@ethersproject/random": {
       "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
+        "crypto.getRandomValues": true
       }
     },
-    "@material-ui/core>@material-ui/styles>jss": {
-      "globals": {
-        "CSS": true,
-        "document.createElement": true,
-        "document.querySelector": true
-      },
+    "ethers>@ethersproject/random": {
       "packages": {
-        "@babel/runtime": true,
-        "@material-ui/core>@material-ui/styles>jss>is-in-browser": true,
-        "react-router-dom>tiny-warning": true
+        "@ethersproject/bytes": true,
+        "ethers>@ethersproject/logger": true
       }
     },
-    "@material-ui/core>@material-ui/styles>jss-plugin-camel-case": {
+    "ethers>@ethersproject/rlp": {
       "packages": {
-        "@material-ui/core>@material-ui/styles>jss-plugin-camel-case>hyphenate-style-name": true
+        "@ethersproject/bytes": true,
+        "ethers>@ethersproject/logger": true
       }
     },
-    "@material-ui/core>@material-ui/styles>jss-plugin-default-unit": {
-      "globals": {
-        "CSS": true
-      },
+    "ethers>@ethersproject/sha2": {
       "packages": {
-        "@material-ui/core>@material-ui/styles>jss": true
+        "@ethersproject/bytes": true,
+        "ethers>@ethersproject/logger": true,
+        "ethers>@ethersproject/sha2>hash.js": true
       }
     },
-    "@material-ui/core>@material-ui/styles>jss-plugin-global": {
+    "ethers>@ethersproject/signing-key": {
       "packages": {
-        "@babel/runtime": true,
-        "@material-ui/core>@material-ui/styles>jss": true
+        "@ethersproject/bytes": true,
+        "ethers>@ethersproject/logger": true,
+        "ethers>@ethersproject/properties": true,
+        "ethers>@ethersproject/signing-key>elliptic": true
       }
     },
-    "@material-ui/core>@material-ui/styles>jss-plugin-nested": {
+    "ethers>@ethersproject/solidity": {
       "packages": {
-        "@babel/runtime": true,
-        "react-router-dom>tiny-warning": true
+        "@ethersproject/bignumber": true,
+        "@ethersproject/bytes": true,
+        "ethers>@ethersproject/keccak256": true,
+        "ethers>@ethersproject/logger": true,
+        "ethers>@ethersproject/sha2": true,
+        "ethers>@ethersproject/strings": true
       }
     },
-    "@material-ui/core>@material-ui/styles>jss-plugin-rule-value-function": {
+    "ethers>@ethersproject/strings": {
       "packages": {
-        "@material-ui/core>@material-ui/styles>jss": true,
-        "react-router-dom>tiny-warning": true
+        "@ethersproject/bytes": true,
+        "ethers>@ethersproject/constants": true,
+        "ethers>@ethersproject/logger": true
       }
     },
-    "@material-ui/core>@material-ui/styles>jss-plugin-vendor-prefixer": {
+    "ethers>@ethersproject/transactions": {
       "packages": {
-        "@material-ui/core>@material-ui/styles>jss": true,
-        "@material-ui/core>@material-ui/styles>jss-plugin-vendor-prefixer>css-vendor": true
+        "ethers>@ethersproject/address": true,
+        "@ethersproject/bignumber": true,
+        "@ethersproject/bytes": true,
+        "ethers>@ethersproject/constants": true,
+        "ethers>@ethersproject/keccak256": true,
+        "ethers>@ethersproject/logger": true,
+        "ethers>@ethersproject/properties": true,
+        "ethers>@ethersproject/rlp": true,
+        "ethers>@ethersproject/signing-key": true
       }
     },
-    "@material-ui/core>@material-ui/styles>jss-plugin-vendor-prefixer>css-vendor": {
-      "globals": {
-        "document.createElement": true,
-        "document.documentElement": true,
-        "getComputedStyle": true
-      },
+    "ethers>@ethersproject/units": {
       "packages": {
-        "@babel/runtime": true,
-        "@material-ui/core>@material-ui/styles>jss>is-in-browser": true
+        "@ethersproject/bignumber": true,
+        "ethers>@ethersproject/logger": true
       }
     },
-    "@material-ui/core>@material-ui/styles>jss>is-in-browser": {
-      "globals": {
-        "document": true
+    "@ethersproject/wallet": {
+      "packages": {
+        "ethers>@ethersproject/abstract-provider": true,
+        "ethers>@ethersproject/abstract-signer": true,
+        "ethers>@ethersproject/address": true,
+        "@ethersproject/bytes": true,
+        "@ethersproject/hash": true,
+        "@ethersproject/hdnode": true,
+        "ethers>@ethersproject/json-wallets": true,
+        "ethers>@ethersproject/keccak256": true,
+        "ethers>@ethersproject/logger": true,
+        "ethers>@ethersproject/properties": true,
+        "ethers>@ethersproject/random": true,
+        "ethers>@ethersproject/signing-key": true,
+        "ethers>@ethersproject/transactions": true
       }
     },
-    "@material-ui/core>@material-ui/system": {
+    "@ethersproject/providers>@ethersproject/web": {
       "globals": {
-        "console.error": true
+        "clearTimeout": true,
+        "fetch": true,
+        "setTimeout": 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
+        "ethers>@ethersproject/base64": true,
+        "@ethersproject/bytes": true,
+        "ethers>@ethersproject/logger": true,
+        "ethers>@ethersproject/properties": true,
+        "ethers>@ethersproject/strings": true
       }
     },
-    "@material-ui/core>popper.js": {
+    "ethers>@ethersproject/providers>@ethersproject/web": {
       "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,
+        "clearTimeout": true,
+        "fetch": true,
         "setTimeout": true
+      },
+      "packages": {
+        "ethers>@ethersproject/base64": true,
+        "@ethersproject/bytes": true,
+        "ethers>@ethersproject/logger": true,
+        "ethers>@ethersproject/properties": true,
+        "ethers>@ethersproject/strings": true
       }
     },
-    "@material-ui/core>react-transition-group": {
+    "ethers>@ethersproject/web": {
       "globals": {
-        "Element": true,
+        "clearTimeout": true,
+        "fetch": 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
+        "ethers>@ethersproject/base64": true,
+        "@ethersproject/bytes": true,
+        "ethers>@ethersproject/logger": true,
+        "ethers>@ethersproject/properties": true,
+        "ethers>@ethersproject/strings": true
       }
     },
-    "@metamask/abi-utils": {
+    "ethers>@ethersproject/wordlists": {
       "packages": {
-        "@metamask/abi-utils>@metamask/utils": true,
-        "@metamask/utils>@metamask/superstruct": true
+        "@ethersproject/bytes": true,
+        "@ethersproject/hash": true,
+        "ethers>@ethersproject/logger": true,
+        "ethers>@ethersproject/properties": true,
+        "ethers>@ethersproject/strings": true
       }
     },
-    "@metamask/abi-utils>@metamask/utils": {
+    "@metamask/notification-services-controller>firebase>@firebase/app": {
       "globals": {
-        "TextDecoder": true,
-        "TextEncoder": true
+        "FinalizationRegistry": true,
+        "console.warn": true
       },
       "packages": {
-        "@metamask/utils>@metamask/superstruct": true,
-        "@metamask/utils>@scure/base": true,
-        "@metamask/utils>pony-cause": true,
-        "@noble/hashes": true,
-        "browserify>buffer": true,
-        "nock>debug": true,
-        "semver": true
-      }
-    },
-    "@metamask/accounts-controller": {
-      "packages": {
-        "@ethereumjs/tx>@ethereumjs/util": true,
-        "@ethereumjs/tx>ethereum-cryptography": true,
-        "@metamask/base-controller": true,
-        "@metamask/eth-snap-keyring": true,
-        "@metamask/keyring-api": true,
-        "@metamask/keyring-controller": true,
-        "@metamask/utils": true,
-        "uuid": true
-      }
-    },
-    "@metamask/address-book-controller": {
-      "packages": {
-        "@metamask/base-controller": true,
-        "@metamask/controller-utils": true
+        "@metamask/notification-services-controller>firebase>@firebase/app>@firebase/component": true,
+        "@metamask/notification-services-controller>firebase>@firebase/app>@firebase/logger": true,
+        "@metamask/notification-services-controller>firebase>@firebase/util": true,
+        "@metamask/notification-services-controller>firebase>@firebase/app>idb": true
       }
     },
-    "@metamask/announcement-controller": {
+    "@metamask/notification-services-controller>firebase>@firebase/app>@firebase/component": {
       "packages": {
-        "@metamask/announcement-controller>@metamask/base-controller": true
+        "@metamask/notification-services-controller>firebase>@firebase/util": true
       }
     },
-    "@metamask/announcement-controller>@metamask/base-controller": {
+    "@metamask/notification-services-controller>firebase>@firebase/installations": {
       "globals": {
+        "BroadcastChannel": true,
+        "Headers": true,
+        "btoa": true,
+        "console.error": true,
+        "crypto": true,
+        "fetch": true,
+        "msCrypto": true,
+        "navigator.onLine": true,
         "setTimeout": true
       },
       "packages": {
-        "immer": true
+        "@metamask/notification-services-controller>firebase>@firebase/app": true,
+        "@metamask/notification-services-controller>firebase>@firebase/app>@firebase/component": true,
+        "@metamask/notification-services-controller>firebase>@firebase/util": true,
+        "@metamask/notification-services-controller>firebase>@firebase/app>idb": true
       }
     },
-    "@metamask/approval-controller": {
+    "@metamask/notification-services-controller>firebase>@firebase/app>@firebase/logger": {
       "globals": {
-        "console.info": true
+        "console": true
       },
       "packages": {
-        "@metamask/base-controller": true,
-        "@metamask/rpc-errors": true,
-        "nanoid": true
-      }
-    },
-    "@metamask/approval-controller>nanoid": {
-      "globals": {
-        "crypto.getRandomValues": true
+        "@swc/helpers>tslib": true
       }
     },
-    "@metamask/assets-controllers": {
+    "@metamask/notification-services-controller>firebase>@firebase/messaging": {
       "globals": {
-        "AbortController": true,
         "Headers": true,
+        "Notification.maxActions": true,
+        "Notification.permission": true,
+        "Notification.requestPermission": true,
+        "PushSubscription.prototype.hasOwnProperty": true,
+        "ServiceWorkerRegistration": true,
         "URL": true,
-        "URLSearchParams": true,
-        "clearInterval": true,
-        "clearTimeout": true,
-        "console.error": true,
-        "console.log": true,
-        "setInterval": true,
-        "setTimeout": true
-      },
-      "packages": {
-        "@ensdomains/content-hash>multicodec>uint8arrays>multiformats": true,
-        "@ethereumjs/tx>@ethereumjs/util": true,
-        "@ethersproject/bignumber": true,
-        "@ethersproject/contracts": true,
-        "@ethersproject/providers": true,
-        "@metamask/abi-utils": true,
-        "@metamask/base-controller": true,
-        "@metamask/contract-metadata": true,
-        "@metamask/controller-utils": true,
-        "@metamask/eth-query": true,
-        "@metamask/metamask-eth-abis": true,
-        "@metamask/name-controller>async-mutex": true,
-        "@metamask/polling-controller": true,
-        "@metamask/rpc-errors": true,
-        "@metamask/utils": true,
-        "bn.js": true,
-        "cockatiel": true,
-        "ethers>@ethersproject/address": true,
-        "lodash": true,
-        "single-call-balance-checker-abi": true,
-        "uuid": true
-      }
-    },
-    "@metamask/base-controller": {
-      "globals": {
+        "addEventListener": true,
+        "atob": true,
+        "btoa": true,
+        "clients.matchAll": true,
+        "clients.openWindow": true,
+        "console.warn": true,
+        "document": true,
+        "fetch": true,
+        "indexedDB": true,
+        "location.href": true,
+        "location.origin": true,
+        "navigator": true,
+        "origin.replace": true,
+        "registration.showNotification": true,
         "setTimeout": true
       },
       "packages": {
-        "immer": true
+        "@metamask/notification-services-controller>firebase>@firebase/app": true,
+        "@metamask/notification-services-controller>firebase>@firebase/app>@firebase/component": true,
+        "@metamask/notification-services-controller>firebase>@firebase/installations": true,
+        "@metamask/notification-services-controller>firebase>@firebase/util": true,
+        "@metamask/notification-services-controller>firebase>@firebase/app>idb": true,
+        "@swc/helpers>tslib": true
       }
     },
-    "@metamask/browser-passworder": {
+    "@metamask/notification-services-controller>firebase>@firebase/util": {
       "globals": {
-        "CryptoKey": true,
+        "atob": true,
+        "browser": true,
         "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
+        "chrome": true,
+        "console": true,
+        "document": true,
+        "indexedDB": true,
+        "navigator": true,
+        "process": true,
+        "self": true,
+        "setTimeout": true
       },
       "packages": {
-        "@metamask/browser-passworder>@metamask/utils": true,
-        "browserify>buffer": true
+        "process": true
       }
     },
-    "@metamask/browser-passworder>@metamask/utils": {
-      "globals": {
-        "TextDecoder": true,
-        "TextEncoder": true
-      },
+    "@keystonehq/metamask-airgapped-keyring>@keystonehq/base-eth-keyring": {
       "packages": {
-        "@metamask/utils>@metamask/superstruct": true,
-        "@metamask/utils>@scure/base": true,
-        "@metamask/utils>pony-cause": true,
-        "@noble/hashes": true,
+        "@ethereumjs/tx": true,
+        "@ethereumjs/tx>@ethereumjs/util": true,
+        "@keystonehq/bc-ur-registry-eth": true,
         "browserify>buffer": true,
-        "nock>debug": true,
-        "semver": true
+        "@metamask/eth-trezor-keyring>hdkey": true,
+        "eth-lattice-keyring>rlp": true,
+        "uuid": true
       }
     },
-    "@metamask/controller-utils": {
-      "globals": {
-        "URL": true,
-        "console.error": true,
-        "fetch": true,
-        "setTimeout": true
-      },
+    "@keystonehq/bc-ur-registry-eth": {
       "packages": {
         "@ethereumjs/tx>@ethereumjs/util": true,
-        "@metamask/controller-utils>@spruceid/siwe-parser": true,
-        "@metamask/ethjs>@metamask/ethjs-unit": true,
-        "@metamask/utils": true,
-        "bn.js": true,
+        "@keystonehq/bc-ur-registry-eth>@keystonehq/bc-ur-registry": true,
         "browserify>buffer": true,
-        "eslint>fast-deep-equal": true,
-        "eth-ens-namehash": true
+        "@metamask/eth-trezor-keyring>hdkey": true,
+        "uuid": true
       }
     },
-    "@metamask/controller-utils>@spruceid/siwe-parser": {
+    "@keystonehq/bc-ur-registry-eth>@keystonehq/bc-ur-registry": {
       "globals": {
-        "console.error": true,
-        "console.log": true
+        "define": true
       },
       "packages": {
-        "@metamask/controller-utils>@spruceid/siwe-parser>apg-js": true,
-        "@noble/hashes": true
-      }
-    },
-    "@metamask/controller-utils>@spruceid/siwe-parser>apg-js": {
-      "packages": {
-        "browserify>buffer": 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/ens-controller": {
-      "packages": {
-        "@ethersproject/providers": true,
-        "@metamask/base-controller": true,
-        "@metamask/controller-utils": true,
-        "@metamask/utils": true,
-        "punycode": true
+        "@ngraveio/bc-ur": true,
+        "ethereumjs-util>ethereum-cryptography>bs58check": true,
+        "buffer": true,
+        "browserify>buffer": true,
+        "@swc/helpers>tslib": true
       }
     },
-    "@metamask/eth-json-rpc-filters": {
-      "globals": {
-        "console.error": true
-      },
+    "@keystonehq/metamask-airgapped-keyring": {
       "packages": {
-        "@metamask/eth-query": true,
-        "@metamask/json-rpc-engine": true,
-        "@metamask/name-controller>async-mutex": true,
-        "@metamask/safe-event-emitter": true,
-        "pify": true
+        "@ethereumjs/tx": true,
+        "@keystonehq/metamask-airgapped-keyring>@keystonehq/base-eth-keyring": true,
+        "@keystonehq/bc-ur-registry-eth": true,
+        "@metamask/obs-store": true,
+        "browserify>buffer": true,
+        "webpack>events": true,
+        "@keystonehq/metamask-airgapped-keyring>rlp": true,
+        "uuid": true
       }
     },
-    "@metamask/eth-json-rpc-middleware": {
+    "chart.js>@kurkle/color": {
       "globals": {
-        "URL": true,
-        "console.error": true,
-        "setTimeout": true
-      },
-      "packages": {
-        "@metamask/eth-json-rpc-middleware>@metamask/utils": true,
-        "@metamask/eth-json-rpc-middleware>klona": true,
-        "@metamask/eth-json-rpc-middleware>safe-stable-stringify": true,
-        "@metamask/eth-sig-util": true,
-        "@metamask/json-rpc-engine": true,
-        "@metamask/rpc-errors": true
+        "define": true
       }
     },
-    "@metamask/eth-json-rpc-middleware>@metamask/utils": {
+    "@lavamoat/lavadome-react": {
       "globals": {
-        "TextDecoder": true,
-        "TextEncoder": true
+        "Document.prototype": true,
+        "DocumentFragment.prototype": true,
+        "Element.prototype": true,
+        "Node.prototype": true,
+        "console.warn": true,
+        "document": true
       },
       "packages": {
-        "@metamask/utils>@metamask/superstruct": true,
-        "@metamask/utils>@scure/base": true,
-        "@metamask/utils>pony-cause": true,
-        "@noble/hashes": true,
-        "browserify>buffer": true,
-        "nock>debug": true,
-        "semver": true
+        "react": true
       }
     },
-    "@metamask/eth-json-rpc-provider": {
+    "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth>@ledgerhq/domain-service": {
       "packages": {
-        "@metamask/json-rpc-engine": true,
-        "@metamask/rpc-errors": true,
-        "@metamask/safe-event-emitter": true,
-        "uuid": true
+        "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth>@ledgerhq/logs": true,
+        "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth>@ledgerhq/domain-service>axios": true
       }
     },
-    "@metamask/eth-ledger-bridge-keyring": {
+    "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth>@ledgerhq/errors": {
       "globals": {
-        "addEventListener": true,
-        "console.error": true,
-        "document.createElement": true,
-        "document.head.appendChild": true,
-        "fetch": true,
-        "removeEventListener": true
-      },
-      "packages": {
-        "@ethereumjs/tx": true,
-        "@ethereumjs/tx>@ethereumjs/util": true,
-        "@metamask/eth-ledger-bridge-keyring>@ethereumjs/rlp": true,
-        "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth": true,
-        "@metamask/eth-sig-util": true,
-        "@metamask/eth-trezor-keyring>hdkey": true,
-        "browserify>buffer": true,
-        "webpack>events": true
+        "console.warn": true
       }
     },
-    "@metamask/eth-ledger-bridge-keyring>@ethereumjs/rlp": {
-      "globals": {
-        "TextEncoder": true
+    "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth>@ledgerhq/evm-tools": {
+      "packages": {
+        "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth>@ledgerhq/cryptoassets-evm-signatures": true,
+        "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth>@ledgerhq/evm-tools>@ledgerhq/live-env": true,
+        "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth>@ledgerhq/evm-tools>axios": true,
+        "@metamask/ppom-validator>crypto-js": true,
+        "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth>@ledgerhq/evm-tools>ethers": true
       }
     },
     "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth": {
@@ -861,6 +693,7 @@
       },
       "packages": {
         "@ethersproject/abi": true,
+        "ethers>@ethersproject/rlp": true,
         "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth>@ledgerhq/cryptoassets-evm-signatures": true,
         "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth>@ledgerhq/domain-service": true,
         "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth>@ledgerhq/errors": true,
@@ -869,361 +702,451 @@
         "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth>axios": true,
         "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth>bignumber.js": true,
         "browserify>buffer": true,
-        "ethers>@ethersproject/rlp": true,
         "semver": true
       }
     },
-    "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth>@ledgerhq/domain-service": {
+    "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth>@ledgerhq/evm-tools>@ledgerhq/live-env": {
+      "globals": {
+        "console.warn": true
+      },
       "packages": {
-        "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth>@ledgerhq/domain-service>axios": true,
-        "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth>@ledgerhq/logs": true
+        "wait-on>rxjs": true
       }
     },
-    "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth>@ledgerhq/domain-service>axios": {
+    "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth>@ledgerhq/logs": {
       "globals": {
-        "Blob": true,
-        "FormData": true,
-        "URLSearchParams": true,
-        "XMLHttpRequest": true,
-        "btoa": true,
+        "__ledgerLogsListen": "write",
+        "console.error": true
+      }
+    },
+    "@material-ui/core": {
+      "globals": {
+        "Image": true,
+        "_formatMuiErrorMessage": true,
+        "addEventListener": true,
+        "clearInterval": true,
+        "clearTimeout": true,
+        "console.error": true,
         "console.warn": true,
         "document": true,
-        "location.href": 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": {
-        "axios>form-data": true,
-        "browserify>buffer": true,
-        "process": true
+        "@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,
+        "react-redux>hoist-non-react-statics": true,
+        "@material-ui/core>popper.js": true,
+        "prop-types": true,
+        "react": true,
+        "react-dom": true,
+        "prop-types>react-is": true,
+        "@material-ui/core>react-transition-group": true
       }
     },
-    "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth>@ledgerhq/errors": {
+    "@material-ui/core>@material-ui/styles": {
       "globals": {
-        "console.warn": true
-      }
-    },
-    "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth>@ledgerhq/evm-tools": {
+        "console.error": true,
+        "console.warn": true,
+        "document.createComment": true,
+        "document.head": true
+      },
       "packages": {
-        "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth>@ledgerhq/cryptoassets-evm-signatures": true,
-        "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth>@ledgerhq/evm-tools>@ledgerhq/live-env": true,
-        "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth>@ledgerhq/evm-tools>axios": true,
-        "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth>@ledgerhq/evm-tools>ethers": true,
-        "@metamask/ppom-validator>crypto-js": true
+        "@babel/runtime": true,
+        "@material-ui/core>@material-ui/utils": true,
+        "@material-ui/core>clsx": true,
+        "react-redux>hoist-non-react-statics": 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/styles>jss": true,
+        "prop-types": true,
+        "react": true
       }
     },
-    "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth>@ledgerhq/evm-tools>@ledgerhq/live-env": {
+    "@material-ui/core>@material-ui/system": {
       "globals": {
-        "console.warn": true
+        "console.error": true
       },
       "packages": {
-        "wait-on>rxjs": true
+        "@babel/runtime": true,
+        "@material-ui/core>@material-ui/utils": true,
+        "prop-types": true
       }
     },
-    "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth>@ledgerhq/evm-tools>axios": {
-      "globals": {
-        "Blob": true,
-        "FormData": true,
-        "URLSearchParams": true,
-        "XMLHttpRequest": true,
-        "btoa": true,
-        "console.warn": true,
-        "document": true,
-        "location.href": true,
-        "navigator": true,
-        "setTimeout": true
-      },
+    "@material-ui/core>@material-ui/utils": {
       "packages": {
-        "axios>form-data": true,
-        "browserify>buffer": true,
-        "process": true
+        "@babel/runtime": true,
+        "prop-types": true,
+        "prop-types>react-is": true
       }
     },
-    "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth>@ledgerhq/evm-tools>ethers": {
+    "@metamask/abi-utils": {
       "packages": {
-        "@ethersproject/abi": true,
-        "@ethersproject/bignumber": true,
-        "@ethersproject/bytes": true,
-        "@ethersproject/contracts": true,
-        "@ethersproject/hash": true,
-        "@ethersproject/hdnode": true,
-        "@ethersproject/providers": true,
-        "@ethersproject/providers>@ethersproject/web": true,
-        "@ethersproject/wallet": true,
-        "ethers>@ethersproject/abstract-signer": true,
-        "ethers>@ethersproject/address": true,
-        "ethers>@ethersproject/base64": true,
-        "ethers>@ethersproject/basex": true,
-        "ethers>@ethersproject/constants": true,
-        "ethers>@ethersproject/json-wallets": true,
-        "ethers>@ethersproject/keccak256": true,
-        "ethers>@ethersproject/logger": true,
-        "ethers>@ethersproject/properties": true,
-        "ethers>@ethersproject/random": true,
-        "ethers>@ethersproject/rlp": true,
-        "ethers>@ethersproject/sha2": true,
-        "ethers>@ethersproject/signing-key": true,
-        "ethers>@ethersproject/solidity": true,
-        "ethers>@ethersproject/strings": true,
-        "ethers>@ethersproject/transactions": true,
-        "ethers>@ethersproject/units": true,
-        "ethers>@ethersproject/wordlists": true
+        "@metamask/utils>@metamask/superstruct": true,
+        "@metamask/abi-utils>@metamask/utils": true
       }
     },
-    "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth>@ledgerhq/logs": {
-      "globals": {
-        "__ledgerLogsListen": "write",
-        "console.error": true
+    "@metamask/accounts-controller": {
+      "packages": {
+        "@ethereumjs/tx>@ethereumjs/util": true,
+        "@metamask/base-controller": true,
+        "@metamask/eth-snap-keyring": true,
+        "@metamask/keyring-api": true,
+        "@metamask/keyring-controller": true,
+        "@metamask/utils": true,
+        "@ethereumjs/tx>ethereum-cryptography": true,
+        "uuid": true
       }
     },
-    "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth>axios": {
-      "globals": {
-        "Blob": true,
-        "FormData": true,
-        "URLSearchParams": true,
-        "XMLHttpRequest": true,
-        "btoa": true,
-        "console.warn": true,
-        "document": true,
-        "location.href": true,
-        "navigator": true,
-        "setTimeout": true
-      },
+    "@metamask/address-book-controller": {
       "packages": {
-        "axios>form-data": true,
-        "browserify>buffer": true,
-        "process": true
+        "@metamask/base-controller": true,
+        "@metamask/controller-utils": true
       }
     },
-    "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth>bignumber.js": {
-      "globals": {
-        "crypto": true,
-        "define": true
+    "@metamask/announcement-controller": {
+      "packages": {
+        "@metamask/announcement-controller>@metamask/base-controller": true
       }
     },
-    "@metamask/eth-query": {
+    "@metamask/approval-controller": {
+      "globals": {
+        "console.info": true
+      },
       "packages": {
-        "@metamask/eth-query>json-rpc-random-id": true,
-        "watchify>xtend": true
+        "@metamask/base-controller": true,
+        "@metamask/rpc-errors": true,
+        "nanoid": true
       }
     },
-    "@metamask/eth-sig-util": {
+    "@metamask/assets-controllers": {
+      "globals": {
+        "AbortController": true,
+        "Headers": true,
+        "URL": true,
+        "URLSearchParams": true,
+        "clearInterval": true,
+        "clearTimeout": true,
+        "console.error": true,
+        "console.log": true,
+        "setInterval": true,
+        "setTimeout": true
+      },
       "packages": {
         "@ethereumjs/tx>@ethereumjs/util": true,
-        "@ethereumjs/tx>ethereum-cryptography": true,
+        "ethers>@ethersproject/address": true,
+        "@ethersproject/bignumber": true,
+        "@ethersproject/contracts": true,
+        "@ethersproject/providers": true,
         "@metamask/abi-utils": true,
-        "@metamask/eth-sig-util>@metamask/utils": true,
-        "@metamask/eth-sig-util>tweetnacl": true,
-        "@metamask/utils>@scure/base": true,
-        "browserify>buffer": true
+        "@metamask/base-controller": true,
+        "@metamask/contract-metadata": true,
+        "@metamask/controller-utils": true,
+        "@metamask/eth-query": true,
+        "@metamask/metamask-eth-abis": true,
+        "@metamask/polling-controller": true,
+        "@metamask/rpc-errors": true,
+        "@metamask/utils": true,
+        "@metamask/name-controller>async-mutex": true,
+        "bn.js": true,
+        "cockatiel": true,
+        "lodash": true,
+        "@ensdomains/content-hash>multicodec>uint8arrays>multiformats": true,
+        "single-call-balance-checker-abi": true,
+        "uuid": true
       }
     },
-    "@metamask/eth-sig-util>@metamask/utils": {
+    "@metamask/base-controller": {
       "globals": {
-        "TextDecoder": true,
-        "TextEncoder": true
+        "setTimeout": true
       },
       "packages": {
-        "@metamask/utils>@metamask/superstruct": true,
-        "@metamask/utils>@scure/base": true,
-        "@metamask/utils>pony-cause": true,
-        "@noble/hashes": true,
-        "browserify>buffer": true,
-        "nock>debug": true,
-        "semver": true
+        "immer": true
       }
     },
-    "@metamask/eth-sig-util>tweetnacl": {
+    "@metamask/announcement-controller>@metamask/base-controller": {
       "globals": {
-        "crypto": true,
-        "msCrypto": true,
-        "nacl": "write"
+        "setTimeout": true
+      },
+      "packages": {
+        "immer": true
+      }
+    },
+    "@metamask/name-controller>@metamask/base-controller": {
+      "globals": {
+        "setTimeout": true
       },
       "packages": {
-        "browserify>browser-resolve": true
+        "immer": true
       }
     },
-    "@metamask/eth-snap-keyring": {
+    "@metamask/rate-limit-controller>@metamask/base-controller": {
       "globals": {
-        "URL": true,
-        "console.error": true
+        "setTimeout": true
       },
       "packages": {
-        "@ethereumjs/tx": true,
-        "@metamask/eth-snap-keyring>@metamask/eth-sig-util": true,
-        "@metamask/eth-snap-keyring>@metamask/keyring-internal-snap-client": true,
-        "@metamask/eth-snap-keyring>@metamask/utils": true,
-        "@metamask/eth-snap-keyring>uuid": true,
-        "@metamask/keyring-api": true,
-        "@metamask/utils>@metamask/superstruct": true,
-        "webpack>events": true
+        "immer": true
       }
     },
-    "@metamask/eth-snap-keyring>@metamask/eth-sig-util": {
+    "@metamask/browser-passworder": {
+      "globals": {
+        "CryptoKey": true,
+        "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": {
-        "@ethereumjs/tx>@ethereumjs/util": true,
-        "@ethereumjs/tx>ethereum-cryptography": true,
-        "@metamask/abi-utils": true,
-        "@metamask/eth-sig-util>tweetnacl": true,
-        "@metamask/eth-snap-keyring>@metamask/utils": true,
-        "@metamask/utils>@scure/base": true,
+        "@metamask/browser-passworder>@metamask/utils": true,
         "browserify>buffer": true
       }
     },
-    "@metamask/eth-snap-keyring>@metamask/keyring-internal-snap-client": {
-      "packages": {
-        "@metamask/keyring-snap-client": true
+    "eth-keyring-controller>@metamask/browser-passworder": {
+      "globals": {
+        "crypto": true
       }
     },
-    "@metamask/eth-snap-keyring>@metamask/utils": {
+    "@metamask/controller-utils": {
       "globals": {
-        "TextDecoder": true,
-        "TextEncoder": true
+        "URL": true,
+        "console.error": true,
+        "fetch": true,
+        "setTimeout": true
       },
       "packages": {
-        "@metamask/utils>@metamask/superstruct": true,
-        "@metamask/utils>@scure/base": true,
-        "@metamask/utils>pony-cause": true,
-        "@noble/hashes": true,
+        "@ethereumjs/tx>@ethereumjs/util": true,
+        "@metamask/ethjs>@metamask/ethjs-unit": true,
+        "@metamask/utils": true,
+        "@metamask/controller-utils>@spruceid/siwe-parser": true,
+        "bn.js": true,
         "browserify>buffer": true,
-        "nock>debug": true,
-        "semver": true
+        "eth-ens-namehash": true,
+        "eslint>fast-deep-equal": true
       }
     },
-    "@metamask/eth-snap-keyring>uuid": {
-      "globals": {
-        "crypto": true
+    "@metamask/ens-controller": {
+      "packages": {
+        "@ethersproject/providers": true,
+        "@metamask/base-controller": true,
+        "@metamask/controller-utils": true,
+        "@metamask/utils": true,
+        "punycode": true
       }
     },
-    "@metamask/eth-token-tracker": {
+    "@metamask/eth-token-tracker>@metamask/eth-block-tracker": {
       "globals": {
-        "console.warn": true
+        "clearTimeout": true,
+        "console.error": true,
+        "setTimeout": true
       },
       "packages": {
-        "@babel/runtime": true,
-        "@metamask/eth-token-tracker>@metamask/eth-block-tracker": true,
-        "@metamask/eth-token-tracker>deep-equal": true,
-        "@metamask/ethjs-contract": true,
-        "@metamask/ethjs-query": true,
         "@metamask/safe-event-emitter": true,
-        "bn.js": true,
-        "human-standard-token-abi": true
+        "@metamask/eth-token-tracker>@metamask/eth-block-tracker>@metamask/utils": true,
+        "@metamask/eth-query>json-rpc-random-id": true,
+        "pify": true
       }
     },
-    "@metamask/eth-token-tracker>@metamask/eth-block-tracker": {
+    "@metamask/network-controller>@metamask/eth-block-tracker": {
       "globals": {
         "clearTimeout": true,
         "console.error": true,
         "setTimeout": true
       },
       "packages": {
-        "@metamask/eth-query>json-rpc-random-id": true,
-        "@metamask/eth-token-tracker>@metamask/eth-block-tracker>@metamask/utils": true,
         "@metamask/safe-event-emitter": true,
-        "pify": true
+        "@metamask/network-controller>@metamask/eth-block-tracker>@metamask/utils": true,
+        "@metamask/eth-query>json-rpc-random-id": true
       }
     },
-    "@metamask/eth-token-tracker>@metamask/eth-block-tracker>@metamask/utils": {
+    "@metamask/keyring-controller>@metamask/eth-hd-keyring": {
       "globals": {
-        "TextDecoder": true,
         "TextEncoder": true
       },
       "packages": {
-        "@metamask/utils>@metamask/superstruct": true,
-        "@metamask/utils>@scure/base": true,
-        "@metamask/utils>pony-cause": true,
-        "@noble/hashes": true,
+        "@ethereumjs/tx>@ethereumjs/util": true,
+        "@metamask/eth-sig-util": true,
+        "@metamask/scure-bip39": true,
+        "@metamask/keyring-controller>@metamask/eth-hd-keyring>@metamask/utils": true,
         "browserify>buffer": true,
-        "nock>debug": true,
-        "semver": true
+        "@ethereumjs/tx>ethereum-cryptography": true
       }
     },
-    "@metamask/eth-token-tracker>deep-equal": {
+    "@metamask/eth-json-rpc-filters": {
+      "globals": {
+        "console.error": true
+      },
       "packages": {
-        "@lavamoat/lavapack>json-stable-stringify>isarray": true,
-        "@lavamoat/lavapack>json-stable-stringify>object-keys": true,
-        "@metamask/eth-token-tracker>deep-equal>es-get-iterator": true,
-        "@metamask/eth-token-tracker>deep-equal>is-date-object": true,
-        "@metamask/eth-token-tracker>deep-equal>which-boxed-primitive": true,
-        "@metamask/eth-token-tracker>deep-equal>which-collection": true,
-        "@ngraveio/bc-ur>assert>object-is": true,
-        "browserify>util>is-arguments": true,
-        "browserify>util>which-typed-array": true,
-        "gulp>vinyl-fs>object.assign": true,
-        "string.prototype.matchall>call-bind": true,
-        "string.prototype.matchall>es-abstract>array-buffer-byte-length": true,
-        "string.prototype.matchall>es-abstract>is-array-buffer": true,
-        "string.prototype.matchall>es-abstract>is-regex": true,
-        "string.prototype.matchall>es-abstract>is-shared-array-buffer": true,
-        "string.prototype.matchall>get-intrinsic": true,
-        "string.prototype.matchall>regexp.prototype.flags": true,
-        "string.prototype.matchall>side-channel": true
+        "@metamask/eth-query": true,
+        "@metamask/json-rpc-engine": true,
+        "@metamask/safe-event-emitter": true,
+        "@metamask/name-controller>async-mutex": true,
+        "pify": true
       }
     },
-    "@metamask/eth-token-tracker>deep-equal>es-get-iterator": {
+    "@metamask/network-controller>@metamask/eth-json-rpc-infura": {
+      "globals": {
+        "fetch": true,
+        "setTimeout": true
+      },
       "packages": {
-        "@lavamoat/lavapack>json-stable-stringify>isarray": true,
-        "@metamask/eth-token-tracker>deep-equal>es-get-iterator>is-map": true,
-        "@metamask/eth-token-tracker>deep-equal>es-get-iterator>is-set": true,
-        "@metamask/eth-token-tracker>deep-equal>es-get-iterator>stop-iteration-iterator": true,
-        "browserify>util>is-arguments": true,
-        "eslint-plugin-react>array-includes>is-string": true,
-        "process": true,
-        "string.prototype.matchall>call-bind": true,
-        "string.prototype.matchall>get-intrinsic": true,
-        "string.prototype.matchall>has-symbols": true
+        "@metamask/eth-json-rpc-provider": true,
+        "@metamask/json-rpc-engine": true,
+        "@metamask/rpc-errors": true,
+        "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/utils": true
       }
     },
-    "@metamask/eth-token-tracker>deep-equal>es-get-iterator>stop-iteration-iterator": {
+    "@metamask/eth-json-rpc-middleware": {
       "globals": {
-        "StopIteration": true
+        "URL": true,
+        "console.error": true,
+        "setTimeout": true
       },
       "packages": {
-        "string.prototype.matchall>internal-slot": true
+        "@metamask/eth-sig-util": true,
+        "@metamask/json-rpc-engine": true,
+        "@metamask/rpc-errors": true,
+        "@metamask/eth-json-rpc-middleware>@metamask/utils": true,
+        "@metamask/eth-json-rpc-middleware>klona": true,
+        "@metamask/eth-json-rpc-middleware>safe-stable-stringify": true
       }
     },
-    "@metamask/eth-token-tracker>deep-equal>is-date-object": {
+    "@metamask/eth-json-rpc-provider": {
       "packages": {
-        "koa>is-generator-function>has-tostringtag": true
+        "@metamask/json-rpc-engine": true,
+        "@metamask/rpc-errors": true,
+        "@metamask/safe-event-emitter": true,
+        "uuid": true
       }
     },
-    "@metamask/eth-token-tracker>deep-equal>which-boxed-primitive": {
+    "@metamask/eth-ledger-bridge-keyring": {
+      "globals": {
+        "addEventListener": true,
+        "console.error": true,
+        "document.createElement": true,
+        "document.head.appendChild": true,
+        "fetch": true,
+        "removeEventListener": true
+      },
       "packages": {
-        "@metamask/eth-token-tracker>deep-equal>which-boxed-primitive>is-bigint": true,
-        "@metamask/eth-token-tracker>deep-equal>which-boxed-primitive>is-boolean-object": true,
-        "@metamask/eth-token-tracker>deep-equal>which-boxed-primitive>is-number-object": true,
-        "eslint-plugin-react>array-includes>is-string": true,
-        "string.prototype.matchall>es-abstract>es-to-primitive>is-symbol": true
+        "@metamask/eth-ledger-bridge-keyring>@ethereumjs/rlp": true,
+        "@ethereumjs/tx": true,
+        "@ethereumjs/tx>@ethereumjs/util": true,
+        "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth": true,
+        "@metamask/eth-sig-util": true,
+        "browserify>buffer": true,
+        "webpack>events": true,
+        "@metamask/eth-trezor-keyring>hdkey": true
       }
     },
-    "@metamask/eth-token-tracker>deep-equal>which-boxed-primitive>is-bigint": {
+    "@metamask/eth-query": {
       "packages": {
-        "string.prototype.matchall>es-abstract>unbox-primitive>has-bigints": true
+        "@metamask/eth-query>json-rpc-random-id": true,
+        "watchify>xtend": true
       }
     },
-    "@metamask/eth-token-tracker>deep-equal>which-boxed-primitive>is-boolean-object": {
+    "@metamask/eth-sig-util": {
       "packages": {
-        "koa>is-generator-function>has-tostringtag": true,
-        "string.prototype.matchall>call-bind": true
+        "@ethereumjs/tx>@ethereumjs/util": true,
+        "@metamask/abi-utils": true,
+        "@metamask/eth-sig-util>@metamask/utils": true,
+        "@metamask/utils>@scure/base": true,
+        "browserify>buffer": true,
+        "@ethereumjs/tx>ethereum-cryptography": true,
+        "@metamask/eth-sig-util>tweetnacl": true
       }
     },
-    "@metamask/eth-token-tracker>deep-equal>which-boxed-primitive>is-number-object": {
+    "@metamask/eth-snap-keyring>@metamask/eth-sig-util": {
       "packages": {
-        "koa>is-generator-function>has-tostringtag": true
+        "@ethereumjs/tx>@ethereumjs/util": true,
+        "@metamask/abi-utils": true,
+        "@metamask/eth-snap-keyring>@metamask/utils": true,
+        "@metamask/utils>@scure/base": true,
+        "browserify>buffer": true,
+        "@ethereumjs/tx>ethereum-cryptography": true,
+        "@metamask/eth-sig-util>tweetnacl": true
       }
     },
-    "@metamask/eth-token-tracker>deep-equal>which-collection": {
+    "@metamask/keyring-controller>@metamask/eth-sig-util": {
       "packages": {
-        "@metamask/eth-token-tracker>deep-equal>es-get-iterator>is-map": true,
-        "@metamask/eth-token-tracker>deep-equal>es-get-iterator>is-set": true,
-        "@metamask/eth-token-tracker>deep-equal>which-collection>is-weakmap": true,
-        "@metamask/eth-token-tracker>deep-equal>which-collection>is-weakset": true
+        "@ethereumjs/tx>@ethereumjs/util": true,
+        "@metamask/abi-utils": true,
+        "@metamask/keyring-controller>@metamask/eth-sig-util>@metamask/utils": true,
+        "@metamask/utils>@scure/base": true,
+        "browserify>buffer": true,
+        "@ethereumjs/tx>ethereum-cryptography": true,
+        "@metamask/eth-sig-util>tweetnacl": true
+      }
+    },
+    "@metamask/signature-controller>@metamask/eth-sig-util": {
+      "packages": {
+        "@ethereumjs/tx>@ethereumjs/util": true,
+        "@metamask/abi-utils": true,
+        "@metamask/signature-controller>@metamask/eth-sig-util>@metamask/utils": true,
+        "@metamask/utils>@scure/base": true,
+        "browserify>buffer": true,
+        "@ethereumjs/tx>ethereum-cryptography": true,
+        "@metamask/eth-sig-util>tweetnacl": true
+      }
+    },
+    "@metamask/keyring-controller>@metamask/eth-simple-keyring": {
+      "packages": {
+        "@ethereumjs/tx>@ethereumjs/util": true,
+        "@metamask/eth-sig-util": true,
+        "@metamask/keyring-controller>@metamask/eth-simple-keyring>@metamask/utils": true,
+        "browserify>buffer": true,
+        "@ethereumjs/tx>ethereum-cryptography": true,
+        "crypto-browserify>randombytes": true
+      }
+    },
+    "@metamask/eth-snap-keyring": {
+      "globals": {
+        "URL": true,
+        "console.error": true
+      },
+      "packages": {
+        "@ethereumjs/tx": true,
+        "@metamask/eth-snap-keyring>@metamask/eth-sig-util": true,
+        "@metamask/keyring-api": true,
+        "@metamask/eth-snap-keyring>@metamask/keyring-internal-snap-client": true,
+        "@metamask/utils>@metamask/superstruct": true,
+        "@metamask/eth-snap-keyring>@metamask/utils": true,
+        "webpack>events": true,
+        "@metamask/eth-snap-keyring>uuid": true
       }
     },
-    "@metamask/eth-token-tracker>deep-equal>which-collection>is-weakset": {
+    "@metamask/eth-token-tracker": {
+      "globals": {
+        "console.warn": true
+      },
       "packages": {
-        "string.prototype.matchall>call-bind": true,
-        "string.prototype.matchall>get-intrinsic": true
+        "@babel/runtime": true,
+        "@metamask/eth-token-tracker>@metamask/eth-block-tracker": true,
+        "@metamask/ethjs-contract": true,
+        "@metamask/ethjs-query": true,
+        "@metamask/safe-event-emitter": true,
+        "bn.js": true,
+        "@metamask/eth-token-tracker>deep-equal": true,
+        "human-standard-token-abi": true
       }
     },
     "@metamask/eth-trezor-keyring": {
@@ -1234,26 +1157,10 @@
         "@ethereumjs/tx": true,
         "@ethereumjs/tx>@ethereumjs/util": true,
         "@metamask/eth-trezor-keyring>@trezor/connect-plugin-ethereum": true,
-        "@metamask/eth-trezor-keyring>hdkey": true,
         "@trezor/connect-web": true,
         "browserify>buffer": true,
-        "webpack>events": true
-      }
-    },
-    "@metamask/eth-trezor-keyring>@trezor/connect-plugin-ethereum": {
-      "packages": {
-        "@metamask/eth-sig-util": true,
-        "@swc/helpers>tslib": true
-      }
-    },
-    "@metamask/eth-trezor-keyring>hdkey": {
-      "packages": {
-        "browserify>assert": true,
-        "crypto-browserify": true,
-        "ethereumjs-util>create-hash>ripemd160": true,
-        "ethereumjs-util>ethereum-cryptography>bs58check": true,
-        "ganache>secp256k1": true,
-        "koa>content-disposition>safe-buffer": true
+        "webpack>events": true,
+        "@metamask/eth-trezor-keyring>hdkey": true
       }
     },
     "@metamask/etherscan-link": {
@@ -1268,16 +1175,16 @@
       },
       "packages": {
         "@metamask/ethjs-contract": true,
-        "@metamask/ethjs-query": true,
         "@metamask/ethjs>@metamask/ethjs-filter": true,
         "@metamask/ethjs>@metamask/ethjs-provider-http": true,
+        "@metamask/ethjs-query": true,
         "@metamask/ethjs>@metamask/ethjs-unit": true,
         "@metamask/ethjs>@metamask/ethjs-util": true,
         "@metamask/ethjs>@metamask/number-to-bn": true,
-        "@metamask/ethjs>ethjs-abi": true,
-        "@metamask/ethjs>js-sha3": true,
         "bn.js": true,
-        "browserify>buffer": true
+        "browserify>buffer": true,
+        "@metamask/ethjs>ethjs-abi": true,
+        "@metamask/ethjs>js-sha3": true
       }
     },
     "@metamask/ethjs-contract": {
@@ -1290,43 +1197,38 @@
         "promise-to-callback": true
       }
     },
-    "@metamask/ethjs-query": {
+    "@metamask/ethjs>@metamask/ethjs-filter": {
       "globals": {
-        "console": true
-      },
-      "packages": {
-        "@metamask/ethjs-query>@metamask/ethjs-format": true,
-        "@metamask/ethjs-query>@metamask/ethjs-rpc": true,
-        "promise-to-callback": true
+        "clearInterval": true,
+        "setInterval": true
       }
     },
     "@metamask/ethjs-query>@metamask/ethjs-format": {
       "packages": {
-        "@metamask/ethjs-query>@metamask/ethjs-format>ethjs-schema": true,
         "@metamask/ethjs>@metamask/ethjs-util": true,
-        "@metamask/ethjs>@metamask/ethjs-util>strip-hex-prefix": true,
-        "@metamask/ethjs>@metamask/number-to-bn": true
+        "@metamask/ethjs>@metamask/number-to-bn": true,
+        "@metamask/ethjs-query>@metamask/ethjs-format>ethjs-schema": true,
+        "@metamask/ethjs>@metamask/ethjs-util>strip-hex-prefix": true
       }
     },
-    "@metamask/ethjs-query>@metamask/ethjs-rpc": {
+    "@metamask/ethjs>@metamask/ethjs-provider-http": {
       "packages": {
-        "promise-to-callback": true
+        "@metamask/ethjs>@metamask/ethjs-provider-http>xhr2": true
       }
     },
-    "@metamask/ethjs>@metamask/ethjs-filter": {
+    "@metamask/ethjs-query": {
       "globals": {
-        "clearInterval": true,
-        "setInterval": true
-      }
-    },
-    "@metamask/ethjs>@metamask/ethjs-provider-http": {
+        "console": true
+      },
       "packages": {
-        "@metamask/ethjs>@metamask/ethjs-provider-http>xhr2": true
+        "@metamask/ethjs-query>@metamask/ethjs-format": true,
+        "@metamask/ethjs-query>@metamask/ethjs-rpc": true,
+        "promise-to-callback": true
       }
     },
-    "@metamask/ethjs>@metamask/ethjs-provider-http>xhr2": {
-      "globals": {
-        "XMLHttpRequest": true
+    "@metamask/ethjs-query>@metamask/ethjs-rpc": {
+      "packages": {
+        "promise-to-callback": true
       }
     },
     "@metamask/ethjs>@metamask/ethjs-unit": {
@@ -1337,42 +1239,9 @@
     },
     "@metamask/ethjs>@metamask/ethjs-util": {
       "packages": {
+        "browserify>buffer": true,
         "@metamask/ethjs>@metamask/ethjs-util>is-hex-prefixed": true,
-        "@metamask/ethjs>@metamask/ethjs-util>strip-hex-prefix": true,
-        "browserify>buffer": true
-      }
-    },
-    "@metamask/ethjs>@metamask/ethjs-util>strip-hex-prefix": {
-      "packages": {
-        "@metamask/ethjs>@metamask/ethjs-util>is-hex-prefixed": true
-      }
-    },
-    "@metamask/ethjs>@metamask/number-to-bn": {
-      "packages": {
-        "@metamask/ethjs>@metamask/ethjs-util>strip-hex-prefix": true,
-        "bn.js": true
-      }
-    },
-    "@metamask/ethjs>ethjs-abi": {
-      "packages": {
-        "@metamask/ethjs>ethjs-abi>number-to-bn": true,
-        "@metamask/ethjs>js-sha3": true,
-        "bn.js": true,
-        "browserify>buffer": true
-      }
-    },
-    "@metamask/ethjs>ethjs-abi>number-to-bn": {
-      "packages": {
-        "@metamask/ethjs>@metamask/ethjs-util>strip-hex-prefix": true,
-        "bn.js": true
-      }
-    },
-    "@metamask/ethjs>js-sha3": {
-      "globals": {
-        "define": true
-      },
-      "packages": {
-        "process": true
+        "@metamask/ethjs>@metamask/ethjs-util>strip-hex-prefix": true
       }
     },
     "@metamask/gas-fee-controller": {
@@ -1399,28 +1268,6 @@
         "@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/json-rpc-engine": {
       "packages": {
         "@metamask/rpc-errors": true,
@@ -1433,206 +1280,65 @@
         "console.warn": true,
         "setTimeout": true
       },
-      "packages": {
-        "@metamask/safe-event-emitter": true,
-        "@metamask/utils": true,
-        "readable-stream": true
-      }
-    },
-    "@metamask/keyring-api": {
-      "packages": {
-        "@metamask/keyring-api>@metamask/keyring-utils": true,
-        "@metamask/keyring-api>@metamask/utils": true,
-        "@metamask/keyring-api>bech32": true,
-        "@metamask/utils>@metamask/superstruct": true
-      }
-    },
-    "@metamask/keyring-api>@metamask/keyring-utils": {
-      "globals": {
-        "URL": true
-      },
-      "packages": {
-        "@metamask/keyring-api>@metamask/keyring-utils>@metamask/utils": true,
-        "@metamask/utils>@metamask/superstruct": true
-      }
-    },
-    "@metamask/keyring-api>@metamask/keyring-utils>@metamask/utils": {
-      "globals": {
-        "TextDecoder": true,
-        "TextEncoder": true
-      },
-      "packages": {
-        "@metamask/utils>@metamask/superstruct": true,
-        "@metamask/utils>@scure/base": true,
-        "@metamask/utils>pony-cause": true,
-        "@noble/hashes": true,
-        "browserify>buffer": true,
-        "nock>debug": true,
-        "semver": true
-      }
-    },
-    "@metamask/keyring-api>@metamask/utils": {
-      "globals": {
-        "TextDecoder": true,
-        "TextEncoder": true
-      },
-      "packages": {
-        "@metamask/utils>@metamask/superstruct": true,
-        "@metamask/utils>@scure/base": true,
-        "@metamask/utils>pony-cause": true,
-        "@noble/hashes": true,
-        "browserify>buffer": true,
-        "nock>debug": true,
-        "semver": true
-      }
-    },
-    "@metamask/keyring-controller": {
-      "packages": {
-        "@ethereumjs/tx>@ethereumjs/util": true,
-        "@metamask/base-controller": true,
-        "@metamask/browser-passworder": true,
-        "@metamask/keyring-controller>@metamask/eth-hd-keyring": true,
-        "@metamask/keyring-controller>@metamask/eth-sig-util": true,
-        "@metamask/keyring-controller>@metamask/eth-simple-keyring": true,
-        "@metamask/keyring-controller>ethereumjs-wallet": true,
-        "@metamask/name-controller>async-mutex": true,
-        "@metamask/utils": true
-      }
-    },
-    "@metamask/keyring-controller>@metamask/eth-hd-keyring": {
-      "globals": {
-        "TextEncoder": true
-      },
-      "packages": {
-        "@ethereumjs/tx>@ethereumjs/util": true,
-        "@ethereumjs/tx>ethereum-cryptography": true,
-        "@metamask/eth-sig-util": true,
-        "@metamask/keyring-controller>@metamask/eth-hd-keyring>@metamask/utils": true,
-        "@metamask/scure-bip39": true,
-        "browserify>buffer": true
-      }
-    },
-    "@metamask/keyring-controller>@metamask/eth-hd-keyring>@metamask/utils": {
-      "globals": {
-        "TextDecoder": true,
-        "TextEncoder": true
-      },
-      "packages": {
-        "@metamask/utils>@metamask/superstruct": true,
-        "@metamask/utils>@scure/base": true,
-        "@metamask/utils>pony-cause": true,
-        "@noble/hashes": true,
-        "browserify>buffer": true,
-        "nock>debug": true,
-        "semver": true
-      }
-    },
-    "@metamask/keyring-controller>@metamask/eth-sig-util": {
-      "packages": {
-        "@ethereumjs/tx>@ethereumjs/util": true,
-        "@ethereumjs/tx>ethereum-cryptography": true,
-        "@metamask/abi-utils": true,
-        "@metamask/eth-sig-util>tweetnacl": true,
-        "@metamask/keyring-controller>@metamask/eth-sig-util>@metamask/utils": true,
-        "@metamask/utils>@scure/base": true,
-        "browserify>buffer": true
-      }
-    },
-    "@metamask/keyring-controller>@metamask/eth-sig-util>@metamask/utils": {
-      "globals": {
-        "TextDecoder": true,
-        "TextEncoder": true
-      },
-      "packages": {
-        "@metamask/utils>@metamask/superstruct": true,
-        "@metamask/utils>@scure/base": true,
-        "@metamask/utils>pony-cause": true,
-        "@noble/hashes": true,
-        "browserify>buffer": true,
-        "nock>debug": true,
-        "semver": true
-      }
-    },
-    "@metamask/keyring-controller>@metamask/eth-simple-keyring": {
-      "packages": {
-        "@ethereumjs/tx>@ethereumjs/util": true,
-        "@ethereumjs/tx>ethereum-cryptography": true,
-        "@metamask/eth-sig-util": true,
-        "@metamask/keyring-controller>@metamask/eth-simple-keyring>@metamask/utils": true,
-        "browserify>buffer": true,
-        "crypto-browserify>randombytes": true
+      "packages": {
+        "@metamask/safe-event-emitter": true,
+        "@metamask/utils": true,
+        "readable-stream": true
       }
     },
-    "@metamask/keyring-controller>@metamask/eth-simple-keyring>@metamask/utils": {
+    "@metamask/snaps-sdk>@metamask/key-tree": {
       "globals": {
-        "TextDecoder": true,
-        "TextEncoder": true
+        "crypto.subtle": true
       },
       "packages": {
-        "@metamask/utils>@metamask/superstruct": true,
-        "@metamask/utils>@scure/base": true,
-        "@metamask/utils>pony-cause": true,
+        "@metamask/scure-bip39": true,
+        "@metamask/utils": true,
+        "@ethereumjs/tx>ethereum-cryptography>@noble/curves": true,
         "@noble/hashes": true,
-        "browserify>buffer": true,
-        "nock>debug": true,
-        "semver": true
-      }
-    },
-    "@metamask/keyring-controller>ethereumjs-wallet": {
-      "packages": {
-        "@metamask/keyring-controller>ethereumjs-wallet>ethereum-cryptography": true,
-        "@metamask/keyring-controller>ethereumjs-wallet>ethereumjs-util": true,
-        "@metamask/keyring-controller>ethereumjs-wallet>utf8": true,
-        "browserify>buffer": true,
-        "crypto-browserify": true,
-        "crypto-browserify>randombytes": true,
-        "eth-lattice-keyring>gridplus-sdk>aes-js": true,
-        "ethereumjs-util>ethereum-cryptography>bs58check": true,
-        "ethers>@ethersproject/json-wallets>scrypt-js": true,
-        "uuid": true
+        "@metamask/utils>@scure/base": true
       }
     },
-    "@metamask/keyring-controller>ethereumjs-wallet>ethereum-cryptography": {
+    "@metamask/keyring-api": {
       "packages": {
-        "browserify>assert": true,
-        "browserify>buffer": true,
-        "crypto-browserify>create-hmac": true,
-        "crypto-browserify>randombytes": true,
-        "ethereumjs-util>ethereum-cryptography>bs58check": true,
-        "ethereumjs-util>ethereum-cryptography>keccak": true,
-        "ethers>@ethersproject/sha2>hash.js": true,
-        "ganache>secp256k1": true,
-        "koa>content-disposition>safe-buffer": true
+        "@metamask/keyring-api>@metamask/keyring-utils": true,
+        "@metamask/utils>@metamask/superstruct": true,
+        "@metamask/keyring-api>@metamask/utils": true,
+        "@metamask/keyring-api>bech32": true
       }
     },
-    "@metamask/keyring-controller>ethereumjs-wallet>ethereumjs-util": {
+    "@metamask/keyring-controller": {
       "packages": {
-        "@metamask/keyring-controller>ethereumjs-wallet>ethereum-cryptography": true,
-        "@metamask/keyring-controller>ethereumjs-wallet>ethereumjs-util>rlp": true,
-        "bn.js": true,
-        "browserify>assert": true,
-        "browserify>buffer": true,
-        "browserify>insert-module-globals>is-buffer": true,
-        "ethereumjs-util>create-hash": true
+        "@ethereumjs/tx>@ethereumjs/util": true,
+        "@metamask/base-controller": true,
+        "@metamask/browser-passworder": true,
+        "@metamask/keyring-controller>@metamask/eth-hd-keyring": true,
+        "@metamask/keyring-controller>@metamask/eth-sig-util": true,
+        "@metamask/keyring-controller>@metamask/eth-simple-keyring": true,
+        "@metamask/utils": true,
+        "@metamask/name-controller>async-mutex": true,
+        "@metamask/keyring-controller>ethereumjs-wallet": true
       }
     },
-    "@metamask/keyring-controller>ethereumjs-wallet>ethereumjs-util>rlp": {
+    "@metamask/eth-snap-keyring>@metamask/keyring-internal-snap-client": {
       "packages": {
-        "bn.js": true,
-        "browserify>buffer": true
+        "@metamask/keyring-snap-client": true
       }
     },
     "@metamask/keyring-snap-client": {
       "packages": {
         "@metamask/keyring-api": true,
         "@metamask/keyring-api>@metamask/keyring-utils": true,
-        "@metamask/keyring-snap-client>uuid": true,
-        "@metamask/utils>@metamask/superstruct": true
+        "@metamask/utils>@metamask/superstruct": true,
+        "@metamask/keyring-snap-client>uuid": true
       }
     },
-    "@metamask/keyring-snap-client>uuid": {
+    "@metamask/keyring-api>@metamask/keyring-utils": {
       "globals": {
-        "crypto": true
+        "URL": true
+      },
+      "packages": {
+        "@metamask/utils>@metamask/superstruct": true,
+        "@metamask/keyring-api>@metamask/keyring-utils>@metamask/utils": true
       }
     },
     "@metamask/logging-controller": {
@@ -1661,13 +1367,8 @@
         "@metamask/controller-utils": true,
         "@metamask/utils": true,
         "browserify>buffer": true,
-        "uuid": true,
-        "webpack>events": true
-      }
-    },
-    "@metamask/message-manager>jsonschema": {
-      "packages": {
-        "browserify>url": true
+        "webpack>events": true,
+        "uuid": true
       }
     },
     "@metamask/name-controller": {
@@ -1675,44 +1376,12 @@
         "fetch": true
       },
       "packages": {
-        "@metamask/controller-utils": true,
         "@metamask/name-controller>@metamask/base-controller": true,
+        "@metamask/controller-utils": true,
         "@metamask/name-controller>@metamask/utils": true,
         "@metamask/name-controller>async-mutex": true
       }
     },
-    "@metamask/name-controller>@metamask/base-controller": {
-      "globals": {
-        "setTimeout": true
-      },
-      "packages": {
-        "immer": true
-      }
-    },
-    "@metamask/name-controller>@metamask/utils": {
-      "globals": {
-        "TextDecoder": true,
-        "TextEncoder": true
-      },
-      "packages": {
-        "@metamask/utils>@metamask/superstruct": true,
-        "@metamask/utils>@scure/base": true,
-        "@metamask/utils>pony-cause": true,
-        "@noble/hashes": true,
-        "browserify>buffer": true,
-        "nock>debug": true,
-        "semver": true
-      }
-    },
-    "@metamask/name-controller>async-mutex": {
-      "globals": {
-        "clearTimeout": true,
-        "setTimeout": true
-      },
-      "packages": {
-        "@swc/helpers>tslib": true
-      }
-    },
     "@metamask/network-controller": {
       "globals": {
         "btoa": true,
@@ -1722,224 +1391,52 @@
       "packages": {
         "@metamask/base-controller": true,
         "@metamask/controller-utils": true,
+        "@metamask/network-controller>@metamask/eth-block-tracker": true,
+        "@metamask/network-controller>@metamask/eth-json-rpc-infura": true,
         "@metamask/eth-json-rpc-middleware": true,
         "@metamask/eth-json-rpc-provider": true,
         "@metamask/eth-query": true,
         "@metamask/json-rpc-engine": true,
-        "@metamask/network-controller>@metamask/eth-block-tracker": true,
-        "@metamask/network-controller>@metamask/eth-json-rpc-infura": true,
-        "@metamask/network-controller>@metamask/swappable-obj-proxy": true,
         "@metamask/rpc-errors": true,
+        "@metamask/network-controller>@metamask/swappable-obj-proxy": true,
         "@metamask/utils": true,
         "eslint>fast-deep-equal": true,
-        "reselect": true,
-        "uri-js": true,
-        "uuid": true
-      }
-    },
-    "@metamask/network-controller>@metamask/eth-block-tracker": {
-      "globals": {
-        "clearTimeout": true,
-        "console.error": true,
-        "setTimeout": true
-      },
-      "packages": {
-        "@metamask/eth-query>json-rpc-random-id": true,
-        "@metamask/network-controller>@metamask/eth-block-tracker>@metamask/utils": true,
-        "@metamask/safe-event-emitter": true
-      }
-    },
-    "@metamask/network-controller>@metamask/eth-block-tracker>@metamask/utils": {
-      "globals": {
-        "TextDecoder": true,
-        "TextEncoder": true
-      },
-      "packages": {
-        "@metamask/utils>@metamask/superstruct": true,
-        "@metamask/utils>@scure/base": true,
-        "@metamask/utils>pony-cause": true,
-        "@noble/hashes": true,
-        "browserify>buffer": true,
-        "nock>debug": true,
-        "semver": true
-      }
-    },
-    "@metamask/network-controller>@metamask/eth-json-rpc-infura": {
-      "globals": {
-        "fetch": true,
-        "setTimeout": true
-      },
-      "packages": {
-        "@metamask/eth-json-rpc-provider": true,
-        "@metamask/json-rpc-engine": true,
-        "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/utils": true,
-        "@metamask/rpc-errors": true
-      }
-    },
-    "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/utils": {
-      "globals": {
-        "TextDecoder": true,
-        "TextEncoder": true
-      },
-      "packages": {
-        "@metamask/utils>@metamask/superstruct": true,
-        "@metamask/utils>@scure/base": true,
-        "@metamask/utils>pony-cause": true,
-        "@noble/hashes": true,
-        "browserify>buffer": true,
-        "nock>debug": true,
-        "semver": true
-      }
-    },
-    "@metamask/notification-controller>nanoid": {
-      "globals": {
-        "crypto.getRandomValues": true
-      }
-    },
-    "@metamask/notification-services-controller": {
-      "globals": {
-        "Intl.NumberFormat": true,
-        "addEventListener": true,
-        "fetch": true,
-        "registration": true,
-        "removeEventListener": true
-      },
-      "packages": {
-        "@metamask/base-controller": true,
-        "@metamask/controller-utils": true,
-        "@metamask/notification-services-controller>@contentful/rich-text-html-renderer": true,
-        "@metamask/notification-services-controller>bignumber.js": true,
-        "@metamask/notification-services-controller>firebase": true,
-        "@metamask/profile-sync-controller": true,
-        "@metamask/utils": true,
-        "loglevel": true,
-        "uuid": true
-      }
-    },
-    "@metamask/notification-services-controller>@contentful/rich-text-html-renderer": {
-      "globals": {
-        "SuppressedError": true
-      }
-    },
-    "@metamask/notification-services-controller>bignumber.js": {
-      "globals": {
-        "crypto": true,
-        "define": true
-      }
-    },
-    "@metamask/notification-services-controller>firebase": {
-      "packages": {
-        "@metamask/notification-services-controller>firebase>@firebase/app": true,
-        "@metamask/notification-services-controller>firebase>@firebase/messaging": true
-      }
-    },
-    "@metamask/notification-services-controller>firebase>@firebase/app": {
-      "globals": {
-        "FinalizationRegistry": true,
-        "console.warn": true
-      },
-      "packages": {
-        "@metamask/notification-services-controller>firebase>@firebase/app>@firebase/component": true,
-        "@metamask/notification-services-controller>firebase>@firebase/app>@firebase/logger": true,
-        "@metamask/notification-services-controller>firebase>@firebase/app>idb": true,
-        "@metamask/notification-services-controller>firebase>@firebase/util": true
-      }
-    },
-    "@metamask/notification-services-controller>firebase>@firebase/app>@firebase/component": {
-      "packages": {
-        "@metamask/notification-services-controller>firebase>@firebase/util": true
-      }
-    },
-    "@metamask/notification-services-controller>firebase>@firebase/app>@firebase/logger": {
-      "globals": {
-        "console": true
-      },
-      "packages": {
-        "@swc/helpers>tslib": true
-      }
-    },
-    "@metamask/notification-services-controller>firebase>@firebase/app>idb": {
-      "globals": {
-        "DOMException": true,
-        "IDBCursor": true,
-        "IDBDatabase": true,
-        "IDBIndex": true,
-        "IDBObjectStore": true,
-        "IDBRequest": true,
-        "IDBTransaction": true,
-        "indexedDB.deleteDatabase": true,
-        "indexedDB.open": true
+        "reselect": true,
+        "uri-js": true,
+        "uuid": true
       }
     },
-    "@metamask/notification-services-controller>firebase>@firebase/installations": {
-      "globals": {
-        "BroadcastChannel": true,
-        "Headers": true,
-        "btoa": true,
-        "console.error": true,
-        "crypto": true,
-        "fetch": true,
-        "msCrypto": true,
-        "navigator.onLine": true,
-        "setTimeout": true
-      },
+    "@metamask/transaction-controller>@metamask/nonce-tracker": {
       "packages": {
-        "@metamask/notification-services-controller>firebase>@firebase/app": true,
-        "@metamask/notification-services-controller>firebase>@firebase/app>@firebase/component": true,
-        "@metamask/notification-services-controller>firebase>@firebase/app>idb": true,
-        "@metamask/notification-services-controller>firebase>@firebase/util": true
+        "@ethersproject/providers": true,
+        "browserify>assert": true,
+        "@metamask/transaction-controller>@metamask/nonce-tracker>async-mutex": true
       }
     },
-    "@metamask/notification-services-controller>firebase>@firebase/messaging": {
+    "@metamask/notification-services-controller": {
       "globals": {
-        "Headers": true,
-        "Notification.maxActions": true,
-        "Notification.permission": true,
-        "Notification.requestPermission": true,
-        "PushSubscription.prototype.hasOwnProperty": true,
-        "ServiceWorkerRegistration": true,
-        "URL": true,
+        "Intl.NumberFormat": true,
         "addEventListener": true,
-        "atob": true,
-        "btoa": true,
-        "clients.matchAll": true,
-        "clients.openWindow": true,
-        "console.warn": true,
-        "document": true,
         "fetch": true,
-        "indexedDB": true,
-        "location.href": true,
-        "location.origin": true,
-        "navigator": true,
-        "origin.replace": true,
-        "registration.showNotification": true,
-        "setTimeout": true
+        "registration": true,
+        "removeEventListener": true
       },
       "packages": {
-        "@metamask/notification-services-controller>firebase>@firebase/app": true,
-        "@metamask/notification-services-controller>firebase>@firebase/app>@firebase/component": true,
-        "@metamask/notification-services-controller>firebase>@firebase/app>idb": true,
-        "@metamask/notification-services-controller>firebase>@firebase/installations": true,
-        "@metamask/notification-services-controller>firebase>@firebase/util": true,
-        "@swc/helpers>tslib": true
+        "@metamask/notification-services-controller>@contentful/rich-text-html-renderer": true,
+        "@metamask/base-controller": true,
+        "@metamask/controller-utils": true,
+        "@metamask/profile-sync-controller": true,
+        "@metamask/utils": true,
+        "@metamask/notification-services-controller>bignumber.js": true,
+        "@metamask/notification-services-controller>firebase": true,
+        "loglevel": true,
+        "uuid": true
       }
     },
-    "@metamask/notification-services-controller>firebase>@firebase/util": {
-      "globals": {
-        "atob": true,
-        "browser": true,
-        "btoa": true,
-        "chrome": true,
-        "console": true,
-        "document": true,
-        "indexedDB": true,
-        "navigator": true,
-        "process": true,
-        "self": true,
-        "setTimeout": true
-      },
+    "@metamask/ethjs>@metamask/number-to-bn": {
       "packages": {
-        "process": true
+        "bn.js": true,
+        "@metamask/ethjs>@metamask/ethjs-util>strip-hex-prefix": true
       }
     },
     "@metamask/object-multiplex": {
@@ -1951,11 +1448,6 @@
         "readable-stream": true
       }
     },
-    "@metamask/object-multiplex>once": {
-      "packages": {
-        "@metamask/object-multiplex>once>wrappy": true
-      }
-    },
     "@metamask/obs-store": {
       "packages": {
         "@metamask/safe-event-emitter": true,
@@ -1977,32 +1469,12 @@
         "nanoid": true
       }
     },
-    "@metamask/permission-controller>nanoid": {
-      "globals": {
-        "crypto.getRandomValues": true
-      }
-    },
     "@metamask/permission-log-controller": {
       "packages": {
         "@metamask/base-controller": true,
         "@metamask/permission-log-controller>@metamask/utils": true
       }
     },
-    "@metamask/permission-log-controller>@metamask/utils": {
-      "globals": {
-        "TextDecoder": true,
-        "TextEncoder": true
-      },
-      "packages": {
-        "@metamask/utils>@metamask/superstruct": true,
-        "@metamask/utils>@scure/base": true,
-        "@metamask/utils>pony-cause": true,
-        "@noble/hashes": true,
-        "browserify>buffer": true,
-        "nock>debug": true,
-        "semver": true
-      }
-    },
     "@metamask/phishing-controller": {
       "globals": {
         "TextEncoder": true,
@@ -2011,12 +1483,12 @@
         "fetch": true
       },
       "packages": {
-        "@ethereumjs/tx>ethereum-cryptography": true,
         "@metamask/base-controller": true,
         "@metamask/controller-utils": true,
         "@noble/hashes": true,
-        "punycode": true,
-        "webpack-cli>fastest-levenshtein": true
+        "@ethereumjs/tx>ethereum-cryptography": true,
+        "webpack-cli>fastest-levenshtein": true,
+        "punycode": true
       }
     },
     "@metamask/polling-controller": {
@@ -2047,21 +1519,6 @@
         "readable-stream": true
       }
     },
-    "@metamask/post-message-stream>@metamask/utils": {
-      "globals": {
-        "TextDecoder": true,
-        "TextEncoder": true
-      },
-      "packages": {
-        "@metamask/utils>@metamask/superstruct": true,
-        "@metamask/utils>@scure/base": true,
-        "@metamask/utils>pony-cause": true,
-        "@noble/hashes": true,
-        "browserify>buffer": true,
-        "nock>debug": true,
-        "semver": true
-      }
-    },
     "@metamask/ppom-validator": {
       "globals": {
         "URL": true,
@@ -2071,48 +1528,11 @@
       "packages": {
         "@metamask/base-controller": true,
         "@metamask/controller-utils": true,
-        "@metamask/eth-query>json-rpc-random-id": true,
+        "await-semaphore": true,
+        "browserify>buffer": true,
         "@metamask/ppom-validator>crypto-js": true,
         "@metamask/ppom-validator>elliptic": true,
-        "await-semaphore": true,
-        "browserify>buffer": true
-      }
-    },
-    "@metamask/ppom-validator>crypto-js": {
-      "globals": {
-        "crypto": true,
-        "define": true,
-        "msCrypto": true
-      },
-      "packages": {
-        "browserify>browser-resolve": true
-      }
-    },
-    "@metamask/ppom-validator>elliptic": {
-      "packages": {
-        "@metamask/ppom-validator>elliptic>brorand": true,
-        "@metamask/ppom-validator>elliptic>hmac-drbg": true,
-        "@metamask/ppom-validator>elliptic>minimalistic-assert": true,
-        "@metamask/ppom-validator>elliptic>minimalistic-crypto-utils": true,
-        "bn.js": true,
-        "ethers>@ethersproject/sha2>hash.js": true,
-        "pumpify>inherits": true
-      }
-    },
-    "@metamask/ppom-validator>elliptic>brorand": {
-      "globals": {
-        "crypto": true,
-        "msCrypto": true
-      },
-      "packages": {
-        "browserify>browser-resolve": true
-      }
-    },
-    "@metamask/ppom-validator>elliptic>hmac-drbg": {
-      "packages": {
-        "@metamask/ppom-validator>elliptic>minimalistic-assert": true,
-        "@metamask/ppom-validator>elliptic>minimalistic-crypto-utils": true,
-        "ethers>@ethersproject/sha2>hash.js": true
+        "@metamask/eth-query>json-rpc-random-id": true
       }
     },
     "@metamask/preferences-controller": {
@@ -2142,55 +1562,10 @@
         "@metamask/keyring-controller": true,
         "@metamask/network-controller": true,
         "@metamask/profile-sync-controller>@noble/ciphers": true,
-        "@metamask/profile-sync-controller>siwe": true,
         "@noble/hashes": true,
         "browserify>buffer": true,
-        "loglevel": true
-      }
-    },
-    "@metamask/profile-sync-controller>@noble/ciphers": {
-      "globals": {
-        "TextDecoder": true,
-        "TextEncoder": true,
-        "crypto": true
-      }
-    },
-    "@metamask/profile-sync-controller>siwe": {
-      "globals": {
-        "console.error": true,
-        "console.warn": true
-      },
-      "packages": {
-        "@metamask/controller-utils>@spruceid/siwe-parser>valid-url": true,
-        "@metamask/profile-sync-controller>siwe>@spruceid/siwe-parser": true,
-        "@metamask/profile-sync-controller>siwe>@stablelib/random": true,
-        "ethers": true
-      }
-    },
-    "@metamask/profile-sync-controller>siwe>@spruceid/siwe-parser": {
-      "globals": {
-        "console.error": true,
-        "console.log": true
-      },
-      "packages": {
-        "@metamask/controller-utils>@spruceid/siwe-parser>apg-js": true,
-        "@noble/hashes": true
-      }
-    },
-    "@metamask/profile-sync-controller>siwe>@stablelib/random": {
-      "globals": {
-        "crypto": true,
-        "msCrypto": true
-      },
-      "packages": {
-        "@metamask/profile-sync-controller>siwe>@stablelib/random>@stablelib/binary": true,
-        "@metamask/profile-sync-controller>siwe>@stablelib/random>@stablelib/wipe": true,
-        "browserify>browser-resolve": true
-      }
-    },
-    "@metamask/profile-sync-controller>siwe>@stablelib/random>@stablelib/binary": {
-      "packages": {
-        "@metamask/profile-sync-controller>siwe>@stablelib/random>@stablelib/binary>@stablelib/int": true
+        "loglevel": true,
+        "@metamask/profile-sync-controller>siwe": true
       }
     },
     "@metamask/queued-request-controller": {
@@ -2203,57 +1578,13 @@
       }
     },
     "@metamask/rate-limit-controller": {
-      "globals": {
-        "setTimeout": true
-      },
-      "packages": {
-        "@metamask/rate-limit-controller>@metamask/base-controller": true,
-        "@metamask/rate-limit-controller>@metamask/rpc-errors": true,
-        "@metamask/rate-limit-controller>@metamask/utils": true
-      }
-    },
-    "@metamask/rate-limit-controller>@metamask/base-controller": {
-      "globals": {
-        "setTimeout": true
-      },
-      "packages": {
-        "immer": true
-      }
-    },
-    "@metamask/rate-limit-controller>@metamask/rpc-errors": {
-      "packages": {
-        "@metamask/rate-limit-controller>@metamask/rpc-errors>@metamask/utils": true,
-        "@metamask/rpc-errors>fast-safe-stringify": true
-      }
-    },
-    "@metamask/rate-limit-controller>@metamask/rpc-errors>@metamask/utils": {
-      "globals": {
-        "TextDecoder": true,
-        "TextEncoder": true
-      },
-      "packages": {
-        "@metamask/utils>@metamask/superstruct": true,
-        "@metamask/utils>@scure/base": true,
-        "@metamask/utils>pony-cause": true,
-        "@noble/hashes": true,
-        "browserify>buffer": true,
-        "nock>debug": true,
-        "semver": true
-      }
-    },
-    "@metamask/rate-limit-controller>@metamask/utils": {
-      "globals": {
-        "TextDecoder": true,
-        "TextEncoder": true
-      },
-      "packages": {
-        "@metamask/utils>@metamask/superstruct": true,
-        "@metamask/utils>@scure/base": true,
-        "@metamask/utils>pony-cause": true,
-        "@noble/hashes": true,
-        "browserify>buffer": true,
-        "nock>debug": true,
-        "semver": true
+      "globals": {
+        "setTimeout": true
+      },
+      "packages": {
+        "@metamask/rate-limit-controller>@metamask/base-controller": true,
+        "@metamask/rate-limit-controller>@metamask/rpc-errors": true,
+        "@metamask/rate-limit-controller>@metamask/utils": true
       }
     },
     "@metamask/remote-feature-flag-controller": {
@@ -2264,18 +1595,14 @@
     },
     "@metamask/rpc-errors": {
       "packages": {
-        "@metamask/rpc-errors>fast-safe-stringify": true,
-        "@metamask/utils": true
-      }
-    },
-    "@metamask/rpc-methods-flask>nanoid": {
-      "globals": {
-        "crypto.getRandomValues": true
+        "@metamask/utils": true,
+        "@metamask/rpc-errors>fast-safe-stringify": true
       }
     },
-    "@metamask/rpc-methods>nanoid": {
-      "globals": {
-        "crypto.getRandomValues": true
+    "@metamask/rate-limit-controller>@metamask/rpc-errors": {
+      "packages": {
+        "@metamask/rate-limit-controller>@metamask/rpc-errors>@metamask/utils": true,
+        "@metamask/rpc-errors>fast-safe-stringify": true
       }
     },
     "@metamask/safe-event-emitter": {
@@ -2295,12 +1622,6 @@
         "@metamask/utils>@scure/base": true
       }
     },
-    "@metamask/scure-bip39>@noble/hashes": {
-      "globals": {
-        "TextEncoder": true,
-        "crypto": true
-      }
-    },
     "@metamask/selected-network-controller": {
       "packages": {
         "@metamask/base-controller": true,
@@ -2314,40 +1635,14 @@
       "packages": {
         "@metamask/base-controller": true,
         "@metamask/controller-utils": true,
+        "@metamask/signature-controller>@metamask/eth-sig-util": true,
         "@metamask/keyring-controller": true,
         "@metamask/logging-controller": true,
-        "@metamask/message-manager>jsonschema": true,
-        "@metamask/signature-controller>@metamask/eth-sig-util": true,
         "@metamask/utils": true,
         "browserify>buffer": true,
-        "uuid": true,
-        "webpack>events": true
-      }
-    },
-    "@metamask/signature-controller>@metamask/eth-sig-util": {
-      "packages": {
-        "@ethereumjs/tx>@ethereumjs/util": true,
-        "@ethereumjs/tx>ethereum-cryptography": true,
-        "@metamask/abi-utils": true,
-        "@metamask/eth-sig-util>tweetnacl": true,
-        "@metamask/signature-controller>@metamask/eth-sig-util>@metamask/utils": true,
-        "@metamask/utils>@scure/base": true,
-        "browserify>buffer": true
-      }
-    },
-    "@metamask/signature-controller>@metamask/eth-sig-util>@metamask/utils": {
-      "globals": {
-        "TextDecoder": true,
-        "TextEncoder": true
-      },
-      "packages": {
-        "@metamask/utils>@metamask/superstruct": true,
-        "@metamask/utils>@scure/base": true,
-        "@metamask/utils>pony-cause": true,
-        "@noble/hashes": true,
-        "browserify>buffer": true,
-        "nock>debug": true,
-        "semver": true
+        "webpack>events": true,
+        "@metamask/message-manager>jsonschema": true,
+        "uuid": true
       }
     },
     "@metamask/smart-transactions-controller": {
@@ -2360,60 +1655,19 @@
         "setInterval": true
       },
       "packages": {
+        "@metamask/smart-transactions-controller>@ethereumjs/tx": true,
+        "@metamask/smart-transactions-controller>@ethereumjs/util": true,
         "@ethersproject/bytes": true,
         "@metamask/controller-utils": true,
         "@metamask/eth-query": true,
         "@metamask/polling-controller": true,
-        "@metamask/smart-transactions-controller>@ethereumjs/tx": true,
-        "@metamask/smart-transactions-controller>@ethereumjs/util": true,
-        "@metamask/smart-transactions-controller>bignumber.js": true,
         "@metamask/transaction-controller": true,
+        "@metamask/smart-transactions-controller>bignumber.js": true,
         "browserify>buffer": true,
         "fast-json-patch": true,
         "lodash": true
       }
     },
-    "@metamask/smart-transactions-controller>@ethereumjs/tx": {
-      "packages": {
-        "@ethereumjs/tx>ethereum-cryptography": true,
-        "@metamask/smart-transactions-controller>@ethereumjs/tx>@ethereumjs/common": true,
-        "@metamask/smart-transactions-controller>@ethereumjs/tx>@ethereumjs/rlp": true,
-        "@metamask/smart-transactions-controller>@ethereumjs/util": true
-      }
-    },
-    "@metamask/smart-transactions-controller>@ethereumjs/tx>@ethereumjs/common": {
-      "packages": {
-        "@metamask/smart-transactions-controller>@ethereumjs/util": true,
-        "webpack>events": true
-      }
-    },
-    "@metamask/smart-transactions-controller>@ethereumjs/tx>@ethereumjs/rlp": {
-      "globals": {
-        "TextEncoder": true
-      }
-    },
-    "@metamask/smart-transactions-controller>@ethereumjs/util": {
-      "globals": {
-        "console.warn": true,
-        "fetch": true
-      },
-      "packages": {
-        "@ethereumjs/tx>ethereum-cryptography": true,
-        "@metamask/smart-transactions-controller>@ethereumjs/tx>@ethereumjs/rlp": true,
-        "webpack>events": 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": {
         "DecompressionStream": true,
@@ -2431,337 +1685,498 @@
         "@metamask/permission-controller": true,
         "@metamask/post-message-stream": true,
         "@metamask/rpc-errors": true,
-        "@metamask/snaps-controllers>@xstate/fsm": true,
-        "@metamask/snaps-controllers>concat-stream": true,
-        "@metamask/snaps-controllers>get-npm-tarball-url": true,
-        "@metamask/snaps-controllers>readable-web-to-node-stream": true,
-        "@metamask/snaps-controllers>tar-stream": true,
+        "@metamask/snaps-utils>@metamask/snaps-registry": true,
         "@metamask/snaps-rpc-methods": true,
         "@metamask/snaps-sdk": true,
         "@metamask/snaps-utils": true,
-        "@metamask/snaps-utils>@metamask/snaps-registry": true,
         "@metamask/utils": true,
+        "@metamask/snaps-controllers>@xstate/fsm": true,
         "browserify>browserify-zlib": true,
+        "@metamask/snaps-controllers>concat-stream": true,
         "eslint>fast-deep-equal": true,
+        "@metamask/snaps-controllers>get-npm-tarball-url": true,
         "immer": true,
         "nanoid": true,
         "readable-stream": true,
-        "semver": true
+        "@metamask/snaps-controllers>readable-web-to-node-stream": true,
+        "semver": true,
+        "@metamask/snaps-controllers>tar-stream": true
       }
     },
-    "@metamask/snaps-controllers-flask>nanoid": {
+    "@metamask/snaps-execution-environments": {
       "globals": {
-        "crypto.getRandomValues": true
+        "document.getElementById": true
+      },
+      "packages": {
+        "@metamask/post-message-stream": true,
+        "@metamask/snaps-utils": true,
+        "@metamask/utils": true
       }
     },
-    "@metamask/snaps-controllers>concat-stream": {
+    "@metamask/snaps-utils>@metamask/snaps-registry": {
       "packages": {
-        "browserify>buffer": true,
-        "browserify>concat-stream>typedarray": true,
-        "pumpify>inherits": true,
-        "readable-stream": true,
-        "terser>source-map-support>buffer-from": true
+        "@metamask/utils>@metamask/superstruct": true,
+        "@metamask/utils": true,
+        "@ethereumjs/tx>ethereum-cryptography>@noble/curves": true,
+        "@noble/hashes": true
       }
     },
-    "@metamask/snaps-controllers>nanoid": {
+    "@metamask/snaps-rpc-methods": {
+      "packages": {
+        "@metamask/snaps-sdk>@metamask/key-tree": true,
+        "@metamask/permission-controller": true,
+        "@metamask/rpc-errors": true,
+        "@metamask/snaps-sdk": true,
+        "@metamask/snaps-utils": true,
+        "@metamask/utils>@metamask/superstruct": true,
+        "@metamask/utils": true,
+        "@noble/hashes": true
+      }
+    },
+    "@metamask/snaps-sdk": {
       "globals": {
-        "crypto.getRandomValues": true
+        "fetch": true
+      },
+      "packages": {
+        "@metamask/rpc-errors": true,
+        "@metamask/utils>@metamask/superstruct": true,
+        "@metamask/utils": true
       }
     },
-    "@metamask/snaps-controllers>readable-web-to-node-stream": {
+    "@metamask/snaps-utils": {
+      "globals": {
+        "File": true,
+        "FileReader": true,
+        "TextDecoder": true,
+        "TextEncoder": true,
+        "URL": true,
+        "console.error": true,
+        "console.log": true,
+        "console.warn": true,
+        "crypto": true,
+        "document.body.appendChild": true,
+        "document.createElement": true,
+        "fetch": true
+      },
       "packages": {
-        "readable-stream": true
+        "@metamask/snaps-sdk>@metamask/key-tree": true,
+        "@metamask/permission-controller": true,
+        "@metamask/rpc-errors": true,
+        "@metamask/snaps-utils>@metamask/slip44": true,
+        "@metamask/snaps-sdk": true,
+        "@metamask/utils>@metamask/superstruct": true,
+        "@metamask/utils": true,
+        "@noble/hashes": true,
+        "@metamask/utils>@scure/base": true,
+        "chalk": true,
+        "@metamask/snaps-utils>cron-parser": true,
+        "@metamask/snaps-utils>fast-json-stable-stringify": true,
+        "@metamask/snaps-utils>fast-xml-parser": true,
+        "@metamask/snaps-utils>marked": true,
+        "@metamask/snaps-utils>rfdc": true,
+        "semver": true,
+        "@metamask/snaps-utils>validate-npm-package-name": true
       }
     },
-    "@metamask/snaps-controllers>tar-stream": {
+    "@metamask/transaction-controller": {
+      "globals": {
+        "clearTimeout": true,
+        "console.error": true,
+        "fetch": true,
+        "setTimeout": true
+      },
       "packages": {
-        "@metamask/snaps-controllers>tar-stream>b4a": true,
-        "@metamask/snaps-controllers>tar-stream>fast-fifo": true,
-        "@metamask/snaps-controllers>tar-stream>streamx": true,
-        "browserify>browser-resolve": true
+        "@ethereumjs/tx>@ethereumjs/common": true,
+        "@ethereumjs/tx": true,
+        "@ethereumjs/tx>@ethereumjs/util": true,
+        "@ethersproject/abi": true,
+        "@ethersproject/contracts": true,
+        "@ethersproject/providers": true,
+        "@metamask/base-controller": true,
+        "@metamask/controller-utils": true,
+        "@metamask/eth-query": true,
+        "@metamask/gas-fee-controller": true,
+        "@metamask/metamask-eth-abis": true,
+        "@metamask/network-controller": true,
+        "@metamask/transaction-controller>@metamask/nonce-tracker": true,
+        "@metamask/rpc-errors": true,
+        "@metamask/utils": true,
+        "@metamask/name-controller>async-mutex": true,
+        "bn.js": true,
+        "browserify>buffer": true,
+        "eth-method-registry": true,
+        "webpack>events": true,
+        "fast-json-patch": true,
+        "lodash": true,
+        "uuid": true
       }
     },
-    "@metamask/snaps-controllers>tar-stream>b4a": {
+    "@metamask/user-operation-controller": {
+      "globals": {
+        "fetch": true
+      },
+      "packages": {
+        "@metamask/base-controller": true,
+        "@metamask/controller-utils": true,
+        "@metamask/eth-query": true,
+        "@metamask/gas-fee-controller": true,
+        "@metamask/polling-controller": true,
+        "@metamask/rpc-errors": true,
+        "@metamask/utils>@metamask/superstruct": true,
+        "@metamask/transaction-controller": true,
+        "@metamask/utils": true,
+        "bn.js": true,
+        "webpack>events": true,
+        "lodash": true,
+        "uuid": true
+      }
+    },
+    "@metamask/utils": {
+      "globals": {
+        "TextDecoder": true,
+        "TextEncoder": true
+      },
+      "packages": {
+        "@metamask/utils>@metamask/superstruct": true,
+        "@noble/hashes": true,
+        "@metamask/utils>@scure/base": true,
+        "browserify>buffer": true,
+        "nock>debug": true,
+        "@metamask/utils>pony-cause": true,
+        "semver": true
+      }
+    },
+    "@metamask/abi-utils>@metamask/utils": {
       "globals": {
         "TextDecoder": true,
         "TextEncoder": true
-      }
-    },
-    "@metamask/snaps-controllers>tar-stream>streamx": {
+      },
       "packages": {
-        "@metamask/snaps-controllers>tar-stream>fast-fifo": true,
-        "@metamask/snaps-controllers>tar-stream>streamx>queue-tick": true,
-        "webpack>events": true
-      }
-    },
-    "@metamask/snaps-controllers>tar-stream>streamx>queue-tick": {
-      "globals": {
-        "queueMicrotask": true
+        "@metamask/utils>@metamask/superstruct": true,
+        "@noble/hashes": true,
+        "@metamask/utils>@scure/base": true,
+        "browserify>buffer": true,
+        "nock>debug": true,
+        "@metamask/utils>pony-cause": true,
+        "semver": true
       }
     },
-    "@metamask/snaps-execution-environments": {
+    "@metamask/browser-passworder>@metamask/utils": {
       "globals": {
-        "document.getElementById": true
+        "TextDecoder": true,
+        "TextEncoder": true
       },
       "packages": {
-        "@metamask/post-message-stream": true,
-        "@metamask/snaps-utils": true,
-        "@metamask/utils": true
-      }
-    },
-    "@metamask/snaps-rpc-methods": {
-      "packages": {
-        "@metamask/permission-controller": true,
-        "@metamask/rpc-errors": true,
-        "@metamask/snaps-sdk": true,
-        "@metamask/snaps-sdk>@metamask/key-tree": true,
-        "@metamask/snaps-utils": true,
-        "@metamask/utils": true,
         "@metamask/utils>@metamask/superstruct": true,
-        "@noble/hashes": true
+        "@noble/hashes": true,
+        "@metamask/utils>@scure/base": true,
+        "browserify>buffer": true,
+        "nock>debug": true,
+        "@metamask/utils>pony-cause": true,
+        "semver": true
       }
     },
-    "@metamask/snaps-sdk": {
+    "@metamask/eth-token-tracker>@metamask/eth-block-tracker>@metamask/utils": {
       "globals": {
-        "fetch": true
+        "TextDecoder": true,
+        "TextEncoder": true
       },
       "packages": {
-        "@metamask/rpc-errors": true,
-        "@metamask/utils": true,
-        "@metamask/utils>@metamask/superstruct": true
+        "@metamask/utils>@metamask/superstruct": true,
+        "@noble/hashes": true,
+        "@metamask/utils>@scure/base": true,
+        "browserify>buffer": true,
+        "nock>debug": true,
+        "@metamask/utils>pony-cause": true,
+        "semver": true
       }
     },
-    "@metamask/snaps-sdk>@metamask/key-tree": {
+    "@metamask/network-controller>@metamask/eth-block-tracker>@metamask/utils": {
       "globals": {
-        "crypto.subtle": true
+        "TextDecoder": true,
+        "TextEncoder": true
       },
       "packages": {
-        "@ethereumjs/tx>ethereum-cryptography>@noble/curves": true,
-        "@metamask/scure-bip39": true,
-        "@metamask/utils": true,
+        "@metamask/utils>@metamask/superstruct": true,
+        "@noble/hashes": true,
         "@metamask/utils>@scure/base": true,
-        "@noble/hashes": true
+        "browserify>buffer": true,
+        "nock>debug": true,
+        "@metamask/utils>pony-cause": true,
+        "semver": true
       }
     },
-    "@metamask/snaps-utils": {
+    "@metamask/keyring-controller>@metamask/eth-hd-keyring>@metamask/utils": {
       "globals": {
-        "File": true,
-        "FileReader": true,
         "TextDecoder": true,
-        "TextEncoder": true,
-        "URL": true,
-        "console.error": true,
-        "console.log": true,
-        "console.warn": true,
-        "crypto": true,
-        "document.body.appendChild": true,
-        "document.createElement": true,
-        "fetch": true
+        "TextEncoder": true
       },
       "packages": {
-        "@metamask/permission-controller": true,
-        "@metamask/rpc-errors": true,
-        "@metamask/snaps-sdk": true,
-        "@metamask/snaps-sdk>@metamask/key-tree": true,
-        "@metamask/snaps-utils>@metamask/slip44": true,
-        "@metamask/snaps-utils>cron-parser": true,
-        "@metamask/snaps-utils>fast-json-stable-stringify": true,
-        "@metamask/snaps-utils>fast-xml-parser": true,
-        "@metamask/snaps-utils>marked": true,
-        "@metamask/snaps-utils>rfdc": true,
-        "@metamask/snaps-utils>validate-npm-package-name": true,
-        "@metamask/utils": true,
         "@metamask/utils>@metamask/superstruct": true,
-        "@metamask/utils>@scure/base": true,
         "@noble/hashes": true,
-        "chalk": true,
+        "@metamask/utils>@scure/base": true,
+        "browserify>buffer": true,
+        "nock>debug": true,
+        "@metamask/utils>pony-cause": true,
         "semver": true
       }
     },
-    "@metamask/snaps-utils>@metamask/snaps-registry": {
+    "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/utils": {
+      "globals": {
+        "TextDecoder": true,
+        "TextEncoder": true
+      },
       "packages": {
-        "@ethereumjs/tx>ethereum-cryptography>@noble/curves": true,
-        "@metamask/utils": true,
         "@metamask/utils>@metamask/superstruct": true,
-        "@noble/hashes": true
+        "@noble/hashes": true,
+        "@metamask/utils>@scure/base": true,
+        "browserify>buffer": true,
+        "nock>debug": true,
+        "@metamask/utils>pony-cause": true,
+        "semver": true
       }
     },
-    "@metamask/snaps-utils>cron-parser": {
+    "@metamask/eth-json-rpc-middleware>@metamask/utils": {
+      "globals": {
+        "TextDecoder": true,
+        "TextEncoder": true
+      },
       "packages": {
-        "browserify>browser-resolve": true,
-        "luxon": true
+        "@metamask/utils>@metamask/superstruct": true,
+        "@noble/hashes": true,
+        "@metamask/utils>@scure/base": true,
+        "browserify>buffer": true,
+        "nock>debug": true,
+        "@metamask/utils>pony-cause": true,
+        "semver": true
       }
     },
-    "@metamask/snaps-utils>fast-xml-parser": {
+    "@metamask/eth-sig-util>@metamask/utils": {
       "globals": {
-        "entityName": true,
-        "val": true
+        "TextDecoder": true,
+        "TextEncoder": true
       },
       "packages": {
-        "@metamask/snaps-utils>fast-xml-parser>strnum": true
+        "@metamask/utils>@metamask/superstruct": true,
+        "@noble/hashes": true,
+        "@metamask/utils>@scure/base": true,
+        "browserify>buffer": true,
+        "nock>debug": true,
+        "@metamask/utils>pony-cause": true,
+        "semver": true
       }
     },
-    "@metamask/snaps-utils>marked": {
+    "@metamask/keyring-controller>@metamask/eth-sig-util>@metamask/utils": {
       "globals": {
-        "console.error": true,
-        "console.warn": true,
-        "define": true
-      }
-    },
-    "@metamask/snaps-utils>rfdc": {
+        "TextDecoder": true,
+        "TextEncoder": true
+      },
       "packages": {
-        "browserify>buffer": true
+        "@metamask/utils>@metamask/superstruct": true,
+        "@noble/hashes": true,
+        "@metamask/utils>@scure/base": true,
+        "browserify>buffer": true,
+        "nock>debug": true,
+        "@metamask/utils>pony-cause": true,
+        "semver": true
       }
     },
-    "@metamask/snaps-utils>validate-npm-package-name": {
+    "@metamask/signature-controller>@metamask/eth-sig-util>@metamask/utils": {
+      "globals": {
+        "TextDecoder": true,
+        "TextEncoder": true
+      },
       "packages": {
-        "@metamask/snaps-utils>validate-npm-package-name>builtins": true
+        "@metamask/utils>@metamask/superstruct": true,
+        "@noble/hashes": true,
+        "@metamask/utils>@scure/base": true,
+        "browserify>buffer": true,
+        "nock>debug": true,
+        "@metamask/utils>pony-cause": true,
+        "semver": true
       }
     },
-    "@metamask/snaps-utils>validate-npm-package-name>builtins": {
+    "@metamask/keyring-controller>@metamask/eth-simple-keyring>@metamask/utils": {
+      "globals": {
+        "TextDecoder": true,
+        "TextEncoder": true
+      },
       "packages": {
-        "process": true,
+        "@metamask/utils>@metamask/superstruct": true,
+        "@noble/hashes": true,
+        "@metamask/utils>@scure/base": true,
+        "browserify>buffer": true,
+        "nock>debug": true,
+        "@metamask/utils>pony-cause": true,
         "semver": true
       }
     },
-    "@metamask/test-bundler>@ethersproject/networks": {
+    "@metamask/eth-snap-keyring>@metamask/utils": {
+      "globals": {
+        "TextDecoder": true,
+        "TextEncoder": true
+      },
       "packages": {
-        "ethers>@ethersproject/logger": true
+        "@metamask/utils>@metamask/superstruct": true,
+        "@noble/hashes": true,
+        "@metamask/utils>@scure/base": true,
+        "browserify>buffer": true,
+        "nock>debug": true,
+        "@metamask/utils>pony-cause": true,
+        "semver": true
       }
     },
-    "@metamask/transaction-controller": {
+    "@metamask/keyring-api>@metamask/utils": {
       "globals": {
-        "clearTimeout": true,
-        "console.error": true,
-        "fetch": true,
-        "setTimeout": true
+        "TextDecoder": true,
+        "TextEncoder": true
       },
       "packages": {
-        "@ethereumjs/tx": true,
-        "@ethereumjs/tx>@ethereumjs/common": true,
-        "@ethereumjs/tx>@ethereumjs/util": true,
-        "@ethersproject/abi": true,
-        "@ethersproject/contracts": true,
-        "@ethersproject/providers": true,
-        "@metamask/base-controller": true,
-        "@metamask/controller-utils": true,
-        "@metamask/eth-query": true,
-        "@metamask/gas-fee-controller": true,
-        "@metamask/metamask-eth-abis": true,
-        "@metamask/name-controller>async-mutex": true,
-        "@metamask/network-controller": true,
-        "@metamask/rpc-errors": true,
-        "@metamask/transaction-controller>@metamask/nonce-tracker": true,
-        "@metamask/utils": true,
-        "bn.js": true,
+        "@metamask/utils>@metamask/superstruct": true,
+        "@noble/hashes": true,
+        "@metamask/utils>@scure/base": true,
         "browserify>buffer": true,
-        "eth-method-registry": true,
-        "fast-json-patch": true,
-        "lodash": true,
-        "uuid": true,
-        "webpack>events": true
+        "nock>debug": true,
+        "@metamask/utils>pony-cause": true,
+        "semver": true
       }
     },
-    "@metamask/transaction-controller>@metamask/nonce-tracker": {
+    "@metamask/keyring-api>@metamask/keyring-utils>@metamask/utils": {
+      "globals": {
+        "TextDecoder": true,
+        "TextEncoder": true
+      },
       "packages": {
-        "@ethersproject/providers": true,
-        "@metamask/transaction-controller>@metamask/nonce-tracker>async-mutex": true,
-        "browserify>assert": true
+        "@metamask/utils>@metamask/superstruct": true,
+        "@noble/hashes": true,
+        "@metamask/utils>@scure/base": true,
+        "browserify>buffer": true,
+        "nock>debug": true,
+        "@metamask/utils>pony-cause": true,
+        "semver": true
       }
     },
-    "@metamask/transaction-controller>@metamask/nonce-tracker>async-mutex": {
+    "@metamask/name-controller>@metamask/utils": {
       "globals": {
-        "clearTimeout": true,
-        "setTimeout": true
+        "TextDecoder": true,
+        "TextEncoder": true
       },
       "packages": {
-        "@swc/helpers>tslib": true
+        "@metamask/utils>@metamask/superstruct": true,
+        "@noble/hashes": true,
+        "@metamask/utils>@scure/base": true,
+        "browserify>buffer": true,
+        "nock>debug": true,
+        "@metamask/utils>pony-cause": true,
+        "semver": true
       }
     },
-    "@metamask/user-operation-controller": {
+    "@metamask/permission-log-controller>@metamask/utils": {
       "globals": {
-        "fetch": true
+        "TextDecoder": true,
+        "TextEncoder": true
       },
       "packages": {
-        "@metamask/base-controller": true,
-        "@metamask/controller-utils": true,
-        "@metamask/eth-query": true,
-        "@metamask/gas-fee-controller": true,
-        "@metamask/polling-controller": true,
-        "@metamask/rpc-errors": true,
-        "@metamask/transaction-controller": true,
-        "@metamask/utils": true,
         "@metamask/utils>@metamask/superstruct": true,
-        "bn.js": true,
-        "lodash": true,
-        "uuid": true,
-        "webpack>events": true
+        "@noble/hashes": true,
+        "@metamask/utils>@scure/base": true,
+        "browserify>buffer": true,
+        "nock>debug": true,
+        "@metamask/utils>pony-cause": true,
+        "semver": true
       }
     },
-    "@metamask/utils": {
+    "@metamask/post-message-stream>@metamask/utils": {
       "globals": {
         "TextDecoder": true,
         "TextEncoder": true
       },
       "packages": {
         "@metamask/utils>@metamask/superstruct": true,
+        "@noble/hashes": true,
         "@metamask/utils>@scure/base": true,
+        "browserify>buffer": true,
+        "nock>debug": true,
         "@metamask/utils>pony-cause": true,
+        "semver": true
+      }
+    },
+    "@metamask/rate-limit-controller>@metamask/utils": {
+      "globals": {
+        "TextDecoder": true,
+        "TextEncoder": true
+      },
+      "packages": {
+        "@metamask/utils>@metamask/superstruct": true,
         "@noble/hashes": true,
+        "@metamask/utils>@scure/base": true,
         "browserify>buffer": true,
         "nock>debug": true,
+        "@metamask/utils>pony-cause": true,
         "semver": true
       }
     },
-    "@metamask/utils>@scure/base": {
+    "@metamask/rate-limit-controller>@metamask/rpc-errors>@metamask/utils": {
       "globals": {
         "TextDecoder": true,
         "TextEncoder": true
+      },
+      "packages": {
+        "@metamask/utils>@metamask/superstruct": true,
+        "@noble/hashes": true,
+        "@metamask/utils>@scure/base": true,
+        "browserify>buffer": true,
+        "nock>debug": true,
+        "@metamask/utils>pony-cause": true,
+        "semver": true
       }
     },
     "@ngraveio/bc-ur": {
       "packages": {
         "@ngraveio/bc-ur>@keystonehq/alias-sampling": true,
+        "browserify>assert": true,
         "@ngraveio/bc-ur>bignumber.js": true,
+        "browserify>buffer": true,
         "@ngraveio/bc-ur>cbor-sync": true,
         "@ngraveio/bc-ur>crc": true,
         "@ngraveio/bc-ur>jsbi": true,
-        "addons-linter>sha.js": true,
-        "browserify>assert": true,
-        "browserify>buffer": true
-      }
-    },
-    "@ngraveio/bc-ur>assert>object-is": {
-      "packages": {
-        "string.prototype.matchall>call-bind": true,
-        "string.prototype.matchall>define-properties": true
+        "addons-linter>sha.js": true
       }
     },
-    "@ngraveio/bc-ur>bignumber.js": {
+    "@metamask/profile-sync-controller>@noble/ciphers": {
       "globals": {
-        "crypto": true,
-        "define": true
+        "TextDecoder": true,
+        "TextEncoder": true,
+        "crypto": true
       }
     },
-    "@ngraveio/bc-ur>cbor-sync": {
+    "@ethereumjs/tx>ethereum-cryptography>@noble/curves": {
       "globals": {
-        "define": true
+        "TextEncoder": true
       },
       "packages": {
-        "browserify>buffer": true
+        "@noble/hashes": true
       }
     },
-    "@ngraveio/bc-ur>crc": {
-      "packages": {
-        "browserify>buffer": true
+    "@noble/hashes": {
+      "globals": {
+        "TextEncoder": true,
+        "crypto": true
       }
     },
-    "@ngraveio/bc-ur>jsbi": {
+    "@metamask/scure-bip39>@noble/hashes": {
       "globals": {
-        "define": true
+        "TextEncoder": true,
+        "crypto": true
       }
     },
-    "@noble/hashes": {
+    "eth-lattice-keyring>@ethereumjs/tx>ethereum-cryptography>@noble/hashes": {
+      "globals": {
+        "TextEncoder": true,
+        "crypto": true
+      }
+    },
+    "eth-lattice-keyring>gridplus-sdk>@ethereumjs/tx>ethereum-cryptography>@noble/hashes": {
       "globals": {
         "TextEncoder": true,
         "crypto": true
@@ -2778,6 +2193,20 @@
         "navigator.userAgent": true
       }
     },
+    "@trezor/connect-web>@trezor/connect>@trezor/protobuf>protobufjs>@protobufjs/codegen": {
+      "globals": {
+        "console.log": true
+      }
+    },
+    "@trezor/connect-web>@trezor/connect>@trezor/protobuf>protobufjs>@protobufjs/fetch": {
+      "globals": {
+        "XMLHttpRequest": true
+      },
+      "packages": {
+        "@trezor/connect-web>@trezor/connect>@trezor/protobuf>protobufjs>@protobufjs/aspromise": true,
+        "@trezor/connect-web>@trezor/connect>@trezor/protobuf>protobufjs>@protobufjs/inquire": true
+      }
+    },
     "@reduxjs/toolkit": {
       "globals": {
         "AbortController": true,
@@ -2789,42 +2218,46 @@
         "setTimeout": true
       },
       "packages": {
-        "@reduxjs/toolkit>reselect": true,
         "immer": true,
         "process": 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
+        "redux-thunk": true,
+        "@reduxjs/toolkit>reselect": true
       }
     },
-    "@sentry/browser": {
+    "react-router-dom-v5-compat>@remix-run/router": {
       "globals": {
-        "PerformanceObserver.supportedEntryTypes": true,
+        "AbortController": true,
+        "DOMException": true,
+        "FormData": true,
+        "Headers": true,
         "Request": true,
+        "Response": true,
         "URL": true,
-        "XMLHttpRequest.prototype": true,
-        "__SENTRY_DEBUG__": true,
-        "__SENTRY_RELEASE__": true,
-        "addEventListener": true,
-        "console.error": true,
-        "indexedDB.open": true,
-        "performance.timeOrigin": true,
-        "setTimeout": true
-      },
+        "URLSearchParams": true,
+        "console": true,
+        "document.defaultView": true
+      }
+    },
+    "@metamask/utils>@scure/base": {
+      "globals": {
+        "TextDecoder": true,
+        "TextEncoder": true
+      }
+    },
+    "@ethereumjs/tx>ethereum-cryptography>@scure/bip32": {
       "packages": {
-        "@sentry/browser>@sentry-internal/browser-utils": true,
-        "@sentry/browser>@sentry-internal/feedback": true,
-        "@sentry/browser>@sentry-internal/replay": true,
-        "@sentry/browser>@sentry-internal/replay-canvas": true,
-        "@sentry/browser>@sentry/core": true,
-        "@sentry/utils": true
+        "@ethereumjs/tx>ethereum-cryptography>@noble/curves": true,
+        "@noble/hashes": true,
+        "@metamask/utils>@scure/base": true
+      }
+    },
+    "@segment/loosely-validate-event": {
+      "packages": {
+        "browserify>assert": true,
+        "browserify>buffer": true,
+        "@segment/loosely-validate-event>component-type": true,
+        "@segment/loosely-validate-event>join-component": true
       }
     },
     "@sentry/browser>@sentry-internal/browser-utils": {
@@ -2863,6 +2296,25 @@
         "@sentry/utils": true
       }
     },
+    "@sentry/browser>@sentry-internal/replay-canvas": {
+      "globals": {
+        "Blob": true,
+        "HTMLCanvasElement": true,
+        "HTMLImageElement": true,
+        "ImageData": true,
+        "URL.createObjectURL": true,
+        "WeakRef": true,
+        "Worker": true,
+        "cancelAnimationFrame": true,
+        "console.error": true,
+        "createImageBitmap": true,
+        "document": true
+      },
+      "packages": {
+        "@sentry/browser>@sentry/core": true,
+        "@sentry/utils": true
+      }
+    },
     "@sentry/browser>@sentry-internal/replay": {
       "globals": {
         "Blob": true,
@@ -2912,21 +2364,25 @@
         "@sentry/utils": true
       }
     },
-    "@sentry/browser>@sentry-internal/replay-canvas": {
+    "@sentry/browser": {
       "globals": {
-        "Blob": true,
-        "HTMLCanvasElement": true,
-        "HTMLImageElement": true,
-        "ImageData": true,
-        "URL.createObjectURL": true,
-        "WeakRef": true,
-        "Worker": true,
-        "cancelAnimationFrame": true,
+        "PerformanceObserver.supportedEntryTypes": true,
+        "Request": true,
+        "URL": true,
+        "XMLHttpRequest.prototype": true,
+        "__SENTRY_DEBUG__": true,
+        "__SENTRY_RELEASE__": true,
+        "addEventListener": true,
         "console.error": true,
-        "createImageBitmap": true,
-        "document": true
+        "indexedDB.open": true,
+        "performance.timeOrigin": true,
+        "setTimeout": true
       },
       "packages": {
+        "@sentry/browser>@sentry-internal/browser-utils": true,
+        "@sentry/browser>@sentry-internal/feedback": true,
+        "@sentry/browser>@sentry-internal/replay-canvas": true,
+        "@sentry/browser>@sentry-internal/replay": true,
         "@sentry/browser>@sentry/core": true,
         "@sentry/utils": true
       }
@@ -2997,45 +2453,86 @@
         "isSecureContext": true
       },
       "packages": {
-        "@solana/addresses>@solana/errors": true
+        "@solana/addresses>@solana/errors": true
+      }
+    },
+    "@solana/addresses>@solana/codecs-core": {
+      "packages": {
+        "@solana/addresses>@solana/errors": true
+      }
+    },
+    "@solana/addresses>@solana/codecs-strings": {
+      "globals": {
+        "TextDecoder": true,
+        "TextEncoder": true,
+        "atob": true,
+        "btoa": true
+      },
+      "packages": {
+        "@solana/addresses>@solana/codecs-core": true,
+        "@solana/addresses>@solana/errors": true
+      }
+    },
+    "@solana/addresses>@solana/errors": {
+      "globals": {
+        "btoa": true
+      }
+    },
+    "@metamask/controller-utils>@spruceid/siwe-parser": {
+      "globals": {
+        "console.error": true,
+        "console.log": true
+      },
+      "packages": {
+        "@noble/hashes": true,
+        "@metamask/controller-utils>@spruceid/siwe-parser>apg-js": true
+      }
+    },
+    "@metamask/profile-sync-controller>siwe>@spruceid/siwe-parser": {
+      "globals": {
+        "console.error": true,
+        "console.log": true
+      },
+      "packages": {
+        "@noble/hashes": true,
+        "@metamask/controller-utils>@spruceid/siwe-parser>apg-js": true
       }
     },
-    "@solana/addresses>@solana/codecs-core": {
+    "@metamask/profile-sync-controller>siwe>@stablelib/random>@stablelib/binary": {
       "packages": {
-        "@solana/addresses>@solana/errors": true
+        "@metamask/profile-sync-controller>siwe>@stablelib/random>@stablelib/binary>@stablelib/int": true
       }
     },
-    "@solana/addresses>@solana/codecs-strings": {
+    "@metamask/profile-sync-controller>siwe>@stablelib/random": {
       "globals": {
-        "TextDecoder": true,
-        "TextEncoder": true,
-        "atob": true,
-        "btoa": true
+        "crypto": true,
+        "msCrypto": true
       },
       "packages": {
-        "@solana/addresses>@solana/codecs-core": true,
-        "@solana/addresses>@solana/errors": true
+        "@metamask/profile-sync-controller>siwe>@stablelib/random>@stablelib/binary": true,
+        "@metamask/profile-sync-controller>siwe>@stablelib/random>@stablelib/wipe": true,
+        "browserify>browser-resolve": true
       }
     },
-    "@solana/addresses>@solana/errors": {
+    "@trezor/connect-web>@trezor/connect-common": {
       "globals": {
-        "btoa": true
-      }
-    },
-    "@storybook/addon-docs>remark-external-links>mdast-util-definitions": {
+        "console.warn": true,
+        "localStorage.getItem": true,
+        "localStorage.setItem": true,
+        "navigator": true,
+        "setTimeout": true,
+        "window": true
+      },
       "packages": {
-        "react-markdown>unist-util-visit": true
+        "@trezor/connect-web>@trezor/connect-common>@trezor/env-utils": true,
+        "@trezor/connect-web>@trezor/utils": true,
+        "@swc/helpers>tslib": true
       }
     },
-    "@storybook/addon-knobs>qs": {
+    "@metamask/eth-trezor-keyring>@trezor/connect-plugin-ethereum": {
       "packages": {
-        "string.prototype.matchall>side-channel": true
-      }
-    },
-    "@swc/helpers>tslib": {
-      "globals": {
-        "SuppressedError": true,
-        "define": true
+        "@metamask/eth-sig-util": true,
+        "@swc/helpers>tslib": true
       }
     },
     "@trezor/connect-web": {
@@ -3062,35 +2559,20 @@
         "setTimeout": true
       },
       "packages": {
-        "@swc/helpers>tslib": true,
-        "@trezor/connect-web>@trezor/connect": true,
         "@trezor/connect-web>@trezor/connect-common": true,
+        "@trezor/connect-web>@trezor/connect": true,
         "@trezor/connect-web>@trezor/utils": true,
-        "webpack>events": true
+        "webpack>events": true,
+        "@swc/helpers>tslib": true
       }
     },
     "@trezor/connect-web>@trezor/connect": {
       "packages": {
-        "@swc/helpers>tslib": true,
         "@trezor/connect-web>@trezor/connect>@trezor/protobuf": true,
         "@trezor/connect-web>@trezor/connect>@trezor/schema-utils": true,
         "@trezor/connect-web>@trezor/connect>@trezor/transport": true,
-        "@trezor/connect-web>@trezor/utils": true
-      }
-    },
-    "@trezor/connect-web>@trezor/connect-common": {
-      "globals": {
-        "console.warn": true,
-        "localStorage.getItem": true,
-        "localStorage.setItem": true,
-        "navigator": true,
-        "setTimeout": true,
-        "window": true
-      },
-      "packages": {
-        "@swc/helpers>tslib": true,
-        "@trezor/connect-web>@trezor/connect-common>@trezor/env-utils": true,
-        "@trezor/connect-web>@trezor/utils": true
+        "@trezor/connect-web>@trezor/utils": true,
+        "@swc/helpers>tslib": true
       }
     },
     "@trezor/connect-web>@trezor/connect-common>@trezor/env-utils": {
@@ -3106,54 +2588,17 @@
         "screen.width": true
       },
       "packages": {
+        "process": true,
         "@swc/helpers>tslib": true,
-        "@trezor/connect-web>@trezor/connect-common>@trezor/env-utils>ua-parser-js": true,
-        "process": true
-      }
-    },
-    "@trezor/connect-web>@trezor/connect-common>@trezor/env-utils>ua-parser-js": {
-      "globals": {
-        "define": true
+        "@trezor/connect-web>@trezor/connect-common>@trezor/env-utils>ua-parser-js": true
       }
     },
     "@trezor/connect-web>@trezor/connect>@trezor/protobuf": {
       "packages": {
-        "@swc/helpers>tslib": true,
-        "@trezor/connect-web>@trezor/connect>@trezor/protobuf>protobufjs": true,
         "@trezor/connect-web>@trezor/connect>@trezor/schema-utils": true,
-        "browserify>buffer": true
-      }
-    },
-    "@trezor/connect-web>@trezor/connect>@trezor/protobuf>protobufjs": {
-      "globals": {
-        "process": true,
-        "setTimeout": true
-      },
-      "packages": {
-        "@trezor/connect-web>@trezor/connect>@trezor/protobuf>protobufjs>@protobufjs/aspromise": true,
-        "@trezor/connect-web>@trezor/connect>@trezor/protobuf>protobufjs>@protobufjs/base64": true,
-        "@trezor/connect-web>@trezor/connect>@trezor/protobuf>protobufjs>@protobufjs/codegen": true,
-        "@trezor/connect-web>@trezor/connect>@trezor/protobuf>protobufjs>@protobufjs/eventemitter": true,
-        "@trezor/connect-web>@trezor/connect>@trezor/protobuf>protobufjs>@protobufjs/fetch": true,
-        "@trezor/connect-web>@trezor/connect>@trezor/protobuf>protobufjs>@protobufjs/float": true,
-        "@trezor/connect-web>@trezor/connect>@trezor/protobuf>protobufjs>@protobufjs/inquire": true,
-        "@trezor/connect-web>@trezor/connect>@trezor/protobuf>protobufjs>@protobufjs/path": true,
-        "@trezor/connect-web>@trezor/connect>@trezor/protobuf>protobufjs>@protobufjs/pool": true,
-        "@trezor/connect-web>@trezor/connect>@trezor/protobuf>protobufjs>@protobufjs/utf8": true
-      }
-    },
-    "@trezor/connect-web>@trezor/connect>@trezor/protobuf>protobufjs>@protobufjs/codegen": {
-      "globals": {
-        "console.log": true
-      }
-    },
-    "@trezor/connect-web>@trezor/connect>@trezor/protobuf>protobufjs>@protobufjs/fetch": {
-      "globals": {
-        "XMLHttpRequest": true
-      },
-      "packages": {
-        "@trezor/connect-web>@trezor/connect>@trezor/protobuf>protobufjs>@protobufjs/aspromise": true,
-        "@trezor/connect-web>@trezor/connect>@trezor/protobuf>protobufjs>@protobufjs/inquire": true
+        "browserify>buffer": true,
+        "@trezor/connect-web>@trezor/connect>@trezor/protobuf>protobufjs": true,
+        "@swc/helpers>tslib": true
       }
     },
     "@trezor/connect-web>@trezor/connect>@trezor/schema-utils": {
@@ -3180,16 +2625,10 @@
         "setTimeout": true
       },
       "packages": {
-        "@swc/helpers>tslib": true,
         "@trezor/connect-web>@trezor/utils>bignumber.js": true,
         "browserify>buffer": true,
-        "webpack>events": true
-      }
-    },
-    "@trezor/connect-web>@trezor/utils>bignumber.js": {
-      "globals": {
-        "crypto": true,
-        "define": true
+        "webpack>events": true,
+        "@swc/helpers>tslib": true
       }
     },
     "@welldone-software/why-did-you-render": {
@@ -3204,59 +2643,193 @@
         "setTimeout": true
       },
       "packages": {
-        "lodash": true,
-        "react": true
+        "lodash": true,
+        "react": true
+      }
+    },
+    "@zxing/browser": {
+      "globals": {
+        "HTMLElement": true,
+        "HTMLImageElement": true,
+        "HTMLVideoElement": true,
+        "clearTimeout": true,
+        "console.error": true,
+        "console.warn": true,
+        "document": true,
+        "navigator": true,
+        "setTimeout": true
+      },
+      "packages": {
+        "@zxing/library": true
+      }
+    },
+    "@zxing/library": {
+      "globals": {
+        "HTMLImageElement": true,
+        "HTMLVideoElement": true,
+        "TextDecoder": true,
+        "TextEncoder": true,
+        "URL.createObjectURL": true,
+        "btoa": true,
+        "console.log": true,
+        "console.warn": true,
+        "document": true,
+        "navigator": true,
+        "setTimeout": true
+      },
+      "packages": {
+        "@zxing/library>ts-custom-error": true
+      }
+    },
+    "@lavamoat/lavapack>readable-stream>abort-controller": {
+      "globals": {
+        "AbortController": true
+      }
+    },
+    "currency-formatter>accounting": {
+      "globals": {
+        "define": true
+      }
+    },
+    "ethers>@ethersproject/json-wallets>aes-js": {
+      "globals": {
+        "define": true
+      }
+    },
+    "eth-lattice-keyring>gridplus-sdk>aes-js": {
+      "globals": {
+        "define": true
+      }
+    },
+    "chalk>ansi-styles": {
+      "packages": {
+        "chalk>ansi-styles>color-convert": true
+      }
+    },
+    "@metamask/controller-utils>@spruceid/siwe-parser>apg-js": {
+      "packages": {
+        "browserify>buffer": true
+      }
+    },
+    "string.prototype.matchall>es-abstract>array-buffer-byte-length": {
+      "packages": {
+        "string.prototype.matchall>call-bind": true,
+        "string.prototype.matchall>es-abstract>is-array-buffer": true
+      }
+    },
+    "crypto-browserify>public-encrypt>parse-asn1>asn1.js": {
+      "packages": {
+        "bn.js": true,
+        "browserify>buffer": true,
+        "pumpify>inherits": true,
+        "@metamask/ppom-validator>elliptic>minimalistic-assert": true,
+        "browserify>vm-browserify": true
+      }
+    },
+    "browserify>assert": {
+      "globals": {
+        "Buffer": true
+      },
+      "packages": {
+        "react>object-assign": true,
+        "browserify>assert>util": true
+      }
+    },
+    "@metamask/name-controller>async-mutex": {
+      "globals": {
+        "clearTimeout": true,
+        "setTimeout": true
+      },
+      "packages": {
+        "@swc/helpers>tslib": true
+      }
+    },
+    "@metamask/transaction-controller>@metamask/nonce-tracker>async-mutex": {
+      "globals": {
+        "clearTimeout": true,
+        "setTimeout": true
+      },
+      "packages": {
+        "@swc/helpers>tslib": true
+      }
+    },
+    "string.prototype.matchall>es-abstract>available-typed-arrays": {
+      "packages": {
+        "string.prototype.matchall>es-abstract>typed-array-length>possible-typed-array-names": true
+      }
+    },
+    "await-semaphore": {
+      "packages": {
+        "process": true,
+        "browserify>timers-browserify": true
+      }
+    },
+    "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth>@ledgerhq/domain-service>axios": {
+      "globals": {
+        "Blob": true,
+        "FormData": true,
+        "URLSearchParams": true,
+        "XMLHttpRequest": true,
+        "btoa": true,
+        "console.warn": true,
+        "document": true,
+        "location.href": true,
+        "navigator": true,
+        "setTimeout": true
+      },
+      "packages": {
+        "browserify>buffer": true,
+        "axios>form-data": true,
+        "process": true
       }
     },
-    "@zxing/browser": {
+    "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth>@ledgerhq/evm-tools>axios": {
       "globals": {
-        "HTMLElement": true,
-        "HTMLImageElement": true,
-        "HTMLVideoElement": true,
-        "clearTimeout": true,
-        "console.error": true,
+        "Blob": true,
+        "FormData": true,
+        "URLSearchParams": true,
+        "XMLHttpRequest": true,
+        "btoa": true,
         "console.warn": true,
         "document": true,
+        "location.href": true,
         "navigator": true,
         "setTimeout": true
       },
       "packages": {
-        "@zxing/library": true
+        "browserify>buffer": true,
+        "axios>form-data": true,
+        "process": true
       }
     },
-    "@zxing/library": {
+    "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth>axios": {
       "globals": {
-        "HTMLImageElement": true,
-        "HTMLVideoElement": true,
-        "TextDecoder": true,
-        "TextEncoder": true,
-        "URL.createObjectURL": true,
+        "Blob": true,
+        "FormData": true,
+        "URLSearchParams": true,
+        "XMLHttpRequest": true,
         "btoa": true,
-        "console.log": true,
         "console.warn": true,
         "document": true,
+        "location.href": true,
         "navigator": true,
         "setTimeout": true
       },
       "packages": {
-        "@zxing/library>ts-custom-error": true
+        "browserify>buffer": true,
+        "axios>form-data": true,
+        "process": true
       }
     },
-    "addons-linter>sha.js": {
-      "packages": {
-        "koa>content-disposition>safe-buffer": true,
-        "pumpify>inherits": true
+    "@metamask/snaps-controllers>tar-stream>b4a": {
+      "globals": {
+        "TextDecoder": true,
+        "TextEncoder": true
       }
     },
-    "await-semaphore": {
+    "@ensdomains/content-hash>multihashes>multibase>base-x": {
       "packages": {
-        "browserify>timers-browserify": true,
-        "process": true
-      }
-    },
-    "axios>form-data": {
-      "globals": {
-        "FormData": true
+        "koa>content-disposition>safe-buffer": true
       }
     },
     "base32-encode": {
@@ -3270,136 +2843,156 @@
         "define": true
       }
     },
-    "blo": {
+    "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth>bignumber.js": {
       "globals": {
-        "btoa": true
+        "crypto": true,
+        "define": true
       }
     },
-    "bn.js": {
+    "@metamask/notification-services-controller>bignumber.js": {
       "globals": {
-        "Buffer": true
-      },
-      "packages": {
-        "browserify>browser-resolve": true
+        "crypto": true,
+        "define": true
       }
     },
-    "bowser": {
+    "@metamask/smart-transactions-controller>bignumber.js": {
       "globals": {
+        "crypto": true,
         "define": true
       }
     },
-    "browserify>assert": {
+    "@ngraveio/bc-ur>bignumber.js": {
       "globals": {
-        "Buffer": true
-      },
-      "packages": {
-        "browserify>assert>util": true,
-        "react>object-assign": true
+        "crypto": true,
+        "define": true
       }
     },
-    "browserify>assert>util": {
+    "@trezor/connect-web>@trezor/utils>bignumber.js": {
       "globals": {
-        "console.error": true,
-        "console.log": true,
-        "console.trace": true,
-        "process": true
-      },
+        "crypto": true,
+        "define": true
+      }
+    },
+    "eth-lattice-keyring>gridplus-sdk>borc>bignumber.js": {
+      "globals": {
+        "crypto": true,
+        "define": true
+      }
+    },
+    "eth-lattice-keyring>gridplus-sdk>bignumber.js": {
+      "globals": {
+        "crypto": true,
+        "define": true
+      }
+    },
+    "eth-lattice-keyring>gridplus-sdk>bitwise": {
       "packages": {
-        "browserify>assert>util>inherits": true,
-        "process": true
+        "browserify>buffer": true
       }
     },
-    "browserify>browserify-zlib": {
+    "blo": {
+      "globals": {
+        "btoa": true
+      }
+    },
+    "bn.js": {
+      "globals": {
+        "Buffer": true
+      },
       "packages": {
-        "browserify>assert": true,
-        "browserify>browserify-zlib>pako": true,
-        "browserify>buffer": true,
-        "browserify>util": true,
-        "process": true,
-        "stream-browserify": true
+        "browserify>browser-resolve": true
       }
     },
-    "browserify>buffer": {
+    "eth-lattice-keyring>gridplus-sdk>borc": {
       "globals": {
         "console": true
       },
       "packages": {
-        "base64-js": true,
-        "buffer>ieee754": true
+        "eth-lattice-keyring>gridplus-sdk>borc>bignumber.js": true,
+        "browserify>buffer": true,
+        "buffer>ieee754": true,
+        "eth-lattice-keyring>gridplus-sdk>borc>iso-url": true
       }
     },
-    "browserify>punycode": {
+    "bowser": {
       "globals": {
         "define": true
       }
     },
-    "browserify>string_decoder": {
+    "@metamask/ppom-validator>elliptic>brorand": {
+      "globals": {
+        "crypto": true,
+        "msCrypto": true
+      },
       "packages": {
-        "koa>content-disposition>safe-buffer": true
+        "browserify>browser-resolve": true
       }
     },
-    "browserify>timers-browserify": {
-      "globals": {
-        "clearInterval": true,
-        "clearTimeout": true,
-        "setInterval": true,
-        "setTimeout": true
-      },
+    "ethereumjs-util>ethereum-cryptography>browserify-aes": {
       "packages": {
-        "process": true
+        "ethereumjs-util>ethereum-cryptography>browserify-aes>buffer-xor": true,
+        "browserify>buffer": true,
+        "ethereumjs-util>create-hash>cipher-base": true,
+        "crypto-browserify>browserify-cipher>evp_bytestokey": true,
+        "pumpify>inherits": true,
+        "koa>content-disposition>safe-buffer": true
       }
     },
-    "browserify>url": {
+    "crypto-browserify>browserify-cipher": {
       "packages": {
-        "@storybook/addon-knobs>qs": true,
-        "browserify>punycode": true
+        "ethereumjs-util>ethereum-cryptography>browserify-aes": true,
+        "crypto-browserify>browserify-cipher>browserify-des": true,
+        "crypto-browserify>browserify-cipher>evp_bytestokey": true
       }
     },
-    "browserify>util": {
-      "globals": {
-        "console.error": true,
-        "console.log": true,
-        "console.trace": true
-      },
+    "crypto-browserify>browserify-cipher>browserify-des": {
       "packages": {
-        "browserify>util>is-arguments": true,
-        "browserify>util>is-typed-array": true,
-        "browserify>util>which-typed-array": true,
-        "koa>is-generator-function": true,
-        "process": true,
+        "browserify>buffer": true,
+        "ethereumjs-util>create-hash>cipher-base": true,
+        "crypto-browserify>browserify-cipher>browserify-des>des.js": true,
         "pumpify>inherits": true
       }
     },
-    "browserify>util>is-arguments": {
+    "crypto-browserify>public-encrypt>browserify-rsa": {
       "packages": {
-        "koa>is-generator-function>has-tostringtag": true,
-        "string.prototype.matchall>call-bind": true
+        "bn.js": true,
+        "browserify>buffer": true,
+        "crypto-browserify>randombytes": true
       }
     },
-    "browserify>util>is-typed-array": {
+    "crypto-browserify>browserify-sign": {
       "packages": {
-        "browserify>util>which-typed-array": true
+        "bn.js": true,
+        "crypto-browserify>public-encrypt>browserify-rsa": true,
+        "browserify>buffer": true,
+        "ethereumjs-util>create-hash": true,
+        "crypto-browserify>create-hmac": true,
+        "@metamask/ppom-validator>elliptic": true,
+        "pumpify>inherits": true,
+        "crypto-browserify>public-encrypt>parse-asn1": true,
+        "stream-browserify": true
       }
     },
-    "browserify>util>which-typed-array": {
+    "browserify>browserify-zlib": {
       "packages": {
-        "browserify>util>which-typed-array>for-each": true,
-        "koa>is-generator-function>has-tostringtag": true,
-        "string.prototype.matchall>call-bind": true,
-        "string.prototype.matchall>es-abstract>available-typed-arrays": true,
-        "string.prototype.matchall>es-abstract>gopd": true
+        "browserify>assert": true,
+        "browserify>buffer": true,
+        "browserify>browserify-zlib>pako": true,
+        "process": true,
+        "stream-browserify": true,
+        "browserify>util": true
       }
     },
-    "browserify>util>which-typed-array>for-each": {
+    "ethereumjs-util>ethereum-cryptography>bs58check>bs58": {
       "packages": {
-        "string.prototype.matchall>es-abstract>is-callable": true
+        "@ensdomains/content-hash>multihashes>multibase>base-x": true
       }
     },
-    "browserify>vm-browserify": {
-      "globals": {
-        "document.body.appendChild": true,
-        "document.body.removeChild": true,
-        "document.createElement": true
+    "ethereumjs-util>ethereum-cryptography>bs58check": {
+      "packages": {
+        "ethereumjs-util>ethereum-cryptography>bs58check>bs58": true,
+        "ethereumjs-util>create-hash": true,
+        "koa>content-disposition>safe-buffer": true
       }
     },
     "buffer": {
@@ -3411,20 +3004,52 @@
         "buffer>ieee754": true
       }
     },
-    "chalk": {
+    "terser>source-map-support>buffer-from": {
       "packages": {
-        "chalk>ansi-styles": true,
-        "chalk>supports-color": true
+        "browserify>buffer": true
       }
     },
-    "chalk>ansi-styles": {
+    "ethereumjs-util>ethereum-cryptography>browserify-aes>buffer-xor": {
+      "packages": {
+        "browserify>buffer": true
+      }
+    },
+    "browserify>buffer": {
+      "globals": {
+        "console": true
+      },
+      "packages": {
+        "base64-js": true,
+        "buffer>ieee754": true
+      }
+    },
+    "@metamask/snaps-utils>validate-npm-package-name>builtins": {
+      "packages": {
+        "process": true,
+        "semver": true
+      }
+    },
+    "string.prototype.matchall>call-bind": {
+      "packages": {
+        "string.prototype.matchall>call-bind>es-define-property": true,
+        "string.prototype.matchall>call-bind>es-errors": true,
+        "browserify>has>function-bind": true,
+        "string.prototype.matchall>get-intrinsic": true,
+        "string.prototype.matchall>call-bind>set-function-length": true
+      }
+    },
+    "@ngraveio/bc-ur>cbor-sync": {
+      "globals": {
+        "define": true
+      },
       "packages": {
-        "chalk>ansi-styles>color-convert": true
+        "browserify>buffer": true
       }
     },
-    "chalk>ansi-styles>color-convert": {
+    "chalk": {
       "packages": {
-        "jest-canvas-mock>moo-color>color-name": true
+        "chalk>ansi-styles": true,
+        "chalk>supports-color": true
       }
     },
     "chart.js": {
@@ -3448,9 +3073,20 @@
         "chart.js>@kurkle/color": true
       }
     },
-    "chart.js>@kurkle/color": {
-      "globals": {
-        "define": true
+    "@ensdomains/content-hash>cids": {
+      "packages": {
+        "@ensdomains/content-hash>cids>multibase": true,
+        "@ensdomains/content-hash>multicodec": true,
+        "@ensdomains/content-hash>cids>multihashes": true,
+        "@ensdomains/content-hash>cids>uint8arrays": true
+      }
+    },
+    "ethereumjs-util>create-hash>cipher-base": {
+      "packages": {
+        "pumpify>inherits": true,
+        "koa>content-disposition>safe-buffer": true,
+        "stream-browserify": true,
+        "browserify>string_decoder": true
       }
     },
     "classnames": {
@@ -3459,6 +3095,11 @@
         "define": true
       }
     },
+    "@metamask/jazzicon>color>clone": {
+      "packages": {
+        "browserify>buffer": true
+      }
+    },
     "cockatiel": {
       "globals": {
         "AbortController": true,
@@ -3472,6 +3113,37 @@
         "process": true
       }
     },
+    "chalk>ansi-styles>color-convert": {
+      "packages": {
+        "jest-canvas-mock>moo-color>color-name": 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/jazzicon>color": {
+      "packages": {
+        "@metamask/jazzicon>color>clone": true,
+        "@metamask/jazzicon>color>color-convert": true,
+        "@metamask/jazzicon>color>color-string": true
+      }
+    },
+    "@metamask/snaps-controllers>concat-stream": {
+      "packages": {
+        "terser>source-map-support>buffer-from": true,
+        "browserify>buffer": true,
+        "pumpify>inherits": true,
+        "readable-stream": true,
+        "browserify>concat-stream>typedarray": true
+      }
+    },
     "copy-to-clipboard": {
       "globals": {
         "clipboardData": true,
@@ -3490,10 +3162,47 @@
         "copy-to-clipboard>toggle-selection": true
       }
     },
-    "copy-to-clipboard>toggle-selection": {
+    "@ethereumjs/tx>@ethereumjs/common>crc-32": {
       "globals": {
-        "document.activeElement": true,
-        "document.getSelection": true
+        "DO_NOT_EXPORT_CRC": true,
+        "define": true
+      }
+    },
+    "@ngraveio/bc-ur>crc": {
+      "packages": {
+        "browserify>buffer": true
+      }
+    },
+    "crypto-browserify>create-ecdh": {
+      "packages": {
+        "bn.js": true,
+        "browserify>buffer": true,
+        "@metamask/ppom-validator>elliptic": true
+      }
+    },
+    "ethereumjs-util>create-hash": {
+      "packages": {
+        "ethereumjs-util>create-hash>cipher-base": true,
+        "pumpify>inherits": true,
+        "ethereumjs-util>create-hash>md5.js": true,
+        "ethereumjs-util>create-hash>ripemd160": true,
+        "addons-linter>sha.js": true
+      }
+    },
+    "crypto-browserify>create-hmac": {
+      "packages": {
+        "ethereumjs-util>create-hash>cipher-base": true,
+        "ethereumjs-util>create-hash": true,
+        "pumpify>inherits": true,
+        "ethereumjs-util>create-hash>ripemd160": true,
+        "koa>content-disposition>safe-buffer": true,
+        "addons-linter>sha.js": true
+      }
+    },
+    "@metamask/snaps-utils>cron-parser": {
+      "packages": {
+        "browserify>browser-resolve": true,
+        "luxon": true
       }
     },
     "crypto-browserify": {
@@ -3501,303 +3210,484 @@
         "crypto-browserify>browserify-cipher": true,
         "crypto-browserify>browserify-sign": true,
         "crypto-browserify>create-ecdh": true,
+        "ethereumjs-util>create-hash": true,
         "crypto-browserify>create-hmac": true,
         "crypto-browserify>diffie-hellman": true,
         "crypto-browserify>pbkdf2": true,
         "crypto-browserify>public-encrypt": true,
         "crypto-browserify>randombytes": true,
-        "crypto-browserify>randomfill": true,
-        "ethereumjs-util>create-hash": true
+        "crypto-browserify>randomfill": true
       }
     },
-    "crypto-browserify>browserify-cipher": {
+    "@metamask/ppom-validator>crypto-js": {
+      "globals": {
+        "crypto": true,
+        "define": true,
+        "msCrypto": true
+      },
       "packages": {
-        "crypto-browserify>browserify-cipher>browserify-des": true,
-        "crypto-browserify>browserify-cipher>evp_bytestokey": true,
-        "ethereumjs-util>ethereum-cryptography>browserify-aes": true
+        "browserify>browser-resolve": true
       }
     },
-    "crypto-browserify>browserify-cipher>browserify-des": {
+    "react-beautiful-dnd>css-box-model": {
+      "globals": {
+        "getComputedStyle": true,
+        "pageXOffset": true,
+        "pageYOffset": true
+      },
       "packages": {
-        "browserify>buffer": true,
-        "crypto-browserify>browserify-cipher>browserify-des>des.js": true,
-        "ethereumjs-util>create-hash>cipher-base": true,
-        "pumpify>inherits": true
+        "react-router-dom>tiny-invariant": true
       }
     },
-    "crypto-browserify>browserify-cipher>browserify-des>des.js": {
+    "@material-ui/core>@material-ui/styles>jss-plugin-vendor-prefixer>css-vendor": {
+      "globals": {
+        "document.createElement": true,
+        "document.documentElement": true,
+        "getComputedStyle": true
+      },
       "packages": {
-        "@metamask/ppom-validator>elliptic>minimalistic-assert": true,
-        "pumpify>inherits": true
+        "@babel/runtime": true,
+        "@material-ui/core>@material-ui/styles>jss>is-in-browser": true
       }
     },
-    "crypto-browserify>browserify-cipher>evp_bytestokey": {
+    "currency-formatter": {
       "packages": {
-        "ethereumjs-util>create-hash>md5.js": true,
-        "koa>content-disposition>safe-buffer": true
+        "currency-formatter>accounting": true,
+        "currency-formatter>locale-currency": true,
+        "react>object-assign": true
       }
     },
-    "crypto-browserify>browserify-sign": {
+    "debounce-stream": {
+      "packages": {
+        "debounce-stream>debounce": true,
+        "debounce-stream>duplexer": true,
+        "debounce-stream>through": true
+      }
+    },
+    "debounce-stream>debounce": {
+      "globals": {
+        "clearTimeout": true,
+        "setTimeout": true
+      }
+    },
+    "nock>debug": {
+      "globals": {
+        "console": true,
+        "document": true,
+        "localStorage": true,
+        "navigator": true,
+        "process": true
+      },
+      "packages": {
+        "nock>debug>ms": true,
+        "process": true
+      }
+    },
+    "@metamask/eth-token-tracker>deep-equal": {
+      "packages": {
+        "string.prototype.matchall>es-abstract>array-buffer-byte-length": true,
+        "string.prototype.matchall>call-bind": true,
+        "@metamask/eth-token-tracker>deep-equal>es-get-iterator": true,
+        "string.prototype.matchall>get-intrinsic": true,
+        "browserify>util>is-arguments": true,
+        "string.prototype.matchall>es-abstract>is-array-buffer": true,
+        "@metamask/eth-token-tracker>deep-equal>is-date-object": true,
+        "string.prototype.matchall>es-abstract>is-regex": true,
+        "string.prototype.matchall>es-abstract>is-shared-array-buffer": true,
+        "@lavamoat/lavapack>json-stable-stringify>isarray": true,
+        "@ngraveio/bc-ur>assert>object-is": true,
+        "@lavamoat/lavapack>json-stable-stringify>object-keys": true,
+        "gulp>vinyl-fs>object.assign": true,
+        "string.prototype.matchall>regexp.prototype.flags": true,
+        "string.prototype.matchall>side-channel": true,
+        "@metamask/eth-token-tracker>deep-equal>which-boxed-primitive": true,
+        "@metamask/eth-token-tracker>deep-equal>which-collection": true,
+        "browserify>util>which-typed-array": true
+      }
+    },
+    "string.prototype.matchall>define-properties>define-data-property": {
+      "packages": {
+        "string.prototype.matchall>call-bind>es-define-property": true,
+        "string.prototype.matchall>call-bind>es-errors": true,
+        "string.prototype.matchall>es-abstract>gopd": true
+      }
+    },
+    "string.prototype.matchall>define-properties": {
+      "packages": {
+        "string.prototype.matchall>define-properties>define-data-property": true,
+        "string.prototype.matchall>es-abstract>has-property-descriptors": true,
+        "@lavamoat/lavapack>json-stable-stringify>object-keys": true
+      }
+    },
+    "crypto-browserify>browserify-cipher>browserify-des>des.js": {
+      "packages": {
+        "pumpify>inherits": true,
+        "@metamask/ppom-validator>elliptic>minimalistic-assert": true
+      }
+    },
+    "crypto-browserify>diffie-hellman": {
       "packages": {
-        "@metamask/ppom-validator>elliptic": true,
         "bn.js": true,
         "browserify>buffer": true,
-        "crypto-browserify>create-hmac": true,
-        "crypto-browserify>public-encrypt>browserify-rsa": true,
-        "crypto-browserify>public-encrypt>parse-asn1": true,
-        "ethereumjs-util>create-hash": true,
-        "pumpify>inherits": true,
+        "crypto-browserify>diffie-hellman>miller-rabin": true,
+        "crypto-browserify>randombytes": true
+      }
+    },
+    "@material-ui/core>react-transition-group>dom-helpers": {
+      "packages": {
+        "@babel/runtime": true
+      }
+    },
+    "debounce-stream>duplexer": {
+      "packages": {
         "stream-browserify": true
       }
     },
-    "crypto-browserify>create-ecdh": {
+    "ethers>@ethersproject/signing-key>elliptic": {
       "packages": {
-        "@metamask/ppom-validator>elliptic": true,
         "bn.js": true,
-        "browserify>buffer": true
+        "@metamask/ppom-validator>elliptic>brorand": true,
+        "ethers>@ethersproject/sha2>hash.js": true,
+        "@metamask/ppom-validator>elliptic>hmac-drbg": true,
+        "pumpify>inherits": true,
+        "@metamask/ppom-validator>elliptic>minimalistic-assert": true,
+        "@metamask/ppom-validator>elliptic>minimalistic-crypto-utils": true
       }
     },
-    "crypto-browserify>create-hmac": {
+    "@metamask/ppom-validator>elliptic": {
       "packages": {
-        "addons-linter>sha.js": true,
-        "ethereumjs-util>create-hash": true,
-        "ethereumjs-util>create-hash>cipher-base": true,
-        "ethereumjs-util>create-hash>ripemd160": true,
-        "koa>content-disposition>safe-buffer": true,
-        "pumpify>inherits": true
+        "bn.js": true,
+        "@metamask/ppom-validator>elliptic>brorand": true,
+        "ethers>@ethersproject/sha2>hash.js": true,
+        "@metamask/ppom-validator>elliptic>hmac-drbg": true,
+        "pumpify>inherits": true,
+        "@metamask/ppom-validator>elliptic>minimalistic-assert": true,
+        "@metamask/ppom-validator>elliptic>minimalistic-crypto-utils": true
       }
     },
-    "crypto-browserify>diffie-hellman": {
+    "eth-lattice-keyring>gridplus-sdk>elliptic": {
+      "packages": {
+        "bn.js": true,
+        "@metamask/ppom-validator>elliptic>brorand": true,
+        "ethers>@ethersproject/sha2>hash.js": true,
+        "@metamask/ppom-validator>elliptic>hmac-drbg": true,
+        "pumpify>inherits": true,
+        "@metamask/ppom-validator>elliptic>minimalistic-assert": true,
+        "@metamask/ppom-validator>elliptic>minimalistic-crypto-utils": true
+      }
+    },
+    "string.prototype.matchall>call-bind>es-define-property": {
       "packages": {
-        "bn.js": true,
-        "browserify>buffer": true,
-        "crypto-browserify>diffie-hellman>miller-rabin": true,
-        "crypto-browserify>randombytes": true
+        "string.prototype.matchall>get-intrinsic": true
       }
     },
-    "crypto-browserify>diffie-hellman>miller-rabin": {
+    "@metamask/eth-token-tracker>deep-equal>es-get-iterator": {
       "packages": {
-        "@metamask/ppom-validator>elliptic>brorand": true,
-        "bn.js": true
+        "string.prototype.matchall>call-bind": true,
+        "string.prototype.matchall>get-intrinsic": true,
+        "string.prototype.matchall>has-symbols": true,
+        "browserify>util>is-arguments": true,
+        "@metamask/eth-token-tracker>deep-equal>es-get-iterator>is-map": true,
+        "@metamask/eth-token-tracker>deep-equal>es-get-iterator>is-set": true,
+        "eslint-plugin-react>array-includes>is-string": true,
+        "@lavamoat/lavapack>json-stable-stringify>isarray": true,
+        "process": true,
+        "@metamask/eth-token-tracker>deep-equal>es-get-iterator>stop-iteration-iterator": true
       }
     },
-    "crypto-browserify>pbkdf2": {
+    "eth-lattice-keyring>gridplus-sdk>eth-eip712-util-browser": {
       "globals": {
-        "crypto": true,
-        "process": true,
-        "queueMicrotask": true,
-        "setImmediate": true,
-        "setTimeout": true
+        "intToBuffer": true
       },
       "packages": {
-        "addons-linter>sha.js": true,
-        "ethereumjs-util>create-hash": true,
-        "ethereumjs-util>create-hash>ripemd160": true,
-        "koa>content-disposition>safe-buffer": true,
-        "process": true
+        "bn.js": true,
+        "buffer": true,
+        "@metamask/ethjs>js-sha3": true
       }
     },
-    "crypto-browserify>public-encrypt": {
+    "eth-ens-namehash": {
+      "globals": {
+        "name": "write"
+      },
       "packages": {
-        "bn.js": true,
         "browserify>buffer": true,
-        "crypto-browserify>public-encrypt>browserify-rsa": true,
-        "crypto-browserify>public-encrypt>parse-asn1": true,
-        "crypto-browserify>randombytes": true,
-        "ethereumjs-util>create-hash": true
+        "eth-ens-namehash>idna-uts46-hx": true,
+        "@metamask/ethjs>js-sha3": true
       }
     },
-    "crypto-browserify>public-encrypt>browserify-rsa": {
+    "eth-lattice-keyring": {
+      "globals": {
+        "addEventListener": true,
+        "browser": true,
+        "clearInterval": true,
+        "fetch": true,
+        "open": true,
+        "setInterval": true
+      },
       "packages": {
+        "eth-lattice-keyring>@ethereumjs/tx": true,
+        "@ethereumjs/tx>@ethereumjs/util": true,
         "bn.js": true,
         "browserify>buffer": true,
-        "crypto-browserify>randombytes": true
+        "crypto-browserify": true,
+        "webpack>events": true,
+        "eth-lattice-keyring>gridplus-sdk": true,
+        "eth-lattice-keyring>rlp": true
       }
     },
-    "crypto-browserify>public-encrypt>parse-asn1": {
+    "eth-method-registry": {
       "packages": {
-        "browserify>buffer": true,
-        "crypto-browserify>browserify-cipher>evp_bytestokey": true,
-        "crypto-browserify>pbkdf2": true,
-        "crypto-browserify>public-encrypt>parse-asn1>asn1.js": true,
-        "ethereumjs-util>ethereum-cryptography>browserify-aes": true
+        "@metamask/ethjs-contract": true,
+        "@metamask/ethjs-query": true
       }
     },
-    "crypto-browserify>public-encrypt>parse-asn1>asn1.js": {
+    "@ethereumjs/tx>ethereum-cryptography": {
+      "globals": {
+        "TextDecoder": true,
+        "crypto": true
+      },
       "packages": {
-        "@metamask/ppom-validator>elliptic>minimalistic-assert": true,
-        "bn.js": true,
-        "browserify>buffer": true,
-        "browserify>vm-browserify": true,
-        "pumpify>inherits": true
+        "@ethereumjs/tx>ethereum-cryptography>@noble/curves": true,
+        "@noble/hashes": true,
+        "@ethereumjs/tx>ethereum-cryptography>@scure/bip32": true
       }
     },
-    "crypto-browserify>randombytes": {
+    "eth-lattice-keyring>@ethereumjs/tx>ethereum-cryptography": {
       "globals": {
-        "crypto": true,
-        "msCrypto": true
+        "TextDecoder": true,
+        "crypto": true
       },
       "packages": {
-        "koa>content-disposition>safe-buffer": true,
-        "process": true
+        "eth-lattice-keyring>@ethereumjs/tx>ethereum-cryptography>@noble/hashes": true
       }
     },
-    "crypto-browserify>randomfill": {
+    "eth-lattice-keyring>gridplus-sdk>@ethereumjs/tx>ethereum-cryptography": {
       "globals": {
-        "crypto": true,
-        "msCrypto": true
+        "TextDecoder": true,
+        "crypto": true
       },
       "packages": {
-        "crypto-browserify>randombytes": true,
-        "koa>content-disposition>safe-buffer": true,
-        "process": true
+        "eth-lattice-keyring>gridplus-sdk>@ethereumjs/tx>ethereum-cryptography>@noble/hashes": true
       }
     },
-    "currency-formatter": {
+    "ethereumjs-util>ethereum-cryptography": {
       "packages": {
-        "currency-formatter>accounting": true,
-        "currency-formatter>locale-currency": true,
-        "react>object-assign": true
-      }
-    },
-    "currency-formatter>accounting": {
-      "globals": {
-        "define": true
+        "browserify>buffer": true,
+        "ethereumjs-util>ethereum-cryptography>keccak": true,
+        "crypto-browserify>randombytes": true,
+        "ganache>secp256k1": true
       }
     },
-    "currency-formatter>locale-currency": {
-      "globals": {
-        "countryCode": true
+    "@metamask/keyring-controller>ethereumjs-wallet>ethereum-cryptography": {
+      "packages": {
+        "browserify>assert": true,
+        "ethereumjs-util>ethereum-cryptography>bs58check": true,
+        "browserify>buffer": true,
+        "crypto-browserify>create-hmac": true,
+        "ethers>@ethersproject/sha2>hash.js": true,
+        "ethereumjs-util>ethereum-cryptography>keccak": true,
+        "crypto-browserify>randombytes": true,
+        "koa>content-disposition>safe-buffer": true,
+        "ganache>secp256k1": true
       }
     },
-    "debounce-stream": {
+    "ethereumjs-util": {
       "packages": {
-        "debounce-stream>debounce": true,
-        "debounce-stream>duplexer": true,
-        "debounce-stream>through": true
+        "browserify>assert": true,
+        "bn.js": true,
+        "browserify>buffer": true,
+        "ethereumjs-util>create-hash": true,
+        "ethereumjs-util>ethereum-cryptography": true,
+        "browserify>insert-module-globals>is-buffer": true,
+        "ethereumjs-util>rlp": true
       }
     },
-    "debounce-stream>debounce": {
-      "globals": {
-        "clearTimeout": true,
-        "setTimeout": true
+    "@metamask/keyring-controller>ethereumjs-wallet>ethereumjs-util": {
+      "packages": {
+        "browserify>assert": true,
+        "bn.js": true,
+        "browserify>buffer": true,
+        "ethereumjs-util>create-hash": true,
+        "@metamask/keyring-controller>ethereumjs-wallet>ethereum-cryptography": true,
+        "browserify>insert-module-globals>is-buffer": true,
+        "@metamask/keyring-controller>ethereumjs-wallet>ethereumjs-util>rlp": true
       }
     },
-    "debounce-stream>duplexer": {
+    "@metamask/keyring-controller>ethereumjs-wallet": {
       "packages": {
-        "stream-browserify": true
+        "eth-lattice-keyring>gridplus-sdk>aes-js": true,
+        "ethereumjs-util>ethereum-cryptography>bs58check": true,
+        "browserify>buffer": true,
+        "crypto-browserify": true,
+        "@metamask/keyring-controller>ethereumjs-wallet>ethereum-cryptography": true,
+        "@metamask/keyring-controller>ethereumjs-wallet>ethereumjs-util": true,
+        "crypto-browserify>randombytes": true,
+        "ethers>@ethersproject/json-wallets>scrypt-js": true,
+        "@metamask/keyring-controller>ethereumjs-wallet>utf8": true,
+        "uuid": true
       }
     },
-    "debounce-stream>through": {
+    "ethers": {
       "packages": {
-        "process": true,
-        "stream-browserify": true
+        "@ethersproject/abi": true,
+        "ethers>@ethersproject/abstract-signer": true,
+        "ethers>@ethersproject/address": true,
+        "ethers>@ethersproject/base64": true,
+        "ethers>@ethersproject/basex": true,
+        "@ethersproject/bignumber": true,
+        "@ethersproject/bytes": true,
+        "ethers>@ethersproject/constants": true,
+        "@ethersproject/contracts": true,
+        "@ethersproject/hash": true,
+        "@ethersproject/hdnode": true,
+        "ethers>@ethersproject/json-wallets": true,
+        "ethers>@ethersproject/keccak256": true,
+        "ethers>@ethersproject/logger": true,
+        "ethers>@ethersproject/properties": true,
+        "ethers>@ethersproject/providers": true,
+        "ethers>@ethersproject/random": true,
+        "ethers>@ethersproject/rlp": true,
+        "ethers>@ethersproject/sha2": true,
+        "ethers>@ethersproject/signing-key": true,
+        "ethers>@ethersproject/solidity": true,
+        "ethers>@ethersproject/strings": true,
+        "ethers>@ethersproject/transactions": true,
+        "ethers>@ethersproject/units": true,
+        "@ethersproject/wallet": true,
+        "ethers>@ethersproject/web": true,
+        "ethers>@ethersproject/wordlists": true
       }
     },
-    "depcheck>@vue/compiler-sfc>postcss>nanoid": {
-      "globals": {
-        "crypto.getRandomValues": true
+    "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth>@ledgerhq/evm-tools>ethers": {
+      "packages": {
+        "@ethersproject/abi": true,
+        "ethers>@ethersproject/abstract-signer": true,
+        "ethers>@ethersproject/address": true,
+        "ethers>@ethersproject/base64": true,
+        "ethers>@ethersproject/basex": true,
+        "@ethersproject/bignumber": true,
+        "@ethersproject/bytes": true,
+        "ethers>@ethersproject/constants": true,
+        "@ethersproject/contracts": true,
+        "@ethersproject/hash": true,
+        "@ethersproject/hdnode": true,
+        "ethers>@ethersproject/json-wallets": true,
+        "ethers>@ethersproject/keccak256": true,
+        "ethers>@ethersproject/logger": true,
+        "ethers>@ethersproject/properties": true,
+        "@ethersproject/providers": true,
+        "ethers>@ethersproject/random": true,
+        "ethers>@ethersproject/rlp": true,
+        "ethers>@ethersproject/sha2": true,
+        "ethers>@ethersproject/signing-key": true,
+        "ethers>@ethersproject/solidity": true,
+        "ethers>@ethersproject/strings": true,
+        "ethers>@ethersproject/transactions": true,
+        "ethers>@ethersproject/units": true,
+        "@ethersproject/wallet": true,
+        "@ethersproject/providers>@ethersproject/web": true,
+        "ethers>@ethersproject/wordlists": true
       }
     },
-    "depcheck>is-core-module>hasown": {
+    "@metamask/ethjs>ethjs-abi": {
       "packages": {
-        "browserify>has>function-bind": true
+        "bn.js": true,
+        "browserify>buffer": true,
+        "@metamask/ethjs>js-sha3": true,
+        "@metamask/ethjs>ethjs-abi>number-to-bn": true
       }
     },
-    "dependency-tree>precinct>detective-postcss>postcss>nanoid": {
+    "webpack>events": {
       "globals": {
-        "crypto.getRandomValues": true
+        "console": true
       }
     },
-    "eslint-plugin-react>array-includes>is-string": {
+    "crypto-browserify>browserify-cipher>evp_bytestokey": {
       "packages": {
-        "koa>is-generator-function>has-tostringtag": true
+        "ethereumjs-util>create-hash>md5.js": true,
+        "koa>content-disposition>safe-buffer": true
       }
     },
-    "eth-ens-namehash": {
-      "globals": {
-        "name": "write"
-      },
+    "extension-port-stream": {
       "packages": {
-        "@metamask/ethjs>js-sha3": true,
         "browserify>buffer": true,
-        "eth-ens-namehash>idna-uts46-hx": true
+        "extension-port-stream>readable-stream": true
       }
     },
-    "eth-ens-namehash>idna-uts46-hx": {
+    "fast-json-patch": {
+      "globals": {
+        "addEventListener": true,
+        "clearTimeout": true,
+        "removeEventListener": true,
+        "setTimeout": true
+      }
+    },
+    "@metamask/snaps-utils>fast-xml-parser": {
       "globals": {
-        "define": true
+        "entityName": true,
+        "val": true
       },
       "packages": {
-        "browserify>punycode": true
+        "@metamask/snaps-utils>fast-xml-parser>strnum": true
       }
     },
-    "eth-keyring-controller>@metamask/browser-passworder": {
-      "globals": {
-        "crypto": true
+    "@metamask/notification-services-controller>firebase": {
+      "packages": {
+        "@metamask/notification-services-controller>firebase>@firebase/app": true,
+        "@metamask/notification-services-controller>firebase>@firebase/messaging": true
       }
     },
-    "eth-lattice-keyring": {
+    "react-focus-lock>focus-lock": {
       "globals": {
-        "addEventListener": true,
-        "browser": true,
-        "clearInterval": true,
-        "fetch": true,
-        "open": true,
-        "setInterval": true
+        "HTMLIFrameElement": true,
+        "Node.DOCUMENT_FRAGMENT_NODE": true,
+        "Node.DOCUMENT_NODE": true,
+        "Node.DOCUMENT_POSITION_CONTAINED_BY": true,
+        "Node.DOCUMENT_POSITION_CONTAINS": true,
+        "Node.ELEMENT_NODE": true,
+        "console.error": true,
+        "console.warn": true,
+        "document": true,
+        "getComputedStyle": true,
+        "setTimeout": true
       },
       "packages": {
-        "@ethereumjs/tx>@ethereumjs/util": true,
-        "bn.js": true,
-        "browserify>buffer": true,
-        "crypto-browserify": true,
-        "eth-lattice-keyring>@ethereumjs/tx": true,
-        "eth-lattice-keyring>gridplus-sdk": true,
-        "eth-lattice-keyring>rlp": true,
-        "webpack>events": true
+        "@swc/helpers>tslib": true
       }
     },
-    "eth-lattice-keyring>@ethereumjs/tx": {
+    "browserify>util>which-typed-array>for-each": {
       "packages": {
-        "@ethereumjs/tx>@ethereumjs/common": true,
-        "@ethereumjs/tx>@ethereumjs/rlp": true,
-        "@ethereumjs/tx>@ethereumjs/util": true,
-        "@ethersproject/providers": true,
-        "browserify>buffer": true,
-        "browserify>insert-module-globals>is-buffer": true,
-        "eth-lattice-keyring>@ethereumjs/tx>@chainsafe/ssz": true,
-        "eth-lattice-keyring>@ethereumjs/tx>ethereum-cryptography": true
+        "string.prototype.matchall>es-abstract>is-callable": true
       }
     },
-    "eth-lattice-keyring>@ethereumjs/tx>@chainsafe/ssz": {
-      "packages": {
-        "browserify": true,
-        "browserify>buffer": true,
-        "eth-lattice-keyring>@ethereumjs/tx>@chainsafe/ssz>@chainsafe/persistent-merkle-tree": true,
-        "eth-lattice-keyring>@ethereumjs/tx>@chainsafe/ssz>case": true
+    "axios>form-data": {
+      "globals": {
+        "FormData": true
       }
     },
-    "eth-lattice-keyring>@ethereumjs/tx>@chainsafe/ssz>@chainsafe/persistent-merkle-tree": {
+    "fuse.js": {
       "globals": {
-        "WeakRef": true
-      },
-      "packages": {
-        "browserify": true
+        "console": true,
+        "define": true
       }
     },
-    "eth-lattice-keyring>@ethereumjs/tx>ethereum-cryptography": {
+    "string.prototype.matchall>get-intrinsic": {
       "globals": {
-        "TextDecoder": true,
-        "crypto": true
+        "AggregateError": true,
+        "FinalizationRegistry": true,
+        "WeakRef": true
       },
       "packages": {
-        "eth-lattice-keyring>@ethereumjs/tx>ethereum-cryptography>@noble/hashes": true
+        "string.prototype.matchall>call-bind>es-errors": true,
+        "browserify>has>function-bind": true,
+        "string.prototype.matchall>es-abstract>has-proto": true,
+        "string.prototype.matchall>has-symbols": true,
+        "depcheck>is-core-module>hasown": true
       }
     },
-    "eth-lattice-keyring>@ethereumjs/tx>ethereum-cryptography>@noble/hashes": {
-      "globals": {
-        "TextEncoder": true,
-        "crypto": true
+    "string.prototype.matchall>es-abstract>gopd": {
+      "packages": {
+        "string.prototype.matchall>get-intrinsic": true
       }
     },
     "eth-lattice-keyring>gridplus-sdk": {
@@ -3815,230 +3705,307 @@
         "setTimeout": true
       },
       "packages": {
-        "@ethereumjs/tx>@ethereumjs/common>crc-32": true,
-        "@ethersproject/abi": true,
-        "@metamask/ethjs>js-sha3": true,
-        "@metamask/keyring-api>bech32": true,
-        "bn.js": true,
-        "browserify>buffer": true,
         "eth-lattice-keyring>gridplus-sdk>@ethereumjs/common": true,
         "eth-lattice-keyring>gridplus-sdk>@ethereumjs/tx": true,
+        "@ethersproject/abi": true,
         "eth-lattice-keyring>gridplus-sdk>aes-js": true,
+        "@metamask/keyring-api>bech32": true,
         "eth-lattice-keyring>gridplus-sdk>bignumber.js": true,
         "eth-lattice-keyring>gridplus-sdk>bitwise": true,
+        "bn.js": true,
         "eth-lattice-keyring>gridplus-sdk>borc": true,
+        "ethereumjs-util>ethereum-cryptography>bs58check": true,
+        "browserify>buffer": true,
+        "@ethereumjs/tx>@ethereumjs/common>crc-32": true,
         "eth-lattice-keyring>gridplus-sdk>elliptic": true,
         "eth-lattice-keyring>gridplus-sdk>eth-eip712-util-browser": true,
-        "eth-lattice-keyring>gridplus-sdk>uuid": true,
-        "eth-lattice-keyring>rlp": true,
-        "ethereumjs-util>ethereum-cryptography>bs58check": true,
         "ethers>@ethersproject/sha2>hash.js": true,
+        "@metamask/ethjs>js-sha3": true,
+        "lodash": true,
+        "eth-lattice-keyring>rlp": true,
         "ganache>secp256k1": true,
-        "lodash": true
+        "eth-lattice-keyring>gridplus-sdk>uuid": true
       }
     },
-    "eth-lattice-keyring>gridplus-sdk>@ethereumjs/common": {
+    "string.prototype.matchall>es-abstract>has-property-descriptors": {
       "packages": {
-        "@ethereumjs/tx>@ethereumjs/common>crc-32": true,
-        "@ethereumjs/tx>@ethereumjs/util": true,
-        "browserify>buffer": true,
-        "webpack>events": true
+        "string.prototype.matchall>call-bind>es-define-property": true
       }
     },
-    "eth-lattice-keyring>gridplus-sdk>@ethereumjs/tx": {
+    "koa>is-generator-function>has-tostringtag": {
       "packages": {
-        "@ethereumjs/tx>@ethereumjs/rlp": true,
-        "@ethereumjs/tx>@ethereumjs/util": true,
-        "@ethersproject/providers": true,
-        "browserify>buffer": true,
-        "browserify>insert-module-globals>is-buffer": true,
-        "eth-lattice-keyring>@ethereumjs/tx>@chainsafe/ssz": true,
-        "eth-lattice-keyring>gridplus-sdk>@ethereumjs/tx>@ethereumjs/common": true,
-        "eth-lattice-keyring>gridplus-sdk>@ethereumjs/tx>ethereum-cryptography": true
+        "string.prototype.matchall>has-symbols": true
       }
     },
-    "eth-lattice-keyring>gridplus-sdk>@ethereumjs/tx>@ethereumjs/common": {
+    "ethereumjs-util>create-hash>md5.js>hash-base": {
       "packages": {
-        "@ethereumjs/tx>@ethereumjs/common>crc-32": true,
-        "@ethereumjs/tx>@ethereumjs/util": true,
-        "browserify>buffer": true,
-        "webpack>events": true
+        "pumpify>inherits": true,
+        "readable-stream": true,
+        "koa>content-disposition>safe-buffer": true
       }
     },
-    "eth-lattice-keyring>gridplus-sdk>@ethereumjs/tx>ethereum-cryptography": {
+    "ethers>@ethersproject/sha2>hash.js": {
+      "packages": {
+        "pumpify>inherits": true,
+        "@metamask/ppom-validator>elliptic>minimalistic-assert": true
+      }
+    },
+    "depcheck>is-core-module>hasown": {
+      "packages": {
+        "browserify>has>function-bind": true
+      }
+    },
+    "@metamask/eth-trezor-keyring>hdkey": {
+      "packages": {
+        "browserify>assert": true,
+        "ethereumjs-util>ethereum-cryptography>bs58check": true,
+        "crypto-browserify": true,
+        "ethereumjs-util>create-hash>ripemd160": true,
+        "koa>content-disposition>safe-buffer": true,
+        "ganache>secp256k1": true
+      }
+    },
+    "he": {
       "globals": {
-        "TextDecoder": true,
-        "crypto": true
+        "define": true
+      }
+    },
+    "history": {
+      "globals": {
+        "console": true,
+        "define": true,
+        "document.defaultView": true,
+        "document.querySelector": true
+      }
+    },
+    "react-router-dom>history": {
+      "globals": {
+        "addEventListener": true,
+        "confirm": true,
+        "document": true,
+        "history": true,
+        "location": true,
+        "navigator.userAgent": true,
+        "removeEventListener": true
       },
       "packages": {
-        "eth-lattice-keyring>gridplus-sdk>@ethereumjs/tx>ethereum-cryptography>@noble/hashes": true
+        "react-router-dom>history>resolve-pathname": true,
+        "react-router-dom>tiny-invariant": true,
+        "react-router-dom>tiny-warning": true,
+        "react-router-dom>history>value-equal": true
       }
     },
-    "eth-lattice-keyring>gridplus-sdk>@ethereumjs/tx>ethereum-cryptography>@noble/hashes": {
+    "@metamask/ppom-validator>elliptic>hmac-drbg": {
+      "packages": {
+        "ethers>@ethersproject/sha2>hash.js": true,
+        "@metamask/ppom-validator>elliptic>minimalistic-assert": true,
+        "@metamask/ppom-validator>elliptic>minimalistic-crypto-utils": true
+      }
+    },
+    "react-redux>hoist-non-react-statics": {
+      "packages": {
+        "prop-types>react-is": true
+      }
+    },
+    "https-browserify": {
+      "packages": {
+        "stream-http": true,
+        "browserify>url": true
+      }
+    },
+    "@metamask/notification-services-controller>firebase>@firebase/app>idb": {
       "globals": {
-        "TextEncoder": true,
-        "crypto": true
+        "DOMException": true,
+        "IDBCursor": true,
+        "IDBDatabase": true,
+        "IDBIndex": true,
+        "IDBObjectStore": true,
+        "IDBRequest": true,
+        "IDBTransaction": true,
+        "indexedDB.deleteDatabase": true,
+        "indexedDB.open": true
       }
     },
-    "eth-lattice-keyring>gridplus-sdk>aes-js": {
+    "eth-ens-namehash>idna-uts46-hx": {
       "globals": {
         "define": true
+      },
+      "packages": {
+        "browserify>punycode": true
+      }
+    },
+    "string.prototype.matchall>internal-slot": {
+      "packages": {
+        "string.prototype.matchall>call-bind>es-errors": true,
+        "depcheck>is-core-module>hasown": true,
+        "string.prototype.matchall>side-channel": true
+      }
+    },
+    "browserify>util>is-arguments": {
+      "packages": {
+        "string.prototype.matchall>call-bind": true,
+        "koa>is-generator-function>has-tostringtag": true
+      }
+    },
+    "string.prototype.matchall>es-abstract>is-array-buffer": {
+      "packages": {
+        "string.prototype.matchall>call-bind": true,
+        "string.prototype.matchall>get-intrinsic": true
+      }
+    },
+    "@metamask/eth-token-tracker>deep-equal>which-boxed-primitive>is-bigint": {
+      "packages": {
+        "string.prototype.matchall>es-abstract>unbox-primitive>has-bigints": true
+      }
+    },
+    "@metamask/eth-token-tracker>deep-equal>which-boxed-primitive>is-boolean-object": {
+      "packages": {
+        "string.prototype.matchall>call-bind": true,
+        "koa>is-generator-function>has-tostringtag": true
+      }
+    },
+    "string.prototype.matchall>es-abstract>is-callable": {
+      "globals": {
+        "document": true
+      }
+    },
+    "@metamask/eth-token-tracker>deep-equal>is-date-object": {
+      "packages": {
+        "koa>is-generator-function>has-tostringtag": true
+      }
+    },
+    "koa>is-generator-function": {
+      "packages": {
+        "koa>is-generator-function>has-tostringtag": true
       }
     },
-    "eth-lattice-keyring>gridplus-sdk>bignumber.js": {
+    "@material-ui/core>@material-ui/styles>jss>is-in-browser": {
       "globals": {
-        "crypto": true,
-        "define": true
+        "document": true
       }
     },
-    "eth-lattice-keyring>gridplus-sdk>bitwise": {
+    "@metamask/eth-token-tracker>deep-equal>which-boxed-primitive>is-number-object": {
       "packages": {
-        "browserify>buffer": true
+        "koa>is-generator-function>has-tostringtag": true
       }
     },
-    "eth-lattice-keyring>gridplus-sdk>borc": {
-      "globals": {
-        "console": true
-      },
+    "string.prototype.matchall>es-abstract>is-regex": {
       "packages": {
-        "browserify>buffer": true,
-        "buffer>ieee754": true,
-        "eth-lattice-keyring>gridplus-sdk>borc>bignumber.js": true,
-        "eth-lattice-keyring>gridplus-sdk>borc>iso-url": true
+        "string.prototype.matchall>call-bind": true,
+        "koa>is-generator-function>has-tostringtag": true
       }
     },
-    "eth-lattice-keyring>gridplus-sdk>borc>bignumber.js": {
-      "globals": {
-        "crypto": true,
-        "define": true
+    "string.prototype.matchall>es-abstract>is-shared-array-buffer": {
+      "packages": {
+        "string.prototype.matchall>call-bind": true
       }
     },
-    "eth-lattice-keyring>gridplus-sdk>borc>iso-url": {
-      "globals": {
-        "URL": true,
-        "URLSearchParams": true,
-        "location": true
+    "eslint-plugin-react>array-includes>is-string": {
+      "packages": {
+        "koa>is-generator-function>has-tostringtag": true
       }
     },
-    "eth-lattice-keyring>gridplus-sdk>elliptic": {
+    "string.prototype.matchall>es-abstract>es-to-primitive>is-symbol": {
       "packages": {
-        "@metamask/ppom-validator>elliptic>brorand": true,
-        "@metamask/ppom-validator>elliptic>hmac-drbg": true,
-        "@metamask/ppom-validator>elliptic>minimalistic-assert": true,
-        "@metamask/ppom-validator>elliptic>minimalistic-crypto-utils": true,
-        "bn.js": true,
-        "ethers>@ethersproject/sha2>hash.js": true,
-        "pumpify>inherits": true
+        "string.prototype.matchall>has-symbols": true
       }
     },
-    "eth-lattice-keyring>gridplus-sdk>eth-eip712-util-browser": {
-      "globals": {
-        "intToBuffer": true
-      },
+    "browserify>util>is-typed-array": {
       "packages": {
-        "@metamask/ethjs>js-sha3": true,
-        "bn.js": true,
-        "buffer": true
+        "browserify>util>which-typed-array": true
       }
     },
-    "eth-lattice-keyring>gridplus-sdk>uuid": {
-      "globals": {
-        "crypto": true
+    "@metamask/eth-token-tracker>deep-equal>which-collection>is-weakset": {
+      "packages": {
+        "string.prototype.matchall>call-bind": true,
+        "string.prototype.matchall>get-intrinsic": true
       }
     },
-    "eth-lattice-keyring>rlp": {
+    "eth-lattice-keyring>gridplus-sdk>borc>iso-url": {
       "globals": {
-        "TextEncoder": true
-      }
-    },
-    "eth-method-registry": {
-      "packages": {
-        "@metamask/ethjs-contract": true,
-        "@metamask/ethjs-query": true
+        "URL": true,
+        "URLSearchParams": true,
+        "location": true
       }
     },
-    "ethereumjs-util": {
+    "@ensdomains/content-hash>js-base64": {
+      "globals": {
+        "Base64": "write",
+        "TextDecoder": true,
+        "TextEncoder": true,
+        "atob": true,
+        "btoa": true,
+        "define": true
+      },
       "packages": {
-        "bn.js": true,
-        "browserify>assert": true,
-        "browserify>buffer": true,
-        "browserify>insert-module-globals>is-buffer": true,
-        "ethereumjs-util>create-hash": true,
-        "ethereumjs-util>ethereum-cryptography": true,
-        "ethereumjs-util>rlp": true
+        "browserify>buffer": true
       }
     },
-    "ethereumjs-util>create-hash": {
+    "@metamask/ethjs>js-sha3": {
+      "globals": {
+        "define": true
+      },
       "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
+        "process": true
       }
     },
-    "ethereumjs-util>create-hash>cipher-base": {
-      "packages": {
-        "browserify>string_decoder": true,
-        "koa>content-disposition>safe-buffer": true,
-        "pumpify>inherits": true,
-        "stream-browserify": true
+    "@ngraveio/bc-ur>jsbi": {
+      "globals": {
+        "define": true
       }
     },
-    "ethereumjs-util>create-hash>md5.js": {
+    "@metamask/message-manager>jsonschema": {
       "packages": {
-        "ethereumjs-util>create-hash>md5.js>hash-base": true,
-        "koa>content-disposition>safe-buffer": true,
-        "pumpify>inherits": true
+        "browserify>url": true
       }
     },
-    "ethereumjs-util>create-hash>md5.js>hash-base": {
+    "@material-ui/core>@material-ui/styles>jss-plugin-camel-case": {
       "packages": {
-        "koa>content-disposition>safe-buffer": true,
-        "pumpify>inherits": true,
-        "readable-stream": true
+        "@material-ui/core>@material-ui/styles>jss-plugin-camel-case>hyphenate-style-name": true
       }
     },
-    "ethereumjs-util>create-hash>ripemd160": {
+    "@material-ui/core>@material-ui/styles>jss-plugin-default-unit": {
+      "globals": {
+        "CSS": true
+      },
       "packages": {
-        "browserify>buffer": true,
-        "ethereumjs-util>create-hash>md5.js>hash-base": true,
-        "pumpify>inherits": true
+        "@material-ui/core>@material-ui/styles>jss": true
       }
     },
-    "ethereumjs-util>ethereum-cryptography": {
+    "@material-ui/core>@material-ui/styles>jss-plugin-global": {
       "packages": {
-        "browserify>buffer": true,
-        "crypto-browserify>randombytes": true,
-        "ethereumjs-util>ethereum-cryptography>keccak": true,
-        "ganache>secp256k1": true
+        "@babel/runtime": true,
+        "@material-ui/core>@material-ui/styles>jss": true
       }
     },
-    "ethereumjs-util>ethereum-cryptography>browserify-aes": {
+    "@material-ui/core>@material-ui/styles>jss-plugin-nested": {
       "packages": {
-        "browserify>buffer": true,
-        "crypto-browserify>browserify-cipher>evp_bytestokey": true,
-        "ethereumjs-util>create-hash>cipher-base": true,
-        "ethereumjs-util>ethereum-cryptography>browserify-aes>buffer-xor": true,
-        "koa>content-disposition>safe-buffer": true,
-        "pumpify>inherits": true
+        "@babel/runtime": true,
+        "react-router-dom>tiny-warning": true
       }
     },
-    "ethereumjs-util>ethereum-cryptography>browserify-aes>buffer-xor": {
+    "@material-ui/core>@material-ui/styles>jss-plugin-rule-value-function": {
       "packages": {
-        "browserify>buffer": true
+        "@material-ui/core>@material-ui/styles>jss": true,
+        "react-router-dom>tiny-warning": true
       }
     },
-    "ethereumjs-util>ethereum-cryptography>bs58check": {
+    "@material-ui/core>@material-ui/styles>jss-plugin-vendor-prefixer": {
       "packages": {
-        "ethereumjs-util>create-hash": true,
-        "ethereumjs-util>ethereum-cryptography>bs58check>bs58": true,
-        "koa>content-disposition>safe-buffer": true
+        "@material-ui/core>@material-ui/styles>jss-plugin-vendor-prefixer>css-vendor": true,
+        "@material-ui/core>@material-ui/styles>jss": true
       }
     },
-    "ethereumjs-util>ethereum-cryptography>bs58check>bs58": {
+    "@material-ui/core>@material-ui/styles>jss": {
+      "globals": {
+        "CSS": true,
+        "document.createElement": true,
+        "document.querySelector": true
+      },
       "packages": {
-        "@ensdomains/content-hash>multihashes>multibase>base-x": true
+        "@babel/runtime": true,
+        "@material-ui/core>@material-ui/styles>jss>is-in-browser": true,
+        "react-router-dom>tiny-warning": true
       }
     },
     "ethereumjs-util>ethereum-cryptography>keccak": {
@@ -4047,536 +4014,496 @@
         "readable-stream": true
       }
     },
-    "ethereumjs-util>rlp": {
-      "packages": {
-        "bn.js": true,
-        "browserify>buffer": true
+    "currency-formatter>locale-currency": {
+      "globals": {
+        "countryCode": true
       }
     },
-    "ethereumjs-wallet>randombytes": {
+    "localforage": {
       "globals": {
-        "crypto.getRandomValues": true
+        "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
       }
     },
-    "ethers": {
-      "packages": {
-        "@ethersproject/abi": true,
-        "@ethersproject/bignumber": true,
-        "@ethersproject/bytes": true,
-        "@ethersproject/contracts": true,
-        "@ethersproject/hash": true,
-        "@ethersproject/hdnode": true,
-        "@ethersproject/wallet": true,
-        "ethers>@ethersproject/abstract-signer": true,
-        "ethers>@ethersproject/address": true,
-        "ethers>@ethersproject/base64": true,
-        "ethers>@ethersproject/basex": true,
-        "ethers>@ethersproject/constants": true,
-        "ethers>@ethersproject/json-wallets": true,
-        "ethers>@ethersproject/keccak256": true,
-        "ethers>@ethersproject/logger": true,
-        "ethers>@ethersproject/properties": true,
-        "ethers>@ethersproject/providers": true,
-        "ethers>@ethersproject/random": true,
-        "ethers>@ethersproject/rlp": true,
-        "ethers>@ethersproject/sha2": true,
-        "ethers>@ethersproject/signing-key": true,
-        "ethers>@ethersproject/solidity": true,
-        "ethers>@ethersproject/strings": true,
-        "ethers>@ethersproject/transactions": true,
-        "ethers>@ethersproject/units": true,
-        "ethers>@ethersproject/web": true,
-        "ethers>@ethersproject/wordlists": true
+    "lodash": {
+      "globals": {
+        "clearTimeout": true,
+        "define": true,
+        "setTimeout": true
       }
     },
-    "ethers>@ethersproject/abstract-provider": {
-      "packages": {
-        "@ethersproject/bignumber": true,
-        "@ethersproject/bytes": true,
-        "ethers>@ethersproject/logger": true,
-        "ethers>@ethersproject/properties": true
+    "loglevel": {
+      "globals": {
+        "console": true,
+        "define": true,
+        "document.cookie": true,
+        "localStorage": true,
+        "log": "write",
+        "navigator": true
       }
-    },
-    "ethers>@ethersproject/abstract-signer": {
-      "packages": {
-        "ethers>@ethersproject/logger": true,
-        "ethers>@ethersproject/properties": true
+    },
+    "lottie-web": {
+      "globals": {
+        "Blob": true,
+        "Howl": true,
+        "OffscreenCanvas": true,
+        "URL.createObjectURL": true,
+        "Worker": true,
+        "XMLHttpRequest": true,
+        "bodymovin": "write",
+        "clearInterval": true,
+        "console": true,
+        "define": true,
+        "document.body": true,
+        "document.createElement": true,
+        "document.createElementNS": true,
+        "document.getElementsByClassName": true,
+        "document.getElementsByTagName": true,
+        "document.querySelectorAll": true,
+        "document.readyState": true,
+        "location.origin": true,
+        "location.pathname": true,
+        "navigator": true,
+        "requestAnimationFrame": true,
+        "setInterval": true,
+        "setTimeout": true
       }
     },
-    "ethers>@ethersproject/address": {
-      "packages": {
-        "@ethersproject/bignumber": true,
-        "@ethersproject/bytes": true,
-        "ethers>@ethersproject/keccak256": true,
-        "ethers>@ethersproject/logger": true,
-        "ethers>@ethersproject/rlp": true
+    "luxon": {
+      "globals": {
+        "Intl": true
       }
     },
-    "ethers>@ethersproject/base64": {
+    "@metamask/snaps-utils>marked": {
       "globals": {
-        "atob": true,
-        "btoa": true
-      },
-      "packages": {
-        "@ethersproject/bytes": true
+        "console.error": true,
+        "console.warn": true,
+        "define": true
       }
     },
-    "ethers>@ethersproject/basex": {
+    "ethereumjs-util>create-hash>md5.js": {
       "packages": {
-        "@ethersproject/bytes": true,
-        "ethers>@ethersproject/properties": true
+        "ethereumjs-util>create-hash>md5.js>hash-base": true,
+        "pumpify>inherits": true,
+        "koa>content-disposition>safe-buffer": true
       }
     },
-    "ethers>@ethersproject/constants": {
+    "@storybook/addon-docs>remark-external-links>mdast-util-definitions": {
       "packages": {
-        "@ethersproject/bignumber": true
+        "react-markdown>unist-util-visit": true
       }
     },
-    "ethers>@ethersproject/json-wallets": {
+    "react-markdown>remark-parse>mdast-util-from-markdown": {
       "packages": {
-        "@ethersproject/bytes": true,
-        "@ethersproject/hdnode": true,
-        "ethers>@ethersproject/address": true,
-        "ethers>@ethersproject/json-wallets>aes-js": true,
-        "ethers>@ethersproject/json-wallets>scrypt-js": true,
-        "ethers>@ethersproject/keccak256": true,
-        "ethers>@ethersproject/logger": true,
-        "ethers>@ethersproject/pbkdf2": true,
-        "ethers>@ethersproject/properties": true,
-        "ethers>@ethersproject/random": true,
-        "ethers>@ethersproject/strings": true,
-        "ethers>@ethersproject/transactions": true
+        "react-markdown>remark-parse>mdast-util-from-markdown>mdast-util-to-string": true,
+        "react-markdown>remark-parse>mdast-util-from-markdown>micromark": true,
+        "react-syntax-highlighter>refractor>parse-entities": true,
+        "react-markdown>remark-parse>mdast-util-from-markdown>unist-util-stringify-position": true
       }
     },
-    "ethers>@ethersproject/json-wallets>aes-js": {
+    "react-markdown>remark-rehype>mdast-util-to-hast": {
       "globals": {
-        "define": true
+        "console.warn": true
+      },
+      "packages": {
+        "@storybook/addon-docs>remark-external-links>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
       }
     },
-    "ethers>@ethersproject/json-wallets>scrypt-js": {
+    "@ethereumjs/tx>@ethereumjs/util>micro-ftch": {
       "globals": {
-        "define": true,
-        "setTimeout": true
+        "Headers": true,
+        "TextDecoder": true,
+        "URL": true,
+        "btoa": true,
+        "fetch": true
       },
       "packages": {
-        "browserify>timers-browserify": true
+        "browserify>browserify-zlib": true,
+        "browserify>buffer": true,
+        "https-browserify": true,
+        "process": true,
+        "stream-http": true,
+        "browserify>url": true,
+        "browserify>util": true
       }
     },
-    "ethers>@ethersproject/keccak256": {
+    "react-markdown>remark-parse>mdast-util-from-markdown>micromark": {
       "packages": {
-        "@ethersproject/bytes": true,
-        "@metamask/ethjs>js-sha3": true
-      }
-    },
-    "ethers>@ethersproject/logger": {
-      "globals": {
-        "console": true
+        "react-syntax-highlighter>refractor>parse-entities": true
       }
     },
-    "ethers>@ethersproject/pbkdf2": {
+    "crypto-browserify>diffie-hellman>miller-rabin": {
       "packages": {
-        "@ethersproject/bytes": true,
-        "ethers>@ethersproject/sha2": true
+        "bn.js": true,
+        "@metamask/ppom-validator>elliptic>brorand": true
       }
     },
-    "ethers>@ethersproject/properties": {
+    "@ensdomains/content-hash>cids>multibase": {
+      "globals": {
+        "TextDecoder": true,
+        "TextEncoder": true
+      },
       "packages": {
-        "ethers>@ethersproject/logger": true
+        "@ensdomains/content-hash>cids>multibase>@multiformats/base-x": true
       }
     },
-    "ethers>@ethersproject/providers": {
-      "globals": {
-        "WebSocket": true,
-        "clearInterval": true,
-        "clearTimeout": true,
-        "console.log": true,
-        "console.warn": true,
-        "setInterval": true,
-        "setTimeout": true
-      },
+    "@ensdomains/content-hash>multihashes>multibase": {
       "packages": {
-        "@ethersproject/bignumber": true,
-        "@ethersproject/bytes": true,
-        "@ethersproject/hash": true,
-        "ethers>@ethersproject/abstract-provider": true,
-        "ethers>@ethersproject/abstract-signer": true,
-        "ethers>@ethersproject/address": true,
-        "ethers>@ethersproject/base64": true,
-        "ethers>@ethersproject/basex": true,
-        "ethers>@ethersproject/constants": true,
-        "ethers>@ethersproject/logger": true,
-        "ethers>@ethersproject/properties": true,
-        "ethers>@ethersproject/providers>@ethersproject/networks": true,
-        "ethers>@ethersproject/providers>@ethersproject/web": true,
-        "ethers>@ethersproject/providers>bech32": true,
-        "ethers>@ethersproject/random": true,
-        "ethers>@ethersproject/sha2": true,
-        "ethers>@ethersproject/strings": true,
-        "ethers>@ethersproject/transactions": true
+        "@ensdomains/content-hash>multihashes>multibase>base-x": true,
+        "browserify>buffer": true,
+        "@ensdomains/content-hash>multihashes>web-encoding": true
       }
     },
-    "ethers>@ethersproject/providers>@ethersproject/networks": {
+    "@ensdomains/content-hash>multicodec": {
       "packages": {
-        "ethers>@ethersproject/logger": true
+        "@ensdomains/content-hash>multicodec>uint8arrays": true,
+        "sass-embedded>varint": true
       }
     },
-    "ethers>@ethersproject/providers>@ethersproject/web": {
+    "@ensdomains/content-hash>multicodec>uint8arrays>multiformats": {
       "globals": {
-        "clearTimeout": true,
-        "fetch": true,
-        "setTimeout": true
-      },
-      "packages": {
-        "@ethersproject/bytes": true,
-        "ethers>@ethersproject/base64": true,
-        "ethers>@ethersproject/logger": true,
-        "ethers>@ethersproject/properties": true,
-        "ethers>@ethersproject/strings": true
+        "TextDecoder": true,
+        "TextEncoder": true,
+        "console.warn": true,
+        "crypto.subtle.digest": true
       }
     },
-    "ethers>@ethersproject/random": {
+    "@ensdomains/content-hash>multihashes": {
       "packages": {
-        "@ethersproject/bytes": true,
-        "ethers>@ethersproject/logger": true
+        "browserify>buffer": true,
+        "@ensdomains/content-hash>multihashes>multibase": true,
+        "@ensdomains/content-hash>multihashes>varint": true,
+        "@ensdomains/content-hash>multihashes>web-encoding": true
       }
     },
-    "ethers>@ethersproject/rlp": {
+    "@ensdomains/content-hash>cids>multihashes": {
       "packages": {
-        "@ethersproject/bytes": true,
-        "ethers>@ethersproject/logger": true
+        "@ensdomains/content-hash>cids>multibase": true,
+        "@ensdomains/content-hash>cids>uint8arrays": true,
+        "@ensdomains/content-hash>cids>multihashes>varint": true
       }
     },
-    "ethers>@ethersproject/sha2": {
-      "packages": {
-        "@ethersproject/bytes": true,
-        "ethers>@ethersproject/logger": true,
-        "ethers>@ethersproject/sha2>hash.js": true
+    "nanoid": {
+      "globals": {
+        "crypto.getRandomValues": true
       }
     },
-    "ethers>@ethersproject/sha2>hash.js": {
-      "packages": {
-        "@metamask/ppom-validator>elliptic>minimalistic-assert": true,
-        "pumpify>inherits": true
+    "@metamask/approval-controller>nanoid": {
+      "globals": {
+        "crypto.getRandomValues": true
       }
     },
-    "ethers>@ethersproject/signing-key": {
-      "packages": {
-        "@ethersproject/bytes": true,
-        "ethers>@ethersproject/logger": true,
-        "ethers>@ethersproject/properties": true,
-        "ethers>@ethersproject/signing-key>elliptic": true
+    "@metamask/smart-transactions-controller>@metamask/controllers>nanoid": {
+      "globals": {
+        "crypto.getRandomValues": true
       }
     },
-    "ethers>@ethersproject/signing-key>elliptic": {
-      "packages": {
-        "@metamask/ppom-validator>elliptic>brorand": true,
-        "@metamask/ppom-validator>elliptic>hmac-drbg": true,
-        "@metamask/ppom-validator>elliptic>minimalistic-assert": true,
-        "@metamask/ppom-validator>elliptic>minimalistic-crypto-utils": true,
-        "bn.js": true,
-        "ethers>@ethersproject/sha2>hash.js": true,
-        "pumpify>inherits": true
+    "@metamask/notification-controller>nanoid": {
+      "globals": {
+        "crypto.getRandomValues": true
       }
     },
-    "ethers>@ethersproject/solidity": {
-      "packages": {
-        "@ethersproject/bignumber": true,
-        "@ethersproject/bytes": true,
-        "ethers>@ethersproject/keccak256": true,
-        "ethers>@ethersproject/logger": true,
-        "ethers>@ethersproject/sha2": true,
-        "ethers>@ethersproject/strings": true
+    "@metamask/permission-controller>nanoid": {
+      "globals": {
+        "crypto.getRandomValues": true
       }
     },
-    "ethers>@ethersproject/strings": {
-      "packages": {
-        "@ethersproject/bytes": true,
-        "ethers>@ethersproject/constants": true,
-        "ethers>@ethersproject/logger": true
+    "@metamask/rpc-methods>nanoid": {
+      "globals": {
+        "crypto.getRandomValues": true
       }
     },
-    "ethers>@ethersproject/transactions": {
-      "packages": {
-        "@ethersproject/bignumber": true,
-        "@ethersproject/bytes": true,
-        "ethers>@ethersproject/address": true,
-        "ethers>@ethersproject/constants": true,
-        "ethers>@ethersproject/keccak256": true,
-        "ethers>@ethersproject/logger": true,
-        "ethers>@ethersproject/properties": true,
-        "ethers>@ethersproject/rlp": true,
-        "ethers>@ethersproject/signing-key": true
+    "@metamask/rpc-methods-flask>nanoid": {
+      "globals": {
+        "crypto.getRandomValues": true
       }
     },
-    "ethers>@ethersproject/units": {
-      "packages": {
-        "@ethersproject/bignumber": true,
-        "ethers>@ethersproject/logger": true
+    "@metamask/snaps-controllers>nanoid": {
+      "globals": {
+        "crypto.getRandomValues": true
       }
     },
-    "ethers>@ethersproject/web": {
+    "@metamask/snaps-controllers-flask>nanoid": {
       "globals": {
-        "clearTimeout": true,
-        "fetch": true,
-        "setTimeout": true
-      },
-      "packages": {
-        "@ethersproject/bytes": true,
-        "ethers>@ethersproject/base64": true,
-        "ethers>@ethersproject/logger": true,
-        "ethers>@ethersproject/properties": true,
-        "ethers>@ethersproject/strings": true
+        "crypto.getRandomValues": true
       }
     },
-    "ethers>@ethersproject/wordlists": {
-      "packages": {
-        "@ethersproject/bytes": true,
-        "@ethersproject/hash": true,
-        "ethers>@ethersproject/logger": true,
-        "ethers>@ethersproject/properties": true,
-        "ethers>@ethersproject/strings": true
+    "depcheck>@vue/compiler-sfc>postcss>nanoid": {
+      "globals": {
+        "crypto.getRandomValues": true
       }
     },
-    "extension-port-stream": {
-      "packages": {
-        "browserify>buffer": true,
-        "extension-port-stream>readable-stream": true
+    "dependency-tree>precinct>detective-postcss>postcss>nanoid": {
+      "globals": {
+        "crypto.getRandomValues": true
       }
     },
-    "extension-port-stream>readable-stream": {
+    "node-fetch": {
       "globals": {
-        "AbortController": true,
-        "AggregateError": true,
-        "Blob": true
-      },
-      "packages": {
-        "browserify>buffer": true,
-        "browserify>string_decoder": true,
-        "extension-port-stream>readable-stream>abort-controller": true,
-        "process": true,
-        "webpack>events": true
+        "Headers": true,
+        "Request": true,
+        "Response": true,
+        "fetch": true
       }
     },
-    "extension-port-stream>readable-stream>abort-controller": {
+    "@metamask/controllers>web3-provider-engine>cross-fetch>node-fetch": {
       "globals": {
-        "AbortController": true
+        "fetch": true
       }
     },
-    "fast-json-patch": {
+    "@metamask/controllers>web3-provider-engine>eth-json-rpc-middleware>node-fetch": {
       "globals": {
-        "addEventListener": true,
-        "clearTimeout": true,
-        "removeEventListener": true,
-        "setTimeout": true
+        "fetch": true
       }
     },
-    "fuse.js": {
+    "@metamask/ethjs>ethjs-abi>number-to-bn": {
+      "packages": {
+        "bn.js": true,
+        "@metamask/ethjs>@metamask/ethjs-util>strip-hex-prefix": true
+      }
+    },
+    "string.prototype.matchall>es-abstract>object-inspect": {
       "globals": {
-        "console": true,
-        "define": true
+        "HTMLElement": true,
+        "WeakRef": true
+      },
+      "packages": {
+        "browserify>browser-resolve": true
       }
     },
-    "ganache>secp256k1": {
+    "@ngraveio/bc-ur>assert>object-is": {
       "packages": {
-        "@metamask/ppom-validator>elliptic": true
+        "string.prototype.matchall>call-bind": true,
+        "string.prototype.matchall>define-properties": true
       }
     },
     "gulp>vinyl-fs>object.assign": {
       "packages": {
-        "@lavamoat/lavapack>json-stable-stringify>object-keys": true,
         "string.prototype.matchall>call-bind": true,
         "string.prototype.matchall>define-properties": true,
-        "string.prototype.matchall>has-symbols": true
+        "string.prototype.matchall>has-symbols": true,
+        "@lavamoat/lavapack>json-stable-stringify>object-keys": true
       }
     },
-    "he": {
-      "globals": {
-        "define": true
+    "@metamask/object-multiplex>once": {
+      "packages": {
+        "@metamask/object-multiplex>once>wrappy": true
       }
     },
-    "history": {
-      "globals": {
-        "console": true,
-        "define": true,
-        "document.defaultView": true,
-        "document.querySelector": true
+    "crypto-browserify>public-encrypt>parse-asn1": {
+      "packages": {
+        "crypto-browserify>public-encrypt>parse-asn1>asn1.js": true,
+        "ethereumjs-util>ethereum-cryptography>browserify-aes": true,
+        "browserify>buffer": true,
+        "crypto-browserify>browserify-cipher>evp_bytestokey": true,
+        "crypto-browserify>pbkdf2": true
       }
     },
-    "https-browserify": {
-      "packages": {
-        "browserify>url": true,
-        "stream-http": true
+    "react-syntax-highlighter>refractor>parse-entities": {
+      "globals": {
+        "document.createElement": true
       }
     },
-    "koa>content-disposition>safe-buffer": {
+    "path-browserify": {
       "packages": {
-        "browserify>buffer": true
+        "process": true
       }
     },
-    "koa>is-generator-function": {
+    "serve-handler>path-to-regexp": {
       "packages": {
-        "koa>is-generator-function>has-tostringtag": true
+        "serve-handler>path-to-regexp>isarray": true
       }
     },
-    "koa>is-generator-function>has-tostringtag": {
+    "crypto-browserify>pbkdf2": {
+      "globals": {
+        "crypto": true,
+        "process": true,
+        "queueMicrotask": true,
+        "setImmediate": true,
+        "setTimeout": true
+      },
       "packages": {
-        "string.prototype.matchall>has-symbols": true
+        "ethereumjs-util>create-hash": true,
+        "process": true,
+        "ethereumjs-util>create-hash>ripemd160": true,
+        "koa>content-disposition>safe-buffer": true,
+        "addons-linter>sha.js": true
       }
     },
-    "localforage": {
+    "@material-ui/core>popper.js": {
       "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,
+        "MSInputMethodContext": true,
+        "Node.DOCUMENT_POSITION_FOLLOWING": true,
+        "cancelAnimationFrame": 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
+        "devicePixelRatio": true,
+        "document": true,
+        "getComputedStyle": true,
+        "innerHeight": true,
+        "innerWidth": true,
+        "navigator": true,
+        "requestAnimationFrame": true,
+        "setTimeout": true
       }
     },
-    "lodash": {
+    "react-tippy>popper.js": {
       "globals": {
-        "clearTimeout": true,
+        "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
       }
     },
-    "loglevel": {
+    "process": {
       "globals": {
-        "console": true,
-        "define": true,
-        "document.cookie": true,
-        "localStorage": true,
-        "log": "write",
-        "navigator": true
+        "clearTimeout": true,
+        "setTimeout": true
       }
     },
-    "lottie-web": {
-      "globals": {
-        "Blob": true,
-        "Howl": true,
-        "OffscreenCanvas": true,
-        "URL.createObjectURL": true,
-        "Worker": true,
-        "XMLHttpRequest": true,
-        "bodymovin": "write",
-        "clearInterval": true,
-        "console": true,
-        "define": true,
-        "document.body": true,
-        "document.createElement": true,
-        "document.createElementNS": true,
-        "document.getElementsByClassName": true,
-        "document.getElementsByTagName": true,
-        "document.querySelectorAll": true,
-        "document.readyState": true,
-        "location.origin": true,
-        "location.pathname": true,
-        "navigator": true,
-        "requestAnimationFrame": true,
-        "setInterval": true,
-        "setTimeout": true
+    "promise-to-callback": {
+      "packages": {
+        "promise-to-callback>is-fn": true,
+        "promise-to-callback>set-immediate-shim": true
       }
     },
-    "luxon": {
+    "prop-types": {
       "globals": {
-        "Intl": true
+        "console": true
+      },
+      "packages": {
+        "react>object-assign": true,
+        "prop-types>react-is": true
       }
     },
-    "nanoid": {
-      "globals": {
-        "crypto.getRandomValues": true
+    "react-markdown>property-information": {
+      "packages": {
+        "watchify>xtend": true
       }
     },
-    "nock>debug": {
+    "@trezor/connect-web>@trezor/connect>@trezor/protobuf>protobufjs": {
       "globals": {
-        "console": true,
-        "document": true,
-        "localStorage": true,
-        "navigator": true,
-        "process": true
+        "process": true,
+        "setTimeout": true
       },
       "packages": {
-        "nock>debug>ms": true,
-        "process": true
+        "@trezor/connect-web>@trezor/connect>@trezor/protobuf>protobufjs>@protobufjs/aspromise": true,
+        "@trezor/connect-web>@trezor/connect>@trezor/protobuf>protobufjs>@protobufjs/base64": true,
+        "@trezor/connect-web>@trezor/connect>@trezor/protobuf>protobufjs>@protobufjs/codegen": true,
+        "@trezor/connect-web>@trezor/connect>@trezor/protobuf>protobufjs>@protobufjs/eventemitter": true,
+        "@trezor/connect-web>@trezor/connect>@trezor/protobuf>protobufjs>@protobufjs/fetch": true,
+        "@trezor/connect-web>@trezor/connect>@trezor/protobuf>protobufjs>@protobufjs/float": true,
+        "@trezor/connect-web>@trezor/connect>@trezor/protobuf>protobufjs>@protobufjs/inquire": true,
+        "@trezor/connect-web>@trezor/connect>@trezor/protobuf>protobufjs>@protobufjs/path": true,
+        "@trezor/connect-web>@trezor/connect>@trezor/protobuf>protobufjs>@protobufjs/pool": true,
+        "@trezor/connect-web>@trezor/connect>@trezor/protobuf>protobufjs>@protobufjs/utf8": true
+      }
+    },
+    "crypto-browserify>public-encrypt": {
+      "packages": {
+        "bn.js": true,
+        "crypto-browserify>public-encrypt>browserify-rsa": true,
+        "browserify>buffer": true,
+        "ethereumjs-util>create-hash": true,
+        "crypto-browserify>public-encrypt>parse-asn1": true,
+        "crypto-browserify>randombytes": true
       }
     },
-    "node-fetch": {
+    "browserify>punycode": {
       "globals": {
-        "Headers": true,
-        "Request": true,
-        "Response": true,
-        "fetch": true
+        "define": true
       }
     },
-    "path-browserify": {
-      "packages": {
-        "process": true
+    "qrcode-generator": {
+      "globals": {
+        "define": true
       }
     },
-    "process": {
+    "qrcode.react": {
       "globals": {
-        "clearTimeout": true,
-        "setTimeout": true
+        "Path2D": true,
+        "devicePixelRatio": true
+      },
+      "packages": {
+        "react": true
       }
     },
-    "promise-to-callback": {
+    "@storybook/addon-knobs>qs": {
       "packages": {
-        "promise-to-callback>is-fn": true,
-        "promise-to-callback>set-immediate-shim": true
+        "string.prototype.matchall>side-channel": true
       }
     },
-    "promise-to-callback>set-immediate-shim": {
+    "@metamask/snaps-controllers>tar-stream>streamx>queue-tick": {
       "globals": {
-        "setTimeout.apply": true
-      },
-      "packages": {
-        "browserify>timers-browserify": true
+        "queueMicrotask": true
       }
     },
-    "prop-types": {
+    "react-beautiful-dnd>raf-schd": {
       "globals": {
-        "console": true
-      },
-      "packages": {
-        "prop-types>react-is": true,
-        "react>object-assign": true
+        "cancelAnimationFrame": true,
+        "requestAnimationFrame": true
       }
     },
-    "prop-types>react-is": {
+    "crypto-browserify>randombytes": {
       "globals": {
-        "console": true
+        "crypto": true,
+        "msCrypto": true
+      },
+      "packages": {
+        "process": true,
+        "koa>content-disposition>safe-buffer": true
       }
     },
-    "qrcode-generator": {
+    "ethereumjs-wallet>randombytes": {
       "globals": {
-        "define": true
+        "crypto.getRandomValues": true
       }
     },
-    "qrcode.react": {
+    "crypto-browserify>randomfill": {
       "globals": {
-        "Path2D": true,
-        "devicePixelRatio": true
+        "crypto": true,
+        "msCrypto": true
       },
       "packages": {
-        "react": true
+        "process": true,
+        "crypto-browserify>randombytes": true,
+        "koa>content-disposition>safe-buffer": true
       }
     },
     "react": {
@@ -4584,8 +4511,8 @@
         "console": true
       },
       "packages": {
-        "prop-types": true,
-        "react>object-assign": true
+        "react>object-assign": true,
+        "prop-types": true
       }
     },
     "react-beautiful-dnd": {
@@ -4607,43 +4534,28 @@
       },
       "packages": {
         "@babel/runtime": true,
-        "react": true,
         "react-beautiful-dnd>css-box-model": true,
         "react-beautiful-dnd>memoize-one": true,
         "react-beautiful-dnd>raf-schd": true,
-        "react-beautiful-dnd>use-memo-one": true,
+        "react": true,
         "react-dom": true,
         "react-redux": true,
-        "redux": true
+        "redux": true,
+        "react-beautiful-dnd>use-memo-one": true
       }
     },
-    "react-beautiful-dnd>css-box-model": {
+    "react-chartjs-2": {
       "globals": {
-        "getComputedStyle": true,
-        "pageXOffset": true,
-        "pageYOffset": true
+        "setTimeout": true
       },
       "packages": {
-        "react-router-dom>tiny-invariant": true
-      }
-    },
-    "react-beautiful-dnd>raf-schd": {
-      "globals": {
-        "cancelAnimationFrame": true,
-        "requestAnimationFrame": true
-      }
-    },
-    "react-beautiful-dnd>use-memo-one": {
-      "packages": {
+        "chart.js": true,
         "react": true
       }
     },
-    "react-chartjs-2": {
-      "globals": {
-        "setTimeout": true
-      },
+    "react-focus-lock>react-clientside-effect": {
       "packages": {
-        "chart.js": true,
+        "@babel/runtime": true,
         "react": true
       }
     },
@@ -4688,22 +4600,28 @@
         "trustedTypes": true
       },
       "packages": {
+        "react>object-assign": true,
         "prop-types": true,
         "react": true,
-        "react-dom>scheduler": true,
-        "react>object-assign": true
+        "react-dom>scheduler": true
       }
     },
-    "react-dom>scheduler": {
+    "react-responsive-carousel>react-easy-swipe": {
       "globals": {
-        "MessageChannel": true,
-        "cancelAnimationFrame": true,
-        "clearTimeout": true,
-        "console": true,
-        "navigator": true,
-        "performance": true,
-        "requestAnimationFrame": true,
-        "setTimeout": true
+        "addEventListener": true,
+        "define": true,
+        "document.addEventListener": true,
+        "document.removeEventListener": true
+      },
+      "packages": {
+        "prop-types": true,
+        "react": true
+      }
+    },
+    "react-popper>react-fast-compare": {
+      "globals": {
+        "Element": true,
+        "console.warn": true
       }
     },
     "react-focus-lock": {
@@ -4717,667 +4635,726 @@
       },
       "packages": {
         "@babel/runtime": true,
+        "react-focus-lock>focus-lock": true,
         "prop-types": true,
         "react": true,
-        "react-focus-lock>focus-lock": true,
         "react-focus-lock>react-clientside-effect": true,
         "react-focus-lock>use-callback-ref": true,
         "react-focus-lock>use-sidecar": true
       }
     },
-    "react-focus-lock>focus-lock": {
+    "react-idle-timer": {
       "globals": {
-        "HTMLIFrameElement": true,
-        "Node.DOCUMENT_FRAGMENT_NODE": true,
-        "Node.DOCUMENT_NODE": true,
-        "Node.DOCUMENT_POSITION_CONTAINED_BY": true,
-        "Node.DOCUMENT_POSITION_CONTAINS": true,
-        "Node.ELEMENT_NODE": true,
-        "console.error": true,
+        "clearTimeout": true,
+        "document": true,
+        "setTimeout": true
+      },
+      "packages": {
+        "prop-types": true,
+        "react": true
+      }
+    },
+    "react-inspector": {
+      "globals": {
+        "Node": true,
+        "chromeDark": true,
+        "chromeLight": true
+      },
+      "packages": {
+        "react": true
+      }
+    },
+    "prop-types>react-is": {
+      "globals": {
+        "console": true
+      }
+    },
+    "react-markdown>react-is": {
+      "globals": {
+        "console": true
+      }
+    },
+    "react-redux>react-is": {
+      "globals": {
+        "console": true
+      }
+    },
+    "react-markdown": {
+      "globals": {
+        "console.warn": true
+      },
+      "packages": {
+        "react-markdown>comma-separated-tokens": true,
+        "prop-types": true,
+        "react-markdown>property-information": true,
+        "react": 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-popper": {
+      "globals": {
+        "document": true
+      },
+      "packages": {
+        "@popperjs/core": true,
+        "react": true,
+        "react-popper>react-fast-compare": true,
+        "react-popper>warning": true
+      }
+    },
+    "react-redux": {
+      "globals": {
+        "console": true,
+        "document": true
+      },
+      "packages": {
+        "@babel/runtime": true,
+        "react-redux>hoist-non-react-statics": true,
+        "prop-types": true,
+        "react": true,
+        "react-dom": true,
+        "react-redux>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-router-dom": {
+      "packages": {
+        "react-router-dom>history": true,
+        "prop-types": true,
+        "react": true,
+        "react-router-dom>react-router": true,
+        "react-router-dom>tiny-invariant": true,
+        "react-router-dom>tiny-warning": true
+      }
+    },
+    "react-router-dom-v5-compat": {
+      "globals": {
+        "FormData": true,
+        "URL": true,
+        "URLSearchParams": true,
+        "__reactRouterVersion": "write",
+        "addEventListener": true,
+        "confirm": true,
+        "define": true,
+        "document": true,
+        "history.scrollRestoration": true,
+        "location.href": true,
+        "removeEventListener": true,
+        "scrollTo": true,
+        "scrollY": true,
+        "sessionStorage.getItem": true,
+        "sessionStorage.setItem": true,
         "setTimeout": true
       },
       "packages": {
-        "@swc/helpers>tslib": true
+        "react-router-dom-v5-compat>@remix-run/router": true,
+        "history": true,
+        "react": true,
+        "react-dom": true,
+        "react-router-dom": true,
+        "react-router-dom-v5-compat>react-router": true
       }
     },
-    "react-focus-lock>react-clientside-effect": {
+    "react-router-dom>react-router": {
       "packages": {
-        "@babel/runtime": true,
-        "react": true
+        "react-router-dom>history": true,
+        "react-redux>hoist-non-react-statics": true,
+        "serve-handler>path-to-regexp": true,
+        "prop-types": true,
+        "react": true,
+        "prop-types>react-is": true,
+        "react-router-dom>tiny-invariant": true,
+        "react-router-dom>tiny-warning": true
       }
     },
-    "react-focus-lock>use-callback-ref": {
+    "react-router-dom-v5-compat>react-router": {
+      "globals": {
+        "console.error": true,
+        "define": true
+      },
       "packages": {
+        "react-router-dom-v5-compat>@remix-run/router": true,
         "react": true
       }
     },
-    "react-focus-lock>use-sidecar": {
+    "react-simple-file-input": {
       "globals": {
-        "console.error": true
+        "File": true,
+        "FileReader": true,
+        "console.warn": true
       },
       "packages": {
-        "@swc/helpers>tslib": true,
-        "react": true,
-        "react-focus-lock>use-sidecar>detect-node-es": true
+        "prop-types": true,
+        "react": true
       }
     },
-    "react-idle-timer": {
+    "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": {
-        "prop-types": true,
-        "react": true
+        "react-tippy>popper.js": true,
+        "react": true,
+        "react-dom": true
       }
     },
-    "react-inspector": {
+    "react-toggle-button": {
       "globals": {
-        "Node": true,
-        "chromeDark": true,
-        "chromeLight": true
+        "clearTimeout": true,
+        "console.warn": true,
+        "define": true,
+        "performance": true,
+        "setTimeout": true
       },
       "packages": {
         "react": true
       }
     },
-    "react-markdown": {
+    "@material-ui/core>react-transition-group": {
       "globals": {
-        "console.warn": true
+        "Element": true,
+        "setTimeout": true
       },
       "packages": {
+        "@material-ui/core>react-transition-group>dom-helpers": true,
         "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-dom": true
       }
     },
-    "react-markdown>property-information": {
+    "readable-stream": {
       "packages": {
-        "watchify>xtend": true
+        "browserify>browser-resolve": true,
+        "browserify>buffer": true,
+        "webpack>events": true,
+        "pumpify>inherits": true,
+        "process": true,
+        "browserify>string_decoder": true,
+        "readable-stream>util-deprecate": true
       }
     },
-    "react-markdown>react-is": {
+    "extension-port-stream>readable-stream": {
       "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>unist-util-stringify-position": true,
-        "react-syntax-highlighter>refractor>parse-entities": true
-      }
-    },
-    "react-markdown>remark-parse>mdast-util-from-markdown>micromark": {
+        "AbortController": true,
+        "AbortSignal": true,
+        "AggregateError": true,
+        "Blob": true,
+        "ERR_INVALID_ARG_TYPE": true,
+        "queueMicrotask": true
+      },
       "packages": {
-        "react-syntax-highlighter>refractor>parse-entities": true
+        "@lavamoat/lavapack>readable-stream>abort-controller": true,
+        "browserify>buffer": true,
+        "webpack>events": true,
+        "process": true,
+        "browserify>string_decoder": true
       }
     },
-    "react-markdown>remark-rehype": {
+    "@metamask/snaps-controllers>readable-web-to-node-stream": {
       "packages": {
-        "react-markdown>remark-rehype>mdast-util-to-hast": true
+        "readable-stream": true
       }
     },
-    "react-markdown>remark-rehype>mdast-util-to-hast": {
+    "redux": {
       "globals": {
-        "console.warn": true
+        "console": true
       },
       "packages": {
-        "@storybook/addon-docs>remark-external-links>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
+        "@babel/runtime": true
       }
     },
-    "react-markdown>style-to-object": {
+    "string.prototype.matchall>regexp.prototype.flags": {
       "packages": {
-        "react-markdown>style-to-object>inline-style-parser": true
+        "string.prototype.matchall>call-bind": true,
+        "string.prototype.matchall>define-properties": true,
+        "string.prototype.matchall>call-bind>es-errors": true,
+        "string.prototype.matchall>regexp.prototype.flags>set-function-name": true
       }
     },
-    "react-markdown>unified": {
+    "react-markdown>remark-parse": {
       "packages": {
-        "mocha>yargs-unparser>is-plain-obj": true,
-        "react-markdown>unified>bail": true,
-        "react-markdown>unified>extend": true,
-        "react-markdown>unified>is-buffer": true,
-        "react-markdown>unified>trough": true,
-        "react-markdown>vfile": true
+        "react-markdown>remark-parse>mdast-util-from-markdown": true
       }
     },
-    "react-markdown>unist-util-visit": {
+    "react-markdown>remark-rehype": {
       "packages": {
-        "react-markdown>unist-util-visit>unist-util-visit-parents": true
+        "react-markdown>remark-rehype>mdast-util-to-hast": true
       }
     },
-    "react-markdown>unist-util-visit>unist-util-visit-parents": {
+    "react-markdown>vfile>replace-ext": {
       "packages": {
-        "react-markdown>unist-util-visit>unist-util-is": true
+        "path-browserify": true
       }
     },
-    "react-markdown>vfile": {
-      "packages": {
-        "path-browserify": true,
-        "process": true,
-        "react-markdown>vfile>is-buffer": true,
-        "react-markdown>vfile>replace-ext": true,
-        "react-markdown>vfile>vfile-message": true
+    "reselect": {
+      "globals": {
+        "WeakRef": true,
+        "console.warn": true,
+        "unstable_autotrackMemoize": true
       }
     },
-    "react-markdown>vfile>replace-ext": {
+    "@metamask/snaps-utils>rfdc": {
       "packages": {
-        "path-browserify": true
+        "browserify>buffer": true
       }
     },
-    "react-markdown>vfile>vfile-message": {
+    "ethereumjs-util>create-hash>ripemd160": {
       "packages": {
-        "react-markdown>vfile>unist-util-stringify-position": true
+        "browserify>buffer": true,
+        "ethereumjs-util>create-hash>md5.js>hash-base": true,
+        "pumpify>inherits": true
       }
     },
-    "react-popper": {
-      "globals": {
-        "document": true
-      },
+    "@keystonehq/metamask-airgapped-keyring>rlp": {
       "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
+        "bn.js": true,
+        "browserify>buffer": true
       }
     },
-    "react-popper>warning": {
+    "eth-lattice-keyring>rlp": {
       "globals": {
-        "console": true
+        "TextEncoder": true
       }
     },
-    "react-redux": {
-      "globals": {
-        "console": true,
-        "document": true
-      },
+    "ethereumjs-util>rlp": {
       "packages": {
-        "@babel/runtime": true,
-        "prop-types": true,
-        "react": true,
-        "react-dom": true,
-        "react-redux>hoist-non-react-statics": true,
-        "react-redux>react-is": true
+        "bn.js": true,
+        "browserify>buffer": true
       }
     },
-    "react-redux>hoist-non-react-statics": {
+    "@metamask/keyring-controller>ethereumjs-wallet>ethereumjs-util>rlp": {
       "packages": {
-        "prop-types>react-is": true
+        "bn.js": true,
+        "browserify>buffer": true
       }
     },
-    "react-redux>react-is": {
+    "wait-on>rxjs": {
       "globals": {
-        "console": true
+        "cancelAnimationFrame": true,
+        "clearInterval": true,
+        "clearTimeout": true,
+        "performance": true,
+        "requestAnimationFrame": true,
+        "setInterval.apply": true,
+        "setTimeout.apply": true
       }
     },
-    "react-responsive-carousel": {
+    "koa>content-disposition>safe-buffer": {
+      "packages": {
+        "browserify>buffer": true
+      }
+    },
+    "react-dom>scheduler": {
       "globals": {
-        "HTMLElement": true,
-        "addEventListener": true,
+        "MessageChannel": true,
+        "cancelAnimationFrame": true,
         "clearTimeout": true,
-        "console.warn": true,
-        "document": true,
-        "getComputedStyle": true,
-        "removeEventListener": true,
+        "console": true,
+        "navigator": true,
+        "performance": true,
+        "requestAnimationFrame": true,
         "setTimeout": true
-      },
-      "packages": {
-        "classnames": true,
-        "react": true,
-        "react-dom": true,
-        "react-responsive-carousel>react-easy-swipe": true
       }
     },
-    "react-responsive-carousel>react-easy-swipe": {
+    "ethers>@ethersproject/json-wallets>scrypt-js": {
       "globals": {
-        "addEventListener": true,
         "define": true,
-        "document.addEventListener": true,
-        "document.removeEventListener": true
+        "setTimeout": true
       },
       "packages": {
-        "prop-types": true,
-        "react": true
+        "browserify>timers-browserify": true
       }
     },
-    "react-router-dom": {
+    "ganache>secp256k1": {
       "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
+        "@metamask/ppom-validator>elliptic": true
       }
     },
-    "react-router-dom-v5-compat": {
+    "semver": {
       "globals": {
-        "FormData": true,
-        "URL": true,
-        "URLSearchParams": true,
-        "__reactRouterVersion": "write",
-        "addEventListener": true,
-        "confirm": true,
-        "define": true,
-        "document": true,
-        "history.scrollRestoration": true,
-        "location.href": true,
-        "removeEventListener": true,
-        "scrollTo": true,
-        "scrollY": true,
-        "sessionStorage.getItem": true,
-        "sessionStorage.setItem": true,
-        "setTimeout": true
+        "console.error": true
       },
       "packages": {
-        "history": true,
-        "react": true,
-        "react-dom": true,
-        "react-router-dom": true,
-        "react-router-dom-v5-compat>@remix-run/router": true,
-        "react-router-dom-v5-compat>react-router": true
+        "process": true
       }
     },
-    "react-router-dom-v5-compat>@remix-run/router": {
-      "globals": {
-        "AbortController": true,
-        "DOMException": true,
-        "FormData": true,
-        "Headers": true,
-        "Request": true,
-        "Response": true,
-        "URL": true,
-        "URLSearchParams": true,
-        "console": true,
-        "document.defaultView": true
+    "string.prototype.matchall>call-bind>set-function-length": {
+      "packages": {
+        "string.prototype.matchall>define-properties>define-data-property": true,
+        "string.prototype.matchall>call-bind>es-errors": true,
+        "string.prototype.matchall>get-intrinsic": true,
+        "string.prototype.matchall>es-abstract>gopd": true,
+        "string.prototype.matchall>es-abstract>has-property-descriptors": true
       }
     },
-    "react-router-dom-v5-compat>react-router": {
-      "globals": {
-        "console.error": true,
-        "define": true
-      },
+    "string.prototype.matchall>regexp.prototype.flags>set-function-name": {
       "packages": {
-        "react": true,
-        "react-router-dom-v5-compat>@remix-run/router": true
+        "string.prototype.matchall>define-properties>define-data-property": true,
+        "string.prototype.matchall>call-bind>es-errors": true,
+        "string.prototype.matchall>es-abstract>function.prototype.name>functions-have-names": true,
+        "string.prototype.matchall>es-abstract>has-property-descriptors": true
       }
     },
-    "react-router-dom>history": {
+    "promise-to-callback>set-immediate-shim": {
       "globals": {
-        "addEventListener": true,
-        "confirm": true,
-        "document": true,
-        "history": true,
-        "location": true,
-        "navigator.userAgent": true,
-        "removeEventListener": true
+        "setTimeout.apply": 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
+        "browserify>timers-browserify": true
       }
     },
-    "react-router-dom>react-router": {
+    "addons-linter>sha.js": {
       "packages": {
-        "prop-types": true,
-        "prop-types>react-is": true,
-        "react": true,
-        "react-redux>hoist-non-react-statics": true,
-        "react-router-dom>history": true,
-        "react-router-dom>tiny-invariant": true,
-        "react-router-dom>tiny-warning": true,
-        "serve-handler>path-to-regexp": true
+        "pumpify>inherits": true,
+        "koa>content-disposition>safe-buffer": true
       }
     },
-    "react-router-dom>tiny-warning": {
-      "globals": {
-        "console": true
+    "string.prototype.matchall>side-channel": {
+      "packages": {
+        "string.prototype.matchall>call-bind": true,
+        "string.prototype.matchall>get-intrinsic": true,
+        "string.prototype.matchall>es-abstract>object-inspect": true
       }
     },
-    "react-simple-file-input": {
+    "@metamask/profile-sync-controller>siwe": {
       "globals": {
-        "File": true,
-        "FileReader": true,
+        "console.error": true,
         "console.warn": true
       },
       "packages": {
-        "prop-types": true,
-        "react": true
+        "@metamask/profile-sync-controller>siwe>@spruceid/siwe-parser": true,
+        "@metamask/profile-sync-controller>siwe>@stablelib/random": true,
+        "ethers": true,
+        "@metamask/controller-utils>@spruceid/siwe-parser>valid-url": true
       }
     },
-    "react-syntax-highlighter>refractor>parse-entities": {
+    "@metamask/eth-token-tracker>deep-equal>es-get-iterator>stop-iteration-iterator": {
       "globals": {
-        "document.createElement": true
+        "StopIteration": true
+      },
+      "packages": {
+        "string.prototype.matchall>internal-slot": true
       }
     },
-    "react-tippy": {
+    "stream-browserify": {
+      "packages": {
+        "webpack>events": true,
+        "pumpify>inherits": true,
+        "readable-stream": true
+      }
+    },
+    "stream-http": {
       "globals": {
-        "Element": true,
-        "MSStream": true,
-        "MutationObserver": true,
-        "addEventListener": true,
+        "AbortController": true,
+        "Blob": true,
+        "MSStreamReader": true,
+        "ReadableStream": true,
+        "WritableStream": true,
+        "XDomainRequest": true,
+        "XMLHttpRequest": 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,
+        "fetch": true,
+        "location.protocol.search": true,
         "setTimeout": true
       },
       "packages": {
-        "react": true,
-        "react-dom": true,
-        "react-tippy>popper.js": true
+        "browserify>buffer": true,
+        "stream-http>builtin-status-codes": true,
+        "pumpify>inherits": true,
+        "process": true,
+        "readable-stream": true,
+        "browserify>url": true,
+        "watchify>xtend": 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
+    "@metamask/snaps-controllers>tar-stream>streamx": {
+      "packages": {
+        "webpack>events": true,
+        "@metamask/snaps-controllers>tar-stream>fast-fifo": true,
+        "@metamask/snaps-controllers>tar-stream>streamx>queue-tick": true
       }
     },
-    "react-toggle-button": {
-      "globals": {
-        "clearTimeout": true,
-        "console.warn": true,
-        "define": true,
-        "performance": true,
-        "setTimeout": true
-      },
+    "browserify>string_decoder": {
       "packages": {
-        "react": true
+        "koa>content-disposition>safe-buffer": true
       }
     },
-    "readable-stream": {
+    "@metamask/ethjs>@metamask/ethjs-util>strip-hex-prefix": {
       "packages": {
-        "browserify>browser-resolve": true,
-        "browserify>buffer": true,
-        "browserify>string_decoder": true,
-        "process": true,
-        "pumpify>inherits": true,
-        "readable-stream>util-deprecate": true,
-        "webpack>events": true
+        "@metamask/ethjs>@metamask/ethjs-util>is-hex-prefixed": true
       }
     },
-    "readable-stream>util-deprecate": {
-      "globals": {
-        "console.trace": true,
-        "console.warn": true,
-        "localStorage": true
+    "react-markdown>style-to-object": {
+      "packages": {
+        "react-markdown>style-to-object>inline-style-parser": true
       }
     },
-    "redux": {
-      "globals": {
-        "console": true
-      },
+    "@metamask/snaps-controllers>tar-stream": {
       "packages": {
-        "@babel/runtime": true
+        "@metamask/snaps-controllers>tar-stream>b4a": true,
+        "browserify>browser-resolve": true,
+        "@metamask/snaps-controllers>tar-stream>fast-fifo": true,
+        "@metamask/snaps-controllers>tar-stream>streamx": true
       }
     },
-    "reselect": {
-      "globals": {
-        "WeakRef": true,
-        "console.warn": true,
-        "unstable_autotrackMemoize": true
+    "debounce-stream>through": {
+      "packages": {
+        "process": true,
+        "stream-browserify": true
       }
     },
-    "semver": {
+    "browserify>timers-browserify": {
       "globals": {
-        "console.error": true
+        "clearInterval": true,
+        "clearTimeout": true,
+        "setInterval": true,
+        "setTimeout": true
       },
       "packages": {
         "process": true
       }
     },
-    "serve-handler>path-to-regexp": {
-      "packages": {
-        "serve-handler>path-to-regexp>isarray": true
+    "react-router-dom>tiny-warning": {
+      "globals": {
+        "console": true
       }
     },
-    "stream-browserify": {
-      "packages": {
-        "pumpify>inherits": true,
-        "readable-stream": true,
-        "webpack>events": true
+    "copy-to-clipboard>toggle-selection": {
+      "globals": {
+        "document.activeElement": true,
+        "document.getSelection": true
       }
     },
-    "stream-http": {
+    "@swc/helpers>tslib": {
+      "globals": {
+        "SuppressedError": true,
+        "define": true
+      }
+    },
+    "@metamask/eth-sig-util>tweetnacl": {
       "globals": {
-        "AbortController": true,
-        "Blob": true,
-        "MSStreamReader": true,
-        "ReadableStream": true,
-        "WritableStream": true,
-        "XDomainRequest": true,
-        "XMLHttpRequest": true,
-        "clearTimeout": true,
-        "fetch": true,
-        "location.protocol.search": true,
-        "setTimeout": true
+        "crypto": true,
+        "msCrypto": true,
+        "nacl": "write"
       },
       "packages": {
-        "browserify>buffer": true,
-        "browserify>url": true,
-        "process": true,
-        "pumpify>inherits": true,
-        "readable-stream": true,
-        "stream-http>builtin-status-codes": true,
-        "watchify>xtend": true
+        "browserify>browser-resolve": true
       }
     },
-    "string.prototype.matchall>call-bind": {
-      "packages": {
-        "browserify>has>function-bind": true,
-        "string.prototype.matchall>call-bind>es-define-property": true,
-        "string.prototype.matchall>call-bind>es-errors": true,
-        "string.prototype.matchall>call-bind>set-function-length": true,
-        "string.prototype.matchall>get-intrinsic": true
+    "@trezor/connect-web>@trezor/connect-common>@trezor/env-utils>ua-parser-js": {
+      "globals": {
+        "define": true
       }
     },
-    "string.prototype.matchall>call-bind>es-define-property": {
+    "@ensdomains/content-hash>cids>uint8arrays": {
+      "globals": {
+        "TextDecoder": true,
+        "TextEncoder": true
+      },
       "packages": {
-        "string.prototype.matchall>get-intrinsic": true
+        "@ensdomains/content-hash>cids>multibase": true
       }
     },
-    "string.prototype.matchall>call-bind>set-function-length": {
+    "@ensdomains/content-hash>multicodec>uint8arrays": {
+      "globals": {
+        "Buffer": true,
+        "TextDecoder": true,
+        "TextEncoder": true
+      },
       "packages": {
-        "string.prototype.matchall>call-bind>es-errors": true,
-        "string.prototype.matchall>define-properties>define-data-property": true,
-        "string.prototype.matchall>es-abstract>gopd": true,
-        "string.prototype.matchall>es-abstract>has-property-descriptors": true,
-        "string.prototype.matchall>get-intrinsic": true
+        "@ensdomains/content-hash>multicodec>uint8arrays>multiformats": true
       }
     },
-    "string.prototype.matchall>define-properties": {
+    "react-markdown>unified": {
       "packages": {
-        "@lavamoat/lavapack>json-stable-stringify>object-keys": true,
-        "string.prototype.matchall>define-properties>define-data-property": true,
-        "string.prototype.matchall>es-abstract>has-property-descriptors": true
+        "react-markdown>unified>bail": true,
+        "react-markdown>unified>extend": true,
+        "react-markdown>unified>is-buffer": true,
+        "mocha>yargs-unparser>is-plain-obj": true,
+        "react-markdown>unified>trough": true,
+        "react-markdown>vfile": true
       }
     },
-    "string.prototype.matchall>define-properties>define-data-property": {
+    "react-markdown>unist-util-visit>unist-util-visit-parents": {
       "packages": {
-        "string.prototype.matchall>call-bind>es-define-property": true,
-        "string.prototype.matchall>call-bind>es-errors": true,
-        "string.prototype.matchall>es-abstract>gopd": true
+        "react-markdown>unist-util-visit>unist-util-is": true
       }
     },
-    "string.prototype.matchall>es-abstract>array-buffer-byte-length": {
+    "react-markdown>unist-util-visit": {
       "packages": {
-        "string.prototype.matchall>call-bind": true,
-        "string.prototype.matchall>es-abstract>is-array-buffer": true
+        "react-markdown>unist-util-visit>unist-util-visit-parents": true
       }
     },
-    "string.prototype.matchall>es-abstract>available-typed-arrays": {
-      "packages": {
-        "string.prototype.matchall>es-abstract>typed-array-length>possible-typed-array-names": true
+    "uri-js": {
+      "globals": {
+        "define": true
       }
     },
-    "string.prototype.matchall>es-abstract>es-to-primitive>is-symbol": {
+    "browserify>url": {
       "packages": {
-        "string.prototype.matchall>has-symbols": true
+        "browserify>punycode": true,
+        "@storybook/addon-knobs>qs": true
       }
     },
-    "string.prototype.matchall>es-abstract>gopd": {
+    "react-focus-lock>use-callback-ref": {
       "packages": {
-        "string.prototype.matchall>get-intrinsic": true
+        "react": true
       }
     },
-    "string.prototype.matchall>es-abstract>has-property-descriptors": {
+    "react-beautiful-dnd>use-memo-one": {
       "packages": {
-        "string.prototype.matchall>call-bind>es-define-property": true
+        "react": true
       }
     },
-    "string.prototype.matchall>es-abstract>is-array-buffer": {
+    "react-focus-lock>use-sidecar": {
+      "globals": {
+        "console.error": true
+      },
       "packages": {
-        "string.prototype.matchall>call-bind": true,
-        "string.prototype.matchall>get-intrinsic": true
+        "react-focus-lock>use-sidecar>detect-node-es": true,
+        "react": true,
+        "@swc/helpers>tslib": true
       }
     },
-    "string.prototype.matchall>es-abstract>is-callable": {
+    "readable-stream>util-deprecate": {
       "globals": {
-        "document": true
+        "console.trace": true,
+        "console.warn": true,
+        "localStorage": true
       }
     },
-    "string.prototype.matchall>es-abstract>is-regex": {
+    "browserify>assert>util": {
+      "globals": {
+        "console.error": true,
+        "console.log": true,
+        "console.trace": true,
+        "process": true
+      },
       "packages": {
-        "koa>is-generator-function>has-tostringtag": true,
-        "string.prototype.matchall>call-bind": true
+        "browserify>assert>util>inherits": true,
+        "process": true
       }
     },
-    "string.prototype.matchall>es-abstract>is-shared-array-buffer": {
+    "browserify>util": {
+      "globals": {
+        "console.error": true,
+        "console.log": true,
+        "console.trace": true
+      },
       "packages": {
-        "string.prototype.matchall>call-bind": true
+        "pumpify>inherits": true,
+        "browserify>util>is-arguments": true,
+        "koa>is-generator-function": true,
+        "browserify>util>is-typed-array": true,
+        "process": true,
+        "browserify>util>which-typed-array": true
       }
     },
-    "string.prototype.matchall>es-abstract>object-inspect": {
+    "uuid": {
       "globals": {
-        "HTMLElement": true,
-        "WeakRef": true
-      },
-      "packages": {
-        "browserify>browser-resolve": true
+        "crypto": true,
+        "msCrypto": true
       }
     },
-    "string.prototype.matchall>get-intrinsic": {
+    "@metamask/eth-snap-keyring>uuid": {
       "globals": {
-        "AggregateError": true,
-        "FinalizationRegistry": true,
-        "WeakRef": true
-      },
-      "packages": {
-        "browserify>has>function-bind": true,
-        "depcheck>is-core-module>hasown": true,
-        "string.prototype.matchall>call-bind>es-errors": true,
-        "string.prototype.matchall>es-abstract>has-proto": true,
-        "string.prototype.matchall>has-symbols": true
+        "crypto": true
       }
     },
-    "string.prototype.matchall>internal-slot": {
-      "packages": {
-        "depcheck>is-core-module>hasown": true,
-        "string.prototype.matchall>call-bind>es-errors": true,
-        "string.prototype.matchall>side-channel": true
+    "@metamask/keyring-snap-client>uuid": {
+      "globals": {
+        "crypto": true
       }
     },
-    "string.prototype.matchall>regexp.prototype.flags": {
-      "packages": {
-        "string.prototype.matchall>call-bind": true,
-        "string.prototype.matchall>call-bind>es-errors": true,
-        "string.prototype.matchall>define-properties": true,
-        "string.prototype.matchall>regexp.prototype.flags>set-function-name": true
+    "eth-lattice-keyring>gridplus-sdk>uuid": {
+      "globals": {
+        "crypto": true
       }
     },
-    "string.prototype.matchall>regexp.prototype.flags>set-function-name": {
+    "web3-stream-provider>uuid": {
+      "globals": {
+        "crypto": true
+      }
+    },
+    "@metamask/snaps-utils>validate-npm-package-name": {
       "packages": {
-        "string.prototype.matchall>call-bind>es-errors": true,
-        "string.prototype.matchall>define-properties>define-data-property": true,
-        "string.prototype.matchall>es-abstract>function.prototype.name>functions-have-names": true,
-        "string.prototype.matchall>es-abstract>has-property-descriptors": true
+        "@metamask/snaps-utils>validate-npm-package-name>builtins": true
       }
     },
-    "string.prototype.matchall>side-channel": {
+    "react-markdown>vfile>vfile-message": {
       "packages": {
-        "string.prototype.matchall>call-bind": true,
-        "string.prototype.matchall>es-abstract>object-inspect": true,
-        "string.prototype.matchall>get-intrinsic": true
+        "react-markdown>vfile>unist-util-stringify-position": true
       }
     },
-    "terser>source-map-support>buffer-from": {
+    "react-markdown>vfile": {
       "packages": {
-        "browserify>buffer": true
+        "react-markdown>vfile>is-buffer": true,
+        "path-browserify": true,
+        "process": true,
+        "react-markdown>vfile>replace-ext": true,
+        "react-markdown>vfile>vfile-message": true
       }
     },
-    "uri-js": {
+    "browserify>vm-browserify": {
       "globals": {
-        "define": true
+        "document.body.appendChild": true,
+        "document.body.removeChild": true,
+        "document.createElement": true
       }
     },
-    "uuid": {
+    "react-popper>warning": {
       "globals": {
-        "crypto": true,
-        "msCrypto": true
+        "console": true
       }
     },
-    "wait-on>rxjs": {
+    "@ensdomains/content-hash>multihashes>web-encoding": {
       "globals": {
-        "cancelAnimationFrame": true,
-        "clearInterval": true,
-        "clearTimeout": true,
-        "performance": true,
-        "requestAnimationFrame": true,
-        "setInterval.apply": true,
-        "setTimeout.apply": true
+        "TextDecoder": true,
+        "TextEncoder": true
+      },
+      "packages": {
+        "browserify>util": true
       }
     },
     "web3": {
@@ -5390,14 +5367,14 @@
         "setTimeout": true
       },
       "packages": {
-        "browserify>util": true,
         "readable-stream": true,
+        "browserify>util": true,
         "web3-stream-provider>uuid": true
       }
     },
-    "web3-stream-provider>uuid": {
+    "@metamask/controllers>web3": {
       "globals": {
-        "crypto": true
+        "XMLHttpRequest": true
       }
     },
     "webextension-polyfill": {
@@ -5409,9 +5386,35 @@
         "define": true
       }
     },
-    "webpack>events": {
+    "@metamask/eth-token-tracker>deep-equal>which-boxed-primitive": {
+      "packages": {
+        "@metamask/eth-token-tracker>deep-equal>which-boxed-primitive>is-bigint": true,
+        "@metamask/eth-token-tracker>deep-equal>which-boxed-primitive>is-boolean-object": true,
+        "@metamask/eth-token-tracker>deep-equal>which-boxed-primitive>is-number-object": true,
+        "eslint-plugin-react>array-includes>is-string": true,
+        "string.prototype.matchall>es-abstract>es-to-primitive>is-symbol": true
+      }
+    },
+    "@metamask/eth-token-tracker>deep-equal>which-collection": {
+      "packages": {
+        "@metamask/eth-token-tracker>deep-equal>es-get-iterator>is-map": true,
+        "@metamask/eth-token-tracker>deep-equal>es-get-iterator>is-set": true,
+        "@metamask/eth-token-tracker>deep-equal>which-collection>is-weakmap": true,
+        "@metamask/eth-token-tracker>deep-equal>which-collection>is-weakset": true
+      }
+    },
+    "browserify>util>which-typed-array": {
+      "packages": {
+        "string.prototype.matchall>es-abstract>available-typed-arrays": true,
+        "string.prototype.matchall>call-bind": true,
+        "browserify>util>which-typed-array>for-each": true,
+        "string.prototype.matchall>es-abstract>gopd": true,
+        "koa>is-generator-function>has-tostringtag": true
+      }
+    },
+    "@metamask/ethjs>@metamask/ethjs-provider-http>xhr2": {
       "globals": {
-        "console": true
+        "XMLHttpRequest": true
       }
     }
   }
diff --git a/lavamoat/browserify/main/policy.json b/lavamoat/browserify/main/policy.json
index 542d38004de3..82075f709022 100644
--- a/lavamoat/browserify/main/policy.json
+++ b/lavamoat/browserify/main/policy.json
@@ -5,144 +5,124 @@
         "regeneratorRuntime": "write"
       }
     },
-    "@ensdomains/content-hash": {
+    "eth-lattice-keyring>@ethereumjs/tx>@chainsafe/ssz>@chainsafe/persistent-merkle-tree": {
       "globals": {
-        "console.warn": true
+        "WeakRef": 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
+        "browserify": true
       }
     },
-    "@ensdomains/content-hash>cids": {
+    "eth-lattice-keyring>@ethereumjs/tx>@chainsafe/ssz": {
       "packages": {
-        "@ensdomains/content-hash>cids>multibase": true,
-        "@ensdomains/content-hash>cids>multihashes": true,
-        "@ensdomains/content-hash>cids>uint8arrays": true,
-        "@ensdomains/content-hash>multicodec": true
+        "eth-lattice-keyring>@ethereumjs/tx>@chainsafe/ssz>@chainsafe/persistent-merkle-tree": true,
+        "browserify": true,
+        "browserify>buffer": true,
+        "eth-lattice-keyring>@ethereumjs/tx>@chainsafe/ssz>case": true
       }
     },
-    "@ensdomains/content-hash>cids>multibase": {
+    "@metamask/notification-services-controller>@contentful/rich-text-html-renderer": {
       "globals": {
-        "TextDecoder": true,
-        "TextEncoder": true
+        "SuppressedError": true
+      }
+    },
+    "@ensdomains/content-hash": {
+      "globals": {
+        "console.warn": true
       },
       "packages": {
-        "@ensdomains/content-hash>cids>multibase>@multiformats/base-x": true
+        "browserify>buffer": true,
+        "@ensdomains/content-hash>cids": true,
+        "@ensdomains/content-hash>js-base64": true,
+        "@ensdomains/content-hash>multicodec": true,
+        "@ensdomains/content-hash>multihashes": true
       }
     },
-    "@ensdomains/content-hash>cids>multihashes": {
+    "@ethereumjs/tx>@ethereumjs/common": {
       "packages": {
-        "@ensdomains/content-hash>cids>multibase": true,
-        "@ensdomains/content-hash>cids>multihashes>varint": true,
-        "@ensdomains/content-hash>cids>uint8arrays": true
+        "@ethereumjs/tx>@ethereumjs/util": true,
+        "browserify>buffer": true,
+        "@ethereumjs/tx>@ethereumjs/common>crc-32": true,
+        "webpack>events": true
       }
     },
-    "@ensdomains/content-hash>cids>uint8arrays": {
-      "globals": {
-        "TextDecoder": true,
-        "TextEncoder": true
-      },
+    "@metamask/smart-transactions-controller>@ethereumjs/tx>@ethereumjs/common": {
       "packages": {
-        "@ensdomains/content-hash>cids>multibase": true
+        "@metamask/smart-transactions-controller>@ethereumjs/util": true,
+        "webpack>events": true
       }
     },
-    "@ensdomains/content-hash>js-base64": {
-      "globals": {
-        "Base64": "write",
-        "TextDecoder": true,
-        "TextEncoder": true,
-        "atob": true,
-        "btoa": true,
-        "define": true
-      },
+    "eth-lattice-keyring>gridplus-sdk>@ethereumjs/tx>@ethereumjs/common": {
       "packages": {
-        "browserify>buffer": true
+        "@ethereumjs/tx>@ethereumjs/util": true,
+        "browserify>buffer": true,
+        "@ethereumjs/tx>@ethereumjs/common>crc-32": true,
+        "webpack>events": true
       }
     },
-    "@ensdomains/content-hash>multicodec": {
+    "eth-lattice-keyring>gridplus-sdk>@ethereumjs/common": {
       "packages": {
-        "@ensdomains/content-hash>multicodec>uint8arrays": true,
-        "sass-embedded>varint": true
+        "@ethereumjs/tx>@ethereumjs/util": true,
+        "browserify>buffer": true,
+        "@ethereumjs/tx>@ethereumjs/common>crc-32": true,
+        "webpack>events": true
       }
     },
-    "@ensdomains/content-hash>multicodec>uint8arrays": {
+    "@ethereumjs/tx>@ethereumjs/rlp": {
       "globals": {
-        "Buffer": true,
-        "TextDecoder": true,
         "TextEncoder": true
-      },
-      "packages": {
-        "@ensdomains/content-hash>multicodec>uint8arrays>multiformats": true
       }
     },
-    "@ensdomains/content-hash>multicodec>uint8arrays>multiformats": {
+    "@metamask/smart-transactions-controller>@ethereumjs/tx>@ethereumjs/rlp": {
       "globals": {
-        "TextDecoder": true,
-        "TextEncoder": true,
-        "console.warn": true,
-        "crypto.subtle.digest": 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
+        "TextEncoder": true
       }
     },
-    "@ensdomains/content-hash>multihashes>multibase": {
-      "packages": {
-        "@ensdomains/content-hash>multihashes>multibase>base-x": true,
-        "@ensdomains/content-hash>multihashes>web-encoding": true,
-        "browserify>buffer": true
+    "@metamask/eth-ledger-bridge-keyring>@ethereumjs/rlp": {
+      "globals": {
+        "TextEncoder": true
       }
     },
-    "@ensdomains/content-hash>multihashes>multibase>base-x": {
+    "@ethereumjs/tx": {
       "packages": {
-        "koa>content-disposition>safe-buffer": true
+        "@ethereumjs/tx>@ethereumjs/common": true,
+        "@ethereumjs/tx>@ethereumjs/rlp": true,
+        "@ethereumjs/tx>@ethereumjs/util": true,
+        "browserify>buffer": true,
+        "@ethereumjs/tx>ethereum-cryptography": true,
+        "browserify>insert-module-globals>is-buffer": true
       }
     },
-    "@ensdomains/content-hash>multihashes>web-encoding": {
-      "globals": {
-        "TextDecoder": true,
-        "TextEncoder": true
-      },
+    "@metamask/smart-transactions-controller>@ethereumjs/tx": {
       "packages": {
-        "browserify>util": true
+        "@metamask/smart-transactions-controller>@ethereumjs/tx>@ethereumjs/common": true,
+        "@metamask/smart-transactions-controller>@ethereumjs/tx>@ethereumjs/rlp": true,
+        "@metamask/smart-transactions-controller>@ethereumjs/util": true,
+        "@ethereumjs/tx>ethereum-cryptography": true
       }
     },
-    "@ethereumjs/tx": {
+    "eth-lattice-keyring>@ethereumjs/tx": {
       "packages": {
+        "eth-lattice-keyring>@ethereumjs/tx>@chainsafe/ssz": true,
         "@ethereumjs/tx>@ethereumjs/common": true,
         "@ethereumjs/tx>@ethereumjs/rlp": true,
         "@ethereumjs/tx>@ethereumjs/util": true,
-        "@ethereumjs/tx>ethereum-cryptography": true,
+        "@ethersproject/providers": true,
         "browserify>buffer": true,
+        "eth-lattice-keyring>@ethereumjs/tx>ethereum-cryptography": true,
         "browserify>insert-module-globals>is-buffer": true
       }
     },
-    "@ethereumjs/tx>@ethereumjs/common": {
+    "eth-lattice-keyring>gridplus-sdk>@ethereumjs/tx": {
       "packages": {
-        "@ethereumjs/tx>@ethereumjs/common>crc-32": true,
+        "eth-lattice-keyring>@ethereumjs/tx>@chainsafe/ssz": true,
+        "eth-lattice-keyring>gridplus-sdk>@ethereumjs/tx>@ethereumjs/common": true,
+        "@ethereumjs/tx>@ethereumjs/rlp": true,
         "@ethereumjs/tx>@ethereumjs/util": true,
+        "@ethersproject/providers": true,
         "browserify>buffer": true,
-        "webpack>events": true
-      }
-    },
-    "@ethereumjs/tx>@ethereumjs/common>crc-32": {
-      "globals": {
-        "DO_NOT_EXPORT_CRC": true,
-        "define": true
-      }
-    },
-    "@ethereumjs/tx>@ethereumjs/rlp": {
-      "globals": {
-        "TextEncoder": true
+        "eth-lattice-keyring>gridplus-sdk>@ethereumjs/tx>ethereum-cryptography": true,
+        "browserify>insert-module-globals>is-buffer": true
       }
     },
     "@ethereumjs/tx>@ethereumjs/util": {
@@ -151,78 +131,83 @@
       },
       "packages": {
         "@ethereumjs/tx>@ethereumjs/rlp": true,
-        "@ethereumjs/tx>@ethereumjs/util>micro-ftch": true,
-        "@ethereumjs/tx>ethereum-cryptography": true,
         "browserify>buffer": true,
+        "@ethereumjs/tx>ethereum-cryptography": true,
+        "webpack>events": true,
         "browserify>insert-module-globals>is-buffer": true,
-        "webpack>events": true
+        "@ethereumjs/tx>@ethereumjs/util>micro-ftch": true
       }
     },
-    "@ethereumjs/tx>@ethereumjs/util>micro-ftch": {
+    "@metamask/smart-transactions-controller>@ethereumjs/util": {
       "globals": {
-        "Headers": true,
-        "TextDecoder": true,
-        "URL": true,
-        "btoa": true,
+        "console.warn": true,
         "fetch": true
       },
       "packages": {
-        "browserify>browserify-zlib": true,
-        "browserify>buffer": true,
-        "browserify>url": true,
-        "browserify>util": true,
-        "https-browserify": true,
-        "process": true,
-        "stream-http": true
+        "@metamask/smart-transactions-controller>@ethereumjs/tx>@ethereumjs/rlp": true,
+        "@ethereumjs/tx>ethereum-cryptography": true,
+        "webpack>events": true
       }
     },
-    "@ethereumjs/tx>ethereum-cryptography": {
+    "@ethersproject/abi": {
       "globals": {
-        "TextDecoder": true,
-        "crypto": true
+        "console.log": true
       },
       "packages": {
-        "@ethereumjs/tx>ethereum-cryptography>@noble/curves": true,
-        "@ethereumjs/tx>ethereum-cryptography>@scure/bip32": true,
-        "@noble/hashes": true
+        "ethers>@ethersproject/address": true,
+        "@ethersproject/bignumber": true,
+        "@ethersproject/bytes": true,
+        "ethers>@ethersproject/constants": true,
+        "@ethersproject/hash": true,
+        "ethers>@ethersproject/keccak256": true,
+        "ethers>@ethersproject/logger": true,
+        "ethers>@ethersproject/properties": true,
+        "ethers>@ethersproject/strings": true
       }
     },
-    "@ethereumjs/tx>ethereum-cryptography>@noble/curves": {
-      "globals": {
-        "TextEncoder": true
-      },
+    "ethers>@ethersproject/abstract-provider": {
       "packages": {
-        "@noble/hashes": true
+        "@ethersproject/bignumber": true,
+        "@ethersproject/bytes": true,
+        "ethers>@ethersproject/logger": true,
+        "ethers>@ethersproject/properties": true
       }
     },
-    "@ethereumjs/tx>ethereum-cryptography>@scure/bip32": {
+    "ethers>@ethersproject/abstract-signer": {
       "packages": {
-        "@ethereumjs/tx>ethereum-cryptography>@noble/curves": true,
-        "@metamask/utils>@scure/base": true,
-        "@noble/hashes": true
+        "ethers>@ethersproject/logger": true,
+        "ethers>@ethersproject/properties": true
       }
     },
-    "@ethersproject/abi": {
-      "globals": {
-        "console.log": true
-      },
+    "ethers>@ethersproject/address": {
       "packages": {
         "@ethersproject/bignumber": true,
         "@ethersproject/bytes": true,
-        "@ethersproject/hash": true,
-        "ethers>@ethersproject/address": true,
-        "ethers>@ethersproject/constants": true,
         "ethers>@ethersproject/keccak256": true,
         "ethers>@ethersproject/logger": true,
-        "ethers>@ethersproject/properties": true,
-        "ethers>@ethersproject/strings": true
+        "ethers>@ethersproject/rlp": true
+      }
+    },
+    "ethers>@ethersproject/base64": {
+      "globals": {
+        "atob": true,
+        "btoa": true
+      },
+      "packages": {
+        "@ethersproject/bytes": true
+      }
+    },
+    "ethers>@ethersproject/basex": {
+      "packages": {
+        "@ethersproject/bytes": true,
+        "ethers>@ethersproject/properties": true
       }
     },
     "@ethersproject/bignumber": {
       "packages": {
         "@ethersproject/bytes": true,
-        "bn.js": true,
-        "ethers>@ethersproject/logger": true
+        "ethers>@ethersproject/logger": true,
+        "bn.js": true
       }
     },
     "@ethersproject/bytes": {
@@ -230,17 +215,22 @@
         "ethers>@ethersproject/logger": true
       }
     },
+    "ethers>@ethersproject/constants": {
+      "packages": {
+        "@ethersproject/bignumber": true
+      }
+    },
     "@ethersproject/contracts": {
       "globals": {
         "setTimeout": true
       },
       "packages": {
         "@ethersproject/abi": true,
-        "@ethersproject/bignumber": true,
-        "@ethersproject/bytes": true,
         "ethers>@ethersproject/abstract-provider": true,
         "ethers>@ethersproject/abstract-signer": true,
         "ethers>@ethersproject/address": true,
+        "@ethersproject/bignumber": true,
+        "@ethersproject/bytes": true,
         "ethers>@ethersproject/logger": true,
         "ethers>@ethersproject/properties": true,
         "ethers>@ethersproject/transactions": true
@@ -248,10 +238,10 @@
     },
     "@ethersproject/hash": {
       "packages": {
-        "@ethersproject/bignumber": true,
-        "@ethersproject/bytes": true,
         "ethers>@ethersproject/address": true,
         "ethers>@ethersproject/base64": true,
+        "@ethersproject/bignumber": true,
+        "@ethersproject/bytes": true,
         "ethers>@ethersproject/keccak256": true,
         "ethers>@ethersproject/logger": true,
         "ethers>@ethersproject/properties": true,
@@ -260,9 +250,9 @@
     },
     "@ethersproject/hdnode": {
       "packages": {
+        "ethers>@ethersproject/basex": true,
         "@ethersproject/bignumber": true,
         "@ethersproject/bytes": true,
-        "ethers>@ethersproject/basex": true,
         "ethers>@ethersproject/logger": true,
         "ethers>@ethersproject/pbkdf2": true,
         "ethers>@ethersproject/properties": true,
@@ -273,586 +263,428 @@
         "ethers>@ethersproject/wordlists": true
       }
     },
-    "@ethersproject/providers": {
-      "globals": {
-        "WebSocket": true,
-        "clearInterval": true,
-        "clearTimeout": true,
-        "console.log": true,
-        "console.warn": true,
-        "setInterval": true,
-        "setTimeout": true
-      },
+    "ethers>@ethersproject/json-wallets": {
       "packages": {
-        "@ethersproject/bignumber": true,
+        "ethers>@ethersproject/address": true,
         "@ethersproject/bytes": true,
-        "@ethersproject/hash": true,
-        "@ethersproject/providers>@ethersproject/web": true,
-        "@ethersproject/providers>bech32": true,
-        "@metamask/test-bundler>@ethersproject/networks": true,
-        "ethers>@ethersproject/abstract-provider": true,
-        "ethers>@ethersproject/abstract-signer": true,
-        "ethers>@ethersproject/address": true,
-        "ethers>@ethersproject/base64": true,
-        "ethers>@ethersproject/basex": true,
-        "ethers>@ethersproject/constants": true,
+        "@ethersproject/hdnode": true,
+        "ethers>@ethersproject/keccak256": true,
         "ethers>@ethersproject/logger": true,
+        "ethers>@ethersproject/pbkdf2": true,
         "ethers>@ethersproject/properties": true,
         "ethers>@ethersproject/random": true,
-        "ethers>@ethersproject/sha2": true,
         "ethers>@ethersproject/strings": true,
-        "ethers>@ethersproject/transactions": true
-      }
-    },
-    "@ethersproject/providers>@ethersproject/random": {
-      "globals": {
-        "crypto.getRandomValues": true
-      }
-    },
-    "@ethersproject/providers>@ethersproject/web": {
-      "globals": {
-        "clearTimeout": true,
-        "fetch": true,
-        "setTimeout": true
-      },
-      "packages": {
-        "@ethersproject/bytes": true,
-        "ethers>@ethersproject/base64": true,
-        "ethers>@ethersproject/logger": true,
-        "ethers>@ethersproject/properties": true,
-        "ethers>@ethersproject/strings": true
+        "ethers>@ethersproject/transactions": true,
+        "ethers>@ethersproject/json-wallets>aes-js": true,
+        "ethers>@ethersproject/json-wallets>scrypt-js": true
       }
     },
-    "@ethersproject/wallet": {
+    "ethers>@ethersproject/keccak256": {
       "packages": {
         "@ethersproject/bytes": true,
-        "@ethersproject/hash": true,
-        "@ethersproject/hdnode": true,
-        "ethers>@ethersproject/abstract-provider": true,
-        "ethers>@ethersproject/abstract-signer": true,
-        "ethers>@ethersproject/address": true,
-        "ethers>@ethersproject/json-wallets": true,
-        "ethers>@ethersproject/keccak256": true,
-        "ethers>@ethersproject/logger": true,
-        "ethers>@ethersproject/properties": true,
-        "ethers>@ethersproject/random": true,
-        "ethers>@ethersproject/signing-key": true,
-        "ethers>@ethersproject/transactions": true
+        "@metamask/ethjs>js-sha3": true
       }
     },
-    "@keystonehq/bc-ur-registry-eth": {
-      "packages": {
-        "@ethereumjs/tx>@ethereumjs/util": true,
-        "@keystonehq/bc-ur-registry-eth>@keystonehq/bc-ur-registry": true,
-        "@metamask/eth-trezor-keyring>hdkey": true,
-        "browserify>buffer": true,
-        "uuid": true
+    "ethers>@ethersproject/logger": {
+      "globals": {
+        "console": true
       }
     },
-    "@keystonehq/bc-ur-registry-eth>@keystonehq/bc-ur-registry": {
-      "globals": {
-        "define": true
-      },
+    "ethers>@ethersproject/providers>@ethersproject/networks": {
       "packages": {
-        "@ngraveio/bc-ur": true,
-        "@swc/helpers>tslib": true,
-        "browserify>buffer": true,
-        "buffer": true,
-        "ethereumjs-util>ethereum-cryptography>bs58check": true
+        "ethers>@ethersproject/logger": true
       }
     },
-    "@keystonehq/metamask-airgapped-keyring": {
+    "@metamask/test-bundler>@ethersproject/networks": {
       "packages": {
-        "@ethereumjs/tx": true,
-        "@keystonehq/bc-ur-registry-eth": true,
-        "@keystonehq/metamask-airgapped-keyring>@keystonehq/base-eth-keyring": true,
-        "@keystonehq/metamask-airgapped-keyring>rlp": true,
-        "@metamask/obs-store": true,
-        "browserify>buffer": true,
-        "uuid": true,
-        "webpack>events": true
+        "ethers>@ethersproject/logger": true
       }
     },
-    "@keystonehq/metamask-airgapped-keyring>@keystonehq/base-eth-keyring": {
+    "ethers>@ethersproject/pbkdf2": {
       "packages": {
-        "@ethereumjs/tx": true,
-        "@ethereumjs/tx>@ethereumjs/util": true,
-        "@keystonehq/bc-ur-registry-eth": true,
-        "@metamask/eth-trezor-keyring>hdkey": true,
-        "browserify>buffer": true,
-        "eth-lattice-keyring>rlp": true,
-        "uuid": true
+        "@ethersproject/bytes": true,
+        "ethers>@ethersproject/sha2": true
       }
     },
-    "@keystonehq/metamask-airgapped-keyring>rlp": {
+    "ethers>@ethersproject/properties": {
       "packages": {
-        "bn.js": true,
-        "browserify>buffer": true
+        "ethers>@ethersproject/logger": true
       }
     },
-    "@lavamoat/lavadome-react": {
+    "@ethersproject/providers": {
       "globals": {
-        "Document.prototype": true,
-        "DocumentFragment.prototype": true,
-        "Element.prototype": true,
-        "Node.prototype": true,
+        "WebSocket": true,
+        "clearInterval": true,
+        "clearTimeout": true,
+        "console.log": true,
         "console.warn": true,
-        "document": true
+        "setInterval": true,
+        "setTimeout": true
       },
       "packages": {
-        "react": true
+        "ethers>@ethersproject/abstract-provider": true,
+        "ethers>@ethersproject/abstract-signer": true,
+        "ethers>@ethersproject/address": true,
+        "ethers>@ethersproject/base64": true,
+        "ethers>@ethersproject/basex": true,
+        "@ethersproject/bignumber": true,
+        "@ethersproject/bytes": true,
+        "ethers>@ethersproject/constants": true,
+        "@ethersproject/hash": true,
+        "ethers>@ethersproject/logger": true,
+        "@metamask/test-bundler>@ethersproject/networks": true,
+        "ethers>@ethersproject/properties": true,
+        "ethers>@ethersproject/random": true,
+        "ethers>@ethersproject/sha2": true,
+        "ethers>@ethersproject/strings": true,
+        "ethers>@ethersproject/transactions": true,
+        "@ethersproject/providers>@ethersproject/web": true,
+        "@ethersproject/providers>bech32": true
       }
     },
-    "@material-ui/core": {
+    "ethers>@ethersproject/providers": {
       "globals": {
-        "Image": true,
-        "_formatMuiErrorMessage": true,
-        "addEventListener": true,
+        "WebSocket": true,
         "clearInterval": true,
         "clearTimeout": true,
-        "console.error": true,
+        "console.log": 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
+        "ethers>@ethersproject/abstract-provider": true,
+        "ethers>@ethersproject/abstract-signer": true,
+        "ethers>@ethersproject/address": true,
+        "ethers>@ethersproject/base64": true,
+        "ethers>@ethersproject/basex": true,
+        "@ethersproject/bignumber": true,
+        "@ethersproject/bytes": true,
+        "ethers>@ethersproject/constants": true,
+        "@ethersproject/hash": true,
+        "ethers>@ethersproject/logger": true,
+        "ethers>@ethersproject/providers>@ethersproject/networks": true,
+        "ethers>@ethersproject/properties": true,
+        "ethers>@ethersproject/random": true,
+        "ethers>@ethersproject/sha2": true,
+        "ethers>@ethersproject/strings": true,
+        "ethers>@ethersproject/transactions": true,
+        "ethers>@ethersproject/providers>@ethersproject/web": true,
+        "ethers>@ethersproject/providers>bech32": true
       }
     },
-    "@material-ui/core>@material-ui/styles": {
+    "@ethersproject/providers>@ethersproject/random": {
       "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
+        "crypto.getRandomValues": true
       }
     },
-    "@material-ui/core>@material-ui/styles>jss": {
-      "globals": {
-        "CSS": true,
-        "document.createElement": true,
-        "document.querySelector": true
-      },
+    "ethers>@ethersproject/random": {
       "packages": {
-        "@babel/runtime": true,
-        "@material-ui/core>@material-ui/styles>jss>is-in-browser": true,
-        "react-router-dom>tiny-warning": true
+        "@ethersproject/bytes": true,
+        "ethers>@ethersproject/logger": true
       }
     },
-    "@material-ui/core>@material-ui/styles>jss-plugin-camel-case": {
+    "ethers>@ethersproject/rlp": {
       "packages": {
-        "@material-ui/core>@material-ui/styles>jss-plugin-camel-case>hyphenate-style-name": true
+        "@ethersproject/bytes": true,
+        "ethers>@ethersproject/logger": true
       }
     },
-    "@material-ui/core>@material-ui/styles>jss-plugin-default-unit": {
-      "globals": {
-        "CSS": true
-      },
+    "ethers>@ethersproject/sha2": {
       "packages": {
-        "@material-ui/core>@material-ui/styles>jss": true
+        "@ethersproject/bytes": true,
+        "ethers>@ethersproject/logger": true,
+        "ethers>@ethersproject/sha2>hash.js": true
       }
     },
-    "@material-ui/core>@material-ui/styles>jss-plugin-global": {
+    "ethers>@ethersproject/signing-key": {
       "packages": {
-        "@babel/runtime": true,
-        "@material-ui/core>@material-ui/styles>jss": true
+        "@ethersproject/bytes": true,
+        "ethers>@ethersproject/logger": true,
+        "ethers>@ethersproject/properties": true,
+        "ethers>@ethersproject/signing-key>elliptic": true
       }
     },
-    "@material-ui/core>@material-ui/styles>jss-plugin-nested": {
+    "ethers>@ethersproject/solidity": {
       "packages": {
-        "@babel/runtime": true,
-        "react-router-dom>tiny-warning": true
+        "@ethersproject/bignumber": true,
+        "@ethersproject/bytes": true,
+        "ethers>@ethersproject/keccak256": true,
+        "ethers>@ethersproject/logger": true,
+        "ethers>@ethersproject/sha2": true,
+        "ethers>@ethersproject/strings": true
       }
     },
-    "@material-ui/core>@material-ui/styles>jss-plugin-rule-value-function": {
+    "ethers>@ethersproject/strings": {
       "packages": {
-        "@material-ui/core>@material-ui/styles>jss": true,
-        "react-router-dom>tiny-warning": true
+        "@ethersproject/bytes": true,
+        "ethers>@ethersproject/constants": true,
+        "ethers>@ethersproject/logger": true
       }
     },
-    "@material-ui/core>@material-ui/styles>jss-plugin-vendor-prefixer": {
+    "ethers>@ethersproject/transactions": {
       "packages": {
-        "@material-ui/core>@material-ui/styles>jss": true,
-        "@material-ui/core>@material-ui/styles>jss-plugin-vendor-prefixer>css-vendor": true
+        "ethers>@ethersproject/address": true,
+        "@ethersproject/bignumber": true,
+        "@ethersproject/bytes": true,
+        "ethers>@ethersproject/constants": true,
+        "ethers>@ethersproject/keccak256": true,
+        "ethers>@ethersproject/logger": true,
+        "ethers>@ethersproject/properties": true,
+        "ethers>@ethersproject/rlp": true,
+        "ethers>@ethersproject/signing-key": true
       }
     },
-    "@material-ui/core>@material-ui/styles>jss-plugin-vendor-prefixer>css-vendor": {
-      "globals": {
-        "document.createElement": true,
-        "document.documentElement": true,
-        "getComputedStyle": true
-      },
+    "ethers>@ethersproject/units": {
       "packages": {
-        "@babel/runtime": true,
-        "@material-ui/core>@material-ui/styles>jss>is-in-browser": true
+        "@ethersproject/bignumber": true,
+        "ethers>@ethersproject/logger": true
       }
     },
-    "@material-ui/core>@material-ui/styles>jss>is-in-browser": {
-      "globals": {
-        "document": true
+    "@ethersproject/wallet": {
+      "packages": {
+        "ethers>@ethersproject/abstract-provider": true,
+        "ethers>@ethersproject/abstract-signer": true,
+        "ethers>@ethersproject/address": true,
+        "@ethersproject/bytes": true,
+        "@ethersproject/hash": true,
+        "@ethersproject/hdnode": true,
+        "ethers>@ethersproject/json-wallets": true,
+        "ethers>@ethersproject/keccak256": true,
+        "ethers>@ethersproject/logger": true,
+        "ethers>@ethersproject/properties": true,
+        "ethers>@ethersproject/random": true,
+        "ethers>@ethersproject/signing-key": true,
+        "ethers>@ethersproject/transactions": true
       }
     },
-    "@material-ui/core>@material-ui/system": {
+    "@ethersproject/providers>@ethersproject/web": {
       "globals": {
-        "console.error": true
+        "clearTimeout": true,
+        "fetch": true,
+        "setTimeout": 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
+        "ethers>@ethersproject/base64": true,
+        "@ethersproject/bytes": true,
+        "ethers>@ethersproject/logger": true,
+        "ethers>@ethersproject/properties": true,
+        "ethers>@ethersproject/strings": true
       }
     },
-    "@material-ui/core>popper.js": {
+    "ethers>@ethersproject/providers>@ethersproject/web": {
       "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,
+        "clearTimeout": true,
+        "fetch": true,
         "setTimeout": true
+      },
+      "packages": {
+        "ethers>@ethersproject/base64": true,
+        "@ethersproject/bytes": true,
+        "ethers>@ethersproject/logger": true,
+        "ethers>@ethersproject/properties": true,
+        "ethers>@ethersproject/strings": true
       }
     },
-    "@material-ui/core>react-transition-group": {
+    "ethers>@ethersproject/web": {
       "globals": {
-        "Element": true,
+        "clearTimeout": true,
+        "fetch": 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
+        "ethers>@ethersproject/base64": true,
+        "@ethersproject/bytes": true,
+        "ethers>@ethersproject/logger": true,
+        "ethers>@ethersproject/properties": true,
+        "ethers>@ethersproject/strings": true
       }
     },
-    "@metamask/abi-utils": {
+    "ethers>@ethersproject/wordlists": {
       "packages": {
-        "@metamask/abi-utils>@metamask/utils": true,
-        "@metamask/utils>@metamask/superstruct": true
+        "@ethersproject/bytes": true,
+        "@ethersproject/hash": true,
+        "ethers>@ethersproject/logger": true,
+        "ethers>@ethersproject/properties": true,
+        "ethers>@ethersproject/strings": true
       }
     },
-    "@metamask/abi-utils>@metamask/utils": {
+    "@metamask/notification-services-controller>firebase>@firebase/app": {
       "globals": {
-        "TextDecoder": true,
-        "TextEncoder": true
+        "FinalizationRegistry": true,
+        "console.warn": true
       },
       "packages": {
-        "@metamask/utils>@metamask/superstruct": true,
-        "@metamask/utils>@scure/base": true,
-        "@metamask/utils>pony-cause": true,
-        "@noble/hashes": true,
-        "browserify>buffer": true,
-        "nock>debug": true,
-        "semver": true
-      }
-    },
-    "@metamask/accounts-controller": {
-      "packages": {
-        "@ethereumjs/tx>@ethereumjs/util": true,
-        "@ethereumjs/tx>ethereum-cryptography": true,
-        "@metamask/base-controller": true,
-        "@metamask/eth-snap-keyring": true,
-        "@metamask/keyring-api": true,
-        "@metamask/keyring-controller": true,
-        "@metamask/utils": true,
-        "uuid": true
-      }
-    },
-    "@metamask/address-book-controller": {
-      "packages": {
-        "@metamask/base-controller": true,
-        "@metamask/controller-utils": true
+        "@metamask/notification-services-controller>firebase>@firebase/app>@firebase/component": true,
+        "@metamask/notification-services-controller>firebase>@firebase/app>@firebase/logger": true,
+        "@metamask/notification-services-controller>firebase>@firebase/util": true,
+        "@metamask/notification-services-controller>firebase>@firebase/app>idb": true
       }
     },
-    "@metamask/announcement-controller": {
+    "@metamask/notification-services-controller>firebase>@firebase/app>@firebase/component": {
       "packages": {
-        "@metamask/announcement-controller>@metamask/base-controller": true
+        "@metamask/notification-services-controller>firebase>@firebase/util": true
       }
     },
-    "@metamask/announcement-controller>@metamask/base-controller": {
+    "@metamask/notification-services-controller>firebase>@firebase/installations": {
       "globals": {
+        "BroadcastChannel": true,
+        "Headers": true,
+        "btoa": true,
+        "console.error": true,
+        "crypto": true,
+        "fetch": true,
+        "msCrypto": true,
+        "navigator.onLine": true,
         "setTimeout": true
       },
       "packages": {
-        "immer": true
+        "@metamask/notification-services-controller>firebase>@firebase/app": true,
+        "@metamask/notification-services-controller>firebase>@firebase/app>@firebase/component": true,
+        "@metamask/notification-services-controller>firebase>@firebase/util": true,
+        "@metamask/notification-services-controller>firebase>@firebase/app>idb": true
       }
     },
-    "@metamask/approval-controller": {
+    "@metamask/notification-services-controller>firebase>@firebase/app>@firebase/logger": {
       "globals": {
-        "console.info": true
+        "console": true
       },
       "packages": {
-        "@metamask/base-controller": true,
-        "@metamask/rpc-errors": true,
-        "nanoid": true
-      }
-    },
-    "@metamask/approval-controller>nanoid": {
-      "globals": {
-        "crypto.getRandomValues": true
+        "@swc/helpers>tslib": true
       }
     },
-    "@metamask/assets-controllers": {
+    "@metamask/notification-services-controller>firebase>@firebase/messaging": {
       "globals": {
-        "AbortController": true,
         "Headers": true,
+        "Notification.maxActions": true,
+        "Notification.permission": true,
+        "Notification.requestPermission": true,
+        "PushSubscription.prototype.hasOwnProperty": true,
+        "ServiceWorkerRegistration": true,
         "URL": true,
-        "URLSearchParams": true,
-        "clearInterval": true,
-        "clearTimeout": true,
-        "console.error": true,
-        "console.log": true,
-        "setInterval": true,
-        "setTimeout": true
-      },
-      "packages": {
-        "@ensdomains/content-hash>multicodec>uint8arrays>multiformats": true,
-        "@ethereumjs/tx>@ethereumjs/util": true,
-        "@ethersproject/bignumber": true,
-        "@ethersproject/contracts": true,
-        "@ethersproject/providers": true,
-        "@metamask/abi-utils": true,
-        "@metamask/base-controller": true,
-        "@metamask/contract-metadata": true,
-        "@metamask/controller-utils": true,
-        "@metamask/eth-query": true,
-        "@metamask/metamask-eth-abis": true,
-        "@metamask/name-controller>async-mutex": true,
-        "@metamask/polling-controller": true,
-        "@metamask/rpc-errors": true,
-        "@metamask/utils": true,
-        "bn.js": true,
-        "cockatiel": true,
-        "ethers>@ethersproject/address": true,
-        "lodash": true,
-        "single-call-balance-checker-abi": true,
-        "uuid": true
-      }
-    },
-    "@metamask/base-controller": {
-      "globals": {
+        "addEventListener": true,
+        "atob": true,
+        "btoa": true,
+        "clients.matchAll": true,
+        "clients.openWindow": true,
+        "console.warn": true,
+        "document": true,
+        "fetch": true,
+        "indexedDB": true,
+        "location.href": true,
+        "location.origin": true,
+        "navigator": true,
+        "origin.replace": true,
+        "registration.showNotification": true,
         "setTimeout": true
       },
       "packages": {
-        "immer": true
+        "@metamask/notification-services-controller>firebase>@firebase/app": true,
+        "@metamask/notification-services-controller>firebase>@firebase/app>@firebase/component": true,
+        "@metamask/notification-services-controller>firebase>@firebase/installations": true,
+        "@metamask/notification-services-controller>firebase>@firebase/util": true,
+        "@metamask/notification-services-controller>firebase>@firebase/app>idb": true,
+        "@swc/helpers>tslib": true
       }
     },
-    "@metamask/browser-passworder": {
+    "@metamask/notification-services-controller>firebase>@firebase/util": {
       "globals": {
-        "CryptoKey": true,
+        "atob": true,
+        "browser": true,
         "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
+        "chrome": true,
+        "console": true,
+        "document": true,
+        "indexedDB": true,
+        "navigator": true,
+        "process": true,
+        "self": true,
+        "setTimeout": true
       },
       "packages": {
-        "@metamask/browser-passworder>@metamask/utils": true,
-        "browserify>buffer": true
+        "process": true
       }
     },
-    "@metamask/browser-passworder>@metamask/utils": {
-      "globals": {
-        "TextDecoder": true,
-        "TextEncoder": true
-      },
+    "@keystonehq/metamask-airgapped-keyring>@keystonehq/base-eth-keyring": {
       "packages": {
-        "@metamask/utils>@metamask/superstruct": true,
-        "@metamask/utils>@scure/base": true,
-        "@metamask/utils>pony-cause": true,
-        "@noble/hashes": true,
+        "@ethereumjs/tx": true,
+        "@ethereumjs/tx>@ethereumjs/util": true,
+        "@keystonehq/bc-ur-registry-eth": true,
         "browserify>buffer": true,
-        "nock>debug": true,
-        "semver": true
+        "@metamask/eth-trezor-keyring>hdkey": true,
+        "eth-lattice-keyring>rlp": true,
+        "uuid": true
       }
     },
-    "@metamask/controller-utils": {
-      "globals": {
-        "URL": true,
-        "console.error": true,
-        "fetch": true,
-        "setTimeout": true
-      },
+    "@keystonehq/bc-ur-registry-eth": {
       "packages": {
         "@ethereumjs/tx>@ethereumjs/util": true,
-        "@metamask/controller-utils>@spruceid/siwe-parser": true,
-        "@metamask/ethjs>@metamask/ethjs-unit": true,
-        "@metamask/utils": true,
-        "bn.js": true,
+        "@keystonehq/bc-ur-registry-eth>@keystonehq/bc-ur-registry": true,
         "browserify>buffer": true,
-        "eslint>fast-deep-equal": true,
-        "eth-ens-namehash": true
+        "@metamask/eth-trezor-keyring>hdkey": true,
+        "uuid": true
       }
     },
-    "@metamask/controller-utils>@spruceid/siwe-parser": {
+    "@keystonehq/bc-ur-registry-eth>@keystonehq/bc-ur-registry": {
       "globals": {
-        "console.error": true,
-        "console.log": true
+        "define": true
       },
       "packages": {
-        "@metamask/controller-utils>@spruceid/siwe-parser>apg-js": true,
-        "@noble/hashes": true
-      }
-    },
-    "@metamask/controller-utils>@spruceid/siwe-parser>apg-js": {
-      "packages": {
-        "browserify>buffer": 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/ens-controller": {
-      "packages": {
-        "@ethersproject/providers": true,
-        "@metamask/base-controller": true,
-        "@metamask/controller-utils": true,
-        "@metamask/utils": true,
-        "punycode": true
+        "@ngraveio/bc-ur": true,
+        "ethereumjs-util>ethereum-cryptography>bs58check": true,
+        "buffer": true,
+        "browserify>buffer": true,
+        "@swc/helpers>tslib": true
       }
     },
-    "@metamask/eth-json-rpc-filters": {
-      "globals": {
-        "console.error": true
-      },
+    "@keystonehq/metamask-airgapped-keyring": {
       "packages": {
-        "@metamask/eth-query": true,
-        "@metamask/json-rpc-engine": true,
-        "@metamask/name-controller>async-mutex": true,
-        "@metamask/safe-event-emitter": true,
-        "pify": true
+        "@ethereumjs/tx": true,
+        "@keystonehq/metamask-airgapped-keyring>@keystonehq/base-eth-keyring": true,
+        "@keystonehq/bc-ur-registry-eth": true,
+        "@metamask/obs-store": true,
+        "browserify>buffer": true,
+        "webpack>events": true,
+        "@keystonehq/metamask-airgapped-keyring>rlp": true,
+        "uuid": true
       }
     },
-    "@metamask/eth-json-rpc-middleware": {
+    "chart.js>@kurkle/color": {
       "globals": {
-        "URL": true,
-        "console.error": true,
-        "setTimeout": true
-      },
-      "packages": {
-        "@metamask/eth-json-rpc-middleware>@metamask/utils": true,
-        "@metamask/eth-json-rpc-middleware>klona": true,
-        "@metamask/eth-json-rpc-middleware>safe-stable-stringify": true,
-        "@metamask/eth-sig-util": true,
-        "@metamask/json-rpc-engine": true,
-        "@metamask/rpc-errors": true
+        "define": true
       }
     },
-    "@metamask/eth-json-rpc-middleware>@metamask/utils": {
+    "@lavamoat/lavadome-react": {
       "globals": {
-        "TextDecoder": true,
-        "TextEncoder": true
+        "Document.prototype": true,
+        "DocumentFragment.prototype": true,
+        "Element.prototype": true,
+        "Node.prototype": true,
+        "console.warn": true,
+        "document": true
       },
       "packages": {
-        "@metamask/utils>@metamask/superstruct": true,
-        "@metamask/utils>@scure/base": true,
-        "@metamask/utils>pony-cause": true,
-        "@noble/hashes": true,
-        "browserify>buffer": true,
-        "nock>debug": true,
-        "semver": true
+        "react": true
       }
     },
-    "@metamask/eth-json-rpc-provider": {
+    "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth>@ledgerhq/domain-service": {
       "packages": {
-        "@metamask/json-rpc-engine": true,
-        "@metamask/rpc-errors": true,
-        "@metamask/safe-event-emitter": true,
-        "uuid": true
+        "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth>@ledgerhq/logs": true,
+        "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth>@ledgerhq/domain-service>axios": true
       }
     },
-    "@metamask/eth-ledger-bridge-keyring": {
+    "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth>@ledgerhq/errors": {
       "globals": {
-        "addEventListener": true,
-        "console.error": true,
-        "document.createElement": true,
-        "document.head.appendChild": true,
-        "fetch": true,
-        "removeEventListener": true
-      },
-      "packages": {
-        "@ethereumjs/tx": true,
-        "@ethereumjs/tx>@ethereumjs/util": true,
-        "@metamask/eth-ledger-bridge-keyring>@ethereumjs/rlp": true,
-        "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth": true,
-        "@metamask/eth-sig-util": true,
-        "@metamask/eth-trezor-keyring>hdkey": true,
-        "browserify>buffer": true,
-        "webpack>events": true
+        "console.warn": true
       }
     },
-    "@metamask/eth-ledger-bridge-keyring>@ethereumjs/rlp": {
-      "globals": {
-        "TextEncoder": true
+    "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth>@ledgerhq/evm-tools": {
+      "packages": {
+        "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth>@ledgerhq/cryptoassets-evm-signatures": true,
+        "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth>@ledgerhq/evm-tools>@ledgerhq/live-env": true,
+        "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth>@ledgerhq/evm-tools>axios": true,
+        "@metamask/ppom-validator>crypto-js": true,
+        "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth>@ledgerhq/evm-tools>ethers": true
       }
     },
     "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth": {
@@ -861,6 +693,7 @@
       },
       "packages": {
         "@ethersproject/abi": true,
+        "ethers>@ethersproject/rlp": true,
         "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth>@ledgerhq/cryptoassets-evm-signatures": true,
         "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth>@ledgerhq/domain-service": true,
         "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth>@ledgerhq/errors": true,
@@ -869,361 +702,451 @@
         "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth>axios": true,
         "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth>bignumber.js": true,
         "browserify>buffer": true,
-        "ethers>@ethersproject/rlp": true,
         "semver": true
       }
     },
-    "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth>@ledgerhq/domain-service": {
+    "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth>@ledgerhq/evm-tools>@ledgerhq/live-env": {
+      "globals": {
+        "console.warn": true
+      },
       "packages": {
-        "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth>@ledgerhq/domain-service>axios": true,
-        "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth>@ledgerhq/logs": true
+        "wait-on>rxjs": true
       }
     },
-    "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth>@ledgerhq/domain-service>axios": {
+    "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth>@ledgerhq/logs": {
       "globals": {
-        "Blob": true,
-        "FormData": true,
-        "URLSearchParams": true,
-        "XMLHttpRequest": true,
-        "btoa": true,
+        "__ledgerLogsListen": "write",
+        "console.error": true
+      }
+    },
+    "@material-ui/core": {
+      "globals": {
+        "Image": true,
+        "_formatMuiErrorMessage": true,
+        "addEventListener": true,
+        "clearInterval": true,
+        "clearTimeout": true,
+        "console.error": true,
         "console.warn": true,
         "document": true,
-        "location.href": 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": {
-        "axios>form-data": true,
-        "browserify>buffer": true,
-        "process": true
+        "@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,
+        "react-redux>hoist-non-react-statics": true,
+        "@material-ui/core>popper.js": true,
+        "prop-types": true,
+        "react": true,
+        "react-dom": true,
+        "prop-types>react-is": true,
+        "@material-ui/core>react-transition-group": true
       }
     },
-    "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth>@ledgerhq/errors": {
+    "@material-ui/core>@material-ui/styles": {
       "globals": {
-        "console.warn": true
-      }
-    },
-    "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth>@ledgerhq/evm-tools": {
+        "console.error": true,
+        "console.warn": true,
+        "document.createComment": true,
+        "document.head": true
+      },
       "packages": {
-        "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth>@ledgerhq/cryptoassets-evm-signatures": true,
-        "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth>@ledgerhq/evm-tools>@ledgerhq/live-env": true,
-        "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth>@ledgerhq/evm-tools>axios": true,
-        "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth>@ledgerhq/evm-tools>ethers": true,
-        "@metamask/ppom-validator>crypto-js": true
+        "@babel/runtime": true,
+        "@material-ui/core>@material-ui/utils": true,
+        "@material-ui/core>clsx": true,
+        "react-redux>hoist-non-react-statics": 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/styles>jss": true,
+        "prop-types": true,
+        "react": true
       }
     },
-    "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth>@ledgerhq/evm-tools>@ledgerhq/live-env": {
+    "@material-ui/core>@material-ui/system": {
       "globals": {
-        "console.warn": true
+        "console.error": true
       },
       "packages": {
-        "wait-on>rxjs": true
+        "@babel/runtime": true,
+        "@material-ui/core>@material-ui/utils": true,
+        "prop-types": true
       }
     },
-    "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth>@ledgerhq/evm-tools>axios": {
-      "globals": {
-        "Blob": true,
-        "FormData": true,
-        "URLSearchParams": true,
-        "XMLHttpRequest": true,
-        "btoa": true,
-        "console.warn": true,
-        "document": true,
-        "location.href": true,
-        "navigator": true,
-        "setTimeout": true
-      },
+    "@material-ui/core>@material-ui/utils": {
       "packages": {
-        "axios>form-data": true,
-        "browserify>buffer": true,
-        "process": true
+        "@babel/runtime": true,
+        "prop-types": true,
+        "prop-types>react-is": true
       }
     },
-    "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth>@ledgerhq/evm-tools>ethers": {
+    "@metamask/abi-utils": {
       "packages": {
-        "@ethersproject/abi": true,
-        "@ethersproject/bignumber": true,
-        "@ethersproject/bytes": true,
-        "@ethersproject/contracts": true,
-        "@ethersproject/hash": true,
-        "@ethersproject/hdnode": true,
-        "@ethersproject/providers": true,
-        "@ethersproject/providers>@ethersproject/web": true,
-        "@ethersproject/wallet": true,
-        "ethers>@ethersproject/abstract-signer": true,
-        "ethers>@ethersproject/address": true,
-        "ethers>@ethersproject/base64": true,
-        "ethers>@ethersproject/basex": true,
-        "ethers>@ethersproject/constants": true,
-        "ethers>@ethersproject/json-wallets": true,
-        "ethers>@ethersproject/keccak256": true,
-        "ethers>@ethersproject/logger": true,
-        "ethers>@ethersproject/properties": true,
-        "ethers>@ethersproject/random": true,
-        "ethers>@ethersproject/rlp": true,
-        "ethers>@ethersproject/sha2": true,
-        "ethers>@ethersproject/signing-key": true,
-        "ethers>@ethersproject/solidity": true,
-        "ethers>@ethersproject/strings": true,
-        "ethers>@ethersproject/transactions": true,
-        "ethers>@ethersproject/units": true,
-        "ethers>@ethersproject/wordlists": true
+        "@metamask/utils>@metamask/superstruct": true,
+        "@metamask/abi-utils>@metamask/utils": true
       }
     },
-    "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth>@ledgerhq/logs": {
-      "globals": {
-        "__ledgerLogsListen": "write",
-        "console.error": true
+    "@metamask/accounts-controller": {
+      "packages": {
+        "@ethereumjs/tx>@ethereumjs/util": true,
+        "@metamask/base-controller": true,
+        "@metamask/eth-snap-keyring": true,
+        "@metamask/keyring-api": true,
+        "@metamask/keyring-controller": true,
+        "@metamask/utils": true,
+        "@ethereumjs/tx>ethereum-cryptography": true,
+        "uuid": true
       }
     },
-    "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth>axios": {
-      "globals": {
-        "Blob": true,
-        "FormData": true,
-        "URLSearchParams": true,
-        "XMLHttpRequest": true,
-        "btoa": true,
-        "console.warn": true,
-        "document": true,
-        "location.href": true,
-        "navigator": true,
-        "setTimeout": true
-      },
+    "@metamask/address-book-controller": {
       "packages": {
-        "axios>form-data": true,
-        "browserify>buffer": true,
-        "process": true
+        "@metamask/base-controller": true,
+        "@metamask/controller-utils": true
       }
     },
-    "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth>bignumber.js": {
-      "globals": {
-        "crypto": true,
-        "define": true
+    "@metamask/announcement-controller": {
+      "packages": {
+        "@metamask/announcement-controller>@metamask/base-controller": true
       }
     },
-    "@metamask/eth-query": {
+    "@metamask/approval-controller": {
+      "globals": {
+        "console.info": true
+      },
       "packages": {
-        "@metamask/eth-query>json-rpc-random-id": true,
-        "watchify>xtend": true
+        "@metamask/base-controller": true,
+        "@metamask/rpc-errors": true,
+        "nanoid": true
       }
     },
-    "@metamask/eth-sig-util": {
+    "@metamask/assets-controllers": {
+      "globals": {
+        "AbortController": true,
+        "Headers": true,
+        "URL": true,
+        "URLSearchParams": true,
+        "clearInterval": true,
+        "clearTimeout": true,
+        "console.error": true,
+        "console.log": true,
+        "setInterval": true,
+        "setTimeout": true
+      },
       "packages": {
         "@ethereumjs/tx>@ethereumjs/util": true,
-        "@ethereumjs/tx>ethereum-cryptography": true,
+        "ethers>@ethersproject/address": true,
+        "@ethersproject/bignumber": true,
+        "@ethersproject/contracts": true,
+        "@ethersproject/providers": true,
         "@metamask/abi-utils": true,
-        "@metamask/eth-sig-util>@metamask/utils": true,
-        "@metamask/eth-sig-util>tweetnacl": true,
-        "@metamask/utils>@scure/base": true,
-        "browserify>buffer": true
+        "@metamask/base-controller": true,
+        "@metamask/contract-metadata": true,
+        "@metamask/controller-utils": true,
+        "@metamask/eth-query": true,
+        "@metamask/metamask-eth-abis": true,
+        "@metamask/polling-controller": true,
+        "@metamask/rpc-errors": true,
+        "@metamask/utils": true,
+        "@metamask/name-controller>async-mutex": true,
+        "bn.js": true,
+        "cockatiel": true,
+        "lodash": true,
+        "@ensdomains/content-hash>multicodec>uint8arrays>multiformats": true,
+        "single-call-balance-checker-abi": true,
+        "uuid": true
       }
     },
-    "@metamask/eth-sig-util>@metamask/utils": {
+    "@metamask/base-controller": {
       "globals": {
-        "TextDecoder": true,
-        "TextEncoder": true
+        "setTimeout": true
       },
       "packages": {
-        "@metamask/utils>@metamask/superstruct": true,
-        "@metamask/utils>@scure/base": true,
-        "@metamask/utils>pony-cause": true,
-        "@noble/hashes": true,
-        "browserify>buffer": true,
-        "nock>debug": true,
-        "semver": true
+        "immer": true
       }
     },
-    "@metamask/eth-sig-util>tweetnacl": {
+    "@metamask/announcement-controller>@metamask/base-controller": {
       "globals": {
-        "crypto": true,
-        "msCrypto": true,
-        "nacl": "write"
+        "setTimeout": true
+      },
+      "packages": {
+        "immer": true
+      }
+    },
+    "@metamask/name-controller>@metamask/base-controller": {
+      "globals": {
+        "setTimeout": true
       },
       "packages": {
-        "browserify>browser-resolve": true
+        "immer": true
       }
     },
-    "@metamask/eth-snap-keyring": {
+    "@metamask/rate-limit-controller>@metamask/base-controller": {
       "globals": {
-        "URL": true,
-        "console.error": true
+        "setTimeout": true
       },
       "packages": {
-        "@ethereumjs/tx": true,
-        "@metamask/eth-snap-keyring>@metamask/eth-sig-util": true,
-        "@metamask/eth-snap-keyring>@metamask/keyring-internal-snap-client": true,
-        "@metamask/eth-snap-keyring>@metamask/utils": true,
-        "@metamask/eth-snap-keyring>uuid": true,
-        "@metamask/keyring-api": true,
-        "@metamask/utils>@metamask/superstruct": true,
-        "webpack>events": true
+        "immer": true
       }
     },
-    "@metamask/eth-snap-keyring>@metamask/eth-sig-util": {
+    "@metamask/browser-passworder": {
+      "globals": {
+        "CryptoKey": true,
+        "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": {
-        "@ethereumjs/tx>@ethereumjs/util": true,
-        "@ethereumjs/tx>ethereum-cryptography": true,
-        "@metamask/abi-utils": true,
-        "@metamask/eth-sig-util>tweetnacl": true,
-        "@metamask/eth-snap-keyring>@metamask/utils": true,
-        "@metamask/utils>@scure/base": true,
+        "@metamask/browser-passworder>@metamask/utils": true,
         "browserify>buffer": true
       }
     },
-    "@metamask/eth-snap-keyring>@metamask/keyring-internal-snap-client": {
-      "packages": {
-        "@metamask/keyring-snap-client": true
+    "eth-keyring-controller>@metamask/browser-passworder": {
+      "globals": {
+        "crypto": true
       }
     },
-    "@metamask/eth-snap-keyring>@metamask/utils": {
+    "@metamask/controller-utils": {
       "globals": {
-        "TextDecoder": true,
-        "TextEncoder": true
+        "URL": true,
+        "console.error": true,
+        "fetch": true,
+        "setTimeout": true
       },
       "packages": {
-        "@metamask/utils>@metamask/superstruct": true,
-        "@metamask/utils>@scure/base": true,
-        "@metamask/utils>pony-cause": true,
-        "@noble/hashes": true,
+        "@ethereumjs/tx>@ethereumjs/util": true,
+        "@metamask/ethjs>@metamask/ethjs-unit": true,
+        "@metamask/utils": true,
+        "@metamask/controller-utils>@spruceid/siwe-parser": true,
+        "bn.js": true,
         "browserify>buffer": true,
-        "nock>debug": true,
-        "semver": true
+        "eth-ens-namehash": true,
+        "eslint>fast-deep-equal": true
       }
     },
-    "@metamask/eth-snap-keyring>uuid": {
-      "globals": {
-        "crypto": true
+    "@metamask/ens-controller": {
+      "packages": {
+        "@ethersproject/providers": true,
+        "@metamask/base-controller": true,
+        "@metamask/controller-utils": true,
+        "@metamask/utils": true,
+        "punycode": true
       }
     },
-    "@metamask/eth-token-tracker": {
+    "@metamask/eth-token-tracker>@metamask/eth-block-tracker": {
       "globals": {
-        "console.warn": true
+        "clearTimeout": true,
+        "console.error": true,
+        "setTimeout": true
       },
       "packages": {
-        "@babel/runtime": true,
-        "@metamask/eth-token-tracker>@metamask/eth-block-tracker": true,
-        "@metamask/eth-token-tracker>deep-equal": true,
-        "@metamask/ethjs-contract": true,
-        "@metamask/ethjs-query": true,
         "@metamask/safe-event-emitter": true,
-        "bn.js": true,
-        "human-standard-token-abi": true
+        "@metamask/eth-token-tracker>@metamask/eth-block-tracker>@metamask/utils": true,
+        "@metamask/eth-query>json-rpc-random-id": true,
+        "pify": true
       }
     },
-    "@metamask/eth-token-tracker>@metamask/eth-block-tracker": {
+    "@metamask/network-controller>@metamask/eth-block-tracker": {
       "globals": {
         "clearTimeout": true,
         "console.error": true,
         "setTimeout": true
       },
       "packages": {
-        "@metamask/eth-query>json-rpc-random-id": true,
-        "@metamask/eth-token-tracker>@metamask/eth-block-tracker>@metamask/utils": true,
         "@metamask/safe-event-emitter": true,
-        "pify": true
+        "@metamask/network-controller>@metamask/eth-block-tracker>@metamask/utils": true,
+        "@metamask/eth-query>json-rpc-random-id": true
       }
     },
-    "@metamask/eth-token-tracker>@metamask/eth-block-tracker>@metamask/utils": {
+    "@metamask/keyring-controller>@metamask/eth-hd-keyring": {
       "globals": {
-        "TextDecoder": true,
         "TextEncoder": true
       },
       "packages": {
-        "@metamask/utils>@metamask/superstruct": true,
-        "@metamask/utils>@scure/base": true,
-        "@metamask/utils>pony-cause": true,
-        "@noble/hashes": true,
+        "@ethereumjs/tx>@ethereumjs/util": true,
+        "@metamask/eth-sig-util": true,
+        "@metamask/scure-bip39": true,
+        "@metamask/keyring-controller>@metamask/eth-hd-keyring>@metamask/utils": true,
         "browserify>buffer": true,
-        "nock>debug": true,
-        "semver": true
+        "@ethereumjs/tx>ethereum-cryptography": true
       }
     },
-    "@metamask/eth-token-tracker>deep-equal": {
+    "@metamask/eth-json-rpc-filters": {
+      "globals": {
+        "console.error": true
+      },
       "packages": {
-        "@lavamoat/lavapack>json-stable-stringify>isarray": true,
-        "@lavamoat/lavapack>json-stable-stringify>object-keys": true,
-        "@metamask/eth-token-tracker>deep-equal>es-get-iterator": true,
-        "@metamask/eth-token-tracker>deep-equal>is-date-object": true,
-        "@metamask/eth-token-tracker>deep-equal>which-boxed-primitive": true,
-        "@metamask/eth-token-tracker>deep-equal>which-collection": true,
-        "@ngraveio/bc-ur>assert>object-is": true,
-        "browserify>util>is-arguments": true,
-        "browserify>util>which-typed-array": true,
-        "gulp>vinyl-fs>object.assign": true,
-        "string.prototype.matchall>call-bind": true,
-        "string.prototype.matchall>es-abstract>array-buffer-byte-length": true,
-        "string.prototype.matchall>es-abstract>is-array-buffer": true,
-        "string.prototype.matchall>es-abstract>is-regex": true,
-        "string.prototype.matchall>es-abstract>is-shared-array-buffer": true,
-        "string.prototype.matchall>get-intrinsic": true,
-        "string.prototype.matchall>regexp.prototype.flags": true,
-        "string.prototype.matchall>side-channel": true
+        "@metamask/eth-query": true,
+        "@metamask/json-rpc-engine": true,
+        "@metamask/safe-event-emitter": true,
+        "@metamask/name-controller>async-mutex": true,
+        "pify": true
       }
     },
-    "@metamask/eth-token-tracker>deep-equal>es-get-iterator": {
+    "@metamask/network-controller>@metamask/eth-json-rpc-infura": {
+      "globals": {
+        "fetch": true,
+        "setTimeout": true
+      },
       "packages": {
-        "@lavamoat/lavapack>json-stable-stringify>isarray": true,
-        "@metamask/eth-token-tracker>deep-equal>es-get-iterator>is-map": true,
-        "@metamask/eth-token-tracker>deep-equal>es-get-iterator>is-set": true,
-        "@metamask/eth-token-tracker>deep-equal>es-get-iterator>stop-iteration-iterator": true,
-        "browserify>util>is-arguments": true,
-        "eslint-plugin-react>array-includes>is-string": true,
-        "process": true,
-        "string.prototype.matchall>call-bind": true,
-        "string.prototype.matchall>get-intrinsic": true,
-        "string.prototype.matchall>has-symbols": true
+        "@metamask/eth-json-rpc-provider": true,
+        "@metamask/json-rpc-engine": true,
+        "@metamask/rpc-errors": true,
+        "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/utils": true
       }
     },
-    "@metamask/eth-token-tracker>deep-equal>es-get-iterator>stop-iteration-iterator": {
+    "@metamask/eth-json-rpc-middleware": {
       "globals": {
-        "StopIteration": true
+        "URL": true,
+        "console.error": true,
+        "setTimeout": true
       },
       "packages": {
-        "string.prototype.matchall>internal-slot": true
+        "@metamask/eth-sig-util": true,
+        "@metamask/json-rpc-engine": true,
+        "@metamask/rpc-errors": true,
+        "@metamask/eth-json-rpc-middleware>@metamask/utils": true,
+        "@metamask/eth-json-rpc-middleware>klona": true,
+        "@metamask/eth-json-rpc-middleware>safe-stable-stringify": true
       }
     },
-    "@metamask/eth-token-tracker>deep-equal>is-date-object": {
+    "@metamask/eth-json-rpc-provider": {
       "packages": {
-        "koa>is-generator-function>has-tostringtag": true
+        "@metamask/json-rpc-engine": true,
+        "@metamask/rpc-errors": true,
+        "@metamask/safe-event-emitter": true,
+        "uuid": true
       }
     },
-    "@metamask/eth-token-tracker>deep-equal>which-boxed-primitive": {
+    "@metamask/eth-ledger-bridge-keyring": {
+      "globals": {
+        "addEventListener": true,
+        "console.error": true,
+        "document.createElement": true,
+        "document.head.appendChild": true,
+        "fetch": true,
+        "removeEventListener": true
+      },
       "packages": {
-        "@metamask/eth-token-tracker>deep-equal>which-boxed-primitive>is-bigint": true,
-        "@metamask/eth-token-tracker>deep-equal>which-boxed-primitive>is-boolean-object": true,
-        "@metamask/eth-token-tracker>deep-equal>which-boxed-primitive>is-number-object": true,
-        "eslint-plugin-react>array-includes>is-string": true,
-        "string.prototype.matchall>es-abstract>es-to-primitive>is-symbol": true
+        "@metamask/eth-ledger-bridge-keyring>@ethereumjs/rlp": true,
+        "@ethereumjs/tx": true,
+        "@ethereumjs/tx>@ethereumjs/util": true,
+        "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth": true,
+        "@metamask/eth-sig-util": true,
+        "browserify>buffer": true,
+        "webpack>events": true,
+        "@metamask/eth-trezor-keyring>hdkey": true
       }
     },
-    "@metamask/eth-token-tracker>deep-equal>which-boxed-primitive>is-bigint": {
+    "@metamask/eth-query": {
       "packages": {
-        "string.prototype.matchall>es-abstract>unbox-primitive>has-bigints": true
+        "@metamask/eth-query>json-rpc-random-id": true,
+        "watchify>xtend": true
       }
     },
-    "@metamask/eth-token-tracker>deep-equal>which-boxed-primitive>is-boolean-object": {
+    "@metamask/eth-sig-util": {
       "packages": {
-        "koa>is-generator-function>has-tostringtag": true,
-        "string.prototype.matchall>call-bind": true
+        "@ethereumjs/tx>@ethereumjs/util": true,
+        "@metamask/abi-utils": true,
+        "@metamask/eth-sig-util>@metamask/utils": true,
+        "@metamask/utils>@scure/base": true,
+        "browserify>buffer": true,
+        "@ethereumjs/tx>ethereum-cryptography": true,
+        "@metamask/eth-sig-util>tweetnacl": true
       }
     },
-    "@metamask/eth-token-tracker>deep-equal>which-boxed-primitive>is-number-object": {
+    "@metamask/eth-snap-keyring>@metamask/eth-sig-util": {
       "packages": {
-        "koa>is-generator-function>has-tostringtag": true
+        "@ethereumjs/tx>@ethereumjs/util": true,
+        "@metamask/abi-utils": true,
+        "@metamask/eth-snap-keyring>@metamask/utils": true,
+        "@metamask/utils>@scure/base": true,
+        "browserify>buffer": true,
+        "@ethereumjs/tx>ethereum-cryptography": true,
+        "@metamask/eth-sig-util>tweetnacl": true
       }
     },
-    "@metamask/eth-token-tracker>deep-equal>which-collection": {
+    "@metamask/keyring-controller>@metamask/eth-sig-util": {
       "packages": {
-        "@metamask/eth-token-tracker>deep-equal>es-get-iterator>is-map": true,
-        "@metamask/eth-token-tracker>deep-equal>es-get-iterator>is-set": true,
-        "@metamask/eth-token-tracker>deep-equal>which-collection>is-weakmap": true,
-        "@metamask/eth-token-tracker>deep-equal>which-collection>is-weakset": true
+        "@ethereumjs/tx>@ethereumjs/util": true,
+        "@metamask/abi-utils": true,
+        "@metamask/keyring-controller>@metamask/eth-sig-util>@metamask/utils": true,
+        "@metamask/utils>@scure/base": true,
+        "browserify>buffer": true,
+        "@ethereumjs/tx>ethereum-cryptography": true,
+        "@metamask/eth-sig-util>tweetnacl": true
+      }
+    },
+    "@metamask/signature-controller>@metamask/eth-sig-util": {
+      "packages": {
+        "@ethereumjs/tx>@ethereumjs/util": true,
+        "@metamask/abi-utils": true,
+        "@metamask/signature-controller>@metamask/eth-sig-util>@metamask/utils": true,
+        "@metamask/utils>@scure/base": true,
+        "browserify>buffer": true,
+        "@ethereumjs/tx>ethereum-cryptography": true,
+        "@metamask/eth-sig-util>tweetnacl": true
+      }
+    },
+    "@metamask/keyring-controller>@metamask/eth-simple-keyring": {
+      "packages": {
+        "@ethereumjs/tx>@ethereumjs/util": true,
+        "@metamask/eth-sig-util": true,
+        "@metamask/keyring-controller>@metamask/eth-simple-keyring>@metamask/utils": true,
+        "browserify>buffer": true,
+        "@ethereumjs/tx>ethereum-cryptography": true,
+        "crypto-browserify>randombytes": true
+      }
+    },
+    "@metamask/eth-snap-keyring": {
+      "globals": {
+        "URL": true,
+        "console.error": true
+      },
+      "packages": {
+        "@ethereumjs/tx": true,
+        "@metamask/eth-snap-keyring>@metamask/eth-sig-util": true,
+        "@metamask/keyring-api": true,
+        "@metamask/eth-snap-keyring>@metamask/keyring-internal-snap-client": true,
+        "@metamask/utils>@metamask/superstruct": true,
+        "@metamask/eth-snap-keyring>@metamask/utils": true,
+        "webpack>events": true,
+        "@metamask/eth-snap-keyring>uuid": true
       }
     },
-    "@metamask/eth-token-tracker>deep-equal>which-collection>is-weakset": {
+    "@metamask/eth-token-tracker": {
+      "globals": {
+        "console.warn": true
+      },
       "packages": {
-        "string.prototype.matchall>call-bind": true,
-        "string.prototype.matchall>get-intrinsic": true
+        "@babel/runtime": true,
+        "@metamask/eth-token-tracker>@metamask/eth-block-tracker": true,
+        "@metamask/ethjs-contract": true,
+        "@metamask/ethjs-query": true,
+        "@metamask/safe-event-emitter": true,
+        "bn.js": true,
+        "@metamask/eth-token-tracker>deep-equal": true,
+        "human-standard-token-abi": true
       }
     },
     "@metamask/eth-trezor-keyring": {
@@ -1234,26 +1157,10 @@
         "@ethereumjs/tx": true,
         "@ethereumjs/tx>@ethereumjs/util": true,
         "@metamask/eth-trezor-keyring>@trezor/connect-plugin-ethereum": true,
-        "@metamask/eth-trezor-keyring>hdkey": true,
         "@trezor/connect-web": true,
         "browserify>buffer": true,
-        "webpack>events": true
-      }
-    },
-    "@metamask/eth-trezor-keyring>@trezor/connect-plugin-ethereum": {
-      "packages": {
-        "@metamask/eth-sig-util": true,
-        "@swc/helpers>tslib": true
-      }
-    },
-    "@metamask/eth-trezor-keyring>hdkey": {
-      "packages": {
-        "browserify>assert": true,
-        "crypto-browserify": true,
-        "ethereumjs-util>create-hash>ripemd160": true,
-        "ethereumjs-util>ethereum-cryptography>bs58check": true,
-        "ganache>secp256k1": true,
-        "koa>content-disposition>safe-buffer": true
+        "webpack>events": true,
+        "@metamask/eth-trezor-keyring>hdkey": true
       }
     },
     "@metamask/etherscan-link": {
@@ -1268,16 +1175,16 @@
       },
       "packages": {
         "@metamask/ethjs-contract": true,
-        "@metamask/ethjs-query": true,
         "@metamask/ethjs>@metamask/ethjs-filter": true,
         "@metamask/ethjs>@metamask/ethjs-provider-http": true,
+        "@metamask/ethjs-query": true,
         "@metamask/ethjs>@metamask/ethjs-unit": true,
         "@metamask/ethjs>@metamask/ethjs-util": true,
         "@metamask/ethjs>@metamask/number-to-bn": true,
-        "@metamask/ethjs>ethjs-abi": true,
-        "@metamask/ethjs>js-sha3": true,
         "bn.js": true,
-        "browserify>buffer": true
+        "browserify>buffer": true,
+        "@metamask/ethjs>ethjs-abi": true,
+        "@metamask/ethjs>js-sha3": true
       }
     },
     "@metamask/ethjs-contract": {
@@ -1290,43 +1197,38 @@
         "promise-to-callback": true
       }
     },
-    "@metamask/ethjs-query": {
+    "@metamask/ethjs>@metamask/ethjs-filter": {
       "globals": {
-        "console": true
-      },
-      "packages": {
-        "@metamask/ethjs-query>@metamask/ethjs-format": true,
-        "@metamask/ethjs-query>@metamask/ethjs-rpc": true,
-        "promise-to-callback": true
+        "clearInterval": true,
+        "setInterval": true
       }
     },
     "@metamask/ethjs-query>@metamask/ethjs-format": {
       "packages": {
-        "@metamask/ethjs-query>@metamask/ethjs-format>ethjs-schema": true,
         "@metamask/ethjs>@metamask/ethjs-util": true,
-        "@metamask/ethjs>@metamask/ethjs-util>strip-hex-prefix": true,
-        "@metamask/ethjs>@metamask/number-to-bn": true
+        "@metamask/ethjs>@metamask/number-to-bn": true,
+        "@metamask/ethjs-query>@metamask/ethjs-format>ethjs-schema": true,
+        "@metamask/ethjs>@metamask/ethjs-util>strip-hex-prefix": true
       }
     },
-    "@metamask/ethjs-query>@metamask/ethjs-rpc": {
+    "@metamask/ethjs>@metamask/ethjs-provider-http": {
       "packages": {
-        "promise-to-callback": true
+        "@metamask/ethjs>@metamask/ethjs-provider-http>xhr2": true
       }
     },
-    "@metamask/ethjs>@metamask/ethjs-filter": {
+    "@metamask/ethjs-query": {
       "globals": {
-        "clearInterval": true,
-        "setInterval": true
-      }
-    },
-    "@metamask/ethjs>@metamask/ethjs-provider-http": {
+        "console": true
+      },
       "packages": {
-        "@metamask/ethjs>@metamask/ethjs-provider-http>xhr2": true
+        "@metamask/ethjs-query>@metamask/ethjs-format": true,
+        "@metamask/ethjs-query>@metamask/ethjs-rpc": true,
+        "promise-to-callback": true
       }
     },
-    "@metamask/ethjs>@metamask/ethjs-provider-http>xhr2": {
-      "globals": {
-        "XMLHttpRequest": true
+    "@metamask/ethjs-query>@metamask/ethjs-rpc": {
+      "packages": {
+        "promise-to-callback": true
       }
     },
     "@metamask/ethjs>@metamask/ethjs-unit": {
@@ -1337,42 +1239,9 @@
     },
     "@metamask/ethjs>@metamask/ethjs-util": {
       "packages": {
+        "browserify>buffer": true,
         "@metamask/ethjs>@metamask/ethjs-util>is-hex-prefixed": true,
-        "@metamask/ethjs>@metamask/ethjs-util>strip-hex-prefix": true,
-        "browserify>buffer": true
-      }
-    },
-    "@metamask/ethjs>@metamask/ethjs-util>strip-hex-prefix": {
-      "packages": {
-        "@metamask/ethjs>@metamask/ethjs-util>is-hex-prefixed": true
-      }
-    },
-    "@metamask/ethjs>@metamask/number-to-bn": {
-      "packages": {
-        "@metamask/ethjs>@metamask/ethjs-util>strip-hex-prefix": true,
-        "bn.js": true
-      }
-    },
-    "@metamask/ethjs>ethjs-abi": {
-      "packages": {
-        "@metamask/ethjs>ethjs-abi>number-to-bn": true,
-        "@metamask/ethjs>js-sha3": true,
-        "bn.js": true,
-        "browserify>buffer": true
-      }
-    },
-    "@metamask/ethjs>ethjs-abi>number-to-bn": {
-      "packages": {
-        "@metamask/ethjs>@metamask/ethjs-util>strip-hex-prefix": true,
-        "bn.js": true
-      }
-    },
-    "@metamask/ethjs>js-sha3": {
-      "globals": {
-        "define": true
-      },
-      "packages": {
-        "process": true
+        "@metamask/ethjs>@metamask/ethjs-util>strip-hex-prefix": true
       }
     },
     "@metamask/gas-fee-controller": {
@@ -1399,28 +1268,6 @@
         "@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/json-rpc-engine": {
       "packages": {
         "@metamask/rpc-errors": true,
@@ -1433,206 +1280,65 @@
         "console.warn": true,
         "setTimeout": true
       },
-      "packages": {
-        "@metamask/safe-event-emitter": true,
-        "@metamask/utils": true,
-        "readable-stream": true
-      }
-    },
-    "@metamask/keyring-api": {
-      "packages": {
-        "@metamask/keyring-api>@metamask/keyring-utils": true,
-        "@metamask/keyring-api>@metamask/utils": true,
-        "@metamask/keyring-api>bech32": true,
-        "@metamask/utils>@metamask/superstruct": true
-      }
-    },
-    "@metamask/keyring-api>@metamask/keyring-utils": {
-      "globals": {
-        "URL": true
-      },
-      "packages": {
-        "@metamask/keyring-api>@metamask/keyring-utils>@metamask/utils": true,
-        "@metamask/utils>@metamask/superstruct": true
-      }
-    },
-    "@metamask/keyring-api>@metamask/keyring-utils>@metamask/utils": {
-      "globals": {
-        "TextDecoder": true,
-        "TextEncoder": true
-      },
-      "packages": {
-        "@metamask/utils>@metamask/superstruct": true,
-        "@metamask/utils>@scure/base": true,
-        "@metamask/utils>pony-cause": true,
-        "@noble/hashes": true,
-        "browserify>buffer": true,
-        "nock>debug": true,
-        "semver": true
-      }
-    },
-    "@metamask/keyring-api>@metamask/utils": {
-      "globals": {
-        "TextDecoder": true,
-        "TextEncoder": true
-      },
-      "packages": {
-        "@metamask/utils>@metamask/superstruct": true,
-        "@metamask/utils>@scure/base": true,
-        "@metamask/utils>pony-cause": true,
-        "@noble/hashes": true,
-        "browserify>buffer": true,
-        "nock>debug": true,
-        "semver": true
-      }
-    },
-    "@metamask/keyring-controller": {
-      "packages": {
-        "@ethereumjs/tx>@ethereumjs/util": true,
-        "@metamask/base-controller": true,
-        "@metamask/browser-passworder": true,
-        "@metamask/keyring-controller>@metamask/eth-hd-keyring": true,
-        "@metamask/keyring-controller>@metamask/eth-sig-util": true,
-        "@metamask/keyring-controller>@metamask/eth-simple-keyring": true,
-        "@metamask/keyring-controller>ethereumjs-wallet": true,
-        "@metamask/name-controller>async-mutex": true,
-        "@metamask/utils": true
-      }
-    },
-    "@metamask/keyring-controller>@metamask/eth-hd-keyring": {
-      "globals": {
-        "TextEncoder": true
-      },
-      "packages": {
-        "@ethereumjs/tx>@ethereumjs/util": true,
-        "@ethereumjs/tx>ethereum-cryptography": true,
-        "@metamask/eth-sig-util": true,
-        "@metamask/keyring-controller>@metamask/eth-hd-keyring>@metamask/utils": true,
-        "@metamask/scure-bip39": true,
-        "browserify>buffer": true
-      }
-    },
-    "@metamask/keyring-controller>@metamask/eth-hd-keyring>@metamask/utils": {
-      "globals": {
-        "TextDecoder": true,
-        "TextEncoder": true
-      },
-      "packages": {
-        "@metamask/utils>@metamask/superstruct": true,
-        "@metamask/utils>@scure/base": true,
-        "@metamask/utils>pony-cause": true,
-        "@noble/hashes": true,
-        "browserify>buffer": true,
-        "nock>debug": true,
-        "semver": true
-      }
-    },
-    "@metamask/keyring-controller>@metamask/eth-sig-util": {
-      "packages": {
-        "@ethereumjs/tx>@ethereumjs/util": true,
-        "@ethereumjs/tx>ethereum-cryptography": true,
-        "@metamask/abi-utils": true,
-        "@metamask/eth-sig-util>tweetnacl": true,
-        "@metamask/keyring-controller>@metamask/eth-sig-util>@metamask/utils": true,
-        "@metamask/utils>@scure/base": true,
-        "browserify>buffer": true
-      }
-    },
-    "@metamask/keyring-controller>@metamask/eth-sig-util>@metamask/utils": {
-      "globals": {
-        "TextDecoder": true,
-        "TextEncoder": true
-      },
-      "packages": {
-        "@metamask/utils>@metamask/superstruct": true,
-        "@metamask/utils>@scure/base": true,
-        "@metamask/utils>pony-cause": true,
-        "@noble/hashes": true,
-        "browserify>buffer": true,
-        "nock>debug": true,
-        "semver": true
-      }
-    },
-    "@metamask/keyring-controller>@metamask/eth-simple-keyring": {
-      "packages": {
-        "@ethereumjs/tx>@ethereumjs/util": true,
-        "@ethereumjs/tx>ethereum-cryptography": true,
-        "@metamask/eth-sig-util": true,
-        "@metamask/keyring-controller>@metamask/eth-simple-keyring>@metamask/utils": true,
-        "browserify>buffer": true,
-        "crypto-browserify>randombytes": true
+      "packages": {
+        "@metamask/safe-event-emitter": true,
+        "@metamask/utils": true,
+        "readable-stream": true
       }
     },
-    "@metamask/keyring-controller>@metamask/eth-simple-keyring>@metamask/utils": {
+    "@metamask/snaps-sdk>@metamask/key-tree": {
       "globals": {
-        "TextDecoder": true,
-        "TextEncoder": true
+        "crypto.subtle": true
       },
       "packages": {
-        "@metamask/utils>@metamask/superstruct": true,
-        "@metamask/utils>@scure/base": true,
-        "@metamask/utils>pony-cause": true,
+        "@metamask/scure-bip39": true,
+        "@metamask/utils": true,
+        "@ethereumjs/tx>ethereum-cryptography>@noble/curves": true,
         "@noble/hashes": true,
-        "browserify>buffer": true,
-        "nock>debug": true,
-        "semver": true
-      }
-    },
-    "@metamask/keyring-controller>ethereumjs-wallet": {
-      "packages": {
-        "@metamask/keyring-controller>ethereumjs-wallet>ethereum-cryptography": true,
-        "@metamask/keyring-controller>ethereumjs-wallet>ethereumjs-util": true,
-        "@metamask/keyring-controller>ethereumjs-wallet>utf8": true,
-        "browserify>buffer": true,
-        "crypto-browserify": true,
-        "crypto-browserify>randombytes": true,
-        "eth-lattice-keyring>gridplus-sdk>aes-js": true,
-        "ethereumjs-util>ethereum-cryptography>bs58check": true,
-        "ethers>@ethersproject/json-wallets>scrypt-js": true,
-        "uuid": true
+        "@metamask/utils>@scure/base": true
       }
     },
-    "@metamask/keyring-controller>ethereumjs-wallet>ethereum-cryptography": {
+    "@metamask/keyring-api": {
       "packages": {
-        "browserify>assert": true,
-        "browserify>buffer": true,
-        "crypto-browserify>create-hmac": true,
-        "crypto-browserify>randombytes": true,
-        "ethereumjs-util>ethereum-cryptography>bs58check": true,
-        "ethereumjs-util>ethereum-cryptography>keccak": true,
-        "ethers>@ethersproject/sha2>hash.js": true,
-        "ganache>secp256k1": true,
-        "koa>content-disposition>safe-buffer": true
+        "@metamask/keyring-api>@metamask/keyring-utils": true,
+        "@metamask/utils>@metamask/superstruct": true,
+        "@metamask/keyring-api>@metamask/utils": true,
+        "@metamask/keyring-api>bech32": true
       }
     },
-    "@metamask/keyring-controller>ethereumjs-wallet>ethereumjs-util": {
+    "@metamask/keyring-controller": {
       "packages": {
-        "@metamask/keyring-controller>ethereumjs-wallet>ethereum-cryptography": true,
-        "@metamask/keyring-controller>ethereumjs-wallet>ethereumjs-util>rlp": true,
-        "bn.js": true,
-        "browserify>assert": true,
-        "browserify>buffer": true,
-        "browserify>insert-module-globals>is-buffer": true,
-        "ethereumjs-util>create-hash": true
+        "@ethereumjs/tx>@ethereumjs/util": true,
+        "@metamask/base-controller": true,
+        "@metamask/browser-passworder": true,
+        "@metamask/keyring-controller>@metamask/eth-hd-keyring": true,
+        "@metamask/keyring-controller>@metamask/eth-sig-util": true,
+        "@metamask/keyring-controller>@metamask/eth-simple-keyring": true,
+        "@metamask/utils": true,
+        "@metamask/name-controller>async-mutex": true,
+        "@metamask/keyring-controller>ethereumjs-wallet": true
       }
     },
-    "@metamask/keyring-controller>ethereumjs-wallet>ethereumjs-util>rlp": {
+    "@metamask/eth-snap-keyring>@metamask/keyring-internal-snap-client": {
       "packages": {
-        "bn.js": true,
-        "browserify>buffer": true
+        "@metamask/keyring-snap-client": true
       }
     },
     "@metamask/keyring-snap-client": {
       "packages": {
         "@metamask/keyring-api": true,
         "@metamask/keyring-api>@metamask/keyring-utils": true,
-        "@metamask/keyring-snap-client>uuid": true,
-        "@metamask/utils>@metamask/superstruct": true
+        "@metamask/utils>@metamask/superstruct": true,
+        "@metamask/keyring-snap-client>uuid": true
       }
     },
-    "@metamask/keyring-snap-client>uuid": {
+    "@metamask/keyring-api>@metamask/keyring-utils": {
       "globals": {
-        "crypto": true
+        "URL": true
+      },
+      "packages": {
+        "@metamask/utils>@metamask/superstruct": true,
+        "@metamask/keyring-api>@metamask/keyring-utils>@metamask/utils": true
       }
     },
     "@metamask/logging-controller": {
@@ -1661,13 +1367,8 @@
         "@metamask/controller-utils": true,
         "@metamask/utils": true,
         "browserify>buffer": true,
-        "uuid": true,
-        "webpack>events": true
-      }
-    },
-    "@metamask/message-manager>jsonschema": {
-      "packages": {
-        "browserify>url": true
+        "webpack>events": true,
+        "uuid": true
       }
     },
     "@metamask/name-controller": {
@@ -1675,44 +1376,12 @@
         "fetch": true
       },
       "packages": {
-        "@metamask/controller-utils": true,
         "@metamask/name-controller>@metamask/base-controller": true,
+        "@metamask/controller-utils": true,
         "@metamask/name-controller>@metamask/utils": true,
         "@metamask/name-controller>async-mutex": true
       }
     },
-    "@metamask/name-controller>@metamask/base-controller": {
-      "globals": {
-        "setTimeout": true
-      },
-      "packages": {
-        "immer": true
-      }
-    },
-    "@metamask/name-controller>@metamask/utils": {
-      "globals": {
-        "TextDecoder": true,
-        "TextEncoder": true
-      },
-      "packages": {
-        "@metamask/utils>@metamask/superstruct": true,
-        "@metamask/utils>@scure/base": true,
-        "@metamask/utils>pony-cause": true,
-        "@noble/hashes": true,
-        "browserify>buffer": true,
-        "nock>debug": true,
-        "semver": true
-      }
-    },
-    "@metamask/name-controller>async-mutex": {
-      "globals": {
-        "clearTimeout": true,
-        "setTimeout": true
-      },
-      "packages": {
-        "@swc/helpers>tslib": true
-      }
-    },
     "@metamask/network-controller": {
       "globals": {
         "btoa": true,
@@ -1722,224 +1391,52 @@
       "packages": {
         "@metamask/base-controller": true,
         "@metamask/controller-utils": true,
+        "@metamask/network-controller>@metamask/eth-block-tracker": true,
+        "@metamask/network-controller>@metamask/eth-json-rpc-infura": true,
         "@metamask/eth-json-rpc-middleware": true,
         "@metamask/eth-json-rpc-provider": true,
         "@metamask/eth-query": true,
         "@metamask/json-rpc-engine": true,
-        "@metamask/network-controller>@metamask/eth-block-tracker": true,
-        "@metamask/network-controller>@metamask/eth-json-rpc-infura": true,
-        "@metamask/network-controller>@metamask/swappable-obj-proxy": true,
         "@metamask/rpc-errors": true,
+        "@metamask/network-controller>@metamask/swappable-obj-proxy": true,
         "@metamask/utils": true,
         "eslint>fast-deep-equal": true,
-        "reselect": true,
-        "uri-js": true,
-        "uuid": true
-      }
-    },
-    "@metamask/network-controller>@metamask/eth-block-tracker": {
-      "globals": {
-        "clearTimeout": true,
-        "console.error": true,
-        "setTimeout": true
-      },
-      "packages": {
-        "@metamask/eth-query>json-rpc-random-id": true,
-        "@metamask/network-controller>@metamask/eth-block-tracker>@metamask/utils": true,
-        "@metamask/safe-event-emitter": true
-      }
-    },
-    "@metamask/network-controller>@metamask/eth-block-tracker>@metamask/utils": {
-      "globals": {
-        "TextDecoder": true,
-        "TextEncoder": true
-      },
-      "packages": {
-        "@metamask/utils>@metamask/superstruct": true,
-        "@metamask/utils>@scure/base": true,
-        "@metamask/utils>pony-cause": true,
-        "@noble/hashes": true,
-        "browserify>buffer": true,
-        "nock>debug": true,
-        "semver": true
-      }
-    },
-    "@metamask/network-controller>@metamask/eth-json-rpc-infura": {
-      "globals": {
-        "fetch": true,
-        "setTimeout": true
-      },
-      "packages": {
-        "@metamask/eth-json-rpc-provider": true,
-        "@metamask/json-rpc-engine": true,
-        "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/utils": true,
-        "@metamask/rpc-errors": true
-      }
-    },
-    "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/utils": {
-      "globals": {
-        "TextDecoder": true,
-        "TextEncoder": true
-      },
-      "packages": {
-        "@metamask/utils>@metamask/superstruct": true,
-        "@metamask/utils>@scure/base": true,
-        "@metamask/utils>pony-cause": true,
-        "@noble/hashes": true,
-        "browserify>buffer": true,
-        "nock>debug": true,
-        "semver": true
-      }
-    },
-    "@metamask/notification-controller>nanoid": {
-      "globals": {
-        "crypto.getRandomValues": true
-      }
-    },
-    "@metamask/notification-services-controller": {
-      "globals": {
-        "Intl.NumberFormat": true,
-        "addEventListener": true,
-        "fetch": true,
-        "registration": true,
-        "removeEventListener": true
-      },
-      "packages": {
-        "@metamask/base-controller": true,
-        "@metamask/controller-utils": true,
-        "@metamask/notification-services-controller>@contentful/rich-text-html-renderer": true,
-        "@metamask/notification-services-controller>bignumber.js": true,
-        "@metamask/notification-services-controller>firebase": true,
-        "@metamask/profile-sync-controller": true,
-        "@metamask/utils": true,
-        "loglevel": true,
-        "uuid": true
-      }
-    },
-    "@metamask/notification-services-controller>@contentful/rich-text-html-renderer": {
-      "globals": {
-        "SuppressedError": true
-      }
-    },
-    "@metamask/notification-services-controller>bignumber.js": {
-      "globals": {
-        "crypto": true,
-        "define": true
-      }
-    },
-    "@metamask/notification-services-controller>firebase": {
-      "packages": {
-        "@metamask/notification-services-controller>firebase>@firebase/app": true,
-        "@metamask/notification-services-controller>firebase>@firebase/messaging": true
-      }
-    },
-    "@metamask/notification-services-controller>firebase>@firebase/app": {
-      "globals": {
-        "FinalizationRegistry": true,
-        "console.warn": true
-      },
-      "packages": {
-        "@metamask/notification-services-controller>firebase>@firebase/app>@firebase/component": true,
-        "@metamask/notification-services-controller>firebase>@firebase/app>@firebase/logger": true,
-        "@metamask/notification-services-controller>firebase>@firebase/app>idb": true,
-        "@metamask/notification-services-controller>firebase>@firebase/util": true
-      }
-    },
-    "@metamask/notification-services-controller>firebase>@firebase/app>@firebase/component": {
-      "packages": {
-        "@metamask/notification-services-controller>firebase>@firebase/util": true
-      }
-    },
-    "@metamask/notification-services-controller>firebase>@firebase/app>@firebase/logger": {
-      "globals": {
-        "console": true
-      },
-      "packages": {
-        "@swc/helpers>tslib": true
-      }
-    },
-    "@metamask/notification-services-controller>firebase>@firebase/app>idb": {
-      "globals": {
-        "DOMException": true,
-        "IDBCursor": true,
-        "IDBDatabase": true,
-        "IDBIndex": true,
-        "IDBObjectStore": true,
-        "IDBRequest": true,
-        "IDBTransaction": true,
-        "indexedDB.deleteDatabase": true,
-        "indexedDB.open": true
+        "reselect": true,
+        "uri-js": true,
+        "uuid": true
       }
     },
-    "@metamask/notification-services-controller>firebase>@firebase/installations": {
-      "globals": {
-        "BroadcastChannel": true,
-        "Headers": true,
-        "btoa": true,
-        "console.error": true,
-        "crypto": true,
-        "fetch": true,
-        "msCrypto": true,
-        "navigator.onLine": true,
-        "setTimeout": true
-      },
+    "@metamask/transaction-controller>@metamask/nonce-tracker": {
       "packages": {
-        "@metamask/notification-services-controller>firebase>@firebase/app": true,
-        "@metamask/notification-services-controller>firebase>@firebase/app>@firebase/component": true,
-        "@metamask/notification-services-controller>firebase>@firebase/app>idb": true,
-        "@metamask/notification-services-controller>firebase>@firebase/util": true
+        "@ethersproject/providers": true,
+        "browserify>assert": true,
+        "@metamask/transaction-controller>@metamask/nonce-tracker>async-mutex": true
       }
     },
-    "@metamask/notification-services-controller>firebase>@firebase/messaging": {
+    "@metamask/notification-services-controller": {
       "globals": {
-        "Headers": true,
-        "Notification.maxActions": true,
-        "Notification.permission": true,
-        "Notification.requestPermission": true,
-        "PushSubscription.prototype.hasOwnProperty": true,
-        "ServiceWorkerRegistration": true,
-        "URL": true,
+        "Intl.NumberFormat": true,
         "addEventListener": true,
-        "atob": true,
-        "btoa": true,
-        "clients.matchAll": true,
-        "clients.openWindow": true,
-        "console.warn": true,
-        "document": true,
         "fetch": true,
-        "indexedDB": true,
-        "location.href": true,
-        "location.origin": true,
-        "navigator": true,
-        "origin.replace": true,
-        "registration.showNotification": true,
-        "setTimeout": true
+        "registration": true,
+        "removeEventListener": true
       },
       "packages": {
-        "@metamask/notification-services-controller>firebase>@firebase/app": true,
-        "@metamask/notification-services-controller>firebase>@firebase/app>@firebase/component": true,
-        "@metamask/notification-services-controller>firebase>@firebase/app>idb": true,
-        "@metamask/notification-services-controller>firebase>@firebase/installations": true,
-        "@metamask/notification-services-controller>firebase>@firebase/util": true,
-        "@swc/helpers>tslib": true
+        "@metamask/notification-services-controller>@contentful/rich-text-html-renderer": true,
+        "@metamask/base-controller": true,
+        "@metamask/controller-utils": true,
+        "@metamask/profile-sync-controller": true,
+        "@metamask/utils": true,
+        "@metamask/notification-services-controller>bignumber.js": true,
+        "@metamask/notification-services-controller>firebase": true,
+        "loglevel": true,
+        "uuid": true
       }
     },
-    "@metamask/notification-services-controller>firebase>@firebase/util": {
-      "globals": {
-        "atob": true,
-        "browser": true,
-        "btoa": true,
-        "chrome": true,
-        "console": true,
-        "document": true,
-        "indexedDB": true,
-        "navigator": true,
-        "process": true,
-        "self": true,
-        "setTimeout": true
-      },
+    "@metamask/ethjs>@metamask/number-to-bn": {
       "packages": {
-        "process": true
+        "bn.js": true,
+        "@metamask/ethjs>@metamask/ethjs-util>strip-hex-prefix": true
       }
     },
     "@metamask/object-multiplex": {
@@ -1951,11 +1448,6 @@
         "readable-stream": true
       }
     },
-    "@metamask/object-multiplex>once": {
-      "packages": {
-        "@metamask/object-multiplex>once>wrappy": true
-      }
-    },
     "@metamask/obs-store": {
       "packages": {
         "@metamask/safe-event-emitter": true,
@@ -1977,32 +1469,12 @@
         "nanoid": true
       }
     },
-    "@metamask/permission-controller>nanoid": {
-      "globals": {
-        "crypto.getRandomValues": true
-      }
-    },
     "@metamask/permission-log-controller": {
       "packages": {
         "@metamask/base-controller": true,
         "@metamask/permission-log-controller>@metamask/utils": true
       }
     },
-    "@metamask/permission-log-controller>@metamask/utils": {
-      "globals": {
-        "TextDecoder": true,
-        "TextEncoder": true
-      },
-      "packages": {
-        "@metamask/utils>@metamask/superstruct": true,
-        "@metamask/utils>@scure/base": true,
-        "@metamask/utils>pony-cause": true,
-        "@noble/hashes": true,
-        "browserify>buffer": true,
-        "nock>debug": true,
-        "semver": true
-      }
-    },
     "@metamask/phishing-controller": {
       "globals": {
         "TextEncoder": true,
@@ -2011,12 +1483,12 @@
         "fetch": true
       },
       "packages": {
-        "@ethereumjs/tx>ethereum-cryptography": true,
         "@metamask/base-controller": true,
         "@metamask/controller-utils": true,
         "@noble/hashes": true,
-        "punycode": true,
-        "webpack-cli>fastest-levenshtein": true
+        "@ethereumjs/tx>ethereum-cryptography": true,
+        "webpack-cli>fastest-levenshtein": true,
+        "punycode": true
       }
     },
     "@metamask/polling-controller": {
@@ -2047,21 +1519,6 @@
         "readable-stream": true
       }
     },
-    "@metamask/post-message-stream>@metamask/utils": {
-      "globals": {
-        "TextDecoder": true,
-        "TextEncoder": true
-      },
-      "packages": {
-        "@metamask/utils>@metamask/superstruct": true,
-        "@metamask/utils>@scure/base": true,
-        "@metamask/utils>pony-cause": true,
-        "@noble/hashes": true,
-        "browserify>buffer": true,
-        "nock>debug": true,
-        "semver": true
-      }
-    },
     "@metamask/ppom-validator": {
       "globals": {
         "URL": true,
@@ -2071,48 +1528,11 @@
       "packages": {
         "@metamask/base-controller": true,
         "@metamask/controller-utils": true,
-        "@metamask/eth-query>json-rpc-random-id": true,
+        "await-semaphore": true,
+        "browserify>buffer": true,
         "@metamask/ppom-validator>crypto-js": true,
         "@metamask/ppom-validator>elliptic": true,
-        "await-semaphore": true,
-        "browserify>buffer": true
-      }
-    },
-    "@metamask/ppom-validator>crypto-js": {
-      "globals": {
-        "crypto": true,
-        "define": true,
-        "msCrypto": true
-      },
-      "packages": {
-        "browserify>browser-resolve": true
-      }
-    },
-    "@metamask/ppom-validator>elliptic": {
-      "packages": {
-        "@metamask/ppom-validator>elliptic>brorand": true,
-        "@metamask/ppom-validator>elliptic>hmac-drbg": true,
-        "@metamask/ppom-validator>elliptic>minimalistic-assert": true,
-        "@metamask/ppom-validator>elliptic>minimalistic-crypto-utils": true,
-        "bn.js": true,
-        "ethers>@ethersproject/sha2>hash.js": true,
-        "pumpify>inherits": true
-      }
-    },
-    "@metamask/ppom-validator>elliptic>brorand": {
-      "globals": {
-        "crypto": true,
-        "msCrypto": true
-      },
-      "packages": {
-        "browserify>browser-resolve": true
-      }
-    },
-    "@metamask/ppom-validator>elliptic>hmac-drbg": {
-      "packages": {
-        "@metamask/ppom-validator>elliptic>minimalistic-assert": true,
-        "@metamask/ppom-validator>elliptic>minimalistic-crypto-utils": true,
-        "ethers>@ethersproject/sha2>hash.js": true
+        "@metamask/eth-query>json-rpc-random-id": true
       }
     },
     "@metamask/preferences-controller": {
@@ -2142,55 +1562,10 @@
         "@metamask/keyring-controller": true,
         "@metamask/network-controller": true,
         "@metamask/profile-sync-controller>@noble/ciphers": true,
-        "@metamask/profile-sync-controller>siwe": true,
         "@noble/hashes": true,
         "browserify>buffer": true,
-        "loglevel": true
-      }
-    },
-    "@metamask/profile-sync-controller>@noble/ciphers": {
-      "globals": {
-        "TextDecoder": true,
-        "TextEncoder": true,
-        "crypto": true
-      }
-    },
-    "@metamask/profile-sync-controller>siwe": {
-      "globals": {
-        "console.error": true,
-        "console.warn": true
-      },
-      "packages": {
-        "@metamask/controller-utils>@spruceid/siwe-parser>valid-url": true,
-        "@metamask/profile-sync-controller>siwe>@spruceid/siwe-parser": true,
-        "@metamask/profile-sync-controller>siwe>@stablelib/random": true,
-        "ethers": true
-      }
-    },
-    "@metamask/profile-sync-controller>siwe>@spruceid/siwe-parser": {
-      "globals": {
-        "console.error": true,
-        "console.log": true
-      },
-      "packages": {
-        "@metamask/controller-utils>@spruceid/siwe-parser>apg-js": true,
-        "@noble/hashes": true
-      }
-    },
-    "@metamask/profile-sync-controller>siwe>@stablelib/random": {
-      "globals": {
-        "crypto": true,
-        "msCrypto": true
-      },
-      "packages": {
-        "@metamask/profile-sync-controller>siwe>@stablelib/random>@stablelib/binary": true,
-        "@metamask/profile-sync-controller>siwe>@stablelib/random>@stablelib/wipe": true,
-        "browserify>browser-resolve": true
-      }
-    },
-    "@metamask/profile-sync-controller>siwe>@stablelib/random>@stablelib/binary": {
-      "packages": {
-        "@metamask/profile-sync-controller>siwe>@stablelib/random>@stablelib/binary>@stablelib/int": true
+        "loglevel": true,
+        "@metamask/profile-sync-controller>siwe": true
       }
     },
     "@metamask/queued-request-controller": {
@@ -2203,57 +1578,13 @@
       }
     },
     "@metamask/rate-limit-controller": {
-      "globals": {
-        "setTimeout": true
-      },
-      "packages": {
-        "@metamask/rate-limit-controller>@metamask/base-controller": true,
-        "@metamask/rate-limit-controller>@metamask/rpc-errors": true,
-        "@metamask/rate-limit-controller>@metamask/utils": true
-      }
-    },
-    "@metamask/rate-limit-controller>@metamask/base-controller": {
-      "globals": {
-        "setTimeout": true
-      },
-      "packages": {
-        "immer": true
-      }
-    },
-    "@metamask/rate-limit-controller>@metamask/rpc-errors": {
-      "packages": {
-        "@metamask/rate-limit-controller>@metamask/rpc-errors>@metamask/utils": true,
-        "@metamask/rpc-errors>fast-safe-stringify": true
-      }
-    },
-    "@metamask/rate-limit-controller>@metamask/rpc-errors>@metamask/utils": {
-      "globals": {
-        "TextDecoder": true,
-        "TextEncoder": true
-      },
-      "packages": {
-        "@metamask/utils>@metamask/superstruct": true,
-        "@metamask/utils>@scure/base": true,
-        "@metamask/utils>pony-cause": true,
-        "@noble/hashes": true,
-        "browserify>buffer": true,
-        "nock>debug": true,
-        "semver": true
-      }
-    },
-    "@metamask/rate-limit-controller>@metamask/utils": {
-      "globals": {
-        "TextDecoder": true,
-        "TextEncoder": true
-      },
-      "packages": {
-        "@metamask/utils>@metamask/superstruct": true,
-        "@metamask/utils>@scure/base": true,
-        "@metamask/utils>pony-cause": true,
-        "@noble/hashes": true,
-        "browserify>buffer": true,
-        "nock>debug": true,
-        "semver": true
+      "globals": {
+        "setTimeout": true
+      },
+      "packages": {
+        "@metamask/rate-limit-controller>@metamask/base-controller": true,
+        "@metamask/rate-limit-controller>@metamask/rpc-errors": true,
+        "@metamask/rate-limit-controller>@metamask/utils": true
       }
     },
     "@metamask/remote-feature-flag-controller": {
@@ -2264,18 +1595,14 @@
     },
     "@metamask/rpc-errors": {
       "packages": {
-        "@metamask/rpc-errors>fast-safe-stringify": true,
-        "@metamask/utils": true
-      }
-    },
-    "@metamask/rpc-methods-flask>nanoid": {
-      "globals": {
-        "crypto.getRandomValues": true
+        "@metamask/utils": true,
+        "@metamask/rpc-errors>fast-safe-stringify": true
       }
     },
-    "@metamask/rpc-methods>nanoid": {
-      "globals": {
-        "crypto.getRandomValues": true
+    "@metamask/rate-limit-controller>@metamask/rpc-errors": {
+      "packages": {
+        "@metamask/rate-limit-controller>@metamask/rpc-errors>@metamask/utils": true,
+        "@metamask/rpc-errors>fast-safe-stringify": true
       }
     },
     "@metamask/safe-event-emitter": {
@@ -2295,12 +1622,6 @@
         "@metamask/utils>@scure/base": true
       }
     },
-    "@metamask/scure-bip39>@noble/hashes": {
-      "globals": {
-        "TextEncoder": true,
-        "crypto": true
-      }
-    },
     "@metamask/selected-network-controller": {
       "packages": {
         "@metamask/base-controller": true,
@@ -2314,40 +1635,14 @@
       "packages": {
         "@metamask/base-controller": true,
         "@metamask/controller-utils": true,
+        "@metamask/signature-controller>@metamask/eth-sig-util": true,
         "@metamask/keyring-controller": true,
         "@metamask/logging-controller": true,
-        "@metamask/message-manager>jsonschema": true,
-        "@metamask/signature-controller>@metamask/eth-sig-util": true,
         "@metamask/utils": true,
         "browserify>buffer": true,
-        "uuid": true,
-        "webpack>events": true
-      }
-    },
-    "@metamask/signature-controller>@metamask/eth-sig-util": {
-      "packages": {
-        "@ethereumjs/tx>@ethereumjs/util": true,
-        "@ethereumjs/tx>ethereum-cryptography": true,
-        "@metamask/abi-utils": true,
-        "@metamask/eth-sig-util>tweetnacl": true,
-        "@metamask/signature-controller>@metamask/eth-sig-util>@metamask/utils": true,
-        "@metamask/utils>@scure/base": true,
-        "browserify>buffer": true
-      }
-    },
-    "@metamask/signature-controller>@metamask/eth-sig-util>@metamask/utils": {
-      "globals": {
-        "TextDecoder": true,
-        "TextEncoder": true
-      },
-      "packages": {
-        "@metamask/utils>@metamask/superstruct": true,
-        "@metamask/utils>@scure/base": true,
-        "@metamask/utils>pony-cause": true,
-        "@noble/hashes": true,
-        "browserify>buffer": true,
-        "nock>debug": true,
-        "semver": true
+        "webpack>events": true,
+        "@metamask/message-manager>jsonschema": true,
+        "uuid": true
       }
     },
     "@metamask/smart-transactions-controller": {
@@ -2360,60 +1655,19 @@
         "setInterval": true
       },
       "packages": {
+        "@metamask/smart-transactions-controller>@ethereumjs/tx": true,
+        "@metamask/smart-transactions-controller>@ethereumjs/util": true,
         "@ethersproject/bytes": true,
         "@metamask/controller-utils": true,
         "@metamask/eth-query": true,
         "@metamask/polling-controller": true,
-        "@metamask/smart-transactions-controller>@ethereumjs/tx": true,
-        "@metamask/smart-transactions-controller>@ethereumjs/util": true,
-        "@metamask/smart-transactions-controller>bignumber.js": true,
         "@metamask/transaction-controller": true,
+        "@metamask/smart-transactions-controller>bignumber.js": true,
         "browserify>buffer": true,
         "fast-json-patch": true,
         "lodash": true
       }
     },
-    "@metamask/smart-transactions-controller>@ethereumjs/tx": {
-      "packages": {
-        "@ethereumjs/tx>ethereum-cryptography": true,
-        "@metamask/smart-transactions-controller>@ethereumjs/tx>@ethereumjs/common": true,
-        "@metamask/smart-transactions-controller>@ethereumjs/tx>@ethereumjs/rlp": true,
-        "@metamask/smart-transactions-controller>@ethereumjs/util": true
-      }
-    },
-    "@metamask/smart-transactions-controller>@ethereumjs/tx>@ethereumjs/common": {
-      "packages": {
-        "@metamask/smart-transactions-controller>@ethereumjs/util": true,
-        "webpack>events": true
-      }
-    },
-    "@metamask/smart-transactions-controller>@ethereumjs/tx>@ethereumjs/rlp": {
-      "globals": {
-        "TextEncoder": true
-      }
-    },
-    "@metamask/smart-transactions-controller>@ethereumjs/util": {
-      "globals": {
-        "console.warn": true,
-        "fetch": true
-      },
-      "packages": {
-        "@ethereumjs/tx>ethereum-cryptography": true,
-        "@metamask/smart-transactions-controller>@ethereumjs/tx>@ethereumjs/rlp": true,
-        "webpack>events": 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": {
         "DecompressionStream": true,
@@ -2431,337 +1685,498 @@
         "@metamask/permission-controller": true,
         "@metamask/post-message-stream": true,
         "@metamask/rpc-errors": true,
-        "@metamask/snaps-controllers>@xstate/fsm": true,
-        "@metamask/snaps-controllers>concat-stream": true,
-        "@metamask/snaps-controllers>get-npm-tarball-url": true,
-        "@metamask/snaps-controllers>readable-web-to-node-stream": true,
-        "@metamask/snaps-controllers>tar-stream": true,
+        "@metamask/snaps-utils>@metamask/snaps-registry": true,
         "@metamask/snaps-rpc-methods": true,
         "@metamask/snaps-sdk": true,
         "@metamask/snaps-utils": true,
-        "@metamask/snaps-utils>@metamask/snaps-registry": true,
         "@metamask/utils": true,
+        "@metamask/snaps-controllers>@xstate/fsm": true,
         "browserify>browserify-zlib": true,
+        "@metamask/snaps-controllers>concat-stream": true,
         "eslint>fast-deep-equal": true,
+        "@metamask/snaps-controllers>get-npm-tarball-url": true,
         "immer": true,
         "nanoid": true,
         "readable-stream": true,
-        "semver": true
+        "@metamask/snaps-controllers>readable-web-to-node-stream": true,
+        "semver": true,
+        "@metamask/snaps-controllers>tar-stream": true
       }
     },
-    "@metamask/snaps-controllers-flask>nanoid": {
+    "@metamask/snaps-execution-environments": {
       "globals": {
-        "crypto.getRandomValues": true
+        "document.getElementById": true
+      },
+      "packages": {
+        "@metamask/post-message-stream": true,
+        "@metamask/snaps-utils": true,
+        "@metamask/utils": true
       }
     },
-    "@metamask/snaps-controllers>concat-stream": {
+    "@metamask/snaps-utils>@metamask/snaps-registry": {
       "packages": {
-        "browserify>buffer": true,
-        "browserify>concat-stream>typedarray": true,
-        "pumpify>inherits": true,
-        "readable-stream": true,
-        "terser>source-map-support>buffer-from": true
+        "@metamask/utils>@metamask/superstruct": true,
+        "@metamask/utils": true,
+        "@ethereumjs/tx>ethereum-cryptography>@noble/curves": true,
+        "@noble/hashes": true
       }
     },
-    "@metamask/snaps-controllers>nanoid": {
+    "@metamask/snaps-rpc-methods": {
+      "packages": {
+        "@metamask/snaps-sdk>@metamask/key-tree": true,
+        "@metamask/permission-controller": true,
+        "@metamask/rpc-errors": true,
+        "@metamask/snaps-sdk": true,
+        "@metamask/snaps-utils": true,
+        "@metamask/utils>@metamask/superstruct": true,
+        "@metamask/utils": true,
+        "@noble/hashes": true
+      }
+    },
+    "@metamask/snaps-sdk": {
       "globals": {
-        "crypto.getRandomValues": true
+        "fetch": true
+      },
+      "packages": {
+        "@metamask/rpc-errors": true,
+        "@metamask/utils>@metamask/superstruct": true,
+        "@metamask/utils": true
       }
     },
-    "@metamask/snaps-controllers>readable-web-to-node-stream": {
+    "@metamask/snaps-utils": {
+      "globals": {
+        "File": true,
+        "FileReader": true,
+        "TextDecoder": true,
+        "TextEncoder": true,
+        "URL": true,
+        "console.error": true,
+        "console.log": true,
+        "console.warn": true,
+        "crypto": true,
+        "document.body.appendChild": true,
+        "document.createElement": true,
+        "fetch": true
+      },
       "packages": {
-        "readable-stream": true
+        "@metamask/snaps-sdk>@metamask/key-tree": true,
+        "@metamask/permission-controller": true,
+        "@metamask/rpc-errors": true,
+        "@metamask/snaps-utils>@metamask/slip44": true,
+        "@metamask/snaps-sdk": true,
+        "@metamask/utils>@metamask/superstruct": true,
+        "@metamask/utils": true,
+        "@noble/hashes": true,
+        "@metamask/utils>@scure/base": true,
+        "chalk": true,
+        "@metamask/snaps-utils>cron-parser": true,
+        "@metamask/snaps-utils>fast-json-stable-stringify": true,
+        "@metamask/snaps-utils>fast-xml-parser": true,
+        "@metamask/snaps-utils>marked": true,
+        "@metamask/snaps-utils>rfdc": true,
+        "semver": true,
+        "@metamask/snaps-utils>validate-npm-package-name": true
       }
     },
-    "@metamask/snaps-controllers>tar-stream": {
+    "@metamask/transaction-controller": {
+      "globals": {
+        "clearTimeout": true,
+        "console.error": true,
+        "fetch": true,
+        "setTimeout": true
+      },
       "packages": {
-        "@metamask/snaps-controllers>tar-stream>b4a": true,
-        "@metamask/snaps-controllers>tar-stream>fast-fifo": true,
-        "@metamask/snaps-controllers>tar-stream>streamx": true,
-        "browserify>browser-resolve": true
+        "@ethereumjs/tx>@ethereumjs/common": true,
+        "@ethereumjs/tx": true,
+        "@ethereumjs/tx>@ethereumjs/util": true,
+        "@ethersproject/abi": true,
+        "@ethersproject/contracts": true,
+        "@ethersproject/providers": true,
+        "@metamask/base-controller": true,
+        "@metamask/controller-utils": true,
+        "@metamask/eth-query": true,
+        "@metamask/gas-fee-controller": true,
+        "@metamask/metamask-eth-abis": true,
+        "@metamask/network-controller": true,
+        "@metamask/transaction-controller>@metamask/nonce-tracker": true,
+        "@metamask/rpc-errors": true,
+        "@metamask/utils": true,
+        "@metamask/name-controller>async-mutex": true,
+        "bn.js": true,
+        "browserify>buffer": true,
+        "eth-method-registry": true,
+        "webpack>events": true,
+        "fast-json-patch": true,
+        "lodash": true,
+        "uuid": true
       }
     },
-    "@metamask/snaps-controllers>tar-stream>b4a": {
+    "@metamask/user-operation-controller": {
+      "globals": {
+        "fetch": true
+      },
+      "packages": {
+        "@metamask/base-controller": true,
+        "@metamask/controller-utils": true,
+        "@metamask/eth-query": true,
+        "@metamask/gas-fee-controller": true,
+        "@metamask/polling-controller": true,
+        "@metamask/rpc-errors": true,
+        "@metamask/utils>@metamask/superstruct": true,
+        "@metamask/transaction-controller": true,
+        "@metamask/utils": true,
+        "bn.js": true,
+        "webpack>events": true,
+        "lodash": true,
+        "uuid": true
+      }
+    },
+    "@metamask/utils": {
+      "globals": {
+        "TextDecoder": true,
+        "TextEncoder": true
+      },
+      "packages": {
+        "@metamask/utils>@metamask/superstruct": true,
+        "@noble/hashes": true,
+        "@metamask/utils>@scure/base": true,
+        "browserify>buffer": true,
+        "nock>debug": true,
+        "@metamask/utils>pony-cause": true,
+        "semver": true
+      }
+    },
+    "@metamask/abi-utils>@metamask/utils": {
       "globals": {
         "TextDecoder": true,
         "TextEncoder": true
-      }
-    },
-    "@metamask/snaps-controllers>tar-stream>streamx": {
+      },
       "packages": {
-        "@metamask/snaps-controllers>tar-stream>fast-fifo": true,
-        "@metamask/snaps-controllers>tar-stream>streamx>queue-tick": true,
-        "webpack>events": true
-      }
-    },
-    "@metamask/snaps-controllers>tar-stream>streamx>queue-tick": {
-      "globals": {
-        "queueMicrotask": true
+        "@metamask/utils>@metamask/superstruct": true,
+        "@noble/hashes": true,
+        "@metamask/utils>@scure/base": true,
+        "browserify>buffer": true,
+        "nock>debug": true,
+        "@metamask/utils>pony-cause": true,
+        "semver": true
       }
     },
-    "@metamask/snaps-execution-environments": {
+    "@metamask/browser-passworder>@metamask/utils": {
       "globals": {
-        "document.getElementById": true
+        "TextDecoder": true,
+        "TextEncoder": true
       },
       "packages": {
-        "@metamask/post-message-stream": true,
-        "@metamask/snaps-utils": true,
-        "@metamask/utils": true
-      }
-    },
-    "@metamask/snaps-rpc-methods": {
-      "packages": {
-        "@metamask/permission-controller": true,
-        "@metamask/rpc-errors": true,
-        "@metamask/snaps-sdk": true,
-        "@metamask/snaps-sdk>@metamask/key-tree": true,
-        "@metamask/snaps-utils": true,
-        "@metamask/utils": true,
         "@metamask/utils>@metamask/superstruct": true,
-        "@noble/hashes": true
+        "@noble/hashes": true,
+        "@metamask/utils>@scure/base": true,
+        "browserify>buffer": true,
+        "nock>debug": true,
+        "@metamask/utils>pony-cause": true,
+        "semver": true
       }
     },
-    "@metamask/snaps-sdk": {
+    "@metamask/eth-token-tracker>@metamask/eth-block-tracker>@metamask/utils": {
       "globals": {
-        "fetch": true
+        "TextDecoder": true,
+        "TextEncoder": true
       },
       "packages": {
-        "@metamask/rpc-errors": true,
-        "@metamask/utils": true,
-        "@metamask/utils>@metamask/superstruct": true
+        "@metamask/utils>@metamask/superstruct": true,
+        "@noble/hashes": true,
+        "@metamask/utils>@scure/base": true,
+        "browserify>buffer": true,
+        "nock>debug": true,
+        "@metamask/utils>pony-cause": true,
+        "semver": true
       }
     },
-    "@metamask/snaps-sdk>@metamask/key-tree": {
+    "@metamask/network-controller>@metamask/eth-block-tracker>@metamask/utils": {
       "globals": {
-        "crypto.subtle": true
+        "TextDecoder": true,
+        "TextEncoder": true
       },
       "packages": {
-        "@ethereumjs/tx>ethereum-cryptography>@noble/curves": true,
-        "@metamask/scure-bip39": true,
-        "@metamask/utils": true,
+        "@metamask/utils>@metamask/superstruct": true,
+        "@noble/hashes": true,
         "@metamask/utils>@scure/base": true,
-        "@noble/hashes": true
+        "browserify>buffer": true,
+        "nock>debug": true,
+        "@metamask/utils>pony-cause": true,
+        "semver": true
       }
     },
-    "@metamask/snaps-utils": {
+    "@metamask/keyring-controller>@metamask/eth-hd-keyring>@metamask/utils": {
       "globals": {
-        "File": true,
-        "FileReader": true,
         "TextDecoder": true,
-        "TextEncoder": true,
-        "URL": true,
-        "console.error": true,
-        "console.log": true,
-        "console.warn": true,
-        "crypto": true,
-        "document.body.appendChild": true,
-        "document.createElement": true,
-        "fetch": true
+        "TextEncoder": true
       },
       "packages": {
-        "@metamask/permission-controller": true,
-        "@metamask/rpc-errors": true,
-        "@metamask/snaps-sdk": true,
-        "@metamask/snaps-sdk>@metamask/key-tree": true,
-        "@metamask/snaps-utils>@metamask/slip44": true,
-        "@metamask/snaps-utils>cron-parser": true,
-        "@metamask/snaps-utils>fast-json-stable-stringify": true,
-        "@metamask/snaps-utils>fast-xml-parser": true,
-        "@metamask/snaps-utils>marked": true,
-        "@metamask/snaps-utils>rfdc": true,
-        "@metamask/snaps-utils>validate-npm-package-name": true,
-        "@metamask/utils": true,
         "@metamask/utils>@metamask/superstruct": true,
-        "@metamask/utils>@scure/base": true,
         "@noble/hashes": true,
-        "chalk": true,
+        "@metamask/utils>@scure/base": true,
+        "browserify>buffer": true,
+        "nock>debug": true,
+        "@metamask/utils>pony-cause": true,
         "semver": true
       }
     },
-    "@metamask/snaps-utils>@metamask/snaps-registry": {
+    "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/utils": {
+      "globals": {
+        "TextDecoder": true,
+        "TextEncoder": true
+      },
       "packages": {
-        "@ethereumjs/tx>ethereum-cryptography>@noble/curves": true,
-        "@metamask/utils": true,
         "@metamask/utils>@metamask/superstruct": true,
-        "@noble/hashes": true
+        "@noble/hashes": true,
+        "@metamask/utils>@scure/base": true,
+        "browserify>buffer": true,
+        "nock>debug": true,
+        "@metamask/utils>pony-cause": true,
+        "semver": true
       }
     },
-    "@metamask/snaps-utils>cron-parser": {
+    "@metamask/eth-json-rpc-middleware>@metamask/utils": {
+      "globals": {
+        "TextDecoder": true,
+        "TextEncoder": true
+      },
       "packages": {
-        "browserify>browser-resolve": true,
-        "luxon": true
+        "@metamask/utils>@metamask/superstruct": true,
+        "@noble/hashes": true,
+        "@metamask/utils>@scure/base": true,
+        "browserify>buffer": true,
+        "nock>debug": true,
+        "@metamask/utils>pony-cause": true,
+        "semver": true
       }
     },
-    "@metamask/snaps-utils>fast-xml-parser": {
+    "@metamask/eth-sig-util>@metamask/utils": {
       "globals": {
-        "entityName": true,
-        "val": true
+        "TextDecoder": true,
+        "TextEncoder": true
       },
       "packages": {
-        "@metamask/snaps-utils>fast-xml-parser>strnum": true
+        "@metamask/utils>@metamask/superstruct": true,
+        "@noble/hashes": true,
+        "@metamask/utils>@scure/base": true,
+        "browserify>buffer": true,
+        "nock>debug": true,
+        "@metamask/utils>pony-cause": true,
+        "semver": true
       }
     },
-    "@metamask/snaps-utils>marked": {
+    "@metamask/keyring-controller>@metamask/eth-sig-util>@metamask/utils": {
       "globals": {
-        "console.error": true,
-        "console.warn": true,
-        "define": true
-      }
-    },
-    "@metamask/snaps-utils>rfdc": {
+        "TextDecoder": true,
+        "TextEncoder": true
+      },
       "packages": {
-        "browserify>buffer": true
+        "@metamask/utils>@metamask/superstruct": true,
+        "@noble/hashes": true,
+        "@metamask/utils>@scure/base": true,
+        "browserify>buffer": true,
+        "nock>debug": true,
+        "@metamask/utils>pony-cause": true,
+        "semver": true
       }
     },
-    "@metamask/snaps-utils>validate-npm-package-name": {
+    "@metamask/signature-controller>@metamask/eth-sig-util>@metamask/utils": {
+      "globals": {
+        "TextDecoder": true,
+        "TextEncoder": true
+      },
       "packages": {
-        "@metamask/snaps-utils>validate-npm-package-name>builtins": true
+        "@metamask/utils>@metamask/superstruct": true,
+        "@noble/hashes": true,
+        "@metamask/utils>@scure/base": true,
+        "browserify>buffer": true,
+        "nock>debug": true,
+        "@metamask/utils>pony-cause": true,
+        "semver": true
       }
     },
-    "@metamask/snaps-utils>validate-npm-package-name>builtins": {
+    "@metamask/keyring-controller>@metamask/eth-simple-keyring>@metamask/utils": {
+      "globals": {
+        "TextDecoder": true,
+        "TextEncoder": true
+      },
       "packages": {
-        "process": true,
+        "@metamask/utils>@metamask/superstruct": true,
+        "@noble/hashes": true,
+        "@metamask/utils>@scure/base": true,
+        "browserify>buffer": true,
+        "nock>debug": true,
+        "@metamask/utils>pony-cause": true,
         "semver": true
       }
     },
-    "@metamask/test-bundler>@ethersproject/networks": {
+    "@metamask/eth-snap-keyring>@metamask/utils": {
+      "globals": {
+        "TextDecoder": true,
+        "TextEncoder": true
+      },
       "packages": {
-        "ethers>@ethersproject/logger": true
+        "@metamask/utils>@metamask/superstruct": true,
+        "@noble/hashes": true,
+        "@metamask/utils>@scure/base": true,
+        "browserify>buffer": true,
+        "nock>debug": true,
+        "@metamask/utils>pony-cause": true,
+        "semver": true
       }
     },
-    "@metamask/transaction-controller": {
+    "@metamask/keyring-api>@metamask/utils": {
       "globals": {
-        "clearTimeout": true,
-        "console.error": true,
-        "fetch": true,
-        "setTimeout": true
+        "TextDecoder": true,
+        "TextEncoder": true
       },
       "packages": {
-        "@ethereumjs/tx": true,
-        "@ethereumjs/tx>@ethereumjs/common": true,
-        "@ethereumjs/tx>@ethereumjs/util": true,
-        "@ethersproject/abi": true,
-        "@ethersproject/contracts": true,
-        "@ethersproject/providers": true,
-        "@metamask/base-controller": true,
-        "@metamask/controller-utils": true,
-        "@metamask/eth-query": true,
-        "@metamask/gas-fee-controller": true,
-        "@metamask/metamask-eth-abis": true,
-        "@metamask/name-controller>async-mutex": true,
-        "@metamask/network-controller": true,
-        "@metamask/rpc-errors": true,
-        "@metamask/transaction-controller>@metamask/nonce-tracker": true,
-        "@metamask/utils": true,
-        "bn.js": true,
+        "@metamask/utils>@metamask/superstruct": true,
+        "@noble/hashes": true,
+        "@metamask/utils>@scure/base": true,
         "browserify>buffer": true,
-        "eth-method-registry": true,
-        "fast-json-patch": true,
-        "lodash": true,
-        "uuid": true,
-        "webpack>events": true
+        "nock>debug": true,
+        "@metamask/utils>pony-cause": true,
+        "semver": true
       }
     },
-    "@metamask/transaction-controller>@metamask/nonce-tracker": {
+    "@metamask/keyring-api>@metamask/keyring-utils>@metamask/utils": {
+      "globals": {
+        "TextDecoder": true,
+        "TextEncoder": true
+      },
       "packages": {
-        "@ethersproject/providers": true,
-        "@metamask/transaction-controller>@metamask/nonce-tracker>async-mutex": true,
-        "browserify>assert": true
+        "@metamask/utils>@metamask/superstruct": true,
+        "@noble/hashes": true,
+        "@metamask/utils>@scure/base": true,
+        "browserify>buffer": true,
+        "nock>debug": true,
+        "@metamask/utils>pony-cause": true,
+        "semver": true
       }
     },
-    "@metamask/transaction-controller>@metamask/nonce-tracker>async-mutex": {
+    "@metamask/name-controller>@metamask/utils": {
       "globals": {
-        "clearTimeout": true,
-        "setTimeout": true
+        "TextDecoder": true,
+        "TextEncoder": true
       },
       "packages": {
-        "@swc/helpers>tslib": true
+        "@metamask/utils>@metamask/superstruct": true,
+        "@noble/hashes": true,
+        "@metamask/utils>@scure/base": true,
+        "browserify>buffer": true,
+        "nock>debug": true,
+        "@metamask/utils>pony-cause": true,
+        "semver": true
       }
     },
-    "@metamask/user-operation-controller": {
+    "@metamask/permission-log-controller>@metamask/utils": {
       "globals": {
-        "fetch": true
+        "TextDecoder": true,
+        "TextEncoder": true
       },
       "packages": {
-        "@metamask/base-controller": true,
-        "@metamask/controller-utils": true,
-        "@metamask/eth-query": true,
-        "@metamask/gas-fee-controller": true,
-        "@metamask/polling-controller": true,
-        "@metamask/rpc-errors": true,
-        "@metamask/transaction-controller": true,
-        "@metamask/utils": true,
         "@metamask/utils>@metamask/superstruct": true,
-        "bn.js": true,
-        "lodash": true,
-        "uuid": true,
-        "webpack>events": true
+        "@noble/hashes": true,
+        "@metamask/utils>@scure/base": true,
+        "browserify>buffer": true,
+        "nock>debug": true,
+        "@metamask/utils>pony-cause": true,
+        "semver": true
       }
     },
-    "@metamask/utils": {
+    "@metamask/post-message-stream>@metamask/utils": {
       "globals": {
         "TextDecoder": true,
         "TextEncoder": true
       },
       "packages": {
         "@metamask/utils>@metamask/superstruct": true,
+        "@noble/hashes": true,
         "@metamask/utils>@scure/base": true,
+        "browserify>buffer": true,
+        "nock>debug": true,
         "@metamask/utils>pony-cause": true,
+        "semver": true
+      }
+    },
+    "@metamask/rate-limit-controller>@metamask/utils": {
+      "globals": {
+        "TextDecoder": true,
+        "TextEncoder": true
+      },
+      "packages": {
+        "@metamask/utils>@metamask/superstruct": true,
         "@noble/hashes": true,
+        "@metamask/utils>@scure/base": true,
         "browserify>buffer": true,
         "nock>debug": true,
+        "@metamask/utils>pony-cause": true,
         "semver": true
       }
     },
-    "@metamask/utils>@scure/base": {
+    "@metamask/rate-limit-controller>@metamask/rpc-errors>@metamask/utils": {
       "globals": {
         "TextDecoder": true,
         "TextEncoder": true
+      },
+      "packages": {
+        "@metamask/utils>@metamask/superstruct": true,
+        "@noble/hashes": true,
+        "@metamask/utils>@scure/base": true,
+        "browserify>buffer": true,
+        "nock>debug": true,
+        "@metamask/utils>pony-cause": true,
+        "semver": true
       }
     },
     "@ngraveio/bc-ur": {
       "packages": {
         "@ngraveio/bc-ur>@keystonehq/alias-sampling": true,
+        "browserify>assert": true,
         "@ngraveio/bc-ur>bignumber.js": true,
+        "browserify>buffer": true,
         "@ngraveio/bc-ur>cbor-sync": true,
         "@ngraveio/bc-ur>crc": true,
         "@ngraveio/bc-ur>jsbi": true,
-        "addons-linter>sha.js": true,
-        "browserify>assert": true,
-        "browserify>buffer": true
-      }
-    },
-    "@ngraveio/bc-ur>assert>object-is": {
-      "packages": {
-        "string.prototype.matchall>call-bind": true,
-        "string.prototype.matchall>define-properties": true
+        "addons-linter>sha.js": true
       }
     },
-    "@ngraveio/bc-ur>bignumber.js": {
+    "@metamask/profile-sync-controller>@noble/ciphers": {
       "globals": {
-        "crypto": true,
-        "define": true
+        "TextDecoder": true,
+        "TextEncoder": true,
+        "crypto": true
       }
     },
-    "@ngraveio/bc-ur>cbor-sync": {
+    "@ethereumjs/tx>ethereum-cryptography>@noble/curves": {
       "globals": {
-        "define": true
+        "TextEncoder": true
       },
       "packages": {
-        "browserify>buffer": true
+        "@noble/hashes": true
       }
     },
-    "@ngraveio/bc-ur>crc": {
-      "packages": {
-        "browserify>buffer": true
+    "@noble/hashes": {
+      "globals": {
+        "TextEncoder": true,
+        "crypto": true
       }
     },
-    "@ngraveio/bc-ur>jsbi": {
+    "@metamask/scure-bip39>@noble/hashes": {
       "globals": {
-        "define": true
+        "TextEncoder": true,
+        "crypto": true
       }
     },
-    "@noble/hashes": {
+    "eth-lattice-keyring>@ethereumjs/tx>ethereum-cryptography>@noble/hashes": {
+      "globals": {
+        "TextEncoder": true,
+        "crypto": true
+      }
+    },
+    "eth-lattice-keyring>gridplus-sdk>@ethereumjs/tx>ethereum-cryptography>@noble/hashes": {
       "globals": {
         "TextEncoder": true,
         "crypto": true
@@ -2778,6 +2193,20 @@
         "navigator.userAgent": true
       }
     },
+    "@trezor/connect-web>@trezor/connect>@trezor/protobuf>protobufjs>@protobufjs/codegen": {
+      "globals": {
+        "console.log": true
+      }
+    },
+    "@trezor/connect-web>@trezor/connect>@trezor/protobuf>protobufjs>@protobufjs/fetch": {
+      "globals": {
+        "XMLHttpRequest": true
+      },
+      "packages": {
+        "@trezor/connect-web>@trezor/connect>@trezor/protobuf>protobufjs>@protobufjs/aspromise": true,
+        "@trezor/connect-web>@trezor/connect>@trezor/protobuf>protobufjs>@protobufjs/inquire": true
+      }
+    },
     "@reduxjs/toolkit": {
       "globals": {
         "AbortController": true,
@@ -2789,42 +2218,46 @@
         "setTimeout": true
       },
       "packages": {
-        "@reduxjs/toolkit>reselect": true,
         "immer": true,
         "process": 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
+        "redux-thunk": true,
+        "@reduxjs/toolkit>reselect": true
       }
     },
-    "@sentry/browser": {
+    "react-router-dom-v5-compat>@remix-run/router": {
       "globals": {
-        "PerformanceObserver.supportedEntryTypes": true,
+        "AbortController": true,
+        "DOMException": true,
+        "FormData": true,
+        "Headers": true,
         "Request": true,
+        "Response": true,
         "URL": true,
-        "XMLHttpRequest.prototype": true,
-        "__SENTRY_DEBUG__": true,
-        "__SENTRY_RELEASE__": true,
-        "addEventListener": true,
-        "console.error": true,
-        "indexedDB.open": true,
-        "performance.timeOrigin": true,
-        "setTimeout": true
-      },
+        "URLSearchParams": true,
+        "console": true,
+        "document.defaultView": true
+      }
+    },
+    "@metamask/utils>@scure/base": {
+      "globals": {
+        "TextDecoder": true,
+        "TextEncoder": true
+      }
+    },
+    "@ethereumjs/tx>ethereum-cryptography>@scure/bip32": {
       "packages": {
-        "@sentry/browser>@sentry-internal/browser-utils": true,
-        "@sentry/browser>@sentry-internal/feedback": true,
-        "@sentry/browser>@sentry-internal/replay": true,
-        "@sentry/browser>@sentry-internal/replay-canvas": true,
-        "@sentry/browser>@sentry/core": true,
-        "@sentry/utils": true
+        "@ethereumjs/tx>ethereum-cryptography>@noble/curves": true,
+        "@noble/hashes": true,
+        "@metamask/utils>@scure/base": true
+      }
+    },
+    "@segment/loosely-validate-event": {
+      "packages": {
+        "browserify>assert": true,
+        "browserify>buffer": true,
+        "@segment/loosely-validate-event>component-type": true,
+        "@segment/loosely-validate-event>join-component": true
       }
     },
     "@sentry/browser>@sentry-internal/browser-utils": {
@@ -2863,6 +2296,25 @@
         "@sentry/utils": true
       }
     },
+    "@sentry/browser>@sentry-internal/replay-canvas": {
+      "globals": {
+        "Blob": true,
+        "HTMLCanvasElement": true,
+        "HTMLImageElement": true,
+        "ImageData": true,
+        "URL.createObjectURL": true,
+        "WeakRef": true,
+        "Worker": true,
+        "cancelAnimationFrame": true,
+        "console.error": true,
+        "createImageBitmap": true,
+        "document": true
+      },
+      "packages": {
+        "@sentry/browser>@sentry/core": true,
+        "@sentry/utils": true
+      }
+    },
     "@sentry/browser>@sentry-internal/replay": {
       "globals": {
         "Blob": true,
@@ -2912,21 +2364,25 @@
         "@sentry/utils": true
       }
     },
-    "@sentry/browser>@sentry-internal/replay-canvas": {
+    "@sentry/browser": {
       "globals": {
-        "Blob": true,
-        "HTMLCanvasElement": true,
-        "HTMLImageElement": true,
-        "ImageData": true,
-        "URL.createObjectURL": true,
-        "WeakRef": true,
-        "Worker": true,
-        "cancelAnimationFrame": true,
+        "PerformanceObserver.supportedEntryTypes": true,
+        "Request": true,
+        "URL": true,
+        "XMLHttpRequest.prototype": true,
+        "__SENTRY_DEBUG__": true,
+        "__SENTRY_RELEASE__": true,
+        "addEventListener": true,
         "console.error": true,
-        "createImageBitmap": true,
-        "document": true
+        "indexedDB.open": true,
+        "performance.timeOrigin": true,
+        "setTimeout": true
       },
       "packages": {
+        "@sentry/browser>@sentry-internal/browser-utils": true,
+        "@sentry/browser>@sentry-internal/feedback": true,
+        "@sentry/browser>@sentry-internal/replay-canvas": true,
+        "@sentry/browser>@sentry-internal/replay": true,
         "@sentry/browser>@sentry/core": true,
         "@sentry/utils": true
       }
@@ -2997,45 +2453,86 @@
         "isSecureContext": true
       },
       "packages": {
-        "@solana/addresses>@solana/errors": true
+        "@solana/addresses>@solana/errors": true
+      }
+    },
+    "@solana/addresses>@solana/codecs-core": {
+      "packages": {
+        "@solana/addresses>@solana/errors": true
+      }
+    },
+    "@solana/addresses>@solana/codecs-strings": {
+      "globals": {
+        "TextDecoder": true,
+        "TextEncoder": true,
+        "atob": true,
+        "btoa": true
+      },
+      "packages": {
+        "@solana/addresses>@solana/codecs-core": true,
+        "@solana/addresses>@solana/errors": true
+      }
+    },
+    "@solana/addresses>@solana/errors": {
+      "globals": {
+        "btoa": true
+      }
+    },
+    "@metamask/controller-utils>@spruceid/siwe-parser": {
+      "globals": {
+        "console.error": true,
+        "console.log": true
+      },
+      "packages": {
+        "@noble/hashes": true,
+        "@metamask/controller-utils>@spruceid/siwe-parser>apg-js": true
+      }
+    },
+    "@metamask/profile-sync-controller>siwe>@spruceid/siwe-parser": {
+      "globals": {
+        "console.error": true,
+        "console.log": true
+      },
+      "packages": {
+        "@noble/hashes": true,
+        "@metamask/controller-utils>@spruceid/siwe-parser>apg-js": true
       }
     },
-    "@solana/addresses>@solana/codecs-core": {
+    "@metamask/profile-sync-controller>siwe>@stablelib/random>@stablelib/binary": {
       "packages": {
-        "@solana/addresses>@solana/errors": true
+        "@metamask/profile-sync-controller>siwe>@stablelib/random>@stablelib/binary>@stablelib/int": true
       }
     },
-    "@solana/addresses>@solana/codecs-strings": {
+    "@metamask/profile-sync-controller>siwe>@stablelib/random": {
       "globals": {
-        "TextDecoder": true,
-        "TextEncoder": true,
-        "atob": true,
-        "btoa": true
+        "crypto": true,
+        "msCrypto": true
       },
       "packages": {
-        "@solana/addresses>@solana/codecs-core": true,
-        "@solana/addresses>@solana/errors": true
+        "@metamask/profile-sync-controller>siwe>@stablelib/random>@stablelib/binary": true,
+        "@metamask/profile-sync-controller>siwe>@stablelib/random>@stablelib/wipe": true,
+        "browserify>browser-resolve": true
       }
     },
-    "@solana/addresses>@solana/errors": {
+    "@trezor/connect-web>@trezor/connect-common": {
       "globals": {
-        "btoa": true
-      }
-    },
-    "@storybook/addon-docs>remark-external-links>mdast-util-definitions": {
+        "console.warn": true,
+        "localStorage.getItem": true,
+        "localStorage.setItem": true,
+        "navigator": true,
+        "setTimeout": true,
+        "window": true
+      },
       "packages": {
-        "react-markdown>unist-util-visit": true
+        "@trezor/connect-web>@trezor/connect-common>@trezor/env-utils": true,
+        "@trezor/connect-web>@trezor/utils": true,
+        "@swc/helpers>tslib": true
       }
     },
-    "@storybook/addon-knobs>qs": {
+    "@metamask/eth-trezor-keyring>@trezor/connect-plugin-ethereum": {
       "packages": {
-        "string.prototype.matchall>side-channel": true
-      }
-    },
-    "@swc/helpers>tslib": {
-      "globals": {
-        "SuppressedError": true,
-        "define": true
+        "@metamask/eth-sig-util": true,
+        "@swc/helpers>tslib": true
       }
     },
     "@trezor/connect-web": {
@@ -3062,35 +2559,20 @@
         "setTimeout": true
       },
       "packages": {
-        "@swc/helpers>tslib": true,
-        "@trezor/connect-web>@trezor/connect": true,
         "@trezor/connect-web>@trezor/connect-common": true,
+        "@trezor/connect-web>@trezor/connect": true,
         "@trezor/connect-web>@trezor/utils": true,
-        "webpack>events": true
+        "webpack>events": true,
+        "@swc/helpers>tslib": true
       }
     },
     "@trezor/connect-web>@trezor/connect": {
       "packages": {
-        "@swc/helpers>tslib": true,
         "@trezor/connect-web>@trezor/connect>@trezor/protobuf": true,
         "@trezor/connect-web>@trezor/connect>@trezor/schema-utils": true,
         "@trezor/connect-web>@trezor/connect>@trezor/transport": true,
-        "@trezor/connect-web>@trezor/utils": true
-      }
-    },
-    "@trezor/connect-web>@trezor/connect-common": {
-      "globals": {
-        "console.warn": true,
-        "localStorage.getItem": true,
-        "localStorage.setItem": true,
-        "navigator": true,
-        "setTimeout": true,
-        "window": true
-      },
-      "packages": {
-        "@swc/helpers>tslib": true,
-        "@trezor/connect-web>@trezor/connect-common>@trezor/env-utils": true,
-        "@trezor/connect-web>@trezor/utils": true
+        "@trezor/connect-web>@trezor/utils": true,
+        "@swc/helpers>tslib": true
       }
     },
     "@trezor/connect-web>@trezor/connect-common>@trezor/env-utils": {
@@ -3106,54 +2588,17 @@
         "screen.width": true
       },
       "packages": {
+        "process": true,
         "@swc/helpers>tslib": true,
-        "@trezor/connect-web>@trezor/connect-common>@trezor/env-utils>ua-parser-js": true,
-        "process": true
-      }
-    },
-    "@trezor/connect-web>@trezor/connect-common>@trezor/env-utils>ua-parser-js": {
-      "globals": {
-        "define": true
+        "@trezor/connect-web>@trezor/connect-common>@trezor/env-utils>ua-parser-js": true
       }
     },
     "@trezor/connect-web>@trezor/connect>@trezor/protobuf": {
       "packages": {
-        "@swc/helpers>tslib": true,
-        "@trezor/connect-web>@trezor/connect>@trezor/protobuf>protobufjs": true,
         "@trezor/connect-web>@trezor/connect>@trezor/schema-utils": true,
-        "browserify>buffer": true
-      }
-    },
-    "@trezor/connect-web>@trezor/connect>@trezor/protobuf>protobufjs": {
-      "globals": {
-        "process": true,
-        "setTimeout": true
-      },
-      "packages": {
-        "@trezor/connect-web>@trezor/connect>@trezor/protobuf>protobufjs>@protobufjs/aspromise": true,
-        "@trezor/connect-web>@trezor/connect>@trezor/protobuf>protobufjs>@protobufjs/base64": true,
-        "@trezor/connect-web>@trezor/connect>@trezor/protobuf>protobufjs>@protobufjs/codegen": true,
-        "@trezor/connect-web>@trezor/connect>@trezor/protobuf>protobufjs>@protobufjs/eventemitter": true,
-        "@trezor/connect-web>@trezor/connect>@trezor/protobuf>protobufjs>@protobufjs/fetch": true,
-        "@trezor/connect-web>@trezor/connect>@trezor/protobuf>protobufjs>@protobufjs/float": true,
-        "@trezor/connect-web>@trezor/connect>@trezor/protobuf>protobufjs>@protobufjs/inquire": true,
-        "@trezor/connect-web>@trezor/connect>@trezor/protobuf>protobufjs>@protobufjs/path": true,
-        "@trezor/connect-web>@trezor/connect>@trezor/protobuf>protobufjs>@protobufjs/pool": true,
-        "@trezor/connect-web>@trezor/connect>@trezor/protobuf>protobufjs>@protobufjs/utf8": true
-      }
-    },
-    "@trezor/connect-web>@trezor/connect>@trezor/protobuf>protobufjs>@protobufjs/codegen": {
-      "globals": {
-        "console.log": true
-      }
-    },
-    "@trezor/connect-web>@trezor/connect>@trezor/protobuf>protobufjs>@protobufjs/fetch": {
-      "globals": {
-        "XMLHttpRequest": true
-      },
-      "packages": {
-        "@trezor/connect-web>@trezor/connect>@trezor/protobuf>protobufjs>@protobufjs/aspromise": true,
-        "@trezor/connect-web>@trezor/connect>@trezor/protobuf>protobufjs>@protobufjs/inquire": true
+        "browserify>buffer": true,
+        "@trezor/connect-web>@trezor/connect>@trezor/protobuf>protobufjs": true,
+        "@swc/helpers>tslib": true
       }
     },
     "@trezor/connect-web>@trezor/connect>@trezor/schema-utils": {
@@ -3180,16 +2625,10 @@
         "setTimeout": true
       },
       "packages": {
-        "@swc/helpers>tslib": true,
         "@trezor/connect-web>@trezor/utils>bignumber.js": true,
         "browserify>buffer": true,
-        "webpack>events": true
-      }
-    },
-    "@trezor/connect-web>@trezor/utils>bignumber.js": {
-      "globals": {
-        "crypto": true,
-        "define": true
+        "webpack>events": true,
+        "@swc/helpers>tslib": true
       }
     },
     "@welldone-software/why-did-you-render": {
@@ -3204,59 +2643,193 @@
         "setTimeout": true
       },
       "packages": {
-        "lodash": true,
-        "react": true
+        "lodash": true,
+        "react": true
+      }
+    },
+    "@zxing/browser": {
+      "globals": {
+        "HTMLElement": true,
+        "HTMLImageElement": true,
+        "HTMLVideoElement": true,
+        "clearTimeout": true,
+        "console.error": true,
+        "console.warn": true,
+        "document": true,
+        "navigator": true,
+        "setTimeout": true
+      },
+      "packages": {
+        "@zxing/library": true
+      }
+    },
+    "@zxing/library": {
+      "globals": {
+        "HTMLImageElement": true,
+        "HTMLVideoElement": true,
+        "TextDecoder": true,
+        "TextEncoder": true,
+        "URL.createObjectURL": true,
+        "btoa": true,
+        "console.log": true,
+        "console.warn": true,
+        "document": true,
+        "navigator": true,
+        "setTimeout": true
+      },
+      "packages": {
+        "@zxing/library>ts-custom-error": true
+      }
+    },
+    "@lavamoat/lavapack>readable-stream>abort-controller": {
+      "globals": {
+        "AbortController": true
+      }
+    },
+    "currency-formatter>accounting": {
+      "globals": {
+        "define": true
+      }
+    },
+    "ethers>@ethersproject/json-wallets>aes-js": {
+      "globals": {
+        "define": true
+      }
+    },
+    "eth-lattice-keyring>gridplus-sdk>aes-js": {
+      "globals": {
+        "define": true
+      }
+    },
+    "chalk>ansi-styles": {
+      "packages": {
+        "chalk>ansi-styles>color-convert": true
+      }
+    },
+    "@metamask/controller-utils>@spruceid/siwe-parser>apg-js": {
+      "packages": {
+        "browserify>buffer": true
+      }
+    },
+    "string.prototype.matchall>es-abstract>array-buffer-byte-length": {
+      "packages": {
+        "string.prototype.matchall>call-bind": true,
+        "string.prototype.matchall>es-abstract>is-array-buffer": true
+      }
+    },
+    "crypto-browserify>public-encrypt>parse-asn1>asn1.js": {
+      "packages": {
+        "bn.js": true,
+        "browserify>buffer": true,
+        "pumpify>inherits": true,
+        "@metamask/ppom-validator>elliptic>minimalistic-assert": true,
+        "browserify>vm-browserify": true
+      }
+    },
+    "browserify>assert": {
+      "globals": {
+        "Buffer": true
+      },
+      "packages": {
+        "react>object-assign": true,
+        "browserify>assert>util": true
+      }
+    },
+    "@metamask/name-controller>async-mutex": {
+      "globals": {
+        "clearTimeout": true,
+        "setTimeout": true
+      },
+      "packages": {
+        "@swc/helpers>tslib": true
+      }
+    },
+    "@metamask/transaction-controller>@metamask/nonce-tracker>async-mutex": {
+      "globals": {
+        "clearTimeout": true,
+        "setTimeout": true
+      },
+      "packages": {
+        "@swc/helpers>tslib": true
+      }
+    },
+    "string.prototype.matchall>es-abstract>available-typed-arrays": {
+      "packages": {
+        "string.prototype.matchall>es-abstract>typed-array-length>possible-typed-array-names": true
+      }
+    },
+    "await-semaphore": {
+      "packages": {
+        "process": true,
+        "browserify>timers-browserify": true
+      }
+    },
+    "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth>@ledgerhq/domain-service>axios": {
+      "globals": {
+        "Blob": true,
+        "FormData": true,
+        "URLSearchParams": true,
+        "XMLHttpRequest": true,
+        "btoa": true,
+        "console.warn": true,
+        "document": true,
+        "location.href": true,
+        "navigator": true,
+        "setTimeout": true
+      },
+      "packages": {
+        "browserify>buffer": true,
+        "axios>form-data": true,
+        "process": true
       }
     },
-    "@zxing/browser": {
+    "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth>@ledgerhq/evm-tools>axios": {
       "globals": {
-        "HTMLElement": true,
-        "HTMLImageElement": true,
-        "HTMLVideoElement": true,
-        "clearTimeout": true,
-        "console.error": true,
+        "Blob": true,
+        "FormData": true,
+        "URLSearchParams": true,
+        "XMLHttpRequest": true,
+        "btoa": true,
         "console.warn": true,
         "document": true,
+        "location.href": true,
         "navigator": true,
         "setTimeout": true
       },
       "packages": {
-        "@zxing/library": true
+        "browserify>buffer": true,
+        "axios>form-data": true,
+        "process": true
       }
     },
-    "@zxing/library": {
+    "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth>axios": {
       "globals": {
-        "HTMLImageElement": true,
-        "HTMLVideoElement": true,
-        "TextDecoder": true,
-        "TextEncoder": true,
-        "URL.createObjectURL": true,
+        "Blob": true,
+        "FormData": true,
+        "URLSearchParams": true,
+        "XMLHttpRequest": true,
         "btoa": true,
-        "console.log": true,
         "console.warn": true,
         "document": true,
+        "location.href": true,
         "navigator": true,
         "setTimeout": true
       },
       "packages": {
-        "@zxing/library>ts-custom-error": true
+        "browserify>buffer": true,
+        "axios>form-data": true,
+        "process": true
       }
     },
-    "addons-linter>sha.js": {
-      "packages": {
-        "koa>content-disposition>safe-buffer": true,
-        "pumpify>inherits": true
+    "@metamask/snaps-controllers>tar-stream>b4a": {
+      "globals": {
+        "TextDecoder": true,
+        "TextEncoder": true
       }
     },
-    "await-semaphore": {
+    "@ensdomains/content-hash>multihashes>multibase>base-x": {
       "packages": {
-        "browserify>timers-browserify": true,
-        "process": true
-      }
-    },
-    "axios>form-data": {
-      "globals": {
-        "FormData": true
+        "koa>content-disposition>safe-buffer": true
       }
     },
     "base32-encode": {
@@ -3270,136 +2843,156 @@
         "define": true
       }
     },
-    "blo": {
+    "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth>bignumber.js": {
       "globals": {
-        "btoa": true
+        "crypto": true,
+        "define": true
       }
     },
-    "bn.js": {
+    "@metamask/notification-services-controller>bignumber.js": {
       "globals": {
-        "Buffer": true
-      },
-      "packages": {
-        "browserify>browser-resolve": true
+        "crypto": true,
+        "define": true
       }
     },
-    "bowser": {
+    "@metamask/smart-transactions-controller>bignumber.js": {
       "globals": {
+        "crypto": true,
         "define": true
       }
     },
-    "browserify>assert": {
+    "@ngraveio/bc-ur>bignumber.js": {
       "globals": {
-        "Buffer": true
-      },
-      "packages": {
-        "browserify>assert>util": true,
-        "react>object-assign": true
+        "crypto": true,
+        "define": true
       }
     },
-    "browserify>assert>util": {
+    "@trezor/connect-web>@trezor/utils>bignumber.js": {
       "globals": {
-        "console.error": true,
-        "console.log": true,
-        "console.trace": true,
-        "process": true
-      },
+        "crypto": true,
+        "define": true
+      }
+    },
+    "eth-lattice-keyring>gridplus-sdk>borc>bignumber.js": {
+      "globals": {
+        "crypto": true,
+        "define": true
+      }
+    },
+    "eth-lattice-keyring>gridplus-sdk>bignumber.js": {
+      "globals": {
+        "crypto": true,
+        "define": true
+      }
+    },
+    "eth-lattice-keyring>gridplus-sdk>bitwise": {
       "packages": {
-        "browserify>assert>util>inherits": true,
-        "process": true
+        "browserify>buffer": true
       }
     },
-    "browserify>browserify-zlib": {
+    "blo": {
+      "globals": {
+        "btoa": true
+      }
+    },
+    "bn.js": {
+      "globals": {
+        "Buffer": true
+      },
       "packages": {
-        "browserify>assert": true,
-        "browserify>browserify-zlib>pako": true,
-        "browserify>buffer": true,
-        "browserify>util": true,
-        "process": true,
-        "stream-browserify": true
+        "browserify>browser-resolve": true
       }
     },
-    "browserify>buffer": {
+    "eth-lattice-keyring>gridplus-sdk>borc": {
       "globals": {
         "console": true
       },
       "packages": {
-        "base64-js": true,
-        "buffer>ieee754": true
+        "eth-lattice-keyring>gridplus-sdk>borc>bignumber.js": true,
+        "browserify>buffer": true,
+        "buffer>ieee754": true,
+        "eth-lattice-keyring>gridplus-sdk>borc>iso-url": true
       }
     },
-    "browserify>punycode": {
+    "bowser": {
       "globals": {
         "define": true
       }
     },
-    "browserify>string_decoder": {
+    "@metamask/ppom-validator>elliptic>brorand": {
+      "globals": {
+        "crypto": true,
+        "msCrypto": true
+      },
       "packages": {
-        "koa>content-disposition>safe-buffer": true
+        "browserify>browser-resolve": true
       }
     },
-    "browserify>timers-browserify": {
-      "globals": {
-        "clearInterval": true,
-        "clearTimeout": true,
-        "setInterval": true,
-        "setTimeout": true
-      },
+    "ethereumjs-util>ethereum-cryptography>browserify-aes": {
       "packages": {
-        "process": true
+        "ethereumjs-util>ethereum-cryptography>browserify-aes>buffer-xor": true,
+        "browserify>buffer": true,
+        "ethereumjs-util>create-hash>cipher-base": true,
+        "crypto-browserify>browserify-cipher>evp_bytestokey": true,
+        "pumpify>inherits": true,
+        "koa>content-disposition>safe-buffer": true
       }
     },
-    "browserify>url": {
+    "crypto-browserify>browserify-cipher": {
       "packages": {
-        "@storybook/addon-knobs>qs": true,
-        "browserify>punycode": true
+        "ethereumjs-util>ethereum-cryptography>browserify-aes": true,
+        "crypto-browserify>browserify-cipher>browserify-des": true,
+        "crypto-browserify>browserify-cipher>evp_bytestokey": true
       }
     },
-    "browserify>util": {
-      "globals": {
-        "console.error": true,
-        "console.log": true,
-        "console.trace": true
-      },
+    "crypto-browserify>browserify-cipher>browserify-des": {
       "packages": {
-        "browserify>util>is-arguments": true,
-        "browserify>util>is-typed-array": true,
-        "browserify>util>which-typed-array": true,
-        "koa>is-generator-function": true,
-        "process": true,
+        "browserify>buffer": true,
+        "ethereumjs-util>create-hash>cipher-base": true,
+        "crypto-browserify>browserify-cipher>browserify-des>des.js": true,
         "pumpify>inherits": true
       }
     },
-    "browserify>util>is-arguments": {
+    "crypto-browserify>public-encrypt>browserify-rsa": {
       "packages": {
-        "koa>is-generator-function>has-tostringtag": true,
-        "string.prototype.matchall>call-bind": true
+        "bn.js": true,
+        "browserify>buffer": true,
+        "crypto-browserify>randombytes": true
       }
     },
-    "browserify>util>is-typed-array": {
+    "crypto-browserify>browserify-sign": {
       "packages": {
-        "browserify>util>which-typed-array": true
+        "bn.js": true,
+        "crypto-browserify>public-encrypt>browserify-rsa": true,
+        "browserify>buffer": true,
+        "ethereumjs-util>create-hash": true,
+        "crypto-browserify>create-hmac": true,
+        "@metamask/ppom-validator>elliptic": true,
+        "pumpify>inherits": true,
+        "crypto-browserify>public-encrypt>parse-asn1": true,
+        "stream-browserify": true
       }
     },
-    "browserify>util>which-typed-array": {
+    "browserify>browserify-zlib": {
       "packages": {
-        "browserify>util>which-typed-array>for-each": true,
-        "koa>is-generator-function>has-tostringtag": true,
-        "string.prototype.matchall>call-bind": true,
-        "string.prototype.matchall>es-abstract>available-typed-arrays": true,
-        "string.prototype.matchall>es-abstract>gopd": true
+        "browserify>assert": true,
+        "browserify>buffer": true,
+        "browserify>browserify-zlib>pako": true,
+        "process": true,
+        "stream-browserify": true,
+        "browserify>util": true
       }
     },
-    "browserify>util>which-typed-array>for-each": {
+    "ethereumjs-util>ethereum-cryptography>bs58check>bs58": {
       "packages": {
-        "string.prototype.matchall>es-abstract>is-callable": true
+        "@ensdomains/content-hash>multihashes>multibase>base-x": true
       }
     },
-    "browserify>vm-browserify": {
-      "globals": {
-        "document.body.appendChild": true,
-        "document.body.removeChild": true,
-        "document.createElement": true
+    "ethereumjs-util>ethereum-cryptography>bs58check": {
+      "packages": {
+        "ethereumjs-util>ethereum-cryptography>bs58check>bs58": true,
+        "ethereumjs-util>create-hash": true,
+        "koa>content-disposition>safe-buffer": true
       }
     },
     "buffer": {
@@ -3411,20 +3004,52 @@
         "buffer>ieee754": true
       }
     },
-    "chalk": {
+    "terser>source-map-support>buffer-from": {
       "packages": {
-        "chalk>ansi-styles": true,
-        "chalk>supports-color": true
+        "browserify>buffer": true
       }
     },
-    "chalk>ansi-styles": {
+    "ethereumjs-util>ethereum-cryptography>browserify-aes>buffer-xor": {
+      "packages": {
+        "browserify>buffer": true
+      }
+    },
+    "browserify>buffer": {
+      "globals": {
+        "console": true
+      },
+      "packages": {
+        "base64-js": true,
+        "buffer>ieee754": true
+      }
+    },
+    "@metamask/snaps-utils>validate-npm-package-name>builtins": {
+      "packages": {
+        "process": true,
+        "semver": true
+      }
+    },
+    "string.prototype.matchall>call-bind": {
+      "packages": {
+        "string.prototype.matchall>call-bind>es-define-property": true,
+        "string.prototype.matchall>call-bind>es-errors": true,
+        "browserify>has>function-bind": true,
+        "string.prototype.matchall>get-intrinsic": true,
+        "string.prototype.matchall>call-bind>set-function-length": true
+      }
+    },
+    "@ngraveio/bc-ur>cbor-sync": {
+      "globals": {
+        "define": true
+      },
       "packages": {
-        "chalk>ansi-styles>color-convert": true
+        "browserify>buffer": true
       }
     },
-    "chalk>ansi-styles>color-convert": {
+    "chalk": {
       "packages": {
-        "jest-canvas-mock>moo-color>color-name": true
+        "chalk>ansi-styles": true,
+        "chalk>supports-color": true
       }
     },
     "chart.js": {
@@ -3448,9 +3073,20 @@
         "chart.js>@kurkle/color": true
       }
     },
-    "chart.js>@kurkle/color": {
-      "globals": {
-        "define": true
+    "@ensdomains/content-hash>cids": {
+      "packages": {
+        "@ensdomains/content-hash>cids>multibase": true,
+        "@ensdomains/content-hash>multicodec": true,
+        "@ensdomains/content-hash>cids>multihashes": true,
+        "@ensdomains/content-hash>cids>uint8arrays": true
+      }
+    },
+    "ethereumjs-util>create-hash>cipher-base": {
+      "packages": {
+        "pumpify>inherits": true,
+        "koa>content-disposition>safe-buffer": true,
+        "stream-browserify": true,
+        "browserify>string_decoder": true
       }
     },
     "classnames": {
@@ -3459,6 +3095,11 @@
         "define": true
       }
     },
+    "@metamask/jazzicon>color>clone": {
+      "packages": {
+        "browserify>buffer": true
+      }
+    },
     "cockatiel": {
       "globals": {
         "AbortController": true,
@@ -3472,6 +3113,37 @@
         "process": true
       }
     },
+    "chalk>ansi-styles>color-convert": {
+      "packages": {
+        "jest-canvas-mock>moo-color>color-name": 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/jazzicon>color": {
+      "packages": {
+        "@metamask/jazzicon>color>clone": true,
+        "@metamask/jazzicon>color>color-convert": true,
+        "@metamask/jazzicon>color>color-string": true
+      }
+    },
+    "@metamask/snaps-controllers>concat-stream": {
+      "packages": {
+        "terser>source-map-support>buffer-from": true,
+        "browserify>buffer": true,
+        "pumpify>inherits": true,
+        "readable-stream": true,
+        "browserify>concat-stream>typedarray": true
+      }
+    },
     "copy-to-clipboard": {
       "globals": {
         "clipboardData": true,
@@ -3490,10 +3162,47 @@
         "copy-to-clipboard>toggle-selection": true
       }
     },
-    "copy-to-clipboard>toggle-selection": {
+    "@ethereumjs/tx>@ethereumjs/common>crc-32": {
       "globals": {
-        "document.activeElement": true,
-        "document.getSelection": true
+        "DO_NOT_EXPORT_CRC": true,
+        "define": true
+      }
+    },
+    "@ngraveio/bc-ur>crc": {
+      "packages": {
+        "browserify>buffer": true
+      }
+    },
+    "crypto-browserify>create-ecdh": {
+      "packages": {
+        "bn.js": true,
+        "browserify>buffer": true,
+        "@metamask/ppom-validator>elliptic": true
+      }
+    },
+    "ethereumjs-util>create-hash": {
+      "packages": {
+        "ethereumjs-util>create-hash>cipher-base": true,
+        "pumpify>inherits": true,
+        "ethereumjs-util>create-hash>md5.js": true,
+        "ethereumjs-util>create-hash>ripemd160": true,
+        "addons-linter>sha.js": true
+      }
+    },
+    "crypto-browserify>create-hmac": {
+      "packages": {
+        "ethereumjs-util>create-hash>cipher-base": true,
+        "ethereumjs-util>create-hash": true,
+        "pumpify>inherits": true,
+        "ethereumjs-util>create-hash>ripemd160": true,
+        "koa>content-disposition>safe-buffer": true,
+        "addons-linter>sha.js": true
+      }
+    },
+    "@metamask/snaps-utils>cron-parser": {
+      "packages": {
+        "browserify>browser-resolve": true,
+        "luxon": true
       }
     },
     "crypto-browserify": {
@@ -3501,303 +3210,484 @@
         "crypto-browserify>browserify-cipher": true,
         "crypto-browserify>browserify-sign": true,
         "crypto-browserify>create-ecdh": true,
+        "ethereumjs-util>create-hash": true,
         "crypto-browserify>create-hmac": true,
         "crypto-browserify>diffie-hellman": true,
         "crypto-browserify>pbkdf2": true,
         "crypto-browserify>public-encrypt": true,
         "crypto-browserify>randombytes": true,
-        "crypto-browserify>randomfill": true,
-        "ethereumjs-util>create-hash": true
+        "crypto-browserify>randomfill": true
       }
     },
-    "crypto-browserify>browserify-cipher": {
+    "@metamask/ppom-validator>crypto-js": {
+      "globals": {
+        "crypto": true,
+        "define": true,
+        "msCrypto": true
+      },
       "packages": {
-        "crypto-browserify>browserify-cipher>browserify-des": true,
-        "crypto-browserify>browserify-cipher>evp_bytestokey": true,
-        "ethereumjs-util>ethereum-cryptography>browserify-aes": true
+        "browserify>browser-resolve": true
       }
     },
-    "crypto-browserify>browserify-cipher>browserify-des": {
+    "react-beautiful-dnd>css-box-model": {
+      "globals": {
+        "getComputedStyle": true,
+        "pageXOffset": true,
+        "pageYOffset": true
+      },
       "packages": {
-        "browserify>buffer": true,
-        "crypto-browserify>browserify-cipher>browserify-des>des.js": true,
-        "ethereumjs-util>create-hash>cipher-base": true,
-        "pumpify>inherits": true
+        "react-router-dom>tiny-invariant": true
       }
     },
-    "crypto-browserify>browserify-cipher>browserify-des>des.js": {
+    "@material-ui/core>@material-ui/styles>jss-plugin-vendor-prefixer>css-vendor": {
+      "globals": {
+        "document.createElement": true,
+        "document.documentElement": true,
+        "getComputedStyle": true
+      },
       "packages": {
-        "@metamask/ppom-validator>elliptic>minimalistic-assert": true,
-        "pumpify>inherits": true
+        "@babel/runtime": true,
+        "@material-ui/core>@material-ui/styles>jss>is-in-browser": true
       }
     },
-    "crypto-browserify>browserify-cipher>evp_bytestokey": {
+    "currency-formatter": {
       "packages": {
-        "ethereumjs-util>create-hash>md5.js": true,
-        "koa>content-disposition>safe-buffer": true
+        "currency-formatter>accounting": true,
+        "currency-formatter>locale-currency": true,
+        "react>object-assign": true
       }
     },
-    "crypto-browserify>browserify-sign": {
+    "debounce-stream": {
+      "packages": {
+        "debounce-stream>debounce": true,
+        "debounce-stream>duplexer": true,
+        "debounce-stream>through": true
+      }
+    },
+    "debounce-stream>debounce": {
+      "globals": {
+        "clearTimeout": true,
+        "setTimeout": true
+      }
+    },
+    "nock>debug": {
+      "globals": {
+        "console": true,
+        "document": true,
+        "localStorage": true,
+        "navigator": true,
+        "process": true
+      },
+      "packages": {
+        "nock>debug>ms": true,
+        "process": true
+      }
+    },
+    "@metamask/eth-token-tracker>deep-equal": {
+      "packages": {
+        "string.prototype.matchall>es-abstract>array-buffer-byte-length": true,
+        "string.prototype.matchall>call-bind": true,
+        "@metamask/eth-token-tracker>deep-equal>es-get-iterator": true,
+        "string.prototype.matchall>get-intrinsic": true,
+        "browserify>util>is-arguments": true,
+        "string.prototype.matchall>es-abstract>is-array-buffer": true,
+        "@metamask/eth-token-tracker>deep-equal>is-date-object": true,
+        "string.prototype.matchall>es-abstract>is-regex": true,
+        "string.prototype.matchall>es-abstract>is-shared-array-buffer": true,
+        "@lavamoat/lavapack>json-stable-stringify>isarray": true,
+        "@ngraveio/bc-ur>assert>object-is": true,
+        "@lavamoat/lavapack>json-stable-stringify>object-keys": true,
+        "gulp>vinyl-fs>object.assign": true,
+        "string.prototype.matchall>regexp.prototype.flags": true,
+        "string.prototype.matchall>side-channel": true,
+        "@metamask/eth-token-tracker>deep-equal>which-boxed-primitive": true,
+        "@metamask/eth-token-tracker>deep-equal>which-collection": true,
+        "browserify>util>which-typed-array": true
+      }
+    },
+    "string.prototype.matchall>define-properties>define-data-property": {
+      "packages": {
+        "string.prototype.matchall>call-bind>es-define-property": true,
+        "string.prototype.matchall>call-bind>es-errors": true,
+        "string.prototype.matchall>es-abstract>gopd": true
+      }
+    },
+    "string.prototype.matchall>define-properties": {
+      "packages": {
+        "string.prototype.matchall>define-properties>define-data-property": true,
+        "string.prototype.matchall>es-abstract>has-property-descriptors": true,
+        "@lavamoat/lavapack>json-stable-stringify>object-keys": true
+      }
+    },
+    "crypto-browserify>browserify-cipher>browserify-des>des.js": {
+      "packages": {
+        "pumpify>inherits": true,
+        "@metamask/ppom-validator>elliptic>minimalistic-assert": true
+      }
+    },
+    "crypto-browserify>diffie-hellman": {
       "packages": {
-        "@metamask/ppom-validator>elliptic": true,
         "bn.js": true,
         "browserify>buffer": true,
-        "crypto-browserify>create-hmac": true,
-        "crypto-browserify>public-encrypt>browserify-rsa": true,
-        "crypto-browserify>public-encrypt>parse-asn1": true,
-        "ethereumjs-util>create-hash": true,
-        "pumpify>inherits": true,
+        "crypto-browserify>diffie-hellman>miller-rabin": true,
+        "crypto-browserify>randombytes": true
+      }
+    },
+    "@material-ui/core>react-transition-group>dom-helpers": {
+      "packages": {
+        "@babel/runtime": true
+      }
+    },
+    "debounce-stream>duplexer": {
+      "packages": {
         "stream-browserify": true
       }
     },
-    "crypto-browserify>create-ecdh": {
+    "ethers>@ethersproject/signing-key>elliptic": {
       "packages": {
-        "@metamask/ppom-validator>elliptic": true,
         "bn.js": true,
-        "browserify>buffer": true
+        "@metamask/ppom-validator>elliptic>brorand": true,
+        "ethers>@ethersproject/sha2>hash.js": true,
+        "@metamask/ppom-validator>elliptic>hmac-drbg": true,
+        "pumpify>inherits": true,
+        "@metamask/ppom-validator>elliptic>minimalistic-assert": true,
+        "@metamask/ppom-validator>elliptic>minimalistic-crypto-utils": true
       }
     },
-    "crypto-browserify>create-hmac": {
+    "@metamask/ppom-validator>elliptic": {
       "packages": {
-        "addons-linter>sha.js": true,
-        "ethereumjs-util>create-hash": true,
-        "ethereumjs-util>create-hash>cipher-base": true,
-        "ethereumjs-util>create-hash>ripemd160": true,
-        "koa>content-disposition>safe-buffer": true,
-        "pumpify>inherits": true
+        "bn.js": true,
+        "@metamask/ppom-validator>elliptic>brorand": true,
+        "ethers>@ethersproject/sha2>hash.js": true,
+        "@metamask/ppom-validator>elliptic>hmac-drbg": true,
+        "pumpify>inherits": true,
+        "@metamask/ppom-validator>elliptic>minimalistic-assert": true,
+        "@metamask/ppom-validator>elliptic>minimalistic-crypto-utils": true
       }
     },
-    "crypto-browserify>diffie-hellman": {
+    "eth-lattice-keyring>gridplus-sdk>elliptic": {
+      "packages": {
+        "bn.js": true,
+        "@metamask/ppom-validator>elliptic>brorand": true,
+        "ethers>@ethersproject/sha2>hash.js": true,
+        "@metamask/ppom-validator>elliptic>hmac-drbg": true,
+        "pumpify>inherits": true,
+        "@metamask/ppom-validator>elliptic>minimalistic-assert": true,
+        "@metamask/ppom-validator>elliptic>minimalistic-crypto-utils": true
+      }
+    },
+    "string.prototype.matchall>call-bind>es-define-property": {
       "packages": {
-        "bn.js": true,
-        "browserify>buffer": true,
-        "crypto-browserify>diffie-hellman>miller-rabin": true,
-        "crypto-browserify>randombytes": true
+        "string.prototype.matchall>get-intrinsic": true
       }
     },
-    "crypto-browserify>diffie-hellman>miller-rabin": {
+    "@metamask/eth-token-tracker>deep-equal>es-get-iterator": {
       "packages": {
-        "@metamask/ppom-validator>elliptic>brorand": true,
-        "bn.js": true
+        "string.prototype.matchall>call-bind": true,
+        "string.prototype.matchall>get-intrinsic": true,
+        "string.prototype.matchall>has-symbols": true,
+        "browserify>util>is-arguments": true,
+        "@metamask/eth-token-tracker>deep-equal>es-get-iterator>is-map": true,
+        "@metamask/eth-token-tracker>deep-equal>es-get-iterator>is-set": true,
+        "eslint-plugin-react>array-includes>is-string": true,
+        "@lavamoat/lavapack>json-stable-stringify>isarray": true,
+        "process": true,
+        "@metamask/eth-token-tracker>deep-equal>es-get-iterator>stop-iteration-iterator": true
       }
     },
-    "crypto-browserify>pbkdf2": {
+    "eth-lattice-keyring>gridplus-sdk>eth-eip712-util-browser": {
       "globals": {
-        "crypto": true,
-        "process": true,
-        "queueMicrotask": true,
-        "setImmediate": true,
-        "setTimeout": true
+        "intToBuffer": true
       },
       "packages": {
-        "addons-linter>sha.js": true,
-        "ethereumjs-util>create-hash": true,
-        "ethereumjs-util>create-hash>ripemd160": true,
-        "koa>content-disposition>safe-buffer": true,
-        "process": true
+        "bn.js": true,
+        "buffer": true,
+        "@metamask/ethjs>js-sha3": true
       }
     },
-    "crypto-browserify>public-encrypt": {
+    "eth-ens-namehash": {
+      "globals": {
+        "name": "write"
+      },
       "packages": {
-        "bn.js": true,
         "browserify>buffer": true,
-        "crypto-browserify>public-encrypt>browserify-rsa": true,
-        "crypto-browserify>public-encrypt>parse-asn1": true,
-        "crypto-browserify>randombytes": true,
-        "ethereumjs-util>create-hash": true
+        "eth-ens-namehash>idna-uts46-hx": true,
+        "@metamask/ethjs>js-sha3": true
       }
     },
-    "crypto-browserify>public-encrypt>browserify-rsa": {
+    "eth-lattice-keyring": {
+      "globals": {
+        "addEventListener": true,
+        "browser": true,
+        "clearInterval": true,
+        "fetch": true,
+        "open": true,
+        "setInterval": true
+      },
       "packages": {
+        "eth-lattice-keyring>@ethereumjs/tx": true,
+        "@ethereumjs/tx>@ethereumjs/util": true,
         "bn.js": true,
         "browserify>buffer": true,
-        "crypto-browserify>randombytes": true
+        "crypto-browserify": true,
+        "webpack>events": true,
+        "eth-lattice-keyring>gridplus-sdk": true,
+        "eth-lattice-keyring>rlp": true
       }
     },
-    "crypto-browserify>public-encrypt>parse-asn1": {
+    "eth-method-registry": {
       "packages": {
-        "browserify>buffer": true,
-        "crypto-browserify>browserify-cipher>evp_bytestokey": true,
-        "crypto-browserify>pbkdf2": true,
-        "crypto-browserify>public-encrypt>parse-asn1>asn1.js": true,
-        "ethereumjs-util>ethereum-cryptography>browserify-aes": true
+        "@metamask/ethjs-contract": true,
+        "@metamask/ethjs-query": true
       }
     },
-    "crypto-browserify>public-encrypt>parse-asn1>asn1.js": {
+    "@ethereumjs/tx>ethereum-cryptography": {
+      "globals": {
+        "TextDecoder": true,
+        "crypto": true
+      },
       "packages": {
-        "@metamask/ppom-validator>elliptic>minimalistic-assert": true,
-        "bn.js": true,
-        "browserify>buffer": true,
-        "browserify>vm-browserify": true,
-        "pumpify>inherits": true
+        "@ethereumjs/tx>ethereum-cryptography>@noble/curves": true,
+        "@noble/hashes": true,
+        "@ethereumjs/tx>ethereum-cryptography>@scure/bip32": true
       }
     },
-    "crypto-browserify>randombytes": {
+    "eth-lattice-keyring>@ethereumjs/tx>ethereum-cryptography": {
       "globals": {
-        "crypto": true,
-        "msCrypto": true
+        "TextDecoder": true,
+        "crypto": true
       },
       "packages": {
-        "koa>content-disposition>safe-buffer": true,
-        "process": true
+        "eth-lattice-keyring>@ethereumjs/tx>ethereum-cryptography>@noble/hashes": true
       }
     },
-    "crypto-browserify>randomfill": {
+    "eth-lattice-keyring>gridplus-sdk>@ethereumjs/tx>ethereum-cryptography": {
       "globals": {
-        "crypto": true,
-        "msCrypto": true
+        "TextDecoder": true,
+        "crypto": true
       },
       "packages": {
-        "crypto-browserify>randombytes": true,
-        "koa>content-disposition>safe-buffer": true,
-        "process": true
+        "eth-lattice-keyring>gridplus-sdk>@ethereumjs/tx>ethereum-cryptography>@noble/hashes": true
       }
     },
-    "currency-formatter": {
+    "ethereumjs-util>ethereum-cryptography": {
       "packages": {
-        "currency-formatter>accounting": true,
-        "currency-formatter>locale-currency": true,
-        "react>object-assign": true
-      }
-    },
-    "currency-formatter>accounting": {
-      "globals": {
-        "define": true
+        "browserify>buffer": true,
+        "ethereumjs-util>ethereum-cryptography>keccak": true,
+        "crypto-browserify>randombytes": true,
+        "ganache>secp256k1": true
       }
     },
-    "currency-formatter>locale-currency": {
-      "globals": {
-        "countryCode": true
+    "@metamask/keyring-controller>ethereumjs-wallet>ethereum-cryptography": {
+      "packages": {
+        "browserify>assert": true,
+        "ethereumjs-util>ethereum-cryptography>bs58check": true,
+        "browserify>buffer": true,
+        "crypto-browserify>create-hmac": true,
+        "ethers>@ethersproject/sha2>hash.js": true,
+        "ethereumjs-util>ethereum-cryptography>keccak": true,
+        "crypto-browserify>randombytes": true,
+        "koa>content-disposition>safe-buffer": true,
+        "ganache>secp256k1": true
       }
     },
-    "debounce-stream": {
+    "ethereumjs-util": {
       "packages": {
-        "debounce-stream>debounce": true,
-        "debounce-stream>duplexer": true,
-        "debounce-stream>through": true
+        "browserify>assert": true,
+        "bn.js": true,
+        "browserify>buffer": true,
+        "ethereumjs-util>create-hash": true,
+        "ethereumjs-util>ethereum-cryptography": true,
+        "browserify>insert-module-globals>is-buffer": true,
+        "ethereumjs-util>rlp": true
       }
     },
-    "debounce-stream>debounce": {
-      "globals": {
-        "clearTimeout": true,
-        "setTimeout": true
+    "@metamask/keyring-controller>ethereumjs-wallet>ethereumjs-util": {
+      "packages": {
+        "browserify>assert": true,
+        "bn.js": true,
+        "browserify>buffer": true,
+        "ethereumjs-util>create-hash": true,
+        "@metamask/keyring-controller>ethereumjs-wallet>ethereum-cryptography": true,
+        "browserify>insert-module-globals>is-buffer": true,
+        "@metamask/keyring-controller>ethereumjs-wallet>ethereumjs-util>rlp": true
       }
     },
-    "debounce-stream>duplexer": {
+    "@metamask/keyring-controller>ethereumjs-wallet": {
       "packages": {
-        "stream-browserify": true
+        "eth-lattice-keyring>gridplus-sdk>aes-js": true,
+        "ethereumjs-util>ethereum-cryptography>bs58check": true,
+        "browserify>buffer": true,
+        "crypto-browserify": true,
+        "@metamask/keyring-controller>ethereumjs-wallet>ethereum-cryptography": true,
+        "@metamask/keyring-controller>ethereumjs-wallet>ethereumjs-util": true,
+        "crypto-browserify>randombytes": true,
+        "ethers>@ethersproject/json-wallets>scrypt-js": true,
+        "@metamask/keyring-controller>ethereumjs-wallet>utf8": true,
+        "uuid": true
       }
     },
-    "debounce-stream>through": {
+    "ethers": {
       "packages": {
-        "process": true,
-        "stream-browserify": true
+        "@ethersproject/abi": true,
+        "ethers>@ethersproject/abstract-signer": true,
+        "ethers>@ethersproject/address": true,
+        "ethers>@ethersproject/base64": true,
+        "ethers>@ethersproject/basex": true,
+        "@ethersproject/bignumber": true,
+        "@ethersproject/bytes": true,
+        "ethers>@ethersproject/constants": true,
+        "@ethersproject/contracts": true,
+        "@ethersproject/hash": true,
+        "@ethersproject/hdnode": true,
+        "ethers>@ethersproject/json-wallets": true,
+        "ethers>@ethersproject/keccak256": true,
+        "ethers>@ethersproject/logger": true,
+        "ethers>@ethersproject/properties": true,
+        "ethers>@ethersproject/providers": true,
+        "ethers>@ethersproject/random": true,
+        "ethers>@ethersproject/rlp": true,
+        "ethers>@ethersproject/sha2": true,
+        "ethers>@ethersproject/signing-key": true,
+        "ethers>@ethersproject/solidity": true,
+        "ethers>@ethersproject/strings": true,
+        "ethers>@ethersproject/transactions": true,
+        "ethers>@ethersproject/units": true,
+        "@ethersproject/wallet": true,
+        "ethers>@ethersproject/web": true,
+        "ethers>@ethersproject/wordlists": true
       }
     },
-    "depcheck>@vue/compiler-sfc>postcss>nanoid": {
-      "globals": {
-        "crypto.getRandomValues": true
+    "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth>@ledgerhq/evm-tools>ethers": {
+      "packages": {
+        "@ethersproject/abi": true,
+        "ethers>@ethersproject/abstract-signer": true,
+        "ethers>@ethersproject/address": true,
+        "ethers>@ethersproject/base64": true,
+        "ethers>@ethersproject/basex": true,
+        "@ethersproject/bignumber": true,
+        "@ethersproject/bytes": true,
+        "ethers>@ethersproject/constants": true,
+        "@ethersproject/contracts": true,
+        "@ethersproject/hash": true,
+        "@ethersproject/hdnode": true,
+        "ethers>@ethersproject/json-wallets": true,
+        "ethers>@ethersproject/keccak256": true,
+        "ethers>@ethersproject/logger": true,
+        "ethers>@ethersproject/properties": true,
+        "@ethersproject/providers": true,
+        "ethers>@ethersproject/random": true,
+        "ethers>@ethersproject/rlp": true,
+        "ethers>@ethersproject/sha2": true,
+        "ethers>@ethersproject/signing-key": true,
+        "ethers>@ethersproject/solidity": true,
+        "ethers>@ethersproject/strings": true,
+        "ethers>@ethersproject/transactions": true,
+        "ethers>@ethersproject/units": true,
+        "@ethersproject/wallet": true,
+        "@ethersproject/providers>@ethersproject/web": true,
+        "ethers>@ethersproject/wordlists": true
       }
     },
-    "depcheck>is-core-module>hasown": {
+    "@metamask/ethjs>ethjs-abi": {
       "packages": {
-        "browserify>has>function-bind": true
+        "bn.js": true,
+        "browserify>buffer": true,
+        "@metamask/ethjs>js-sha3": true,
+        "@metamask/ethjs>ethjs-abi>number-to-bn": true
       }
     },
-    "dependency-tree>precinct>detective-postcss>postcss>nanoid": {
+    "webpack>events": {
       "globals": {
-        "crypto.getRandomValues": true
+        "console": true
       }
     },
-    "eslint-plugin-react>array-includes>is-string": {
+    "crypto-browserify>browserify-cipher>evp_bytestokey": {
       "packages": {
-        "koa>is-generator-function>has-tostringtag": true
+        "ethereumjs-util>create-hash>md5.js": true,
+        "koa>content-disposition>safe-buffer": true
       }
     },
-    "eth-ens-namehash": {
-      "globals": {
-        "name": "write"
-      },
+    "extension-port-stream": {
       "packages": {
-        "@metamask/ethjs>js-sha3": true,
         "browserify>buffer": true,
-        "eth-ens-namehash>idna-uts46-hx": true
+        "extension-port-stream>readable-stream": true
       }
     },
-    "eth-ens-namehash>idna-uts46-hx": {
+    "fast-json-patch": {
+      "globals": {
+        "addEventListener": true,
+        "clearTimeout": true,
+        "removeEventListener": true,
+        "setTimeout": true
+      }
+    },
+    "@metamask/snaps-utils>fast-xml-parser": {
       "globals": {
-        "define": true
+        "entityName": true,
+        "val": true
       },
       "packages": {
-        "browserify>punycode": true
+        "@metamask/snaps-utils>fast-xml-parser>strnum": true
       }
     },
-    "eth-keyring-controller>@metamask/browser-passworder": {
-      "globals": {
-        "crypto": true
+    "@metamask/notification-services-controller>firebase": {
+      "packages": {
+        "@metamask/notification-services-controller>firebase>@firebase/app": true,
+        "@metamask/notification-services-controller>firebase>@firebase/messaging": true
       }
     },
-    "eth-lattice-keyring": {
+    "react-focus-lock>focus-lock": {
       "globals": {
-        "addEventListener": true,
-        "browser": true,
-        "clearInterval": true,
-        "fetch": true,
-        "open": true,
-        "setInterval": true
+        "HTMLIFrameElement": true,
+        "Node.DOCUMENT_FRAGMENT_NODE": true,
+        "Node.DOCUMENT_NODE": true,
+        "Node.DOCUMENT_POSITION_CONTAINED_BY": true,
+        "Node.DOCUMENT_POSITION_CONTAINS": true,
+        "Node.ELEMENT_NODE": true,
+        "console.error": true,
+        "console.warn": true,
+        "document": true,
+        "getComputedStyle": true,
+        "setTimeout": true
       },
       "packages": {
-        "@ethereumjs/tx>@ethereumjs/util": true,
-        "bn.js": true,
-        "browserify>buffer": true,
-        "crypto-browserify": true,
-        "eth-lattice-keyring>@ethereumjs/tx": true,
-        "eth-lattice-keyring>gridplus-sdk": true,
-        "eth-lattice-keyring>rlp": true,
-        "webpack>events": true
+        "@swc/helpers>tslib": true
       }
     },
-    "eth-lattice-keyring>@ethereumjs/tx": {
+    "browserify>util>which-typed-array>for-each": {
       "packages": {
-        "@ethereumjs/tx>@ethereumjs/common": true,
-        "@ethereumjs/tx>@ethereumjs/rlp": true,
-        "@ethereumjs/tx>@ethereumjs/util": true,
-        "@ethersproject/providers": true,
-        "browserify>buffer": true,
-        "browserify>insert-module-globals>is-buffer": true,
-        "eth-lattice-keyring>@ethereumjs/tx>@chainsafe/ssz": true,
-        "eth-lattice-keyring>@ethereumjs/tx>ethereum-cryptography": true
+        "string.prototype.matchall>es-abstract>is-callable": true
       }
     },
-    "eth-lattice-keyring>@ethereumjs/tx>@chainsafe/ssz": {
-      "packages": {
-        "browserify": true,
-        "browserify>buffer": true,
-        "eth-lattice-keyring>@ethereumjs/tx>@chainsafe/ssz>@chainsafe/persistent-merkle-tree": true,
-        "eth-lattice-keyring>@ethereumjs/tx>@chainsafe/ssz>case": true
+    "axios>form-data": {
+      "globals": {
+        "FormData": true
       }
     },
-    "eth-lattice-keyring>@ethereumjs/tx>@chainsafe/ssz>@chainsafe/persistent-merkle-tree": {
+    "fuse.js": {
       "globals": {
-        "WeakRef": true
-      },
-      "packages": {
-        "browserify": true
+        "console": true,
+        "define": true
       }
     },
-    "eth-lattice-keyring>@ethereumjs/tx>ethereum-cryptography": {
+    "string.prototype.matchall>get-intrinsic": {
       "globals": {
-        "TextDecoder": true,
-        "crypto": true
+        "AggregateError": true,
+        "FinalizationRegistry": true,
+        "WeakRef": true
       },
       "packages": {
-        "eth-lattice-keyring>@ethereumjs/tx>ethereum-cryptography>@noble/hashes": true
+        "string.prototype.matchall>call-bind>es-errors": true,
+        "browserify>has>function-bind": true,
+        "string.prototype.matchall>es-abstract>has-proto": true,
+        "string.prototype.matchall>has-symbols": true,
+        "depcheck>is-core-module>hasown": true
       }
     },
-    "eth-lattice-keyring>@ethereumjs/tx>ethereum-cryptography>@noble/hashes": {
-      "globals": {
-        "TextEncoder": true,
-        "crypto": true
+    "string.prototype.matchall>es-abstract>gopd": {
+      "packages": {
+        "string.prototype.matchall>get-intrinsic": true
       }
     },
     "eth-lattice-keyring>gridplus-sdk": {
@@ -3815,230 +3705,307 @@
         "setTimeout": true
       },
       "packages": {
-        "@ethereumjs/tx>@ethereumjs/common>crc-32": true,
-        "@ethersproject/abi": true,
-        "@metamask/ethjs>js-sha3": true,
-        "@metamask/keyring-api>bech32": true,
-        "bn.js": true,
-        "browserify>buffer": true,
         "eth-lattice-keyring>gridplus-sdk>@ethereumjs/common": true,
         "eth-lattice-keyring>gridplus-sdk>@ethereumjs/tx": true,
+        "@ethersproject/abi": true,
         "eth-lattice-keyring>gridplus-sdk>aes-js": true,
+        "@metamask/keyring-api>bech32": true,
         "eth-lattice-keyring>gridplus-sdk>bignumber.js": true,
         "eth-lattice-keyring>gridplus-sdk>bitwise": true,
+        "bn.js": true,
         "eth-lattice-keyring>gridplus-sdk>borc": true,
+        "ethereumjs-util>ethereum-cryptography>bs58check": true,
+        "browserify>buffer": true,
+        "@ethereumjs/tx>@ethereumjs/common>crc-32": true,
         "eth-lattice-keyring>gridplus-sdk>elliptic": true,
         "eth-lattice-keyring>gridplus-sdk>eth-eip712-util-browser": true,
-        "eth-lattice-keyring>gridplus-sdk>uuid": true,
-        "eth-lattice-keyring>rlp": true,
-        "ethereumjs-util>ethereum-cryptography>bs58check": true,
         "ethers>@ethersproject/sha2>hash.js": true,
+        "@metamask/ethjs>js-sha3": true,
+        "lodash": true,
+        "eth-lattice-keyring>rlp": true,
         "ganache>secp256k1": true,
-        "lodash": true
+        "eth-lattice-keyring>gridplus-sdk>uuid": true
       }
     },
-    "eth-lattice-keyring>gridplus-sdk>@ethereumjs/common": {
+    "string.prototype.matchall>es-abstract>has-property-descriptors": {
       "packages": {
-        "@ethereumjs/tx>@ethereumjs/common>crc-32": true,
-        "@ethereumjs/tx>@ethereumjs/util": true,
-        "browserify>buffer": true,
-        "webpack>events": true
+        "string.prototype.matchall>call-bind>es-define-property": true
       }
     },
-    "eth-lattice-keyring>gridplus-sdk>@ethereumjs/tx": {
+    "koa>is-generator-function>has-tostringtag": {
       "packages": {
-        "@ethereumjs/tx>@ethereumjs/rlp": true,
-        "@ethereumjs/tx>@ethereumjs/util": true,
-        "@ethersproject/providers": true,
-        "browserify>buffer": true,
-        "browserify>insert-module-globals>is-buffer": true,
-        "eth-lattice-keyring>@ethereumjs/tx>@chainsafe/ssz": true,
-        "eth-lattice-keyring>gridplus-sdk>@ethereumjs/tx>@ethereumjs/common": true,
-        "eth-lattice-keyring>gridplus-sdk>@ethereumjs/tx>ethereum-cryptography": true
+        "string.prototype.matchall>has-symbols": true
       }
     },
-    "eth-lattice-keyring>gridplus-sdk>@ethereumjs/tx>@ethereumjs/common": {
+    "ethereumjs-util>create-hash>md5.js>hash-base": {
       "packages": {
-        "@ethereumjs/tx>@ethereumjs/common>crc-32": true,
-        "@ethereumjs/tx>@ethereumjs/util": true,
-        "browserify>buffer": true,
-        "webpack>events": true
+        "pumpify>inherits": true,
+        "readable-stream": true,
+        "koa>content-disposition>safe-buffer": true
       }
     },
-    "eth-lattice-keyring>gridplus-sdk>@ethereumjs/tx>ethereum-cryptography": {
+    "ethers>@ethersproject/sha2>hash.js": {
+      "packages": {
+        "pumpify>inherits": true,
+        "@metamask/ppom-validator>elliptic>minimalistic-assert": true
+      }
+    },
+    "depcheck>is-core-module>hasown": {
+      "packages": {
+        "browserify>has>function-bind": true
+      }
+    },
+    "@metamask/eth-trezor-keyring>hdkey": {
+      "packages": {
+        "browserify>assert": true,
+        "ethereumjs-util>ethereum-cryptography>bs58check": true,
+        "crypto-browserify": true,
+        "ethereumjs-util>create-hash>ripemd160": true,
+        "koa>content-disposition>safe-buffer": true,
+        "ganache>secp256k1": true
+      }
+    },
+    "he": {
       "globals": {
-        "TextDecoder": true,
-        "crypto": true
+        "define": true
+      }
+    },
+    "history": {
+      "globals": {
+        "console": true,
+        "define": true,
+        "document.defaultView": true,
+        "document.querySelector": true
+      }
+    },
+    "react-router-dom>history": {
+      "globals": {
+        "addEventListener": true,
+        "confirm": true,
+        "document": true,
+        "history": true,
+        "location": true,
+        "navigator.userAgent": true,
+        "removeEventListener": true
       },
       "packages": {
-        "eth-lattice-keyring>gridplus-sdk>@ethereumjs/tx>ethereum-cryptography>@noble/hashes": true
+        "react-router-dom>history>resolve-pathname": true,
+        "react-router-dom>tiny-invariant": true,
+        "react-router-dom>tiny-warning": true,
+        "react-router-dom>history>value-equal": true
       }
     },
-    "eth-lattice-keyring>gridplus-sdk>@ethereumjs/tx>ethereum-cryptography>@noble/hashes": {
+    "@metamask/ppom-validator>elliptic>hmac-drbg": {
+      "packages": {
+        "ethers>@ethersproject/sha2>hash.js": true,
+        "@metamask/ppom-validator>elliptic>minimalistic-assert": true,
+        "@metamask/ppom-validator>elliptic>minimalistic-crypto-utils": true
+      }
+    },
+    "react-redux>hoist-non-react-statics": {
+      "packages": {
+        "prop-types>react-is": true
+      }
+    },
+    "https-browserify": {
+      "packages": {
+        "stream-http": true,
+        "browserify>url": true
+      }
+    },
+    "@metamask/notification-services-controller>firebase>@firebase/app>idb": {
       "globals": {
-        "TextEncoder": true,
-        "crypto": true
+        "DOMException": true,
+        "IDBCursor": true,
+        "IDBDatabase": true,
+        "IDBIndex": true,
+        "IDBObjectStore": true,
+        "IDBRequest": true,
+        "IDBTransaction": true,
+        "indexedDB.deleteDatabase": true,
+        "indexedDB.open": true
       }
     },
-    "eth-lattice-keyring>gridplus-sdk>aes-js": {
+    "eth-ens-namehash>idna-uts46-hx": {
       "globals": {
         "define": true
+      },
+      "packages": {
+        "browserify>punycode": true
+      }
+    },
+    "string.prototype.matchall>internal-slot": {
+      "packages": {
+        "string.prototype.matchall>call-bind>es-errors": true,
+        "depcheck>is-core-module>hasown": true,
+        "string.prototype.matchall>side-channel": true
+      }
+    },
+    "browserify>util>is-arguments": {
+      "packages": {
+        "string.prototype.matchall>call-bind": true,
+        "koa>is-generator-function>has-tostringtag": true
+      }
+    },
+    "string.prototype.matchall>es-abstract>is-array-buffer": {
+      "packages": {
+        "string.prototype.matchall>call-bind": true,
+        "string.prototype.matchall>get-intrinsic": true
+      }
+    },
+    "@metamask/eth-token-tracker>deep-equal>which-boxed-primitive>is-bigint": {
+      "packages": {
+        "string.prototype.matchall>es-abstract>unbox-primitive>has-bigints": true
+      }
+    },
+    "@metamask/eth-token-tracker>deep-equal>which-boxed-primitive>is-boolean-object": {
+      "packages": {
+        "string.prototype.matchall>call-bind": true,
+        "koa>is-generator-function>has-tostringtag": true
+      }
+    },
+    "string.prototype.matchall>es-abstract>is-callable": {
+      "globals": {
+        "document": true
+      }
+    },
+    "@metamask/eth-token-tracker>deep-equal>is-date-object": {
+      "packages": {
+        "koa>is-generator-function>has-tostringtag": true
+      }
+    },
+    "koa>is-generator-function": {
+      "packages": {
+        "koa>is-generator-function>has-tostringtag": true
       }
     },
-    "eth-lattice-keyring>gridplus-sdk>bignumber.js": {
+    "@material-ui/core>@material-ui/styles>jss>is-in-browser": {
       "globals": {
-        "crypto": true,
-        "define": true
+        "document": true
       }
     },
-    "eth-lattice-keyring>gridplus-sdk>bitwise": {
+    "@metamask/eth-token-tracker>deep-equal>which-boxed-primitive>is-number-object": {
       "packages": {
-        "browserify>buffer": true
+        "koa>is-generator-function>has-tostringtag": true
       }
     },
-    "eth-lattice-keyring>gridplus-sdk>borc": {
-      "globals": {
-        "console": true
-      },
+    "string.prototype.matchall>es-abstract>is-regex": {
       "packages": {
-        "browserify>buffer": true,
-        "buffer>ieee754": true,
-        "eth-lattice-keyring>gridplus-sdk>borc>bignumber.js": true,
-        "eth-lattice-keyring>gridplus-sdk>borc>iso-url": true
+        "string.prototype.matchall>call-bind": true,
+        "koa>is-generator-function>has-tostringtag": true
       }
     },
-    "eth-lattice-keyring>gridplus-sdk>borc>bignumber.js": {
-      "globals": {
-        "crypto": true,
-        "define": true
+    "string.prototype.matchall>es-abstract>is-shared-array-buffer": {
+      "packages": {
+        "string.prototype.matchall>call-bind": true
       }
     },
-    "eth-lattice-keyring>gridplus-sdk>borc>iso-url": {
-      "globals": {
-        "URL": true,
-        "URLSearchParams": true,
-        "location": true
+    "eslint-plugin-react>array-includes>is-string": {
+      "packages": {
+        "koa>is-generator-function>has-tostringtag": true
       }
     },
-    "eth-lattice-keyring>gridplus-sdk>elliptic": {
+    "string.prototype.matchall>es-abstract>es-to-primitive>is-symbol": {
       "packages": {
-        "@metamask/ppom-validator>elliptic>brorand": true,
-        "@metamask/ppom-validator>elliptic>hmac-drbg": true,
-        "@metamask/ppom-validator>elliptic>minimalistic-assert": true,
-        "@metamask/ppom-validator>elliptic>minimalistic-crypto-utils": true,
-        "bn.js": true,
-        "ethers>@ethersproject/sha2>hash.js": true,
-        "pumpify>inherits": true
+        "string.prototype.matchall>has-symbols": true
       }
     },
-    "eth-lattice-keyring>gridplus-sdk>eth-eip712-util-browser": {
-      "globals": {
-        "intToBuffer": true
-      },
+    "browserify>util>is-typed-array": {
       "packages": {
-        "@metamask/ethjs>js-sha3": true,
-        "bn.js": true,
-        "buffer": true
+        "browserify>util>which-typed-array": true
       }
     },
-    "eth-lattice-keyring>gridplus-sdk>uuid": {
-      "globals": {
-        "crypto": true
+    "@metamask/eth-token-tracker>deep-equal>which-collection>is-weakset": {
+      "packages": {
+        "string.prototype.matchall>call-bind": true,
+        "string.prototype.matchall>get-intrinsic": true
       }
     },
-    "eth-lattice-keyring>rlp": {
+    "eth-lattice-keyring>gridplus-sdk>borc>iso-url": {
       "globals": {
-        "TextEncoder": true
-      }
-    },
-    "eth-method-registry": {
-      "packages": {
-        "@metamask/ethjs-contract": true,
-        "@metamask/ethjs-query": true
+        "URL": true,
+        "URLSearchParams": true,
+        "location": true
       }
     },
-    "ethereumjs-util": {
+    "@ensdomains/content-hash>js-base64": {
+      "globals": {
+        "Base64": "write",
+        "TextDecoder": true,
+        "TextEncoder": true,
+        "atob": true,
+        "btoa": true,
+        "define": true
+      },
       "packages": {
-        "bn.js": true,
-        "browserify>assert": true,
-        "browserify>buffer": true,
-        "browserify>insert-module-globals>is-buffer": true,
-        "ethereumjs-util>create-hash": true,
-        "ethereumjs-util>ethereum-cryptography": true,
-        "ethereumjs-util>rlp": true
+        "browserify>buffer": true
       }
     },
-    "ethereumjs-util>create-hash": {
+    "@metamask/ethjs>js-sha3": {
+      "globals": {
+        "define": true
+      },
       "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
+        "process": true
       }
     },
-    "ethereumjs-util>create-hash>cipher-base": {
-      "packages": {
-        "browserify>string_decoder": true,
-        "koa>content-disposition>safe-buffer": true,
-        "pumpify>inherits": true,
-        "stream-browserify": true
+    "@ngraveio/bc-ur>jsbi": {
+      "globals": {
+        "define": true
       }
     },
-    "ethereumjs-util>create-hash>md5.js": {
+    "@metamask/message-manager>jsonschema": {
       "packages": {
-        "ethereumjs-util>create-hash>md5.js>hash-base": true,
-        "koa>content-disposition>safe-buffer": true,
-        "pumpify>inherits": true
+        "browserify>url": true
       }
     },
-    "ethereumjs-util>create-hash>md5.js>hash-base": {
+    "@material-ui/core>@material-ui/styles>jss-plugin-camel-case": {
       "packages": {
-        "koa>content-disposition>safe-buffer": true,
-        "pumpify>inherits": true,
-        "readable-stream": true
+        "@material-ui/core>@material-ui/styles>jss-plugin-camel-case>hyphenate-style-name": true
       }
     },
-    "ethereumjs-util>create-hash>ripemd160": {
+    "@material-ui/core>@material-ui/styles>jss-plugin-default-unit": {
+      "globals": {
+        "CSS": true
+      },
       "packages": {
-        "browserify>buffer": true,
-        "ethereumjs-util>create-hash>md5.js>hash-base": true,
-        "pumpify>inherits": true
+        "@material-ui/core>@material-ui/styles>jss": true
       }
     },
-    "ethereumjs-util>ethereum-cryptography": {
+    "@material-ui/core>@material-ui/styles>jss-plugin-global": {
       "packages": {
-        "browserify>buffer": true,
-        "crypto-browserify>randombytes": true,
-        "ethereumjs-util>ethereum-cryptography>keccak": true,
-        "ganache>secp256k1": true
+        "@babel/runtime": true,
+        "@material-ui/core>@material-ui/styles>jss": true
       }
     },
-    "ethereumjs-util>ethereum-cryptography>browserify-aes": {
+    "@material-ui/core>@material-ui/styles>jss-plugin-nested": {
       "packages": {
-        "browserify>buffer": true,
-        "crypto-browserify>browserify-cipher>evp_bytestokey": true,
-        "ethereumjs-util>create-hash>cipher-base": true,
-        "ethereumjs-util>ethereum-cryptography>browserify-aes>buffer-xor": true,
-        "koa>content-disposition>safe-buffer": true,
-        "pumpify>inherits": true
+        "@babel/runtime": true,
+        "react-router-dom>tiny-warning": true
       }
     },
-    "ethereumjs-util>ethereum-cryptography>browserify-aes>buffer-xor": {
+    "@material-ui/core>@material-ui/styles>jss-plugin-rule-value-function": {
       "packages": {
-        "browserify>buffer": true
+        "@material-ui/core>@material-ui/styles>jss": true,
+        "react-router-dom>tiny-warning": true
       }
     },
-    "ethereumjs-util>ethereum-cryptography>bs58check": {
+    "@material-ui/core>@material-ui/styles>jss-plugin-vendor-prefixer": {
       "packages": {
-        "ethereumjs-util>create-hash": true,
-        "ethereumjs-util>ethereum-cryptography>bs58check>bs58": true,
-        "koa>content-disposition>safe-buffer": true
+        "@material-ui/core>@material-ui/styles>jss-plugin-vendor-prefixer>css-vendor": true,
+        "@material-ui/core>@material-ui/styles>jss": true
       }
     },
-    "ethereumjs-util>ethereum-cryptography>bs58check>bs58": {
+    "@material-ui/core>@material-ui/styles>jss": {
+      "globals": {
+        "CSS": true,
+        "document.createElement": true,
+        "document.querySelector": true
+      },
       "packages": {
-        "@ensdomains/content-hash>multihashes>multibase>base-x": true
+        "@babel/runtime": true,
+        "@material-ui/core>@material-ui/styles>jss>is-in-browser": true,
+        "react-router-dom>tiny-warning": true
       }
     },
     "ethereumjs-util>ethereum-cryptography>keccak": {
@@ -4047,536 +4014,496 @@
         "readable-stream": true
       }
     },
-    "ethereumjs-util>rlp": {
-      "packages": {
-        "bn.js": true,
-        "browserify>buffer": true
+    "currency-formatter>locale-currency": {
+      "globals": {
+        "countryCode": true
       }
     },
-    "ethereumjs-wallet>randombytes": {
+    "localforage": {
       "globals": {
-        "crypto.getRandomValues": true
+        "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
       }
     },
-    "ethers": {
-      "packages": {
-        "@ethersproject/abi": true,
-        "@ethersproject/bignumber": true,
-        "@ethersproject/bytes": true,
-        "@ethersproject/contracts": true,
-        "@ethersproject/hash": true,
-        "@ethersproject/hdnode": true,
-        "@ethersproject/wallet": true,
-        "ethers>@ethersproject/abstract-signer": true,
-        "ethers>@ethersproject/address": true,
-        "ethers>@ethersproject/base64": true,
-        "ethers>@ethersproject/basex": true,
-        "ethers>@ethersproject/constants": true,
-        "ethers>@ethersproject/json-wallets": true,
-        "ethers>@ethersproject/keccak256": true,
-        "ethers>@ethersproject/logger": true,
-        "ethers>@ethersproject/properties": true,
-        "ethers>@ethersproject/providers": true,
-        "ethers>@ethersproject/random": true,
-        "ethers>@ethersproject/rlp": true,
-        "ethers>@ethersproject/sha2": true,
-        "ethers>@ethersproject/signing-key": true,
-        "ethers>@ethersproject/solidity": true,
-        "ethers>@ethersproject/strings": true,
-        "ethers>@ethersproject/transactions": true,
-        "ethers>@ethersproject/units": true,
-        "ethers>@ethersproject/web": true,
-        "ethers>@ethersproject/wordlists": true
+    "lodash": {
+      "globals": {
+        "clearTimeout": true,
+        "define": true,
+        "setTimeout": true
       }
     },
-    "ethers>@ethersproject/abstract-provider": {
-      "packages": {
-        "@ethersproject/bignumber": true,
-        "@ethersproject/bytes": true,
-        "ethers>@ethersproject/logger": true,
-        "ethers>@ethersproject/properties": true
+    "loglevel": {
+      "globals": {
+        "console": true,
+        "define": true,
+        "document.cookie": true,
+        "localStorage": true,
+        "log": "write",
+        "navigator": true
       }
-    },
-    "ethers>@ethersproject/abstract-signer": {
-      "packages": {
-        "ethers>@ethersproject/logger": true,
-        "ethers>@ethersproject/properties": true
+    },
+    "lottie-web": {
+      "globals": {
+        "Blob": true,
+        "Howl": true,
+        "OffscreenCanvas": true,
+        "URL.createObjectURL": true,
+        "Worker": true,
+        "XMLHttpRequest": true,
+        "bodymovin": "write",
+        "clearInterval": true,
+        "console": true,
+        "define": true,
+        "document.body": true,
+        "document.createElement": true,
+        "document.createElementNS": true,
+        "document.getElementsByClassName": true,
+        "document.getElementsByTagName": true,
+        "document.querySelectorAll": true,
+        "document.readyState": true,
+        "location.origin": true,
+        "location.pathname": true,
+        "navigator": true,
+        "requestAnimationFrame": true,
+        "setInterval": true,
+        "setTimeout": true
       }
     },
-    "ethers>@ethersproject/address": {
-      "packages": {
-        "@ethersproject/bignumber": true,
-        "@ethersproject/bytes": true,
-        "ethers>@ethersproject/keccak256": true,
-        "ethers>@ethersproject/logger": true,
-        "ethers>@ethersproject/rlp": true
+    "luxon": {
+      "globals": {
+        "Intl": true
       }
     },
-    "ethers>@ethersproject/base64": {
+    "@metamask/snaps-utils>marked": {
       "globals": {
-        "atob": true,
-        "btoa": true
-      },
-      "packages": {
-        "@ethersproject/bytes": true
+        "console.error": true,
+        "console.warn": true,
+        "define": true
       }
     },
-    "ethers>@ethersproject/basex": {
+    "ethereumjs-util>create-hash>md5.js": {
       "packages": {
-        "@ethersproject/bytes": true,
-        "ethers>@ethersproject/properties": true
+        "ethereumjs-util>create-hash>md5.js>hash-base": true,
+        "pumpify>inherits": true,
+        "koa>content-disposition>safe-buffer": true
       }
     },
-    "ethers>@ethersproject/constants": {
+    "@storybook/addon-docs>remark-external-links>mdast-util-definitions": {
       "packages": {
-        "@ethersproject/bignumber": true
+        "react-markdown>unist-util-visit": true
       }
     },
-    "ethers>@ethersproject/json-wallets": {
+    "react-markdown>remark-parse>mdast-util-from-markdown": {
       "packages": {
-        "@ethersproject/bytes": true,
-        "@ethersproject/hdnode": true,
-        "ethers>@ethersproject/address": true,
-        "ethers>@ethersproject/json-wallets>aes-js": true,
-        "ethers>@ethersproject/json-wallets>scrypt-js": true,
-        "ethers>@ethersproject/keccak256": true,
-        "ethers>@ethersproject/logger": true,
-        "ethers>@ethersproject/pbkdf2": true,
-        "ethers>@ethersproject/properties": true,
-        "ethers>@ethersproject/random": true,
-        "ethers>@ethersproject/strings": true,
-        "ethers>@ethersproject/transactions": true
+        "react-markdown>remark-parse>mdast-util-from-markdown>mdast-util-to-string": true,
+        "react-markdown>remark-parse>mdast-util-from-markdown>micromark": true,
+        "react-syntax-highlighter>refractor>parse-entities": true,
+        "react-markdown>remark-parse>mdast-util-from-markdown>unist-util-stringify-position": true
       }
     },
-    "ethers>@ethersproject/json-wallets>aes-js": {
+    "react-markdown>remark-rehype>mdast-util-to-hast": {
       "globals": {
-        "define": true
+        "console.warn": true
+      },
+      "packages": {
+        "@storybook/addon-docs>remark-external-links>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
       }
     },
-    "ethers>@ethersproject/json-wallets>scrypt-js": {
+    "@ethereumjs/tx>@ethereumjs/util>micro-ftch": {
       "globals": {
-        "define": true,
-        "setTimeout": true
+        "Headers": true,
+        "TextDecoder": true,
+        "URL": true,
+        "btoa": true,
+        "fetch": true
       },
       "packages": {
-        "browserify>timers-browserify": true
+        "browserify>browserify-zlib": true,
+        "browserify>buffer": true,
+        "https-browserify": true,
+        "process": true,
+        "stream-http": true,
+        "browserify>url": true,
+        "browserify>util": true
       }
     },
-    "ethers>@ethersproject/keccak256": {
+    "react-markdown>remark-parse>mdast-util-from-markdown>micromark": {
       "packages": {
-        "@ethersproject/bytes": true,
-        "@metamask/ethjs>js-sha3": true
-      }
-    },
-    "ethers>@ethersproject/logger": {
-      "globals": {
-        "console": true
+        "react-syntax-highlighter>refractor>parse-entities": true
       }
     },
-    "ethers>@ethersproject/pbkdf2": {
+    "crypto-browserify>diffie-hellman>miller-rabin": {
       "packages": {
-        "@ethersproject/bytes": true,
-        "ethers>@ethersproject/sha2": true
+        "bn.js": true,
+        "@metamask/ppom-validator>elliptic>brorand": true
       }
     },
-    "ethers>@ethersproject/properties": {
+    "@ensdomains/content-hash>cids>multibase": {
+      "globals": {
+        "TextDecoder": true,
+        "TextEncoder": true
+      },
       "packages": {
-        "ethers>@ethersproject/logger": true
+        "@ensdomains/content-hash>cids>multibase>@multiformats/base-x": true
       }
     },
-    "ethers>@ethersproject/providers": {
-      "globals": {
-        "WebSocket": true,
-        "clearInterval": true,
-        "clearTimeout": true,
-        "console.log": true,
-        "console.warn": true,
-        "setInterval": true,
-        "setTimeout": true
-      },
+    "@ensdomains/content-hash>multihashes>multibase": {
       "packages": {
-        "@ethersproject/bignumber": true,
-        "@ethersproject/bytes": true,
-        "@ethersproject/hash": true,
-        "ethers>@ethersproject/abstract-provider": true,
-        "ethers>@ethersproject/abstract-signer": true,
-        "ethers>@ethersproject/address": true,
-        "ethers>@ethersproject/base64": true,
-        "ethers>@ethersproject/basex": true,
-        "ethers>@ethersproject/constants": true,
-        "ethers>@ethersproject/logger": true,
-        "ethers>@ethersproject/properties": true,
-        "ethers>@ethersproject/providers>@ethersproject/networks": true,
-        "ethers>@ethersproject/providers>@ethersproject/web": true,
-        "ethers>@ethersproject/providers>bech32": true,
-        "ethers>@ethersproject/random": true,
-        "ethers>@ethersproject/sha2": true,
-        "ethers>@ethersproject/strings": true,
-        "ethers>@ethersproject/transactions": true
+        "@ensdomains/content-hash>multihashes>multibase>base-x": true,
+        "browserify>buffer": true,
+        "@ensdomains/content-hash>multihashes>web-encoding": true
       }
     },
-    "ethers>@ethersproject/providers>@ethersproject/networks": {
+    "@ensdomains/content-hash>multicodec": {
       "packages": {
-        "ethers>@ethersproject/logger": true
+        "@ensdomains/content-hash>multicodec>uint8arrays": true,
+        "sass-embedded>varint": true
       }
     },
-    "ethers>@ethersproject/providers>@ethersproject/web": {
+    "@ensdomains/content-hash>multicodec>uint8arrays>multiformats": {
       "globals": {
-        "clearTimeout": true,
-        "fetch": true,
-        "setTimeout": true
-      },
-      "packages": {
-        "@ethersproject/bytes": true,
-        "ethers>@ethersproject/base64": true,
-        "ethers>@ethersproject/logger": true,
-        "ethers>@ethersproject/properties": true,
-        "ethers>@ethersproject/strings": true
+        "TextDecoder": true,
+        "TextEncoder": true,
+        "console.warn": true,
+        "crypto.subtle.digest": true
       }
     },
-    "ethers>@ethersproject/random": {
+    "@ensdomains/content-hash>multihashes": {
       "packages": {
-        "@ethersproject/bytes": true,
-        "ethers>@ethersproject/logger": true
+        "browserify>buffer": true,
+        "@ensdomains/content-hash>multihashes>multibase": true,
+        "@ensdomains/content-hash>multihashes>varint": true,
+        "@ensdomains/content-hash>multihashes>web-encoding": true
       }
     },
-    "ethers>@ethersproject/rlp": {
+    "@ensdomains/content-hash>cids>multihashes": {
       "packages": {
-        "@ethersproject/bytes": true,
-        "ethers>@ethersproject/logger": true
+        "@ensdomains/content-hash>cids>multibase": true,
+        "@ensdomains/content-hash>cids>uint8arrays": true,
+        "@ensdomains/content-hash>cids>multihashes>varint": true
       }
     },
-    "ethers>@ethersproject/sha2": {
-      "packages": {
-        "@ethersproject/bytes": true,
-        "ethers>@ethersproject/logger": true,
-        "ethers>@ethersproject/sha2>hash.js": true
+    "nanoid": {
+      "globals": {
+        "crypto.getRandomValues": true
       }
     },
-    "ethers>@ethersproject/sha2>hash.js": {
-      "packages": {
-        "@metamask/ppom-validator>elliptic>minimalistic-assert": true,
-        "pumpify>inherits": true
+    "@metamask/approval-controller>nanoid": {
+      "globals": {
+        "crypto.getRandomValues": true
       }
     },
-    "ethers>@ethersproject/signing-key": {
-      "packages": {
-        "@ethersproject/bytes": true,
-        "ethers>@ethersproject/logger": true,
-        "ethers>@ethersproject/properties": true,
-        "ethers>@ethersproject/signing-key>elliptic": true
+    "@metamask/smart-transactions-controller>@metamask/controllers>nanoid": {
+      "globals": {
+        "crypto.getRandomValues": true
       }
     },
-    "ethers>@ethersproject/signing-key>elliptic": {
-      "packages": {
-        "@metamask/ppom-validator>elliptic>brorand": true,
-        "@metamask/ppom-validator>elliptic>hmac-drbg": true,
-        "@metamask/ppom-validator>elliptic>minimalistic-assert": true,
-        "@metamask/ppom-validator>elliptic>minimalistic-crypto-utils": true,
-        "bn.js": true,
-        "ethers>@ethersproject/sha2>hash.js": true,
-        "pumpify>inherits": true
+    "@metamask/notification-controller>nanoid": {
+      "globals": {
+        "crypto.getRandomValues": true
       }
     },
-    "ethers>@ethersproject/solidity": {
-      "packages": {
-        "@ethersproject/bignumber": true,
-        "@ethersproject/bytes": true,
-        "ethers>@ethersproject/keccak256": true,
-        "ethers>@ethersproject/logger": true,
-        "ethers>@ethersproject/sha2": true,
-        "ethers>@ethersproject/strings": true
+    "@metamask/permission-controller>nanoid": {
+      "globals": {
+        "crypto.getRandomValues": true
       }
     },
-    "ethers>@ethersproject/strings": {
-      "packages": {
-        "@ethersproject/bytes": true,
-        "ethers>@ethersproject/constants": true,
-        "ethers>@ethersproject/logger": true
+    "@metamask/rpc-methods>nanoid": {
+      "globals": {
+        "crypto.getRandomValues": true
       }
     },
-    "ethers>@ethersproject/transactions": {
-      "packages": {
-        "@ethersproject/bignumber": true,
-        "@ethersproject/bytes": true,
-        "ethers>@ethersproject/address": true,
-        "ethers>@ethersproject/constants": true,
-        "ethers>@ethersproject/keccak256": true,
-        "ethers>@ethersproject/logger": true,
-        "ethers>@ethersproject/properties": true,
-        "ethers>@ethersproject/rlp": true,
-        "ethers>@ethersproject/signing-key": true
+    "@metamask/rpc-methods-flask>nanoid": {
+      "globals": {
+        "crypto.getRandomValues": true
       }
     },
-    "ethers>@ethersproject/units": {
-      "packages": {
-        "@ethersproject/bignumber": true,
-        "ethers>@ethersproject/logger": true
+    "@metamask/snaps-controllers>nanoid": {
+      "globals": {
+        "crypto.getRandomValues": true
       }
     },
-    "ethers>@ethersproject/web": {
+    "@metamask/snaps-controllers-flask>nanoid": {
       "globals": {
-        "clearTimeout": true,
-        "fetch": true,
-        "setTimeout": true
-      },
-      "packages": {
-        "@ethersproject/bytes": true,
-        "ethers>@ethersproject/base64": true,
-        "ethers>@ethersproject/logger": true,
-        "ethers>@ethersproject/properties": true,
-        "ethers>@ethersproject/strings": true
+        "crypto.getRandomValues": true
       }
     },
-    "ethers>@ethersproject/wordlists": {
-      "packages": {
-        "@ethersproject/bytes": true,
-        "@ethersproject/hash": true,
-        "ethers>@ethersproject/logger": true,
-        "ethers>@ethersproject/properties": true,
-        "ethers>@ethersproject/strings": true
+    "depcheck>@vue/compiler-sfc>postcss>nanoid": {
+      "globals": {
+        "crypto.getRandomValues": true
       }
     },
-    "extension-port-stream": {
-      "packages": {
-        "browserify>buffer": true,
-        "extension-port-stream>readable-stream": true
+    "dependency-tree>precinct>detective-postcss>postcss>nanoid": {
+      "globals": {
+        "crypto.getRandomValues": true
       }
     },
-    "extension-port-stream>readable-stream": {
+    "node-fetch": {
       "globals": {
-        "AbortController": true,
-        "AggregateError": true,
-        "Blob": true
-      },
-      "packages": {
-        "browserify>buffer": true,
-        "browserify>string_decoder": true,
-        "extension-port-stream>readable-stream>abort-controller": true,
-        "process": true,
-        "webpack>events": true
+        "Headers": true,
+        "Request": true,
+        "Response": true,
+        "fetch": true
       }
     },
-    "extension-port-stream>readable-stream>abort-controller": {
+    "@metamask/controllers>web3-provider-engine>cross-fetch>node-fetch": {
       "globals": {
-        "AbortController": true
+        "fetch": true
       }
     },
-    "fast-json-patch": {
+    "@metamask/controllers>web3-provider-engine>eth-json-rpc-middleware>node-fetch": {
       "globals": {
-        "addEventListener": true,
-        "clearTimeout": true,
-        "removeEventListener": true,
-        "setTimeout": true
+        "fetch": true
       }
     },
-    "fuse.js": {
+    "@metamask/ethjs>ethjs-abi>number-to-bn": {
+      "packages": {
+        "bn.js": true,
+        "@metamask/ethjs>@metamask/ethjs-util>strip-hex-prefix": true
+      }
+    },
+    "string.prototype.matchall>es-abstract>object-inspect": {
       "globals": {
-        "console": true,
-        "define": true
+        "HTMLElement": true,
+        "WeakRef": true
+      },
+      "packages": {
+        "browserify>browser-resolve": true
       }
     },
-    "ganache>secp256k1": {
+    "@ngraveio/bc-ur>assert>object-is": {
       "packages": {
-        "@metamask/ppom-validator>elliptic": true
+        "string.prototype.matchall>call-bind": true,
+        "string.prototype.matchall>define-properties": true
       }
     },
     "gulp>vinyl-fs>object.assign": {
       "packages": {
-        "@lavamoat/lavapack>json-stable-stringify>object-keys": true,
         "string.prototype.matchall>call-bind": true,
         "string.prototype.matchall>define-properties": true,
-        "string.prototype.matchall>has-symbols": true
+        "string.prototype.matchall>has-symbols": true,
+        "@lavamoat/lavapack>json-stable-stringify>object-keys": true
       }
     },
-    "he": {
-      "globals": {
-        "define": true
+    "@metamask/object-multiplex>once": {
+      "packages": {
+        "@metamask/object-multiplex>once>wrappy": true
       }
     },
-    "history": {
-      "globals": {
-        "console": true,
-        "define": true,
-        "document.defaultView": true,
-        "document.querySelector": true
+    "crypto-browserify>public-encrypt>parse-asn1": {
+      "packages": {
+        "crypto-browserify>public-encrypt>parse-asn1>asn1.js": true,
+        "ethereumjs-util>ethereum-cryptography>browserify-aes": true,
+        "browserify>buffer": true,
+        "crypto-browserify>browserify-cipher>evp_bytestokey": true,
+        "crypto-browserify>pbkdf2": true
       }
     },
-    "https-browserify": {
-      "packages": {
-        "browserify>url": true,
-        "stream-http": true
+    "react-syntax-highlighter>refractor>parse-entities": {
+      "globals": {
+        "document.createElement": true
       }
     },
-    "koa>content-disposition>safe-buffer": {
+    "path-browserify": {
       "packages": {
-        "browserify>buffer": true
+        "process": true
       }
     },
-    "koa>is-generator-function": {
+    "serve-handler>path-to-regexp": {
       "packages": {
-        "koa>is-generator-function>has-tostringtag": true
+        "serve-handler>path-to-regexp>isarray": true
       }
     },
-    "koa>is-generator-function>has-tostringtag": {
+    "crypto-browserify>pbkdf2": {
+      "globals": {
+        "crypto": true,
+        "process": true,
+        "queueMicrotask": true,
+        "setImmediate": true,
+        "setTimeout": true
+      },
       "packages": {
-        "string.prototype.matchall>has-symbols": true
+        "ethereumjs-util>create-hash": true,
+        "process": true,
+        "ethereumjs-util>create-hash>ripemd160": true,
+        "koa>content-disposition>safe-buffer": true,
+        "addons-linter>sha.js": true
       }
     },
-    "localforage": {
+    "@material-ui/core>popper.js": {
       "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,
+        "MSInputMethodContext": true,
+        "Node.DOCUMENT_POSITION_FOLLOWING": true,
+        "cancelAnimationFrame": 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
+        "devicePixelRatio": true,
+        "document": true,
+        "getComputedStyle": true,
+        "innerHeight": true,
+        "innerWidth": true,
+        "navigator": true,
+        "requestAnimationFrame": true,
+        "setTimeout": true
       }
     },
-    "lodash": {
+    "react-tippy>popper.js": {
       "globals": {
-        "clearTimeout": true,
+        "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
       }
     },
-    "loglevel": {
+    "process": {
       "globals": {
-        "console": true,
-        "define": true,
-        "document.cookie": true,
-        "localStorage": true,
-        "log": "write",
-        "navigator": true
+        "clearTimeout": true,
+        "setTimeout": true
       }
     },
-    "lottie-web": {
-      "globals": {
-        "Blob": true,
-        "Howl": true,
-        "OffscreenCanvas": true,
-        "URL.createObjectURL": true,
-        "Worker": true,
-        "XMLHttpRequest": true,
-        "bodymovin": "write",
-        "clearInterval": true,
-        "console": true,
-        "define": true,
-        "document.body": true,
-        "document.createElement": true,
-        "document.createElementNS": true,
-        "document.getElementsByClassName": true,
-        "document.getElementsByTagName": true,
-        "document.querySelectorAll": true,
-        "document.readyState": true,
-        "location.origin": true,
-        "location.pathname": true,
-        "navigator": true,
-        "requestAnimationFrame": true,
-        "setInterval": true,
-        "setTimeout": true
+    "promise-to-callback": {
+      "packages": {
+        "promise-to-callback>is-fn": true,
+        "promise-to-callback>set-immediate-shim": true
       }
     },
-    "luxon": {
+    "prop-types": {
       "globals": {
-        "Intl": true
+        "console": true
+      },
+      "packages": {
+        "react>object-assign": true,
+        "prop-types>react-is": true
       }
     },
-    "nanoid": {
-      "globals": {
-        "crypto.getRandomValues": true
+    "react-markdown>property-information": {
+      "packages": {
+        "watchify>xtend": true
       }
     },
-    "nock>debug": {
+    "@trezor/connect-web>@trezor/connect>@trezor/protobuf>protobufjs": {
       "globals": {
-        "console": true,
-        "document": true,
-        "localStorage": true,
-        "navigator": true,
-        "process": true
+        "process": true,
+        "setTimeout": true
       },
       "packages": {
-        "nock>debug>ms": true,
-        "process": true
+        "@trezor/connect-web>@trezor/connect>@trezor/protobuf>protobufjs>@protobufjs/aspromise": true,
+        "@trezor/connect-web>@trezor/connect>@trezor/protobuf>protobufjs>@protobufjs/base64": true,
+        "@trezor/connect-web>@trezor/connect>@trezor/protobuf>protobufjs>@protobufjs/codegen": true,
+        "@trezor/connect-web>@trezor/connect>@trezor/protobuf>protobufjs>@protobufjs/eventemitter": true,
+        "@trezor/connect-web>@trezor/connect>@trezor/protobuf>protobufjs>@protobufjs/fetch": true,
+        "@trezor/connect-web>@trezor/connect>@trezor/protobuf>protobufjs>@protobufjs/float": true,
+        "@trezor/connect-web>@trezor/connect>@trezor/protobuf>protobufjs>@protobufjs/inquire": true,
+        "@trezor/connect-web>@trezor/connect>@trezor/protobuf>protobufjs>@protobufjs/path": true,
+        "@trezor/connect-web>@trezor/connect>@trezor/protobuf>protobufjs>@protobufjs/pool": true,
+        "@trezor/connect-web>@trezor/connect>@trezor/protobuf>protobufjs>@protobufjs/utf8": true
+      }
+    },
+    "crypto-browserify>public-encrypt": {
+      "packages": {
+        "bn.js": true,
+        "crypto-browserify>public-encrypt>browserify-rsa": true,
+        "browserify>buffer": true,
+        "ethereumjs-util>create-hash": true,
+        "crypto-browserify>public-encrypt>parse-asn1": true,
+        "crypto-browserify>randombytes": true
       }
     },
-    "node-fetch": {
+    "browserify>punycode": {
       "globals": {
-        "Headers": true,
-        "Request": true,
-        "Response": true,
-        "fetch": true
+        "define": true
       }
     },
-    "path-browserify": {
-      "packages": {
-        "process": true
+    "qrcode-generator": {
+      "globals": {
+        "define": true
       }
     },
-    "process": {
+    "qrcode.react": {
       "globals": {
-        "clearTimeout": true,
-        "setTimeout": true
+        "Path2D": true,
+        "devicePixelRatio": true
+      },
+      "packages": {
+        "react": true
       }
     },
-    "promise-to-callback": {
+    "@storybook/addon-knobs>qs": {
       "packages": {
-        "promise-to-callback>is-fn": true,
-        "promise-to-callback>set-immediate-shim": true
+        "string.prototype.matchall>side-channel": true
       }
     },
-    "promise-to-callback>set-immediate-shim": {
+    "@metamask/snaps-controllers>tar-stream>streamx>queue-tick": {
       "globals": {
-        "setTimeout.apply": true
-      },
-      "packages": {
-        "browserify>timers-browserify": true
+        "queueMicrotask": true
       }
     },
-    "prop-types": {
+    "react-beautiful-dnd>raf-schd": {
       "globals": {
-        "console": true
-      },
-      "packages": {
-        "prop-types>react-is": true,
-        "react>object-assign": true
+        "cancelAnimationFrame": true,
+        "requestAnimationFrame": true
       }
     },
-    "prop-types>react-is": {
+    "crypto-browserify>randombytes": {
       "globals": {
-        "console": true
+        "crypto": true,
+        "msCrypto": true
+      },
+      "packages": {
+        "process": true,
+        "koa>content-disposition>safe-buffer": true
       }
     },
-    "qrcode-generator": {
+    "ethereumjs-wallet>randombytes": {
       "globals": {
-        "define": true
+        "crypto.getRandomValues": true
       }
     },
-    "qrcode.react": {
+    "crypto-browserify>randomfill": {
       "globals": {
-        "Path2D": true,
-        "devicePixelRatio": true
+        "crypto": true,
+        "msCrypto": true
       },
       "packages": {
-        "react": true
+        "process": true,
+        "crypto-browserify>randombytes": true,
+        "koa>content-disposition>safe-buffer": true
       }
     },
     "react": {
@@ -4584,8 +4511,8 @@
         "console": true
       },
       "packages": {
-        "prop-types": true,
-        "react>object-assign": true
+        "react>object-assign": true,
+        "prop-types": true
       }
     },
     "react-beautiful-dnd": {
@@ -4607,43 +4534,28 @@
       },
       "packages": {
         "@babel/runtime": true,
-        "react": true,
         "react-beautiful-dnd>css-box-model": true,
         "react-beautiful-dnd>memoize-one": true,
         "react-beautiful-dnd>raf-schd": true,
-        "react-beautiful-dnd>use-memo-one": true,
+        "react": true,
         "react-dom": true,
         "react-redux": true,
-        "redux": true
+        "redux": true,
+        "react-beautiful-dnd>use-memo-one": true
       }
     },
-    "react-beautiful-dnd>css-box-model": {
+    "react-chartjs-2": {
       "globals": {
-        "getComputedStyle": true,
-        "pageXOffset": true,
-        "pageYOffset": true
+        "setTimeout": true
       },
       "packages": {
-        "react-router-dom>tiny-invariant": true
-      }
-    },
-    "react-beautiful-dnd>raf-schd": {
-      "globals": {
-        "cancelAnimationFrame": true,
-        "requestAnimationFrame": true
-      }
-    },
-    "react-beautiful-dnd>use-memo-one": {
-      "packages": {
+        "chart.js": true,
         "react": true
       }
     },
-    "react-chartjs-2": {
-      "globals": {
-        "setTimeout": true
-      },
+    "react-focus-lock>react-clientside-effect": {
       "packages": {
-        "chart.js": true,
+        "@babel/runtime": true,
         "react": true
       }
     },
@@ -4688,22 +4600,28 @@
         "trustedTypes": true
       },
       "packages": {
+        "react>object-assign": true,
         "prop-types": true,
         "react": true,
-        "react-dom>scheduler": true,
-        "react>object-assign": true
+        "react-dom>scheduler": true
       }
     },
-    "react-dom>scheduler": {
+    "react-responsive-carousel>react-easy-swipe": {
       "globals": {
-        "MessageChannel": true,
-        "cancelAnimationFrame": true,
-        "clearTimeout": true,
-        "console": true,
-        "navigator": true,
-        "performance": true,
-        "requestAnimationFrame": true,
-        "setTimeout": true
+        "addEventListener": true,
+        "define": true,
+        "document.addEventListener": true,
+        "document.removeEventListener": true
+      },
+      "packages": {
+        "prop-types": true,
+        "react": true
+      }
+    },
+    "react-popper>react-fast-compare": {
+      "globals": {
+        "Element": true,
+        "console.warn": true
       }
     },
     "react-focus-lock": {
@@ -4717,667 +4635,726 @@
       },
       "packages": {
         "@babel/runtime": true,
+        "react-focus-lock>focus-lock": true,
         "prop-types": true,
         "react": true,
-        "react-focus-lock>focus-lock": true,
         "react-focus-lock>react-clientside-effect": true,
         "react-focus-lock>use-callback-ref": true,
         "react-focus-lock>use-sidecar": true
       }
     },
-    "react-focus-lock>focus-lock": {
+    "react-idle-timer": {
       "globals": {
-        "HTMLIFrameElement": true,
-        "Node.DOCUMENT_FRAGMENT_NODE": true,
-        "Node.DOCUMENT_NODE": true,
-        "Node.DOCUMENT_POSITION_CONTAINED_BY": true,
-        "Node.DOCUMENT_POSITION_CONTAINS": true,
-        "Node.ELEMENT_NODE": true,
-        "console.error": true,
+        "clearTimeout": true,
+        "document": true,
+        "setTimeout": true
+      },
+      "packages": {
+        "prop-types": true,
+        "react": true
+      }
+    },
+    "react-inspector": {
+      "globals": {
+        "Node": true,
+        "chromeDark": true,
+        "chromeLight": true
+      },
+      "packages": {
+        "react": true
+      }
+    },
+    "prop-types>react-is": {
+      "globals": {
+        "console": true
+      }
+    },
+    "react-markdown>react-is": {
+      "globals": {
+        "console": true
+      }
+    },
+    "react-redux>react-is": {
+      "globals": {
+        "console": true
+      }
+    },
+    "react-markdown": {
+      "globals": {
+        "console.warn": true
+      },
+      "packages": {
+        "react-markdown>comma-separated-tokens": true,
+        "prop-types": true,
+        "react-markdown>property-information": true,
+        "react": 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-popper": {
+      "globals": {
+        "document": true
+      },
+      "packages": {
+        "@popperjs/core": true,
+        "react": true,
+        "react-popper>react-fast-compare": true,
+        "react-popper>warning": true
+      }
+    },
+    "react-redux": {
+      "globals": {
+        "console": true,
+        "document": true
+      },
+      "packages": {
+        "@babel/runtime": true,
+        "react-redux>hoist-non-react-statics": true,
+        "prop-types": true,
+        "react": true,
+        "react-dom": true,
+        "react-redux>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-router-dom": {
+      "packages": {
+        "react-router-dom>history": true,
+        "prop-types": true,
+        "react": true,
+        "react-router-dom>react-router": true,
+        "react-router-dom>tiny-invariant": true,
+        "react-router-dom>tiny-warning": true
+      }
+    },
+    "react-router-dom-v5-compat": {
+      "globals": {
+        "FormData": true,
+        "URL": true,
+        "URLSearchParams": true,
+        "__reactRouterVersion": "write",
+        "addEventListener": true,
+        "confirm": true,
+        "define": true,
+        "document": true,
+        "history.scrollRestoration": true,
+        "location.href": true,
+        "removeEventListener": true,
+        "scrollTo": true,
+        "scrollY": true,
+        "sessionStorage.getItem": true,
+        "sessionStorage.setItem": true,
         "setTimeout": true
       },
       "packages": {
-        "@swc/helpers>tslib": true
+        "react-router-dom-v5-compat>@remix-run/router": true,
+        "history": true,
+        "react": true,
+        "react-dom": true,
+        "react-router-dom": true,
+        "react-router-dom-v5-compat>react-router": true
       }
     },
-    "react-focus-lock>react-clientside-effect": {
+    "react-router-dom>react-router": {
       "packages": {
-        "@babel/runtime": true,
-        "react": true
+        "react-router-dom>history": true,
+        "react-redux>hoist-non-react-statics": true,
+        "serve-handler>path-to-regexp": true,
+        "prop-types": true,
+        "react": true,
+        "prop-types>react-is": true,
+        "react-router-dom>tiny-invariant": true,
+        "react-router-dom>tiny-warning": true
       }
     },
-    "react-focus-lock>use-callback-ref": {
+    "react-router-dom-v5-compat>react-router": {
+      "globals": {
+        "console.error": true,
+        "define": true
+      },
       "packages": {
+        "react-router-dom-v5-compat>@remix-run/router": true,
         "react": true
       }
     },
-    "react-focus-lock>use-sidecar": {
+    "react-simple-file-input": {
       "globals": {
-        "console.error": true
+        "File": true,
+        "FileReader": true,
+        "console.warn": true
       },
       "packages": {
-        "@swc/helpers>tslib": true,
-        "react": true,
-        "react-focus-lock>use-sidecar>detect-node-es": true
+        "prop-types": true,
+        "react": true
       }
     },
-    "react-idle-timer": {
+    "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": {
-        "prop-types": true,
-        "react": true
+        "react-tippy>popper.js": true,
+        "react": true,
+        "react-dom": true
       }
     },
-    "react-inspector": {
+    "react-toggle-button": {
       "globals": {
-        "Node": true,
-        "chromeDark": true,
-        "chromeLight": true
+        "clearTimeout": true,
+        "console.warn": true,
+        "define": true,
+        "performance": true,
+        "setTimeout": true
       },
       "packages": {
         "react": true
       }
     },
-    "react-markdown": {
+    "@material-ui/core>react-transition-group": {
       "globals": {
-        "console.warn": true
+        "Element": true,
+        "setTimeout": true
       },
       "packages": {
+        "@material-ui/core>react-transition-group>dom-helpers": true,
         "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-dom": true
       }
     },
-    "react-markdown>property-information": {
+    "readable-stream": {
       "packages": {
-        "watchify>xtend": true
+        "browserify>browser-resolve": true,
+        "browserify>buffer": true,
+        "webpack>events": true,
+        "pumpify>inherits": true,
+        "process": true,
+        "browserify>string_decoder": true,
+        "readable-stream>util-deprecate": true
       }
     },
-    "react-markdown>react-is": {
+    "extension-port-stream>readable-stream": {
       "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>unist-util-stringify-position": true,
-        "react-syntax-highlighter>refractor>parse-entities": true
-      }
-    },
-    "react-markdown>remark-parse>mdast-util-from-markdown>micromark": {
+        "AbortController": true,
+        "AbortSignal": true,
+        "AggregateError": true,
+        "Blob": true,
+        "ERR_INVALID_ARG_TYPE": true,
+        "queueMicrotask": true
+      },
       "packages": {
-        "react-syntax-highlighter>refractor>parse-entities": true
+        "@lavamoat/lavapack>readable-stream>abort-controller": true,
+        "browserify>buffer": true,
+        "webpack>events": true,
+        "process": true,
+        "browserify>string_decoder": true
       }
     },
-    "react-markdown>remark-rehype": {
+    "@metamask/snaps-controllers>readable-web-to-node-stream": {
       "packages": {
-        "react-markdown>remark-rehype>mdast-util-to-hast": true
+        "readable-stream": true
       }
     },
-    "react-markdown>remark-rehype>mdast-util-to-hast": {
+    "redux": {
       "globals": {
-        "console.warn": true
+        "console": true
       },
       "packages": {
-        "@storybook/addon-docs>remark-external-links>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
+        "@babel/runtime": true
       }
     },
-    "react-markdown>style-to-object": {
+    "string.prototype.matchall>regexp.prototype.flags": {
       "packages": {
-        "react-markdown>style-to-object>inline-style-parser": true
+        "string.prototype.matchall>call-bind": true,
+        "string.prototype.matchall>define-properties": true,
+        "string.prototype.matchall>call-bind>es-errors": true,
+        "string.prototype.matchall>regexp.prototype.flags>set-function-name": true
       }
     },
-    "react-markdown>unified": {
+    "react-markdown>remark-parse": {
       "packages": {
-        "mocha>yargs-unparser>is-plain-obj": true,
-        "react-markdown>unified>bail": true,
-        "react-markdown>unified>extend": true,
-        "react-markdown>unified>is-buffer": true,
-        "react-markdown>unified>trough": true,
-        "react-markdown>vfile": true
+        "react-markdown>remark-parse>mdast-util-from-markdown": true
       }
     },
-    "react-markdown>unist-util-visit": {
+    "react-markdown>remark-rehype": {
       "packages": {
-        "react-markdown>unist-util-visit>unist-util-visit-parents": true
+        "react-markdown>remark-rehype>mdast-util-to-hast": true
       }
     },
-    "react-markdown>unist-util-visit>unist-util-visit-parents": {
+    "react-markdown>vfile>replace-ext": {
       "packages": {
-        "react-markdown>unist-util-visit>unist-util-is": true
+        "path-browserify": true
       }
     },
-    "react-markdown>vfile": {
-      "packages": {
-        "path-browserify": true,
-        "process": true,
-        "react-markdown>vfile>is-buffer": true,
-        "react-markdown>vfile>replace-ext": true,
-        "react-markdown>vfile>vfile-message": true
+    "reselect": {
+      "globals": {
+        "WeakRef": true,
+        "console.warn": true,
+        "unstable_autotrackMemoize": true
       }
     },
-    "react-markdown>vfile>replace-ext": {
+    "@metamask/snaps-utils>rfdc": {
       "packages": {
-        "path-browserify": true
+        "browserify>buffer": true
       }
     },
-    "react-markdown>vfile>vfile-message": {
+    "ethereumjs-util>create-hash>ripemd160": {
       "packages": {
-        "react-markdown>vfile>unist-util-stringify-position": true
+        "browserify>buffer": true,
+        "ethereumjs-util>create-hash>md5.js>hash-base": true,
+        "pumpify>inherits": true
       }
     },
-    "react-popper": {
-      "globals": {
-        "document": true
-      },
+    "@keystonehq/metamask-airgapped-keyring>rlp": {
       "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
+        "bn.js": true,
+        "browserify>buffer": true
       }
     },
-    "react-popper>warning": {
+    "eth-lattice-keyring>rlp": {
       "globals": {
-        "console": true
+        "TextEncoder": true
       }
     },
-    "react-redux": {
-      "globals": {
-        "console": true,
-        "document": true
-      },
+    "ethereumjs-util>rlp": {
       "packages": {
-        "@babel/runtime": true,
-        "prop-types": true,
-        "react": true,
-        "react-dom": true,
-        "react-redux>hoist-non-react-statics": true,
-        "react-redux>react-is": true
+        "bn.js": true,
+        "browserify>buffer": true
       }
     },
-    "react-redux>hoist-non-react-statics": {
+    "@metamask/keyring-controller>ethereumjs-wallet>ethereumjs-util>rlp": {
       "packages": {
-        "prop-types>react-is": true
+        "bn.js": true,
+        "browserify>buffer": true
       }
     },
-    "react-redux>react-is": {
+    "wait-on>rxjs": {
       "globals": {
-        "console": true
+        "cancelAnimationFrame": true,
+        "clearInterval": true,
+        "clearTimeout": true,
+        "performance": true,
+        "requestAnimationFrame": true,
+        "setInterval.apply": true,
+        "setTimeout.apply": true
       }
     },
-    "react-responsive-carousel": {
+    "koa>content-disposition>safe-buffer": {
+      "packages": {
+        "browserify>buffer": true
+      }
+    },
+    "react-dom>scheduler": {
       "globals": {
-        "HTMLElement": true,
-        "addEventListener": true,
+        "MessageChannel": true,
+        "cancelAnimationFrame": true,
         "clearTimeout": true,
-        "console.warn": true,
-        "document": true,
-        "getComputedStyle": true,
-        "removeEventListener": true,
+        "console": true,
+        "navigator": true,
+        "performance": true,
+        "requestAnimationFrame": true,
         "setTimeout": true
-      },
-      "packages": {
-        "classnames": true,
-        "react": true,
-        "react-dom": true,
-        "react-responsive-carousel>react-easy-swipe": true
       }
     },
-    "react-responsive-carousel>react-easy-swipe": {
+    "ethers>@ethersproject/json-wallets>scrypt-js": {
       "globals": {
-        "addEventListener": true,
         "define": true,
-        "document.addEventListener": true,
-        "document.removeEventListener": true
+        "setTimeout": true
       },
       "packages": {
-        "prop-types": true,
-        "react": true
+        "browserify>timers-browserify": true
       }
     },
-    "react-router-dom": {
+    "ganache>secp256k1": {
       "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
+        "@metamask/ppom-validator>elliptic": true
       }
     },
-    "react-router-dom-v5-compat": {
+    "semver": {
       "globals": {
-        "FormData": true,
-        "URL": true,
-        "URLSearchParams": true,
-        "__reactRouterVersion": "write",
-        "addEventListener": true,
-        "confirm": true,
-        "define": true,
-        "document": true,
-        "history.scrollRestoration": true,
-        "location.href": true,
-        "removeEventListener": true,
-        "scrollTo": true,
-        "scrollY": true,
-        "sessionStorage.getItem": true,
-        "sessionStorage.setItem": true,
-        "setTimeout": true
+        "console.error": true
       },
       "packages": {
-        "history": true,
-        "react": true,
-        "react-dom": true,
-        "react-router-dom": true,
-        "react-router-dom-v5-compat>@remix-run/router": true,
-        "react-router-dom-v5-compat>react-router": true
+        "process": true
       }
     },
-    "react-router-dom-v5-compat>@remix-run/router": {
-      "globals": {
-        "AbortController": true,
-        "DOMException": true,
-        "FormData": true,
-        "Headers": true,
-        "Request": true,
-        "Response": true,
-        "URL": true,
-        "URLSearchParams": true,
-        "console": true,
-        "document.defaultView": true
+    "string.prototype.matchall>call-bind>set-function-length": {
+      "packages": {
+        "string.prototype.matchall>define-properties>define-data-property": true,
+        "string.prototype.matchall>call-bind>es-errors": true,
+        "string.prototype.matchall>get-intrinsic": true,
+        "string.prototype.matchall>es-abstract>gopd": true,
+        "string.prototype.matchall>es-abstract>has-property-descriptors": true
       }
     },
-    "react-router-dom-v5-compat>react-router": {
-      "globals": {
-        "console.error": true,
-        "define": true
-      },
+    "string.prototype.matchall>regexp.prototype.flags>set-function-name": {
       "packages": {
-        "react": true,
-        "react-router-dom-v5-compat>@remix-run/router": true
+        "string.prototype.matchall>define-properties>define-data-property": true,
+        "string.prototype.matchall>call-bind>es-errors": true,
+        "string.prototype.matchall>es-abstract>function.prototype.name>functions-have-names": true,
+        "string.prototype.matchall>es-abstract>has-property-descriptors": true
       }
     },
-    "react-router-dom>history": {
+    "promise-to-callback>set-immediate-shim": {
       "globals": {
-        "addEventListener": true,
-        "confirm": true,
-        "document": true,
-        "history": true,
-        "location": true,
-        "navigator.userAgent": true,
-        "removeEventListener": true
+        "setTimeout.apply": 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
+        "browserify>timers-browserify": true
       }
     },
-    "react-router-dom>react-router": {
+    "addons-linter>sha.js": {
       "packages": {
-        "prop-types": true,
-        "prop-types>react-is": true,
-        "react": true,
-        "react-redux>hoist-non-react-statics": true,
-        "react-router-dom>history": true,
-        "react-router-dom>tiny-invariant": true,
-        "react-router-dom>tiny-warning": true,
-        "serve-handler>path-to-regexp": true
+        "pumpify>inherits": true,
+        "koa>content-disposition>safe-buffer": true
       }
     },
-    "react-router-dom>tiny-warning": {
-      "globals": {
-        "console": true
+    "string.prototype.matchall>side-channel": {
+      "packages": {
+        "string.prototype.matchall>call-bind": true,
+        "string.prototype.matchall>get-intrinsic": true,
+        "string.prototype.matchall>es-abstract>object-inspect": true
       }
     },
-    "react-simple-file-input": {
+    "@metamask/profile-sync-controller>siwe": {
       "globals": {
-        "File": true,
-        "FileReader": true,
+        "console.error": true,
         "console.warn": true
       },
       "packages": {
-        "prop-types": true,
-        "react": true
+        "@metamask/profile-sync-controller>siwe>@spruceid/siwe-parser": true,
+        "@metamask/profile-sync-controller>siwe>@stablelib/random": true,
+        "ethers": true,
+        "@metamask/controller-utils>@spruceid/siwe-parser>valid-url": true
       }
     },
-    "react-syntax-highlighter>refractor>parse-entities": {
+    "@metamask/eth-token-tracker>deep-equal>es-get-iterator>stop-iteration-iterator": {
       "globals": {
-        "document.createElement": true
+        "StopIteration": true
+      },
+      "packages": {
+        "string.prototype.matchall>internal-slot": true
       }
     },
-    "react-tippy": {
+    "stream-browserify": {
+      "packages": {
+        "webpack>events": true,
+        "pumpify>inherits": true,
+        "readable-stream": true
+      }
+    },
+    "stream-http": {
       "globals": {
-        "Element": true,
-        "MSStream": true,
-        "MutationObserver": true,
-        "addEventListener": true,
+        "AbortController": true,
+        "Blob": true,
+        "MSStreamReader": true,
+        "ReadableStream": true,
+        "WritableStream": true,
+        "XDomainRequest": true,
+        "XMLHttpRequest": 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,
+        "fetch": true,
+        "location.protocol.search": true,
         "setTimeout": true
       },
       "packages": {
-        "react": true,
-        "react-dom": true,
-        "react-tippy>popper.js": true
+        "browserify>buffer": true,
+        "stream-http>builtin-status-codes": true,
+        "pumpify>inherits": true,
+        "process": true,
+        "readable-stream": true,
+        "browserify>url": true,
+        "watchify>xtend": 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
+    "@metamask/snaps-controllers>tar-stream>streamx": {
+      "packages": {
+        "webpack>events": true,
+        "@metamask/snaps-controllers>tar-stream>fast-fifo": true,
+        "@metamask/snaps-controllers>tar-stream>streamx>queue-tick": true
       }
     },
-    "react-toggle-button": {
-      "globals": {
-        "clearTimeout": true,
-        "console.warn": true,
-        "define": true,
-        "performance": true,
-        "setTimeout": true
-      },
+    "browserify>string_decoder": {
       "packages": {
-        "react": true
+        "koa>content-disposition>safe-buffer": true
       }
     },
-    "readable-stream": {
+    "@metamask/ethjs>@metamask/ethjs-util>strip-hex-prefix": {
       "packages": {
-        "browserify>browser-resolve": true,
-        "browserify>buffer": true,
-        "browserify>string_decoder": true,
-        "process": true,
-        "pumpify>inherits": true,
-        "readable-stream>util-deprecate": true,
-        "webpack>events": true
+        "@metamask/ethjs>@metamask/ethjs-util>is-hex-prefixed": true
       }
     },
-    "readable-stream>util-deprecate": {
-      "globals": {
-        "console.trace": true,
-        "console.warn": true,
-        "localStorage": true
+    "react-markdown>style-to-object": {
+      "packages": {
+        "react-markdown>style-to-object>inline-style-parser": true
       }
     },
-    "redux": {
-      "globals": {
-        "console": true
-      },
+    "@metamask/snaps-controllers>tar-stream": {
       "packages": {
-        "@babel/runtime": true
+        "@metamask/snaps-controllers>tar-stream>b4a": true,
+        "browserify>browser-resolve": true,
+        "@metamask/snaps-controllers>tar-stream>fast-fifo": true,
+        "@metamask/snaps-controllers>tar-stream>streamx": true
       }
     },
-    "reselect": {
-      "globals": {
-        "WeakRef": true,
-        "console.warn": true,
-        "unstable_autotrackMemoize": true
+    "debounce-stream>through": {
+      "packages": {
+        "process": true,
+        "stream-browserify": true
       }
     },
-    "semver": {
+    "browserify>timers-browserify": {
       "globals": {
-        "console.error": true
+        "clearInterval": true,
+        "clearTimeout": true,
+        "setInterval": true,
+        "setTimeout": true
       },
       "packages": {
         "process": true
       }
     },
-    "serve-handler>path-to-regexp": {
-      "packages": {
-        "serve-handler>path-to-regexp>isarray": true
+    "react-router-dom>tiny-warning": {
+      "globals": {
+        "console": true
       }
     },
-    "stream-browserify": {
-      "packages": {
-        "pumpify>inherits": true,
-        "readable-stream": true,
-        "webpack>events": true
+    "copy-to-clipboard>toggle-selection": {
+      "globals": {
+        "document.activeElement": true,
+        "document.getSelection": true
       }
     },
-    "stream-http": {
+    "@swc/helpers>tslib": {
+      "globals": {
+        "SuppressedError": true,
+        "define": true
+      }
+    },
+    "@metamask/eth-sig-util>tweetnacl": {
       "globals": {
-        "AbortController": true,
-        "Blob": true,
-        "MSStreamReader": true,
-        "ReadableStream": true,
-        "WritableStream": true,
-        "XDomainRequest": true,
-        "XMLHttpRequest": true,
-        "clearTimeout": true,
-        "fetch": true,
-        "location.protocol.search": true,
-        "setTimeout": true
+        "crypto": true,
+        "msCrypto": true,
+        "nacl": "write"
       },
       "packages": {
-        "browserify>buffer": true,
-        "browserify>url": true,
-        "process": true,
-        "pumpify>inherits": true,
-        "readable-stream": true,
-        "stream-http>builtin-status-codes": true,
-        "watchify>xtend": true
+        "browserify>browser-resolve": true
       }
     },
-    "string.prototype.matchall>call-bind": {
-      "packages": {
-        "browserify>has>function-bind": true,
-        "string.prototype.matchall>call-bind>es-define-property": true,
-        "string.prototype.matchall>call-bind>es-errors": true,
-        "string.prototype.matchall>call-bind>set-function-length": true,
-        "string.prototype.matchall>get-intrinsic": true
+    "@trezor/connect-web>@trezor/connect-common>@trezor/env-utils>ua-parser-js": {
+      "globals": {
+        "define": true
       }
     },
-    "string.prototype.matchall>call-bind>es-define-property": {
+    "@ensdomains/content-hash>cids>uint8arrays": {
+      "globals": {
+        "TextDecoder": true,
+        "TextEncoder": true
+      },
       "packages": {
-        "string.prototype.matchall>get-intrinsic": true
+        "@ensdomains/content-hash>cids>multibase": true
       }
     },
-    "string.prototype.matchall>call-bind>set-function-length": {
+    "@ensdomains/content-hash>multicodec>uint8arrays": {
+      "globals": {
+        "Buffer": true,
+        "TextDecoder": true,
+        "TextEncoder": true
+      },
       "packages": {
-        "string.prototype.matchall>call-bind>es-errors": true,
-        "string.prototype.matchall>define-properties>define-data-property": true,
-        "string.prototype.matchall>es-abstract>gopd": true,
-        "string.prototype.matchall>es-abstract>has-property-descriptors": true,
-        "string.prototype.matchall>get-intrinsic": true
+        "@ensdomains/content-hash>multicodec>uint8arrays>multiformats": true
       }
     },
-    "string.prototype.matchall>define-properties": {
+    "react-markdown>unified": {
       "packages": {
-        "@lavamoat/lavapack>json-stable-stringify>object-keys": true,
-        "string.prototype.matchall>define-properties>define-data-property": true,
-        "string.prototype.matchall>es-abstract>has-property-descriptors": true
+        "react-markdown>unified>bail": true,
+        "react-markdown>unified>extend": true,
+        "react-markdown>unified>is-buffer": true,
+        "mocha>yargs-unparser>is-plain-obj": true,
+        "react-markdown>unified>trough": true,
+        "react-markdown>vfile": true
       }
     },
-    "string.prototype.matchall>define-properties>define-data-property": {
+    "react-markdown>unist-util-visit>unist-util-visit-parents": {
       "packages": {
-        "string.prototype.matchall>call-bind>es-define-property": true,
-        "string.prototype.matchall>call-bind>es-errors": true,
-        "string.prototype.matchall>es-abstract>gopd": true
+        "react-markdown>unist-util-visit>unist-util-is": true
       }
     },
-    "string.prototype.matchall>es-abstract>array-buffer-byte-length": {
+    "react-markdown>unist-util-visit": {
       "packages": {
-        "string.prototype.matchall>call-bind": true,
-        "string.prototype.matchall>es-abstract>is-array-buffer": true
+        "react-markdown>unist-util-visit>unist-util-visit-parents": true
       }
     },
-    "string.prototype.matchall>es-abstract>available-typed-arrays": {
-      "packages": {
-        "string.prototype.matchall>es-abstract>typed-array-length>possible-typed-array-names": true
+    "uri-js": {
+      "globals": {
+        "define": true
       }
     },
-    "string.prototype.matchall>es-abstract>es-to-primitive>is-symbol": {
+    "browserify>url": {
       "packages": {
-        "string.prototype.matchall>has-symbols": true
+        "browserify>punycode": true,
+        "@storybook/addon-knobs>qs": true
       }
     },
-    "string.prototype.matchall>es-abstract>gopd": {
+    "react-focus-lock>use-callback-ref": {
       "packages": {
-        "string.prototype.matchall>get-intrinsic": true
+        "react": true
       }
     },
-    "string.prototype.matchall>es-abstract>has-property-descriptors": {
+    "react-beautiful-dnd>use-memo-one": {
       "packages": {
-        "string.prototype.matchall>call-bind>es-define-property": true
+        "react": true
       }
     },
-    "string.prototype.matchall>es-abstract>is-array-buffer": {
+    "react-focus-lock>use-sidecar": {
+      "globals": {
+        "console.error": true
+      },
       "packages": {
-        "string.prototype.matchall>call-bind": true,
-        "string.prototype.matchall>get-intrinsic": true
+        "react-focus-lock>use-sidecar>detect-node-es": true,
+        "react": true,
+        "@swc/helpers>tslib": true
       }
     },
-    "string.prototype.matchall>es-abstract>is-callable": {
+    "readable-stream>util-deprecate": {
       "globals": {
-        "document": true
+        "console.trace": true,
+        "console.warn": true,
+        "localStorage": true
       }
     },
-    "string.prototype.matchall>es-abstract>is-regex": {
+    "browserify>assert>util": {
+      "globals": {
+        "console.error": true,
+        "console.log": true,
+        "console.trace": true,
+        "process": true
+      },
       "packages": {
-        "koa>is-generator-function>has-tostringtag": true,
-        "string.prototype.matchall>call-bind": true
+        "browserify>assert>util>inherits": true,
+        "process": true
       }
     },
-    "string.prototype.matchall>es-abstract>is-shared-array-buffer": {
+    "browserify>util": {
+      "globals": {
+        "console.error": true,
+        "console.log": true,
+        "console.trace": true
+      },
       "packages": {
-        "string.prototype.matchall>call-bind": true
+        "pumpify>inherits": true,
+        "browserify>util>is-arguments": true,
+        "koa>is-generator-function": true,
+        "browserify>util>is-typed-array": true,
+        "process": true,
+        "browserify>util>which-typed-array": true
       }
     },
-    "string.prototype.matchall>es-abstract>object-inspect": {
+    "uuid": {
       "globals": {
-        "HTMLElement": true,
-        "WeakRef": true
-      },
-      "packages": {
-        "browserify>browser-resolve": true
+        "crypto": true,
+        "msCrypto": true
       }
     },
-    "string.prototype.matchall>get-intrinsic": {
+    "@metamask/eth-snap-keyring>uuid": {
       "globals": {
-        "AggregateError": true,
-        "FinalizationRegistry": true,
-        "WeakRef": true
-      },
-      "packages": {
-        "browserify>has>function-bind": true,
-        "depcheck>is-core-module>hasown": true,
-        "string.prototype.matchall>call-bind>es-errors": true,
-        "string.prototype.matchall>es-abstract>has-proto": true,
-        "string.prototype.matchall>has-symbols": true
+        "crypto": true
       }
     },
-    "string.prototype.matchall>internal-slot": {
-      "packages": {
-        "depcheck>is-core-module>hasown": true,
-        "string.prototype.matchall>call-bind>es-errors": true,
-        "string.prototype.matchall>side-channel": true
+    "@metamask/keyring-snap-client>uuid": {
+      "globals": {
+        "crypto": true
       }
     },
-    "string.prototype.matchall>regexp.prototype.flags": {
-      "packages": {
-        "string.prototype.matchall>call-bind": true,
-        "string.prototype.matchall>call-bind>es-errors": true,
-        "string.prototype.matchall>define-properties": true,
-        "string.prototype.matchall>regexp.prototype.flags>set-function-name": true
+    "eth-lattice-keyring>gridplus-sdk>uuid": {
+      "globals": {
+        "crypto": true
       }
     },
-    "string.prototype.matchall>regexp.prototype.flags>set-function-name": {
+    "web3-stream-provider>uuid": {
+      "globals": {
+        "crypto": true
+      }
+    },
+    "@metamask/snaps-utils>validate-npm-package-name": {
       "packages": {
-        "string.prototype.matchall>call-bind>es-errors": true,
-        "string.prototype.matchall>define-properties>define-data-property": true,
-        "string.prototype.matchall>es-abstract>function.prototype.name>functions-have-names": true,
-        "string.prototype.matchall>es-abstract>has-property-descriptors": true
+        "@metamask/snaps-utils>validate-npm-package-name>builtins": true
       }
     },
-    "string.prototype.matchall>side-channel": {
+    "react-markdown>vfile>vfile-message": {
       "packages": {
-        "string.prototype.matchall>call-bind": true,
-        "string.prototype.matchall>es-abstract>object-inspect": true,
-        "string.prototype.matchall>get-intrinsic": true
+        "react-markdown>vfile>unist-util-stringify-position": true
       }
     },
-    "terser>source-map-support>buffer-from": {
+    "react-markdown>vfile": {
       "packages": {
-        "browserify>buffer": true
+        "react-markdown>vfile>is-buffer": true,
+        "path-browserify": true,
+        "process": true,
+        "react-markdown>vfile>replace-ext": true,
+        "react-markdown>vfile>vfile-message": true
       }
     },
-    "uri-js": {
+    "browserify>vm-browserify": {
       "globals": {
-        "define": true
+        "document.body.appendChild": true,
+        "document.body.removeChild": true,
+        "document.createElement": true
       }
     },
-    "uuid": {
+    "react-popper>warning": {
       "globals": {
-        "crypto": true,
-        "msCrypto": true
+        "console": true
       }
     },
-    "wait-on>rxjs": {
+    "@ensdomains/content-hash>multihashes>web-encoding": {
       "globals": {
-        "cancelAnimationFrame": true,
-        "clearInterval": true,
-        "clearTimeout": true,
-        "performance": true,
-        "requestAnimationFrame": true,
-        "setInterval.apply": true,
-        "setTimeout.apply": true
+        "TextDecoder": true,
+        "TextEncoder": true
+      },
+      "packages": {
+        "browserify>util": true
       }
     },
     "web3": {
@@ -5390,14 +5367,14 @@
         "setTimeout": true
       },
       "packages": {
-        "browserify>util": true,
         "readable-stream": true,
+        "browserify>util": true,
         "web3-stream-provider>uuid": true
       }
     },
-    "web3-stream-provider>uuid": {
+    "@metamask/controllers>web3": {
       "globals": {
-        "crypto": true
+        "XMLHttpRequest": true
       }
     },
     "webextension-polyfill": {
@@ -5409,9 +5386,35 @@
         "define": true
       }
     },
-    "webpack>events": {
+    "@metamask/eth-token-tracker>deep-equal>which-boxed-primitive": {
+      "packages": {
+        "@metamask/eth-token-tracker>deep-equal>which-boxed-primitive>is-bigint": true,
+        "@metamask/eth-token-tracker>deep-equal>which-boxed-primitive>is-boolean-object": true,
+        "@metamask/eth-token-tracker>deep-equal>which-boxed-primitive>is-number-object": true,
+        "eslint-plugin-react>array-includes>is-string": true,
+        "string.prototype.matchall>es-abstract>es-to-primitive>is-symbol": true
+      }
+    },
+    "@metamask/eth-token-tracker>deep-equal>which-collection": {
+      "packages": {
+        "@metamask/eth-token-tracker>deep-equal>es-get-iterator>is-map": true,
+        "@metamask/eth-token-tracker>deep-equal>es-get-iterator>is-set": true,
+        "@metamask/eth-token-tracker>deep-equal>which-collection>is-weakmap": true,
+        "@metamask/eth-token-tracker>deep-equal>which-collection>is-weakset": true
+      }
+    },
+    "browserify>util>which-typed-array": {
+      "packages": {
+        "string.prototype.matchall>es-abstract>available-typed-arrays": true,
+        "string.prototype.matchall>call-bind": true,
+        "browserify>util>which-typed-array>for-each": true,
+        "string.prototype.matchall>es-abstract>gopd": true,
+        "koa>is-generator-function>has-tostringtag": true
+      }
+    },
+    "@metamask/ethjs>@metamask/ethjs-provider-http>xhr2": {
       "globals": {
-        "console": true
+        "XMLHttpRequest": true
       }
     }
   }
diff --git a/lavamoat/browserify/mmi/policy.json b/lavamoat/browserify/mmi/policy.json
index 8c76cb6df139..a2453b1686dc 100644
--- a/lavamoat/browserify/mmi/policy.json
+++ b/lavamoat/browserify/mmi/policy.json
@@ -5,144 +5,124 @@
         "regeneratorRuntime": "write"
       }
     },
-    "@ensdomains/content-hash": {
+    "eth-lattice-keyring>@ethereumjs/tx>@chainsafe/ssz>@chainsafe/persistent-merkle-tree": {
       "globals": {
-        "console.warn": true
+        "WeakRef": 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
+        "browserify": true
       }
     },
-    "@ensdomains/content-hash>cids": {
+    "eth-lattice-keyring>@ethereumjs/tx>@chainsafe/ssz": {
       "packages": {
-        "@ensdomains/content-hash>cids>multibase": true,
-        "@ensdomains/content-hash>cids>multihashes": true,
-        "@ensdomains/content-hash>cids>uint8arrays": true,
-        "@ensdomains/content-hash>multicodec": true
+        "eth-lattice-keyring>@ethereumjs/tx>@chainsafe/ssz>@chainsafe/persistent-merkle-tree": true,
+        "browserify": true,
+        "browserify>buffer": true,
+        "eth-lattice-keyring>@ethereumjs/tx>@chainsafe/ssz>case": true
       }
     },
-    "@ensdomains/content-hash>cids>multibase": {
+    "@metamask/notification-services-controller>@contentful/rich-text-html-renderer": {
       "globals": {
-        "TextDecoder": true,
-        "TextEncoder": true
+        "SuppressedError": true
+      }
+    },
+    "@ensdomains/content-hash": {
+      "globals": {
+        "console.warn": true
       },
       "packages": {
-        "@ensdomains/content-hash>cids>multibase>@multiformats/base-x": true
+        "browserify>buffer": true,
+        "@ensdomains/content-hash>cids": true,
+        "@ensdomains/content-hash>js-base64": true,
+        "@ensdomains/content-hash>multicodec": true,
+        "@ensdomains/content-hash>multihashes": true
       }
     },
-    "@ensdomains/content-hash>cids>multihashes": {
+    "@ethereumjs/tx>@ethereumjs/common": {
       "packages": {
-        "@ensdomains/content-hash>cids>multibase": true,
-        "@ensdomains/content-hash>cids>multihashes>varint": true,
-        "@ensdomains/content-hash>cids>uint8arrays": true
+        "@ethereumjs/tx>@ethereumjs/util": true,
+        "browserify>buffer": true,
+        "@ethereumjs/tx>@ethereumjs/common>crc-32": true,
+        "webpack>events": true
       }
     },
-    "@ensdomains/content-hash>cids>uint8arrays": {
-      "globals": {
-        "TextDecoder": true,
-        "TextEncoder": true
-      },
+    "@metamask/smart-transactions-controller>@ethereumjs/tx>@ethereumjs/common": {
       "packages": {
-        "@ensdomains/content-hash>cids>multibase": true
+        "@metamask/smart-transactions-controller>@ethereumjs/util": true,
+        "webpack>events": true
       }
     },
-    "@ensdomains/content-hash>js-base64": {
-      "globals": {
-        "Base64": "write",
-        "TextDecoder": true,
-        "TextEncoder": true,
-        "atob": true,
-        "btoa": true,
-        "define": true
-      },
+    "eth-lattice-keyring>gridplus-sdk>@ethereumjs/tx>@ethereumjs/common": {
       "packages": {
-        "browserify>buffer": true
+        "@ethereumjs/tx>@ethereumjs/util": true,
+        "browserify>buffer": true,
+        "@ethereumjs/tx>@ethereumjs/common>crc-32": true,
+        "webpack>events": true
       }
     },
-    "@ensdomains/content-hash>multicodec": {
+    "eth-lattice-keyring>gridplus-sdk>@ethereumjs/common": {
       "packages": {
-        "@ensdomains/content-hash>multicodec>uint8arrays": true,
-        "sass-embedded>varint": true
+        "@ethereumjs/tx>@ethereumjs/util": true,
+        "browserify>buffer": true,
+        "@ethereumjs/tx>@ethereumjs/common>crc-32": true,
+        "webpack>events": true
       }
     },
-    "@ensdomains/content-hash>multicodec>uint8arrays": {
+    "@ethereumjs/tx>@ethereumjs/rlp": {
       "globals": {
-        "Buffer": true,
-        "TextDecoder": true,
         "TextEncoder": true
-      },
-      "packages": {
-        "@ensdomains/content-hash>multicodec>uint8arrays>multiformats": true
       }
     },
-    "@ensdomains/content-hash>multicodec>uint8arrays>multiformats": {
+    "@metamask/smart-transactions-controller>@ethereumjs/tx>@ethereumjs/rlp": {
       "globals": {
-        "TextDecoder": true,
-        "TextEncoder": true,
-        "console.warn": true,
-        "crypto.subtle.digest": 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
+        "TextEncoder": true
       }
     },
-    "@ensdomains/content-hash>multihashes>multibase": {
-      "packages": {
-        "@ensdomains/content-hash>multihashes>multibase>base-x": true,
-        "@ensdomains/content-hash>multihashes>web-encoding": true,
-        "browserify>buffer": true
+    "@metamask/eth-ledger-bridge-keyring>@ethereumjs/rlp": {
+      "globals": {
+        "TextEncoder": true
       }
     },
-    "@ensdomains/content-hash>multihashes>multibase>base-x": {
+    "@ethereumjs/tx": {
       "packages": {
-        "koa>content-disposition>safe-buffer": true
+        "@ethereumjs/tx>@ethereumjs/common": true,
+        "@ethereumjs/tx>@ethereumjs/rlp": true,
+        "@ethereumjs/tx>@ethereumjs/util": true,
+        "browserify>buffer": true,
+        "@ethereumjs/tx>ethereum-cryptography": true,
+        "browserify>insert-module-globals>is-buffer": true
       }
     },
-    "@ensdomains/content-hash>multihashes>web-encoding": {
-      "globals": {
-        "TextDecoder": true,
-        "TextEncoder": true
-      },
+    "@metamask/smart-transactions-controller>@ethereumjs/tx": {
       "packages": {
-        "browserify>util": true
+        "@metamask/smart-transactions-controller>@ethereumjs/tx>@ethereumjs/common": true,
+        "@metamask/smart-transactions-controller>@ethereumjs/tx>@ethereumjs/rlp": true,
+        "@metamask/smart-transactions-controller>@ethereumjs/util": true,
+        "@ethereumjs/tx>ethereum-cryptography": true
       }
     },
-    "@ethereumjs/tx": {
+    "eth-lattice-keyring>@ethereumjs/tx": {
       "packages": {
+        "eth-lattice-keyring>@ethereumjs/tx>@chainsafe/ssz": true,
         "@ethereumjs/tx>@ethereumjs/common": true,
         "@ethereumjs/tx>@ethereumjs/rlp": true,
         "@ethereumjs/tx>@ethereumjs/util": true,
-        "@ethereumjs/tx>ethereum-cryptography": true,
+        "@ethersproject/providers": true,
         "browserify>buffer": true,
+        "eth-lattice-keyring>@ethereumjs/tx>ethereum-cryptography": true,
         "browserify>insert-module-globals>is-buffer": true
       }
     },
-    "@ethereumjs/tx>@ethereumjs/common": {
+    "eth-lattice-keyring>gridplus-sdk>@ethereumjs/tx": {
       "packages": {
-        "@ethereumjs/tx>@ethereumjs/common>crc-32": true,
+        "eth-lattice-keyring>@ethereumjs/tx>@chainsafe/ssz": true,
+        "eth-lattice-keyring>gridplus-sdk>@ethereumjs/tx>@ethereumjs/common": true,
+        "@ethereumjs/tx>@ethereumjs/rlp": true,
         "@ethereumjs/tx>@ethereumjs/util": true,
+        "@ethersproject/providers": true,
         "browserify>buffer": true,
-        "webpack>events": true
-      }
-    },
-    "@ethereumjs/tx>@ethereumjs/common>crc-32": {
-      "globals": {
-        "DO_NOT_EXPORT_CRC": true,
-        "define": true
-      }
-    },
-    "@ethereumjs/tx>@ethereumjs/rlp": {
-      "globals": {
-        "TextEncoder": true
+        "eth-lattice-keyring>gridplus-sdk>@ethereumjs/tx>ethereum-cryptography": true,
+        "browserify>insert-module-globals>is-buffer": true
       }
     },
     "@ethereumjs/tx>@ethereumjs/util": {
@@ -151,78 +131,83 @@
       },
       "packages": {
         "@ethereumjs/tx>@ethereumjs/rlp": true,
-        "@ethereumjs/tx>@ethereumjs/util>micro-ftch": true,
-        "@ethereumjs/tx>ethereum-cryptography": true,
         "browserify>buffer": true,
+        "@ethereumjs/tx>ethereum-cryptography": true,
+        "webpack>events": true,
         "browserify>insert-module-globals>is-buffer": true,
-        "webpack>events": true
+        "@ethereumjs/tx>@ethereumjs/util>micro-ftch": true
       }
     },
-    "@ethereumjs/tx>@ethereumjs/util>micro-ftch": {
+    "@metamask/smart-transactions-controller>@ethereumjs/util": {
       "globals": {
-        "Headers": true,
-        "TextDecoder": true,
-        "URL": true,
-        "btoa": true,
+        "console.warn": true,
         "fetch": true
       },
       "packages": {
-        "browserify>browserify-zlib": true,
-        "browserify>buffer": true,
-        "browserify>url": true,
-        "browserify>util": true,
-        "https-browserify": true,
-        "process": true,
-        "stream-http": true
+        "@metamask/smart-transactions-controller>@ethereumjs/tx>@ethereumjs/rlp": true,
+        "@ethereumjs/tx>ethereum-cryptography": true,
+        "webpack>events": true
       }
     },
-    "@ethereumjs/tx>ethereum-cryptography": {
+    "@ethersproject/abi": {
       "globals": {
-        "TextDecoder": true,
-        "crypto": true
+        "console.log": true
       },
       "packages": {
-        "@ethereumjs/tx>ethereum-cryptography>@noble/curves": true,
-        "@ethereumjs/tx>ethereum-cryptography>@scure/bip32": true,
-        "@noble/hashes": true
+        "ethers>@ethersproject/address": true,
+        "@ethersproject/bignumber": true,
+        "@ethersproject/bytes": true,
+        "ethers>@ethersproject/constants": true,
+        "@ethersproject/hash": true,
+        "ethers>@ethersproject/keccak256": true,
+        "ethers>@ethersproject/logger": true,
+        "ethers>@ethersproject/properties": true,
+        "ethers>@ethersproject/strings": true
       }
     },
-    "@ethereumjs/tx>ethereum-cryptography>@noble/curves": {
-      "globals": {
-        "TextEncoder": true
-      },
+    "ethers>@ethersproject/abstract-provider": {
       "packages": {
-        "@noble/hashes": true
+        "@ethersproject/bignumber": true,
+        "@ethersproject/bytes": true,
+        "ethers>@ethersproject/logger": true,
+        "ethers>@ethersproject/properties": true
       }
     },
-    "@ethereumjs/tx>ethereum-cryptography>@scure/bip32": {
+    "ethers>@ethersproject/abstract-signer": {
       "packages": {
-        "@ethereumjs/tx>ethereum-cryptography>@noble/curves": true,
-        "@metamask/utils>@scure/base": true,
-        "@noble/hashes": true
+        "ethers>@ethersproject/logger": true,
+        "ethers>@ethersproject/properties": true
       }
     },
-    "@ethersproject/abi": {
-      "globals": {
-        "console.log": true
-      },
+    "ethers>@ethersproject/address": {
       "packages": {
         "@ethersproject/bignumber": true,
         "@ethersproject/bytes": true,
-        "@ethersproject/hash": true,
-        "ethers>@ethersproject/address": true,
-        "ethers>@ethersproject/constants": true,
         "ethers>@ethersproject/keccak256": true,
         "ethers>@ethersproject/logger": true,
-        "ethers>@ethersproject/properties": true,
-        "ethers>@ethersproject/strings": true
+        "ethers>@ethersproject/rlp": true
+      }
+    },
+    "ethers>@ethersproject/base64": {
+      "globals": {
+        "atob": true,
+        "btoa": true
+      },
+      "packages": {
+        "@ethersproject/bytes": true
+      }
+    },
+    "ethers>@ethersproject/basex": {
+      "packages": {
+        "@ethersproject/bytes": true,
+        "ethers>@ethersproject/properties": true
       }
     },
     "@ethersproject/bignumber": {
       "packages": {
         "@ethersproject/bytes": true,
-        "bn.js": true,
-        "ethers>@ethersproject/logger": true
+        "ethers>@ethersproject/logger": true,
+        "bn.js": true
       }
     },
     "@ethersproject/bytes": {
@@ -230,17 +215,22 @@
         "ethers>@ethersproject/logger": true
       }
     },
+    "ethers>@ethersproject/constants": {
+      "packages": {
+        "@ethersproject/bignumber": true
+      }
+    },
     "@ethersproject/contracts": {
       "globals": {
         "setTimeout": true
       },
       "packages": {
         "@ethersproject/abi": true,
-        "@ethersproject/bignumber": true,
-        "@ethersproject/bytes": true,
         "ethers>@ethersproject/abstract-provider": true,
         "ethers>@ethersproject/abstract-signer": true,
         "ethers>@ethersproject/address": true,
+        "@ethersproject/bignumber": true,
+        "@ethersproject/bytes": true,
         "ethers>@ethersproject/logger": true,
         "ethers>@ethersproject/properties": true,
         "ethers>@ethersproject/transactions": true
@@ -248,10 +238,10 @@
     },
     "@ethersproject/hash": {
       "packages": {
-        "@ethersproject/bignumber": true,
-        "@ethersproject/bytes": true,
         "ethers>@ethersproject/address": true,
         "ethers>@ethersproject/base64": true,
+        "@ethersproject/bignumber": true,
+        "@ethersproject/bytes": true,
         "ethers>@ethersproject/keccak256": true,
         "ethers>@ethersproject/logger": true,
         "ethers>@ethersproject/properties": true,
@@ -260,9 +250,9 @@
     },
     "@ethersproject/hdnode": {
       "packages": {
+        "ethers>@ethersproject/basex": true,
         "@ethersproject/bignumber": true,
         "@ethersproject/bytes": true,
-        "ethers>@ethersproject/basex": true,
         "ethers>@ethersproject/logger": true,
         "ethers>@ethersproject/pbkdf2": true,
         "ethers>@ethersproject/properties": true,
@@ -273,918 +263,967 @@
         "ethers>@ethersproject/wordlists": true
       }
     },
-    "@ethersproject/providers": {
-      "globals": {
-        "WebSocket": true,
-        "clearInterval": true,
-        "clearTimeout": true,
-        "console.log": true,
-        "console.warn": true,
-        "setInterval": true,
-        "setTimeout": true
-      },
+    "ethers>@ethersproject/json-wallets": {
       "packages": {
-        "@ethersproject/bignumber": true,
+        "ethers>@ethersproject/address": true,
         "@ethersproject/bytes": true,
-        "@ethersproject/hash": true,
-        "@ethersproject/providers>@ethersproject/web": true,
-        "@ethersproject/providers>bech32": true,
-        "@metamask/test-bundler>@ethersproject/networks": true,
-        "ethers>@ethersproject/abstract-provider": true,
-        "ethers>@ethersproject/abstract-signer": true,
-        "ethers>@ethersproject/address": true,
-        "ethers>@ethersproject/base64": true,
-        "ethers>@ethersproject/basex": true,
-        "ethers>@ethersproject/constants": true,
+        "@ethersproject/hdnode": true,
+        "ethers>@ethersproject/keccak256": true,
         "ethers>@ethersproject/logger": true,
+        "ethers>@ethersproject/pbkdf2": true,
         "ethers>@ethersproject/properties": true,
         "ethers>@ethersproject/random": true,
-        "ethers>@ethersproject/sha2": true,
         "ethers>@ethersproject/strings": true,
-        "ethers>@ethersproject/transactions": true
-      }
-    },
-    "@ethersproject/providers>@ethersproject/random": {
-      "globals": {
-        "crypto.getRandomValues": true
-      }
-    },
-    "@ethersproject/providers>@ethersproject/web": {
-      "globals": {
-        "clearTimeout": true,
-        "fetch": true,
-        "setTimeout": true
-      },
-      "packages": {
-        "@ethersproject/bytes": true,
-        "ethers>@ethersproject/base64": true,
-        "ethers>@ethersproject/logger": true,
-        "ethers>@ethersproject/properties": true,
-        "ethers>@ethersproject/strings": true
+        "ethers>@ethersproject/transactions": true,
+        "ethers>@ethersproject/json-wallets>aes-js": true,
+        "ethers>@ethersproject/json-wallets>scrypt-js": true
       }
     },
-    "@ethersproject/wallet": {
+    "ethers>@ethersproject/keccak256": {
       "packages": {
         "@ethersproject/bytes": true,
-        "@ethersproject/hash": true,
-        "@ethersproject/hdnode": true,
-        "ethers>@ethersproject/abstract-provider": true,
-        "ethers>@ethersproject/abstract-signer": true,
-        "ethers>@ethersproject/address": true,
-        "ethers>@ethersproject/json-wallets": true,
-        "ethers>@ethersproject/keccak256": true,
-        "ethers>@ethersproject/logger": true,
-        "ethers>@ethersproject/properties": true,
-        "ethers>@ethersproject/random": true,
-        "ethers>@ethersproject/signing-key": true,
-        "ethers>@ethersproject/transactions": true
+        "@metamask/ethjs>js-sha3": true
       }
     },
-    "@keystonehq/bc-ur-registry-eth": {
-      "packages": {
-        "@ethereumjs/tx>@ethereumjs/util": true,
-        "@keystonehq/bc-ur-registry-eth>@keystonehq/bc-ur-registry": true,
-        "@metamask/eth-trezor-keyring>hdkey": true,
-        "browserify>buffer": true,
-        "uuid": true
+    "ethers>@ethersproject/logger": {
+      "globals": {
+        "console": true
       }
     },
-    "@keystonehq/bc-ur-registry-eth>@keystonehq/bc-ur-registry": {
-      "globals": {
-        "define": true
-      },
+    "ethers>@ethersproject/providers>@ethersproject/networks": {
       "packages": {
-        "@ngraveio/bc-ur": true,
-        "@swc/helpers>tslib": true,
-        "browserify>buffer": true,
-        "buffer": true,
-        "ethereumjs-util>ethereum-cryptography>bs58check": true
+        "ethers>@ethersproject/logger": true
       }
     },
-    "@keystonehq/metamask-airgapped-keyring": {
+    "@metamask/test-bundler>@ethersproject/networks": {
       "packages": {
-        "@ethereumjs/tx": true,
-        "@keystonehq/bc-ur-registry-eth": true,
-        "@keystonehq/metamask-airgapped-keyring>@keystonehq/base-eth-keyring": true,
-        "@keystonehq/metamask-airgapped-keyring>rlp": true,
-        "@metamask/obs-store": true,
-        "browserify>buffer": true,
-        "uuid": true,
-        "webpack>events": true
+        "ethers>@ethersproject/logger": true
       }
     },
-    "@keystonehq/metamask-airgapped-keyring>@keystonehq/base-eth-keyring": {
+    "ethers>@ethersproject/pbkdf2": {
       "packages": {
-        "@ethereumjs/tx": true,
-        "@ethereumjs/tx>@ethereumjs/util": true,
-        "@keystonehq/bc-ur-registry-eth": true,
-        "@metamask/eth-trezor-keyring>hdkey": true,
-        "browserify>buffer": true,
-        "eth-lattice-keyring>rlp": true,
-        "uuid": true
+        "@ethersproject/bytes": true,
+        "ethers>@ethersproject/sha2": true
       }
     },
-    "@keystonehq/metamask-airgapped-keyring>rlp": {
+    "ethers>@ethersproject/properties": {
       "packages": {
-        "bn.js": true,
-        "browserify>buffer": true
+        "ethers>@ethersproject/logger": true
       }
     },
-    "@lavamoat/lavadome-react": {
+    "@ethersproject/providers": {
       "globals": {
-        "Document.prototype": true,
-        "DocumentFragment.prototype": true,
-        "Element.prototype": true,
-        "Node.prototype": true,
+        "WebSocket": true,
+        "clearInterval": true,
+        "clearTimeout": true,
+        "console.log": true,
         "console.warn": true,
-        "document": true
+        "setInterval": true,
+        "setTimeout": true
       },
       "packages": {
-        "react": true
+        "ethers>@ethersproject/abstract-provider": true,
+        "ethers>@ethersproject/abstract-signer": true,
+        "ethers>@ethersproject/address": true,
+        "ethers>@ethersproject/base64": true,
+        "ethers>@ethersproject/basex": true,
+        "@ethersproject/bignumber": true,
+        "@ethersproject/bytes": true,
+        "ethers>@ethersproject/constants": true,
+        "@ethersproject/hash": true,
+        "ethers>@ethersproject/logger": true,
+        "@metamask/test-bundler>@ethersproject/networks": true,
+        "ethers>@ethersproject/properties": true,
+        "ethers>@ethersproject/random": true,
+        "ethers>@ethersproject/sha2": true,
+        "ethers>@ethersproject/strings": true,
+        "ethers>@ethersproject/transactions": true,
+        "@ethersproject/providers>@ethersproject/web": true,
+        "@ethersproject/providers>bech32": true
       }
     },
-    "@material-ui/core": {
+    "ethers>@ethersproject/providers": {
       "globals": {
-        "Image": true,
-        "_formatMuiErrorMessage": true,
-        "addEventListener": true,
+        "WebSocket": true,
         "clearInterval": true,
         "clearTimeout": true,
-        "console.error": true,
+        "console.log": 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
+        "ethers>@ethersproject/abstract-provider": true,
+        "ethers>@ethersproject/abstract-signer": true,
+        "ethers>@ethersproject/address": true,
+        "ethers>@ethersproject/base64": true,
+        "ethers>@ethersproject/basex": true,
+        "@ethersproject/bignumber": true,
+        "@ethersproject/bytes": true,
+        "ethers>@ethersproject/constants": true,
+        "@ethersproject/hash": true,
+        "ethers>@ethersproject/logger": true,
+        "ethers>@ethersproject/providers>@ethersproject/networks": true,
+        "ethers>@ethersproject/properties": true,
+        "ethers>@ethersproject/random": true,
+        "ethers>@ethersproject/sha2": true,
+        "ethers>@ethersproject/strings": true,
+        "ethers>@ethersproject/transactions": true,
+        "ethers>@ethersproject/providers>@ethersproject/web": true,
+        "ethers>@ethersproject/providers>bech32": true
       }
     },
-    "@material-ui/core>@material-ui/styles": {
+    "@ethersproject/providers>@ethersproject/random": {
       "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
+        "crypto.getRandomValues": true
       }
     },
-    "@material-ui/core>@material-ui/styles>jss": {
-      "globals": {
-        "CSS": true,
-        "document.createElement": true,
-        "document.querySelector": true
-      },
+    "ethers>@ethersproject/random": {
       "packages": {
-        "@babel/runtime": true,
-        "@material-ui/core>@material-ui/styles>jss>is-in-browser": true,
-        "react-router-dom>tiny-warning": true
+        "@ethersproject/bytes": true,
+        "ethers>@ethersproject/logger": true
       }
     },
-    "@material-ui/core>@material-ui/styles>jss-plugin-camel-case": {
+    "ethers>@ethersproject/rlp": {
       "packages": {
-        "@material-ui/core>@material-ui/styles>jss-plugin-camel-case>hyphenate-style-name": true
+        "@ethersproject/bytes": true,
+        "ethers>@ethersproject/logger": true
       }
     },
-    "@material-ui/core>@material-ui/styles>jss-plugin-default-unit": {
-      "globals": {
-        "CSS": true
-      },
+    "ethers>@ethersproject/sha2": {
       "packages": {
-        "@material-ui/core>@material-ui/styles>jss": true
+        "@ethersproject/bytes": true,
+        "ethers>@ethersproject/logger": true,
+        "ethers>@ethersproject/sha2>hash.js": true
       }
     },
-    "@material-ui/core>@material-ui/styles>jss-plugin-global": {
+    "ethers>@ethersproject/signing-key": {
       "packages": {
-        "@babel/runtime": true,
-        "@material-ui/core>@material-ui/styles>jss": true
+        "@ethersproject/bytes": true,
+        "ethers>@ethersproject/logger": true,
+        "ethers>@ethersproject/properties": true,
+        "ethers>@ethersproject/signing-key>elliptic": true
       }
     },
-    "@material-ui/core>@material-ui/styles>jss-plugin-nested": {
+    "ethers>@ethersproject/solidity": {
       "packages": {
-        "@babel/runtime": true,
-        "react-router-dom>tiny-warning": true
+        "@ethersproject/bignumber": true,
+        "@ethersproject/bytes": true,
+        "ethers>@ethersproject/keccak256": true,
+        "ethers>@ethersproject/logger": true,
+        "ethers>@ethersproject/sha2": true,
+        "ethers>@ethersproject/strings": true
       }
     },
-    "@material-ui/core>@material-ui/styles>jss-plugin-rule-value-function": {
+    "ethers>@ethersproject/strings": {
       "packages": {
-        "@material-ui/core>@material-ui/styles>jss": true,
-        "react-router-dom>tiny-warning": true
+        "@ethersproject/bytes": true,
+        "ethers>@ethersproject/constants": true,
+        "ethers>@ethersproject/logger": true
       }
     },
-    "@material-ui/core>@material-ui/styles>jss-plugin-vendor-prefixer": {
+    "ethers>@ethersproject/transactions": {
       "packages": {
-        "@material-ui/core>@material-ui/styles>jss": true,
-        "@material-ui/core>@material-ui/styles>jss-plugin-vendor-prefixer>css-vendor": true
+        "ethers>@ethersproject/address": true,
+        "@ethersproject/bignumber": true,
+        "@ethersproject/bytes": true,
+        "ethers>@ethersproject/constants": true,
+        "ethers>@ethersproject/keccak256": true,
+        "ethers>@ethersproject/logger": true,
+        "ethers>@ethersproject/properties": true,
+        "ethers>@ethersproject/rlp": true,
+        "ethers>@ethersproject/signing-key": true
       }
     },
-    "@material-ui/core>@material-ui/styles>jss-plugin-vendor-prefixer>css-vendor": {
-      "globals": {
-        "document.createElement": true,
-        "document.documentElement": true,
-        "getComputedStyle": true
-      },
+    "ethers>@ethersproject/units": {
       "packages": {
-        "@babel/runtime": true,
-        "@material-ui/core>@material-ui/styles>jss>is-in-browser": true
+        "@ethersproject/bignumber": true,
+        "ethers>@ethersproject/logger": true
       }
     },
-    "@material-ui/core>@material-ui/styles>jss>is-in-browser": {
-      "globals": {
-        "document": true
+    "@ethersproject/wallet": {
+      "packages": {
+        "ethers>@ethersproject/abstract-provider": true,
+        "ethers>@ethersproject/abstract-signer": true,
+        "ethers>@ethersproject/address": true,
+        "@ethersproject/bytes": true,
+        "@ethersproject/hash": true,
+        "@ethersproject/hdnode": true,
+        "ethers>@ethersproject/json-wallets": true,
+        "ethers>@ethersproject/keccak256": true,
+        "ethers>@ethersproject/logger": true,
+        "ethers>@ethersproject/properties": true,
+        "ethers>@ethersproject/random": true,
+        "ethers>@ethersproject/signing-key": true,
+        "ethers>@ethersproject/transactions": true
       }
     },
-    "@material-ui/core>@material-ui/system": {
+    "@ethersproject/providers>@ethersproject/web": {
       "globals": {
-        "console.error": true
+        "clearTimeout": true,
+        "fetch": true,
+        "setTimeout": 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
+        "ethers>@ethersproject/base64": true,
+        "@ethersproject/bytes": true,
+        "ethers>@ethersproject/logger": true,
+        "ethers>@ethersproject/properties": true,
+        "ethers>@ethersproject/strings": true
       }
     },
-    "@material-ui/core>popper.js": {
+    "ethers>@ethersproject/providers>@ethersproject/web": {
       "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,
+        "clearTimeout": true,
+        "fetch": true,
         "setTimeout": true
+      },
+      "packages": {
+        "ethers>@ethersproject/base64": true,
+        "@ethersproject/bytes": true,
+        "ethers>@ethersproject/logger": true,
+        "ethers>@ethersproject/properties": true,
+        "ethers>@ethersproject/strings": true
       }
     },
-    "@material-ui/core>react-transition-group": {
+    "ethers>@ethersproject/web": {
       "globals": {
-        "Element": true,
+        "clearTimeout": true,
+        "fetch": 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
+        "ethers>@ethersproject/base64": true,
+        "@ethersproject/bytes": true,
+        "ethers>@ethersproject/logger": true,
+        "ethers>@ethersproject/properties": true,
+        "ethers>@ethersproject/strings": true
       }
     },
-    "@metamask-institutional/custody-controller": {
+    "ethers>@ethersproject/wordlists": {
       "packages": {
-        "@ethereumjs/tx>@ethereumjs/util": true,
-        "@metamask-institutional/custody-keyring": true,
-        "@metamask/obs-store": true
+        "@ethersproject/bytes": true,
+        "@ethersproject/hash": true,
+        "ethers>@ethersproject/logger": true,
+        "ethers>@ethersproject/properties": true,
+        "ethers>@ethersproject/strings": true
       }
     },
-    "@metamask-institutional/custody-keyring": {
+    "@metamask/notification-services-controller>firebase>@firebase/app": {
       "globals": {
-        "console.error": true,
-        "console.log": true,
+        "FinalizationRegistry": true,
         "console.warn": true
       },
       "packages": {
-        "@ethereumjs/tx>@ethereumjs/util": true,
-        "@metamask-institutional/custody-keyring>@metamask-institutional/configuration-client": true,
-        "@metamask-institutional/sdk": true,
-        "@metamask-institutional/types": true,
-        "@metamask/obs-store": true,
-        "crypto-browserify": true,
-        "gulp-sass>lodash.clonedeep": true,
-        "webpack>events": true
-      }
-    },
-    "@metamask-institutional/custody-keyring>@metamask-institutional/configuration-client": {
-      "globals": {
-        "console.log": true,
-        "fetch": true
-      }
-    },
-    "@metamask-institutional/extension": {
-      "globals": {
-        "console.log": true
-      },
-      "packages": {
-        "@metamask-institutional/custody-controller": true,
-        "@metamask-institutional/sdk": true,
-        "@metamask-institutional/types": true,
-        "gulp-sass>lodash.clonedeep": true
+        "@metamask/notification-services-controller>firebase>@firebase/app>@firebase/component": true,
+        "@metamask/notification-services-controller>firebase>@firebase/app>@firebase/logger": true,
+        "@metamask/notification-services-controller>firebase>@firebase/util": true,
+        "@metamask/notification-services-controller>firebase>@firebase/app>idb": true
       }
     },
-    "@metamask-institutional/institutional-features": {
+    "@metamask/notification-services-controller>firebase>@firebase/app>@firebase/component": {
       "packages": {
-        "@metamask-institutional/custody-keyring": true,
-        "@metamask/obs-store": true
-      }
-    },
-    "@metamask-institutional/rpc-allowlist": {
-      "globals": {
-        "URL": true
+        "@metamask/notification-services-controller>firebase>@firebase/util": true
       }
     },
-    "@metamask-institutional/sdk": {
+    "@metamask/notification-services-controller>firebase>@firebase/installations": {
       "globals": {
-        "URLSearchParams": true,
-        "console.debug": true,
+        "BroadcastChannel": true,
+        "Headers": true,
+        "btoa": true,
         "console.error": true,
-        "console.log": true,
-        "fetch": true
+        "crypto": true,
+        "fetch": true,
+        "msCrypto": true,
+        "navigator.onLine": true,
+        "setTimeout": true
       },
       "packages": {
-        "@metamask-institutional/sdk>@metamask-institutional/simplecache": true,
-        "crypto-browserify": true,
-        "webpack>events": true
+        "@metamask/notification-services-controller>firebase>@firebase/app": true,
+        "@metamask/notification-services-controller>firebase>@firebase/app>@firebase/component": true,
+        "@metamask/notification-services-controller>firebase>@firebase/util": true,
+        "@metamask/notification-services-controller>firebase>@firebase/app>idb": true
       }
     },
-    "@metamask-institutional/transaction-update": {
+    "@metamask/notification-services-controller>firebase>@firebase/app>@firebase/logger": {
       "globals": {
-        "clearInterval": true,
-        "console.info": true,
-        "console.log": true,
-        "setInterval": true
+        "console": true
       },
       "packages": {
-        "@ethereumjs/tx>@ethereumjs/util": true,
-        "@metamask-institutional/sdk": true,
-        "@metamask-institutional/transaction-update>@metamask-institutional/websocket-client": true,
-        "@metamask/obs-store": true,
-        "webpack>events": true
+        "@swc/helpers>tslib": true
       }
     },
-    "@metamask-institutional/transaction-update>@metamask-institutional/websocket-client": {
+    "@metamask/notification-services-controller>firebase>@firebase/messaging": {
       "globals": {
-        "WebSocket": true,
-        "clearTimeout": true,
-        "console.log": true,
+        "Headers": true,
+        "Notification.maxActions": true,
+        "Notification.permission": true,
+        "Notification.requestPermission": true,
+        "PushSubscription.prototype.hasOwnProperty": true,
+        "ServiceWorkerRegistration": true,
+        "URL": true,
+        "addEventListener": true,
+        "atob": true,
+        "btoa": true,
+        "clients.matchAll": true,
+        "clients.openWindow": true,
+        "console.warn": true,
+        "document": true,
+        "fetch": true,
+        "indexedDB": true,
+        "location.href": true,
+        "location.origin": true,
+        "navigator": true,
+        "origin.replace": true,
+        "registration.showNotification": true,
         "setTimeout": true
       },
       "packages": {
-        "webpack>events": true
+        "@metamask/notification-services-controller>firebase>@firebase/app": true,
+        "@metamask/notification-services-controller>firebase>@firebase/app>@firebase/component": true,
+        "@metamask/notification-services-controller>firebase>@firebase/installations": true,
+        "@metamask/notification-services-controller>firebase>@firebase/util": true,
+        "@metamask/notification-services-controller>firebase>@firebase/app>idb": true,
+        "@swc/helpers>tslib": true
       }
     },
-    "@metamask/abi-utils": {
+    "@metamask/notification-services-controller>firebase>@firebase/util": {
+      "globals": {
+        "atob": true,
+        "browser": true,
+        "btoa": true,
+        "chrome": true,
+        "console": true,
+        "document": true,
+        "indexedDB": true,
+        "navigator": true,
+        "process": true,
+        "self": true,
+        "setTimeout": true
+      },
       "packages": {
-        "@metamask/abi-utils>@metamask/utils": true,
-        "@metamask/utils>@metamask/superstruct": true
+        "process": true
       }
     },
-    "@metamask/abi-utils>@metamask/utils": {
-      "globals": {
-        "TextDecoder": true,
-        "TextEncoder": true
-      },
+    "@keystonehq/metamask-airgapped-keyring>@keystonehq/base-eth-keyring": {
       "packages": {
-        "@metamask/utils>@metamask/superstruct": true,
-        "@metamask/utils>@scure/base": true,
-        "@metamask/utils>pony-cause": true,
-        "@noble/hashes": true,
+        "@ethereumjs/tx": true,
+        "@ethereumjs/tx>@ethereumjs/util": true,
+        "@keystonehq/bc-ur-registry-eth": true,
         "browserify>buffer": true,
-        "nock>debug": true,
-        "semver": true
+        "@metamask/eth-trezor-keyring>hdkey": true,
+        "eth-lattice-keyring>rlp": true,
+        "uuid": true
       }
     },
-    "@metamask/accounts-controller": {
+    "@keystonehq/bc-ur-registry-eth": {
       "packages": {
         "@ethereumjs/tx>@ethereumjs/util": true,
-        "@ethereumjs/tx>ethereum-cryptography": true,
-        "@metamask/base-controller": true,
-        "@metamask/eth-snap-keyring": true,
-        "@metamask/keyring-api": true,
-        "@metamask/keyring-controller": true,
-        "@metamask/utils": true,
+        "@keystonehq/bc-ur-registry-eth>@keystonehq/bc-ur-registry": true,
+        "browserify>buffer": true,
+        "@metamask/eth-trezor-keyring>hdkey": true,
         "uuid": true
       }
     },
-    "@metamask/address-book-controller": {
+    "@keystonehq/bc-ur-registry-eth>@keystonehq/bc-ur-registry": {
+      "globals": {
+        "define": true
+      },
       "packages": {
-        "@metamask/base-controller": true,
-        "@metamask/controller-utils": true
+        "@ngraveio/bc-ur": true,
+        "ethereumjs-util>ethereum-cryptography>bs58check": true,
+        "buffer": true,
+        "browserify>buffer": true,
+        "@swc/helpers>tslib": true
       }
     },
-    "@metamask/announcement-controller": {
+    "@keystonehq/metamask-airgapped-keyring": {
       "packages": {
-        "@metamask/announcement-controller>@metamask/base-controller": true
+        "@ethereumjs/tx": true,
+        "@keystonehq/metamask-airgapped-keyring>@keystonehq/base-eth-keyring": true,
+        "@keystonehq/bc-ur-registry-eth": true,
+        "@metamask/obs-store": true,
+        "browserify>buffer": true,
+        "webpack>events": true,
+        "@keystonehq/metamask-airgapped-keyring>rlp": true,
+        "uuid": true
       }
     },
-    "@metamask/announcement-controller>@metamask/base-controller": {
+    "chart.js>@kurkle/color": {
       "globals": {
-        "setTimeout": true
+        "define": true
+      }
+    },
+    "@lavamoat/lavadome-react": {
+      "globals": {
+        "Document.prototype": true,
+        "DocumentFragment.prototype": true,
+        "Element.prototype": true,
+        "Node.prototype": true,
+        "console.warn": true,
+        "document": true
       },
       "packages": {
-        "immer": true
+        "react": true
       }
     },
-    "@metamask/approval-controller": {
+    "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth>@ledgerhq/domain-service": {
+      "packages": {
+        "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth>@ledgerhq/logs": true,
+        "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth>@ledgerhq/domain-service>axios": true
+      }
+    },
+    "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth>@ledgerhq/errors": {
       "globals": {
-        "console.info": true
+        "console.warn": true
+      }
+    },
+    "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth>@ledgerhq/evm-tools": {
+      "packages": {
+        "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth>@ledgerhq/cryptoassets-evm-signatures": true,
+        "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth>@ledgerhq/evm-tools>@ledgerhq/live-env": true,
+        "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth>@ledgerhq/evm-tools>axios": true,
+        "@metamask/ppom-validator>crypto-js": true,
+        "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth>@ledgerhq/evm-tools>ethers": true
+      }
+    },
+    "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth": {
+      "globals": {
+        "console.warn": true
       },
       "packages": {
-        "@metamask/base-controller": true,
-        "@metamask/rpc-errors": true,
-        "nanoid": true
+        "@ethersproject/abi": true,
+        "ethers>@ethersproject/rlp": true,
+        "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth>@ledgerhq/cryptoassets-evm-signatures": true,
+        "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth>@ledgerhq/domain-service": true,
+        "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth>@ledgerhq/errors": true,
+        "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth>@ledgerhq/evm-tools": true,
+        "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth>@ledgerhq/logs": true,
+        "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth>axios": true,
+        "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth>bignumber.js": true,
+        "browserify>buffer": true,
+        "semver": true
       }
     },
-    "@metamask/approval-controller>nanoid": {
+    "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth>@ledgerhq/evm-tools>@ledgerhq/live-env": {
       "globals": {
-        "crypto.getRandomValues": true
+        "console.warn": true
+      },
+      "packages": {
+        "wait-on>rxjs": true
       }
     },
-    "@metamask/assets-controllers": {
+    "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth>@ledgerhq/logs": {
       "globals": {
-        "AbortController": true,
-        "Headers": true,
-        "URL": true,
-        "URLSearchParams": true,
+        "__ledgerLogsListen": "write",
+        "console.error": true
+      }
+    },
+    "@material-ui/core": {
+      "globals": {
+        "Image": true,
+        "_formatMuiErrorMessage": true,
+        "addEventListener": true,
         "clearInterval": true,
         "clearTimeout": true,
         "console.error": true,
-        "console.log": 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": {
-        "@ensdomains/content-hash>multicodec>uint8arrays>multiformats": true,
-        "@ethereumjs/tx>@ethereumjs/util": true,
-        "@ethersproject/bignumber": true,
-        "@ethersproject/contracts": true,
-        "@ethersproject/providers": true,
-        "@metamask/abi-utils": true,
-        "@metamask/base-controller": true,
-        "@metamask/contract-metadata": true,
-        "@metamask/controller-utils": true,
-        "@metamask/eth-query": true,
-        "@metamask/metamask-eth-abis": true,
-        "@metamask/name-controller>async-mutex": true,
-        "@metamask/polling-controller": true,
-        "@metamask/rpc-errors": true,
-        "@metamask/utils": true,
-        "bn.js": true,
-        "cockatiel": true,
-        "ethers>@ethersproject/address": true,
-        "lodash": true,
-        "single-call-balance-checker-abi": true,
-        "uuid": true
+        "@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,
+        "react-redux>hoist-non-react-statics": true,
+        "@material-ui/core>popper.js": true,
+        "prop-types": true,
+        "react": true,
+        "react-dom": true,
+        "prop-types>react-is": true,
+        "@material-ui/core>react-transition-group": true
       }
     },
-    "@metamask/base-controller": {
+    "@material-ui/core>@material-ui/styles": {
       "globals": {
-        "setTimeout": true
+        "console.error": true,
+        "console.warn": true,
+        "document.createComment": true,
+        "document.head": true
       },
       "packages": {
-        "immer": true
+        "@babel/runtime": true,
+        "@material-ui/core>@material-ui/utils": true,
+        "@material-ui/core>clsx": true,
+        "react-redux>hoist-non-react-statics": 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/styles>jss": true,
+        "prop-types": true,
+        "react": true
       }
     },
-    "@metamask/browser-passworder": {
+    "@material-ui/core>@material-ui/system": {
       "globals": {
-        "CryptoKey": true,
-        "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
+        "console.error": true
       },
       "packages": {
-        "@metamask/browser-passworder>@metamask/utils": true,
-        "browserify>buffer": true
+        "@babel/runtime": true,
+        "@material-ui/core>@material-ui/utils": true,
+        "prop-types": true
       }
     },
-    "@metamask/browser-passworder>@metamask/utils": {
+    "@material-ui/core>@material-ui/utils": {
+      "packages": {
+        "@babel/runtime": true,
+        "prop-types": true,
+        "prop-types>react-is": true
+      }
+    },
+    "@metamask-institutional/custody-keyring>@metamask-institutional/configuration-client": {
       "globals": {
-        "TextDecoder": true,
-        "TextEncoder": true
-      },
+        "console.log": true,
+        "fetch": true
+      }
+    },
+    "@metamask-institutional/custody-controller": {
       "packages": {
-        "@metamask/utils>@metamask/superstruct": true,
-        "@metamask/utils>@scure/base": true,
-        "@metamask/utils>pony-cause": true,
-        "@noble/hashes": true,
-        "browserify>buffer": true,
-        "nock>debug": true,
-        "semver": true
+        "@ethereumjs/tx>@ethereumjs/util": true,
+        "@metamask-institutional/custody-keyring": true,
+        "@metamask/obs-store": true
       }
     },
-    "@metamask/controller-utils": {
+    "@metamask-institutional/custody-keyring": {
       "globals": {
-        "URL": true,
         "console.error": true,
-        "fetch": true,
-        "setTimeout": true
+        "console.log": true,
+        "console.warn": true
       },
       "packages": {
         "@ethereumjs/tx>@ethereumjs/util": true,
-        "@metamask/controller-utils>@spruceid/siwe-parser": true,
-        "@metamask/ethjs>@metamask/ethjs-unit": true,
-        "@metamask/utils": true,
-        "bn.js": true,
-        "browserify>buffer": true,
-        "eslint>fast-deep-equal": true,
-        "eth-ens-namehash": true
+        "@metamask-institutional/custody-keyring>@metamask-institutional/configuration-client": true,
+        "@metamask-institutional/sdk": true,
+        "@metamask-institutional/types": true,
+        "@metamask/obs-store": true,
+        "crypto-browserify": true,
+        "webpack>events": true,
+        "gulp-sass>lodash.clonedeep": true
       }
     },
-    "@metamask/controller-utils>@spruceid/siwe-parser": {
+    "@metamask-institutional/extension": {
       "globals": {
-        "console.error": true,
         "console.log": true
       },
       "packages": {
-        "@metamask/controller-utils>@spruceid/siwe-parser>apg-js": true,
-        "@noble/hashes": true
+        "@metamask-institutional/custody-controller": true,
+        "@metamask-institutional/sdk": true,
+        "@metamask-institutional/types": true,
+        "gulp-sass>lodash.clonedeep": true
       }
     },
-    "@metamask/controller-utils>@spruceid/siwe-parser>apg-js": {
+    "@metamask-institutional/institutional-features": {
       "packages": {
-        "browserify>buffer": true
+        "@metamask-institutional/custody-keyring": true,
+        "@metamask/obs-store": true
       }
     },
-    "@metamask/controllers>web3": {
+    "@metamask-institutional/rpc-allowlist": {
       "globals": {
-        "XMLHttpRequest": true
+        "URL": true
       }
     },
-    "@metamask/controllers>web3-provider-engine>cross-fetch>node-fetch": {
+    "@metamask-institutional/sdk": {
       "globals": {
+        "URLSearchParams": true,
+        "console.debug": true,
+        "console.error": true,
+        "console.log": true,
         "fetch": true
+      },
+      "packages": {
+        "@metamask-institutional/sdk>@metamask-institutional/simplecache": true,
+        "crypto-browserify": true,
+        "webpack>events": true
       }
     },
-    "@metamask/controllers>web3-provider-engine>eth-json-rpc-middleware>node-fetch": {
+    "@metamask-institutional/transaction-update": {
       "globals": {
-        "fetch": true
-      }
-    },
-    "@metamask/ens-controller": {
-      "packages": {
-        "@ethersproject/providers": true,
-        "@metamask/base-controller": true,
-        "@metamask/controller-utils": true,
-        "@metamask/utils": true,
-        "punycode": true
-      }
-    },
-    "@metamask/eth-json-rpc-filters": {
-      "globals": {
-        "console.error": true
+        "clearInterval": true,
+        "console.info": true,
+        "console.log": true,
+        "setInterval": true
       },
       "packages": {
-        "@metamask/eth-query": true,
-        "@metamask/json-rpc-engine": true,
-        "@metamask/name-controller>async-mutex": true,
-        "@metamask/safe-event-emitter": true,
-        "pify": true
+        "@ethereumjs/tx>@ethereumjs/util": true,
+        "@metamask-institutional/sdk": true,
+        "@metamask-institutional/transaction-update>@metamask-institutional/websocket-client": true,
+        "@metamask/obs-store": true,
+        "webpack>events": true
       }
     },
-    "@metamask/eth-json-rpc-middleware": {
+    "@metamask-institutional/transaction-update>@metamask-institutional/websocket-client": {
       "globals": {
-        "URL": true,
-        "console.error": true,
+        "WebSocket": true,
+        "clearTimeout": true,
+        "console.log": true,
         "setTimeout": true
       },
       "packages": {
-        "@metamask/eth-json-rpc-middleware>@metamask/utils": true,
-        "@metamask/eth-json-rpc-middleware>klona": true,
-        "@metamask/eth-json-rpc-middleware>safe-stable-stringify": true,
-        "@metamask/eth-sig-util": true,
-        "@metamask/json-rpc-engine": true,
-        "@metamask/rpc-errors": true
+        "webpack>events": true
       }
     },
-    "@metamask/eth-json-rpc-middleware>@metamask/utils": {
-      "globals": {
-        "TextDecoder": true,
-        "TextEncoder": true
-      },
+    "@metamask/abi-utils": {
       "packages": {
         "@metamask/utils>@metamask/superstruct": true,
-        "@metamask/utils>@scure/base": true,
-        "@metamask/utils>pony-cause": true,
-        "@noble/hashes": true,
-        "browserify>buffer": true,
-        "nock>debug": true,
-        "semver": true
+        "@metamask/abi-utils>@metamask/utils": true
       }
     },
-    "@metamask/eth-json-rpc-provider": {
+    "@metamask/accounts-controller": {
       "packages": {
-        "@metamask/json-rpc-engine": true,
-        "@metamask/rpc-errors": true,
-        "@metamask/safe-event-emitter": true,
+        "@ethereumjs/tx>@ethereumjs/util": true,
+        "@metamask/base-controller": true,
+        "@metamask/eth-snap-keyring": true,
+        "@metamask/keyring-api": true,
+        "@metamask/keyring-controller": true,
+        "@metamask/utils": true,
+        "@ethereumjs/tx>ethereum-cryptography": true,
         "uuid": true
       }
     },
-    "@metamask/eth-ledger-bridge-keyring": {
-      "globals": {
-        "addEventListener": true,
-        "console.error": true,
-        "document.createElement": true,
-        "document.head.appendChild": true,
-        "fetch": true,
-        "removeEventListener": true
-      },
+    "@metamask/address-book-controller": {
       "packages": {
-        "@ethereumjs/tx": true,
-        "@ethereumjs/tx>@ethereumjs/util": true,
-        "@metamask/eth-ledger-bridge-keyring>@ethereumjs/rlp": true,
-        "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth": true,
-        "@metamask/eth-sig-util": true,
-        "@metamask/eth-trezor-keyring>hdkey": true,
-        "browserify>buffer": true,
-        "webpack>events": true
+        "@metamask/base-controller": true,
+        "@metamask/controller-utils": true
       }
     },
-    "@metamask/eth-ledger-bridge-keyring>@ethereumjs/rlp": {
-      "globals": {
-        "TextEncoder": true
+    "@metamask/announcement-controller": {
+      "packages": {
+        "@metamask/announcement-controller>@metamask/base-controller": true
       }
     },
-    "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth": {
+    "@metamask/approval-controller": {
       "globals": {
-        "console.warn": true
+        "console.info": true
       },
       "packages": {
-        "@ethersproject/abi": true,
-        "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth>@ledgerhq/cryptoassets-evm-signatures": true,
-        "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth>@ledgerhq/domain-service": true,
-        "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth>@ledgerhq/errors": true,
-        "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth>@ledgerhq/evm-tools": true,
-        "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth>@ledgerhq/logs": true,
-        "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth>axios": true,
-        "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth>bignumber.js": true,
-        "browserify>buffer": true,
-        "ethers>@ethersproject/rlp": true,
-        "semver": true
-      }
-    },
-    "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth>@ledgerhq/domain-service": {
-      "packages": {
-        "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth>@ledgerhq/domain-service>axios": true,
-        "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth>@ledgerhq/logs": true
+        "@metamask/base-controller": true,
+        "@metamask/rpc-errors": true,
+        "nanoid": true
       }
     },
-    "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth>@ledgerhq/domain-service>axios": {
+    "@metamask/assets-controllers": {
       "globals": {
-        "Blob": true,
-        "FormData": true,
+        "AbortController": true,
+        "Headers": true,
+        "URL": true,
         "URLSearchParams": true,
-        "XMLHttpRequest": true,
-        "btoa": true,
-        "console.warn": true,
-        "document": true,
-        "location.href": true,
-        "navigator": true,
+        "clearInterval": true,
+        "clearTimeout": true,
+        "console.error": true,
+        "console.log": true,
+        "setInterval": true,
         "setTimeout": true
       },
       "packages": {
-        "axios>form-data": true,
-        "browserify>buffer": true,
-        "process": true
+        "@ethereumjs/tx>@ethereumjs/util": true,
+        "ethers>@ethersproject/address": true,
+        "@ethersproject/bignumber": true,
+        "@ethersproject/contracts": true,
+        "@ethersproject/providers": true,
+        "@metamask/abi-utils": true,
+        "@metamask/base-controller": true,
+        "@metamask/contract-metadata": true,
+        "@metamask/controller-utils": true,
+        "@metamask/eth-query": true,
+        "@metamask/metamask-eth-abis": true,
+        "@metamask/polling-controller": true,
+        "@metamask/rpc-errors": true,
+        "@metamask/utils": true,
+        "@metamask/name-controller>async-mutex": true,
+        "bn.js": true,
+        "cockatiel": true,
+        "lodash": true,
+        "@ensdomains/content-hash>multicodec>uint8arrays>multiformats": true,
+        "single-call-balance-checker-abi": true,
+        "uuid": true
       }
     },
-    "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth>@ledgerhq/errors": {
+    "@metamask/base-controller": {
       "globals": {
-        "console.warn": true
+        "setTimeout": true
+      },
+      "packages": {
+        "immer": true
       }
     },
-    "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth>@ledgerhq/evm-tools": {
+    "@metamask/announcement-controller>@metamask/base-controller": {
+      "globals": {
+        "setTimeout": true
+      },
       "packages": {
-        "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth>@ledgerhq/cryptoassets-evm-signatures": true,
-        "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth>@ledgerhq/evm-tools>@ledgerhq/live-env": true,
-        "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth>@ledgerhq/evm-tools>axios": true,
-        "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth>@ledgerhq/evm-tools>ethers": true,
-        "@metamask/ppom-validator>crypto-js": true
+        "immer": true
       }
     },
-    "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth>@ledgerhq/evm-tools>@ledgerhq/live-env": {
+    "@metamask/name-controller>@metamask/base-controller": {
       "globals": {
-        "console.warn": true
+        "setTimeout": true
       },
       "packages": {
-        "wait-on>rxjs": true
+        "immer": true
       }
     },
-    "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth>@ledgerhq/evm-tools>axios": {
+    "@metamask/rate-limit-controller>@metamask/base-controller": {
       "globals": {
-        "Blob": true,
-        "FormData": true,
-        "URLSearchParams": true,
-        "XMLHttpRequest": true,
-        "btoa": true,
-        "console.warn": true,
-        "document": true,
-        "location.href": true,
-        "navigator": true,
         "setTimeout": true
       },
       "packages": {
-        "axios>form-data": true,
-        "browserify>buffer": true,
-        "process": true
+        "immer": true
       }
     },
-    "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth>@ledgerhq/evm-tools>ethers": {
+    "@metamask/browser-passworder": {
+      "globals": {
+        "CryptoKey": true,
+        "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": {
-        "@ethersproject/abi": true,
-        "@ethersproject/bignumber": true,
-        "@ethersproject/bytes": true,
-        "@ethersproject/contracts": true,
-        "@ethersproject/hash": true,
-        "@ethersproject/hdnode": true,
-        "@ethersproject/providers": true,
-        "@ethersproject/providers>@ethersproject/web": true,
-        "@ethersproject/wallet": true,
-        "ethers>@ethersproject/abstract-signer": true,
-        "ethers>@ethersproject/address": true,
-        "ethers>@ethersproject/base64": true,
-        "ethers>@ethersproject/basex": true,
-        "ethers>@ethersproject/constants": true,
-        "ethers>@ethersproject/json-wallets": true,
-        "ethers>@ethersproject/keccak256": true,
-        "ethers>@ethersproject/logger": true,
-        "ethers>@ethersproject/properties": true,
-        "ethers>@ethersproject/random": true,
-        "ethers>@ethersproject/rlp": true,
-        "ethers>@ethersproject/sha2": true,
-        "ethers>@ethersproject/signing-key": true,
-        "ethers>@ethersproject/solidity": true,
-        "ethers>@ethersproject/strings": true,
-        "ethers>@ethersproject/transactions": true,
-        "ethers>@ethersproject/units": true,
-        "ethers>@ethersproject/wordlists": true
+        "@metamask/browser-passworder>@metamask/utils": true,
+        "browserify>buffer": true
       }
     },
-    "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth>@ledgerhq/logs": {
+    "eth-keyring-controller>@metamask/browser-passworder": {
       "globals": {
-        "__ledgerLogsListen": "write",
-        "console.error": true
+        "crypto": true
       }
     },
-    "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth>axios": {
+    "@metamask/controller-utils": {
       "globals": {
-        "Blob": true,
-        "FormData": true,
-        "URLSearchParams": true,
-        "XMLHttpRequest": true,
-        "btoa": true,
-        "console.warn": true,
-        "document": true,
-        "location.href": true,
-        "navigator": true,
+        "URL": true,
+        "console.error": true,
+        "fetch": true,
         "setTimeout": true
       },
       "packages": {
-        "axios>form-data": true,
+        "@ethereumjs/tx>@ethereumjs/util": true,
+        "@metamask/ethjs>@metamask/ethjs-unit": true,
+        "@metamask/utils": true,
+        "@metamask/controller-utils>@spruceid/siwe-parser": true,
+        "bn.js": true,
         "browserify>buffer": true,
-        "process": true
+        "eth-ens-namehash": true,
+        "eslint>fast-deep-equal": true
       }
     },
-    "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth>bignumber.js": {
-      "globals": {
-        "crypto": true,
-        "define": true
+    "@metamask/ens-controller": {
+      "packages": {
+        "@ethersproject/providers": true,
+        "@metamask/base-controller": true,
+        "@metamask/controller-utils": true,
+        "@metamask/utils": true,
+        "punycode": true
       }
     },
-    "@metamask/eth-query": {
+    "@metamask/eth-token-tracker>@metamask/eth-block-tracker": {
+      "globals": {
+        "clearTimeout": true,
+        "console.error": true,
+        "setTimeout": true
+      },
       "packages": {
+        "@metamask/safe-event-emitter": true,
+        "@metamask/eth-token-tracker>@metamask/eth-block-tracker>@metamask/utils": true,
         "@metamask/eth-query>json-rpc-random-id": true,
-        "watchify>xtend": true
+        "pify": true
       }
     },
-    "@metamask/eth-sig-util": {
+    "@metamask/network-controller>@metamask/eth-block-tracker": {
+      "globals": {
+        "clearTimeout": true,
+        "console.error": true,
+        "setTimeout": true
+      },
       "packages": {
-        "@ethereumjs/tx>@ethereumjs/util": true,
-        "@ethereumjs/tx>ethereum-cryptography": true,
-        "@metamask/abi-utils": true,
-        "@metamask/eth-sig-util>@metamask/utils": true,
-        "@metamask/eth-sig-util>tweetnacl": true,
-        "@metamask/utils>@scure/base": true,
-        "browserify>buffer": true
+        "@metamask/safe-event-emitter": true,
+        "@metamask/network-controller>@metamask/eth-block-tracker>@metamask/utils": true,
+        "@metamask/eth-query>json-rpc-random-id": true
       }
     },
-    "@metamask/eth-sig-util>@metamask/utils": {
+    "@metamask/keyring-controller>@metamask/eth-hd-keyring": {
       "globals": {
-        "TextDecoder": true,
         "TextEncoder": true
       },
       "packages": {
-        "@metamask/utils>@metamask/superstruct": true,
-        "@metamask/utils>@scure/base": true,
-        "@metamask/utils>pony-cause": true,
-        "@noble/hashes": true,
+        "@ethereumjs/tx>@ethereumjs/util": true,
+        "@metamask/eth-sig-util": true,
+        "@metamask/scure-bip39": true,
+        "@metamask/keyring-controller>@metamask/eth-hd-keyring>@metamask/utils": true,
         "browserify>buffer": true,
-        "nock>debug": true,
-        "semver": true
+        "@ethereumjs/tx>ethereum-cryptography": true
       }
     },
-    "@metamask/eth-sig-util>tweetnacl": {
+    "@metamask/eth-json-rpc-filters": {
       "globals": {
-        "crypto": true,
-        "msCrypto": true,
-        "nacl": "write"
+        "console.error": true
       },
       "packages": {
-        "browserify>browser-resolve": true
+        "@metamask/eth-query": true,
+        "@metamask/json-rpc-engine": true,
+        "@metamask/safe-event-emitter": true,
+        "@metamask/name-controller>async-mutex": true,
+        "pify": true
       }
     },
-    "@metamask/eth-snap-keyring": {
+    "@metamask/network-controller>@metamask/eth-json-rpc-infura": {
+      "globals": {
+        "fetch": true,
+        "setTimeout": true
+      },
+      "packages": {
+        "@metamask/eth-json-rpc-provider": true,
+        "@metamask/json-rpc-engine": true,
+        "@metamask/rpc-errors": true,
+        "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/utils": true
+      }
+    },
+    "@metamask/eth-json-rpc-middleware": {
       "globals": {
         "URL": true,
-        "console.error": true
+        "console.error": true,
+        "setTimeout": true
+      },
+      "packages": {
+        "@metamask/eth-sig-util": true,
+        "@metamask/json-rpc-engine": true,
+        "@metamask/rpc-errors": true,
+        "@metamask/eth-json-rpc-middleware>@metamask/utils": true,
+        "@metamask/eth-json-rpc-middleware>klona": true,
+        "@metamask/eth-json-rpc-middleware>safe-stable-stringify": true
+      }
+    },
+    "@metamask/eth-json-rpc-provider": {
+      "packages": {
+        "@metamask/json-rpc-engine": true,
+        "@metamask/rpc-errors": true,
+        "@metamask/safe-event-emitter": true,
+        "uuid": true
+      }
+    },
+    "@metamask/eth-ledger-bridge-keyring": {
+      "globals": {
+        "addEventListener": true,
+        "console.error": true,
+        "document.createElement": true,
+        "document.head.appendChild": true,
+        "fetch": true,
+        "removeEventListener": true
       },
       "packages": {
+        "@metamask/eth-ledger-bridge-keyring>@ethereumjs/rlp": true,
         "@ethereumjs/tx": true,
-        "@metamask/eth-snap-keyring>@metamask/eth-sig-util": true,
-        "@metamask/eth-snap-keyring>@metamask/keyring-internal-snap-client": true,
-        "@metamask/eth-snap-keyring>@metamask/utils": true,
-        "@metamask/eth-snap-keyring>uuid": true,
-        "@metamask/keyring-api": true,
-        "@metamask/utils>@metamask/superstruct": true,
-        "webpack>events": true
+        "@ethereumjs/tx>@ethereumjs/util": true,
+        "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth": true,
+        "@metamask/eth-sig-util": true,
+        "browserify>buffer": true,
+        "webpack>events": true,
+        "@metamask/eth-trezor-keyring>hdkey": true
       }
     },
-    "@metamask/eth-snap-keyring>@metamask/eth-sig-util": {
+    "@metamask/eth-query": {
+      "packages": {
+        "@metamask/eth-query>json-rpc-random-id": true,
+        "watchify>xtend": true
+      }
+    },
+    "@metamask/eth-sig-util": {
       "packages": {
         "@ethereumjs/tx>@ethereumjs/util": true,
+        "@metamask/abi-utils": true,
+        "@metamask/eth-sig-util>@metamask/utils": true,
+        "@metamask/utils>@scure/base": true,
+        "browserify>buffer": true,
         "@ethereumjs/tx>ethereum-cryptography": true,
+        "@metamask/eth-sig-util>tweetnacl": true
+      }
+    },
+    "@metamask/eth-snap-keyring>@metamask/eth-sig-util": {
+      "packages": {
+        "@ethereumjs/tx>@ethereumjs/util": true,
         "@metamask/abi-utils": true,
-        "@metamask/eth-sig-util>tweetnacl": true,
         "@metamask/eth-snap-keyring>@metamask/utils": true,
         "@metamask/utils>@scure/base": true,
-        "browserify>buffer": true
+        "browserify>buffer": true,
+        "@ethereumjs/tx>ethereum-cryptography": true,
+        "@metamask/eth-sig-util>tweetnacl": true
       }
     },
-    "@metamask/eth-snap-keyring>@metamask/keyring-internal-snap-client": {
+    "@metamask/keyring-controller>@metamask/eth-sig-util": {
       "packages": {
-        "@metamask/keyring-snap-client": true
+        "@ethereumjs/tx>@ethereumjs/util": true,
+        "@metamask/abi-utils": true,
+        "@metamask/keyring-controller>@metamask/eth-sig-util>@metamask/utils": true,
+        "@metamask/utils>@scure/base": true,
+        "browserify>buffer": true,
+        "@ethereumjs/tx>ethereum-cryptography": true,
+        "@metamask/eth-sig-util>tweetnacl": true
       }
     },
-    "@metamask/eth-snap-keyring>@metamask/utils": {
-      "globals": {
-        "TextDecoder": true,
-        "TextEncoder": true
-      },
+    "@metamask/signature-controller>@metamask/eth-sig-util": {
       "packages": {
-        "@metamask/utils>@metamask/superstruct": true,
+        "@ethereumjs/tx>@ethereumjs/util": true,
+        "@metamask/abi-utils": true,
+        "@metamask/signature-controller>@metamask/eth-sig-util>@metamask/utils": true,
         "@metamask/utils>@scure/base": true,
-        "@metamask/utils>pony-cause": true,
-        "@noble/hashes": true,
         "browserify>buffer": true,
-        "nock>debug": true,
-        "semver": true
+        "@ethereumjs/tx>ethereum-cryptography": true,
+        "@metamask/eth-sig-util>tweetnacl": true
       }
     },
-    "@metamask/eth-snap-keyring>uuid": {
+    "@metamask/keyring-controller>@metamask/eth-simple-keyring": {
+      "packages": {
+        "@ethereumjs/tx>@ethereumjs/util": true,
+        "@metamask/eth-sig-util": true,
+        "@metamask/keyring-controller>@metamask/eth-simple-keyring>@metamask/utils": true,
+        "browserify>buffer": true,
+        "@ethereumjs/tx>ethereum-cryptography": true,
+        "crypto-browserify>randombytes": true
+      }
+    },
+    "@metamask/eth-snap-keyring": {
       "globals": {
-        "crypto": true
+        "URL": true,
+        "console.error": true
+      },
+      "packages": {
+        "@ethereumjs/tx": true,
+        "@metamask/eth-snap-keyring>@metamask/eth-sig-util": true,
+        "@metamask/keyring-api": true,
+        "@metamask/eth-snap-keyring>@metamask/keyring-internal-snap-client": true,
+        "@metamask/utils>@metamask/superstruct": true,
+        "@metamask/eth-snap-keyring>@metamask/utils": true,
+        "webpack>events": true,
+        "@metamask/eth-snap-keyring>uuid": true
       }
     },
     "@metamask/eth-token-tracker": {
@@ -1194,192 +1233,79 @@
       "packages": {
         "@babel/runtime": true,
         "@metamask/eth-token-tracker>@metamask/eth-block-tracker": true,
-        "@metamask/eth-token-tracker>deep-equal": true,
         "@metamask/ethjs-contract": true,
         "@metamask/ethjs-query": true,
         "@metamask/safe-event-emitter": true,
         "bn.js": true,
+        "@metamask/eth-token-tracker>deep-equal": true,
         "human-standard-token-abi": true
       }
     },
-    "@metamask/eth-token-tracker>@metamask/eth-block-tracker": {
+    "@metamask/eth-trezor-keyring": {
       "globals": {
-        "clearTimeout": true,
-        "console.error": true,
         "setTimeout": true
       },
       "packages": {
-        "@metamask/eth-query>json-rpc-random-id": true,
-        "@metamask/eth-token-tracker>@metamask/eth-block-tracker>@metamask/utils": true,
-        "@metamask/safe-event-emitter": true,
-        "pify": true
+        "@ethereumjs/tx": true,
+        "@ethereumjs/tx>@ethereumjs/util": true,
+        "@metamask/eth-trezor-keyring>@trezor/connect-plugin-ethereum": true,
+        "@trezor/connect-web": true,
+        "browserify>buffer": true,
+        "webpack>events": true,
+        "@metamask/eth-trezor-keyring>hdkey": true
       }
     },
-    "@metamask/eth-token-tracker>@metamask/eth-block-tracker>@metamask/utils": {
+    "@metamask/etherscan-link": {
       "globals": {
-        "TextDecoder": true,
-        "TextEncoder": true
+        "URL": true
+      }
+    },
+    "@metamask/ethjs": {
+      "globals": {
+        "clearInterval": true,
+        "setInterval": true
       },
       "packages": {
-        "@metamask/utils>@metamask/superstruct": true,
-        "@metamask/utils>@scure/base": true,
-        "@metamask/utils>pony-cause": true,
-        "@noble/hashes": true,
+        "@metamask/ethjs-contract": true,
+        "@metamask/ethjs>@metamask/ethjs-filter": true,
+        "@metamask/ethjs>@metamask/ethjs-provider-http": true,
+        "@metamask/ethjs-query": true,
+        "@metamask/ethjs>@metamask/ethjs-unit": true,
+        "@metamask/ethjs>@metamask/ethjs-util": true,
+        "@metamask/ethjs>@metamask/number-to-bn": true,
+        "bn.js": true,
         "browserify>buffer": true,
-        "nock>debug": true,
-        "semver": true
+        "@metamask/ethjs>ethjs-abi": true,
+        "@metamask/ethjs>js-sha3": true
       }
     },
-    "@metamask/eth-token-tracker>deep-equal": {
+    "@metamask/ethjs-contract": {
       "packages": {
-        "@lavamoat/lavapack>json-stable-stringify>isarray": true,
-        "@lavamoat/lavapack>json-stable-stringify>object-keys": true,
-        "@metamask/eth-token-tracker>deep-equal>es-get-iterator": true,
-        "@metamask/eth-token-tracker>deep-equal>is-date-object": true,
-        "@metamask/eth-token-tracker>deep-equal>which-boxed-primitive": true,
-        "@metamask/eth-token-tracker>deep-equal>which-collection": true,
-        "@ngraveio/bc-ur>assert>object-is": true,
-        "browserify>util>is-arguments": true,
-        "browserify>util>which-typed-array": true,
-        "gulp>vinyl-fs>object.assign": true,
-        "string.prototype.matchall>call-bind": true,
-        "string.prototype.matchall>es-abstract>array-buffer-byte-length": true,
-        "string.prototype.matchall>es-abstract>is-array-buffer": true,
-        "string.prototype.matchall>es-abstract>is-regex": true,
-        "string.prototype.matchall>es-abstract>is-shared-array-buffer": true,
-        "string.prototype.matchall>get-intrinsic": true,
-        "string.prototype.matchall>regexp.prototype.flags": true,
-        "string.prototype.matchall>side-channel": true
+        "@babel/runtime": true,
+        "@metamask/ethjs>@metamask/ethjs-filter": true,
+        "@metamask/ethjs>@metamask/ethjs-util": true,
+        "@metamask/ethjs>ethjs-abi": true,
+        "@metamask/ethjs>js-sha3": true,
+        "promise-to-callback": true
       }
     },
-    "@metamask/eth-token-tracker>deep-equal>es-get-iterator": {
+    "@metamask/ethjs>@metamask/ethjs-filter": {
+      "globals": {
+        "clearInterval": true,
+        "setInterval": true
+      }
+    },
+    "@metamask/ethjs-query>@metamask/ethjs-format": {
       "packages": {
-        "@lavamoat/lavapack>json-stable-stringify>isarray": true,
-        "@metamask/eth-token-tracker>deep-equal>es-get-iterator>is-map": true,
-        "@metamask/eth-token-tracker>deep-equal>es-get-iterator>is-set": true,
-        "@metamask/eth-token-tracker>deep-equal>es-get-iterator>stop-iteration-iterator": true,
-        "browserify>util>is-arguments": true,
-        "eslint-plugin-react>array-includes>is-string": true,
-        "process": true,
-        "string.prototype.matchall>call-bind": true,
-        "string.prototype.matchall>get-intrinsic": true,
-        "string.prototype.matchall>has-symbols": true
-      }
-    },
-    "@metamask/eth-token-tracker>deep-equal>es-get-iterator>stop-iteration-iterator": {
-      "globals": {
-        "StopIteration": true
-      },
-      "packages": {
-        "string.prototype.matchall>internal-slot": true
-      }
-    },
-    "@metamask/eth-token-tracker>deep-equal>is-date-object": {
-      "packages": {
-        "koa>is-generator-function>has-tostringtag": true
-      }
-    },
-    "@metamask/eth-token-tracker>deep-equal>which-boxed-primitive": {
-      "packages": {
-        "@metamask/eth-token-tracker>deep-equal>which-boxed-primitive>is-bigint": true,
-        "@metamask/eth-token-tracker>deep-equal>which-boxed-primitive>is-boolean-object": true,
-        "@metamask/eth-token-tracker>deep-equal>which-boxed-primitive>is-number-object": true,
-        "eslint-plugin-react>array-includes>is-string": true,
-        "string.prototype.matchall>es-abstract>es-to-primitive>is-symbol": true
-      }
-    },
-    "@metamask/eth-token-tracker>deep-equal>which-boxed-primitive>is-bigint": {
-      "packages": {
-        "string.prototype.matchall>es-abstract>unbox-primitive>has-bigints": true
-      }
-    },
-    "@metamask/eth-token-tracker>deep-equal>which-boxed-primitive>is-boolean-object": {
-      "packages": {
-        "koa>is-generator-function>has-tostringtag": true,
-        "string.prototype.matchall>call-bind": true
-      }
-    },
-    "@metamask/eth-token-tracker>deep-equal>which-boxed-primitive>is-number-object": {
-      "packages": {
-        "koa>is-generator-function>has-tostringtag": true
-      }
-    },
-    "@metamask/eth-token-tracker>deep-equal>which-collection": {
-      "packages": {
-        "@metamask/eth-token-tracker>deep-equal>es-get-iterator>is-map": true,
-        "@metamask/eth-token-tracker>deep-equal>es-get-iterator>is-set": true,
-        "@metamask/eth-token-tracker>deep-equal>which-collection>is-weakmap": true,
-        "@metamask/eth-token-tracker>deep-equal>which-collection>is-weakset": true
-      }
-    },
-    "@metamask/eth-token-tracker>deep-equal>which-collection>is-weakset": {
-      "packages": {
-        "string.prototype.matchall>call-bind": true,
-        "string.prototype.matchall>get-intrinsic": true
-      }
-    },
-    "@metamask/eth-trezor-keyring": {
-      "globals": {
-        "setTimeout": true
-      },
-      "packages": {
-        "@ethereumjs/tx": true,
-        "@ethereumjs/tx>@ethereumjs/util": true,
-        "@metamask/eth-trezor-keyring>@trezor/connect-plugin-ethereum": true,
-        "@metamask/eth-trezor-keyring>hdkey": true,
-        "@trezor/connect-web": true,
-        "browserify>buffer": true,
-        "webpack>events": true
-      }
-    },
-    "@metamask/eth-trezor-keyring>@trezor/connect-plugin-ethereum": {
-      "packages": {
-        "@metamask/eth-sig-util": true,
-        "@swc/helpers>tslib": true
-      }
-    },
-    "@metamask/eth-trezor-keyring>hdkey": {
-      "packages": {
-        "browserify>assert": true,
-        "crypto-browserify": true,
-        "ethereumjs-util>create-hash>ripemd160": true,
-        "ethereumjs-util>ethereum-cryptography>bs58check": true,
-        "ganache>secp256k1": true,
-        "koa>content-disposition>safe-buffer": true
-      }
-    },
-    "@metamask/etherscan-link": {
-      "globals": {
-        "URL": true
-      }
-    },
-    "@metamask/ethjs": {
-      "globals": {
-        "clearInterval": true,
-        "setInterval": true
-      },
-      "packages": {
-        "@metamask/ethjs-contract": true,
-        "@metamask/ethjs-query": true,
-        "@metamask/ethjs>@metamask/ethjs-filter": true,
-        "@metamask/ethjs>@metamask/ethjs-provider-http": true,
-        "@metamask/ethjs>@metamask/ethjs-unit": true,
         "@metamask/ethjs>@metamask/ethjs-util": true,
         "@metamask/ethjs>@metamask/number-to-bn": true,
-        "@metamask/ethjs>ethjs-abi": true,
-        "@metamask/ethjs>js-sha3": true,
-        "bn.js": true,
-        "browserify>buffer": true
+        "@metamask/ethjs-query>@metamask/ethjs-format>ethjs-schema": true,
+        "@metamask/ethjs>@metamask/ethjs-util>strip-hex-prefix": true
       }
     },
-    "@metamask/ethjs-contract": {
+    "@metamask/ethjs>@metamask/ethjs-provider-http": {
       "packages": {
-        "@babel/runtime": true,
-        "@metamask/ethjs>@metamask/ethjs-filter": true,
-        "@metamask/ethjs>@metamask/ethjs-util": true,
-        "@metamask/ethjs>ethjs-abi": true,
-        "@metamask/ethjs>js-sha3": true,
-        "promise-to-callback": true
+        "@metamask/ethjs>@metamask/ethjs-provider-http>xhr2": true
       }
     },
     "@metamask/ethjs-query": {
@@ -1392,35 +1318,11 @@
         "promise-to-callback": true
       }
     },
-    "@metamask/ethjs-query>@metamask/ethjs-format": {
-      "packages": {
-        "@metamask/ethjs-query>@metamask/ethjs-format>ethjs-schema": true,
-        "@metamask/ethjs>@metamask/ethjs-util": true,
-        "@metamask/ethjs>@metamask/ethjs-util>strip-hex-prefix": true,
-        "@metamask/ethjs>@metamask/number-to-bn": true
-      }
-    },
     "@metamask/ethjs-query>@metamask/ethjs-rpc": {
       "packages": {
         "promise-to-callback": true
       }
     },
-    "@metamask/ethjs>@metamask/ethjs-filter": {
-      "globals": {
-        "clearInterval": true,
-        "setInterval": true
-      }
-    },
-    "@metamask/ethjs>@metamask/ethjs-provider-http": {
-      "packages": {
-        "@metamask/ethjs>@metamask/ethjs-provider-http>xhr2": true
-      }
-    },
-    "@metamask/ethjs>@metamask/ethjs-provider-http>xhr2": {
-      "globals": {
-        "XMLHttpRequest": true
-      }
-    },
     "@metamask/ethjs>@metamask/ethjs-unit": {
       "packages": {
         "@metamask/ethjs>@metamask/number-to-bn": true,
@@ -1429,42 +1331,9 @@
     },
     "@metamask/ethjs>@metamask/ethjs-util": {
       "packages": {
+        "browserify>buffer": true,
         "@metamask/ethjs>@metamask/ethjs-util>is-hex-prefixed": true,
-        "@metamask/ethjs>@metamask/ethjs-util>strip-hex-prefix": true,
-        "browserify>buffer": true
-      }
-    },
-    "@metamask/ethjs>@metamask/ethjs-util>strip-hex-prefix": {
-      "packages": {
-        "@metamask/ethjs>@metamask/ethjs-util>is-hex-prefixed": true
-      }
-    },
-    "@metamask/ethjs>@metamask/number-to-bn": {
-      "packages": {
-        "@metamask/ethjs>@metamask/ethjs-util>strip-hex-prefix": true,
-        "bn.js": true
-      }
-    },
-    "@metamask/ethjs>ethjs-abi": {
-      "packages": {
-        "@metamask/ethjs>ethjs-abi>number-to-bn": true,
-        "@metamask/ethjs>js-sha3": true,
-        "bn.js": true,
-        "browserify>buffer": true
-      }
-    },
-    "@metamask/ethjs>ethjs-abi>number-to-bn": {
-      "packages": {
-        "@metamask/ethjs>@metamask/ethjs-util>strip-hex-prefix": true,
-        "bn.js": true
-      }
-    },
-    "@metamask/ethjs>js-sha3": {
-      "globals": {
-        "define": true
-      },
-      "packages": {
-        "process": true
+        "@metamask/ethjs>@metamask/ethjs-util>strip-hex-prefix": true
       }
     },
     "@metamask/gas-fee-controller": {
@@ -1491,28 +1360,6 @@
         "@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/json-rpc-engine": {
       "packages": {
         "@metamask/rpc-errors": true,
@@ -1531,51 +1378,24 @@
         "readable-stream": true
       }
     },
-    "@metamask/keyring-api": {
-      "packages": {
-        "@metamask/keyring-api>@metamask/keyring-utils": true,
-        "@metamask/keyring-api>@metamask/utils": true,
-        "@metamask/keyring-api>bech32": true,
-        "@metamask/utils>@metamask/superstruct": true
-      }
-    },
-    "@metamask/keyring-api>@metamask/keyring-utils": {
-      "globals": {
-        "URL": true
-      },
-      "packages": {
-        "@metamask/keyring-api>@metamask/keyring-utils>@metamask/utils": true,
-        "@metamask/utils>@metamask/superstruct": true
-      }
-    },
-    "@metamask/keyring-api>@metamask/keyring-utils>@metamask/utils": {
+    "@metamask/snaps-sdk>@metamask/key-tree": {
       "globals": {
-        "TextDecoder": true,
-        "TextEncoder": true
+        "crypto.subtle": true
       },
       "packages": {
-        "@metamask/utils>@metamask/superstruct": true,
-        "@metamask/utils>@scure/base": true,
-        "@metamask/utils>pony-cause": true,
+        "@metamask/scure-bip39": true,
+        "@metamask/utils": true,
+        "@ethereumjs/tx>ethereum-cryptography>@noble/curves": true,
         "@noble/hashes": true,
-        "browserify>buffer": true,
-        "nock>debug": true,
-        "semver": true
+        "@metamask/utils>@scure/base": true
       }
     },
-    "@metamask/keyring-api>@metamask/utils": {
-      "globals": {
-        "TextDecoder": true,
-        "TextEncoder": true
-      },
+    "@metamask/keyring-api": {
       "packages": {
+        "@metamask/keyring-api>@metamask/keyring-utils": true,
         "@metamask/utils>@metamask/superstruct": true,
-        "@metamask/utils>@scure/base": true,
-        "@metamask/utils>pony-cause": true,
-        "@noble/hashes": true,
-        "browserify>buffer": true,
-        "nock>debug": true,
-        "semver": true
+        "@metamask/keyring-api>@metamask/utils": true,
+        "@metamask/keyring-api>bech32": true
       }
     },
     "@metamask/keyring-controller": {
@@ -1586,145 +1406,31 @@
         "@metamask/keyring-controller>@metamask/eth-hd-keyring": true,
         "@metamask/keyring-controller>@metamask/eth-sig-util": true,
         "@metamask/keyring-controller>@metamask/eth-simple-keyring": true,
-        "@metamask/keyring-controller>ethereumjs-wallet": true,
+        "@metamask/utils": true,
         "@metamask/name-controller>async-mutex": true,
-        "@metamask/utils": true
+        "@metamask/keyring-controller>ethereumjs-wallet": true
       }
     },
-    "@metamask/keyring-controller>@metamask/eth-hd-keyring": {
-      "globals": {
-        "TextEncoder": true
-      },
+    "@metamask/eth-snap-keyring>@metamask/keyring-internal-snap-client": {
       "packages": {
-        "@ethereumjs/tx>@ethereumjs/util": true,
-        "@ethereumjs/tx>ethereum-cryptography": true,
-        "@metamask/eth-sig-util": true,
-        "@metamask/keyring-controller>@metamask/eth-hd-keyring>@metamask/utils": true,
-        "@metamask/scure-bip39": true,
-        "browserify>buffer": true
+        "@metamask/keyring-snap-client": true
       }
     },
-    "@metamask/keyring-controller>@metamask/eth-hd-keyring>@metamask/utils": {
-      "globals": {
-        "TextDecoder": true,
-        "TextEncoder": true
-      },
-      "packages": {
-        "@metamask/utils>@metamask/superstruct": true,
-        "@metamask/utils>@scure/base": true,
-        "@metamask/utils>pony-cause": true,
-        "@noble/hashes": true,
-        "browserify>buffer": true,
-        "nock>debug": true,
-        "semver": true
-      }
-    },
-    "@metamask/keyring-controller>@metamask/eth-sig-util": {
-      "packages": {
-        "@ethereumjs/tx>@ethereumjs/util": true,
-        "@ethereumjs/tx>ethereum-cryptography": true,
-        "@metamask/abi-utils": true,
-        "@metamask/eth-sig-util>tweetnacl": true,
-        "@metamask/keyring-controller>@metamask/eth-sig-util>@metamask/utils": true,
-        "@metamask/utils>@scure/base": true,
-        "browserify>buffer": true
-      }
-    },
-    "@metamask/keyring-controller>@metamask/eth-sig-util>@metamask/utils": {
-      "globals": {
-        "TextDecoder": true,
-        "TextEncoder": true
-      },
+    "@metamask/keyring-snap-client": {
       "packages": {
+        "@metamask/keyring-api": true,
+        "@metamask/keyring-api>@metamask/keyring-utils": true,
         "@metamask/utils>@metamask/superstruct": true,
-        "@metamask/utils>@scure/base": true,
-        "@metamask/utils>pony-cause": true,
-        "@noble/hashes": true,
-        "browserify>buffer": true,
-        "nock>debug": true,
-        "semver": true
-      }
-    },
-    "@metamask/keyring-controller>@metamask/eth-simple-keyring": {
-      "packages": {
-        "@ethereumjs/tx>@ethereumjs/util": true,
-        "@ethereumjs/tx>ethereum-cryptography": true,
-        "@metamask/eth-sig-util": true,
-        "@metamask/keyring-controller>@metamask/eth-simple-keyring>@metamask/utils": true,
-        "browserify>buffer": true,
-        "crypto-browserify>randombytes": true
+        "@metamask/keyring-snap-client>uuid": true
       }
     },
-    "@metamask/keyring-controller>@metamask/eth-simple-keyring>@metamask/utils": {
+    "@metamask/keyring-api>@metamask/keyring-utils": {
       "globals": {
-        "TextDecoder": true,
-        "TextEncoder": true
+        "URL": true
       },
       "packages": {
         "@metamask/utils>@metamask/superstruct": true,
-        "@metamask/utils>@scure/base": true,
-        "@metamask/utils>pony-cause": true,
-        "@noble/hashes": true,
-        "browserify>buffer": true,
-        "nock>debug": true,
-        "semver": true
-      }
-    },
-    "@metamask/keyring-controller>ethereumjs-wallet": {
-      "packages": {
-        "@metamask/keyring-controller>ethereumjs-wallet>ethereum-cryptography": true,
-        "@metamask/keyring-controller>ethereumjs-wallet>ethereumjs-util": true,
-        "@metamask/keyring-controller>ethereumjs-wallet>utf8": true,
-        "browserify>buffer": true,
-        "crypto-browserify": true,
-        "crypto-browserify>randombytes": true,
-        "eth-lattice-keyring>gridplus-sdk>aes-js": true,
-        "ethereumjs-util>ethereum-cryptography>bs58check": true,
-        "ethers>@ethersproject/json-wallets>scrypt-js": true,
-        "uuid": true
-      }
-    },
-    "@metamask/keyring-controller>ethereumjs-wallet>ethereum-cryptography": {
-      "packages": {
-        "browserify>assert": true,
-        "browserify>buffer": true,
-        "crypto-browserify>create-hmac": true,
-        "crypto-browserify>randombytes": true,
-        "ethereumjs-util>ethereum-cryptography>bs58check": true,
-        "ethereumjs-util>ethereum-cryptography>keccak": true,
-        "ethers>@ethersproject/sha2>hash.js": true,
-        "ganache>secp256k1": true,
-        "koa>content-disposition>safe-buffer": true
-      }
-    },
-    "@metamask/keyring-controller>ethereumjs-wallet>ethereumjs-util": {
-      "packages": {
-        "@metamask/keyring-controller>ethereumjs-wallet>ethereum-cryptography": true,
-        "@metamask/keyring-controller>ethereumjs-wallet>ethereumjs-util>rlp": true,
-        "bn.js": true,
-        "browserify>assert": true,
-        "browserify>buffer": true,
-        "browserify>insert-module-globals>is-buffer": true,
-        "ethereumjs-util>create-hash": true
-      }
-    },
-    "@metamask/keyring-controller>ethereumjs-wallet>ethereumjs-util>rlp": {
-      "packages": {
-        "bn.js": true,
-        "browserify>buffer": true
-      }
-    },
-    "@metamask/keyring-snap-client": {
-      "packages": {
-        "@metamask/keyring-api": true,
-        "@metamask/keyring-api>@metamask/keyring-utils": true,
-        "@metamask/keyring-snap-client>uuid": true,
-        "@metamask/utils>@metamask/superstruct": true
-      }
-    },
-    "@metamask/keyring-snap-client>uuid": {
-      "globals": {
-        "crypto": true
+        "@metamask/keyring-api>@metamask/keyring-utils>@metamask/utils": true
       }
     },
     "@metamask/logging-controller": {
@@ -1753,13 +1459,8 @@
         "@metamask/controller-utils": true,
         "@metamask/utils": true,
         "browserify>buffer": true,
-        "uuid": true,
-        "webpack>events": true
-      }
-    },
-    "@metamask/message-manager>jsonschema": {
-      "packages": {
-        "browserify>url": true
+        "webpack>events": true,
+        "uuid": true
       }
     },
     "@metamask/name-controller": {
@@ -1767,44 +1468,12 @@
         "fetch": true
       },
       "packages": {
-        "@metamask/controller-utils": true,
         "@metamask/name-controller>@metamask/base-controller": true,
+        "@metamask/controller-utils": true,
         "@metamask/name-controller>@metamask/utils": true,
         "@metamask/name-controller>async-mutex": true
       }
     },
-    "@metamask/name-controller>@metamask/base-controller": {
-      "globals": {
-        "setTimeout": true
-      },
-      "packages": {
-        "immer": true
-      }
-    },
-    "@metamask/name-controller>@metamask/utils": {
-      "globals": {
-        "TextDecoder": true,
-        "TextEncoder": true
-      },
-      "packages": {
-        "@metamask/utils>@metamask/superstruct": true,
-        "@metamask/utils>@scure/base": true,
-        "@metamask/utils>pony-cause": true,
-        "@noble/hashes": true,
-        "browserify>buffer": true,
-        "nock>debug": true,
-        "semver": true
-      }
-    },
-    "@metamask/name-controller>async-mutex": {
-      "globals": {
-        "clearTimeout": true,
-        "setTimeout": true
-      },
-      "packages": {
-        "@swc/helpers>tslib": true
-      }
-    },
     "@metamask/network-controller": {
       "globals": {
         "btoa": true,
@@ -1814,14 +1483,14 @@
       "packages": {
         "@metamask/base-controller": true,
         "@metamask/controller-utils": true,
+        "@metamask/network-controller>@metamask/eth-block-tracker": true,
+        "@metamask/network-controller>@metamask/eth-json-rpc-infura": true,
         "@metamask/eth-json-rpc-middleware": true,
         "@metamask/eth-json-rpc-provider": true,
         "@metamask/eth-query": true,
         "@metamask/json-rpc-engine": true,
-        "@metamask/network-controller>@metamask/eth-block-tracker": true,
-        "@metamask/network-controller>@metamask/eth-json-rpc-infura": true,
-        "@metamask/network-controller>@metamask/swappable-obj-proxy": true,
         "@metamask/rpc-errors": true,
+        "@metamask/network-controller>@metamask/swappable-obj-proxy": true,
         "@metamask/utils": true,
         "eslint>fast-deep-equal": true,
         "reselect": true,
@@ -1829,63 +1498,11 @@
         "uuid": true
       }
     },
-    "@metamask/network-controller>@metamask/eth-block-tracker": {
-      "globals": {
-        "clearTimeout": true,
-        "console.error": true,
-        "setTimeout": true
-      },
-      "packages": {
-        "@metamask/eth-query>json-rpc-random-id": true,
-        "@metamask/network-controller>@metamask/eth-block-tracker>@metamask/utils": true,
-        "@metamask/safe-event-emitter": true
-      }
-    },
-    "@metamask/network-controller>@metamask/eth-block-tracker>@metamask/utils": {
-      "globals": {
-        "TextDecoder": true,
-        "TextEncoder": true
-      },
-      "packages": {
-        "@metamask/utils>@metamask/superstruct": true,
-        "@metamask/utils>@scure/base": true,
-        "@metamask/utils>pony-cause": true,
-        "@noble/hashes": true,
-        "browserify>buffer": true,
-        "nock>debug": true,
-        "semver": true
-      }
-    },
-    "@metamask/network-controller>@metamask/eth-json-rpc-infura": {
-      "globals": {
-        "fetch": true,
-        "setTimeout": true
-      },
-      "packages": {
-        "@metamask/eth-json-rpc-provider": true,
-        "@metamask/json-rpc-engine": true,
-        "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/utils": true,
-        "@metamask/rpc-errors": true
-      }
-    },
-    "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/utils": {
-      "globals": {
-        "TextDecoder": true,
-        "TextEncoder": true
-      },
+    "@metamask/transaction-controller>@metamask/nonce-tracker": {
       "packages": {
-        "@metamask/utils>@metamask/superstruct": true,
-        "@metamask/utils>@scure/base": true,
-        "@metamask/utils>pony-cause": true,
-        "@noble/hashes": true,
-        "browserify>buffer": true,
-        "nock>debug": true,
-        "semver": true
-      }
-    },
-    "@metamask/notification-controller>nanoid": {
-      "globals": {
-        "crypto.getRandomValues": true
+        "@ethersproject/providers": true,
+        "browserify>assert": true,
+        "@metamask/transaction-controller>@metamask/nonce-tracker>async-mutex": true
       }
     },
     "@metamask/notification-services-controller": {
@@ -1897,166 +1514,41 @@
         "removeEventListener": true
       },
       "packages": {
+        "@metamask/notification-services-controller>@contentful/rich-text-html-renderer": true,
         "@metamask/base-controller": true,
         "@metamask/controller-utils": true,
-        "@metamask/notification-services-controller>@contentful/rich-text-html-renderer": true,
-        "@metamask/notification-services-controller>bignumber.js": true,
-        "@metamask/notification-services-controller>firebase": true,
         "@metamask/profile-sync-controller": true,
         "@metamask/utils": true,
+        "@metamask/notification-services-controller>bignumber.js": true,
+        "@metamask/notification-services-controller>firebase": true,
         "loglevel": true,
         "uuid": true
       }
     },
-    "@metamask/notification-services-controller>@contentful/rich-text-html-renderer": {
-      "globals": {
-        "SuppressedError": true
-      }
-    },
-    "@metamask/notification-services-controller>bignumber.js": {
-      "globals": {
-        "crypto": true,
-        "define": true
-      }
-    },
-    "@metamask/notification-services-controller>firebase": {
+    "@metamask/ethjs>@metamask/number-to-bn": {
       "packages": {
-        "@metamask/notification-services-controller>firebase>@firebase/app": true,
-        "@metamask/notification-services-controller>firebase>@firebase/messaging": true
+        "bn.js": true,
+        "@metamask/ethjs>@metamask/ethjs-util>strip-hex-prefix": true
       }
     },
-    "@metamask/notification-services-controller>firebase>@firebase/app": {
+    "@metamask/object-multiplex": {
       "globals": {
-        "FinalizationRegistry": true,
         "console.warn": true
       },
       "packages": {
-        "@metamask/notification-services-controller>firebase>@firebase/app>@firebase/component": true,
-        "@metamask/notification-services-controller>firebase>@firebase/app>@firebase/logger": true,
-        "@metamask/notification-services-controller>firebase>@firebase/app>idb": true,
-        "@metamask/notification-services-controller>firebase>@firebase/util": true
+        "@metamask/object-multiplex>once": true,
+        "readable-stream": true
       }
     },
-    "@metamask/notification-services-controller>firebase>@firebase/app>@firebase/component": {
+    "@metamask/obs-store": {
       "packages": {
-        "@metamask/notification-services-controller>firebase>@firebase/util": true
+        "@metamask/safe-event-emitter": true,
+        "readable-stream": true
       }
     },
-    "@metamask/notification-services-controller>firebase>@firebase/app>@firebase/logger": {
+    "@metamask/permission-controller": {
       "globals": {
-        "console": true
-      },
-      "packages": {
-        "@swc/helpers>tslib": true
-      }
-    },
-    "@metamask/notification-services-controller>firebase>@firebase/app>idb": {
-      "globals": {
-        "DOMException": true,
-        "IDBCursor": true,
-        "IDBDatabase": true,
-        "IDBIndex": true,
-        "IDBObjectStore": true,
-        "IDBRequest": true,
-        "IDBTransaction": true,
-        "indexedDB.deleteDatabase": true,
-        "indexedDB.open": true
-      }
-    },
-    "@metamask/notification-services-controller>firebase>@firebase/installations": {
-      "globals": {
-        "BroadcastChannel": true,
-        "Headers": true,
-        "btoa": true,
-        "console.error": true,
-        "crypto": true,
-        "fetch": true,
-        "msCrypto": true,
-        "navigator.onLine": true,
-        "setTimeout": true
-      },
-      "packages": {
-        "@metamask/notification-services-controller>firebase>@firebase/app": true,
-        "@metamask/notification-services-controller>firebase>@firebase/app>@firebase/component": true,
-        "@metamask/notification-services-controller>firebase>@firebase/app>idb": true,
-        "@metamask/notification-services-controller>firebase>@firebase/util": true
-      }
-    },
-    "@metamask/notification-services-controller>firebase>@firebase/messaging": {
-      "globals": {
-        "Headers": true,
-        "Notification.maxActions": true,
-        "Notification.permission": true,
-        "Notification.requestPermission": true,
-        "PushSubscription.prototype.hasOwnProperty": true,
-        "ServiceWorkerRegistration": true,
-        "URL": true,
-        "addEventListener": true,
-        "atob": true,
-        "btoa": true,
-        "clients.matchAll": true,
-        "clients.openWindow": true,
-        "console.warn": true,
-        "document": true,
-        "fetch": true,
-        "indexedDB": true,
-        "location.href": true,
-        "location.origin": true,
-        "navigator": true,
-        "origin.replace": true,
-        "registration.showNotification": true,
-        "setTimeout": true
-      },
-      "packages": {
-        "@metamask/notification-services-controller>firebase>@firebase/app": true,
-        "@metamask/notification-services-controller>firebase>@firebase/app>@firebase/component": true,
-        "@metamask/notification-services-controller>firebase>@firebase/app>idb": true,
-        "@metamask/notification-services-controller>firebase>@firebase/installations": true,
-        "@metamask/notification-services-controller>firebase>@firebase/util": true,
-        "@swc/helpers>tslib": true
-      }
-    },
-    "@metamask/notification-services-controller>firebase>@firebase/util": {
-      "globals": {
-        "atob": true,
-        "browser": true,
-        "btoa": true,
-        "chrome": true,
-        "console": true,
-        "document": true,
-        "indexedDB": true,
-        "navigator": true,
-        "process": true,
-        "self": true,
-        "setTimeout": true
-      },
-      "packages": {
-        "process": true
-      }
-    },
-    "@metamask/object-multiplex": {
-      "globals": {
-        "console.warn": true
-      },
-      "packages": {
-        "@metamask/object-multiplex>once": true,
-        "readable-stream": true
-      }
-    },
-    "@metamask/object-multiplex>once": {
-      "packages": {
-        "@metamask/object-multiplex>once>wrappy": true
-      }
-    },
-    "@metamask/obs-store": {
-      "packages": {
-        "@metamask/safe-event-emitter": true,
-        "readable-stream": true
-      }
-    },
-    "@metamask/permission-controller": {
-      "globals": {
-        "console.error": true
+        "console.error": true
       },
       "packages": {
         "@metamask/base-controller": true,
@@ -2069,32 +1561,12 @@
         "nanoid": true
       }
     },
-    "@metamask/permission-controller>nanoid": {
-      "globals": {
-        "crypto.getRandomValues": true
-      }
-    },
     "@metamask/permission-log-controller": {
       "packages": {
         "@metamask/base-controller": true,
         "@metamask/permission-log-controller>@metamask/utils": true
       }
     },
-    "@metamask/permission-log-controller>@metamask/utils": {
-      "globals": {
-        "TextDecoder": true,
-        "TextEncoder": true
-      },
-      "packages": {
-        "@metamask/utils>@metamask/superstruct": true,
-        "@metamask/utils>@scure/base": true,
-        "@metamask/utils>pony-cause": true,
-        "@noble/hashes": true,
-        "browserify>buffer": true,
-        "nock>debug": true,
-        "semver": true
-      }
-    },
     "@metamask/phishing-controller": {
       "globals": {
         "TextEncoder": true,
@@ -2103,12 +1575,12 @@
         "fetch": true
       },
       "packages": {
-        "@ethereumjs/tx>ethereum-cryptography": true,
         "@metamask/base-controller": true,
         "@metamask/controller-utils": true,
         "@noble/hashes": true,
-        "punycode": true,
-        "webpack-cli>fastest-levenshtein": true
+        "@ethereumjs/tx>ethereum-cryptography": true,
+        "webpack-cli>fastest-levenshtein": true,
+        "punycode": true
       }
     },
     "@metamask/polling-controller": {
@@ -2139,21 +1611,6 @@
         "readable-stream": true
       }
     },
-    "@metamask/post-message-stream>@metamask/utils": {
-      "globals": {
-        "TextDecoder": true,
-        "TextEncoder": true
-      },
-      "packages": {
-        "@metamask/utils>@metamask/superstruct": true,
-        "@metamask/utils>@scure/base": true,
-        "@metamask/utils>pony-cause": true,
-        "@noble/hashes": true,
-        "browserify>buffer": true,
-        "nock>debug": true,
-        "semver": true
-      }
-    },
     "@metamask/ppom-validator": {
       "globals": {
         "URL": true,
@@ -2163,48 +1620,11 @@
       "packages": {
         "@metamask/base-controller": true,
         "@metamask/controller-utils": true,
-        "@metamask/eth-query>json-rpc-random-id": true,
+        "await-semaphore": true,
+        "browserify>buffer": true,
         "@metamask/ppom-validator>crypto-js": true,
         "@metamask/ppom-validator>elliptic": true,
-        "await-semaphore": true,
-        "browserify>buffer": true
-      }
-    },
-    "@metamask/ppom-validator>crypto-js": {
-      "globals": {
-        "crypto": true,
-        "define": true,
-        "msCrypto": true
-      },
-      "packages": {
-        "browserify>browser-resolve": true
-      }
-    },
-    "@metamask/ppom-validator>elliptic": {
-      "packages": {
-        "@metamask/ppom-validator>elliptic>brorand": true,
-        "@metamask/ppom-validator>elliptic>hmac-drbg": true,
-        "@metamask/ppom-validator>elliptic>minimalistic-assert": true,
-        "@metamask/ppom-validator>elliptic>minimalistic-crypto-utils": true,
-        "bn.js": true,
-        "ethers>@ethersproject/sha2>hash.js": true,
-        "pumpify>inherits": true
-      }
-    },
-    "@metamask/ppom-validator>elliptic>brorand": {
-      "globals": {
-        "crypto": true,
-        "msCrypto": true
-      },
-      "packages": {
-        "browserify>browser-resolve": true
-      }
-    },
-    "@metamask/ppom-validator>elliptic>hmac-drbg": {
-      "packages": {
-        "@metamask/ppom-validator>elliptic>minimalistic-assert": true,
-        "@metamask/ppom-validator>elliptic>minimalistic-crypto-utils": true,
-        "ethers>@ethersproject/sha2>hash.js": true
+        "@metamask/eth-query>json-rpc-random-id": true
       }
     },
     "@metamask/preferences-controller": {
@@ -2234,55 +1654,10 @@
         "@metamask/keyring-controller": true,
         "@metamask/network-controller": true,
         "@metamask/profile-sync-controller>@noble/ciphers": true,
-        "@metamask/profile-sync-controller>siwe": true,
         "@noble/hashes": true,
         "browserify>buffer": true,
-        "loglevel": true
-      }
-    },
-    "@metamask/profile-sync-controller>@noble/ciphers": {
-      "globals": {
-        "TextDecoder": true,
-        "TextEncoder": true,
-        "crypto": true
-      }
-    },
-    "@metamask/profile-sync-controller>siwe": {
-      "globals": {
-        "console.error": true,
-        "console.warn": true
-      },
-      "packages": {
-        "@metamask/controller-utils>@spruceid/siwe-parser>valid-url": true,
-        "@metamask/profile-sync-controller>siwe>@spruceid/siwe-parser": true,
-        "@metamask/profile-sync-controller>siwe>@stablelib/random": true,
-        "ethers": true
-      }
-    },
-    "@metamask/profile-sync-controller>siwe>@spruceid/siwe-parser": {
-      "globals": {
-        "console.error": true,
-        "console.log": true
-      },
-      "packages": {
-        "@metamask/controller-utils>@spruceid/siwe-parser>apg-js": true,
-        "@noble/hashes": true
-      }
-    },
-    "@metamask/profile-sync-controller>siwe>@stablelib/random": {
-      "globals": {
-        "crypto": true,
-        "msCrypto": true
-      },
-      "packages": {
-        "@metamask/profile-sync-controller>siwe>@stablelib/random>@stablelib/binary": true,
-        "@metamask/profile-sync-controller>siwe>@stablelib/random>@stablelib/wipe": true,
-        "browserify>browser-resolve": true
-      }
-    },
-    "@metamask/profile-sync-controller>siwe>@stablelib/random>@stablelib/binary": {
-      "packages": {
-        "@metamask/profile-sync-controller>siwe>@stablelib/random>@stablelib/binary>@stablelib/int": true
+        "loglevel": true,
+        "@metamask/profile-sync-controller>siwe": true
       }
     },
     "@metamask/queued-request-controller": {
@@ -2304,12 +1679,16 @@
         "@metamask/rate-limit-controller>@metamask/utils": true
       }
     },
-    "@metamask/rate-limit-controller>@metamask/base-controller": {
-      "globals": {
-        "setTimeout": true
-      },
+    "@metamask/remote-feature-flag-controller": {
       "packages": {
-        "immer": true
+        "@metamask/base-controller": true,
+        "cockatiel": true
+      }
+    },
+    "@metamask/rpc-errors": {
+      "packages": {
+        "@metamask/utils": true,
+        "@metamask/rpc-errors>fast-safe-stringify": true
       }
     },
     "@metamask/rate-limit-controller>@metamask/rpc-errors": {
@@ -2318,61 +1697,9 @@
         "@metamask/rpc-errors>fast-safe-stringify": true
       }
     },
-    "@metamask/rate-limit-controller>@metamask/rpc-errors>@metamask/utils": {
+    "@metamask/safe-event-emitter": {
       "globals": {
-        "TextDecoder": true,
-        "TextEncoder": true
-      },
-      "packages": {
-        "@metamask/utils>@metamask/superstruct": true,
-        "@metamask/utils>@scure/base": true,
-        "@metamask/utils>pony-cause": true,
-        "@noble/hashes": true,
-        "browserify>buffer": true,
-        "nock>debug": true,
-        "semver": true
-      }
-    },
-    "@metamask/rate-limit-controller>@metamask/utils": {
-      "globals": {
-        "TextDecoder": true,
-        "TextEncoder": true
-      },
-      "packages": {
-        "@metamask/utils>@metamask/superstruct": true,
-        "@metamask/utils>@scure/base": true,
-        "@metamask/utils>pony-cause": true,
-        "@noble/hashes": true,
-        "browserify>buffer": true,
-        "nock>debug": true,
-        "semver": true
-      }
-    },
-    "@metamask/remote-feature-flag-controller": {
-      "packages": {
-        "@metamask/base-controller": true,
-        "cockatiel": true
-      }
-    },
-    "@metamask/rpc-errors": {
-      "packages": {
-        "@metamask/rpc-errors>fast-safe-stringify": true,
-        "@metamask/utils": true
-      }
-    },
-    "@metamask/rpc-methods-flask>nanoid": {
-      "globals": {
-        "crypto.getRandomValues": true
-      }
-    },
-    "@metamask/rpc-methods>nanoid": {
-      "globals": {
-        "crypto.getRandomValues": true
-      }
-    },
-    "@metamask/safe-event-emitter": {
-      "globals": {
-        "setTimeout": true
+        "setTimeout": true
       },
       "packages": {
         "webpack>events": true
@@ -2387,12 +1714,6 @@
         "@metamask/utils>@scure/base": true
       }
     },
-    "@metamask/scure-bip39>@noble/hashes": {
-      "globals": {
-        "TextEncoder": true,
-        "crypto": true
-      }
-    },
     "@metamask/selected-network-controller": {
       "packages": {
         "@metamask/base-controller": true,
@@ -2406,40 +1727,14 @@
       "packages": {
         "@metamask/base-controller": true,
         "@metamask/controller-utils": true,
+        "@metamask/signature-controller>@metamask/eth-sig-util": true,
         "@metamask/keyring-controller": true,
         "@metamask/logging-controller": true,
-        "@metamask/message-manager>jsonschema": true,
-        "@metamask/signature-controller>@metamask/eth-sig-util": true,
         "@metamask/utils": true,
         "browserify>buffer": true,
-        "uuid": true,
-        "webpack>events": true
-      }
-    },
-    "@metamask/signature-controller>@metamask/eth-sig-util": {
-      "packages": {
-        "@ethereumjs/tx>@ethereumjs/util": true,
-        "@ethereumjs/tx>ethereum-cryptography": true,
-        "@metamask/abi-utils": true,
-        "@metamask/eth-sig-util>tweetnacl": true,
-        "@metamask/signature-controller>@metamask/eth-sig-util>@metamask/utils": true,
-        "@metamask/utils>@scure/base": true,
-        "browserify>buffer": true
-      }
-    },
-    "@metamask/signature-controller>@metamask/eth-sig-util>@metamask/utils": {
-      "globals": {
-        "TextDecoder": true,
-        "TextEncoder": true
-      },
-      "packages": {
-        "@metamask/utils>@metamask/superstruct": true,
-        "@metamask/utils>@scure/base": true,
-        "@metamask/utils>pony-cause": true,
-        "@noble/hashes": true,
-        "browserify>buffer": true,
-        "nock>debug": true,
-        "semver": true
+        "webpack>events": true,
+        "@metamask/message-manager>jsonschema": true,
+        "uuid": true
       }
     },
     "@metamask/smart-transactions-controller": {
@@ -2452,60 +1747,19 @@
         "setInterval": true
       },
       "packages": {
+        "@metamask/smart-transactions-controller>@ethereumjs/tx": true,
+        "@metamask/smart-transactions-controller>@ethereumjs/util": true,
         "@ethersproject/bytes": true,
         "@metamask/controller-utils": true,
         "@metamask/eth-query": true,
         "@metamask/polling-controller": true,
-        "@metamask/smart-transactions-controller>@ethereumjs/tx": true,
-        "@metamask/smart-transactions-controller>@ethereumjs/util": true,
-        "@metamask/smart-transactions-controller>bignumber.js": true,
         "@metamask/transaction-controller": true,
+        "@metamask/smart-transactions-controller>bignumber.js": true,
         "browserify>buffer": true,
         "fast-json-patch": true,
         "lodash": true
       }
     },
-    "@metamask/smart-transactions-controller>@ethereumjs/tx": {
-      "packages": {
-        "@ethereumjs/tx>ethereum-cryptography": true,
-        "@metamask/smart-transactions-controller>@ethereumjs/tx>@ethereumjs/common": true,
-        "@metamask/smart-transactions-controller>@ethereumjs/tx>@ethereumjs/rlp": true,
-        "@metamask/smart-transactions-controller>@ethereumjs/util": true
-      }
-    },
-    "@metamask/smart-transactions-controller>@ethereumjs/tx>@ethereumjs/common": {
-      "packages": {
-        "@metamask/smart-transactions-controller>@ethereumjs/util": true,
-        "webpack>events": true
-      }
-    },
-    "@metamask/smart-transactions-controller>@ethereumjs/tx>@ethereumjs/rlp": {
-      "globals": {
-        "TextEncoder": true
-      }
-    },
-    "@metamask/smart-transactions-controller>@ethereumjs/util": {
-      "globals": {
-        "console.warn": true,
-        "fetch": true
-      },
-      "packages": {
-        "@ethereumjs/tx>ethereum-cryptography": true,
-        "@metamask/smart-transactions-controller>@ethereumjs/tx>@ethereumjs/rlp": true,
-        "webpack>events": 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": {
         "DecompressionStream": true,
@@ -2523,72 +1777,22 @@
         "@metamask/permission-controller": true,
         "@metamask/post-message-stream": true,
         "@metamask/rpc-errors": true,
-        "@metamask/snaps-controllers>@xstate/fsm": true,
-        "@metamask/snaps-controllers>concat-stream": true,
-        "@metamask/snaps-controllers>get-npm-tarball-url": true,
-        "@metamask/snaps-controllers>readable-web-to-node-stream": true,
-        "@metamask/snaps-controllers>tar-stream": true,
+        "@metamask/snaps-utils>@metamask/snaps-registry": true,
         "@metamask/snaps-rpc-methods": true,
         "@metamask/snaps-sdk": true,
         "@metamask/snaps-utils": true,
-        "@metamask/snaps-utils>@metamask/snaps-registry": true,
         "@metamask/utils": true,
+        "@metamask/snaps-controllers>@xstate/fsm": true,
         "browserify>browserify-zlib": true,
+        "@metamask/snaps-controllers>concat-stream": true,
         "eslint>fast-deep-equal": true,
+        "@metamask/snaps-controllers>get-npm-tarball-url": true,
         "immer": true,
         "nanoid": true,
         "readable-stream": true,
-        "semver": true
-      }
-    },
-    "@metamask/snaps-controllers-flask>nanoid": {
-      "globals": {
-        "crypto.getRandomValues": true
-      }
-    },
-    "@metamask/snaps-controllers>concat-stream": {
-      "packages": {
-        "browserify>buffer": true,
-        "browserify>concat-stream>typedarray": true,
-        "pumpify>inherits": true,
-        "readable-stream": true,
-        "terser>source-map-support>buffer-from": true
-      }
-    },
-    "@metamask/snaps-controllers>nanoid": {
-      "globals": {
-        "crypto.getRandomValues": true
-      }
-    },
-    "@metamask/snaps-controllers>readable-web-to-node-stream": {
-      "packages": {
-        "readable-stream": true
-      }
-    },
-    "@metamask/snaps-controllers>tar-stream": {
-      "packages": {
-        "@metamask/snaps-controllers>tar-stream>b4a": true,
-        "@metamask/snaps-controllers>tar-stream>fast-fifo": true,
-        "@metamask/snaps-controllers>tar-stream>streamx": true,
-        "browserify>browser-resolve": true
-      }
-    },
-    "@metamask/snaps-controllers>tar-stream>b4a": {
-      "globals": {
-        "TextDecoder": true,
-        "TextEncoder": true
-      }
-    },
-    "@metamask/snaps-controllers>tar-stream>streamx": {
-      "packages": {
-        "@metamask/snaps-controllers>tar-stream>fast-fifo": true,
-        "@metamask/snaps-controllers>tar-stream>streamx>queue-tick": true,
-        "webpack>events": true
-      }
-    },
-    "@metamask/snaps-controllers>tar-stream>streamx>queue-tick": {
-      "globals": {
-        "queueMicrotask": true
+        "@metamask/snaps-controllers>readable-web-to-node-stream": true,
+        "semver": true,
+        "@metamask/snaps-controllers>tar-stream": true
       }
     },
     "@metamask/snaps-execution-environments": {
@@ -2601,15 +1805,23 @@
         "@metamask/utils": true
       }
     },
+    "@metamask/snaps-utils>@metamask/snaps-registry": {
+      "packages": {
+        "@metamask/utils>@metamask/superstruct": true,
+        "@metamask/utils": true,
+        "@ethereumjs/tx>ethereum-cryptography>@noble/curves": true,
+        "@noble/hashes": true
+      }
+    },
     "@metamask/snaps-rpc-methods": {
       "packages": {
+        "@metamask/snaps-sdk>@metamask/key-tree": true,
         "@metamask/permission-controller": true,
         "@metamask/rpc-errors": true,
         "@metamask/snaps-sdk": true,
-        "@metamask/snaps-sdk>@metamask/key-tree": true,
         "@metamask/snaps-utils": true,
-        "@metamask/utils": true,
         "@metamask/utils>@metamask/superstruct": true,
+        "@metamask/utils": true,
         "@noble/hashes": true
       }
     },
@@ -2619,20 +1831,8 @@
       },
       "packages": {
         "@metamask/rpc-errors": true,
-        "@metamask/utils": true,
-        "@metamask/utils>@metamask/superstruct": true
-      }
-    },
-    "@metamask/snaps-sdk>@metamask/key-tree": {
-      "globals": {
-        "crypto.subtle": true
-      },
-      "packages": {
-        "@ethereumjs/tx>ethereum-cryptography>@noble/curves": true,
-        "@metamask/scure-bip39": true,
-        "@metamask/utils": true,
-        "@metamask/utils>@scure/base": true,
-        "@noble/hashes": true
+        "@metamask/utils>@metamask/superstruct": true,
+        "@metamask/utils": true
       }
     },
     "@metamask/snaps-utils": {
@@ -2651,86 +1851,35 @@
         "fetch": true
       },
       "packages": {
+        "@metamask/snaps-sdk>@metamask/key-tree": true,
         "@metamask/permission-controller": true,
         "@metamask/rpc-errors": true,
-        "@metamask/snaps-sdk": true,
-        "@metamask/snaps-sdk>@metamask/key-tree": true,
         "@metamask/snaps-utils>@metamask/slip44": true,
+        "@metamask/snaps-sdk": true,
+        "@metamask/utils>@metamask/superstruct": true,
+        "@metamask/utils": true,
+        "@noble/hashes": true,
+        "@metamask/utils>@scure/base": true,
+        "chalk": true,
         "@metamask/snaps-utils>cron-parser": true,
         "@metamask/snaps-utils>fast-json-stable-stringify": true,
         "@metamask/snaps-utils>fast-xml-parser": true,
         "@metamask/snaps-utils>marked": true,
         "@metamask/snaps-utils>rfdc": true,
-        "@metamask/snaps-utils>validate-npm-package-name": true,
-        "@metamask/utils": true,
-        "@metamask/utils>@metamask/superstruct": true,
-        "@metamask/utils>@scure/base": true,
-        "@noble/hashes": true,
-        "chalk": true,
-        "semver": true
-      }
-    },
-    "@metamask/snaps-utils>@metamask/snaps-registry": {
-      "packages": {
-        "@ethereumjs/tx>ethereum-cryptography>@noble/curves": true,
-        "@metamask/utils": true,
-        "@metamask/utils>@metamask/superstruct": true,
-        "@noble/hashes": true
-      }
-    },
-    "@metamask/snaps-utils>cron-parser": {
-      "packages": {
-        "browserify>browser-resolve": true,
-        "luxon": true
+        "semver": true,
+        "@metamask/snaps-utils>validate-npm-package-name": true
       }
     },
-    "@metamask/snaps-utils>fast-xml-parser": {
+    "@metamask/transaction-controller": {
       "globals": {
-        "entityName": true,
-        "val": true
+        "clearTimeout": true,
+        "console.error": true,
+        "fetch": true,
+        "setTimeout": true
       },
       "packages": {
-        "@metamask/snaps-utils>fast-xml-parser>strnum": true
-      }
-    },
-    "@metamask/snaps-utils>marked": {
-      "globals": {
-        "console.error": true,
-        "console.warn": true,
-        "define": 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": {
-        "process": true,
-        "semver": true
-      }
-    },
-    "@metamask/test-bundler>@ethersproject/networks": {
-      "packages": {
-        "ethers>@ethersproject/logger": true
-      }
-    },
-    "@metamask/transaction-controller": {
-      "globals": {
-        "clearTimeout": true,
-        "console.error": true,
-        "fetch": true,
-        "setTimeout": true
-      },
-      "packages": {
-        "@ethereumjs/tx": true,
         "@ethereumjs/tx>@ethereumjs/common": true,
+        "@ethereumjs/tx": true,
         "@ethereumjs/tx>@ethereumjs/util": true,
         "@ethersproject/abi": true,
         "@ethersproject/contracts": true,
@@ -2740,34 +1889,18 @@
         "@metamask/eth-query": true,
         "@metamask/gas-fee-controller": true,
         "@metamask/metamask-eth-abis": true,
-        "@metamask/name-controller>async-mutex": true,
         "@metamask/network-controller": true,
-        "@metamask/rpc-errors": true,
         "@metamask/transaction-controller>@metamask/nonce-tracker": true,
+        "@metamask/rpc-errors": true,
         "@metamask/utils": true,
+        "@metamask/name-controller>async-mutex": true,
         "bn.js": true,
         "browserify>buffer": true,
         "eth-method-registry": true,
+        "webpack>events": true,
         "fast-json-patch": true,
         "lodash": true,
-        "uuid": true,
-        "webpack>events": true
-      }
-    },
-    "@metamask/transaction-controller>@metamask/nonce-tracker": {
-      "packages": {
-        "@ethersproject/providers": true,
-        "@metamask/transaction-controller>@metamask/nonce-tracker>async-mutex": true,
-        "browserify>assert": true
-      }
-    },
-    "@metamask/transaction-controller>@metamask/nonce-tracker>async-mutex": {
-      "globals": {
-        "clearTimeout": true,
-        "setTimeout": true
-      },
-      "packages": {
-        "@swc/helpers>tslib": true
+        "uuid": true
       }
     },
     "@metamask/user-operation-controller": {
@@ -2781,13 +1914,13 @@
         "@metamask/gas-fee-controller": true,
         "@metamask/polling-controller": true,
         "@metamask/rpc-errors": true,
+        "@metamask/utils>@metamask/superstruct": true,
         "@metamask/transaction-controller": true,
         "@metamask/utils": true,
-        "@metamask/utils>@metamask/superstruct": true,
         "bn.js": true,
+        "webpack>events": true,
         "lodash": true,
-        "uuid": true,
-        "webpack>events": true
+        "uuid": true
       }
     },
     "@metamask/utils": {
@@ -2797,131 +1930,431 @@
       },
       "packages": {
         "@metamask/utils>@metamask/superstruct": true,
-        "@metamask/utils>@scure/base": true,
-        "@metamask/utils>pony-cause": true,
         "@noble/hashes": true,
+        "@metamask/utils>@scure/base": true,
         "browserify>buffer": true,
         "nock>debug": true,
+        "@metamask/utils>pony-cause": true,
         "semver": true
       }
     },
-    "@metamask/utils>@scure/base": {
+    "@metamask/abi-utils>@metamask/utils": {
       "globals": {
         "TextDecoder": true,
         "TextEncoder": true
-      }
-    },
-    "@ngraveio/bc-ur": {
+      },
       "packages": {
-        "@ngraveio/bc-ur>@keystonehq/alias-sampling": true,
-        "@ngraveio/bc-ur>bignumber.js": true,
-        "@ngraveio/bc-ur>cbor-sync": true,
-        "@ngraveio/bc-ur>crc": true,
-        "@ngraveio/bc-ur>jsbi": true,
-        "addons-linter>sha.js": true,
-        "browserify>assert": true,
-        "browserify>buffer": true
+        "@metamask/utils>@metamask/superstruct": true,
+        "@noble/hashes": true,
+        "@metamask/utils>@scure/base": true,
+        "browserify>buffer": true,
+        "nock>debug": true,
+        "@metamask/utils>pony-cause": true,
+        "semver": true
       }
     },
-    "@ngraveio/bc-ur>assert>object-is": {
+    "@metamask/browser-passworder>@metamask/utils": {
+      "globals": {
+        "TextDecoder": true,
+        "TextEncoder": true
+      },
       "packages": {
-        "string.prototype.matchall>call-bind": true,
-        "string.prototype.matchall>define-properties": true
+        "@metamask/utils>@metamask/superstruct": true,
+        "@noble/hashes": true,
+        "@metamask/utils>@scure/base": true,
+        "browserify>buffer": true,
+        "nock>debug": true,
+        "@metamask/utils>pony-cause": true,
+        "semver": true
       }
     },
-    "@ngraveio/bc-ur>bignumber.js": {
+    "@metamask/eth-token-tracker>@metamask/eth-block-tracker>@metamask/utils": {
       "globals": {
-        "crypto": true,
-        "define": true
+        "TextDecoder": true,
+        "TextEncoder": true
+      },
+      "packages": {
+        "@metamask/utils>@metamask/superstruct": true,
+        "@noble/hashes": true,
+        "@metamask/utils>@scure/base": true,
+        "browserify>buffer": true,
+        "nock>debug": true,
+        "@metamask/utils>pony-cause": true,
+        "semver": true
       }
     },
-    "@ngraveio/bc-ur>cbor-sync": {
+    "@metamask/network-controller>@metamask/eth-block-tracker>@metamask/utils": {
       "globals": {
-        "define": true
+        "TextDecoder": true,
+        "TextEncoder": true
       },
       "packages": {
-        "browserify>buffer": true
+        "@metamask/utils>@metamask/superstruct": true,
+        "@noble/hashes": true,
+        "@metamask/utils>@scure/base": true,
+        "browserify>buffer": true,
+        "nock>debug": true,
+        "@metamask/utils>pony-cause": true,
+        "semver": true
       }
     },
-    "@ngraveio/bc-ur>crc": {
+    "@metamask/keyring-controller>@metamask/eth-hd-keyring>@metamask/utils": {
+      "globals": {
+        "TextDecoder": true,
+        "TextEncoder": true
+      },
       "packages": {
-        "browserify>buffer": true
+        "@metamask/utils>@metamask/superstruct": true,
+        "@noble/hashes": true,
+        "@metamask/utils>@scure/base": true,
+        "browserify>buffer": true,
+        "nock>debug": true,
+        "@metamask/utils>pony-cause": true,
+        "semver": true
       }
     },
-    "@ngraveio/bc-ur>jsbi": {
+    "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/utils": {
       "globals": {
-        "define": true
+        "TextDecoder": true,
+        "TextEncoder": true
+      },
+      "packages": {
+        "@metamask/utils>@metamask/superstruct": true,
+        "@noble/hashes": true,
+        "@metamask/utils>@scure/base": true,
+        "browserify>buffer": true,
+        "nock>debug": true,
+        "@metamask/utils>pony-cause": true,
+        "semver": true
       }
     },
-    "@noble/hashes": {
+    "@metamask/eth-json-rpc-middleware>@metamask/utils": {
       "globals": {
-        "TextEncoder": true,
-        "crypto": true
+        "TextDecoder": true,
+        "TextEncoder": true
+      },
+      "packages": {
+        "@metamask/utils>@metamask/superstruct": true,
+        "@noble/hashes": true,
+        "@metamask/utils>@scure/base": true,
+        "browserify>buffer": true,
+        "nock>debug": true,
+        "@metamask/utils>pony-cause": true,
+        "semver": true
       }
     },
-    "@popperjs/core": {
+    "@metamask/eth-sig-util>@metamask/utils": {
       "globals": {
-        "Element": true,
-        "HTMLElement": true,
-        "ShadowRoot": true,
-        "console.error": true,
-        "console.warn": true,
-        "document": true,
-        "navigator.userAgent": true
+        "TextDecoder": true,
+        "TextEncoder": true
+      },
+      "packages": {
+        "@metamask/utils>@metamask/superstruct": true,
+        "@noble/hashes": true,
+        "@metamask/utils>@scure/base": true,
+        "browserify>buffer": true,
+        "nock>debug": true,
+        "@metamask/utils>pony-cause": true,
+        "semver": true
       }
     },
-    "@reduxjs/toolkit": {
+    "@metamask/keyring-controller>@metamask/eth-sig-util>@metamask/utils": {
       "globals": {
-        "AbortController": true,
-        "__REDUX_DEVTOOLS_EXTENSION_COMPOSE__": true,
-        "__REDUX_DEVTOOLS_EXTENSION__": true,
-        "console": true,
-        "queueMicrotask": true,
-        "requestAnimationFrame": true,
-        "setTimeout": true
+        "TextDecoder": true,
+        "TextEncoder": true
       },
       "packages": {
-        "@reduxjs/toolkit>reselect": true,
-        "immer": true,
-        "process": true,
-        "redux": true,
-        "redux-thunk": true
+        "@metamask/utils>@metamask/superstruct": true,
+        "@noble/hashes": true,
+        "@metamask/utils>@scure/base": true,
+        "browserify>buffer": true,
+        "nock>debug": true,
+        "@metamask/utils>pony-cause": true,
+        "semver": true
       }
     },
-    "@segment/loosely-validate-event": {
+    "@metamask/signature-controller>@metamask/eth-sig-util>@metamask/utils": {
+      "globals": {
+        "TextDecoder": true,
+        "TextEncoder": true
+      },
       "packages": {
-        "@segment/loosely-validate-event>component-type": true,
-        "@segment/loosely-validate-event>join-component": true,
-        "browserify>assert": true,
-        "browserify>buffer": true
+        "@metamask/utils>@metamask/superstruct": true,
+        "@noble/hashes": true,
+        "@metamask/utils>@scure/base": true,
+        "browserify>buffer": true,
+        "nock>debug": true,
+        "@metamask/utils>pony-cause": true,
+        "semver": true
       }
     },
-    "@sentry/browser": {
+    "@metamask/keyring-controller>@metamask/eth-simple-keyring>@metamask/utils": {
       "globals": {
-        "PerformanceObserver.supportedEntryTypes": true,
-        "Request": true,
-        "URL": true,
-        "XMLHttpRequest.prototype": true,
-        "__SENTRY_DEBUG__": true,
-        "__SENTRY_RELEASE__": true,
-        "addEventListener": true,
-        "console.error": true,
-        "indexedDB.open": true,
-        "performance.timeOrigin": true,
-        "setTimeout": true
+        "TextDecoder": true,
+        "TextEncoder": true
       },
       "packages": {
-        "@sentry/browser>@sentry-internal/browser-utils": true,
-        "@sentry/browser>@sentry-internal/feedback": true,
-        "@sentry/browser>@sentry-internal/replay": true,
-        "@sentry/browser>@sentry-internal/replay-canvas": true,
-        "@sentry/browser>@sentry/core": true,
-        "@sentry/utils": true
+        "@metamask/utils>@metamask/superstruct": true,
+        "@noble/hashes": true,
+        "@metamask/utils>@scure/base": true,
+        "browserify>buffer": true,
+        "nock>debug": true,
+        "@metamask/utils>pony-cause": true,
+        "semver": true
       }
     },
-    "@sentry/browser>@sentry-internal/browser-utils": {
+    "@metamask/eth-snap-keyring>@metamask/utils": {
       "globals": {
-        "PerformanceEventTiming.prototype": true,
+        "TextDecoder": true,
+        "TextEncoder": true
+      },
+      "packages": {
+        "@metamask/utils>@metamask/superstruct": true,
+        "@noble/hashes": true,
+        "@metamask/utils>@scure/base": true,
+        "browserify>buffer": true,
+        "nock>debug": true,
+        "@metamask/utils>pony-cause": true,
+        "semver": true
+      }
+    },
+    "@metamask/keyring-api>@metamask/utils": {
+      "globals": {
+        "TextDecoder": true,
+        "TextEncoder": true
+      },
+      "packages": {
+        "@metamask/utils>@metamask/superstruct": true,
+        "@noble/hashes": true,
+        "@metamask/utils>@scure/base": true,
+        "browserify>buffer": true,
+        "nock>debug": true,
+        "@metamask/utils>pony-cause": true,
+        "semver": true
+      }
+    },
+    "@metamask/keyring-api>@metamask/keyring-utils>@metamask/utils": {
+      "globals": {
+        "TextDecoder": true,
+        "TextEncoder": true
+      },
+      "packages": {
+        "@metamask/utils>@metamask/superstruct": true,
+        "@noble/hashes": true,
+        "@metamask/utils>@scure/base": true,
+        "browserify>buffer": true,
+        "nock>debug": true,
+        "@metamask/utils>pony-cause": true,
+        "semver": true
+      }
+    },
+    "@metamask/name-controller>@metamask/utils": {
+      "globals": {
+        "TextDecoder": true,
+        "TextEncoder": true
+      },
+      "packages": {
+        "@metamask/utils>@metamask/superstruct": true,
+        "@noble/hashes": true,
+        "@metamask/utils>@scure/base": true,
+        "browserify>buffer": true,
+        "nock>debug": true,
+        "@metamask/utils>pony-cause": true,
+        "semver": true
+      }
+    },
+    "@metamask/permission-log-controller>@metamask/utils": {
+      "globals": {
+        "TextDecoder": true,
+        "TextEncoder": true
+      },
+      "packages": {
+        "@metamask/utils>@metamask/superstruct": true,
+        "@noble/hashes": true,
+        "@metamask/utils>@scure/base": true,
+        "browserify>buffer": true,
+        "nock>debug": true,
+        "@metamask/utils>pony-cause": true,
+        "semver": true
+      }
+    },
+    "@metamask/post-message-stream>@metamask/utils": {
+      "globals": {
+        "TextDecoder": true,
+        "TextEncoder": true
+      },
+      "packages": {
+        "@metamask/utils>@metamask/superstruct": true,
+        "@noble/hashes": true,
+        "@metamask/utils>@scure/base": true,
+        "browserify>buffer": true,
+        "nock>debug": true,
+        "@metamask/utils>pony-cause": true,
+        "semver": true
+      }
+    },
+    "@metamask/rate-limit-controller>@metamask/utils": {
+      "globals": {
+        "TextDecoder": true,
+        "TextEncoder": true
+      },
+      "packages": {
+        "@metamask/utils>@metamask/superstruct": true,
+        "@noble/hashes": true,
+        "@metamask/utils>@scure/base": true,
+        "browserify>buffer": true,
+        "nock>debug": true,
+        "@metamask/utils>pony-cause": true,
+        "semver": true
+      }
+    },
+    "@metamask/rate-limit-controller>@metamask/rpc-errors>@metamask/utils": {
+      "globals": {
+        "TextDecoder": true,
+        "TextEncoder": true
+      },
+      "packages": {
+        "@metamask/utils>@metamask/superstruct": true,
+        "@noble/hashes": true,
+        "@metamask/utils>@scure/base": true,
+        "browserify>buffer": true,
+        "nock>debug": true,
+        "@metamask/utils>pony-cause": true,
+        "semver": true
+      }
+    },
+    "@ngraveio/bc-ur": {
+      "packages": {
+        "@ngraveio/bc-ur>@keystonehq/alias-sampling": true,
+        "browserify>assert": true,
+        "@ngraveio/bc-ur>bignumber.js": true,
+        "browserify>buffer": true,
+        "@ngraveio/bc-ur>cbor-sync": true,
+        "@ngraveio/bc-ur>crc": true,
+        "@ngraveio/bc-ur>jsbi": true,
+        "addons-linter>sha.js": true
+      }
+    },
+    "@metamask/profile-sync-controller>@noble/ciphers": {
+      "globals": {
+        "TextDecoder": true,
+        "TextEncoder": true,
+        "crypto": true
+      }
+    },
+    "@ethereumjs/tx>ethereum-cryptography>@noble/curves": {
+      "globals": {
+        "TextEncoder": true
+      },
+      "packages": {
+        "@noble/hashes": true
+      }
+    },
+    "@noble/hashes": {
+      "globals": {
+        "TextEncoder": true,
+        "crypto": true
+      }
+    },
+    "@metamask/scure-bip39>@noble/hashes": {
+      "globals": {
+        "TextEncoder": true,
+        "crypto": true
+      }
+    },
+    "eth-lattice-keyring>@ethereumjs/tx>ethereum-cryptography>@noble/hashes": {
+      "globals": {
+        "TextEncoder": true,
+        "crypto": true
+      }
+    },
+    "eth-lattice-keyring>gridplus-sdk>@ethereumjs/tx>ethereum-cryptography>@noble/hashes": {
+      "globals": {
+        "TextEncoder": true,
+        "crypto": true
+      }
+    },
+    "@popperjs/core": {
+      "globals": {
+        "Element": true,
+        "HTMLElement": true,
+        "ShadowRoot": true,
+        "console.error": true,
+        "console.warn": true,
+        "document": true,
+        "navigator.userAgent": true
+      }
+    },
+    "@trezor/connect-web>@trezor/connect>@trezor/protobuf>protobufjs>@protobufjs/codegen": {
+      "globals": {
+        "console.log": true
+      }
+    },
+    "@trezor/connect-web>@trezor/connect>@trezor/protobuf>protobufjs>@protobufjs/fetch": {
+      "globals": {
+        "XMLHttpRequest": true
+      },
+      "packages": {
+        "@trezor/connect-web>@trezor/connect>@trezor/protobuf>protobufjs>@protobufjs/aspromise": true,
+        "@trezor/connect-web>@trezor/connect>@trezor/protobuf>protobufjs>@protobufjs/inquire": true
+      }
+    },
+    "@reduxjs/toolkit": {
+      "globals": {
+        "AbortController": true,
+        "__REDUX_DEVTOOLS_EXTENSION_COMPOSE__": true,
+        "__REDUX_DEVTOOLS_EXTENSION__": true,
+        "console": true,
+        "queueMicrotask": true,
+        "requestAnimationFrame": true,
+        "setTimeout": true
+      },
+      "packages": {
+        "immer": true,
+        "process": true,
+        "redux": true,
+        "redux-thunk": true,
+        "@reduxjs/toolkit>reselect": true
+      }
+    },
+    "react-router-dom-v5-compat>@remix-run/router": {
+      "globals": {
+        "AbortController": true,
+        "DOMException": true,
+        "FormData": true,
+        "Headers": true,
+        "Request": true,
+        "Response": true,
+        "URL": true,
+        "URLSearchParams": true,
+        "console": true,
+        "document.defaultView": true
+      }
+    },
+    "@metamask/utils>@scure/base": {
+      "globals": {
+        "TextDecoder": true,
+        "TextEncoder": true
+      }
+    },
+    "@ethereumjs/tx>ethereum-cryptography>@scure/bip32": {
+      "packages": {
+        "@ethereumjs/tx>ethereum-cryptography>@noble/curves": true,
+        "@noble/hashes": true,
+        "@metamask/utils>@scure/base": true
+      }
+    },
+    "@segment/loosely-validate-event": {
+      "packages": {
+        "browserify>assert": true,
+        "browserify>buffer": true,
+        "@segment/loosely-validate-event>component-type": true,
+        "@segment/loosely-validate-event>join-component": true
+      }
+    },
+    "@sentry/browser>@sentry-internal/browser-utils": {
+      "globals": {
+        "PerformanceEventTiming.prototype": true,
         "PerformanceObserver": true,
         "XMLHttpRequest.prototype": true,
         "__SENTRY_DEBUG__": true,
@@ -2955,6 +2388,25 @@
         "@sentry/utils": true
       }
     },
+    "@sentry/browser>@sentry-internal/replay-canvas": {
+      "globals": {
+        "Blob": true,
+        "HTMLCanvasElement": true,
+        "HTMLImageElement": true,
+        "ImageData": true,
+        "URL.createObjectURL": true,
+        "WeakRef": true,
+        "Worker": true,
+        "cancelAnimationFrame": true,
+        "console.error": true,
+        "createImageBitmap": true,
+        "document": true
+      },
+      "packages": {
+        "@sentry/browser>@sentry/core": true,
+        "@sentry/utils": true
+      }
+    },
     "@sentry/browser>@sentry-internal/replay": {
       "globals": {
         "Blob": true,
@@ -3004,21 +2456,25 @@
         "@sentry/utils": true
       }
     },
-    "@sentry/browser>@sentry-internal/replay-canvas": {
+    "@sentry/browser": {
       "globals": {
-        "Blob": true,
-        "HTMLCanvasElement": true,
-        "HTMLImageElement": true,
-        "ImageData": true,
-        "URL.createObjectURL": true,
-        "WeakRef": true,
-        "Worker": true,
-        "cancelAnimationFrame": true,
+        "PerformanceObserver.supportedEntryTypes": true,
+        "Request": true,
+        "URL": true,
+        "XMLHttpRequest.prototype": true,
+        "__SENTRY_DEBUG__": true,
+        "__SENTRY_RELEASE__": true,
+        "addEventListener": true,
         "console.error": true,
-        "createImageBitmap": true,
-        "document": true
+        "indexedDB.open": true,
+        "performance.timeOrigin": true,
+        "setTimeout": true
       },
       "packages": {
+        "@sentry/browser>@sentry-internal/browser-utils": true,
+        "@sentry/browser>@sentry-internal/feedback": true,
+        "@sentry/browser>@sentry-internal/replay-canvas": true,
+        "@sentry/browser>@sentry-internal/replay": true,
         "@sentry/browser>@sentry/core": true,
         "@sentry/utils": true
       }
@@ -3089,45 +2545,86 @@
         "isSecureContext": true
       },
       "packages": {
-        "@solana/addresses>@solana/errors": true
+        "@solana/addresses>@solana/errors": true
+      }
+    },
+    "@solana/addresses>@solana/codecs-core": {
+      "packages": {
+        "@solana/addresses>@solana/errors": true
+      }
+    },
+    "@solana/addresses>@solana/codecs-strings": {
+      "globals": {
+        "TextDecoder": true,
+        "TextEncoder": true,
+        "atob": true,
+        "btoa": true
+      },
+      "packages": {
+        "@solana/addresses>@solana/codecs-core": true,
+        "@solana/addresses>@solana/errors": true
+      }
+    },
+    "@solana/addresses>@solana/errors": {
+      "globals": {
+        "btoa": true
+      }
+    },
+    "@metamask/controller-utils>@spruceid/siwe-parser": {
+      "globals": {
+        "console.error": true,
+        "console.log": true
+      },
+      "packages": {
+        "@noble/hashes": true,
+        "@metamask/controller-utils>@spruceid/siwe-parser>apg-js": true
+      }
+    },
+    "@metamask/profile-sync-controller>siwe>@spruceid/siwe-parser": {
+      "globals": {
+        "console.error": true,
+        "console.log": true
+      },
+      "packages": {
+        "@noble/hashes": true,
+        "@metamask/controller-utils>@spruceid/siwe-parser>apg-js": true
       }
     },
-    "@solana/addresses>@solana/codecs-core": {
+    "@metamask/profile-sync-controller>siwe>@stablelib/random>@stablelib/binary": {
       "packages": {
-        "@solana/addresses>@solana/errors": true
+        "@metamask/profile-sync-controller>siwe>@stablelib/random>@stablelib/binary>@stablelib/int": true
       }
     },
-    "@solana/addresses>@solana/codecs-strings": {
+    "@metamask/profile-sync-controller>siwe>@stablelib/random": {
       "globals": {
-        "TextDecoder": true,
-        "TextEncoder": true,
-        "atob": true,
-        "btoa": true
+        "crypto": true,
+        "msCrypto": true
       },
       "packages": {
-        "@solana/addresses>@solana/codecs-core": true,
-        "@solana/addresses>@solana/errors": true
+        "@metamask/profile-sync-controller>siwe>@stablelib/random>@stablelib/binary": true,
+        "@metamask/profile-sync-controller>siwe>@stablelib/random>@stablelib/wipe": true,
+        "browserify>browser-resolve": true
       }
     },
-    "@solana/addresses>@solana/errors": {
+    "@trezor/connect-web>@trezor/connect-common": {
       "globals": {
-        "btoa": true
-      }
-    },
-    "@storybook/addon-docs>remark-external-links>mdast-util-definitions": {
+        "console.warn": true,
+        "localStorage.getItem": true,
+        "localStorage.setItem": true,
+        "navigator": true,
+        "setTimeout": true,
+        "window": true
+      },
       "packages": {
-        "react-markdown>unist-util-visit": true
+        "@trezor/connect-web>@trezor/connect-common>@trezor/env-utils": true,
+        "@trezor/connect-web>@trezor/utils": true,
+        "@swc/helpers>tslib": true
       }
     },
-    "@storybook/addon-knobs>qs": {
+    "@metamask/eth-trezor-keyring>@trezor/connect-plugin-ethereum": {
       "packages": {
-        "string.prototype.matchall>side-channel": true
-      }
-    },
-    "@swc/helpers>tslib": {
-      "globals": {
-        "SuppressedError": true,
-        "define": true
+        "@metamask/eth-sig-util": true,
+        "@swc/helpers>tslib": true
       }
     },
     "@trezor/connect-web": {
@@ -3154,35 +2651,20 @@
         "setTimeout": true
       },
       "packages": {
-        "@swc/helpers>tslib": true,
-        "@trezor/connect-web>@trezor/connect": true,
         "@trezor/connect-web>@trezor/connect-common": true,
+        "@trezor/connect-web>@trezor/connect": true,
         "@trezor/connect-web>@trezor/utils": true,
-        "webpack>events": true
+        "webpack>events": true,
+        "@swc/helpers>tslib": true
       }
     },
     "@trezor/connect-web>@trezor/connect": {
       "packages": {
-        "@swc/helpers>tslib": true,
         "@trezor/connect-web>@trezor/connect>@trezor/protobuf": true,
         "@trezor/connect-web>@trezor/connect>@trezor/schema-utils": true,
         "@trezor/connect-web>@trezor/connect>@trezor/transport": true,
-        "@trezor/connect-web>@trezor/utils": true
-      }
-    },
-    "@trezor/connect-web>@trezor/connect-common": {
-      "globals": {
-        "console.warn": true,
-        "localStorage.getItem": true,
-        "localStorage.setItem": true,
-        "navigator": true,
-        "setTimeout": true,
-        "window": true
-      },
-      "packages": {
-        "@swc/helpers>tslib": true,
-        "@trezor/connect-web>@trezor/connect-common>@trezor/env-utils": true,
-        "@trezor/connect-web>@trezor/utils": true
+        "@trezor/connect-web>@trezor/utils": true,
+        "@swc/helpers>tslib": true
       }
     },
     "@trezor/connect-web>@trezor/connect-common>@trezor/env-utils": {
@@ -3198,54 +2680,17 @@
         "screen.width": true
       },
       "packages": {
+        "process": true,
         "@swc/helpers>tslib": true,
-        "@trezor/connect-web>@trezor/connect-common>@trezor/env-utils>ua-parser-js": true,
-        "process": true
-      }
-    },
-    "@trezor/connect-web>@trezor/connect-common>@trezor/env-utils>ua-parser-js": {
-      "globals": {
-        "define": true
+        "@trezor/connect-web>@trezor/connect-common>@trezor/env-utils>ua-parser-js": true
       }
     },
     "@trezor/connect-web>@trezor/connect>@trezor/protobuf": {
       "packages": {
-        "@swc/helpers>tslib": true,
-        "@trezor/connect-web>@trezor/connect>@trezor/protobuf>protobufjs": true,
         "@trezor/connect-web>@trezor/connect>@trezor/schema-utils": true,
-        "browserify>buffer": true
-      }
-    },
-    "@trezor/connect-web>@trezor/connect>@trezor/protobuf>protobufjs": {
-      "globals": {
-        "process": true,
-        "setTimeout": true
-      },
-      "packages": {
-        "@trezor/connect-web>@trezor/connect>@trezor/protobuf>protobufjs>@protobufjs/aspromise": true,
-        "@trezor/connect-web>@trezor/connect>@trezor/protobuf>protobufjs>@protobufjs/base64": true,
-        "@trezor/connect-web>@trezor/connect>@trezor/protobuf>protobufjs>@protobufjs/codegen": true,
-        "@trezor/connect-web>@trezor/connect>@trezor/protobuf>protobufjs>@protobufjs/eventemitter": true,
-        "@trezor/connect-web>@trezor/connect>@trezor/protobuf>protobufjs>@protobufjs/fetch": true,
-        "@trezor/connect-web>@trezor/connect>@trezor/protobuf>protobufjs>@protobufjs/float": true,
-        "@trezor/connect-web>@trezor/connect>@trezor/protobuf>protobufjs>@protobufjs/inquire": true,
-        "@trezor/connect-web>@trezor/connect>@trezor/protobuf>protobufjs>@protobufjs/path": true,
-        "@trezor/connect-web>@trezor/connect>@trezor/protobuf>protobufjs>@protobufjs/pool": true,
-        "@trezor/connect-web>@trezor/connect>@trezor/protobuf>protobufjs>@protobufjs/utf8": true
-      }
-    },
-    "@trezor/connect-web>@trezor/connect>@trezor/protobuf>protobufjs>@protobufjs/codegen": {
-      "globals": {
-        "console.log": true
-      }
-    },
-    "@trezor/connect-web>@trezor/connect>@trezor/protobuf>protobufjs>@protobufjs/fetch": {
-      "globals": {
-        "XMLHttpRequest": true
-      },
-      "packages": {
-        "@trezor/connect-web>@trezor/connect>@trezor/protobuf>protobufjs>@protobufjs/aspromise": true,
-        "@trezor/connect-web>@trezor/connect>@trezor/protobuf>protobufjs>@protobufjs/inquire": true
+        "browserify>buffer": true,
+        "@trezor/connect-web>@trezor/connect>@trezor/protobuf>protobufjs": true,
+        "@swc/helpers>tslib": true
       }
     },
     "@trezor/connect-web>@trezor/connect>@trezor/schema-utils": {
@@ -3272,16 +2717,10 @@
         "setTimeout": true
       },
       "packages": {
-        "@swc/helpers>tslib": true,
         "@trezor/connect-web>@trezor/utils>bignumber.js": true,
         "browserify>buffer": true,
-        "webpack>events": true
-      }
-    },
-    "@trezor/connect-web>@trezor/utils>bignumber.js": {
-      "globals": {
-        "crypto": true,
-        "define": true
+        "webpack>events": true,
+        "@swc/helpers>tslib": true
       }
     },
     "@welldone-software/why-did-you-render": {
@@ -3296,59 +2735,193 @@
         "setTimeout": true
       },
       "packages": {
-        "lodash": true,
-        "react": true
+        "lodash": true,
+        "react": true
+      }
+    },
+    "@zxing/browser": {
+      "globals": {
+        "HTMLElement": true,
+        "HTMLImageElement": true,
+        "HTMLVideoElement": true,
+        "clearTimeout": true,
+        "console.error": true,
+        "console.warn": true,
+        "document": true,
+        "navigator": true,
+        "setTimeout": true
+      },
+      "packages": {
+        "@zxing/library": true
+      }
+    },
+    "@zxing/library": {
+      "globals": {
+        "HTMLImageElement": true,
+        "HTMLVideoElement": true,
+        "TextDecoder": true,
+        "TextEncoder": true,
+        "URL.createObjectURL": true,
+        "btoa": true,
+        "console.log": true,
+        "console.warn": true,
+        "document": true,
+        "navigator": true,
+        "setTimeout": true
+      },
+      "packages": {
+        "@zxing/library>ts-custom-error": true
+      }
+    },
+    "@lavamoat/lavapack>readable-stream>abort-controller": {
+      "globals": {
+        "AbortController": true
+      }
+    },
+    "currency-formatter>accounting": {
+      "globals": {
+        "define": true
+      }
+    },
+    "ethers>@ethersproject/json-wallets>aes-js": {
+      "globals": {
+        "define": true
+      }
+    },
+    "eth-lattice-keyring>gridplus-sdk>aes-js": {
+      "globals": {
+        "define": true
+      }
+    },
+    "chalk>ansi-styles": {
+      "packages": {
+        "chalk>ansi-styles>color-convert": true
+      }
+    },
+    "@metamask/controller-utils>@spruceid/siwe-parser>apg-js": {
+      "packages": {
+        "browserify>buffer": true
+      }
+    },
+    "string.prototype.matchall>es-abstract>array-buffer-byte-length": {
+      "packages": {
+        "string.prototype.matchall>call-bind": true,
+        "string.prototype.matchall>es-abstract>is-array-buffer": true
+      }
+    },
+    "crypto-browserify>public-encrypt>parse-asn1>asn1.js": {
+      "packages": {
+        "bn.js": true,
+        "browserify>buffer": true,
+        "pumpify>inherits": true,
+        "@metamask/ppom-validator>elliptic>minimalistic-assert": true,
+        "browserify>vm-browserify": true
+      }
+    },
+    "browserify>assert": {
+      "globals": {
+        "Buffer": true
+      },
+      "packages": {
+        "react>object-assign": true,
+        "browserify>assert>util": true
+      }
+    },
+    "@metamask/name-controller>async-mutex": {
+      "globals": {
+        "clearTimeout": true,
+        "setTimeout": true
+      },
+      "packages": {
+        "@swc/helpers>tslib": true
+      }
+    },
+    "@metamask/transaction-controller>@metamask/nonce-tracker>async-mutex": {
+      "globals": {
+        "clearTimeout": true,
+        "setTimeout": true
+      },
+      "packages": {
+        "@swc/helpers>tslib": true
+      }
+    },
+    "string.prototype.matchall>es-abstract>available-typed-arrays": {
+      "packages": {
+        "string.prototype.matchall>es-abstract>typed-array-length>possible-typed-array-names": true
+      }
+    },
+    "await-semaphore": {
+      "packages": {
+        "process": true,
+        "browserify>timers-browserify": true
+      }
+    },
+    "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth>@ledgerhq/domain-service>axios": {
+      "globals": {
+        "Blob": true,
+        "FormData": true,
+        "URLSearchParams": true,
+        "XMLHttpRequest": true,
+        "btoa": true,
+        "console.warn": true,
+        "document": true,
+        "location.href": true,
+        "navigator": true,
+        "setTimeout": true
+      },
+      "packages": {
+        "browserify>buffer": true,
+        "axios>form-data": true,
+        "process": true
       }
     },
-    "@zxing/browser": {
+    "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth>@ledgerhq/evm-tools>axios": {
       "globals": {
-        "HTMLElement": true,
-        "HTMLImageElement": true,
-        "HTMLVideoElement": true,
-        "clearTimeout": true,
-        "console.error": true,
+        "Blob": true,
+        "FormData": true,
+        "URLSearchParams": true,
+        "XMLHttpRequest": true,
+        "btoa": true,
         "console.warn": true,
         "document": true,
+        "location.href": true,
         "navigator": true,
         "setTimeout": true
       },
       "packages": {
-        "@zxing/library": true
+        "browserify>buffer": true,
+        "axios>form-data": true,
+        "process": true
       }
     },
-    "@zxing/library": {
+    "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth>axios": {
       "globals": {
-        "HTMLImageElement": true,
-        "HTMLVideoElement": true,
-        "TextDecoder": true,
-        "TextEncoder": true,
-        "URL.createObjectURL": true,
+        "Blob": true,
+        "FormData": true,
+        "URLSearchParams": true,
+        "XMLHttpRequest": true,
         "btoa": true,
-        "console.log": true,
         "console.warn": true,
         "document": true,
+        "location.href": true,
         "navigator": true,
         "setTimeout": true
       },
       "packages": {
-        "@zxing/library>ts-custom-error": true
+        "browserify>buffer": true,
+        "axios>form-data": true,
+        "process": true
       }
     },
-    "addons-linter>sha.js": {
-      "packages": {
-        "koa>content-disposition>safe-buffer": true,
-        "pumpify>inherits": true
+    "@metamask/snaps-controllers>tar-stream>b4a": {
+      "globals": {
+        "TextDecoder": true,
+        "TextEncoder": true
       }
     },
-    "await-semaphore": {
+    "@ensdomains/content-hash>multihashes>multibase>base-x": {
       "packages": {
-        "browserify>timers-browserify": true,
-        "process": true
-      }
-    },
-    "axios>form-data": {
-      "globals": {
-        "FormData": true
+        "koa>content-disposition>safe-buffer": true
       }
     },
     "base32-encode": {
@@ -3362,136 +2935,156 @@
         "define": true
       }
     },
-    "blo": {
+    "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth>bignumber.js": {
       "globals": {
-        "btoa": true
+        "crypto": true,
+        "define": true
       }
     },
-    "bn.js": {
+    "@metamask/notification-services-controller>bignumber.js": {
       "globals": {
-        "Buffer": true
-      },
-      "packages": {
-        "browserify>browser-resolve": true
+        "crypto": true,
+        "define": true
       }
     },
-    "bowser": {
+    "@metamask/smart-transactions-controller>bignumber.js": {
       "globals": {
+        "crypto": true,
         "define": true
       }
     },
-    "browserify>assert": {
+    "@ngraveio/bc-ur>bignumber.js": {
       "globals": {
-        "Buffer": true
-      },
-      "packages": {
-        "browserify>assert>util": true,
-        "react>object-assign": true
+        "crypto": true,
+        "define": true
       }
     },
-    "browserify>assert>util": {
+    "@trezor/connect-web>@trezor/utils>bignumber.js": {
       "globals": {
-        "console.error": true,
-        "console.log": true,
-        "console.trace": true,
-        "process": true
-      },
+        "crypto": true,
+        "define": true
+      }
+    },
+    "eth-lattice-keyring>gridplus-sdk>borc>bignumber.js": {
+      "globals": {
+        "crypto": true,
+        "define": true
+      }
+    },
+    "eth-lattice-keyring>gridplus-sdk>bignumber.js": {
+      "globals": {
+        "crypto": true,
+        "define": true
+      }
+    },
+    "eth-lattice-keyring>gridplus-sdk>bitwise": {
       "packages": {
-        "browserify>assert>util>inherits": true,
-        "process": true
+        "browserify>buffer": true
       }
     },
-    "browserify>browserify-zlib": {
+    "blo": {
+      "globals": {
+        "btoa": true
+      }
+    },
+    "bn.js": {
+      "globals": {
+        "Buffer": true
+      },
       "packages": {
-        "browserify>assert": true,
-        "browserify>browserify-zlib>pako": true,
-        "browserify>buffer": true,
-        "browserify>util": true,
-        "process": true,
-        "stream-browserify": true
+        "browserify>browser-resolve": true
       }
     },
-    "browserify>buffer": {
+    "eth-lattice-keyring>gridplus-sdk>borc": {
       "globals": {
         "console": true
       },
       "packages": {
-        "base64-js": true,
-        "buffer>ieee754": true
+        "eth-lattice-keyring>gridplus-sdk>borc>bignumber.js": true,
+        "browserify>buffer": true,
+        "buffer>ieee754": true,
+        "eth-lattice-keyring>gridplus-sdk>borc>iso-url": true
       }
     },
-    "browserify>punycode": {
+    "bowser": {
       "globals": {
         "define": true
       }
     },
-    "browserify>string_decoder": {
+    "@metamask/ppom-validator>elliptic>brorand": {
+      "globals": {
+        "crypto": true,
+        "msCrypto": true
+      },
       "packages": {
-        "koa>content-disposition>safe-buffer": true
+        "browserify>browser-resolve": true
       }
     },
-    "browserify>timers-browserify": {
-      "globals": {
-        "clearInterval": true,
-        "clearTimeout": true,
-        "setInterval": true,
-        "setTimeout": true
-      },
+    "ethereumjs-util>ethereum-cryptography>browserify-aes": {
       "packages": {
-        "process": true
+        "ethereumjs-util>ethereum-cryptography>browserify-aes>buffer-xor": true,
+        "browserify>buffer": true,
+        "ethereumjs-util>create-hash>cipher-base": true,
+        "crypto-browserify>browserify-cipher>evp_bytestokey": true,
+        "pumpify>inherits": true,
+        "koa>content-disposition>safe-buffer": true
       }
     },
-    "browserify>url": {
+    "crypto-browserify>browserify-cipher": {
       "packages": {
-        "@storybook/addon-knobs>qs": true,
-        "browserify>punycode": true
+        "ethereumjs-util>ethereum-cryptography>browserify-aes": true,
+        "crypto-browserify>browserify-cipher>browserify-des": true,
+        "crypto-browserify>browserify-cipher>evp_bytestokey": true
       }
     },
-    "browserify>util": {
-      "globals": {
-        "console.error": true,
-        "console.log": true,
-        "console.trace": true
-      },
+    "crypto-browserify>browserify-cipher>browserify-des": {
       "packages": {
-        "browserify>util>is-arguments": true,
-        "browserify>util>is-typed-array": true,
-        "browserify>util>which-typed-array": true,
-        "koa>is-generator-function": true,
-        "process": true,
+        "browserify>buffer": true,
+        "ethereumjs-util>create-hash>cipher-base": true,
+        "crypto-browserify>browserify-cipher>browserify-des>des.js": true,
         "pumpify>inherits": true
       }
     },
-    "browserify>util>is-arguments": {
+    "crypto-browserify>public-encrypt>browserify-rsa": {
       "packages": {
-        "koa>is-generator-function>has-tostringtag": true,
-        "string.prototype.matchall>call-bind": true
+        "bn.js": true,
+        "browserify>buffer": true,
+        "crypto-browserify>randombytes": true
       }
     },
-    "browserify>util>is-typed-array": {
+    "crypto-browserify>browserify-sign": {
       "packages": {
-        "browserify>util>which-typed-array": true
+        "bn.js": true,
+        "crypto-browserify>public-encrypt>browserify-rsa": true,
+        "browserify>buffer": true,
+        "ethereumjs-util>create-hash": true,
+        "crypto-browserify>create-hmac": true,
+        "@metamask/ppom-validator>elliptic": true,
+        "pumpify>inherits": true,
+        "crypto-browserify>public-encrypt>parse-asn1": true,
+        "stream-browserify": true
       }
     },
-    "browserify>util>which-typed-array": {
+    "browserify>browserify-zlib": {
       "packages": {
-        "browserify>util>which-typed-array>for-each": true,
-        "koa>is-generator-function>has-tostringtag": true,
-        "string.prototype.matchall>call-bind": true,
-        "string.prototype.matchall>es-abstract>available-typed-arrays": true,
-        "string.prototype.matchall>es-abstract>gopd": true
+        "browserify>assert": true,
+        "browserify>buffer": true,
+        "browserify>browserify-zlib>pako": true,
+        "process": true,
+        "stream-browserify": true,
+        "browserify>util": true
       }
     },
-    "browserify>util>which-typed-array>for-each": {
+    "ethereumjs-util>ethereum-cryptography>bs58check>bs58": {
       "packages": {
-        "string.prototype.matchall>es-abstract>is-callable": true
+        "@ensdomains/content-hash>multihashes>multibase>base-x": true
       }
     },
-    "browserify>vm-browserify": {
-      "globals": {
-        "document.body.appendChild": true,
-        "document.body.removeChild": true,
-        "document.createElement": true
+    "ethereumjs-util>ethereum-cryptography>bs58check": {
+      "packages": {
+        "ethereumjs-util>ethereum-cryptography>bs58check>bs58": true,
+        "ethereumjs-util>create-hash": true,
+        "koa>content-disposition>safe-buffer": true
       }
     },
     "buffer": {
@@ -3503,20 +3096,52 @@
         "buffer>ieee754": true
       }
     },
-    "chalk": {
+    "terser>source-map-support>buffer-from": {
       "packages": {
-        "chalk>ansi-styles": true,
-        "chalk>supports-color": true
+        "browserify>buffer": true
       }
     },
-    "chalk>ansi-styles": {
+    "ethereumjs-util>ethereum-cryptography>browserify-aes>buffer-xor": {
+      "packages": {
+        "browserify>buffer": true
+      }
+    },
+    "browserify>buffer": {
+      "globals": {
+        "console": true
+      },
+      "packages": {
+        "base64-js": true,
+        "buffer>ieee754": true
+      }
+    },
+    "@metamask/snaps-utils>validate-npm-package-name>builtins": {
+      "packages": {
+        "process": true,
+        "semver": true
+      }
+    },
+    "string.prototype.matchall>call-bind": {
+      "packages": {
+        "string.prototype.matchall>call-bind>es-define-property": true,
+        "string.prototype.matchall>call-bind>es-errors": true,
+        "browserify>has>function-bind": true,
+        "string.prototype.matchall>get-intrinsic": true,
+        "string.prototype.matchall>call-bind>set-function-length": true
+      }
+    },
+    "@ngraveio/bc-ur>cbor-sync": {
+      "globals": {
+        "define": true
+      },
       "packages": {
-        "chalk>ansi-styles>color-convert": true
+        "browserify>buffer": true
       }
     },
-    "chalk>ansi-styles>color-convert": {
+    "chalk": {
       "packages": {
-        "jest-canvas-mock>moo-color>color-name": true
+        "chalk>ansi-styles": true,
+        "chalk>supports-color": true
       }
     },
     "chart.js": {
@@ -3540,9 +3165,20 @@
         "chart.js>@kurkle/color": true
       }
     },
-    "chart.js>@kurkle/color": {
-      "globals": {
-        "define": true
+    "@ensdomains/content-hash>cids": {
+      "packages": {
+        "@ensdomains/content-hash>cids>multibase": true,
+        "@ensdomains/content-hash>multicodec": true,
+        "@ensdomains/content-hash>cids>multihashes": true,
+        "@ensdomains/content-hash>cids>uint8arrays": true
+      }
+    },
+    "ethereumjs-util>create-hash>cipher-base": {
+      "packages": {
+        "pumpify>inherits": true,
+        "koa>content-disposition>safe-buffer": true,
+        "stream-browserify": true,
+        "browserify>string_decoder": true
       }
     },
     "classnames": {
@@ -3551,6 +3187,11 @@
         "define": true
       }
     },
+    "@metamask/jazzicon>color>clone": {
+      "packages": {
+        "browserify>buffer": true
+      }
+    },
     "cockatiel": {
       "globals": {
         "AbortController": true,
@@ -3564,6 +3205,37 @@
         "process": true
       }
     },
+    "chalk>ansi-styles>color-convert": {
+      "packages": {
+        "jest-canvas-mock>moo-color>color-name": 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/jazzicon>color": {
+      "packages": {
+        "@metamask/jazzicon>color>clone": true,
+        "@metamask/jazzicon>color>color-convert": true,
+        "@metamask/jazzicon>color>color-string": true
+      }
+    },
+    "@metamask/snaps-controllers>concat-stream": {
+      "packages": {
+        "terser>source-map-support>buffer-from": true,
+        "browserify>buffer": true,
+        "pumpify>inherits": true,
+        "readable-stream": true,
+        "browserify>concat-stream>typedarray": true
+      }
+    },
     "copy-to-clipboard": {
       "globals": {
         "clipboardData": true,
@@ -3582,10 +3254,47 @@
         "copy-to-clipboard>toggle-selection": true
       }
     },
-    "copy-to-clipboard>toggle-selection": {
+    "@ethereumjs/tx>@ethereumjs/common>crc-32": {
       "globals": {
-        "document.activeElement": true,
-        "document.getSelection": true
+        "DO_NOT_EXPORT_CRC": true,
+        "define": true
+      }
+    },
+    "@ngraveio/bc-ur>crc": {
+      "packages": {
+        "browserify>buffer": true
+      }
+    },
+    "crypto-browserify>create-ecdh": {
+      "packages": {
+        "bn.js": true,
+        "browserify>buffer": true,
+        "@metamask/ppom-validator>elliptic": true
+      }
+    },
+    "ethereumjs-util>create-hash": {
+      "packages": {
+        "ethereumjs-util>create-hash>cipher-base": true,
+        "pumpify>inherits": true,
+        "ethereumjs-util>create-hash>md5.js": true,
+        "ethereumjs-util>create-hash>ripemd160": true,
+        "addons-linter>sha.js": true
+      }
+    },
+    "crypto-browserify>create-hmac": {
+      "packages": {
+        "ethereumjs-util>create-hash>cipher-base": true,
+        "ethereumjs-util>create-hash": true,
+        "pumpify>inherits": true,
+        "ethereumjs-util>create-hash>ripemd160": true,
+        "koa>content-disposition>safe-buffer": true,
+        "addons-linter>sha.js": true
+      }
+    },
+    "@metamask/snaps-utils>cron-parser": {
+      "packages": {
+        "browserify>browser-resolve": true,
+        "luxon": true
       }
     },
     "crypto-browserify": {
@@ -3593,303 +3302,484 @@
         "crypto-browserify>browserify-cipher": true,
         "crypto-browserify>browserify-sign": true,
         "crypto-browserify>create-ecdh": true,
+        "ethereumjs-util>create-hash": true,
         "crypto-browserify>create-hmac": true,
         "crypto-browserify>diffie-hellman": true,
         "crypto-browserify>pbkdf2": true,
         "crypto-browserify>public-encrypt": true,
         "crypto-browserify>randombytes": true,
-        "crypto-browserify>randomfill": true,
-        "ethereumjs-util>create-hash": true
+        "crypto-browserify>randomfill": true
       }
     },
-    "crypto-browserify>browserify-cipher": {
+    "@metamask/ppom-validator>crypto-js": {
+      "globals": {
+        "crypto": true,
+        "define": true,
+        "msCrypto": true
+      },
       "packages": {
-        "crypto-browserify>browserify-cipher>browserify-des": true,
-        "crypto-browserify>browserify-cipher>evp_bytestokey": true,
-        "ethereumjs-util>ethereum-cryptography>browserify-aes": true
+        "browserify>browser-resolve": true
       }
     },
-    "crypto-browserify>browserify-cipher>browserify-des": {
+    "react-beautiful-dnd>css-box-model": {
+      "globals": {
+        "getComputedStyle": true,
+        "pageXOffset": true,
+        "pageYOffset": true
+      },
       "packages": {
-        "browserify>buffer": true,
-        "crypto-browserify>browserify-cipher>browserify-des>des.js": true,
-        "ethereumjs-util>create-hash>cipher-base": true,
-        "pumpify>inherits": true
+        "react-router-dom>tiny-invariant": true
       }
     },
-    "crypto-browserify>browserify-cipher>browserify-des>des.js": {
+    "@material-ui/core>@material-ui/styles>jss-plugin-vendor-prefixer>css-vendor": {
+      "globals": {
+        "document.createElement": true,
+        "document.documentElement": true,
+        "getComputedStyle": true
+      },
       "packages": {
-        "@metamask/ppom-validator>elliptic>minimalistic-assert": true,
-        "pumpify>inherits": true
+        "@babel/runtime": true,
+        "@material-ui/core>@material-ui/styles>jss>is-in-browser": true
       }
     },
-    "crypto-browserify>browserify-cipher>evp_bytestokey": {
+    "currency-formatter": {
       "packages": {
-        "ethereumjs-util>create-hash>md5.js": true,
-        "koa>content-disposition>safe-buffer": true
+        "currency-formatter>accounting": true,
+        "currency-formatter>locale-currency": true,
+        "react>object-assign": true
       }
     },
-    "crypto-browserify>browserify-sign": {
+    "debounce-stream": {
+      "packages": {
+        "debounce-stream>debounce": true,
+        "debounce-stream>duplexer": true,
+        "debounce-stream>through": true
+      }
+    },
+    "debounce-stream>debounce": {
+      "globals": {
+        "clearTimeout": true,
+        "setTimeout": true
+      }
+    },
+    "nock>debug": {
+      "globals": {
+        "console": true,
+        "document": true,
+        "localStorage": true,
+        "navigator": true,
+        "process": true
+      },
+      "packages": {
+        "nock>debug>ms": true,
+        "process": true
+      }
+    },
+    "@metamask/eth-token-tracker>deep-equal": {
+      "packages": {
+        "string.prototype.matchall>es-abstract>array-buffer-byte-length": true,
+        "string.prototype.matchall>call-bind": true,
+        "@metamask/eth-token-tracker>deep-equal>es-get-iterator": true,
+        "string.prototype.matchall>get-intrinsic": true,
+        "browserify>util>is-arguments": true,
+        "string.prototype.matchall>es-abstract>is-array-buffer": true,
+        "@metamask/eth-token-tracker>deep-equal>is-date-object": true,
+        "string.prototype.matchall>es-abstract>is-regex": true,
+        "string.prototype.matchall>es-abstract>is-shared-array-buffer": true,
+        "@lavamoat/lavapack>json-stable-stringify>isarray": true,
+        "@ngraveio/bc-ur>assert>object-is": true,
+        "@lavamoat/lavapack>json-stable-stringify>object-keys": true,
+        "gulp>vinyl-fs>object.assign": true,
+        "string.prototype.matchall>regexp.prototype.flags": true,
+        "string.prototype.matchall>side-channel": true,
+        "@metamask/eth-token-tracker>deep-equal>which-boxed-primitive": true,
+        "@metamask/eth-token-tracker>deep-equal>which-collection": true,
+        "browserify>util>which-typed-array": true
+      }
+    },
+    "string.prototype.matchall>define-properties>define-data-property": {
+      "packages": {
+        "string.prototype.matchall>call-bind>es-define-property": true,
+        "string.prototype.matchall>call-bind>es-errors": true,
+        "string.prototype.matchall>es-abstract>gopd": true
+      }
+    },
+    "string.prototype.matchall>define-properties": {
+      "packages": {
+        "string.prototype.matchall>define-properties>define-data-property": true,
+        "string.prototype.matchall>es-abstract>has-property-descriptors": true,
+        "@lavamoat/lavapack>json-stable-stringify>object-keys": true
+      }
+    },
+    "crypto-browserify>browserify-cipher>browserify-des>des.js": {
+      "packages": {
+        "pumpify>inherits": true,
+        "@metamask/ppom-validator>elliptic>minimalistic-assert": true
+      }
+    },
+    "crypto-browserify>diffie-hellman": {
       "packages": {
-        "@metamask/ppom-validator>elliptic": true,
         "bn.js": true,
         "browserify>buffer": true,
-        "crypto-browserify>create-hmac": true,
-        "crypto-browserify>public-encrypt>browserify-rsa": true,
-        "crypto-browserify>public-encrypt>parse-asn1": true,
-        "ethereumjs-util>create-hash": true,
-        "pumpify>inherits": true,
+        "crypto-browserify>diffie-hellman>miller-rabin": true,
+        "crypto-browserify>randombytes": true
+      }
+    },
+    "@material-ui/core>react-transition-group>dom-helpers": {
+      "packages": {
+        "@babel/runtime": true
+      }
+    },
+    "debounce-stream>duplexer": {
+      "packages": {
         "stream-browserify": true
       }
     },
-    "crypto-browserify>create-ecdh": {
+    "ethers>@ethersproject/signing-key>elliptic": {
       "packages": {
-        "@metamask/ppom-validator>elliptic": true,
         "bn.js": true,
-        "browserify>buffer": true
+        "@metamask/ppom-validator>elliptic>brorand": true,
+        "ethers>@ethersproject/sha2>hash.js": true,
+        "@metamask/ppom-validator>elliptic>hmac-drbg": true,
+        "pumpify>inherits": true,
+        "@metamask/ppom-validator>elliptic>minimalistic-assert": true,
+        "@metamask/ppom-validator>elliptic>minimalistic-crypto-utils": true
       }
     },
-    "crypto-browserify>create-hmac": {
+    "@metamask/ppom-validator>elliptic": {
       "packages": {
-        "addons-linter>sha.js": true,
-        "ethereumjs-util>create-hash": true,
-        "ethereumjs-util>create-hash>cipher-base": true,
-        "ethereumjs-util>create-hash>ripemd160": true,
-        "koa>content-disposition>safe-buffer": true,
-        "pumpify>inherits": true
+        "bn.js": true,
+        "@metamask/ppom-validator>elliptic>brorand": true,
+        "ethers>@ethersproject/sha2>hash.js": true,
+        "@metamask/ppom-validator>elliptic>hmac-drbg": true,
+        "pumpify>inherits": true,
+        "@metamask/ppom-validator>elliptic>minimalistic-assert": true,
+        "@metamask/ppom-validator>elliptic>minimalistic-crypto-utils": true
       }
     },
-    "crypto-browserify>diffie-hellman": {
+    "eth-lattice-keyring>gridplus-sdk>elliptic": {
+      "packages": {
+        "bn.js": true,
+        "@metamask/ppom-validator>elliptic>brorand": true,
+        "ethers>@ethersproject/sha2>hash.js": true,
+        "@metamask/ppom-validator>elliptic>hmac-drbg": true,
+        "pumpify>inherits": true,
+        "@metamask/ppom-validator>elliptic>minimalistic-assert": true,
+        "@metamask/ppom-validator>elliptic>minimalistic-crypto-utils": true
+      }
+    },
+    "string.prototype.matchall>call-bind>es-define-property": {
       "packages": {
-        "bn.js": true,
-        "browserify>buffer": true,
-        "crypto-browserify>diffie-hellman>miller-rabin": true,
-        "crypto-browserify>randombytes": true
+        "string.prototype.matchall>get-intrinsic": true
       }
     },
-    "crypto-browserify>diffie-hellman>miller-rabin": {
+    "@metamask/eth-token-tracker>deep-equal>es-get-iterator": {
       "packages": {
-        "@metamask/ppom-validator>elliptic>brorand": true,
-        "bn.js": true
+        "string.prototype.matchall>call-bind": true,
+        "string.prototype.matchall>get-intrinsic": true,
+        "string.prototype.matchall>has-symbols": true,
+        "browserify>util>is-arguments": true,
+        "@metamask/eth-token-tracker>deep-equal>es-get-iterator>is-map": true,
+        "@metamask/eth-token-tracker>deep-equal>es-get-iterator>is-set": true,
+        "eslint-plugin-react>array-includes>is-string": true,
+        "@lavamoat/lavapack>json-stable-stringify>isarray": true,
+        "process": true,
+        "@metamask/eth-token-tracker>deep-equal>es-get-iterator>stop-iteration-iterator": true
       }
     },
-    "crypto-browserify>pbkdf2": {
+    "eth-lattice-keyring>gridplus-sdk>eth-eip712-util-browser": {
       "globals": {
-        "crypto": true,
-        "process": true,
-        "queueMicrotask": true,
-        "setImmediate": true,
-        "setTimeout": true
+        "intToBuffer": true
       },
       "packages": {
-        "addons-linter>sha.js": true,
-        "ethereumjs-util>create-hash": true,
-        "ethereumjs-util>create-hash>ripemd160": true,
-        "koa>content-disposition>safe-buffer": true,
-        "process": true
+        "bn.js": true,
+        "buffer": true,
+        "@metamask/ethjs>js-sha3": true
       }
     },
-    "crypto-browserify>public-encrypt": {
+    "eth-ens-namehash": {
+      "globals": {
+        "name": "write"
+      },
       "packages": {
-        "bn.js": true,
         "browserify>buffer": true,
-        "crypto-browserify>public-encrypt>browserify-rsa": true,
-        "crypto-browserify>public-encrypt>parse-asn1": true,
-        "crypto-browserify>randombytes": true,
-        "ethereumjs-util>create-hash": true
+        "eth-ens-namehash>idna-uts46-hx": true,
+        "@metamask/ethjs>js-sha3": true
       }
     },
-    "crypto-browserify>public-encrypt>browserify-rsa": {
+    "eth-lattice-keyring": {
+      "globals": {
+        "addEventListener": true,
+        "browser": true,
+        "clearInterval": true,
+        "fetch": true,
+        "open": true,
+        "setInterval": true
+      },
       "packages": {
+        "eth-lattice-keyring>@ethereumjs/tx": true,
+        "@ethereumjs/tx>@ethereumjs/util": true,
         "bn.js": true,
         "browserify>buffer": true,
-        "crypto-browserify>randombytes": true
+        "crypto-browserify": true,
+        "webpack>events": true,
+        "eth-lattice-keyring>gridplus-sdk": true,
+        "eth-lattice-keyring>rlp": true
       }
     },
-    "crypto-browserify>public-encrypt>parse-asn1": {
+    "eth-method-registry": {
       "packages": {
-        "browserify>buffer": true,
-        "crypto-browserify>browserify-cipher>evp_bytestokey": true,
-        "crypto-browserify>pbkdf2": true,
-        "crypto-browserify>public-encrypt>parse-asn1>asn1.js": true,
-        "ethereumjs-util>ethereum-cryptography>browserify-aes": true
+        "@metamask/ethjs-contract": true,
+        "@metamask/ethjs-query": true
       }
     },
-    "crypto-browserify>public-encrypt>parse-asn1>asn1.js": {
+    "@ethereumjs/tx>ethereum-cryptography": {
+      "globals": {
+        "TextDecoder": true,
+        "crypto": true
+      },
       "packages": {
-        "@metamask/ppom-validator>elliptic>minimalistic-assert": true,
-        "bn.js": true,
-        "browserify>buffer": true,
-        "browserify>vm-browserify": true,
-        "pumpify>inherits": true
+        "@ethereumjs/tx>ethereum-cryptography>@noble/curves": true,
+        "@noble/hashes": true,
+        "@ethereumjs/tx>ethereum-cryptography>@scure/bip32": true
       }
     },
-    "crypto-browserify>randombytes": {
+    "eth-lattice-keyring>@ethereumjs/tx>ethereum-cryptography": {
       "globals": {
-        "crypto": true,
-        "msCrypto": true
+        "TextDecoder": true,
+        "crypto": true
       },
       "packages": {
-        "koa>content-disposition>safe-buffer": true,
-        "process": true
+        "eth-lattice-keyring>@ethereumjs/tx>ethereum-cryptography>@noble/hashes": true
       }
     },
-    "crypto-browserify>randomfill": {
+    "eth-lattice-keyring>gridplus-sdk>@ethereumjs/tx>ethereum-cryptography": {
       "globals": {
-        "crypto": true,
-        "msCrypto": true
+        "TextDecoder": true,
+        "crypto": true
       },
       "packages": {
-        "crypto-browserify>randombytes": true,
-        "koa>content-disposition>safe-buffer": true,
-        "process": true
+        "eth-lattice-keyring>gridplus-sdk>@ethereumjs/tx>ethereum-cryptography>@noble/hashes": true
       }
     },
-    "currency-formatter": {
+    "ethereumjs-util>ethereum-cryptography": {
       "packages": {
-        "currency-formatter>accounting": true,
-        "currency-formatter>locale-currency": true,
-        "react>object-assign": true
-      }
-    },
-    "currency-formatter>accounting": {
-      "globals": {
-        "define": true
+        "browserify>buffer": true,
+        "ethereumjs-util>ethereum-cryptography>keccak": true,
+        "crypto-browserify>randombytes": true,
+        "ganache>secp256k1": true
       }
     },
-    "currency-formatter>locale-currency": {
-      "globals": {
-        "countryCode": true
+    "@metamask/keyring-controller>ethereumjs-wallet>ethereum-cryptography": {
+      "packages": {
+        "browserify>assert": true,
+        "ethereumjs-util>ethereum-cryptography>bs58check": true,
+        "browserify>buffer": true,
+        "crypto-browserify>create-hmac": true,
+        "ethers>@ethersproject/sha2>hash.js": true,
+        "ethereumjs-util>ethereum-cryptography>keccak": true,
+        "crypto-browserify>randombytes": true,
+        "koa>content-disposition>safe-buffer": true,
+        "ganache>secp256k1": true
       }
     },
-    "debounce-stream": {
+    "ethereumjs-util": {
       "packages": {
-        "debounce-stream>debounce": true,
-        "debounce-stream>duplexer": true,
-        "debounce-stream>through": true
+        "browserify>assert": true,
+        "bn.js": true,
+        "browserify>buffer": true,
+        "ethereumjs-util>create-hash": true,
+        "ethereumjs-util>ethereum-cryptography": true,
+        "browserify>insert-module-globals>is-buffer": true,
+        "ethereumjs-util>rlp": true
       }
     },
-    "debounce-stream>debounce": {
-      "globals": {
-        "clearTimeout": true,
-        "setTimeout": true
+    "@metamask/keyring-controller>ethereumjs-wallet>ethereumjs-util": {
+      "packages": {
+        "browserify>assert": true,
+        "bn.js": true,
+        "browserify>buffer": true,
+        "ethereumjs-util>create-hash": true,
+        "@metamask/keyring-controller>ethereumjs-wallet>ethereum-cryptography": true,
+        "browserify>insert-module-globals>is-buffer": true,
+        "@metamask/keyring-controller>ethereumjs-wallet>ethereumjs-util>rlp": true
       }
     },
-    "debounce-stream>duplexer": {
+    "@metamask/keyring-controller>ethereumjs-wallet": {
       "packages": {
-        "stream-browserify": true
+        "eth-lattice-keyring>gridplus-sdk>aes-js": true,
+        "ethereumjs-util>ethereum-cryptography>bs58check": true,
+        "browserify>buffer": true,
+        "crypto-browserify": true,
+        "@metamask/keyring-controller>ethereumjs-wallet>ethereum-cryptography": true,
+        "@metamask/keyring-controller>ethereumjs-wallet>ethereumjs-util": true,
+        "crypto-browserify>randombytes": true,
+        "ethers>@ethersproject/json-wallets>scrypt-js": true,
+        "@metamask/keyring-controller>ethereumjs-wallet>utf8": true,
+        "uuid": true
       }
     },
-    "debounce-stream>through": {
+    "ethers": {
       "packages": {
-        "process": true,
-        "stream-browserify": true
+        "@ethersproject/abi": true,
+        "ethers>@ethersproject/abstract-signer": true,
+        "ethers>@ethersproject/address": true,
+        "ethers>@ethersproject/base64": true,
+        "ethers>@ethersproject/basex": true,
+        "@ethersproject/bignumber": true,
+        "@ethersproject/bytes": true,
+        "ethers>@ethersproject/constants": true,
+        "@ethersproject/contracts": true,
+        "@ethersproject/hash": true,
+        "@ethersproject/hdnode": true,
+        "ethers>@ethersproject/json-wallets": true,
+        "ethers>@ethersproject/keccak256": true,
+        "ethers>@ethersproject/logger": true,
+        "ethers>@ethersproject/properties": true,
+        "ethers>@ethersproject/providers": true,
+        "ethers>@ethersproject/random": true,
+        "ethers>@ethersproject/rlp": true,
+        "ethers>@ethersproject/sha2": true,
+        "ethers>@ethersproject/signing-key": true,
+        "ethers>@ethersproject/solidity": true,
+        "ethers>@ethersproject/strings": true,
+        "ethers>@ethersproject/transactions": true,
+        "ethers>@ethersproject/units": true,
+        "@ethersproject/wallet": true,
+        "ethers>@ethersproject/web": true,
+        "ethers>@ethersproject/wordlists": true
       }
     },
-    "depcheck>@vue/compiler-sfc>postcss>nanoid": {
-      "globals": {
-        "crypto.getRandomValues": true
+    "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth>@ledgerhq/evm-tools>ethers": {
+      "packages": {
+        "@ethersproject/abi": true,
+        "ethers>@ethersproject/abstract-signer": true,
+        "ethers>@ethersproject/address": true,
+        "ethers>@ethersproject/base64": true,
+        "ethers>@ethersproject/basex": true,
+        "@ethersproject/bignumber": true,
+        "@ethersproject/bytes": true,
+        "ethers>@ethersproject/constants": true,
+        "@ethersproject/contracts": true,
+        "@ethersproject/hash": true,
+        "@ethersproject/hdnode": true,
+        "ethers>@ethersproject/json-wallets": true,
+        "ethers>@ethersproject/keccak256": true,
+        "ethers>@ethersproject/logger": true,
+        "ethers>@ethersproject/properties": true,
+        "@ethersproject/providers": true,
+        "ethers>@ethersproject/random": true,
+        "ethers>@ethersproject/rlp": true,
+        "ethers>@ethersproject/sha2": true,
+        "ethers>@ethersproject/signing-key": true,
+        "ethers>@ethersproject/solidity": true,
+        "ethers>@ethersproject/strings": true,
+        "ethers>@ethersproject/transactions": true,
+        "ethers>@ethersproject/units": true,
+        "@ethersproject/wallet": true,
+        "@ethersproject/providers>@ethersproject/web": true,
+        "ethers>@ethersproject/wordlists": true
       }
     },
-    "depcheck>is-core-module>hasown": {
+    "@metamask/ethjs>ethjs-abi": {
       "packages": {
-        "browserify>has>function-bind": true
+        "bn.js": true,
+        "browserify>buffer": true,
+        "@metamask/ethjs>js-sha3": true,
+        "@metamask/ethjs>ethjs-abi>number-to-bn": true
       }
     },
-    "dependency-tree>precinct>detective-postcss>postcss>nanoid": {
+    "webpack>events": {
       "globals": {
-        "crypto.getRandomValues": true
+        "console": true
       }
     },
-    "eslint-plugin-react>array-includes>is-string": {
+    "crypto-browserify>browserify-cipher>evp_bytestokey": {
       "packages": {
-        "koa>is-generator-function>has-tostringtag": true
+        "ethereumjs-util>create-hash>md5.js": true,
+        "koa>content-disposition>safe-buffer": true
       }
     },
-    "eth-ens-namehash": {
-      "globals": {
-        "name": "write"
-      },
+    "extension-port-stream": {
       "packages": {
-        "@metamask/ethjs>js-sha3": true,
         "browserify>buffer": true,
-        "eth-ens-namehash>idna-uts46-hx": true
+        "extension-port-stream>readable-stream": true
       }
     },
-    "eth-ens-namehash>idna-uts46-hx": {
+    "fast-json-patch": {
+      "globals": {
+        "addEventListener": true,
+        "clearTimeout": true,
+        "removeEventListener": true,
+        "setTimeout": true
+      }
+    },
+    "@metamask/snaps-utils>fast-xml-parser": {
       "globals": {
-        "define": true
+        "entityName": true,
+        "val": true
       },
       "packages": {
-        "browserify>punycode": true
+        "@metamask/snaps-utils>fast-xml-parser>strnum": true
       }
     },
-    "eth-keyring-controller>@metamask/browser-passworder": {
-      "globals": {
-        "crypto": true
+    "@metamask/notification-services-controller>firebase": {
+      "packages": {
+        "@metamask/notification-services-controller>firebase>@firebase/app": true,
+        "@metamask/notification-services-controller>firebase>@firebase/messaging": true
       }
     },
-    "eth-lattice-keyring": {
+    "react-focus-lock>focus-lock": {
       "globals": {
-        "addEventListener": true,
-        "browser": true,
-        "clearInterval": true,
-        "fetch": true,
-        "open": true,
-        "setInterval": true
+        "HTMLIFrameElement": true,
+        "Node.DOCUMENT_FRAGMENT_NODE": true,
+        "Node.DOCUMENT_NODE": true,
+        "Node.DOCUMENT_POSITION_CONTAINED_BY": true,
+        "Node.DOCUMENT_POSITION_CONTAINS": true,
+        "Node.ELEMENT_NODE": true,
+        "console.error": true,
+        "console.warn": true,
+        "document": true,
+        "getComputedStyle": true,
+        "setTimeout": true
       },
       "packages": {
-        "@ethereumjs/tx>@ethereumjs/util": true,
-        "bn.js": true,
-        "browserify>buffer": true,
-        "crypto-browserify": true,
-        "eth-lattice-keyring>@ethereumjs/tx": true,
-        "eth-lattice-keyring>gridplus-sdk": true,
-        "eth-lattice-keyring>rlp": true,
-        "webpack>events": true
+        "@swc/helpers>tslib": true
       }
     },
-    "eth-lattice-keyring>@ethereumjs/tx": {
+    "browserify>util>which-typed-array>for-each": {
       "packages": {
-        "@ethereumjs/tx>@ethereumjs/common": true,
-        "@ethereumjs/tx>@ethereumjs/rlp": true,
-        "@ethereumjs/tx>@ethereumjs/util": true,
-        "@ethersproject/providers": true,
-        "browserify>buffer": true,
-        "browserify>insert-module-globals>is-buffer": true,
-        "eth-lattice-keyring>@ethereumjs/tx>@chainsafe/ssz": true,
-        "eth-lattice-keyring>@ethereumjs/tx>ethereum-cryptography": true
+        "string.prototype.matchall>es-abstract>is-callable": true
       }
     },
-    "eth-lattice-keyring>@ethereumjs/tx>@chainsafe/ssz": {
-      "packages": {
-        "browserify": true,
-        "browserify>buffer": true,
-        "eth-lattice-keyring>@ethereumjs/tx>@chainsafe/ssz>@chainsafe/persistent-merkle-tree": true,
-        "eth-lattice-keyring>@ethereumjs/tx>@chainsafe/ssz>case": true
+    "axios>form-data": {
+      "globals": {
+        "FormData": true
       }
     },
-    "eth-lattice-keyring>@ethereumjs/tx>@chainsafe/ssz>@chainsafe/persistent-merkle-tree": {
+    "fuse.js": {
       "globals": {
-        "WeakRef": true
-      },
-      "packages": {
-        "browserify": true
+        "console": true,
+        "define": true
       }
     },
-    "eth-lattice-keyring>@ethereumjs/tx>ethereum-cryptography": {
+    "string.prototype.matchall>get-intrinsic": {
       "globals": {
-        "TextDecoder": true,
-        "crypto": true
+        "AggregateError": true,
+        "FinalizationRegistry": true,
+        "WeakRef": true
       },
       "packages": {
-        "eth-lattice-keyring>@ethereumjs/tx>ethereum-cryptography>@noble/hashes": true
+        "string.prototype.matchall>call-bind>es-errors": true,
+        "browserify>has>function-bind": true,
+        "string.prototype.matchall>es-abstract>has-proto": true,
+        "string.prototype.matchall>has-symbols": true,
+        "depcheck>is-core-module>hasown": true
       }
     },
-    "eth-lattice-keyring>@ethereumjs/tx>ethereum-cryptography>@noble/hashes": {
-      "globals": {
-        "TextEncoder": true,
-        "crypto": true
+    "string.prototype.matchall>es-abstract>gopd": {
+      "packages": {
+        "string.prototype.matchall>get-intrinsic": true
       }
     },
     "eth-lattice-keyring>gridplus-sdk": {
@@ -3907,230 +3797,307 @@
         "setTimeout": true
       },
       "packages": {
-        "@ethereumjs/tx>@ethereumjs/common>crc-32": true,
-        "@ethersproject/abi": true,
-        "@metamask/ethjs>js-sha3": true,
-        "@metamask/keyring-api>bech32": true,
-        "bn.js": true,
-        "browserify>buffer": true,
         "eth-lattice-keyring>gridplus-sdk>@ethereumjs/common": true,
         "eth-lattice-keyring>gridplus-sdk>@ethereumjs/tx": true,
+        "@ethersproject/abi": true,
         "eth-lattice-keyring>gridplus-sdk>aes-js": true,
+        "@metamask/keyring-api>bech32": true,
         "eth-lattice-keyring>gridplus-sdk>bignumber.js": true,
         "eth-lattice-keyring>gridplus-sdk>bitwise": true,
+        "bn.js": true,
         "eth-lattice-keyring>gridplus-sdk>borc": true,
+        "ethereumjs-util>ethereum-cryptography>bs58check": true,
+        "browserify>buffer": true,
+        "@ethereumjs/tx>@ethereumjs/common>crc-32": true,
         "eth-lattice-keyring>gridplus-sdk>elliptic": true,
         "eth-lattice-keyring>gridplus-sdk>eth-eip712-util-browser": true,
-        "eth-lattice-keyring>gridplus-sdk>uuid": true,
-        "eth-lattice-keyring>rlp": true,
-        "ethereumjs-util>ethereum-cryptography>bs58check": true,
         "ethers>@ethersproject/sha2>hash.js": true,
+        "@metamask/ethjs>js-sha3": true,
+        "lodash": true,
+        "eth-lattice-keyring>rlp": true,
         "ganache>secp256k1": true,
-        "lodash": true
+        "eth-lattice-keyring>gridplus-sdk>uuid": true
       }
     },
-    "eth-lattice-keyring>gridplus-sdk>@ethereumjs/common": {
+    "string.prototype.matchall>es-abstract>has-property-descriptors": {
       "packages": {
-        "@ethereumjs/tx>@ethereumjs/common>crc-32": true,
-        "@ethereumjs/tx>@ethereumjs/util": true,
-        "browserify>buffer": true,
-        "webpack>events": true
+        "string.prototype.matchall>call-bind>es-define-property": true
       }
     },
-    "eth-lattice-keyring>gridplus-sdk>@ethereumjs/tx": {
+    "koa>is-generator-function>has-tostringtag": {
       "packages": {
-        "@ethereumjs/tx>@ethereumjs/rlp": true,
-        "@ethereumjs/tx>@ethereumjs/util": true,
-        "@ethersproject/providers": true,
-        "browserify>buffer": true,
-        "browserify>insert-module-globals>is-buffer": true,
-        "eth-lattice-keyring>@ethereumjs/tx>@chainsafe/ssz": true,
-        "eth-lattice-keyring>gridplus-sdk>@ethereumjs/tx>@ethereumjs/common": true,
-        "eth-lattice-keyring>gridplus-sdk>@ethereumjs/tx>ethereum-cryptography": true
+        "string.prototype.matchall>has-symbols": true
       }
     },
-    "eth-lattice-keyring>gridplus-sdk>@ethereumjs/tx>@ethereumjs/common": {
+    "ethereumjs-util>create-hash>md5.js>hash-base": {
       "packages": {
-        "@ethereumjs/tx>@ethereumjs/common>crc-32": true,
-        "@ethereumjs/tx>@ethereumjs/util": true,
-        "browserify>buffer": true,
-        "webpack>events": true
+        "pumpify>inherits": true,
+        "readable-stream": true,
+        "koa>content-disposition>safe-buffer": true
       }
     },
-    "eth-lattice-keyring>gridplus-sdk>@ethereumjs/tx>ethereum-cryptography": {
+    "ethers>@ethersproject/sha2>hash.js": {
+      "packages": {
+        "pumpify>inherits": true,
+        "@metamask/ppom-validator>elliptic>minimalistic-assert": true
+      }
+    },
+    "depcheck>is-core-module>hasown": {
+      "packages": {
+        "browserify>has>function-bind": true
+      }
+    },
+    "@metamask/eth-trezor-keyring>hdkey": {
+      "packages": {
+        "browserify>assert": true,
+        "ethereumjs-util>ethereum-cryptography>bs58check": true,
+        "crypto-browserify": true,
+        "ethereumjs-util>create-hash>ripemd160": true,
+        "koa>content-disposition>safe-buffer": true,
+        "ganache>secp256k1": true
+      }
+    },
+    "he": {
       "globals": {
-        "TextDecoder": true,
-        "crypto": true
+        "define": true
+      }
+    },
+    "history": {
+      "globals": {
+        "console": true,
+        "define": true,
+        "document.defaultView": true,
+        "document.querySelector": true
+      }
+    },
+    "react-router-dom>history": {
+      "globals": {
+        "addEventListener": true,
+        "confirm": true,
+        "document": true,
+        "history": true,
+        "location": true,
+        "navigator.userAgent": true,
+        "removeEventListener": true
       },
       "packages": {
-        "eth-lattice-keyring>gridplus-sdk>@ethereumjs/tx>ethereum-cryptography>@noble/hashes": true
+        "react-router-dom>history>resolve-pathname": true,
+        "react-router-dom>tiny-invariant": true,
+        "react-router-dom>tiny-warning": true,
+        "react-router-dom>history>value-equal": true
       }
     },
-    "eth-lattice-keyring>gridplus-sdk>@ethereumjs/tx>ethereum-cryptography>@noble/hashes": {
+    "@metamask/ppom-validator>elliptic>hmac-drbg": {
+      "packages": {
+        "ethers>@ethersproject/sha2>hash.js": true,
+        "@metamask/ppom-validator>elliptic>minimalistic-assert": true,
+        "@metamask/ppom-validator>elliptic>minimalistic-crypto-utils": true
+      }
+    },
+    "react-redux>hoist-non-react-statics": {
+      "packages": {
+        "prop-types>react-is": true
+      }
+    },
+    "https-browserify": {
+      "packages": {
+        "stream-http": true,
+        "browserify>url": true
+      }
+    },
+    "@metamask/notification-services-controller>firebase>@firebase/app>idb": {
       "globals": {
-        "TextEncoder": true,
-        "crypto": true
+        "DOMException": true,
+        "IDBCursor": true,
+        "IDBDatabase": true,
+        "IDBIndex": true,
+        "IDBObjectStore": true,
+        "IDBRequest": true,
+        "IDBTransaction": true,
+        "indexedDB.deleteDatabase": true,
+        "indexedDB.open": true
       }
     },
-    "eth-lattice-keyring>gridplus-sdk>aes-js": {
+    "eth-ens-namehash>idna-uts46-hx": {
       "globals": {
         "define": true
+      },
+      "packages": {
+        "browserify>punycode": true
+      }
+    },
+    "string.prototype.matchall>internal-slot": {
+      "packages": {
+        "string.prototype.matchall>call-bind>es-errors": true,
+        "depcheck>is-core-module>hasown": true,
+        "string.prototype.matchall>side-channel": true
+      }
+    },
+    "browserify>util>is-arguments": {
+      "packages": {
+        "string.prototype.matchall>call-bind": true,
+        "koa>is-generator-function>has-tostringtag": true
+      }
+    },
+    "string.prototype.matchall>es-abstract>is-array-buffer": {
+      "packages": {
+        "string.prototype.matchall>call-bind": true,
+        "string.prototype.matchall>get-intrinsic": true
+      }
+    },
+    "@metamask/eth-token-tracker>deep-equal>which-boxed-primitive>is-bigint": {
+      "packages": {
+        "string.prototype.matchall>es-abstract>unbox-primitive>has-bigints": true
+      }
+    },
+    "@metamask/eth-token-tracker>deep-equal>which-boxed-primitive>is-boolean-object": {
+      "packages": {
+        "string.prototype.matchall>call-bind": true,
+        "koa>is-generator-function>has-tostringtag": true
+      }
+    },
+    "string.prototype.matchall>es-abstract>is-callable": {
+      "globals": {
+        "document": true
+      }
+    },
+    "@metamask/eth-token-tracker>deep-equal>is-date-object": {
+      "packages": {
+        "koa>is-generator-function>has-tostringtag": true
+      }
+    },
+    "koa>is-generator-function": {
+      "packages": {
+        "koa>is-generator-function>has-tostringtag": true
       }
     },
-    "eth-lattice-keyring>gridplus-sdk>bignumber.js": {
+    "@material-ui/core>@material-ui/styles>jss>is-in-browser": {
       "globals": {
-        "crypto": true,
-        "define": true
+        "document": true
       }
     },
-    "eth-lattice-keyring>gridplus-sdk>bitwise": {
+    "@metamask/eth-token-tracker>deep-equal>which-boxed-primitive>is-number-object": {
       "packages": {
-        "browserify>buffer": true
+        "koa>is-generator-function>has-tostringtag": true
       }
     },
-    "eth-lattice-keyring>gridplus-sdk>borc": {
-      "globals": {
-        "console": true
-      },
+    "string.prototype.matchall>es-abstract>is-regex": {
       "packages": {
-        "browserify>buffer": true,
-        "buffer>ieee754": true,
-        "eth-lattice-keyring>gridplus-sdk>borc>bignumber.js": true,
-        "eth-lattice-keyring>gridplus-sdk>borc>iso-url": true
+        "string.prototype.matchall>call-bind": true,
+        "koa>is-generator-function>has-tostringtag": true
       }
     },
-    "eth-lattice-keyring>gridplus-sdk>borc>bignumber.js": {
-      "globals": {
-        "crypto": true,
-        "define": true
+    "string.prototype.matchall>es-abstract>is-shared-array-buffer": {
+      "packages": {
+        "string.prototype.matchall>call-bind": true
       }
     },
-    "eth-lattice-keyring>gridplus-sdk>borc>iso-url": {
-      "globals": {
-        "URL": true,
-        "URLSearchParams": true,
-        "location": true
+    "eslint-plugin-react>array-includes>is-string": {
+      "packages": {
+        "koa>is-generator-function>has-tostringtag": true
       }
     },
-    "eth-lattice-keyring>gridplus-sdk>elliptic": {
+    "string.prototype.matchall>es-abstract>es-to-primitive>is-symbol": {
       "packages": {
-        "@metamask/ppom-validator>elliptic>brorand": true,
-        "@metamask/ppom-validator>elliptic>hmac-drbg": true,
-        "@metamask/ppom-validator>elliptic>minimalistic-assert": true,
-        "@metamask/ppom-validator>elliptic>minimalistic-crypto-utils": true,
-        "bn.js": true,
-        "ethers>@ethersproject/sha2>hash.js": true,
-        "pumpify>inherits": true
+        "string.prototype.matchall>has-symbols": true
       }
     },
-    "eth-lattice-keyring>gridplus-sdk>eth-eip712-util-browser": {
-      "globals": {
-        "intToBuffer": true
-      },
+    "browserify>util>is-typed-array": {
       "packages": {
-        "@metamask/ethjs>js-sha3": true,
-        "bn.js": true,
-        "buffer": true
+        "browserify>util>which-typed-array": true
       }
     },
-    "eth-lattice-keyring>gridplus-sdk>uuid": {
-      "globals": {
-        "crypto": true
+    "@metamask/eth-token-tracker>deep-equal>which-collection>is-weakset": {
+      "packages": {
+        "string.prototype.matchall>call-bind": true,
+        "string.prototype.matchall>get-intrinsic": true
       }
     },
-    "eth-lattice-keyring>rlp": {
+    "eth-lattice-keyring>gridplus-sdk>borc>iso-url": {
       "globals": {
-        "TextEncoder": true
-      }
-    },
-    "eth-method-registry": {
-      "packages": {
-        "@metamask/ethjs-contract": true,
-        "@metamask/ethjs-query": true
+        "URL": true,
+        "URLSearchParams": true,
+        "location": true
       }
     },
-    "ethereumjs-util": {
+    "@ensdomains/content-hash>js-base64": {
+      "globals": {
+        "Base64": "write",
+        "TextDecoder": true,
+        "TextEncoder": true,
+        "atob": true,
+        "btoa": true,
+        "define": true
+      },
       "packages": {
-        "bn.js": true,
-        "browserify>assert": true,
-        "browserify>buffer": true,
-        "browserify>insert-module-globals>is-buffer": true,
-        "ethereumjs-util>create-hash": true,
-        "ethereumjs-util>ethereum-cryptography": true,
-        "ethereumjs-util>rlp": true
+        "browserify>buffer": true
       }
     },
-    "ethereumjs-util>create-hash": {
+    "@metamask/ethjs>js-sha3": {
+      "globals": {
+        "define": true
+      },
       "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
+        "process": true
       }
     },
-    "ethereumjs-util>create-hash>cipher-base": {
-      "packages": {
-        "browserify>string_decoder": true,
-        "koa>content-disposition>safe-buffer": true,
-        "pumpify>inherits": true,
-        "stream-browserify": true
+    "@ngraveio/bc-ur>jsbi": {
+      "globals": {
+        "define": true
       }
     },
-    "ethereumjs-util>create-hash>md5.js": {
+    "@metamask/message-manager>jsonschema": {
       "packages": {
-        "ethereumjs-util>create-hash>md5.js>hash-base": true,
-        "koa>content-disposition>safe-buffer": true,
-        "pumpify>inherits": true
+        "browserify>url": true
       }
     },
-    "ethereumjs-util>create-hash>md5.js>hash-base": {
+    "@material-ui/core>@material-ui/styles>jss-plugin-camel-case": {
       "packages": {
-        "koa>content-disposition>safe-buffer": true,
-        "pumpify>inherits": true,
-        "readable-stream": true
+        "@material-ui/core>@material-ui/styles>jss-plugin-camel-case>hyphenate-style-name": true
       }
     },
-    "ethereumjs-util>create-hash>ripemd160": {
+    "@material-ui/core>@material-ui/styles>jss-plugin-default-unit": {
+      "globals": {
+        "CSS": true
+      },
       "packages": {
-        "browserify>buffer": true,
-        "ethereumjs-util>create-hash>md5.js>hash-base": true,
-        "pumpify>inherits": true
+        "@material-ui/core>@material-ui/styles>jss": true
       }
     },
-    "ethereumjs-util>ethereum-cryptography": {
+    "@material-ui/core>@material-ui/styles>jss-plugin-global": {
       "packages": {
-        "browserify>buffer": true,
-        "crypto-browserify>randombytes": true,
-        "ethereumjs-util>ethereum-cryptography>keccak": true,
-        "ganache>secp256k1": true
+        "@babel/runtime": true,
+        "@material-ui/core>@material-ui/styles>jss": true
       }
     },
-    "ethereumjs-util>ethereum-cryptography>browserify-aes": {
+    "@material-ui/core>@material-ui/styles>jss-plugin-nested": {
       "packages": {
-        "browserify>buffer": true,
-        "crypto-browserify>browserify-cipher>evp_bytestokey": true,
-        "ethereumjs-util>create-hash>cipher-base": true,
-        "ethereumjs-util>ethereum-cryptography>browserify-aes>buffer-xor": true,
-        "koa>content-disposition>safe-buffer": true,
-        "pumpify>inherits": true
+        "@babel/runtime": true,
+        "react-router-dom>tiny-warning": true
       }
     },
-    "ethereumjs-util>ethereum-cryptography>browserify-aes>buffer-xor": {
+    "@material-ui/core>@material-ui/styles>jss-plugin-rule-value-function": {
       "packages": {
-        "browserify>buffer": true
+        "@material-ui/core>@material-ui/styles>jss": true,
+        "react-router-dom>tiny-warning": true
       }
     },
-    "ethereumjs-util>ethereum-cryptography>bs58check": {
+    "@material-ui/core>@material-ui/styles>jss-plugin-vendor-prefixer": {
       "packages": {
-        "ethereumjs-util>create-hash": true,
-        "ethereumjs-util>ethereum-cryptography>bs58check>bs58": true,
-        "koa>content-disposition>safe-buffer": true
+        "@material-ui/core>@material-ui/styles>jss-plugin-vendor-prefixer>css-vendor": true,
+        "@material-ui/core>@material-ui/styles>jss": true
       }
     },
-    "ethereumjs-util>ethereum-cryptography>bs58check>bs58": {
+    "@material-ui/core>@material-ui/styles>jss": {
+      "globals": {
+        "CSS": true,
+        "document.createElement": true,
+        "document.querySelector": true
+      },
       "packages": {
-        "@ensdomains/content-hash>multihashes>multibase>base-x": true
+        "@babel/runtime": true,
+        "@material-ui/core>@material-ui/styles>jss>is-in-browser": true,
+        "react-router-dom>tiny-warning": true
       }
     },
     "ethereumjs-util>ethereum-cryptography>keccak": {
@@ -4139,536 +4106,496 @@
         "readable-stream": true
       }
     },
-    "ethereumjs-util>rlp": {
-      "packages": {
-        "bn.js": true,
-        "browserify>buffer": true
+    "currency-formatter>locale-currency": {
+      "globals": {
+        "countryCode": true
       }
     },
-    "ethereumjs-wallet>randombytes": {
+    "localforage": {
       "globals": {
-        "crypto.getRandomValues": true
+        "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
       }
     },
-    "ethers": {
-      "packages": {
-        "@ethersproject/abi": true,
-        "@ethersproject/bignumber": true,
-        "@ethersproject/bytes": true,
-        "@ethersproject/contracts": true,
-        "@ethersproject/hash": true,
-        "@ethersproject/hdnode": true,
-        "@ethersproject/wallet": true,
-        "ethers>@ethersproject/abstract-signer": true,
-        "ethers>@ethersproject/address": true,
-        "ethers>@ethersproject/base64": true,
-        "ethers>@ethersproject/basex": true,
-        "ethers>@ethersproject/constants": true,
-        "ethers>@ethersproject/json-wallets": true,
-        "ethers>@ethersproject/keccak256": true,
-        "ethers>@ethersproject/logger": true,
-        "ethers>@ethersproject/properties": true,
-        "ethers>@ethersproject/providers": true,
-        "ethers>@ethersproject/random": true,
-        "ethers>@ethersproject/rlp": true,
-        "ethers>@ethersproject/sha2": true,
-        "ethers>@ethersproject/signing-key": true,
-        "ethers>@ethersproject/solidity": true,
-        "ethers>@ethersproject/strings": true,
-        "ethers>@ethersproject/transactions": true,
-        "ethers>@ethersproject/units": true,
-        "ethers>@ethersproject/web": true,
-        "ethers>@ethersproject/wordlists": true
+    "lodash": {
+      "globals": {
+        "clearTimeout": true,
+        "define": true,
+        "setTimeout": true
       }
     },
-    "ethers>@ethersproject/abstract-provider": {
-      "packages": {
-        "@ethersproject/bignumber": true,
-        "@ethersproject/bytes": true,
-        "ethers>@ethersproject/logger": true,
-        "ethers>@ethersproject/properties": true
+    "loglevel": {
+      "globals": {
+        "console": true,
+        "define": true,
+        "document.cookie": true,
+        "localStorage": true,
+        "log": "write",
+        "navigator": true
       }
-    },
-    "ethers>@ethersproject/abstract-signer": {
-      "packages": {
-        "ethers>@ethersproject/logger": true,
-        "ethers>@ethersproject/properties": true
+    },
+    "lottie-web": {
+      "globals": {
+        "Blob": true,
+        "Howl": true,
+        "OffscreenCanvas": true,
+        "URL.createObjectURL": true,
+        "Worker": true,
+        "XMLHttpRequest": true,
+        "bodymovin": "write",
+        "clearInterval": true,
+        "console": true,
+        "define": true,
+        "document.body": true,
+        "document.createElement": true,
+        "document.createElementNS": true,
+        "document.getElementsByClassName": true,
+        "document.getElementsByTagName": true,
+        "document.querySelectorAll": true,
+        "document.readyState": true,
+        "location.origin": true,
+        "location.pathname": true,
+        "navigator": true,
+        "requestAnimationFrame": true,
+        "setInterval": true,
+        "setTimeout": true
       }
     },
-    "ethers>@ethersproject/address": {
-      "packages": {
-        "@ethersproject/bignumber": true,
-        "@ethersproject/bytes": true,
-        "ethers>@ethersproject/keccak256": true,
-        "ethers>@ethersproject/logger": true,
-        "ethers>@ethersproject/rlp": true
+    "luxon": {
+      "globals": {
+        "Intl": true
       }
     },
-    "ethers>@ethersproject/base64": {
+    "@metamask/snaps-utils>marked": {
       "globals": {
-        "atob": true,
-        "btoa": true
-      },
-      "packages": {
-        "@ethersproject/bytes": true
+        "console.error": true,
+        "console.warn": true,
+        "define": true
       }
     },
-    "ethers>@ethersproject/basex": {
+    "ethereumjs-util>create-hash>md5.js": {
       "packages": {
-        "@ethersproject/bytes": true,
-        "ethers>@ethersproject/properties": true
+        "ethereumjs-util>create-hash>md5.js>hash-base": true,
+        "pumpify>inherits": true,
+        "koa>content-disposition>safe-buffer": true
       }
     },
-    "ethers>@ethersproject/constants": {
+    "@storybook/addon-docs>remark-external-links>mdast-util-definitions": {
       "packages": {
-        "@ethersproject/bignumber": true
+        "react-markdown>unist-util-visit": true
       }
     },
-    "ethers>@ethersproject/json-wallets": {
+    "react-markdown>remark-parse>mdast-util-from-markdown": {
       "packages": {
-        "@ethersproject/bytes": true,
-        "@ethersproject/hdnode": true,
-        "ethers>@ethersproject/address": true,
-        "ethers>@ethersproject/json-wallets>aes-js": true,
-        "ethers>@ethersproject/json-wallets>scrypt-js": true,
-        "ethers>@ethersproject/keccak256": true,
-        "ethers>@ethersproject/logger": true,
-        "ethers>@ethersproject/pbkdf2": true,
-        "ethers>@ethersproject/properties": true,
-        "ethers>@ethersproject/random": true,
-        "ethers>@ethersproject/strings": true,
-        "ethers>@ethersproject/transactions": true
+        "react-markdown>remark-parse>mdast-util-from-markdown>mdast-util-to-string": true,
+        "react-markdown>remark-parse>mdast-util-from-markdown>micromark": true,
+        "react-syntax-highlighter>refractor>parse-entities": true,
+        "react-markdown>remark-parse>mdast-util-from-markdown>unist-util-stringify-position": true
       }
     },
-    "ethers>@ethersproject/json-wallets>aes-js": {
+    "react-markdown>remark-rehype>mdast-util-to-hast": {
       "globals": {
-        "define": true
+        "console.warn": true
+      },
+      "packages": {
+        "@storybook/addon-docs>remark-external-links>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
       }
     },
-    "ethers>@ethersproject/json-wallets>scrypt-js": {
+    "@ethereumjs/tx>@ethereumjs/util>micro-ftch": {
       "globals": {
-        "define": true,
-        "setTimeout": true
+        "Headers": true,
+        "TextDecoder": true,
+        "URL": true,
+        "btoa": true,
+        "fetch": true
       },
       "packages": {
-        "browserify>timers-browserify": true
+        "browserify>browserify-zlib": true,
+        "browserify>buffer": true,
+        "https-browserify": true,
+        "process": true,
+        "stream-http": true,
+        "browserify>url": true,
+        "browserify>util": true
       }
     },
-    "ethers>@ethersproject/keccak256": {
+    "react-markdown>remark-parse>mdast-util-from-markdown>micromark": {
       "packages": {
-        "@ethersproject/bytes": true,
-        "@metamask/ethjs>js-sha3": true
-      }
-    },
-    "ethers>@ethersproject/logger": {
-      "globals": {
-        "console": true
+        "react-syntax-highlighter>refractor>parse-entities": true
       }
     },
-    "ethers>@ethersproject/pbkdf2": {
+    "crypto-browserify>diffie-hellman>miller-rabin": {
       "packages": {
-        "@ethersproject/bytes": true,
-        "ethers>@ethersproject/sha2": true
+        "bn.js": true,
+        "@metamask/ppom-validator>elliptic>brorand": true
       }
     },
-    "ethers>@ethersproject/properties": {
+    "@ensdomains/content-hash>cids>multibase": {
+      "globals": {
+        "TextDecoder": true,
+        "TextEncoder": true
+      },
       "packages": {
-        "ethers>@ethersproject/logger": true
+        "@ensdomains/content-hash>cids>multibase>@multiformats/base-x": true
       }
     },
-    "ethers>@ethersproject/providers": {
-      "globals": {
-        "WebSocket": true,
-        "clearInterval": true,
-        "clearTimeout": true,
-        "console.log": true,
-        "console.warn": true,
-        "setInterval": true,
-        "setTimeout": true
-      },
+    "@ensdomains/content-hash>multihashes>multibase": {
       "packages": {
-        "@ethersproject/bignumber": true,
-        "@ethersproject/bytes": true,
-        "@ethersproject/hash": true,
-        "ethers>@ethersproject/abstract-provider": true,
-        "ethers>@ethersproject/abstract-signer": true,
-        "ethers>@ethersproject/address": true,
-        "ethers>@ethersproject/base64": true,
-        "ethers>@ethersproject/basex": true,
-        "ethers>@ethersproject/constants": true,
-        "ethers>@ethersproject/logger": true,
-        "ethers>@ethersproject/properties": true,
-        "ethers>@ethersproject/providers>@ethersproject/networks": true,
-        "ethers>@ethersproject/providers>@ethersproject/web": true,
-        "ethers>@ethersproject/providers>bech32": true,
-        "ethers>@ethersproject/random": true,
-        "ethers>@ethersproject/sha2": true,
-        "ethers>@ethersproject/strings": true,
-        "ethers>@ethersproject/transactions": true
+        "@ensdomains/content-hash>multihashes>multibase>base-x": true,
+        "browserify>buffer": true,
+        "@ensdomains/content-hash>multihashes>web-encoding": true
       }
     },
-    "ethers>@ethersproject/providers>@ethersproject/networks": {
+    "@ensdomains/content-hash>multicodec": {
       "packages": {
-        "ethers>@ethersproject/logger": true
+        "@ensdomains/content-hash>multicodec>uint8arrays": true,
+        "sass-embedded>varint": true
       }
     },
-    "ethers>@ethersproject/providers>@ethersproject/web": {
+    "@ensdomains/content-hash>multicodec>uint8arrays>multiformats": {
       "globals": {
-        "clearTimeout": true,
-        "fetch": true,
-        "setTimeout": true
-      },
-      "packages": {
-        "@ethersproject/bytes": true,
-        "ethers>@ethersproject/base64": true,
-        "ethers>@ethersproject/logger": true,
-        "ethers>@ethersproject/properties": true,
-        "ethers>@ethersproject/strings": true
+        "TextDecoder": true,
+        "TextEncoder": true,
+        "console.warn": true,
+        "crypto.subtle.digest": true
       }
     },
-    "ethers>@ethersproject/random": {
+    "@ensdomains/content-hash>multihashes": {
       "packages": {
-        "@ethersproject/bytes": true,
-        "ethers>@ethersproject/logger": true
+        "browserify>buffer": true,
+        "@ensdomains/content-hash>multihashes>multibase": true,
+        "@ensdomains/content-hash>multihashes>varint": true,
+        "@ensdomains/content-hash>multihashes>web-encoding": true
       }
     },
-    "ethers>@ethersproject/rlp": {
+    "@ensdomains/content-hash>cids>multihashes": {
       "packages": {
-        "@ethersproject/bytes": true,
-        "ethers>@ethersproject/logger": true
+        "@ensdomains/content-hash>cids>multibase": true,
+        "@ensdomains/content-hash>cids>uint8arrays": true,
+        "@ensdomains/content-hash>cids>multihashes>varint": true
       }
     },
-    "ethers>@ethersproject/sha2": {
-      "packages": {
-        "@ethersproject/bytes": true,
-        "ethers>@ethersproject/logger": true,
-        "ethers>@ethersproject/sha2>hash.js": true
+    "nanoid": {
+      "globals": {
+        "crypto.getRandomValues": true
       }
     },
-    "ethers>@ethersproject/sha2>hash.js": {
-      "packages": {
-        "@metamask/ppom-validator>elliptic>minimalistic-assert": true,
-        "pumpify>inherits": true
+    "@metamask/approval-controller>nanoid": {
+      "globals": {
+        "crypto.getRandomValues": true
       }
     },
-    "ethers>@ethersproject/signing-key": {
-      "packages": {
-        "@ethersproject/bytes": true,
-        "ethers>@ethersproject/logger": true,
-        "ethers>@ethersproject/properties": true,
-        "ethers>@ethersproject/signing-key>elliptic": true
+    "@metamask/smart-transactions-controller>@metamask/controllers>nanoid": {
+      "globals": {
+        "crypto.getRandomValues": true
       }
     },
-    "ethers>@ethersproject/signing-key>elliptic": {
-      "packages": {
-        "@metamask/ppom-validator>elliptic>brorand": true,
-        "@metamask/ppom-validator>elliptic>hmac-drbg": true,
-        "@metamask/ppom-validator>elliptic>minimalistic-assert": true,
-        "@metamask/ppom-validator>elliptic>minimalistic-crypto-utils": true,
-        "bn.js": true,
-        "ethers>@ethersproject/sha2>hash.js": true,
-        "pumpify>inherits": true
+    "@metamask/notification-controller>nanoid": {
+      "globals": {
+        "crypto.getRandomValues": true
       }
     },
-    "ethers>@ethersproject/solidity": {
-      "packages": {
-        "@ethersproject/bignumber": true,
-        "@ethersproject/bytes": true,
-        "ethers>@ethersproject/keccak256": true,
-        "ethers>@ethersproject/logger": true,
-        "ethers>@ethersproject/sha2": true,
-        "ethers>@ethersproject/strings": true
+    "@metamask/permission-controller>nanoid": {
+      "globals": {
+        "crypto.getRandomValues": true
       }
     },
-    "ethers>@ethersproject/strings": {
-      "packages": {
-        "@ethersproject/bytes": true,
-        "ethers>@ethersproject/constants": true,
-        "ethers>@ethersproject/logger": true
+    "@metamask/rpc-methods>nanoid": {
+      "globals": {
+        "crypto.getRandomValues": true
       }
     },
-    "ethers>@ethersproject/transactions": {
-      "packages": {
-        "@ethersproject/bignumber": true,
-        "@ethersproject/bytes": true,
-        "ethers>@ethersproject/address": true,
-        "ethers>@ethersproject/constants": true,
-        "ethers>@ethersproject/keccak256": true,
-        "ethers>@ethersproject/logger": true,
-        "ethers>@ethersproject/properties": true,
-        "ethers>@ethersproject/rlp": true,
-        "ethers>@ethersproject/signing-key": true
+    "@metamask/rpc-methods-flask>nanoid": {
+      "globals": {
+        "crypto.getRandomValues": true
       }
     },
-    "ethers>@ethersproject/units": {
-      "packages": {
-        "@ethersproject/bignumber": true,
-        "ethers>@ethersproject/logger": true
+    "@metamask/snaps-controllers>nanoid": {
+      "globals": {
+        "crypto.getRandomValues": true
       }
     },
-    "ethers>@ethersproject/web": {
+    "@metamask/snaps-controllers-flask>nanoid": {
       "globals": {
-        "clearTimeout": true,
-        "fetch": true,
-        "setTimeout": true
-      },
-      "packages": {
-        "@ethersproject/bytes": true,
-        "ethers>@ethersproject/base64": true,
-        "ethers>@ethersproject/logger": true,
-        "ethers>@ethersproject/properties": true,
-        "ethers>@ethersproject/strings": true
+        "crypto.getRandomValues": true
       }
     },
-    "ethers>@ethersproject/wordlists": {
-      "packages": {
-        "@ethersproject/bytes": true,
-        "@ethersproject/hash": true,
-        "ethers>@ethersproject/logger": true,
-        "ethers>@ethersproject/properties": true,
-        "ethers>@ethersproject/strings": true
+    "depcheck>@vue/compiler-sfc>postcss>nanoid": {
+      "globals": {
+        "crypto.getRandomValues": true
       }
     },
-    "extension-port-stream": {
-      "packages": {
-        "browserify>buffer": true,
-        "extension-port-stream>readable-stream": true
+    "dependency-tree>precinct>detective-postcss>postcss>nanoid": {
+      "globals": {
+        "crypto.getRandomValues": true
       }
     },
-    "extension-port-stream>readable-stream": {
+    "node-fetch": {
       "globals": {
-        "AbortController": true,
-        "AggregateError": true,
-        "Blob": true
-      },
-      "packages": {
-        "browserify>buffer": true,
-        "browserify>string_decoder": true,
-        "extension-port-stream>readable-stream>abort-controller": true,
-        "process": true,
-        "webpack>events": true
+        "Headers": true,
+        "Request": true,
+        "Response": true,
+        "fetch": true
       }
     },
-    "extension-port-stream>readable-stream>abort-controller": {
+    "@metamask/controllers>web3-provider-engine>cross-fetch>node-fetch": {
       "globals": {
-        "AbortController": true
+        "fetch": true
       }
     },
-    "fast-json-patch": {
+    "@metamask/controllers>web3-provider-engine>eth-json-rpc-middleware>node-fetch": {
       "globals": {
-        "addEventListener": true,
-        "clearTimeout": true,
-        "removeEventListener": true,
-        "setTimeout": true
+        "fetch": true
       }
     },
-    "fuse.js": {
+    "@metamask/ethjs>ethjs-abi>number-to-bn": {
+      "packages": {
+        "bn.js": true,
+        "@metamask/ethjs>@metamask/ethjs-util>strip-hex-prefix": true
+      }
+    },
+    "string.prototype.matchall>es-abstract>object-inspect": {
       "globals": {
-        "console": true,
-        "define": true
+        "HTMLElement": true,
+        "WeakRef": true
+      },
+      "packages": {
+        "browserify>browser-resolve": true
       }
     },
-    "ganache>secp256k1": {
+    "@ngraveio/bc-ur>assert>object-is": {
       "packages": {
-        "@metamask/ppom-validator>elliptic": true
+        "string.prototype.matchall>call-bind": true,
+        "string.prototype.matchall>define-properties": true
       }
     },
     "gulp>vinyl-fs>object.assign": {
       "packages": {
-        "@lavamoat/lavapack>json-stable-stringify>object-keys": true,
         "string.prototype.matchall>call-bind": true,
         "string.prototype.matchall>define-properties": true,
-        "string.prototype.matchall>has-symbols": true
+        "string.prototype.matchall>has-symbols": true,
+        "@lavamoat/lavapack>json-stable-stringify>object-keys": true
       }
     },
-    "he": {
-      "globals": {
-        "define": true
+    "@metamask/object-multiplex>once": {
+      "packages": {
+        "@metamask/object-multiplex>once>wrappy": true
       }
     },
-    "history": {
-      "globals": {
-        "console": true,
-        "define": true,
-        "document.defaultView": true,
-        "document.querySelector": true
+    "crypto-browserify>public-encrypt>parse-asn1": {
+      "packages": {
+        "crypto-browserify>public-encrypt>parse-asn1>asn1.js": true,
+        "ethereumjs-util>ethereum-cryptography>browserify-aes": true,
+        "browserify>buffer": true,
+        "crypto-browserify>browserify-cipher>evp_bytestokey": true,
+        "crypto-browserify>pbkdf2": true
       }
     },
-    "https-browserify": {
-      "packages": {
-        "browserify>url": true,
-        "stream-http": true
+    "react-syntax-highlighter>refractor>parse-entities": {
+      "globals": {
+        "document.createElement": true
       }
     },
-    "koa>content-disposition>safe-buffer": {
+    "path-browserify": {
       "packages": {
-        "browserify>buffer": true
+        "process": true
       }
     },
-    "koa>is-generator-function": {
+    "serve-handler>path-to-regexp": {
       "packages": {
-        "koa>is-generator-function>has-tostringtag": true
+        "serve-handler>path-to-regexp>isarray": true
       }
     },
-    "koa>is-generator-function>has-tostringtag": {
+    "crypto-browserify>pbkdf2": {
+      "globals": {
+        "crypto": true,
+        "process": true,
+        "queueMicrotask": true,
+        "setImmediate": true,
+        "setTimeout": true
+      },
       "packages": {
-        "string.prototype.matchall>has-symbols": true
+        "ethereumjs-util>create-hash": true,
+        "process": true,
+        "ethereumjs-util>create-hash>ripemd160": true,
+        "koa>content-disposition>safe-buffer": true,
+        "addons-linter>sha.js": true
       }
     },
-    "localforage": {
+    "@material-ui/core>popper.js": {
       "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,
+        "MSInputMethodContext": true,
+        "Node.DOCUMENT_POSITION_FOLLOWING": true,
+        "cancelAnimationFrame": 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
+        "devicePixelRatio": true,
+        "document": true,
+        "getComputedStyle": true,
+        "innerHeight": true,
+        "innerWidth": true,
+        "navigator": true,
+        "requestAnimationFrame": true,
+        "setTimeout": true
       }
     },
-    "lodash": {
+    "react-tippy>popper.js": {
       "globals": {
-        "clearTimeout": true,
+        "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
       }
     },
-    "loglevel": {
+    "process": {
       "globals": {
-        "console": true,
-        "define": true,
-        "document.cookie": true,
-        "localStorage": true,
-        "log": "write",
-        "navigator": true
+        "clearTimeout": true,
+        "setTimeout": true
       }
     },
-    "lottie-web": {
-      "globals": {
-        "Blob": true,
-        "Howl": true,
-        "OffscreenCanvas": true,
-        "URL.createObjectURL": true,
-        "Worker": true,
-        "XMLHttpRequest": true,
-        "bodymovin": "write",
-        "clearInterval": true,
-        "console": true,
-        "define": true,
-        "document.body": true,
-        "document.createElement": true,
-        "document.createElementNS": true,
-        "document.getElementsByClassName": true,
-        "document.getElementsByTagName": true,
-        "document.querySelectorAll": true,
-        "document.readyState": true,
-        "location.origin": true,
-        "location.pathname": true,
-        "navigator": true,
-        "requestAnimationFrame": true,
-        "setInterval": true,
-        "setTimeout": true
+    "promise-to-callback": {
+      "packages": {
+        "promise-to-callback>is-fn": true,
+        "promise-to-callback>set-immediate-shim": true
       }
     },
-    "luxon": {
+    "prop-types": {
       "globals": {
-        "Intl": true
+        "console": true
+      },
+      "packages": {
+        "react>object-assign": true,
+        "prop-types>react-is": true
       }
     },
-    "nanoid": {
-      "globals": {
-        "crypto.getRandomValues": true
+    "react-markdown>property-information": {
+      "packages": {
+        "watchify>xtend": true
       }
     },
-    "nock>debug": {
+    "@trezor/connect-web>@trezor/connect>@trezor/protobuf>protobufjs": {
       "globals": {
-        "console": true,
-        "document": true,
-        "localStorage": true,
-        "navigator": true,
-        "process": true
+        "process": true,
+        "setTimeout": true
       },
       "packages": {
-        "nock>debug>ms": true,
-        "process": true
+        "@trezor/connect-web>@trezor/connect>@trezor/protobuf>protobufjs>@protobufjs/aspromise": true,
+        "@trezor/connect-web>@trezor/connect>@trezor/protobuf>protobufjs>@protobufjs/base64": true,
+        "@trezor/connect-web>@trezor/connect>@trezor/protobuf>protobufjs>@protobufjs/codegen": true,
+        "@trezor/connect-web>@trezor/connect>@trezor/protobuf>protobufjs>@protobufjs/eventemitter": true,
+        "@trezor/connect-web>@trezor/connect>@trezor/protobuf>protobufjs>@protobufjs/fetch": true,
+        "@trezor/connect-web>@trezor/connect>@trezor/protobuf>protobufjs>@protobufjs/float": true,
+        "@trezor/connect-web>@trezor/connect>@trezor/protobuf>protobufjs>@protobufjs/inquire": true,
+        "@trezor/connect-web>@trezor/connect>@trezor/protobuf>protobufjs>@protobufjs/path": true,
+        "@trezor/connect-web>@trezor/connect>@trezor/protobuf>protobufjs>@protobufjs/pool": true,
+        "@trezor/connect-web>@trezor/connect>@trezor/protobuf>protobufjs>@protobufjs/utf8": true
+      }
+    },
+    "crypto-browserify>public-encrypt": {
+      "packages": {
+        "bn.js": true,
+        "crypto-browserify>public-encrypt>browserify-rsa": true,
+        "browserify>buffer": true,
+        "ethereumjs-util>create-hash": true,
+        "crypto-browserify>public-encrypt>parse-asn1": true,
+        "crypto-browserify>randombytes": true
       }
     },
-    "node-fetch": {
+    "browserify>punycode": {
       "globals": {
-        "Headers": true,
-        "Request": true,
-        "Response": true,
-        "fetch": true
+        "define": true
       }
     },
-    "path-browserify": {
-      "packages": {
-        "process": true
+    "qrcode-generator": {
+      "globals": {
+        "define": true
       }
     },
-    "process": {
+    "qrcode.react": {
       "globals": {
-        "clearTimeout": true,
-        "setTimeout": true
+        "Path2D": true,
+        "devicePixelRatio": true
+      },
+      "packages": {
+        "react": true
       }
     },
-    "promise-to-callback": {
+    "@storybook/addon-knobs>qs": {
       "packages": {
-        "promise-to-callback>is-fn": true,
-        "promise-to-callback>set-immediate-shim": true
+        "string.prototype.matchall>side-channel": true
       }
     },
-    "promise-to-callback>set-immediate-shim": {
+    "@metamask/snaps-controllers>tar-stream>streamx>queue-tick": {
       "globals": {
-        "setTimeout.apply": true
-      },
-      "packages": {
-        "browserify>timers-browserify": true
+        "queueMicrotask": true
       }
     },
-    "prop-types": {
+    "react-beautiful-dnd>raf-schd": {
       "globals": {
-        "console": true
-      },
-      "packages": {
-        "prop-types>react-is": true,
-        "react>object-assign": true
+        "cancelAnimationFrame": true,
+        "requestAnimationFrame": true
       }
     },
-    "prop-types>react-is": {
+    "crypto-browserify>randombytes": {
       "globals": {
-        "console": true
+        "crypto": true,
+        "msCrypto": true
+      },
+      "packages": {
+        "process": true,
+        "koa>content-disposition>safe-buffer": true
       }
     },
-    "qrcode-generator": {
+    "ethereumjs-wallet>randombytes": {
       "globals": {
-        "define": true
+        "crypto.getRandomValues": true
       }
     },
-    "qrcode.react": {
+    "crypto-browserify>randomfill": {
       "globals": {
-        "Path2D": true,
-        "devicePixelRatio": true
+        "crypto": true,
+        "msCrypto": true
       },
       "packages": {
-        "react": true
+        "process": true,
+        "crypto-browserify>randombytes": true,
+        "koa>content-disposition>safe-buffer": true
       }
     },
     "react": {
@@ -4676,8 +4603,8 @@
         "console": true
       },
       "packages": {
-        "prop-types": true,
-        "react>object-assign": true
+        "react>object-assign": true,
+        "prop-types": true
       }
     },
     "react-beautiful-dnd": {
@@ -4699,43 +4626,28 @@
       },
       "packages": {
         "@babel/runtime": true,
-        "react": true,
         "react-beautiful-dnd>css-box-model": true,
         "react-beautiful-dnd>memoize-one": true,
         "react-beautiful-dnd>raf-schd": true,
-        "react-beautiful-dnd>use-memo-one": true,
+        "react": true,
         "react-dom": true,
         "react-redux": true,
-        "redux": true
+        "redux": true,
+        "react-beautiful-dnd>use-memo-one": true
       }
     },
-    "react-beautiful-dnd>css-box-model": {
+    "react-chartjs-2": {
       "globals": {
-        "getComputedStyle": true,
-        "pageXOffset": true,
-        "pageYOffset": true
+        "setTimeout": true
       },
       "packages": {
-        "react-router-dom>tiny-invariant": true
-      }
-    },
-    "react-beautiful-dnd>raf-schd": {
-      "globals": {
-        "cancelAnimationFrame": true,
-        "requestAnimationFrame": true
-      }
-    },
-    "react-beautiful-dnd>use-memo-one": {
-      "packages": {
+        "chart.js": true,
         "react": true
       }
     },
-    "react-chartjs-2": {
-      "globals": {
-        "setTimeout": true
-      },
+    "react-focus-lock>react-clientside-effect": {
       "packages": {
-        "chart.js": true,
+        "@babel/runtime": true,
         "react": true
       }
     },
@@ -4780,22 +4692,28 @@
         "trustedTypes": true
       },
       "packages": {
+        "react>object-assign": true,
         "prop-types": true,
         "react": true,
-        "react-dom>scheduler": true,
-        "react>object-assign": true
+        "react-dom>scheduler": true
       }
     },
-    "react-dom>scheduler": {
+    "react-responsive-carousel>react-easy-swipe": {
       "globals": {
-        "MessageChannel": true,
-        "cancelAnimationFrame": true,
-        "clearTimeout": true,
-        "console": true,
-        "navigator": true,
-        "performance": true,
-        "requestAnimationFrame": true,
-        "setTimeout": true
+        "addEventListener": true,
+        "define": true,
+        "document.addEventListener": true,
+        "document.removeEventListener": true
+      },
+      "packages": {
+        "prop-types": true,
+        "react": true
+      }
+    },
+    "react-popper>react-fast-compare": {
+      "globals": {
+        "Element": true,
+        "console.warn": true
       }
     },
     "react-focus-lock": {
@@ -4809,667 +4727,726 @@
       },
       "packages": {
         "@babel/runtime": true,
+        "react-focus-lock>focus-lock": true,
         "prop-types": true,
         "react": true,
-        "react-focus-lock>focus-lock": true,
         "react-focus-lock>react-clientside-effect": true,
         "react-focus-lock>use-callback-ref": true,
         "react-focus-lock>use-sidecar": true
       }
     },
-    "react-focus-lock>focus-lock": {
+    "react-idle-timer": {
       "globals": {
-        "HTMLIFrameElement": true,
-        "Node.DOCUMENT_FRAGMENT_NODE": true,
-        "Node.DOCUMENT_NODE": true,
-        "Node.DOCUMENT_POSITION_CONTAINED_BY": true,
-        "Node.DOCUMENT_POSITION_CONTAINS": true,
-        "Node.ELEMENT_NODE": true,
-        "console.error": true,
+        "clearTimeout": true,
+        "document": true,
+        "setTimeout": true
+      },
+      "packages": {
+        "prop-types": true,
+        "react": true
+      }
+    },
+    "react-inspector": {
+      "globals": {
+        "Node": true,
+        "chromeDark": true,
+        "chromeLight": true
+      },
+      "packages": {
+        "react": true
+      }
+    },
+    "prop-types>react-is": {
+      "globals": {
+        "console": true
+      }
+    },
+    "react-markdown>react-is": {
+      "globals": {
+        "console": true
+      }
+    },
+    "react-redux>react-is": {
+      "globals": {
+        "console": true
+      }
+    },
+    "react-markdown": {
+      "globals": {
+        "console.warn": true
+      },
+      "packages": {
+        "react-markdown>comma-separated-tokens": true,
+        "prop-types": true,
+        "react-markdown>property-information": true,
+        "react": 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-popper": {
+      "globals": {
+        "document": true
+      },
+      "packages": {
+        "@popperjs/core": true,
+        "react": true,
+        "react-popper>react-fast-compare": true,
+        "react-popper>warning": true
+      }
+    },
+    "react-redux": {
+      "globals": {
+        "console": true,
+        "document": true
+      },
+      "packages": {
+        "@babel/runtime": true,
+        "react-redux>hoist-non-react-statics": true,
+        "prop-types": true,
+        "react": true,
+        "react-dom": true,
+        "react-redux>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-router-dom": {
+      "packages": {
+        "react-router-dom>history": true,
+        "prop-types": true,
+        "react": true,
+        "react-router-dom>react-router": true,
+        "react-router-dom>tiny-invariant": true,
+        "react-router-dom>tiny-warning": true
+      }
+    },
+    "react-router-dom-v5-compat": {
+      "globals": {
+        "FormData": true,
+        "URL": true,
+        "URLSearchParams": true,
+        "__reactRouterVersion": "write",
+        "addEventListener": true,
+        "confirm": true,
+        "define": true,
+        "document": true,
+        "history.scrollRestoration": true,
+        "location.href": true,
+        "removeEventListener": true,
+        "scrollTo": true,
+        "scrollY": true,
+        "sessionStorage.getItem": true,
+        "sessionStorage.setItem": true,
         "setTimeout": true
       },
       "packages": {
-        "@swc/helpers>tslib": true
+        "react-router-dom-v5-compat>@remix-run/router": true,
+        "history": true,
+        "react": true,
+        "react-dom": true,
+        "react-router-dom": true,
+        "react-router-dom-v5-compat>react-router": true
       }
     },
-    "react-focus-lock>react-clientside-effect": {
+    "react-router-dom>react-router": {
       "packages": {
-        "@babel/runtime": true,
-        "react": true
+        "react-router-dom>history": true,
+        "react-redux>hoist-non-react-statics": true,
+        "serve-handler>path-to-regexp": true,
+        "prop-types": true,
+        "react": true,
+        "prop-types>react-is": true,
+        "react-router-dom>tiny-invariant": true,
+        "react-router-dom>tiny-warning": true
       }
     },
-    "react-focus-lock>use-callback-ref": {
+    "react-router-dom-v5-compat>react-router": {
+      "globals": {
+        "console.error": true,
+        "define": true
+      },
       "packages": {
+        "react-router-dom-v5-compat>@remix-run/router": true,
         "react": true
       }
     },
-    "react-focus-lock>use-sidecar": {
+    "react-simple-file-input": {
       "globals": {
-        "console.error": true
+        "File": true,
+        "FileReader": true,
+        "console.warn": true
       },
       "packages": {
-        "@swc/helpers>tslib": true,
-        "react": true,
-        "react-focus-lock>use-sidecar>detect-node-es": true
+        "prop-types": true,
+        "react": true
       }
     },
-    "react-idle-timer": {
+    "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": {
-        "prop-types": true,
-        "react": true
+        "react-tippy>popper.js": true,
+        "react": true,
+        "react-dom": true
       }
     },
-    "react-inspector": {
+    "react-toggle-button": {
       "globals": {
-        "Node": true,
-        "chromeDark": true,
-        "chromeLight": true
+        "clearTimeout": true,
+        "console.warn": true,
+        "define": true,
+        "performance": true,
+        "setTimeout": true
       },
       "packages": {
         "react": true
       }
     },
-    "react-markdown": {
+    "@material-ui/core>react-transition-group": {
       "globals": {
-        "console.warn": true
+        "Element": true,
+        "setTimeout": true
       },
       "packages": {
+        "@material-ui/core>react-transition-group>dom-helpers": true,
         "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-dom": true
       }
     },
-    "react-markdown>property-information": {
+    "readable-stream": {
       "packages": {
-        "watchify>xtend": true
+        "browserify>browser-resolve": true,
+        "browserify>buffer": true,
+        "webpack>events": true,
+        "pumpify>inherits": true,
+        "process": true,
+        "browserify>string_decoder": true,
+        "readable-stream>util-deprecate": true
       }
     },
-    "react-markdown>react-is": {
+    "extension-port-stream>readable-stream": {
       "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>unist-util-stringify-position": true,
-        "react-syntax-highlighter>refractor>parse-entities": true
-      }
-    },
-    "react-markdown>remark-parse>mdast-util-from-markdown>micromark": {
+        "AbortController": true,
+        "AbortSignal": true,
+        "AggregateError": true,
+        "Blob": true,
+        "ERR_INVALID_ARG_TYPE": true,
+        "queueMicrotask": true
+      },
       "packages": {
-        "react-syntax-highlighter>refractor>parse-entities": true
+        "@lavamoat/lavapack>readable-stream>abort-controller": true,
+        "browserify>buffer": true,
+        "webpack>events": true,
+        "process": true,
+        "browserify>string_decoder": true
       }
     },
-    "react-markdown>remark-rehype": {
+    "@metamask/snaps-controllers>readable-web-to-node-stream": {
       "packages": {
-        "react-markdown>remark-rehype>mdast-util-to-hast": true
+        "readable-stream": true
       }
     },
-    "react-markdown>remark-rehype>mdast-util-to-hast": {
+    "redux": {
       "globals": {
-        "console.warn": true
+        "console": true
       },
       "packages": {
-        "@storybook/addon-docs>remark-external-links>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
+        "@babel/runtime": true
       }
     },
-    "react-markdown>style-to-object": {
+    "string.prototype.matchall>regexp.prototype.flags": {
       "packages": {
-        "react-markdown>style-to-object>inline-style-parser": true
+        "string.prototype.matchall>call-bind": true,
+        "string.prototype.matchall>define-properties": true,
+        "string.prototype.matchall>call-bind>es-errors": true,
+        "string.prototype.matchall>regexp.prototype.flags>set-function-name": true
       }
     },
-    "react-markdown>unified": {
+    "react-markdown>remark-parse": {
       "packages": {
-        "mocha>yargs-unparser>is-plain-obj": true,
-        "react-markdown>unified>bail": true,
-        "react-markdown>unified>extend": true,
-        "react-markdown>unified>is-buffer": true,
-        "react-markdown>unified>trough": true,
-        "react-markdown>vfile": true
+        "react-markdown>remark-parse>mdast-util-from-markdown": true
       }
     },
-    "react-markdown>unist-util-visit": {
+    "react-markdown>remark-rehype": {
       "packages": {
-        "react-markdown>unist-util-visit>unist-util-visit-parents": true
+        "react-markdown>remark-rehype>mdast-util-to-hast": true
       }
     },
-    "react-markdown>unist-util-visit>unist-util-visit-parents": {
+    "react-markdown>vfile>replace-ext": {
       "packages": {
-        "react-markdown>unist-util-visit>unist-util-is": true
+        "path-browserify": true
       }
     },
-    "react-markdown>vfile": {
-      "packages": {
-        "path-browserify": true,
-        "process": true,
-        "react-markdown>vfile>is-buffer": true,
-        "react-markdown>vfile>replace-ext": true,
-        "react-markdown>vfile>vfile-message": true
+    "reselect": {
+      "globals": {
+        "WeakRef": true,
+        "console.warn": true,
+        "unstable_autotrackMemoize": true
       }
     },
-    "react-markdown>vfile>replace-ext": {
+    "@metamask/snaps-utils>rfdc": {
       "packages": {
-        "path-browserify": true
+        "browserify>buffer": true
       }
     },
-    "react-markdown>vfile>vfile-message": {
+    "ethereumjs-util>create-hash>ripemd160": {
       "packages": {
-        "react-markdown>vfile>unist-util-stringify-position": true
+        "browserify>buffer": true,
+        "ethereumjs-util>create-hash>md5.js>hash-base": true,
+        "pumpify>inherits": true
       }
     },
-    "react-popper": {
-      "globals": {
-        "document": true
-      },
+    "@keystonehq/metamask-airgapped-keyring>rlp": {
       "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
+        "bn.js": true,
+        "browserify>buffer": true
       }
     },
-    "react-popper>warning": {
+    "eth-lattice-keyring>rlp": {
       "globals": {
-        "console": true
+        "TextEncoder": true
       }
     },
-    "react-redux": {
-      "globals": {
-        "console": true,
-        "document": true
-      },
+    "ethereumjs-util>rlp": {
       "packages": {
-        "@babel/runtime": true,
-        "prop-types": true,
-        "react": true,
-        "react-dom": true,
-        "react-redux>hoist-non-react-statics": true,
-        "react-redux>react-is": true
+        "bn.js": true,
+        "browserify>buffer": true
       }
     },
-    "react-redux>hoist-non-react-statics": {
+    "@metamask/keyring-controller>ethereumjs-wallet>ethereumjs-util>rlp": {
       "packages": {
-        "prop-types>react-is": true
+        "bn.js": true,
+        "browserify>buffer": true
       }
     },
-    "react-redux>react-is": {
+    "wait-on>rxjs": {
       "globals": {
-        "console": true
+        "cancelAnimationFrame": true,
+        "clearInterval": true,
+        "clearTimeout": true,
+        "performance": true,
+        "requestAnimationFrame": true,
+        "setInterval.apply": true,
+        "setTimeout.apply": true
       }
     },
-    "react-responsive-carousel": {
+    "koa>content-disposition>safe-buffer": {
+      "packages": {
+        "browserify>buffer": true
+      }
+    },
+    "react-dom>scheduler": {
       "globals": {
-        "HTMLElement": true,
-        "addEventListener": true,
+        "MessageChannel": true,
+        "cancelAnimationFrame": true,
         "clearTimeout": true,
-        "console.warn": true,
-        "document": true,
-        "getComputedStyle": true,
-        "removeEventListener": true,
+        "console": true,
+        "navigator": true,
+        "performance": true,
+        "requestAnimationFrame": true,
         "setTimeout": true
-      },
-      "packages": {
-        "classnames": true,
-        "react": true,
-        "react-dom": true,
-        "react-responsive-carousel>react-easy-swipe": true
       }
     },
-    "react-responsive-carousel>react-easy-swipe": {
+    "ethers>@ethersproject/json-wallets>scrypt-js": {
       "globals": {
-        "addEventListener": true,
         "define": true,
-        "document.addEventListener": true,
-        "document.removeEventListener": true
+        "setTimeout": true
       },
       "packages": {
-        "prop-types": true,
-        "react": true
+        "browserify>timers-browserify": true
       }
     },
-    "react-router-dom": {
+    "ganache>secp256k1": {
       "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
+        "@metamask/ppom-validator>elliptic": true
       }
     },
-    "react-router-dom-v5-compat": {
+    "semver": {
       "globals": {
-        "FormData": true,
-        "URL": true,
-        "URLSearchParams": true,
-        "__reactRouterVersion": "write",
-        "addEventListener": true,
-        "confirm": true,
-        "define": true,
-        "document": true,
-        "history.scrollRestoration": true,
-        "location.href": true,
-        "removeEventListener": true,
-        "scrollTo": true,
-        "scrollY": true,
-        "sessionStorage.getItem": true,
-        "sessionStorage.setItem": true,
-        "setTimeout": true
+        "console.error": true
       },
       "packages": {
-        "history": true,
-        "react": true,
-        "react-dom": true,
-        "react-router-dom": true,
-        "react-router-dom-v5-compat>@remix-run/router": true,
-        "react-router-dom-v5-compat>react-router": true
+        "process": true
       }
     },
-    "react-router-dom-v5-compat>@remix-run/router": {
-      "globals": {
-        "AbortController": true,
-        "DOMException": true,
-        "FormData": true,
-        "Headers": true,
-        "Request": true,
-        "Response": true,
-        "URL": true,
-        "URLSearchParams": true,
-        "console": true,
-        "document.defaultView": true
+    "string.prototype.matchall>call-bind>set-function-length": {
+      "packages": {
+        "string.prototype.matchall>define-properties>define-data-property": true,
+        "string.prototype.matchall>call-bind>es-errors": true,
+        "string.prototype.matchall>get-intrinsic": true,
+        "string.prototype.matchall>es-abstract>gopd": true,
+        "string.prototype.matchall>es-abstract>has-property-descriptors": true
       }
     },
-    "react-router-dom-v5-compat>react-router": {
-      "globals": {
-        "console.error": true,
-        "define": true
-      },
+    "string.prototype.matchall>regexp.prototype.flags>set-function-name": {
       "packages": {
-        "react": true,
-        "react-router-dom-v5-compat>@remix-run/router": true
+        "string.prototype.matchall>define-properties>define-data-property": true,
+        "string.prototype.matchall>call-bind>es-errors": true,
+        "string.prototype.matchall>es-abstract>function.prototype.name>functions-have-names": true,
+        "string.prototype.matchall>es-abstract>has-property-descriptors": true
       }
     },
-    "react-router-dom>history": {
+    "promise-to-callback>set-immediate-shim": {
       "globals": {
-        "addEventListener": true,
-        "confirm": true,
-        "document": true,
-        "history": true,
-        "location": true,
-        "navigator.userAgent": true,
-        "removeEventListener": true
+        "setTimeout.apply": 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
+        "browserify>timers-browserify": true
       }
     },
-    "react-router-dom>react-router": {
+    "addons-linter>sha.js": {
       "packages": {
-        "prop-types": true,
-        "prop-types>react-is": true,
-        "react": true,
-        "react-redux>hoist-non-react-statics": true,
-        "react-router-dom>history": true,
-        "react-router-dom>tiny-invariant": true,
-        "react-router-dom>tiny-warning": true,
-        "serve-handler>path-to-regexp": true
+        "pumpify>inherits": true,
+        "koa>content-disposition>safe-buffer": true
       }
     },
-    "react-router-dom>tiny-warning": {
-      "globals": {
-        "console": true
+    "string.prototype.matchall>side-channel": {
+      "packages": {
+        "string.prototype.matchall>call-bind": true,
+        "string.prototype.matchall>get-intrinsic": true,
+        "string.prototype.matchall>es-abstract>object-inspect": true
       }
     },
-    "react-simple-file-input": {
+    "@metamask/profile-sync-controller>siwe": {
       "globals": {
-        "File": true,
-        "FileReader": true,
+        "console.error": true,
         "console.warn": true
       },
       "packages": {
-        "prop-types": true,
-        "react": true
+        "@metamask/profile-sync-controller>siwe>@spruceid/siwe-parser": true,
+        "@metamask/profile-sync-controller>siwe>@stablelib/random": true,
+        "ethers": true,
+        "@metamask/controller-utils>@spruceid/siwe-parser>valid-url": true
       }
     },
-    "react-syntax-highlighter>refractor>parse-entities": {
+    "@metamask/eth-token-tracker>deep-equal>es-get-iterator>stop-iteration-iterator": {
       "globals": {
-        "document.createElement": true
+        "StopIteration": true
+      },
+      "packages": {
+        "string.prototype.matchall>internal-slot": true
       }
     },
-    "react-tippy": {
+    "stream-browserify": {
+      "packages": {
+        "webpack>events": true,
+        "pumpify>inherits": true,
+        "readable-stream": true
+      }
+    },
+    "stream-http": {
       "globals": {
-        "Element": true,
-        "MSStream": true,
-        "MutationObserver": true,
-        "addEventListener": true,
+        "AbortController": true,
+        "Blob": true,
+        "MSStreamReader": true,
+        "ReadableStream": true,
+        "WritableStream": true,
+        "XDomainRequest": true,
+        "XMLHttpRequest": 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,
+        "fetch": true,
+        "location.protocol.search": true,
         "setTimeout": true
       },
       "packages": {
-        "react": true,
-        "react-dom": true,
-        "react-tippy>popper.js": true
+        "browserify>buffer": true,
+        "stream-http>builtin-status-codes": true,
+        "pumpify>inherits": true,
+        "process": true,
+        "readable-stream": true,
+        "browserify>url": true,
+        "watchify>xtend": 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
+    "@metamask/snaps-controllers>tar-stream>streamx": {
+      "packages": {
+        "webpack>events": true,
+        "@metamask/snaps-controllers>tar-stream>fast-fifo": true,
+        "@metamask/snaps-controllers>tar-stream>streamx>queue-tick": true
       }
     },
-    "react-toggle-button": {
-      "globals": {
-        "clearTimeout": true,
-        "console.warn": true,
-        "define": true,
-        "performance": true,
-        "setTimeout": true
-      },
+    "browserify>string_decoder": {
       "packages": {
-        "react": true
+        "koa>content-disposition>safe-buffer": true
       }
     },
-    "readable-stream": {
+    "@metamask/ethjs>@metamask/ethjs-util>strip-hex-prefix": {
       "packages": {
-        "browserify>browser-resolve": true,
-        "browserify>buffer": true,
-        "browserify>string_decoder": true,
-        "process": true,
-        "pumpify>inherits": true,
-        "readable-stream>util-deprecate": true,
-        "webpack>events": true
+        "@metamask/ethjs>@metamask/ethjs-util>is-hex-prefixed": true
       }
     },
-    "readable-stream>util-deprecate": {
-      "globals": {
-        "console.trace": true,
-        "console.warn": true,
-        "localStorage": true
+    "react-markdown>style-to-object": {
+      "packages": {
+        "react-markdown>style-to-object>inline-style-parser": true
       }
     },
-    "redux": {
-      "globals": {
-        "console": true
-      },
+    "@metamask/snaps-controllers>tar-stream": {
       "packages": {
-        "@babel/runtime": true
+        "@metamask/snaps-controllers>tar-stream>b4a": true,
+        "browserify>browser-resolve": true,
+        "@metamask/snaps-controllers>tar-stream>fast-fifo": true,
+        "@metamask/snaps-controllers>tar-stream>streamx": true
       }
     },
-    "reselect": {
-      "globals": {
-        "WeakRef": true,
-        "console.warn": true,
-        "unstable_autotrackMemoize": true
+    "debounce-stream>through": {
+      "packages": {
+        "process": true,
+        "stream-browserify": true
       }
     },
-    "semver": {
+    "browserify>timers-browserify": {
       "globals": {
-        "console.error": true
+        "clearInterval": true,
+        "clearTimeout": true,
+        "setInterval": true,
+        "setTimeout": true
       },
       "packages": {
         "process": true
       }
     },
-    "serve-handler>path-to-regexp": {
-      "packages": {
-        "serve-handler>path-to-regexp>isarray": true
+    "react-router-dom>tiny-warning": {
+      "globals": {
+        "console": true
       }
     },
-    "stream-browserify": {
-      "packages": {
-        "pumpify>inherits": true,
-        "readable-stream": true,
-        "webpack>events": true
+    "copy-to-clipboard>toggle-selection": {
+      "globals": {
+        "document.activeElement": true,
+        "document.getSelection": true
       }
     },
-    "stream-http": {
+    "@swc/helpers>tslib": {
+      "globals": {
+        "SuppressedError": true,
+        "define": true
+      }
+    },
+    "@metamask/eth-sig-util>tweetnacl": {
       "globals": {
-        "AbortController": true,
-        "Blob": true,
-        "MSStreamReader": true,
-        "ReadableStream": true,
-        "WritableStream": true,
-        "XDomainRequest": true,
-        "XMLHttpRequest": true,
-        "clearTimeout": true,
-        "fetch": true,
-        "location.protocol.search": true,
-        "setTimeout": true
+        "crypto": true,
+        "msCrypto": true,
+        "nacl": "write"
       },
       "packages": {
-        "browserify>buffer": true,
-        "browserify>url": true,
-        "process": true,
-        "pumpify>inherits": true,
-        "readable-stream": true,
-        "stream-http>builtin-status-codes": true,
-        "watchify>xtend": true
+        "browserify>browser-resolve": true
       }
     },
-    "string.prototype.matchall>call-bind": {
-      "packages": {
-        "browserify>has>function-bind": true,
-        "string.prototype.matchall>call-bind>es-define-property": true,
-        "string.prototype.matchall>call-bind>es-errors": true,
-        "string.prototype.matchall>call-bind>set-function-length": true,
-        "string.prototype.matchall>get-intrinsic": true
+    "@trezor/connect-web>@trezor/connect-common>@trezor/env-utils>ua-parser-js": {
+      "globals": {
+        "define": true
       }
     },
-    "string.prototype.matchall>call-bind>es-define-property": {
+    "@ensdomains/content-hash>cids>uint8arrays": {
+      "globals": {
+        "TextDecoder": true,
+        "TextEncoder": true
+      },
       "packages": {
-        "string.prototype.matchall>get-intrinsic": true
+        "@ensdomains/content-hash>cids>multibase": true
       }
     },
-    "string.prototype.matchall>call-bind>set-function-length": {
+    "@ensdomains/content-hash>multicodec>uint8arrays": {
+      "globals": {
+        "Buffer": true,
+        "TextDecoder": true,
+        "TextEncoder": true
+      },
       "packages": {
-        "string.prototype.matchall>call-bind>es-errors": true,
-        "string.prototype.matchall>define-properties>define-data-property": true,
-        "string.prototype.matchall>es-abstract>gopd": true,
-        "string.prototype.matchall>es-abstract>has-property-descriptors": true,
-        "string.prototype.matchall>get-intrinsic": true
+        "@ensdomains/content-hash>multicodec>uint8arrays>multiformats": true
       }
     },
-    "string.prototype.matchall>define-properties": {
+    "react-markdown>unified": {
       "packages": {
-        "@lavamoat/lavapack>json-stable-stringify>object-keys": true,
-        "string.prototype.matchall>define-properties>define-data-property": true,
-        "string.prototype.matchall>es-abstract>has-property-descriptors": true
+        "react-markdown>unified>bail": true,
+        "react-markdown>unified>extend": true,
+        "react-markdown>unified>is-buffer": true,
+        "mocha>yargs-unparser>is-plain-obj": true,
+        "react-markdown>unified>trough": true,
+        "react-markdown>vfile": true
       }
     },
-    "string.prototype.matchall>define-properties>define-data-property": {
+    "react-markdown>unist-util-visit>unist-util-visit-parents": {
       "packages": {
-        "string.prototype.matchall>call-bind>es-define-property": true,
-        "string.prototype.matchall>call-bind>es-errors": true,
-        "string.prototype.matchall>es-abstract>gopd": true
+        "react-markdown>unist-util-visit>unist-util-is": true
       }
     },
-    "string.prototype.matchall>es-abstract>array-buffer-byte-length": {
+    "react-markdown>unist-util-visit": {
       "packages": {
-        "string.prototype.matchall>call-bind": true,
-        "string.prototype.matchall>es-abstract>is-array-buffer": true
+        "react-markdown>unist-util-visit>unist-util-visit-parents": true
       }
     },
-    "string.prototype.matchall>es-abstract>available-typed-arrays": {
-      "packages": {
-        "string.prototype.matchall>es-abstract>typed-array-length>possible-typed-array-names": true
+    "uri-js": {
+      "globals": {
+        "define": true
       }
     },
-    "string.prototype.matchall>es-abstract>es-to-primitive>is-symbol": {
+    "browserify>url": {
       "packages": {
-        "string.prototype.matchall>has-symbols": true
+        "browserify>punycode": true,
+        "@storybook/addon-knobs>qs": true
       }
     },
-    "string.prototype.matchall>es-abstract>gopd": {
+    "react-focus-lock>use-callback-ref": {
       "packages": {
-        "string.prototype.matchall>get-intrinsic": true
+        "react": true
       }
     },
-    "string.prototype.matchall>es-abstract>has-property-descriptors": {
+    "react-beautiful-dnd>use-memo-one": {
       "packages": {
-        "string.prototype.matchall>call-bind>es-define-property": true
+        "react": true
       }
     },
-    "string.prototype.matchall>es-abstract>is-array-buffer": {
+    "react-focus-lock>use-sidecar": {
+      "globals": {
+        "console.error": true
+      },
       "packages": {
-        "string.prototype.matchall>call-bind": true,
-        "string.prototype.matchall>get-intrinsic": true
+        "react-focus-lock>use-sidecar>detect-node-es": true,
+        "react": true,
+        "@swc/helpers>tslib": true
       }
     },
-    "string.prototype.matchall>es-abstract>is-callable": {
+    "readable-stream>util-deprecate": {
       "globals": {
-        "document": true
+        "console.trace": true,
+        "console.warn": true,
+        "localStorage": true
       }
     },
-    "string.prototype.matchall>es-abstract>is-regex": {
+    "browserify>assert>util": {
+      "globals": {
+        "console.error": true,
+        "console.log": true,
+        "console.trace": true,
+        "process": true
+      },
       "packages": {
-        "koa>is-generator-function>has-tostringtag": true,
-        "string.prototype.matchall>call-bind": true
+        "browserify>assert>util>inherits": true,
+        "process": true
       }
     },
-    "string.prototype.matchall>es-abstract>is-shared-array-buffer": {
+    "browserify>util": {
+      "globals": {
+        "console.error": true,
+        "console.log": true,
+        "console.trace": true
+      },
       "packages": {
-        "string.prototype.matchall>call-bind": true
+        "pumpify>inherits": true,
+        "browserify>util>is-arguments": true,
+        "koa>is-generator-function": true,
+        "browserify>util>is-typed-array": true,
+        "process": true,
+        "browserify>util>which-typed-array": true
       }
     },
-    "string.prototype.matchall>es-abstract>object-inspect": {
+    "uuid": {
       "globals": {
-        "HTMLElement": true,
-        "WeakRef": true
-      },
-      "packages": {
-        "browserify>browser-resolve": true
+        "crypto": true,
+        "msCrypto": true
       }
     },
-    "string.prototype.matchall>get-intrinsic": {
+    "@metamask/eth-snap-keyring>uuid": {
       "globals": {
-        "AggregateError": true,
-        "FinalizationRegistry": true,
-        "WeakRef": true
-      },
-      "packages": {
-        "browserify>has>function-bind": true,
-        "depcheck>is-core-module>hasown": true,
-        "string.prototype.matchall>call-bind>es-errors": true,
-        "string.prototype.matchall>es-abstract>has-proto": true,
-        "string.prototype.matchall>has-symbols": true
+        "crypto": true
       }
     },
-    "string.prototype.matchall>internal-slot": {
-      "packages": {
-        "depcheck>is-core-module>hasown": true,
-        "string.prototype.matchall>call-bind>es-errors": true,
-        "string.prototype.matchall>side-channel": true
+    "@metamask/keyring-snap-client>uuid": {
+      "globals": {
+        "crypto": true
       }
     },
-    "string.prototype.matchall>regexp.prototype.flags": {
-      "packages": {
-        "string.prototype.matchall>call-bind": true,
-        "string.prototype.matchall>call-bind>es-errors": true,
-        "string.prototype.matchall>define-properties": true,
-        "string.prototype.matchall>regexp.prototype.flags>set-function-name": true
+    "eth-lattice-keyring>gridplus-sdk>uuid": {
+      "globals": {
+        "crypto": true
       }
     },
-    "string.prototype.matchall>regexp.prototype.flags>set-function-name": {
+    "web3-stream-provider>uuid": {
+      "globals": {
+        "crypto": true
+      }
+    },
+    "@metamask/snaps-utils>validate-npm-package-name": {
       "packages": {
-        "string.prototype.matchall>call-bind>es-errors": true,
-        "string.prototype.matchall>define-properties>define-data-property": true,
-        "string.prototype.matchall>es-abstract>function.prototype.name>functions-have-names": true,
-        "string.prototype.matchall>es-abstract>has-property-descriptors": true
+        "@metamask/snaps-utils>validate-npm-package-name>builtins": true
       }
     },
-    "string.prototype.matchall>side-channel": {
+    "react-markdown>vfile>vfile-message": {
       "packages": {
-        "string.prototype.matchall>call-bind": true,
-        "string.prototype.matchall>es-abstract>object-inspect": true,
-        "string.prototype.matchall>get-intrinsic": true
+        "react-markdown>vfile>unist-util-stringify-position": true
       }
     },
-    "terser>source-map-support>buffer-from": {
+    "react-markdown>vfile": {
       "packages": {
-        "browserify>buffer": true
+        "react-markdown>vfile>is-buffer": true,
+        "path-browserify": true,
+        "process": true,
+        "react-markdown>vfile>replace-ext": true,
+        "react-markdown>vfile>vfile-message": true
       }
     },
-    "uri-js": {
+    "browserify>vm-browserify": {
       "globals": {
-        "define": true
+        "document.body.appendChild": true,
+        "document.body.removeChild": true,
+        "document.createElement": true
       }
     },
-    "uuid": {
+    "react-popper>warning": {
       "globals": {
-        "crypto": true,
-        "msCrypto": true
+        "console": true
       }
     },
-    "wait-on>rxjs": {
+    "@ensdomains/content-hash>multihashes>web-encoding": {
       "globals": {
-        "cancelAnimationFrame": true,
-        "clearInterval": true,
-        "clearTimeout": true,
-        "performance": true,
-        "requestAnimationFrame": true,
-        "setInterval.apply": true,
-        "setTimeout.apply": true
+        "TextDecoder": true,
+        "TextEncoder": true
+      },
+      "packages": {
+        "browserify>util": true
       }
     },
     "web3": {
@@ -5482,14 +5459,14 @@
         "setTimeout": true
       },
       "packages": {
-        "browserify>util": true,
         "readable-stream": true,
+        "browserify>util": true,
         "web3-stream-provider>uuid": true
       }
     },
-    "web3-stream-provider>uuid": {
+    "@metamask/controllers>web3": {
       "globals": {
-        "crypto": true
+        "XMLHttpRequest": true
       }
     },
     "webextension-polyfill": {
@@ -5501,9 +5478,35 @@
         "define": true
       }
     },
-    "webpack>events": {
+    "@metamask/eth-token-tracker>deep-equal>which-boxed-primitive": {
+      "packages": {
+        "@metamask/eth-token-tracker>deep-equal>which-boxed-primitive>is-bigint": true,
+        "@metamask/eth-token-tracker>deep-equal>which-boxed-primitive>is-boolean-object": true,
+        "@metamask/eth-token-tracker>deep-equal>which-boxed-primitive>is-number-object": true,
+        "eslint-plugin-react>array-includes>is-string": true,
+        "string.prototype.matchall>es-abstract>es-to-primitive>is-symbol": true
+      }
+    },
+    "@metamask/eth-token-tracker>deep-equal>which-collection": {
+      "packages": {
+        "@metamask/eth-token-tracker>deep-equal>es-get-iterator>is-map": true,
+        "@metamask/eth-token-tracker>deep-equal>es-get-iterator>is-set": true,
+        "@metamask/eth-token-tracker>deep-equal>which-collection>is-weakmap": true,
+        "@metamask/eth-token-tracker>deep-equal>which-collection>is-weakset": true
+      }
+    },
+    "browserify>util>which-typed-array": {
+      "packages": {
+        "string.prototype.matchall>es-abstract>available-typed-arrays": true,
+        "string.prototype.matchall>call-bind": true,
+        "browserify>util>which-typed-array>for-each": true,
+        "string.prototype.matchall>es-abstract>gopd": true,
+        "koa>is-generator-function>has-tostringtag": true
+      }
+    },
+    "@metamask/ethjs>@metamask/ethjs-provider-http>xhr2": {
       "globals": {
-        "console": true
+        "XMLHttpRequest": true
       }
     }
   }
diff --git a/lavamoat/build-system/policy.json b/lavamoat/build-system/policy.json
index 59a807e7313f..50fdd1a0f063 100644
--- a/lavamoat/build-system/policy.json
+++ b/lavamoat/build-system/policy.json
@@ -1,57 +1,25 @@
 {
   "resources": {
-    "@babel/code-frame": {
+    "@babel/core>@ampproject/remapping": {
       "globals": {
-        "console.warn": true,
-        "process": true
+        "define": true
       },
       "packages": {
-        "@babel/code-frame>@babel/highlight": true,
-        "postcss>picocolors": true
+        "terser>@jridgewell/source-map>@jridgewell/gen-mapping": true,
+        "terser-webpack-plugin>@jridgewell/trace-mapping": true
       }
     },
-    "@babel/code-frame>@babel/highlight": {
+    "@babel/code-frame": {
       "globals": {
+        "console.warn": true,
         "process": true
       },
       "packages": {
-        "@babel/code-frame>@babel/highlight>chalk": true,
-        "lavamoat>@babel/highlight>@babel/helper-validator-identifier": true,
+        "@babel/code-frame>@babel/helper-validator-identifier": true,
         "loose-envify>js-tokens": true,
         "postcss>picocolors": true
       }
     },
-    "@babel/code-frame>@babel/highlight>chalk": {
-      "globals": {
-        "process.env.TERM": true,
-        "process.platform": true
-      },
-      "packages": {
-        "@babel/code-frame>@babel/highlight>chalk>ansi-styles": true,
-        "@babel/code-frame>@babel/highlight>chalk>escape-string-regexp": true,
-        "@babel/code-frame>@babel/highlight>chalk>supports-color": true
-      }
-    },
-    "@babel/code-frame>@babel/highlight>chalk>ansi-styles": {
-      "packages": {
-        "@metamask/jazzicon>color>color-convert": true
-      }
-    },
-    "@babel/code-frame>@babel/highlight>chalk>supports-color": {
-      "builtin": {
-        "os.release": true
-      },
-      "globals": {
-        "process.env": true,
-        "process.platform": true,
-        "process.stderr": true,
-        "process.stdout": true,
-        "process.versions.node.split": true
-      },
-      "packages": {
-        "gulp-livereload>chalk>supports-color>has-flag": true
-      }
-    },
     "@babel/core": {
       "builtin": {
         "assert": true,
@@ -75,18 +43,13 @@
       },
       "packages": {
         "$root$": true,
-        "@babel/code-frame": true,
         "@babel/core>@ampproject/remapping": true,
+        "@babel/code-frame": true,
         "@babel/core>@babel/generator": true,
         "@babel/core>@babel/helper-compilation-targets": true,
         "@babel/core>@babel/helper-module-transforms": true,
         "@babel/core>@babel/helpers": true,
         "@babel/core>@babel/parser": true,
-        "@babel/core>@babel/template": true,
-        "@babel/core>@babel/types": true,
-        "@babel/core>convert-source-map": true,
-        "@babel/core>gensync": true,
-        "@babel/core>semver": true,
         "@babel/plugin-proposal-class-properties": true,
         "@babel/plugin-proposal-nullish-coalescing-operator": true,
         "@babel/plugin-proposal-object-rest-spread": true,
@@ -96,18 +59,44 @@
         "@babel/preset-env": true,
         "@babel/preset-react": true,
         "@babel/preset-typescript": true,
+        "@babel/core>@babel/template": true,
         "depcheck>@babel/traverse": true,
+        "@babel/core>@babel/types": true,
+        "@babel/core>convert-source-map": true,
+        "nock>debug": true,
+        "@babel/core>gensync": true,
         "depcheck>json5": true,
-        "nock>debug": true
+        "@babel/core>semver": true
       }
     },
-    "@babel/core>@ampproject/remapping": {
+    "@babel/eslint-parser": {
+      "builtin": {
+        "module": true,
+        "path": true,
+        "worker_threads": true
+      },
       "globals": {
-        "define": true
+        "__dirname": true,
+        "process.cwd": true,
+        "process.versions": true
       },
       "packages": {
-        "terser-webpack-plugin>@jridgewell/trace-mapping": true,
-        "terser>@jridgewell/source-map>@jridgewell/gen-mapping": true
+        "@babel/core": true,
+        "@babel/parser": true,
+        "@babel/core>@babel/parser": true,
+        "depcheck>@babel/parser": true,
+        "lavamoat>lavamoat-tofu>@babel/parser": true,
+        "@babel/eslint-parser>@nicolo-ribaudo/eslint-scope-5-internals": true,
+        "eslint": true,
+        "@babel/eslint-parser>eslint-scope": true,
+        "@babel/eslint-parser>eslint-visitor-keys": true,
+        "@babel/eslint-parser>semver": true
+      }
+    },
+    "@babel/eslint-plugin": {
+      "packages": {
+        "eslint": true,
+        "@babel/eslint-plugin>eslint-rule-composer": true
       }
     },
     "@babel/core>@babel/generator": {
@@ -116,15 +105,20 @@
         "console.warn": true
       },
       "packages": {
-        "@babel/core>@babel/generator>jsesc": true,
         "@babel/core>@babel/types": true,
+        "terser>@jridgewell/source-map>@jridgewell/gen-mapping": true,
         "terser-webpack-plugin>@jridgewell/trace-mapping": true,
-        "terser>@jridgewell/source-map>@jridgewell/gen-mapping": true
+        "@babel/core>@babel/generator>jsesc": true
       }
     },
-    "@babel/core>@babel/generator>jsesc": {
-      "globals": {
-        "Buffer": true
+    "@babel/preset-env>@babel/plugin-transform-classes>@babel/helper-annotate-as-pure": {
+      "packages": {
+        "@babel/core>@babel/types": true
+      }
+    },
+    "@babel/preset-env>@babel/plugin-transform-exponentiation-operator>@babel/helper-builder-binary-assignment-operator-visitor": {
+      "packages": {
+        "@babel/core>@babel/types": true
       }
     },
     "@babel/core>@babel/helper-compilation-targets": {
@@ -135,22 +129,66 @@
         "process.versions.node": true
       },
       "packages": {
-        "@babel/core>@babel/helper-compilation-targets>lru-cache": true,
-        "@babel/core>@babel/helper-compilation-targets>semver": true,
         "@babel/preset-env>@babel/compat-data": true,
         "@babel/preset-env>@babel/helper-validator-option": true,
-        "browserslist": true
+        "browserslist": true,
+        "@babel/core>@babel/helper-compilation-targets>lru-cache": true,
+        "@babel/core>@babel/helper-compilation-targets>semver": true
       }
     },
-    "@babel/core>@babel/helper-compilation-targets>lru-cache": {
+    "@babel/preset-env>@babel/plugin-transform-private-methods>@babel/helper-create-class-features-plugin": {
+      "globals": {
+        "console.warn": true
+      },
       "packages": {
-        "@babel/core>@babel/helper-compilation-targets>lru-cache>yallist": true
+        "@babel/core": true,
+        "@babel/preset-env>@babel/plugin-transform-classes>@babel/helper-annotate-as-pure": true,
+        "@babel/preset-env>@babel/plugin-transform-classes>@babel/helper-replace-supers>@babel/helper-member-expression-to-functions": true,
+        "@babel/preset-env>@babel/plugin-transform-classes>@babel/helper-replace-supers>@babel/helper-optimise-call-expression": true,
+        "@babel/preset-env>@babel/plugin-transform-classes>@babel/helper-replace-supers": true,
+        "@babel/preset-env>@babel/plugin-transform-for-of>@babel/helper-skip-transparent-expression-wrappers": true,
+        "depcheck>@babel/traverse": true,
+        "@babel/preset-env>@babel/plugin-transform-private-methods>@babel/helper-create-class-features-plugin>semver": true
       }
     },
-    "@babel/core>@babel/helper-compilation-targets>semver": {
+    "@babel/preset-env>@babel/plugin-transform-dotall-regex>@babel/helper-create-regexp-features-plugin": {
+      "packages": {
+        "@babel/core": true,
+        "@babel/preset-env>@babel/plugin-transform-classes>@babel/helper-annotate-as-pure": true,
+        "@babel/preset-env>@babel/plugin-transform-dotall-regex>@babel/helper-create-regexp-features-plugin>regexpu-core": true,
+        "@babel/preset-env>@babel/plugin-transform-dotall-regex>@babel/helper-create-regexp-features-plugin>semver": true
+      }
+    },
+    "@babel/preset-env>babel-plugin-polyfill-corejs2>@babel/helper-define-polyfill-provider": {
+      "builtin": {
+        "module": true,
+        "path": true
+      },
       "globals": {
-        "console": true,
-        "process": true
+        "console.log": true,
+        "console.warn": true,
+        "process.exitCode": "write",
+        "process.versions.node": true
+      },
+      "packages": {
+        "@babel/core": true,
+        "@babel/core>@babel/helper-compilation-targets": true,
+        "@babel/preset-env>@babel/helper-plugin-utils": true,
+        "@babel/preset-env>babel-plugin-polyfill-corejs2>@babel/helper-define-polyfill-provider>lodash.debounce": true,
+        "depcheck>resolve": true
+      }
+    },
+    "@babel/preset-env>@babel/plugin-transform-classes>@babel/helper-replace-supers>@babel/helper-member-expression-to-functions": {
+      "packages": {
+        "@babel/core>@babel/types": true
+      }
+    },
+    "@babel/core>@babel/helper-module-transforms>@babel/helper-module-imports": {
+      "builtin": {
+        "assert": true
+      },
+      "packages": {
+        "@babel/core>@babel/types": true
       }
     },
     "@babel/core>@babel/helper-module-transforms": {
@@ -163,242 +201,112 @@
         "@babel/core": true,
         "@babel/core>@babel/helper-module-transforms>@babel/helper-module-imports": true,
         "@babel/core>@babel/helper-module-transforms>@babel/helper-simple-access": true,
-        "depcheck>@babel/traverse": true,
-        "lavamoat>@babel/highlight>@babel/helper-validator-identifier": true
+        "@babel/code-frame>@babel/helper-validator-identifier": true,
+        "depcheck>@babel/traverse": true
       }
     },
-    "@babel/core>@babel/helper-module-transforms>@babel/helper-module-imports": {
-      "builtin": {
-        "assert": true
-      },
+    "@babel/preset-env>@babel/plugin-transform-classes>@babel/helper-replace-supers>@babel/helper-optimise-call-expression": {
       "packages": {
         "@babel/core>@babel/types": true
       }
     },
+    "@babel/preset-env>@babel/plugin-transform-async-to-generator>@babel/helper-remap-async-to-generator": {
+      "packages": {
+        "@babel/core": true,
+        "@babel/preset-env>@babel/plugin-transform-classes>@babel/helper-annotate-as-pure": true,
+        "@babel/preset-env>@babel/plugin-transform-async-to-generator>@babel/helper-remap-async-to-generator>@babel/helper-wrap-function": true,
+        "depcheck>@babel/traverse": true
+      }
+    },
+    "@babel/preset-env>@babel/plugin-transform-classes>@babel/helper-replace-supers": {
+      "packages": {
+        "@babel/core": true,
+        "@babel/preset-env>@babel/plugin-transform-classes>@babel/helper-replace-supers>@babel/helper-member-expression-to-functions": true,
+        "@babel/preset-env>@babel/plugin-transform-classes>@babel/helper-replace-supers>@babel/helper-optimise-call-expression": true,
+        "depcheck>@babel/traverse": true
+      }
+    },
     "@babel/core>@babel/helper-module-transforms>@babel/helper-simple-access": {
       "packages": {
         "@babel/core>@babel/types": true
       }
     },
-    "@babel/core>@babel/helpers": {
+    "@babel/preset-env>@babel/plugin-transform-for-of>@babel/helper-skip-transparent-expression-wrappers": {
+      "packages": {
+        "@babel/core>@babel/types": true
+      }
+    },
+    "@babel/preset-env>@babel/plugin-transform-async-to-generator>@babel/helper-remap-async-to-generator>@babel/helper-wrap-function": {
       "packages": {
         "@babel/core>@babel/template": true,
+        "depcheck>@babel/traverse": true,
         "@babel/core>@babel/types": true
       }
     },
-    "@babel/core>@babel/template": {
+    "@babel/core>@babel/helpers": {
       "packages": {
-        "@babel/code-frame": true,
-        "@babel/core>@babel/parser": true,
+        "@babel/core>@babel/template": true,
         "@babel/core>@babel/types": true
       }
     },
-    "@babel/core>@babel/types": {
-      "globals": {
-        "console.warn": true,
-        "process.env": true
-      },
+    "@babel/preset-env>@babel/plugin-bugfix-firefox-class-in-computed-class-key": {
       "packages": {
-        "@babel/core>@babel/types>@babel/helper-string-parser": true,
-        "lavamoat>@babel/highlight>@babel/helper-validator-identifier": true
+        "@babel/preset-env>@babel/helper-plugin-utils": true,
+        "depcheck>@babel/traverse": true
       }
     },
-    "@babel/core>convert-source-map": {
-      "globals": {
-        "Buffer": true,
-        "atob": true,
-        "btoa": true,
-        "value": true
+    "@babel/preset-env>@babel/plugin-bugfix-safari-class-field-initializer-scope": {
+      "packages": {
+        "@babel/core": true,
+        "@babel/preset-env>@babel/helper-plugin-utils": true
       }
     },
-    "@babel/core>semver": {
-      "globals": {
-        "console": true,
-        "process": true
+    "@babel/preset-env>@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": {
+      "packages": {
+        "@babel/preset-env>@babel/helper-plugin-utils": true
       }
     },
-    "@babel/eslint-parser": {
-      "builtin": {
-        "module": true,
-        "path": true,
-        "worker_threads": true
-      },
-      "globals": {
-        "__dirname": true,
-        "process.cwd": true,
-        "process.versions": true
-      },
+    "@babel/preset-env>@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": {
       "packages": {
         "@babel/core": true,
-        "@babel/core>@babel/parser": true,
-        "@babel/eslint-parser>@nicolo-ribaudo/eslint-scope-5-internals": true,
-        "@babel/eslint-parser>eslint-scope": true,
-        "@babel/eslint-parser>eslint-visitor-keys": true,
-        "@babel/eslint-parser>semver": true,
-        "@babel/parser": true,
-        "depcheck>@babel/parser": true,
-        "eslint": true,
-        "lavamoat>lavamoat-tofu>@babel/parser": true
+        "@babel/preset-env>@babel/helper-plugin-utils": true,
+        "@babel/preset-env>@babel/plugin-transform-for-of>@babel/helper-skip-transparent-expression-wrappers": true,
+        "@babel/preset-env>@babel/plugin-transform-optional-chaining": true
       }
     },
-    "@babel/eslint-parser>@nicolo-ribaudo/eslint-scope-5-internals": {
+    "@babel/preset-env>@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly": {
       "packages": {
-        "@babel/eslint-parser>@nicolo-ribaudo/eslint-scope-5-internals>eslint-scope": true
+        "@babel/core": true,
+        "@babel/preset-env>@babel/helper-plugin-utils": true,
+        "depcheck>@babel/traverse": true
       }
     },
-    "@babel/eslint-parser>@nicolo-ribaudo/eslint-scope-5-internals>eslint-scope": {
-      "builtin": {
-        "assert": true
-      },
+    "@babel/preset-env>@babel/plugin-syntax-import-assertions": {
       "packages": {
-        "@babel/eslint-parser>@nicolo-ribaudo/eslint-scope-5-internals>eslint-scope>estraverse": true,
-        "eslint>eslint-scope>esrecurse": true
+        "@babel/preset-env>@babel/helper-plugin-utils": true
       }
     },
-    "@babel/eslint-parser>semver": {
-      "globals": {
-        "console": true,
-        "process": true
+    "@babel/preset-env>@babel/plugin-syntax-import-attributes": {
+      "packages": {
+        "@babel/preset-env>@babel/helper-plugin-utils": true
       }
     },
-    "@babel/eslint-plugin": {
+    "@babel/preset-typescript>@babel/plugin-syntax-jsx": {
       "packages": {
-        "@babel/eslint-plugin>eslint-rule-composer": true,
-        "eslint": true
+        "@babel/preset-env>@babel/helper-plugin-utils": true
       }
     },
-    "@babel/plugin-transform-logical-assignment-operators": {
+    "@babel/preset-typescript>@babel/plugin-transform-typescript>@babel/plugin-syntax-typescript": {
       "packages": {
-        "@babel/core": true,
-        "@babel/preset-env>@babel/helper-plugin-utils": true,
-        "@babel/preset-env>@babel/plugin-syntax-logical-assignment-operators": true
+        "@babel/preset-env>@babel/helper-plugin-utils": true
       }
     },
-    "@babel/preset-env": {
-      "globals": {
-        "console.log": true,
-        "console.warn": true,
-        "process.cwd": true,
-        "process.env.BABEL_ENV": true
-      },
-      "packages": {
-        "@babel/core>@babel/helper-compilation-targets": true,
-        "@babel/plugin-transform-logical-assignment-operators": true,
-        "@babel/preset-env>@babel/compat-data": true,
-        "@babel/preset-env>@babel/helper-plugin-utils": true,
-        "@babel/preset-env>@babel/helper-validator-option": true,
-        "@babel/preset-env>@babel/plugin-bugfix-firefox-class-in-computed-class-key": true,
-        "@babel/preset-env>@babel/plugin-bugfix-safari-class-field-initializer-scope": true,
-        "@babel/preset-env>@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": true,
-        "@babel/preset-env>@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": true,
-        "@babel/preset-env>@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly": true,
-        "@babel/preset-env>@babel/plugin-syntax-import-assertions": true,
-        "@babel/preset-env>@babel/plugin-syntax-import-attributes": true,
-        "@babel/preset-env>@babel/plugin-syntax-unicode-sets-regex": true,
-        "@babel/preset-env>@babel/plugin-transform-arrow-functions": true,
-        "@babel/preset-env>@babel/plugin-transform-async-generator-functions": true,
-        "@babel/preset-env>@babel/plugin-transform-async-to-generator": true,
-        "@babel/preset-env>@babel/plugin-transform-block-scoped-functions": true,
-        "@babel/preset-env>@babel/plugin-transform-block-scoping": true,
-        "@babel/preset-env>@babel/plugin-transform-class-properties": true,
-        "@babel/preset-env>@babel/plugin-transform-class-static-block": true,
-        "@babel/preset-env>@babel/plugin-transform-classes": true,
-        "@babel/preset-env>@babel/plugin-transform-computed-properties": true,
-        "@babel/preset-env>@babel/plugin-transform-destructuring": true,
-        "@babel/preset-env>@babel/plugin-transform-dotall-regex": true,
-        "@babel/preset-env>@babel/plugin-transform-duplicate-keys": true,
-        "@babel/preset-env>@babel/plugin-transform-duplicate-named-capturing-groups-regex": true,
-        "@babel/preset-env>@babel/plugin-transform-dynamic-import": true,
-        "@babel/preset-env>@babel/plugin-transform-exponentiation-operator": true,
-        "@babel/preset-env>@babel/plugin-transform-export-namespace-from": true,
-        "@babel/preset-env>@babel/plugin-transform-for-of": true,
-        "@babel/preset-env>@babel/plugin-transform-function-name": true,
-        "@babel/preset-env>@babel/plugin-transform-json-strings": true,
-        "@babel/preset-env>@babel/plugin-transform-literals": true,
-        "@babel/preset-env>@babel/plugin-transform-member-expression-literals": true,
-        "@babel/preset-env>@babel/plugin-transform-modules-amd": true,
-        "@babel/preset-env>@babel/plugin-transform-modules-commonjs": true,
-        "@babel/preset-env>@babel/plugin-transform-modules-systemjs": true,
-        "@babel/preset-env>@babel/plugin-transform-modules-umd": true,
-        "@babel/preset-env>@babel/plugin-transform-named-capturing-groups-regex": true,
-        "@babel/preset-env>@babel/plugin-transform-new-target": true,
-        "@babel/preset-env>@babel/plugin-transform-nullish-coalescing-operator": true,
-        "@babel/preset-env>@babel/plugin-transform-numeric-separator": true,
-        "@babel/preset-env>@babel/plugin-transform-object-rest-spread": true,
-        "@babel/preset-env>@babel/plugin-transform-object-super": true,
-        "@babel/preset-env>@babel/plugin-transform-optional-catch-binding": true,
-        "@babel/preset-env>@babel/plugin-transform-optional-chaining": true,
-        "@babel/preset-env>@babel/plugin-transform-parameters": true,
-        "@babel/preset-env>@babel/plugin-transform-private-methods": true,
-        "@babel/preset-env>@babel/plugin-transform-private-property-in-object": true,
-        "@babel/preset-env>@babel/plugin-transform-property-literals": true,
-        "@babel/preset-env>@babel/plugin-transform-regenerator": true,
-        "@babel/preset-env>@babel/plugin-transform-reserved-words": true,
-        "@babel/preset-env>@babel/plugin-transform-shorthand-properties": true,
-        "@babel/preset-env>@babel/plugin-transform-spread": true,
-        "@babel/preset-env>@babel/plugin-transform-sticky-regex": true,
-        "@babel/preset-env>@babel/plugin-transform-template-literals": true,
-        "@babel/preset-env>@babel/plugin-transform-typeof-symbol": true,
-        "@babel/preset-env>@babel/plugin-transform-unicode-escapes": true,
-        "@babel/preset-env>@babel/plugin-transform-unicode-property-regex": true,
-        "@babel/preset-env>@babel/plugin-transform-unicode-regex": true,
-        "@babel/preset-env>@babel/plugin-transform-unicode-sets-regex": true,
-        "@babel/preset-env>@babel/preset-modules": true,
-        "@babel/preset-env>babel-plugin-polyfill-corejs2": true,
-        "@babel/preset-env>babel-plugin-polyfill-corejs3": true,
-        "@babel/preset-env>babel-plugin-polyfill-regenerator": true,
-        "@babel/preset-env>core-js-compat": true,
-        "@babel/preset-env>semver": true
-      }
-    },
-    "@babel/preset-env>@babel/plugin-bugfix-firefox-class-in-computed-class-key": {
-      "packages": {
-        "@babel/preset-env>@babel/helper-plugin-utils": true,
-        "depcheck>@babel/traverse": true
-      }
-    },
-    "@babel/preset-env>@babel/plugin-bugfix-safari-class-field-initializer-scope": {
-      "packages": {
-        "@babel/core": true,
-        "@babel/preset-env>@babel/helper-plugin-utils": true
-      }
-    },
-    "@babel/preset-env>@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": {
-      "packages": {
-        "@babel/preset-env>@babel/helper-plugin-utils": true
-      }
-    },
-    "@babel/preset-env>@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": {
-      "packages": {
-        "@babel/core": true,
-        "@babel/preset-env>@babel/helper-plugin-utils": true,
-        "@babel/preset-env>@babel/plugin-transform-for-of>@babel/helper-skip-transparent-expression-wrappers": true,
-        "@babel/preset-env>@babel/plugin-transform-optional-chaining": true
-      }
-    },
-    "@babel/preset-env>@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly": {
-      "packages": {
-        "@babel/core": true,
-        "@babel/preset-env>@babel/helper-plugin-utils": true,
-        "depcheck>@babel/traverse": true
-      }
-    },
-    "@babel/preset-env>@babel/plugin-syntax-import-assertions": {
-      "packages": {
-        "@babel/preset-env>@babel/helper-plugin-utils": true
-      }
-    },
-    "@babel/preset-env>@babel/plugin-syntax-import-attributes": {
+    "@babel/preset-env>@babel/plugin-syntax-unicode-sets-regex": {
       "packages": {
+        "@babel/preset-env>@babel/plugin-transform-dotall-regex>@babel/helper-create-regexp-features-plugin": true,
         "@babel/preset-env>@babel/helper-plugin-utils": true
       }
     },
-    "@babel/preset-env>@babel/plugin-syntax-unicode-sets-regex": {
-      "packages": {
-        "@babel/preset-env>@babel/helper-plugin-utils": true,
-        "@babel/preset-env>@babel/plugin-transform-dotall-regex>@babel/helper-create-regexp-features-plugin": true
-      }
-    },
     "@babel/preset-env>@babel/plugin-transform-arrow-functions": {
       "packages": {
         "@babel/preset-env>@babel/helper-plugin-utils": true
@@ -420,21 +328,6 @@
         "@babel/preset-env>@babel/plugin-transform-async-to-generator>@babel/helper-remap-async-to-generator": true
       }
     },
-    "@babel/preset-env>@babel/plugin-transform-async-to-generator>@babel/helper-remap-async-to-generator": {
-      "packages": {
-        "@babel/core": true,
-        "@babel/preset-env>@babel/plugin-transform-async-to-generator>@babel/helper-remap-async-to-generator>@babel/helper-wrap-function": true,
-        "@babel/preset-env>@babel/plugin-transform-classes>@babel/helper-annotate-as-pure": true,
-        "depcheck>@babel/traverse": true
-      }
-    },
-    "@babel/preset-env>@babel/plugin-transform-async-to-generator>@babel/helper-remap-async-to-generator>@babel/helper-wrap-function": {
-      "packages": {
-        "@babel/core>@babel/template": true,
-        "@babel/core>@babel/types": true,
-        "depcheck>@babel/traverse": true
-      }
-    },
     "@babel/preset-env>@babel/plugin-transform-block-scoped-functions": {
       "packages": {
         "@babel/core": true,
@@ -449,55 +342,32 @@
     },
     "@babel/preset-env>@babel/plugin-transform-class-properties": {
       "packages": {
-        "@babel/preset-env>@babel/helper-plugin-utils": true,
-        "@babel/preset-env>@babel/plugin-transform-private-methods>@babel/helper-create-class-features-plugin": true
+        "@babel/preset-env>@babel/plugin-transform-private-methods>@babel/helper-create-class-features-plugin": true,
+        "@babel/preset-env>@babel/helper-plugin-utils": true
       }
     },
     "@babel/preset-env>@babel/plugin-transform-class-static-block": {
       "packages": {
-        "@babel/preset-env>@babel/helper-plugin-utils": true,
-        "@babel/preset-env>@babel/plugin-transform-private-methods>@babel/helper-create-class-features-plugin": true
+        "@babel/preset-env>@babel/plugin-transform-private-methods>@babel/helper-create-class-features-plugin": true,
+        "@babel/preset-env>@babel/helper-plugin-utils": true
       }
     },
     "@babel/preset-env>@babel/plugin-transform-classes": {
       "packages": {
         "@babel/core": true,
+        "@babel/preset-env>@babel/plugin-transform-classes>@babel/helper-annotate-as-pure": true,
         "@babel/core>@babel/helper-compilation-targets": true,
         "@babel/preset-env>@babel/helper-plugin-utils": true,
-        "@babel/preset-env>@babel/plugin-transform-classes>@babel/helper-annotate-as-pure": true,
         "@babel/preset-env>@babel/plugin-transform-classes>@babel/helper-replace-supers": true,
-        "@babel/preset-env>@babel/plugin-transform-classes>globals": true,
-        "depcheck>@babel/traverse": true
-      }
-    },
-    "@babel/preset-env>@babel/plugin-transform-classes>@babel/helper-annotate-as-pure": {
-      "packages": {
-        "@babel/core>@babel/types": true
-      }
-    },
-    "@babel/preset-env>@babel/plugin-transform-classes>@babel/helper-replace-supers": {
-      "packages": {
-        "@babel/core": true,
-        "@babel/preset-env>@babel/plugin-transform-classes>@babel/helper-replace-supers>@babel/helper-member-expression-to-functions": true,
-        "@babel/preset-env>@babel/plugin-transform-classes>@babel/helper-replace-supers>@babel/helper-optimise-call-expression": true,
-        "depcheck>@babel/traverse": true
-      }
-    },
-    "@babel/preset-env>@babel/plugin-transform-classes>@babel/helper-replace-supers>@babel/helper-member-expression-to-functions": {
-      "packages": {
-        "@babel/core>@babel/types": true
-      }
-    },
-    "@babel/preset-env>@babel/plugin-transform-classes>@babel/helper-replace-supers>@babel/helper-optimise-call-expression": {
-      "packages": {
-        "@babel/core>@babel/types": true
+        "depcheck>@babel/traverse": true,
+        "@babel/preset-env>@babel/plugin-transform-classes>globals": true
       }
     },
     "@babel/preset-env>@babel/plugin-transform-computed-properties": {
       "packages": {
         "@babel/core": true,
-        "@babel/core>@babel/template": true,
-        "@babel/preset-env>@babel/helper-plugin-utils": true
+        "@babel/preset-env>@babel/helper-plugin-utils": true,
+        "@babel/core>@babel/template": true
       }
     },
     "@babel/preset-env>@babel/plugin-transform-destructuring": {
@@ -508,55 +378,8 @@
     },
     "@babel/preset-env>@babel/plugin-transform-dotall-regex": {
       "packages": {
-        "@babel/preset-env>@babel/helper-plugin-utils": true,
-        "@babel/preset-env>@babel/plugin-transform-dotall-regex>@babel/helper-create-regexp-features-plugin": true
-      }
-    },
-    "@babel/preset-env>@babel/plugin-transform-dotall-regex>@babel/helper-create-regexp-features-plugin": {
-      "packages": {
-        "@babel/core": true,
-        "@babel/preset-env>@babel/plugin-transform-classes>@babel/helper-annotate-as-pure": true,
-        "@babel/preset-env>@babel/plugin-transform-dotall-regex>@babel/helper-create-regexp-features-plugin>regexpu-core": true,
-        "@babel/preset-env>@babel/plugin-transform-dotall-regex>@babel/helper-create-regexp-features-plugin>semver": true
-      }
-    },
-    "@babel/preset-env>@babel/plugin-transform-dotall-regex>@babel/helper-create-regexp-features-plugin>regexpu-core": {
-      "globals": {
-        "characterClassItem.kind": true
-      },
-      "packages": {
-        "@babel/preset-env>@babel/plugin-transform-dotall-regex>@babel/helper-create-regexp-features-plugin>regexpu-core>regenerate": true,
-        "@babel/preset-env>@babel/plugin-transform-dotall-regex>@babel/helper-create-regexp-features-plugin>regexpu-core>regjsgen": true,
-        "@babel/preset-env>@babel/plugin-transform-dotall-regex>@babel/helper-create-regexp-features-plugin>regexpu-core>regjsparser": true,
-        "@babel/preset-env>@babel/plugin-transform-dotall-regex>@babel/helper-create-regexp-features-plugin>regexpu-core>unicode-match-property-ecmascript": true,
-        "@babel/preset-env>@babel/plugin-transform-dotall-regex>@babel/helper-create-regexp-features-plugin>regexpu-core>unicode-match-property-value-ecmascript": true
-      }
-    },
-    "@babel/preset-env>@babel/plugin-transform-dotall-regex>@babel/helper-create-regexp-features-plugin>regexpu-core>regenerate": {
-      "globals": {
-        "define": true
-      }
-    },
-    "@babel/preset-env>@babel/plugin-transform-dotall-regex>@babel/helper-create-regexp-features-plugin>regexpu-core>regjsgen": {
-      "globals": {
-        "define": true
-      }
-    },
-    "@babel/preset-env>@babel/plugin-transform-dotall-regex>@babel/helper-create-regexp-features-plugin>regexpu-core>regjsparser": {
-      "globals": {
-        "regjsparser": "write"
-      }
-    },
-    "@babel/preset-env>@babel/plugin-transform-dotall-regex>@babel/helper-create-regexp-features-plugin>regexpu-core>unicode-match-property-ecmascript": {
-      "packages": {
-        "@babel/preset-env>@babel/plugin-transform-dotall-regex>@babel/helper-create-regexp-features-plugin>regexpu-core>unicode-match-property-ecmascript>unicode-canonical-property-names-ecmascript": true,
-        "@babel/preset-env>@babel/plugin-transform-dotall-regex>@babel/helper-create-regexp-features-plugin>regexpu-core>unicode-match-property-ecmascript>unicode-property-aliases-ecmascript": true
-      }
-    },
-    "@babel/preset-env>@babel/plugin-transform-dotall-regex>@babel/helper-create-regexp-features-plugin>semver": {
-      "globals": {
-        "console": true,
-        "process": true
+        "@babel/preset-env>@babel/plugin-transform-dotall-regex>@babel/helper-create-regexp-features-plugin": true,
+        "@babel/preset-env>@babel/helper-plugin-utils": true
       }
     },
     "@babel/preset-env>@babel/plugin-transform-duplicate-keys": {
@@ -567,8 +390,8 @@
     },
     "@babel/preset-env>@babel/plugin-transform-duplicate-named-capturing-groups-regex": {
       "packages": {
-        "@babel/preset-env>@babel/helper-plugin-utils": true,
-        "@babel/preset-env>@babel/plugin-transform-dotall-regex>@babel/helper-create-regexp-features-plugin": true
+        "@babel/preset-env>@babel/plugin-transform-dotall-regex>@babel/helper-create-regexp-features-plugin": true,
+        "@babel/preset-env>@babel/helper-plugin-utils": true
       }
     },
     "@babel/preset-env>@babel/plugin-transform-dynamic-import": {
@@ -579,13 +402,8 @@
     "@babel/preset-env>@babel/plugin-transform-exponentiation-operator": {
       "packages": {
         "@babel/core": true,
-        "@babel/preset-env>@babel/helper-plugin-utils": true,
-        "@babel/preset-env>@babel/plugin-transform-exponentiation-operator>@babel/helper-builder-binary-assignment-operator-visitor": true
-      }
-    },
-    "@babel/preset-env>@babel/plugin-transform-exponentiation-operator>@babel/helper-builder-binary-assignment-operator-visitor": {
-      "packages": {
-        "@babel/core>@babel/types": true
+        "@babel/preset-env>@babel/plugin-transform-exponentiation-operator>@babel/helper-builder-binary-assignment-operator-visitor": true,
+        "@babel/preset-env>@babel/helper-plugin-utils": true
       }
     },
     "@babel/preset-env>@babel/plugin-transform-export-namespace-from": {
@@ -601,11 +419,6 @@
         "@babel/preset-env>@babel/plugin-transform-for-of>@babel/helper-skip-transparent-expression-wrappers": true
       }
     },
-    "@babel/preset-env>@babel/plugin-transform-for-of>@babel/helper-skip-transparent-expression-wrappers": {
-      "packages": {
-        "@babel/core>@babel/types": true
-      }
-    },
     "@babel/preset-env>@babel/plugin-transform-function-name": {
       "packages": {
         "@babel/core>@babel/helper-compilation-targets": true,
@@ -623,6 +436,13 @@
         "@babel/preset-env>@babel/helper-plugin-utils": true
       }
     },
+    "@babel/plugin-transform-logical-assignment-operators": {
+      "packages": {
+        "@babel/core": true,
+        "@babel/preset-env>@babel/helper-plugin-utils": true,
+        "@babel/preset-env>@babel/plugin-syntax-logical-assignment-operators": true
+      }
+    },
     "@babel/preset-env>@babel/plugin-transform-member-expression-literals": {
       "packages": {
         "@babel/core": true,
@@ -640,8 +460,8 @@
       "packages": {
         "@babel/core": true,
         "@babel/core>@babel/helper-module-transforms": true,
-        "@babel/core>@babel/helper-module-transforms>@babel/helper-simple-access": true,
-        "@babel/preset-env>@babel/helper-plugin-utils": true
+        "@babel/preset-env>@babel/helper-plugin-utils": true,
+        "@babel/core>@babel/helper-module-transforms>@babel/helper-simple-access": true
       }
     },
     "@babel/preset-env>@babel/plugin-transform-modules-systemjs": {
@@ -652,8 +472,8 @@
         "@babel/core": true,
         "@babel/core>@babel/helper-module-transforms": true,
         "@babel/preset-env>@babel/helper-plugin-utils": true,
-        "depcheck>@babel/traverse": true,
-        "lavamoat>@babel/highlight>@babel/helper-validator-identifier": true
+        "@babel/code-frame>@babel/helper-validator-identifier": true,
+        "depcheck>@babel/traverse": true
       }
     },
     "@babel/preset-env>@babel/plugin-transform-modules-umd": {
@@ -669,8 +489,8 @@
     },
     "@babel/preset-env>@babel/plugin-transform-named-capturing-groups-regex": {
       "packages": {
-        "@babel/preset-env>@babel/helper-plugin-utils": true,
-        "@babel/preset-env>@babel/plugin-transform-dotall-regex>@babel/helper-create-regexp-features-plugin": true
+        "@babel/preset-env>@babel/plugin-transform-dotall-regex>@babel/helper-create-regexp-features-plugin": true,
+        "@babel/preset-env>@babel/helper-plugin-utils": true
       }
     },
     "@babel/preset-env>@babel/plugin-transform-new-target": {
@@ -725,41 +545,52 @@
     },
     "@babel/preset-env>@babel/plugin-transform-private-methods": {
       "packages": {
-        "@babel/preset-env>@babel/helper-plugin-utils": true,
-        "@babel/preset-env>@babel/plugin-transform-private-methods>@babel/helper-create-class-features-plugin": true
+        "@babel/preset-env>@babel/plugin-transform-private-methods>@babel/helper-create-class-features-plugin": true,
+        "@babel/preset-env>@babel/helper-plugin-utils": true
       }
     },
-    "@babel/preset-env>@babel/plugin-transform-private-methods>@babel/helper-create-class-features-plugin": {
-      "globals": {
-        "console.warn": true
-      },
+    "@babel/preset-env>@babel/plugin-transform-private-property-in-object": {
       "packages": {
-        "@babel/core": true,
         "@babel/preset-env>@babel/plugin-transform-classes>@babel/helper-annotate-as-pure": true,
-        "@babel/preset-env>@babel/plugin-transform-classes>@babel/helper-replace-supers": true,
-        "@babel/preset-env>@babel/plugin-transform-classes>@babel/helper-replace-supers>@babel/helper-member-expression-to-functions": true,
-        "@babel/preset-env>@babel/plugin-transform-classes>@babel/helper-replace-supers>@babel/helper-optimise-call-expression": true,
-        "@babel/preset-env>@babel/plugin-transform-for-of>@babel/helper-skip-transparent-expression-wrappers": true,
-        "@babel/preset-env>@babel/plugin-transform-private-methods>@babel/helper-create-class-features-plugin>semver": true,
-        "depcheck>@babel/traverse": true
+        "@babel/preset-env>@babel/plugin-transform-private-methods>@babel/helper-create-class-features-plugin": true,
+        "@babel/preset-env>@babel/helper-plugin-utils": true
       }
     },
-    "@babel/preset-env>@babel/plugin-transform-private-methods>@babel/helper-create-class-features-plugin>semver": {
-      "globals": {
-        "console": true,
-        "process": true
+    "@babel/preset-env>@babel/plugin-transform-property-literals": {
+      "packages": {
+        "@babel/core": true,
+        "@babel/preset-env>@babel/helper-plugin-utils": true
       }
     },
-    "@babel/preset-env>@babel/plugin-transform-private-property-in-object": {
+    "@babel/preset-react>@babel/plugin-transform-react-display-name": {
+      "builtin": {
+        "path.basename": true,
+        "path.dirname": true,
+        "path.extname": true
+      },
       "packages": {
-        "@babel/preset-env>@babel/helper-plugin-utils": true,
+        "@babel/core": true,
+        "@babel/preset-env>@babel/helper-plugin-utils": true
+      }
+    },
+    "@babel/preset-react>@babel/plugin-transform-react-jsx-development": {
+      "packages": {
+        "@babel/preset-react>@babel/plugin-transform-react-jsx": true
+      }
+    },
+    "@babel/preset-react>@babel/plugin-transform-react-jsx": {
+      "packages": {
+        "@babel/core": true,
         "@babel/preset-env>@babel/plugin-transform-classes>@babel/helper-annotate-as-pure": true,
-        "@babel/preset-env>@babel/plugin-transform-private-methods>@babel/helper-create-class-features-plugin": true
+        "@babel/core>@babel/helper-module-transforms>@babel/helper-module-imports": true,
+        "@babel/preset-env>@babel/helper-plugin-utils": true,
+        "@babel/preset-typescript>@babel/plugin-syntax-jsx": true
       }
     },
-    "@babel/preset-env>@babel/plugin-transform-property-literals": {
+    "@babel/preset-react>@babel/plugin-transform-react-pure-annotations": {
       "packages": {
         "@babel/core": true,
+        "@babel/preset-env>@babel/plugin-transform-classes>@babel/helper-annotate-as-pure": true,
         "@babel/preset-env>@babel/helper-plugin-utils": true
       }
     },
@@ -769,15 +600,6 @@
         "@babel/preset-env>@babel/plugin-transform-regenerator>regenerator-transform": true
       }
     },
-    "@babel/preset-env>@babel/plugin-transform-regenerator>regenerator-transform": {
-      "builtin": {
-        "assert": true,
-        "util.inherits": true
-      },
-      "packages": {
-        "@babel/runtime": true
-      }
-    },
     "@babel/preset-env>@babel/plugin-transform-reserved-words": {
       "packages": {
         "@babel/core": true,
@@ -815,6 +637,22 @@
         "@babel/preset-env>@babel/helper-plugin-utils": true
       }
     },
+    "@babel/preset-typescript>@babel/plugin-transform-typescript": {
+      "builtin": {
+        "assert": true
+      },
+      "globals": {
+        "console.warn": true
+      },
+      "packages": {
+        "@babel/core": true,
+        "@babel/preset-env>@babel/plugin-transform-classes>@babel/helper-annotate-as-pure": true,
+        "@babel/preset-env>@babel/plugin-transform-private-methods>@babel/helper-create-class-features-plugin": true,
+        "@babel/preset-env>@babel/helper-plugin-utils": true,
+        "@babel/preset-env>@babel/plugin-transform-for-of>@babel/helper-skip-transparent-expression-wrappers": true,
+        "@babel/preset-typescript>@babel/plugin-transform-typescript>@babel/plugin-syntax-typescript": true
+      }
+    },
     "@babel/preset-env>@babel/plugin-transform-unicode-escapes": {
       "packages": {
         "@babel/core": true,
@@ -823,77 +661,97 @@
     },
     "@babel/preset-env>@babel/plugin-transform-unicode-property-regex": {
       "packages": {
-        "@babel/preset-env>@babel/helper-plugin-utils": true,
-        "@babel/preset-env>@babel/plugin-transform-dotall-regex>@babel/helper-create-regexp-features-plugin": true
+        "@babel/preset-env>@babel/plugin-transform-dotall-regex>@babel/helper-create-regexp-features-plugin": true,
+        "@babel/preset-env>@babel/helper-plugin-utils": true
       }
     },
     "@babel/preset-env>@babel/plugin-transform-unicode-regex": {
       "packages": {
-        "@babel/preset-env>@babel/helper-plugin-utils": true,
-        "@babel/preset-env>@babel/plugin-transform-dotall-regex>@babel/helper-create-regexp-features-plugin": true
+        "@babel/preset-env>@babel/plugin-transform-dotall-regex>@babel/helper-create-regexp-features-plugin": true,
+        "@babel/preset-env>@babel/helper-plugin-utils": true
       }
     },
     "@babel/preset-env>@babel/plugin-transform-unicode-sets-regex": {
       "packages": {
-        "@babel/preset-env>@babel/helper-plugin-utils": true,
-        "@babel/preset-env>@babel/plugin-transform-dotall-regex>@babel/helper-create-regexp-features-plugin": true
-      }
-    },
-    "@babel/preset-env>babel-plugin-polyfill-corejs2": {
-      "packages": {
-        "@babel/core": true,
-        "@babel/preset-env>@babel/compat-data": true,
-        "@babel/preset-env>babel-plugin-polyfill-corejs2>@babel/helper-define-polyfill-provider": true,
-        "@babel/preset-env>babel-plugin-polyfill-corejs2>semver": true
+        "@babel/preset-env>@babel/plugin-transform-dotall-regex>@babel/helper-create-regexp-features-plugin": true,
+        "@babel/preset-env>@babel/helper-plugin-utils": true
       }
     },
-    "@babel/preset-env>babel-plugin-polyfill-corejs2>@babel/helper-define-polyfill-provider": {
-      "builtin": {
-        "module": true,
-        "path": true
-      },
+    "@babel/preset-env": {
       "globals": {
         "console.log": true,
         "console.warn": true,
-        "process.exitCode": "write",
-        "process.versions.node": true
+        "process.cwd": true,
+        "process.env.BABEL_ENV": true
       },
       "packages": {
-        "@babel/core": true,
+        "@babel/preset-env>@babel/compat-data": true,
         "@babel/core>@babel/helper-compilation-targets": true,
         "@babel/preset-env>@babel/helper-plugin-utils": true,
-        "@babel/preset-env>babel-plugin-polyfill-corejs2>@babel/helper-define-polyfill-provider>lodash.debounce": true,
-        "depcheck>resolve": true
-      }
-    },
-    "@babel/preset-env>babel-plugin-polyfill-corejs2>@babel/helper-define-polyfill-provider>lodash.debounce": {
-      "globals": {
-        "clearTimeout": true,
-        "setTimeout": true
-      }
-    },
-    "@babel/preset-env>babel-plugin-polyfill-corejs2>semver": {
-      "globals": {
-        "console": true,
-        "process": true
-      }
-    },
-    "@babel/preset-env>babel-plugin-polyfill-corejs3": {
-      "packages": {
-        "@babel/core": true,
-        "@babel/preset-env>babel-plugin-polyfill-corejs2>@babel/helper-define-polyfill-provider": true,
-        "@babel/preset-env>core-js-compat": true
-      }
-    },
-    "@babel/preset-env>babel-plugin-polyfill-regenerator": {
-      "packages": {
-        "@babel/preset-env>babel-plugin-polyfill-corejs2>@babel/helper-define-polyfill-provider": true
-      }
-    },
-    "@babel/preset-env>semver": {
-      "globals": {
-        "console": true,
-        "process": true
+        "@babel/preset-env>@babel/helper-validator-option": true,
+        "@babel/preset-env>@babel/plugin-bugfix-firefox-class-in-computed-class-key": true,
+        "@babel/preset-env>@babel/plugin-bugfix-safari-class-field-initializer-scope": true,
+        "@babel/preset-env>@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": true,
+        "@babel/preset-env>@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": true,
+        "@babel/preset-env>@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly": true,
+        "@babel/preset-env>@babel/plugin-syntax-import-assertions": true,
+        "@babel/preset-env>@babel/plugin-syntax-import-attributes": true,
+        "@babel/preset-env>@babel/plugin-syntax-unicode-sets-regex": true,
+        "@babel/preset-env>@babel/plugin-transform-arrow-functions": true,
+        "@babel/preset-env>@babel/plugin-transform-async-generator-functions": true,
+        "@babel/preset-env>@babel/plugin-transform-async-to-generator": true,
+        "@babel/preset-env>@babel/plugin-transform-block-scoped-functions": true,
+        "@babel/preset-env>@babel/plugin-transform-block-scoping": true,
+        "@babel/preset-env>@babel/plugin-transform-class-properties": true,
+        "@babel/preset-env>@babel/plugin-transform-class-static-block": true,
+        "@babel/preset-env>@babel/plugin-transform-classes": true,
+        "@babel/preset-env>@babel/plugin-transform-computed-properties": true,
+        "@babel/preset-env>@babel/plugin-transform-destructuring": true,
+        "@babel/preset-env>@babel/plugin-transform-dotall-regex": true,
+        "@babel/preset-env>@babel/plugin-transform-duplicate-keys": true,
+        "@babel/preset-env>@babel/plugin-transform-duplicate-named-capturing-groups-regex": true,
+        "@babel/preset-env>@babel/plugin-transform-dynamic-import": true,
+        "@babel/preset-env>@babel/plugin-transform-exponentiation-operator": true,
+        "@babel/preset-env>@babel/plugin-transform-export-namespace-from": true,
+        "@babel/preset-env>@babel/plugin-transform-for-of": true,
+        "@babel/preset-env>@babel/plugin-transform-function-name": true,
+        "@babel/preset-env>@babel/plugin-transform-json-strings": true,
+        "@babel/preset-env>@babel/plugin-transform-literals": true,
+        "@babel/plugin-transform-logical-assignment-operators": true,
+        "@babel/preset-env>@babel/plugin-transform-member-expression-literals": true,
+        "@babel/preset-env>@babel/plugin-transform-modules-amd": true,
+        "@babel/preset-env>@babel/plugin-transform-modules-commonjs": true,
+        "@babel/preset-env>@babel/plugin-transform-modules-systemjs": true,
+        "@babel/preset-env>@babel/plugin-transform-modules-umd": true,
+        "@babel/preset-env>@babel/plugin-transform-named-capturing-groups-regex": true,
+        "@babel/preset-env>@babel/plugin-transform-new-target": true,
+        "@babel/preset-env>@babel/plugin-transform-nullish-coalescing-operator": true,
+        "@babel/preset-env>@babel/plugin-transform-numeric-separator": true,
+        "@babel/preset-env>@babel/plugin-transform-object-rest-spread": true,
+        "@babel/preset-env>@babel/plugin-transform-object-super": true,
+        "@babel/preset-env>@babel/plugin-transform-optional-catch-binding": true,
+        "@babel/preset-env>@babel/plugin-transform-optional-chaining": true,
+        "@babel/preset-env>@babel/plugin-transform-parameters": true,
+        "@babel/preset-env>@babel/plugin-transform-private-methods": true,
+        "@babel/preset-env>@babel/plugin-transform-private-property-in-object": true,
+        "@babel/preset-env>@babel/plugin-transform-property-literals": true,
+        "@babel/preset-env>@babel/plugin-transform-regenerator": true,
+        "@babel/preset-env>@babel/plugin-transform-reserved-words": true,
+        "@babel/preset-env>@babel/plugin-transform-shorthand-properties": true,
+        "@babel/preset-env>@babel/plugin-transform-spread": true,
+        "@babel/preset-env>@babel/plugin-transform-sticky-regex": true,
+        "@babel/preset-env>@babel/plugin-transform-template-literals": true,
+        "@babel/preset-env>@babel/plugin-transform-typeof-symbol": true,
+        "@babel/preset-env>@babel/plugin-transform-unicode-escapes": true,
+        "@babel/preset-env>@babel/plugin-transform-unicode-property-regex": true,
+        "@babel/preset-env>@babel/plugin-transform-unicode-regex": true,
+        "@babel/preset-env>@babel/plugin-transform-unicode-sets-regex": true,
+        "@babel/preset-env>@babel/preset-modules": true,
+        "@babel/preset-env>babel-plugin-polyfill-corejs2": true,
+        "@babel/preset-env>babel-plugin-polyfill-corejs3": true,
+        "@babel/preset-env>babel-plugin-polyfill-regenerator": true,
+        "@babel/preset-env>core-js-compat": true,
+        "@babel/preset-env>semver": true
       }
     },
     "@babel/preset-react": {
@@ -901,214 +759,252 @@
         "@babel/preset-env>@babel/helper-plugin-utils": true,
         "@babel/preset-env>@babel/helper-validator-option": true,
         "@babel/preset-react>@babel/plugin-transform-react-display-name": true,
-        "@babel/preset-react>@babel/plugin-transform-react-jsx": true,
         "@babel/preset-react>@babel/plugin-transform-react-jsx-development": true,
+        "@babel/preset-react>@babel/plugin-transform-react-jsx": true,
         "@babel/preset-react>@babel/plugin-transform-react-pure-annotations": true
       }
     },
-    "@babel/preset-react>@babel/plugin-transform-react-display-name": {
-      "builtin": {
-        "path.basename": true,
-        "path.dirname": true,
-        "path.extname": true
-      },
-      "packages": {
-        "@babel/core": true,
-        "@babel/preset-env>@babel/helper-plugin-utils": true
-      }
-    },
-    "@babel/preset-react>@babel/plugin-transform-react-jsx": {
-      "packages": {
-        "@babel/core": true,
-        "@babel/core>@babel/helper-module-transforms>@babel/helper-module-imports": true,
-        "@babel/preset-env>@babel/helper-plugin-utils": true,
-        "@babel/preset-env>@babel/plugin-transform-classes>@babel/helper-annotate-as-pure": true,
-        "@babel/preset-typescript>@babel/plugin-syntax-jsx": true
-      }
-    },
-    "@babel/preset-react>@babel/plugin-transform-react-jsx-development": {
-      "packages": {
-        "@babel/preset-react>@babel/plugin-transform-react-jsx": true
-      }
-    },
-    "@babel/preset-react>@babel/plugin-transform-react-pure-annotations": {
-      "packages": {
-        "@babel/core": true,
-        "@babel/preset-env>@babel/helper-plugin-utils": true,
-        "@babel/preset-env>@babel/plugin-transform-classes>@babel/helper-annotate-as-pure": true
-      }
-    },
     "@babel/preset-typescript": {
       "packages": {
         "@babel/preset-env>@babel/helper-plugin-utils": true,
         "@babel/preset-env>@babel/helper-validator-option": true,
-        "@babel/preset-env>@babel/plugin-transform-modules-commonjs": true,
         "@babel/preset-typescript>@babel/plugin-syntax-jsx": true,
+        "@babel/preset-env>@babel/plugin-transform-modules-commonjs": true,
         "@babel/preset-typescript>@babel/plugin-transform-typescript": true
       }
     },
-    "@babel/preset-typescript>@babel/plugin-syntax-jsx": {
+    "@babel/core>@babel/template": {
       "packages": {
-        "@babel/preset-env>@babel/helper-plugin-utils": true
+        "@babel/code-frame": true,
+        "@babel/core>@babel/parser": true,
+        "@babel/core>@babel/types": true
       }
     },
-    "@babel/preset-typescript>@babel/plugin-transform-typescript": {
-      "builtin": {
-        "assert": true
-      },
+    "depcheck>@babel/traverse": {
       "globals": {
-        "console.warn": true
+        "console.log": true
       },
       "packages": {
-        "@babel/core": true,
-        "@babel/preset-env>@babel/helper-plugin-utils": true,
-        "@babel/preset-env>@babel/plugin-transform-classes>@babel/helper-annotate-as-pure": true,
-        "@babel/preset-env>@babel/plugin-transform-for-of>@babel/helper-skip-transparent-expression-wrappers": true,
-        "@babel/preset-env>@babel/plugin-transform-private-methods>@babel/helper-create-class-features-plugin": true,
-        "@babel/preset-typescript>@babel/plugin-transform-typescript>@babel/plugin-syntax-typescript": true
-      }
-    },
-    "@babel/preset-typescript>@babel/plugin-transform-typescript>@babel/plugin-syntax-typescript": {
-      "packages": {
-        "@babel/preset-env>@babel/helper-plugin-utils": true
+        "@babel/code-frame": true,
+        "@babel/core>@babel/generator": true,
+        "@babel/core>@babel/parser": true,
+        "@babel/core>@babel/template": true,
+        "@babel/core>@babel/types": true,
+        "babel/preset-env>b@babel/types": true,
+        "nock>debug": true,
+        "depcheck>@babel/traverse>globals": true
       }
     },
-    "@babel/register>clone-deep>is-plain-object": {
+    "@babel/core>@babel/types": {
+      "globals": {
+        "console.warn": true,
+        "process.env": true
+      },
       "packages": {
-        "gulp>gulp-cli>isobject": true
+        "@babel/core>@babel/types>@babel/helper-string-parser": true,
+        "@babel/code-frame>@babel/helper-validator-identifier": true
       }
     },
-    "@lavamoat/allow-scripts>@npmcli/run-script>node-gyp>npmlog": {
+    "sass-embedded>@bufbuild/protobuf": {
+      "globals": {
+        "TextDecoder": true,
+        "TextEncoder": true,
+        "__values": true,
+        "process": true
+      }
+    },
+    "ts-node>@cspotcode/source-map-support": {
       "builtin": {
-        "events.EventEmitter": true,
-        "util": true
+        "fs": true,
+        "path.isAbsolute": true,
+        "path.join": true,
+        "path.normalize": true,
+        "path.resolve": true,
+        "url.fileURLToPath": true,
+        "url.pathToFileURL": true,
+        "util.inspect": true
       },
       "globals": {
-        "process.nextTick": true,
-        "process.stderr": true
+        "Buffer.from": true,
+        "URL": true,
+        "XMLHttpRequest": true,
+        "console.error": true,
+        "process": true
       },
       "packages": {
-        "@lavamoat/allow-scripts>@npmcli/run-script>node-gyp>npmlog>are-we-there-yet": true,
-        "@lavamoat/allow-scripts>@npmcli/run-script>node-gyp>npmlog>gauge": true,
-        "@storybook/react>@storybook/node-logger>npmlog>console-control-strings": true,
-        "nyc>yargs>set-blocking": true
+        "ts-node>@cspotcode/source-map-support>@jridgewell/trace-mapping": true
       }
     },
-    "@lavamoat/allow-scripts>@npmcli/run-script>node-gyp>npmlog>are-we-there-yet": {
-      "builtin": {
-        "events.EventEmitter": true,
-        "util.inherits": true
-      },
+    "eslint-plugin-jsdoc>@es-joy/jsdoccomment": {
       "packages": {
-        "koa>delegates": true,
-        "readable-stream": true
+        "eslint-plugin-jsdoc>comment-parser": true,
+        "eslint>esquery": true,
+        "eslint-plugin-jsdoc>@es-joy/jsdoccomment>jsdoc-type-pratt-parser": true
       }
     },
-    "@lavamoat/allow-scripts>@npmcli/run-script>node-gyp>npmlog>gauge": {
+    "eslint>@eslint-community/eslint-utils": {
+      "packages": {
+        "eslint>eslint-visitor-keys": true
+      }
+    },
+    "eslint>@eslint/eslintrc": {
       "builtin": {
-        "util.format": true
+        "assert": true,
+        "fs": true,
+        "module": true,
+        "os": true,
+        "path": true,
+        "url": true,
+        "util": true
       },
       "globals": {
-        "clearInterval": true,
-        "process": true,
-        "setImmediate": true,
-        "setInterval": true
+        "__filename": true,
+        "process.cwd": true,
+        "process.emitWarning": true,
+        "process.platform": true
       },
       "packages": {
-        "@lavamoat/allow-scripts>@npmcli/run-script>node-gyp>npmlog>gauge>aproba": true,
-        "@lavamoat/allow-scripts>@npmcli/run-script>node-gyp>npmlog>gauge>string-width": true,
-        "@lavamoat/allow-scripts>@npmcli/run-script>node-gyp>npmlog>gauge>strip-ansi": true,
-        "@storybook/react>@storybook/node-logger>npmlog>console-control-strings": true,
-        "@storybook/react>@storybook/node-logger>npmlog>gauge>has-unicode": true,
-        "@storybook/react>@storybook/node-logger>npmlog>gauge>wide-align": true,
-        "nyc>signal-exit": true,
-        "react>object-assign": true
-      }
-    },
-    "@lavamoat/allow-scripts>@npmcli/run-script>node-gyp>npmlog>gauge>string-width": {
-      "packages": {
-        "@lavamoat/allow-scripts>@npmcli/run-script>node-gyp>npmlog>gauge>string-width>is-fullwidth-code-point": true,
-        "@lavamoat/allow-scripts>@npmcli/run-script>node-gyp>npmlog>gauge>strip-ansi": true,
-        "gulp>gulp-cli>yargs>string-width>code-point-at": true
+        "$root$": true,
+        "@babel/eslint-parser": true,
+        "@babel/eslint-plugin": true,
+        "@metamask/eslint-config": true,
+        "@metamask/eslint-config-nodejs": true,
+        "@metamask/eslint-config-typescript": true,
+        "@typescript-eslint/eslint-plugin": true,
+        "eslint>ajv": true,
+        "nock>debug": true,
+        "eslint": true,
+        "eslint-config-prettier": true,
+        "eslint-plugin-import": true,
+        "eslint-plugin-jsdoc": true,
+        "eslint-plugin-node": true,
+        "eslint-plugin-prettier": true,
+        "eslint-plugin-react": true,
+        "eslint-plugin-react-hooks": true,
+        "eslint>globals": true,
+        "eslint>ignore": true,
+        "eslint>minimatch": true,
+        "mocha>strip-json-comments": true
       }
     },
-    "@lavamoat/allow-scripts>@npmcli/run-script>node-gyp>npmlog>gauge>string-width>is-fullwidth-code-point": {
+    "gulp-sourcemaps>@gulp-sourcemaps/identity-map": {
       "packages": {
-        "gulp>gulp-cli>yargs>string-width>is-fullwidth-code-point>number-is-nan": true
+        "gulp-sourcemaps>@gulp-sourcemaps/identity-map>acorn": true,
+        "gulp-sourcemaps>@gulp-sourcemaps/identity-map>normalize-path": true,
+        "gulp-sourcemaps>@gulp-sourcemaps/identity-map>postcss": true,
+        "gulp-sourcemaps>@gulp-sourcemaps/identity-map>source-map": true,
+        "gulp-sourcemaps>@gulp-sourcemaps/identity-map>through2": true
       }
     },
-    "@lavamoat/allow-scripts>@npmcli/run-script>node-gyp>npmlog>gauge>strip-ansi": {
+    "gulp-sourcemaps>@gulp-sourcemaps/map-sources": {
       "packages": {
-        "@lavamoat/allow-scripts>@npmcli/run-script>node-gyp>npmlog>gauge>strip-ansi>ansi-regex": true
+        "gulp-watch>anymatch>normalize-path": true,
+        "gulp-sourcemaps>@gulp-sourcemaps/map-sources>through2": true
       }
     },
-    "@lavamoat/lavapack": {
+    "eslint>@humanwhocodes/config-array": {
       "builtin": {
-        "assert": true,
-        "buffer.Buffer.from": true,
-        "fs.promises.readFile": true,
-        "fs.promises.writeFile": true,
-        "fs.readFileSync": true,
+        "path.dirname": true,
         "path.join": true,
         "path.relative": true
       },
+      "packages": {
+        "eslint>@humanwhocodes/config-array>@humanwhocodes/object-schema": true,
+        "nock>debug": true,
+        "eslint>minimatch": true
+      }
+    },
+    "terser>@jridgewell/source-map>@jridgewell/gen-mapping": {
       "globals": {
-        "__dirname": true,
-        "__filename.slice": true,
-        "console.error": true,
-        "console.warn": true,
-        "process.cwd": true,
-        "setTimeout": true
+        "define": true
       },
       "packages": {
-        "@lavamoat/lavapack>combine-source-map": true,
-        "@lavamoat/lavapack>convert-source-map": true,
-        "@lavamoat/lavapack>json-stable-stringify": true,
-        "@lavamoat/lavapack>umd": true,
-        "browserify>JSONStream": true,
-        "eslint>espree": true,
-        "lavamoat-viz>lavamoat-core": true,
-        "readable-stream": true,
-        "through2": true
+        "terser>@jridgewell/source-map>@jridgewell/gen-mapping>@jridgewell/set-array": true,
+        "terser-webpack-plugin>@jridgewell/trace-mapping>@jridgewell/sourcemap-codec": true,
+        "terser-webpack-plugin>@jridgewell/trace-mapping": true
       }
     },
-    "@lavamoat/lavapack>combine-source-map": {
-      "builtin": {
-        "path.dirname": true,
-        "path.join": true
-      },
+    "terser-webpack-plugin>@jridgewell/trace-mapping>@jridgewell/resolve-uri": {
       "globals": {
-        "process.platform": true
-      },
+        "define": true
+      }
+    },
+    "terser>@jridgewell/source-map>@jridgewell/gen-mapping>@jridgewell/set-array": {
+      "globals": {
+        "define": true
+      }
+    },
+    "terser>@jridgewell/source-map": {
       "packages": {
-        "@lavamoat/lavapack>combine-source-map>inline-source-map": true,
-        "@lavamoat/lavapack>combine-source-map>lodash.memoize": true,
-        "@lavamoat/lavapack>combine-source-map>source-map": true,
-        "nyc>convert-source-map": true
+        "terser>@jridgewell/source-map>@jridgewell/gen-mapping": true,
+        "terser-webpack-plugin>@jridgewell/trace-mapping": true
       }
     },
-    "@lavamoat/lavapack>combine-source-map>inline-source-map": {
+    "terser-webpack-plugin>@jridgewell/trace-mapping>@jridgewell/sourcemap-codec": {
       "globals": {
-        "Buffer.from": true
+        "Buffer": true,
+        "TextDecoder": true,
+        "define": true
+      }
+    },
+    "ts-node>@cspotcode/source-map-support>@jridgewell/trace-mapping": {
+      "globals": {
+        "define": true
       },
       "packages": {
-        "@lavamoat/lavapack>combine-source-map>inline-source-map>source-map": true
+        "terser-webpack-plugin>@jridgewell/trace-mapping>@jridgewell/resolve-uri": true,
+        "terser-webpack-plugin>@jridgewell/trace-mapping>@jridgewell/sourcemap-codec": true
       }
     },
-    "@lavamoat/lavapack>convert-source-map": {
+    "terser-webpack-plugin>@jridgewell/trace-mapping": {
       "globals": {
-        "Buffer": true,
-        "atob": true,
-        "btoa": true,
-        "value": true
+        "define": true
+      },
+      "packages": {
+        "terser-webpack-plugin>@jridgewell/trace-mapping>@jridgewell/resolve-uri": true,
+        "terser-webpack-plugin>@jridgewell/trace-mapping>@jridgewell/sourcemap-codec": true
       }
     },
-    "@lavamoat/lavapack>json-stable-stringify": {
+    "lavamoat>@lavamoat/aa": {
+      "builtin": {
+        "node:fs.lstatSync": true,
+        "node:fs.readFileSync": true,
+        "node:fs.realpathSync": true,
+        "node:path.dirname": true,
+        "node:path.join": true,
+        "node:path.relative": true
+      },
       "packages": {
-        "@lavamoat/lavapack>json-stable-stringify>isarray": true,
-        "@lavamoat/lavapack>json-stable-stringify>object-keys": true,
-        "lavamoat>json-stable-stringify>jsonify": true,
-        "string.prototype.matchall>call-bind": true
+        "depcheck>resolve": true
+      }
+    },
+    "@lavamoat/lavapack": {
+      "builtin": {
+        "node:assert": true,
+        "node:buffer.Buffer.from": true,
+        "node:fs.promises.readFile": true,
+        "node:fs.promises.writeFile": true,
+        "node:fs.readFileSync": true,
+        "node:path.join": true,
+        "node:path.relative": true
+      },
+      "globals": {
+        "__dirname": true,
+        "__filename.slice": true,
+        "console.error": true,
+        "console.warn": true,
+        "process.cwd": true,
+        "setTimeout": true
+      },
+      "packages": {
+        "browserify>JSONStream": true,
+        "@lavamoat/lavapack>combine-source-map": true,
+        "eslint>espree": true,
+        "@lavamoat/lavapack>json-stable-stringify": true,
+        "lavamoat>lavamoat-core": true,
+        "@lavamoat/lavapack>readable-stream": true,
+        "through2": true,
+        "@lavamoat/lavapack>umd": true
       }
     },
     "@metamask/build-utils": {
@@ -1124,37 +1020,16 @@
       },
       "packages": {
         "@metamask/utils>@metamask/superstruct": true,
-        "@metamask/utils>@scure/base": true,
-        "@metamask/utils>pony-cause": true,
         "@noble/hashes": true,
+        "@metamask/utils>@scure/base": true,
         "nock>debug": true,
+        "@metamask/utils>pony-cause": true,
         "semver": true
       }
     },
-    "@metamask/eth-token-tracker>deep-equal>is-date-object": {
-      "packages": {
-        "koa>is-generator-function>has-tostringtag": true
-      }
-    },
-    "@metamask/jazzicon>color>clone": {
-      "globals": {
-        "Buffer": true
-      }
-    },
-    "@metamask/jazzicon>color>color-convert": {
-      "packages": {
-        "@metamask/jazzicon>color>color-convert>color-name": true
-      }
-    },
-    "@metamask/object-multiplex>once": {
+    "@babel/eslint-parser>@nicolo-ribaudo/eslint-scope-5-internals": {
       "packages": {
-        "@metamask/object-multiplex>once>wrappy": true
-      }
-    },
-    "@metamask/utils>@scure/base": {
-      "globals": {
-        "TextDecoder": true,
-        "TextEncoder": true
+        "@babel/eslint-parser>@nicolo-ribaudo/eslint-scope-5-internals>eslint-scope": true
       }
     },
     "@noble/hashes": {
@@ -1163,93 +1038,120 @@
         "crypto": true
       }
     },
-    "@sentry/cli>which>isexe": {
+    "eslint>@nodelib/fs.walk>@nodelib/fs.scandir": {
       "builtin": {
-        "fs": true
+        "fs.lstat": true,
+        "fs.lstatSync": true,
+        "fs.readdir": true,
+        "fs.readdirSync": true,
+        "fs.stat": true,
+        "fs.statSync": true,
+        "path.sep": true
       },
       "globals": {
-        "TESTING_WINDOWS": true,
-        "process.env.PATHEXT": true,
-        "process.getgid": true,
-        "process.getuid": true,
-        "process.platform": true
-      }
-    },
-    "@storybook/addon-knobs>qs": {
+        "process.versions.node": true
+      },
       "packages": {
-        "string.prototype.matchall>side-channel": true
+        "fast-glob>@nodelib/fs.stat": true,
+        "eslint>@nodelib/fs.walk>@nodelib/fs.scandir>run-parallel": true
       }
     },
-    "@storybook/core>@storybook/core-server>x-default-browser>default-browser-id>untildify>os-homedir": {
+    "fast-glob>@nodelib/fs.stat": {
       "builtin": {
-        "os.homedir": true
-      },
-      "globals": {
-        "process.env": true,
-        "process.getuid": true,
-        "process.platform": true
+        "fs.lstat": true,
+        "fs.lstatSync": true,
+        "fs.stat": true,
+        "fs.statSync": true
       }
     },
-    "@storybook/react>@storybook/node-logger>npmlog>gauge>has-unicode": {
+    "eslint>@nodelib/fs.walk": {
       "builtin": {
-        "os.type": true
+        "events.EventEmitter": true,
+        "path.sep": true,
+        "stream.Readable": true
       },
       "globals": {
-        "process.env.LANG": true,
-        "process.env.LC_ALL": true,
-        "process.env.LC_CTYPE": true
+        "setImmediate": true
+      },
+      "packages": {
+        "eslint>@nodelib/fs.walk>@nodelib/fs.scandir": true,
+        "eslint>@nodelib/fs.walk>fastq": true
       }
     },
-    "@storybook/react>@storybook/node-logger>npmlog>gauge>wide-align": {
-      "packages": {
-        "yargs>string-width": true
+    "@metamask/utils>@scure/base": {
+      "globals": {
+        "TextDecoder": true,
+        "TextEncoder": true
       }
     },
-    "@storybook/react>acorn-walk": {
+    "stylelint>@stylelint/postcss-css-in-js": {
       "globals": {
-        "define": true
+        "__dirname": true
+      },
+      "packages": {
+        "@babel/core": true,
+        "stylelint>postcss-syntax": true,
+        "stylelint>postcss": true
       }
     },
-    "@storybook/test-runner>jest-circus>p-limit": {
+    "stylelint>@stylelint/postcss-markdown": {
       "packages": {
-        "@storybook/test-runner>jest-circus>p-limit>yocto-queue": true
+        "stylelint>postcss-html": true,
+        "stylelint>postcss-syntax": true,
+        "stylelint>@stylelint/postcss-markdown>remark": true,
+        "stylelint>@stylelint/postcss-markdown>unist-util-find-all-after": true
       }
     },
     "@typescript-eslint/eslint-plugin": {
       "packages": {
+        "@typescript-eslint/parser>@typescript-eslint/scope-manager": true,
         "@typescript-eslint/eslint-plugin>@typescript-eslint/type-utils": true,
         "@typescript-eslint/eslint-plugin>@typescript-eslint/utils": true,
-        "@typescript-eslint/eslint-plugin>tsutils": true,
-        "@typescript-eslint/parser>@typescript-eslint/scope-manager": true,
-        "eslint": true,
         "eslint-plugin-jest>@typescript-eslint/utils": true,
         "eslint>debug": true,
-        "eslint>regexpp": true,
+        "eslint": true,
         "globby>ignore": true,
+        "eslint>regexpp": true,
         "semver": true,
+        "@typescript-eslint/eslint-plugin>tsutils": true,
         "typescript": true
       }
     },
+    "eslint-plugin-jest>@typescript-eslint/experimental-utils": {
+      "builtin": {
+        "path": true
+      },
+      "packages": {
+        "@typescript-eslint/parser>@typescript-eslint/scope-manager": true,
+        "eslint-plugin-jest>@typescript-eslint/experimental-utils>@typescript-eslint/types": true,
+        "@typescript-eslint/parser>@typescript-eslint/types": true,
+        "eslint": true,
+        "eslint>eslint-scope": true,
+        "webpack>eslint-scope": true,
+        "eslint-plugin-jest>@typescript-eslint/experimental-utils>eslint-utils": true,
+        "eslint>eslint-utils": true
+      }
+    },
+    "eslint-plugin-jest>@typescript-eslint/utils>@typescript-eslint/scope-manager": {
+      "builtin": {
+        "path": true
+      },
+      "packages": {
+        "eslint-plugin-jest>@typescript-eslint/utils>@typescript-eslint/types": true,
+        "eslint-plugin-jest>@typescript-eslint/utils>@typescript-eslint/scope-manager>@typescript-eslint/visitor-keys": true
+      }
+    },
     "@typescript-eslint/eslint-plugin>@typescript-eslint/type-utils": {
       "packages": {
-        "@typescript-eslint/eslint-plugin>@typescript-eslint/type-utils>debug": true,
         "@typescript-eslint/eslint-plugin>@typescript-eslint/utils": true,
-        "@typescript-eslint/eslint-plugin>tsutils": true,
         "eslint-plugin-jest>@typescript-eslint/utils": true,
+        "@typescript-eslint/eslint-plugin>@typescript-eslint/type-utils>debug": true,
         "eslint>debug": true,
         "nock>debug": true,
+        "@typescript-eslint/eslint-plugin>tsutils": true,
         "typescript": true
       }
     },
-    "@typescript-eslint/eslint-plugin>@typescript-eslint/type-utils>debug": {
-      "globals": {
-        "console.debug": true,
-        "console.log": true
-      },
-      "packages": {
-        "@typescript-eslint/eslint-plugin>@typescript-eslint/type-utils>debug>ms": true
-      }
-    },
     "@typescript-eslint/eslint-plugin>@typescript-eslint/utils": {
       "builtin": {
         "path": true
@@ -1259,95 +1161,50 @@
         "@typescript-eslint/parser>@typescript-eslint/types": true,
         "@typescript-eslint/utils": true,
         "eslint": true,
-        "eslint-plugin-mocha>eslint-utils": true,
+        "webpack>eslint-scope": true,
         "eslint>eslint-utils": true,
-        "webpack>eslint-scope": true
-      }
-    },
-    "autoprefixer": {
-      "globals": {
-        "console": true,
-        "process.cwd": true,
-        "process.env.AUTOPREFIXER_GRID": true
-      },
-      "packages": {
-        "autoprefixer>caniuse-lite": true,
-        "autoprefixer>fraction.js": true,
-        "autoprefixer>normalize-range": true,
-        "browserslist": true,
-        "postcss": true,
-        "postcss>picocolors": true,
-        "stylelint>postcss-value-parser": true
+        "eslint-plugin-mocha>eslint-utils": true
       }
     },
-    "babelify": {
+    "eslint-plugin-jest>@typescript-eslint/utils": {
       "builtin": {
-        "path.extname": true,
-        "path.resolve": true,
-        "stream.PassThrough": true,
-        "stream.Transform": true,
-        "util": true
+        "assert": true,
+        "path": true
       },
       "globals": {
-        "Buffer.concat": true
+        "afterAll": true,
+        "process.cwd": true
       },
       "packages": {
-        "@babel/core": true
-      }
-    },
-    "bify-module-groups": {
-      "packages": {
-        "bify-module-groups>through2": true,
-        "pify": true,
-        "pumpify>pump": true
+        "eslint>@eslint-community/eslint-utils": true,
+        "eslint>@eslint-community": true,
+        "@typescript-eslint/parser>@typescript-eslint/scope-manager": true,
+        "eslint-plugin-jest>@typescript-eslint/utils>@typescript-eslint/scope-manager": true,
+        "eslint-plugin-jest>@typescript-eslint/experimental-utils>@typescript-eslint/types": true,
+        "@typescript-eslint/parser>@typescript-eslint/types": true,
+        "eslint-plugin-jest>@typescript-eslint/utils>@typescript-eslint/types": true,
+        "@typescript-eslint/parser>@typescript-eslint": true,
+        "eslint": true,
+        "eslint-plugin-jest>@typescript-eslint/utils>eslint-scope": true,
+        "eslint>eslint-scope": true,
+        "webpack>eslint-scope": true,
+        "eslint-plugin-jest>@typescript-eslint/utils>webpack>eslint-scope": true,
+        "eslint>eslint-utils": true,
+        "eslint-plugin-mocha>eslint-utils": true,
+        "semver": true
       }
     },
-    "bify-module-groups>through2": {
+    "eslint-plugin-jest>@typescript-eslint/utils>@typescript-eslint/scope-manager>@typescript-eslint/visitor-keys": {
       "builtin": {
-        "util.inherits": true
-      },
-      "globals": {
-        "process.nextTick": true
+        "path": true
       },
       "packages": {
-        "readable-stream": true
+        "eslint>eslint-visitor-keys": true
       }
     },
-    "browserify": {
-      "builtin": {
-        "events.EventEmitter": true,
-        "fs.realpath": true,
-        "path.dirname": true,
-        "path.join": true,
-        "path.relative": true,
-        "path.resolve": true,
-        "path.sep": true
-      },
+    "eslint>@ungap/structured-clone": {
       "globals": {
-        "__dirname": true,
-        "process.cwd": true,
-        "process.nextTick": true,
-        "process.platform": true
-      },
-      "packages": {
-        "browserify>browser-pack": true,
-        "browserify>browser-resolve": true,
-        "browserify>cached-path-relative": true,
-        "browserify>concat-stream": true,
-        "browserify>deps-sort": true,
-        "browserify>has": true,
-        "browserify>insert-module-globals": true,
-        "browserify>module-deps": true,
-        "browserify>read-only-stream": true,
-        "browserify>shasum-object": true,
-        "browserify>syntax-error": true,
-        "browserify>through2": true,
-        "depcheck>resolve": true,
-        "labeled-stream-splicer": true,
-        "lavamoat>htmlescape": true,
-        "pumpify>inherits": true,
-        "watchify>defined": true,
-        "watchify>xtend": true
+        "structuredClone": true
       }
     },
     "browserify>JSONStream": {
@@ -1359,585 +1216,441 @@
         "debounce-stream>through": true
       }
     },
-    "browserify>JSONStream>jsonparse": {
-      "globals": {
-        "Buffer": true
+    "@lavamoat/lavapack>readable-stream>abort-controller": {
+      "packages": {
+        "@lavamoat/lavapack>readable-stream>abort-controller>event-target-shim": true
       }
     },
-    "browserify>browser-pack": {
-      "builtin": {
-        "fs.readFileSync": true,
-        "path.join": true,
-        "path.relative": true
-      },
-      "globals": {
-        "__dirname": true,
-        "process.cwd": true
-      },
+    "eslint>espree>acorn-jsx": {
       "packages": {
-        "@lavamoat/lavapack>combine-source-map": true,
-        "@lavamoat/lavapack>umd": true,
-        "browserify>JSONStream": true,
-        "browserify>browser-pack>through2": true,
-        "koa>content-disposition>safe-buffer": true,
-        "watchify>defined": true
+        "jsdom>acorn": true
       }
     },
-    "browserify>browser-pack>through2": {
-      "builtin": {
-        "util.inherits": true
-      },
-      "globals": {
-        "process.nextTick": true
-      },
+    "browserify>syntax-error>acorn-node": {
       "packages": {
-        "browserify>browser-pack>through2>readable-stream": true,
+        "@storybook/react>acorn-walk": true,
+        "browserify>syntax-error>acorn-node>acorn": true,
         "watchify>xtend": true
       }
     },
-    "browserify>browser-pack>through2>readable-stream": {
-      "builtin": {
-        "events.EventEmitter": true,
-        "stream": true,
-        "util": true
-      },
+    "@storybook/react>acorn-walk": {
       "globals": {
-        "process.browser": true,
-        "process.env.READABLE_STREAM": true,
-        "process.stderr": true,
-        "process.stdout": true,
-        "process.version.slice": true,
-        "setImmediate": true
-      },
-      "packages": {
-        "browserify>browser-pack>through2>readable-stream>isarray": true,
-        "browserify>browser-pack>through2>readable-stream>safe-buffer": true,
-        "browserify>browser-pack>through2>readable-stream>string_decoder": true,
-        "pumpify>inherits": true,
-        "readable-stream-2>core-util-is": true,
-        "readable-stream-2>process-nextick-args": true,
-        "readable-stream>util-deprecate": true
+        "define": true
       }
     },
-    "browserify>browser-pack>through2>readable-stream>safe-buffer": {
-      "builtin": {
-        "buffer": true
+    "ts-node>acorn-walk": {
+      "globals": {
+        "define": true
       }
     },
-    "browserify>browser-pack>through2>readable-stream>string_decoder": {
-      "packages": {
-        "browserify>browser-pack>through2>readable-stream>string_decoder>safe-buffer": true
+    "gulp-sourcemaps>@gulp-sourcemaps/identity-map>acorn": {
+      "globals": {
+        "define": true
       }
     },
-    "browserify>browser-pack>through2>readable-stream>string_decoder>safe-buffer": {
-      "builtin": {
-        "buffer": true
+    "browserify>syntax-error>acorn-node>acorn": {
+      "globals": {
+        "define": true
       }
     },
-    "browserify>browser-resolve": {
-      "builtin": {
-        "fs.readFile": true,
-        "fs.readFileSync": true,
-        "path": true
-      },
+    "gulp-sourcemaps>acorn": {
       "globals": {
-        "__dirname": true,
-        "process.platform": true
-      },
-      "packages": {
-        "depcheck>resolve": true
+        "define": true
       }
     },
-    "browserify>cached-path-relative": {
-      "builtin": {
-        "path": true
-      },
+    "jsdom>acorn": {
       "globals": {
-        "process.cwd": true
+        "console": true,
+        "define": true
       }
     },
-    "browserify>concat-stream": {
-      "globals": {
-        "Buffer.concat": true,
-        "Buffer.isBuffer": true
-      },
+    "del>p-map>aggregate-error": {
       "packages": {
-        "browserify>concat-stream>readable-stream": true,
-        "browserify>concat-stream>typedarray": true,
-        "pumpify>inherits": true,
-        "terser>source-map-support>buffer-from": true
+        "del>p-map>aggregate-error>clean-stack": true,
+        "prettier-eslint>indent-string": true
       }
     },
-    "browserify>concat-stream>readable-stream": {
-      "builtin": {
-        "events.EventEmitter": true,
-        "stream": true,
-        "util": true
-      },
+    "eslint>ajv": {
       "globals": {
-        "process.browser": true,
-        "process.env.READABLE_STREAM": true,
-        "process.stderr": true,
-        "process.stdout": true,
-        "process.version.slice": true,
-        "setImmediate": true
+        "console": true
       },
       "packages": {
-        "browserify>concat-stream>readable-stream>isarray": true,
-        "browserify>concat-stream>readable-stream>safe-buffer": true,
-        "browserify>concat-stream>readable-stream>string_decoder": true,
-        "pumpify>inherits": true,
-        "readable-stream-2>core-util-is": true,
-        "readable-stream-2>process-nextick-args": true,
-        "readable-stream>util-deprecate": true
+        "eslint>fast-deep-equal": true,
+        "@metamask/snaps-utils>fast-json-stable-stringify": true,
+        "eslint>ajv>json-schema-traverse": true,
+        "uri-js": true
       }
     },
-    "browserify>concat-stream>readable-stream>safe-buffer": {
-      "builtin": {
-        "buffer": true
+    "gulp-watch>ansi-colors": {
+      "packages": {
+        "fancy-log>ansi-gray>ansi-wrap": true
       }
     },
-    "browserify>concat-stream>readable-stream>string_decoder": {
+    "fancy-log>ansi-gray": {
       "packages": {
-        "browserify>concat-stream>readable-stream>safe-buffer": true
+        "fancy-log>ansi-gray>ansi-wrap": true
       }
     },
-    "browserify>deps-sort": {
+    "chalk>ansi-styles": {
       "packages": {
-        "browserify>deps-sort>through2": true,
-        "browserify>shasum-object": true
+        "chalk>ansi-styles>color-convert": true
       }
     },
-    "browserify>deps-sort>through2": {
-      "builtin": {
-        "util.inherits": true
-      },
-      "globals": {
-        "process.nextTick": true
-      },
+    "gulp-livereload>chalk>ansi-styles": {
       "packages": {
-        "browserify>deps-sort>through2>readable-stream": true,
-        "watchify>xtend": true
+        "gulp-livereload>chalk>ansi-styles>color-convert": true
       }
     },
-    "browserify>deps-sort>through2>readable-stream": {
-      "builtin": {
-        "events.EventEmitter": true,
-        "stream": true,
-        "util": true
-      },
-      "globals": {
-        "process.browser": true,
-        "process.env.READABLE_STREAM": true,
-        "process.stderr": true,
-        "process.stdout": true,
-        "process.version.slice": true,
-        "setImmediate": true
-      },
+    "stylelint>table>slice-ansi>ansi-styles": {
       "packages": {
-        "browserify>deps-sort>through2>readable-stream>isarray": true,
-        "browserify>deps-sort>through2>readable-stream>safe-buffer": true,
-        "browserify>deps-sort>through2>readable-stream>string_decoder": true,
-        "pumpify>inherits": true,
-        "readable-stream-2>core-util-is": true,
-        "readable-stream-2>process-nextick-args": true,
-        "readable-stream>util-deprecate": true
+        "stylelint>table>slice-ansi>ansi-styles>color-convert": true
       }
     },
-    "browserify>deps-sort>through2>readable-stream>safe-buffer": {
-      "builtin": {
-        "buffer": true
+    "chokidar>anymatch": {
+      "packages": {
+        "chokidar>anymatch>normalize-path": true,
+        "chokidar>anymatch>picomatch": true
       }
     },
-    "browserify>deps-sort>through2>readable-stream>string_decoder": {
+    "gulp>glob-watcher>anymatch": {
+      "builtin": {
+        "path.sep": true
+      },
       "packages": {
-        "browserify>deps-sort>through2>readable-stream>safe-buffer": true
+        "gulp>glob-watcher>anymatch>micromatch": true,
+        "gulp-watch>anymatch>normalize-path": true
       }
     },
-    "browserify>duplexer2": {
+    "gulp-watch>anymatch": {
+      "builtin": {
+        "path.sep": true
+      },
       "packages": {
-        "browserify>duplexer2>readable-stream": true
+        "gulp-watch>anymatch>micromatch": true,
+        "gulp-watch>anymatch>normalize-path": true
       }
     },
-    "browserify>duplexer2>readable-stream": {
+    "gulp>vinyl-fs>vinyl-sourcemap>append-buffer": {
       "builtin": {
-        "events.EventEmitter": true,
-        "stream": true,
-        "util": true
+        "os.EOL": true
       },
       "globals": {
-        "process.browser": true,
-        "process.env.READABLE_STREAM": true,
-        "process.stderr": true,
-        "process.stdout": true,
-        "process.version.slice": true,
-        "setImmediate": true
+        "Buffer": true
       },
       "packages": {
-        "browserify>duplexer2>readable-stream>isarray": true,
-        "browserify>duplexer2>readable-stream>safe-buffer": true,
-        "browserify>duplexer2>readable-stream>string_decoder": true,
-        "pumpify>inherits": true,
-        "readable-stream-2>core-util-is": true,
-        "readable-stream-2>process-nextick-args": true,
-        "readable-stream>util-deprecate": true
+        "gulp>vinyl-fs>vinyl-sourcemap>append-buffer>buffer-equal": true
       }
     },
-    "browserify>duplexer2>readable-stream>safe-buffer": {
+    "@lavamoat/allow-scripts>@npmcli/run-script>node-gyp>npmlog>are-we-there-yet": {
       "builtin": {
-        "buffer": true
+        "events.EventEmitter": true,
+        "util.inherits": true
+      },
+      "packages": {
+        "koa>delegates": true,
+        "readable-stream": true
       }
     },
-    "browserify>duplexer2>readable-stream>string_decoder": {
-      "packages": {
-        "browserify>duplexer2>readable-stream>safe-buffer": true
+    "ts-node>arg": {
+      "globals": {
+        "process.argv.slice": true
       }
     },
-    "browserify>has": {
+    "gulp-watch>anymatch>micromatch>arr-diff": {
       "packages": {
-        "browserify>has>function-bind": true
+        "gulp>undertaker>arr-flatten": true
       }
     },
-    "browserify>insert-module-globals": {
-      "builtin": {
-        "path.dirname": true,
-        "path.isAbsolute": true,
-        "path.relative": true,
-        "path.sep": true
-      },
-      "globals": {
-        "Buffer.concat": true,
-        "Buffer.isBuffer": true
-      },
+    "gulp>undertaker>bach>arr-filter": {
       "packages": {
-        "@lavamoat/lavapack>combine-source-map": true,
-        "browserify>insert-module-globals>through2": true,
-        "browserify>insert-module-globals>undeclared-identifiers": true,
-        "browserify>syntax-error>acorn-node": true,
-        "gulp-watch>path-is-absolute": true,
-        "watchify>xtend": true
+        "gulp>undertaker>arr-map>make-iterator": true
       }
     },
-    "browserify>insert-module-globals>through2": {
-      "builtin": {
-        "util.inherits": true
-      },
-      "globals": {
-        "process.nextTick": true
-      },
+    "gulp>undertaker>arr-map": {
       "packages": {
-        "browserify>insert-module-globals>through2>readable-stream": true,
-        "watchify>xtend": true
+        "gulp>undertaker>arr-map>make-iterator": true
       }
     },
-    "browserify>insert-module-globals>through2>readable-stream": {
-      "builtin": {
-        "events.EventEmitter": true,
-        "stream": true,
-        "util": true
-      },
-      "globals": {
-        "process.browser": true,
-        "process.env.READABLE_STREAM": true,
-        "process.stderr": true,
-        "process.stdout": true,
-        "process.version.slice": true,
-        "setImmediate": true
-      },
+    "eslint-plugin-react>array-includes": {
       "packages": {
-        "browserify>insert-module-globals>through2>readable-stream>isarray": true,
-        "browserify>insert-module-globals>through2>readable-stream>safe-buffer": true,
-        "browserify>insert-module-globals>through2>readable-stream>string_decoder": true,
-        "pumpify>inherits": true,
-        "readable-stream-2>core-util-is": true,
-        "readable-stream-2>process-nextick-args": true,
-        "readable-stream>util-deprecate": true
+        "string.prototype.matchall>call-bind": true,
+        "string.prototype.matchall>define-properties": true,
+        "string.prototype.matchall>es-abstract": true,
+        "string.prototype.matchall>get-intrinsic": true,
+        "eslint-plugin-react>array-includes>is-string": true
       }
     },
-    "browserify>insert-module-globals>through2>readable-stream>safe-buffer": {
-      "builtin": {
-        "buffer": true
+    "gulp>undertaker>bach>array-initial": {
+      "packages": {
+        "gulp>undertaker>object.defaults>array-slice": true,
+        "gulp>undertaker>bach>array-last>is-number": true
       }
     },
-    "browserify>insert-module-globals>through2>readable-stream>string_decoder": {
+    "gulp>undertaker>bach>array-last": {
       "packages": {
-        "browserify>insert-module-globals>through2>readable-stream>safe-buffer": true
+        "gulp>undertaker>bach>array-last>is-number": true
       }
     },
-    "browserify>insert-module-globals>undeclared-identifiers": {
+    "eslint-plugin-import>array.prototype.flat": {
       "packages": {
-        "browserify>insert-module-globals>undeclared-identifiers>get-assigned-identifiers": true,
-        "browserify>syntax-error>acorn-node": true,
-        "watchify>xtend": true
+        "string.prototype.matchall>call-bind": true,
+        "string.prototype.matchall>define-properties": true,
+        "string.prototype.matchall>es-abstract": true,
+        "eslint-plugin-react>array.prototype.flatmap>es-shim-unscopables": true
       }
     },
-    "browserify>insert-module-globals>undeclared-identifiers>get-assigned-identifiers": {
-      "builtin": {
-        "assert.equal": true
+    "eslint-plugin-react>array.prototype.flatmap": {
+      "packages": {
+        "string.prototype.matchall>call-bind": true,
+        "string.prototype.matchall>define-properties": true,
+        "string.prototype.matchall>es-abstract": true,
+        "eslint-plugin-react>array.prototype.flatmap>es-shim-unscopables": true
       }
     },
-    "browserify>module-deps": {
-      "builtin": {
-        "fs.createReadStream": true,
-        "fs.readFile": true,
-        "path.delimiter": true,
-        "path.dirname": true,
-        "path.join": true,
-        "path.resolve": true
-      },
+    "gulp>glob-watcher>async-done": {
       "globals": {
-        "process.cwd": true,
-        "process.env.NODE_PATH": true,
-        "process.nextTick": true,
-        "process.platform": true,
-        "setTimeout": true,
-        "tr": true
+        "process.nextTick": true
       },
       "packages": {
-        "browserify>browser-resolve": true,
-        "browserify>cached-path-relative": true,
-        "browserify>concat-stream": true,
-        "browserify>duplexer2": true,
-        "browserify>module-deps>detective": true,
-        "browserify>module-deps>readable-stream": true,
-        "browserify>module-deps>stream-combiner2": true,
-        "browserify>module-deps>through2": true,
-        "browserify>parents": true,
-        "depcheck>resolve": true,
-        "loose-envify": true,
-        "pumpify>inherits": true,
-        "watchify>defined": true,
-        "watchify>xtend": true
+        "duplexify>end-of-stream": true,
+        "@metamask/object-multiplex>once": true,
+        "readable-stream-2>process-nextick-args": true,
+        "gulp>glob-watcher>async-done>stream-exhaust": true
       }
     },
-    "browserify>module-deps>detective": {
+    "gulp>undertaker>bach>async-settle": {
       "packages": {
-        "browserify>syntax-error>acorn-node": true,
-        "watchify>defined": true
+        "gulp>glob-watcher>async-done": true
       }
     },
-    "browserify>module-deps>readable-stream": {
-      "builtin": {
-        "events.EventEmitter": true,
-        "stream": true,
-        "util": true
+    "gulp-sourcemaps>css>source-map-resolve>atob": {
+      "globals": {
+        "Buffer.from": true
+      }
+    },
+    "autoprefixer": {
+      "globals": {
+        "console": true,
+        "process.cwd": true,
+        "process.env.AUTOPREFIXER_GRID": true
       },
+      "packages": {
+        "browserslist": true,
+        "autoprefixer>caniuse-lite": true,
+        "autoprefixer>fraction.js": true,
+        "autoprefixer>normalize-range": true,
+        "postcss>picocolors": true,
+        "postcss": true,
+        "stylelint>postcss-value-parser": true
+      }
+    },
+    "stylelint>autoprefixer": {
       "globals": {
-        "process.browser": true,
-        "process.env.READABLE_STREAM": true,
-        "process.stderr": true,
-        "process.stdout": true,
-        "process.version.slice": true,
-        "setImmediate": true
+        "console": true,
+        "process.cwd": true,
+        "process.env.AUTOPREFIXER_GRID": true
       },
       "packages": {
-        "browserify>module-deps>readable-stream>isarray": true,
-        "browserify>module-deps>readable-stream>safe-buffer": true,
-        "browserify>module-deps>readable-stream>string_decoder": true,
-        "pumpify>inherits": true,
-        "readable-stream-2>core-util-is": true,
-        "readable-stream-2>process-nextick-args": true,
-        "readable-stream>util-deprecate": true
+        "browserslist": true,
+        "autoprefixer>caniuse-lite": true,
+        "autoprefixer>normalize-range": true,
+        "stylelint>autoprefixer>num2fraction": true,
+        "stylelint>postcss>picocolors": true,
+        "stylelint>postcss-value-parser": true,
+        "stylelint>postcss": true
       }
     },
-    "browserify>module-deps>readable-stream>safe-buffer": {
-      "builtin": {
-        "buffer": true
+    "@babel/preset-env>babel-plugin-polyfill-corejs2": {
+      "packages": {
+        "@babel/preset-env>@babel/compat-data": true,
+        "@babel/core": true,
+        "@babel/preset-env>babel-plugin-polyfill-corejs2>@babel/helper-define-polyfill-provider": true,
+        "@babel/preset-env>babel-plugin-polyfill-corejs2>semver": true
       }
     },
-    "browserify>module-deps>readable-stream>string_decoder": {
+    "@babel/preset-env>babel-plugin-polyfill-corejs3": {
       "packages": {
-        "browserify>module-deps>readable-stream>safe-buffer": true
+        "@babel/core": true,
+        "@babel/preset-env>babel-plugin-polyfill-corejs2>@babel/helper-define-polyfill-provider": true,
+        "@babel/preset-env>core-js-compat": true
       }
     },
-    "browserify>module-deps>stream-combiner2": {
+    "@babel/preset-env>babel-plugin-polyfill-regenerator": {
       "packages": {
-        "browserify>duplexer2": true,
-        "browserify>module-deps>stream-combiner2>readable-stream": true
+        "@babel/preset-env>babel-plugin-polyfill-corejs2>@babel/helper-define-polyfill-provider": true
       }
     },
-    "browserify>module-deps>stream-combiner2>readable-stream": {
+    "babelify": {
       "builtin": {
-        "events.EventEmitter": true,
-        "stream": true,
+        "path.extname": true,
+        "path.resolve": true,
+        "stream.PassThrough": true,
+        "stream.Transform": true,
         "util": true
       },
       "globals": {
-        "process.browser": true,
-        "process.env.READABLE_STREAM": true,
-        "process.stderr": true,
-        "process.stdout": true,
-        "process.version.slice": true,
-        "setImmediate": true
+        "Buffer.concat": true
       },
       "packages": {
-        "browserify>module-deps>stream-combiner2>readable-stream>isarray": true,
-        "browserify>module-deps>stream-combiner2>readable-stream>safe-buffer": true,
-        "browserify>module-deps>stream-combiner2>readable-stream>string_decoder": true,
-        "pumpify>inherits": true,
-        "readable-stream-2>core-util-is": true,
-        "readable-stream-2>process-nextick-args": true,
-        "readable-stream>util-deprecate": true
+        "@babel/core": true
       }
     },
-    "browserify>module-deps>stream-combiner2>readable-stream>safe-buffer": {
+    "gulp>undertaker>bach": {
       "builtin": {
-        "buffer": true
-      }
-    },
-    "browserify>module-deps>stream-combiner2>readable-stream>string_decoder": {
+        "assert.ok": true
+      },
       "packages": {
-        "browserify>module-deps>stream-combiner2>readable-stream>safe-buffer": true
+        "gulp>undertaker>bach>arr-filter": true,
+        "gulp>undertaker>arr-flatten": true,
+        "gulp>undertaker>arr-map": true,
+        "gulp>undertaker>bach>array-each": true,
+        "gulp>undertaker>bach>array-initial": true,
+        "gulp>undertaker>bach>array-last": true,
+        "gulp>glob-watcher>async-done": true,
+        "gulp>undertaker>bach>async-settle": true,
+        "gulp>vinyl-fs>vinyl-sourcemap>now-and-later": true
       }
     },
-    "browserify>module-deps>through2": {
+    "gulp>gulp-cli>matchdep>micromatch>snapdragon>base": {
       "builtin": {
         "util.inherits": true
       },
-      "globals": {
-        "process.nextTick": true
-      },
       "packages": {
-        "browserify>module-deps>readable-stream": true,
-        "watchify>xtend": true
+        "gulp>gulp-cli>matchdep>micromatch>snapdragon>base>cache-base": true,
+        "gulp>gulp-cli>matchdep>micromatch>snapdragon>base>class-utils": true,
+        "gulp>gulp-cli>matchdep>micromatch>snapdragon>base>component-emitter": true,
+        "gulp>gulp-cli>matchdep>micromatch>snapdragon>base>define-property": true,
+        "gulp>gulp-cli>isobject": true,
+        "gulp>gulp-cli>matchdep>micromatch>snapdragon>base>mixin-deep": true,
+        "gulp>gulp-cli>matchdep>micromatch>snapdragon>base>pascalcase": true
       }
     },
-    "browserify>parents": {
-      "globals": {
-        "process.cwd": true,
-        "process.platform": true
+    "bify-module-groups": {
+      "packages": {
+        "pify": true,
+        "pumpify>pump": true,
+        "bify-module-groups>through2": true
+      }
+    },
+    "vinyl-buffer>bl": {
+      "builtin": {
+        "util.inherits": true
       },
       "packages": {
-        "browserify>parents>path-platform": true
+        "vinyl-buffer>bl>readable-stream": true,
+        "koa>content-disposition>safe-buffer": true
       }
     },
-    "browserify>parents>path-platform": {
+    "gulp-livereload>tiny-lr>body": {
       "builtin": {
-        "path": true,
-        "util.isObject": true,
-        "util.isString": true
+        "querystring.parse": true
       },
-      "globals": {
-        "process.cwd": true,
-        "process.env": true,
-        "process.platform": true
+      "packages": {
+        "gulp-livereload>tiny-lr>body>continuable-cache": true,
+        "gulp-livereload>tiny-lr>body>error": true,
+        "gulp-livereload>tiny-lr>body>raw-body": true,
+        "gulp-livereload>tiny-lr>body>safe-json-parse": true
       }
     },
-    "browserify>read-only-stream": {
+    "eslint>minimatch>brace-expansion": {
       "packages": {
-        "browserify>read-only-stream>readable-stream": true
+        "stylelint>balanced-match": true,
+        "eslint>minimatch>brace-expansion>concat-map": true
       }
     },
-    "browserify>read-only-stream>readable-stream": {
-      "builtin": {
-        "events.EventEmitter": true,
-        "stream": true,
-        "util": true
-      },
-      "globals": {
-        "process.browser": true,
-        "process.env.READABLE_STREAM": true,
-        "process.stderr": true,
-        "process.stdout": true,
-        "process.version.slice": true,
-        "setImmediate": true
-      },
+    "chokidar>braces": {
       "packages": {
-        "browserify>read-only-stream>readable-stream>isarray": true,
-        "browserify>read-only-stream>readable-stream>safe-buffer": true,
-        "browserify>read-only-stream>readable-stream>string_decoder": true,
-        "pumpify>inherits": true,
-        "readable-stream-2>core-util-is": true,
-        "readable-stream-2>process-nextick-args": true,
-        "readable-stream>util-deprecate": true
+        "chokidar>braces>fill-range": true
       }
     },
-    "browserify>read-only-stream>readable-stream>safe-buffer": {
-      "builtin": {
-        "buffer": true
+    "gulp>glob-watcher>anymatch>micromatch>braces": {
+      "packages": {
+        "gulp>undertaker>arr-flatten": true,
+        "gulp>gulp-cli>matchdep>micromatch>array-unique": true,
+        "gulp>glob-watcher>anymatch>micromatch>braces>extend-shallow": true,
+        "gulp>glob-watcher>anymatch>micromatch>braces>fill-range": true,
+        "gulp>gulp-cli>isobject": true,
+        "gulp-watch>anymatch>micromatch>braces>repeat-element": true,
+        "gulp>gulp-cli>matchdep>micromatch>braces>snapdragon-node": true,
+        "gulp>gulp-cli>matchdep>micromatch>snapdragon": true,
+        "gulp>gulp-cli>matchdep>micromatch>braces>split-string": true,
+        "gulp>gulp-cli>matchdep>micromatch>to-regex": true
       }
     },
-    "browserify>read-only-stream>readable-stream>string_decoder": {
+    "gulp-watch>anymatch>micromatch>braces": {
       "packages": {
-        "browserify>read-only-stream>readable-stream>safe-buffer": true
+        "gulp-watch>anymatch>micromatch>braces>expand-range": true,
+        "gulp-watch>anymatch>micromatch>braces>preserve": true,
+        "gulp-watch>anymatch>micromatch>braces>repeat-element": true
       }
     },
-    "browserify>readable-stream": {
+    "browserify>browser-pack": {
       "builtin": {
-        "events.EventEmitter": true,
-        "stream": true,
-        "util": true
+        "fs.readFileSync": true,
+        "path.join": true,
+        "path.relative": true
       },
       "globals": {
-        "process.browser": true,
-        "process.env.READABLE_STREAM": true,
-        "process.stderr": true,
-        "process.stdout": true,
-        "process.version.slice": true,
-        "setImmediate": true
+        "__dirname": true,
+        "process.cwd": true
       },
       "packages": {
-        "browserify>readable-stream>isarray": true,
-        "browserify>readable-stream>safe-buffer": true,
-        "browserify>readable-stream>string_decoder": true,
-        "pumpify>inherits": true,
-        "readable-stream-2>core-util-is": true,
-        "readable-stream-2>process-nextick-args": true,
-        "readable-stream>util-deprecate": true
-      }
-    },
-    "browserify>readable-stream>safe-buffer": {
-      "builtin": {
-        "buffer": true
-      }
-    },
-    "browserify>readable-stream>string_decoder": {
-      "packages": {
-        "browserify>readable-stream>safe-buffer": true
+        "browserify>JSONStream": true,
+        "@lavamoat/lavapack>combine-source-map": true,
+        "watchify>defined": true,
+        "koa>content-disposition>safe-buffer": true,
+        "browserify>browser-pack>through2": true,
+        "@lavamoat/lavapack>umd": true
       }
     },
-    "browserify>shasum-object": {
+    "browserify>browser-resolve": {
       "builtin": {
-        "crypto.createHash": true
+        "fs.readFile": true,
+        "fs.readFileSync": true,
+        "path": true
       },
       "globals": {
-        "Buffer.isBuffer": true
+        "__dirname": true,
+        "process.platform": true
       },
       "packages": {
-        "@metamask/rpc-errors>fast-safe-stringify": true
-      }
-    },
-    "browserify>string_decoder": {
-      "packages": {
-        "koa>content-disposition>safe-buffer": true
-      }
-    },
-    "browserify>syntax-error": {
-      "packages": {
-        "browserify>syntax-error>acorn-node": true
-      }
-    },
-    "browserify>syntax-error>acorn-node": {
-      "packages": {
-        "@storybook/react>acorn-walk": true,
-        "browserify>syntax-error>acorn-node>acorn": true,
-        "watchify>xtend": true
-      }
-    },
-    "browserify>syntax-error>acorn-node>acorn": {
-      "globals": {
-        "define": true
+        "depcheck>resolve": true
       }
     },
-    "browserify>through2": {
+    "browserify": {
       "builtin": {
-        "util.inherits": true
+        "events.EventEmitter": true,
+        "fs.realpath": true,
+        "path.dirname": true,
+        "path.join": true,
+        "path.relative": true,
+        "path.resolve": true,
+        "path.sep": true
       },
       "globals": {
-        "process.nextTick": true
+        "__dirname": true,
+        "process.cwd": true,
+        "process.nextTick": true,
+        "process.platform": true
       },
       "packages": {
-        "browserify>readable-stream": true,
+        "browserify>browser-pack": true,
+        "browserify>browser-resolve": true,
+        "browserify>cached-path-relative": true,
+        "browserify>concat-stream": true,
+        "watchify>defined": true,
+        "browserify>deps-sort": true,
+        "browserify>has": true,
+        "lavamoat>htmlescape": true,
+        "pumpify>inherits": true,
+        "browserify>insert-module-globals": true,
+        "labeled-stream-splicer": true,
+        "browserify>module-deps": true,
+        "browserify>read-only-stream": true,
+        "depcheck>resolve": true,
+        "browserify>shasum-object": true,
+        "browserify>syntax-error": true,
+        "browserify>through2": true,
         "watchify>xtend": true
       }
     },
@@ -1963,38 +1676,84 @@
         "browserslist>node-releases": true
       }
     },
-    "chalk": {
-      "packages": {
-        "chalk>ansi-styles": true,
-        "chalk>supports-color": true
+    "sass-embedded>buffer-builder": {
+      "globals": {
+        "Buffer": true
       }
     },
-    "chalk>ansi-styles": {
-      "packages": {
-        "chalk>ansi-styles>color-convert": true
+    "gulp-zip>yazl>buffer-crc32": {
+      "builtin": {
+        "buffer.Buffer": true
       }
     },
-    "chalk>ansi-styles>color-convert": {
+    "gulp>vinyl-fs>vinyl-sourcemap>append-buffer>buffer-equal": {
+      "builtin": {
+        "buffer.Buffer.isBuffer": true
+      }
+    },
+    "terser>source-map-support>buffer-from": {
+      "globals": {
+        "Buffer": true
+      }
+    },
+    "gulp>gulp-cli>matchdep>micromatch>snapdragon>base>cache-base": {
       "packages": {
-        "jest-canvas-mock>moo-color>color-name": true
+        "gulp>gulp-cli>matchdep>micromatch>snapdragon>base>cache-base>collection-visit": true,
+        "gulp>gulp-cli>matchdep>micromatch>snapdragon>base>component-emitter": true,
+        "gulp>gulp-cli>array-sort>get-value": true,
+        "gulp>gulp-cli>matchdep>micromatch>snapdragon>base>cache-base>has-value": true,
+        "gulp>gulp-cli>isobject": true,
+        "gulp>gulp-cli>matchdep>micromatch>snapdragon>base>cache-base>set-value": true,
+        "gulp>gulp-cli>matchdep>micromatch>snapdragon>base>cache-base>to-object-path": true,
+        "gulp>gulp-cli>matchdep>micromatch>snapdragon>base>cache-base>union-value": true,
+        "gulp>gulp-cli>matchdep>micromatch>snapdragon>base>cache-base>unset-value": true
       }
     },
-    "chalk>supports-color": {
+    "browserify>cached-path-relative": {
       "builtin": {
-        "os.release": true,
-        "tty.isatty": true
+        "path": true
       },
       "globals": {
-        "process.env": true,
+        "process.cwd": true
+      }
+    },
+    "string.prototype.matchall>call-bind": {
+      "packages": {
+        "string.prototype.matchall>call-bind>es-define-property": true,
+        "string.prototype.matchall>call-bind>es-errors": true,
+        "browserify>has>function-bind": true,
+        "string.prototype.matchall>get-intrinsic": true,
+        "string.prototype.matchall>call-bind>set-function-length": true
+      }
+    },
+    "chalk": {
+      "packages": {
+        "chalk>ansi-styles": true,
+        "chalk>supports-color": true
+      }
+    },
+    "gulp-livereload>chalk": {
+      "globals": {
+        "process.env.TERM": true,
         "process.platform": true
       },
       "packages": {
-        "chalk>supports-color>has-flag": true
+        "gulp-livereload>chalk>ansi-styles": true,
+        "gulp-livereload>chalk>escape-string-regexp": true,
+        "gulp-livereload>chalk>supports-color": true
       }
     },
-    "chalk>supports-color>has-flag": {
+    "postcss-discard-font-face>postcss>chalk": {
       "globals": {
-        "process.argv": true
+        "process.env.TERM": true,
+        "process.platform": true
+      },
+      "packages": {
+        "postcss-discard-font-face>postcss>chalk>ansi-styles": true,
+        "postcss-discard-font-face>postcss>chalk>escape-string-regexp": true,
+        "prettier-eslint>loglevel-colored-level-prefix>chalk>has-ansi": true,
+        "postcss-discard-font-face>postcss>chalk>strip-ansi": true,
+        "postcss-discard-font-face>postcss>chalk>supports-color": true
       }
     },
     "chokidar": {
@@ -2036,378 +1795,365 @@
         "chokidar>anymatch": true,
         "chokidar>braces": true,
         "chokidar>fsevents": true,
+        "eslint>glob-parent": true,
         "chokidar>is-binary-path": true,
-        "chokidar>normalize-path": true,
-        "chokidar>readdirp": true,
         "del>is-glob": true,
-        "eslint>glob-parent": true
+        "chokidar>normalize-path": true,
+        "chokidar>readdirp": true
       }
     },
-    "chokidar>anymatch": {
+    "gulp>glob-watcher>chokidar": {
       "packages": {
-        "chokidar>anymatch>normalize-path": true,
-        "chokidar>anymatch>picomatch": true
+        "gulp>glob-watcher>chokidar>fsevents": true
       }
     },
-    "chokidar>anymatch>picomatch": {
+    "gulp-watch>chokidar": {
       "builtin": {
+        "events.EventEmitter": true,
+        "fs": true,
         "path.basename": true,
+        "path.dirname": true,
+        "path.extname": true,
+        "path.join": true,
+        "path.relative": true,
+        "path.resolve": true,
         "path.sep": true
       },
       "globals": {
+        "clearTimeout": true,
+        "console.error": true,
+        "process.env.CHOKIDAR_INTERVAL": true,
+        "process.env.CHOKIDAR_PRINT_FSEVENTS_REQUIRE_ERROR": true,
+        "process.env.CHOKIDAR_USEPOLLING": true,
+        "process.nextTick": true,
         "process.platform": true,
-        "process.version.slice": true
-      }
-    },
-    "chokidar>braces": {
+        "setTimeout": true
+      },
       "packages": {
-        "chokidar>braces>fill-range": true
+        "gulp-watch>chokidar>anymatch": true,
+        "gulp-watch>chokidar>async-each": true,
+        "gulp-watch>chokidar>braces": true,
+        "gulp-watch>chokidar>fsevents": true,
+        "gulp-watch>glob-parent": true,
+        "pumpify>inherits": true,
+        "gulp-watch>chokidar>is-binary-path": true,
+        "eslint>is-glob": true,
+        "chokidar>normalize-path": true,
+        "gulp-watch>path-is-absolute": true,
+        "gulp-watch>chokidar>readdirp": true,
+        "gulp-watch>chokidar>upath": true
       }
     },
-    "chokidar>braces>fill-range": {
+    "gulp>gulp-cli>matchdep>micromatch>snapdragon>base>class-utils": {
       "builtin": {
-        "util.inspect": true
+        "util": true
       },
       "packages": {
-        "chokidar>braces>fill-range>to-regex-range": true
+        "gulp-zip>plugin-error>arr-union": true,
+        "gulp>gulp-cli>matchdep>micromatch>snapdragon>define-property": true,
+        "gulp>gulp-cli>isobject": true,
+        "gulp>gulp-cli>matchdep>micromatch>snapdragon>base>class-utils>static-extend": true
       }
     },
-    "chokidar>braces>fill-range>to-regex-range": {
-      "packages": {
-        "chokidar>braces>fill-range>to-regex-range>is-number": true
+    "del>p-map>aggregate-error>clean-stack": {
+      "builtin": {
+        "os.homedir": true
       }
     },
-    "chokidar>fsevents": {
+    "yargs>cliui": {
       "globals": {
-        "console.assert": true,
-        "process.platform": true
+        "process": true
       },
-      "native": true
+      "packages": {
+        "yargs>string-width": true,
+        "eslint>strip-ansi": true,
+        "yargs>cliui>wrap-ansi": true
+      }
     },
-    "chokidar>is-binary-path": {
+    "vinyl>clone-buffer": {
       "builtin": {
-        "path.extname": true
-      },
+        "buffer.Buffer": true
+      }
+    },
+    "lavamoat>lavamoat-core>merge-deep>clone-deep": {
       "packages": {
-        "chokidar>is-binary-path>binary-extensions": true
+        "lavamoat>lavamoat-core>merge-deep>clone-deep>for-own": true,
+        "@babel/register>clone-deep>is-plain-object": true,
+        "lavamoat>lavamoat-core>merge-deep>kind-of": true,
+        "lavamoat>lavamoat-core>merge-deep>clone-deep>lazy-cache": true,
+        "lavamoat>lavamoat-core>merge-deep>clone-deep>shallow-clone": true
       }
     },
-    "chokidar>readdirp": {
-      "builtin": {
-        "fs": true,
-        "path.join": true,
-        "path.relative": true,
-        "path.resolve": true,
-        "path.sep": true,
-        "stream.Readable": true,
-        "util.promisify": true
-      },
-      "globals": {
-        "process.platform": true,
-        "process.versions.node.split": true
-      },
+    "stylelint>execall>clone-regexp": {
       "packages": {
-        "chokidar>anymatch>picomatch": true
+        "stylelint>execall>clone-regexp>is-regexp": true
       }
     },
-    "debounce-stream>duplexer": {
+    "vinyl>clone-stats": {
       "builtin": {
-        "stream": true
+        "fs.Stats": true
       }
     },
-    "debounce-stream>through": {
+    "gulp-watch>vinyl-file>vinyl>clone-stats": {
       "builtin": {
-        "stream": true
-      },
-      "globals": {
-        "process.nextTick": true
+        "fs.Stats": true
       }
     },
-    "del": {
-      "builtin": {
-        "path.resolve": true,
-        "util.promisify": true
-      },
+    "@metamask/jazzicon>color>clone": {
       "globals": {
-        "process.cwd": true,
-        "process.platform": true
-      },
-      "packages": {
-        "del>graceful-fs": true,
-        "del>is-glob": true,
-        "del>is-path-cwd": true,
-        "del>is-path-inside": true,
-        "del>p-map": true,
-        "del>rimraf": true,
-        "del>slash": true,
-        "globby": true
+        "Buffer": true
       }
     },
-    "del>graceful-fs": {
-      "builtin": {
-        "assert.equal": true,
-        "constants.O_SYMLINK": true,
-        "constants.O_WRONLY": true,
-        "constants.hasOwnProperty": true,
-        "fs": true,
-        "stream.Stream.call": true,
-        "util": true
-      },
+    "vinyl>clone": {
       "globals": {
-        "clearTimeout": true,
-        "console.error": true,
-        "process": true,
-        "setTimeout": true
+        "Buffer": true
       }
     },
-    "del>is-glob": {
+    "vinyl>cloneable-readable": {
       "packages": {
-        "del>is-glob>is-extglob": true
+        "pumpify>inherits": true,
+        "vinyl>cloneable-readable>process-nextick-args": true,
+        "vinyl>cloneable-readable>through2": true
       }
     },
-    "del>is-path-cwd": {
-      "builtin": {
-        "path.resolve": true
-      },
-      "globals": {
-        "process.cwd": true,
-        "process.platform": true
+    "gulp>undertaker>collection-map": {
+      "packages": {
+        "gulp>undertaker>arr-map": true,
+        "gulp>undertaker>object.reduce>for-own": true,
+        "gulp>undertaker>arr-map>make-iterator": true
       }
     },
-    "del>is-path-inside": {
-      "builtin": {
-        "path.relative": true,
-        "path.resolve": true,
-        "path.sep": true
+    "gulp>gulp-cli>matchdep>micromatch>snapdragon>base>cache-base>collection-visit": {
+      "packages": {
+        "gulp>gulp-cli>matchdep>micromatch>snapdragon>base>cache-base>collection-visit>map-visit": true,
+        "gulp>gulp-cli>matchdep>micromatch>snapdragon>base>cache-base>collection-visit>object-visit": true
       }
     },
-    "del>p-map": {
+    "chalk>ansi-styles>color-convert": {
       "packages": {
-        "del>p-map>aggregate-error": true
+        "jest-canvas-mock>moo-color>color-name": true
       }
     },
-    "del>p-map>aggregate-error": {
+    "gulp-livereload>chalk>ansi-styles>color-convert": {
       "packages": {
-        "del>p-map>aggregate-error>clean-stack": true,
-        "prettier-eslint>indent-string": true
+        "gulp-livereload>chalk>ansi-styles>color-convert>color-name": true
       }
     },
-    "del>p-map>aggregate-error>clean-stack": {
-      "builtin": {
-        "os.homedir": true
+    "stylelint>table>slice-ansi>ansi-styles>color-convert": {
+      "packages": {
+        "stylelint>table>slice-ansi>ansi-styles>color-convert>color-name": true
       }
     },
-    "del>rimraf": {
+    "fancy-log>color-support": {
+      "globals": {
+        "process": true
+      }
+    },
+    "@lavamoat/lavapack>combine-source-map": {
       "builtin": {
-        "assert": true,
-        "fs": true,
+        "path.dirname": true,
         "path.join": true
       },
       "globals": {
-        "process.platform": true,
-        "setTimeout": true
+        "process.platform": true
       },
       "packages": {
-        "nyc>glob": true
+        "nyc>convert-source-map": true,
+        "@lavamoat/lavapack>combine-source-map>inline-source-map": true,
+        "@lavamoat/lavapack>combine-source-map>lodash.memoize": true,
+        "@lavamoat/lavapack>combine-source-map>source-map": true
       }
     },
-    "depcheck>@babel/traverse": {
+    "browserify>concat-stream": {
       "globals": {
-        "console.log": true
+        "Buffer.concat": true,
+        "Buffer.isBuffer": true
       },
       "packages": {
-        "@babel/code-frame": true,
-        "@babel/core>@babel/generator": true,
-        "@babel/core>@babel/parser": true,
-        "@babel/core>@babel/template": true,
-        "@babel/core>@babel/types": true,
-        "babel/preset-env>b@babel/types": true,
-        "depcheck>@babel/traverse>globals": true,
-        "nock>debug": true
+        "terser>source-map-support>buffer-from": true,
+        "pumpify>inherits": true,
+        "browserify>concat-stream>readable-stream": true,
+        "browserify>concat-stream>typedarray": true
       }
     },
-    "depcheck>cosmiconfig>parse-json": {
+    "lavamoat-browserify>concat-stream": {
+      "globals": {
+        "Buffer.concat": true,
+        "Buffer.isBuffer": true
+      },
       "packages": {
-        "@babel/code-frame": true,
-        "depcheck>cosmiconfig>parse-json>error-ex": true,
-        "depcheck>cosmiconfig>parse-json>lines-and-columns": true,
-        "webpack>json-parse-even-better-errors": true
+        "terser>source-map-support>buffer-from": true,
+        "pumpify>inherits": true,
+        "lavamoat-browserify>concat-stream>readable-stream": true,
+        "browserify>concat-stream>typedarray": true
       }
     },
-    "depcheck>cosmiconfig>parse-json>error-ex": {
+    "@babel/core>convert-source-map": {
+      "globals": {
+        "Buffer": true,
+        "atob": true,
+        "btoa": true,
+        "value": true
+      }
+    },
+    "nyc>convert-source-map": {
       "builtin": {
-        "util.inherits": true
+        "fs.readFileSync": true,
+        "path.join": true
       },
-      "packages": {
-        "depcheck>cosmiconfig>parse-json>error-ex>is-arrayish": true
+      "globals": {
+        "Buffer.from": true
       }
     },
-    "depcheck>is-core-module": {
+    "readable-stream-2>core-util-is": {
       "globals": {
-        "process.versions": true
-      },
-      "packages": {
-        "depcheck>is-core-module>hasown": true
+        "Buffer.isBuffer": true
       }
     },
-    "depcheck>is-core-module>hasown": {
+    "stylelint>cosmiconfig": {
+      "builtin": {
+        "fs": true,
+        "os": true,
+        "path": true
+      },
+      "globals": {
+        "process.cwd": true
+      },
       "packages": {
-        "browserify>has>function-bind": true
+        "eslint>@eslint/eslintrc>import-fresh": true,
+        "depcheck>cosmiconfig>parse-json": true,
+        "globby>dir-glob>path-type": true,
+        "stylelint>cosmiconfig>yaml": true
       }
     },
-    "depcheck>json5": {
+    "ts-node>create-require": {
+      "builtin": {
+        "fs.lstatSync": true,
+        "module.Module": true,
+        "module.createRequire": true,
+        "module.createRequireFromPath": true,
+        "path.dirname": true,
+        "path.join": true
+      },
       "globals": {
-        "console.warn": true
+        "process.cwd": true
       }
     },
-    "depcheck>resolve": {
+    "gulp-sourcemaps>css": {
       "builtin": {
-        "fs.readFile": true,
         "fs.readFileSync": true,
-        "fs.realpath": true,
-        "fs.realpathSync": true,
-        "fs.stat": true,
-        "fs.statSync": true,
-        "os.homedir": true,
         "path.dirname": true,
-        "path.join": true,
-        "path.parse": true,
-        "path.relative": true,
-        "path.resolve": true
-      },
-      "globals": {
-        "process.env.HOME": true,
-        "process.env.HOMEDRIVE": true,
-        "process.env.HOMEPATH": true,
-        "process.env.LNAME": true,
-        "process.env.LOGNAME": true,
-        "process.env.USER": true,
-        "process.env.USERNAME": true,
-        "process.env.USERPROFILE": true,
-        "process.getuid": true,
-        "process.nextTick": true,
-        "process.platform": true,
-        "process.versions.pnp": true
+        "path.sep": true
       },
       "packages": {
-        "depcheck>is-core-module": true,
-        "depcheck>resolve>path-parse": true
+        "pumpify>inherits": true,
+        "gulp-sourcemaps>css>source-map-resolve": true,
+        "gulp-sourcemaps>css>source-map": true
       }
     },
-    "depcheck>resolve>path-parse": {
+    "resolve-url-loader>es6-iterator>d": {
+      "packages": {
+        "resolve-url-loader>es6-iterator>es5-ext": true,
+        "resolve-url-loader>es6-iterator>d>type": true
+      }
+    },
+    "gulp-sourcemaps>debug-fabulous": {
+      "packages": {
+        "gulp-sourcemaps>debug-fabulous>debug": true,
+        "gulp-sourcemaps>debug-fabulous>memoizee": true,
+        "react>object-assign": true
+      }
+    },
+    "@typescript-eslint/eslint-plugin>@typescript-eslint/type-utils>debug": {
       "globals": {
-        "process.platform": true
+        "console.debug": true,
+        "console.log": true
+      },
+      "packages": {
+        "@typescript-eslint/eslint-plugin>@typescript-eslint/type-utils>debug>ms": true
       }
     },
-    "duplexify": {
+    "gulp-sourcemaps>debug-fabulous>debug": {
+      "builtin": {
+        "tty.isatty": true,
+        "util": true
+      },
       "globals": {
-        "Buffer": true,
-        "process.nextTick": true
+        "console": true,
+        "document": true,
+        "localStorage": true,
+        "navigator": true,
+        "process": true
       },
       "packages": {
-        "duplexify>end-of-stream": true,
-        "duplexify>stream-shift": true,
-        "pumpify>inherits": true,
-        "readable-stream": true
+        "mocha>ms": true,
+        "mocha>supports-color": true
       }
     },
-    "duplexify>end-of-stream": {
+    "eslint-import-resolver-node>debug": {
+      "builtin": {
+        "tty.isatty": true,
+        "util": true
+      },
       "globals": {
-        "process.nextTick": true
+        "console": true,
+        "document": true,
+        "localStorage": true,
+        "navigator": true,
+        "process": true
       },
       "packages": {
-        "@metamask/object-multiplex>once": true
+        "mocha>ms": true,
+        "mocha>supports-color": true
       }
     },
-    "eslint": {
+    "eslint-plugin-import>eslint-module-utils>debug": {
       "builtin": {
-        "assert": true,
-        "fs.existsSync": true,
-        "fs.lstatSync": true,
-        "fs.promises": true,
-        "fs.readFileSync": true,
-        "fs.readdirSync": true,
-        "fs.statSync": true,
-        "fs.unlinkSync": true,
-        "fs.writeFile": true,
-        "fs.writeFileSync": true,
-        "path.dirname": true,
-        "path.extname": true,
-        "path.isAbsolute": true,
-        "path.join": true,
-        "path.normalize": true,
-        "path.posix.join": true,
-        "path.relative": true,
-        "path.resolve": true,
-        "path.sep": true,
-        "url.pathToFileURL": true,
-        "util.format": true,
-        "util.inspect": true,
-        "util.promisify": true
+        "tty.isatty": true,
+        "util": true
       },
       "globals": {
-        "__dirname": true,
-        "console.log": true,
-        "describe": true,
-        "it": true,
+        "console": true,
+        "document": true,
+        "localStorage": true,
+        "navigator": true,
         "process": true
       },
       "packages": {
-        "del>is-glob": true,
-        "del>is-path-inside": true,
-        "eslint>@eslint-community/eslint-utils": true,
-        "eslint>@eslint-community/regexpp": true,
-        "eslint>@eslint/eslintrc": true,
-        "eslint>@eslint/js": true,
-        "eslint>@humanwhocodes/config-array": true,
-        "eslint>@nodelib/fs.walk": true,
-        "eslint>@ungap/structured-clone": true,
-        "eslint>ajv": true,
-        "eslint>doctrine": true,
-        "eslint>eslint-scope": true,
-        "eslint>eslint-visitor-keys": true,
-        "eslint>espree": true,
-        "eslint>esquery": true,
-        "eslint>esutils": true,
-        "eslint>fast-deep-equal": true,
-        "eslint>file-entry-cache": true,
-        "eslint>glob-parent": true,
-        "eslint>globals": true,
-        "eslint>graphemer": true,
-        "eslint>ignore": true,
-        "eslint>imurmurhash": true,
-        "eslint>json-stable-stringify-without-jsonify": true,
-        "eslint>levn": true,
-        "eslint>lodash.merge": true,
-        "eslint>minimatch": true,
-        "eslint>natural-compare": true,
-        "mocha>escape-string-regexp": true,
-        "mocha>find-up": true,
-        "nock>debug": true
-      }
-    },
-    "eslint-config-prettier": {
-      "globals": {
-        "process.env.ESLINT_CONFIG_PRETTIER_NO_DEPRECATED": true
+        "mocha>ms": true,
+        "mocha>supports-color": true
       }
     },
-    "eslint-import-resolver-node": {
+    "eslint-plugin-import>debug": {
       "builtin": {
-        "path.dirname": true,
-        "path.join": true,
-        "path.resolve": true
+        "fs.SyncWriteStream": true,
+        "net.Socket": true,
+        "tty.WriteStream": true,
+        "tty.isatty": true,
+        "util": true
+      },
+      "globals": {
+        "chrome": true,
+        "console": true,
+        "document": true,
+        "localStorage": true,
+        "navigator": true,
+        "process": true
       },
       "packages": {
-        "depcheck>resolve": true,
-        "eslint-import-resolver-node>debug": true
+        "eslint-plugin-import>debug>ms": true
       }
     },
-    "eslint-import-resolver-node>debug": {
+    "gulp>glob-watcher>anymatch>micromatch>extglob>expand-brackets>debug": {
       "builtin": {
+        "fs.SyncWriteStream": true,
+        "net.Socket": true,
+        "tty.WriteStream": true,
         "tty.isatty": true,
         "util": true
       },
       "globals": {
+        "chrome": true,
         "console": true,
         "document": true,
         "localStorage": true,
@@ -2415,61 +2161,46 @@
         "process": true
       },
       "packages": {
-        "mocha>ms": true,
-        "mocha>supports-color": true
+        "gulp>glob-watcher>anymatch>micromatch>extglob>expand-brackets>debug>ms": true
       }
     },
-    "eslint-import-resolver-typescript": {
+    "gulp-livereload>debug": {
       "builtin": {
-        "path": true
+        "tty.isatty": true,
+        "util": true
       },
       "globals": {
-        "console.warn": true,
-        "process.cwd": true
+        "console": true,
+        "document": true,
+        "localStorage": true,
+        "navigator": true,
+        "process": true
       },
       "packages": {
-        "del>is-glob": true,
-        "depcheck>resolve": true,
-        "eslint-plugin-import>tsconfig-paths": true,
-        "nock>debug": true,
-        "nyc>glob": true
+        "mocha>ms": true,
+        "gulp-livereload>chalk>supports-color": true
       }
     },
-    "eslint-plugin-import": {
+    "nock>debug": {
       "builtin": {
-        "fs": true,
-        "path": true,
-        "vm": true
+        "tty.isatty": true,
+        "util.deprecate": true,
+        "util.formatWithOptions": true,
+        "util.inspect": true
       },
       "globals": {
-        "process.cwd": true,
-        "process.env": true
+        "console": true,
+        "document": true,
+        "localStorage": true,
+        "navigator": true,
+        "process": true
       },
       "packages": {
-        "browserify>has": true,
-        "del>is-glob": true,
-        "depcheck>is-core-module": true,
-        "eslint": true,
-        "eslint-plugin-import>array.prototype.flat": true,
-        "eslint-plugin-import>debug": true,
-        "eslint-plugin-import>doctrine": true,
-        "eslint-plugin-import>eslint-module-utils": true,
-        "eslint-plugin-import>tsconfig-paths": true,
-        "eslint-plugin-react>array-includes": true,
-        "eslint-plugin-react>object.values": true,
-        "eslint>minimatch": true,
-        "typescript": true
-      }
-    },
-    "eslint-plugin-import>array.prototype.flat": {
-      "packages": {
-        "eslint-plugin-react>array.prototype.flatmap>es-shim-unscopables": true,
-        "string.prototype.matchall>call-bind": true,
-        "string.prototype.matchall>define-properties": true,
-        "string.prototype.matchall>es-abstract": true
+        "nock>debug>ms": true,
+        "mocha>supports-color": true
       }
     },
-    "eslint-plugin-import>debug": {
+    "gulp>gulp-cli>matchdep>micromatch>snapdragon>debug": {
       "builtin": {
         "fs.SyncWriteStream": true,
         "net.Socket": true,
@@ -2486,44 +2217,10 @@
         "process": true
       },
       "packages": {
-        "eslint-plugin-import>debug>ms": true
-      }
-    },
-    "eslint-plugin-import>doctrine": {
-      "builtin": {
-        "assert": true
-      },
-      "packages": {
-        "eslint>esutils": true
-      }
-    },
-    "eslint-plugin-import>eslint-module-utils": {
-      "builtin": {
-        "crypto.createHash": true,
-        "fs.existsSync": true,
-        "fs.readFileSync": true,
-        "fs.readdirSync": true,
-        "module": true,
-        "path.dirname": true,
-        "path.extname": true,
-        "path.join": true,
-        "path.parse": true,
-        "path.resolve": true
-      },
-      "globals": {
-        "__dirname.toUpperCase": true,
-        "console.warn": true,
-        "process.cwd": true,
-        "process.hrtime": true
-      },
-      "packages": {
-        "@babel/eslint-parser": true,
-        "eslint-import-resolver-node": true,
-        "eslint-plugin-import>eslint-module-utils>debug": true,
-        "eslint-plugin-import>eslint-module-utils>find-up": true
+        "gulp>gulp-cli>matchdep>micromatch>snapdragon>debug>ms": true
       }
     },
-    "eslint-plugin-import>eslint-module-utils>debug": {
+    "gulp-livereload>tiny-lr>debug": {
       "builtin": {
         "tty.isatty": true,
         "util": true
@@ -2540,902 +2237,666 @@
         "mocha>supports-color": true
       }
     },
-    "eslint-plugin-import>eslint-module-utils>find-up": {
-      "builtin": {
-        "path.dirname": true,
-        "path.join": true,
-        "path.parse": true,
-        "path.resolve": true
-      },
+    "gulp>undertaker>last-run>default-resolution": {
+      "globals": {
+        "process.version.match": true
+      }
+    },
+    "string.prototype.matchall>define-properties>define-data-property": {
       "packages": {
-        "eslint-plugin-import>eslint-module-utils>find-up>locate-path": true
+        "string.prototype.matchall>call-bind>es-define-property": true,
+        "string.prototype.matchall>call-bind>es-errors": true,
+        "string.prototype.matchall>es-abstract>gopd": true
       }
     },
-    "eslint-plugin-import>eslint-module-utils>find-up>locate-path": {
-      "builtin": {
-        "path.resolve": true
-      },
-      "globals": {
-        "process.cwd": true
-      },
+    "string.prototype.matchall>define-properties": {
       "packages": {
-        "eslint-plugin-import>eslint-module-utils>find-up>locate-path>p-locate": true,
-        "eslint-plugin-import>eslint-module-utils>find-up>locate-path>path-exists": true
+        "string.prototype.matchall>define-properties>define-data-property": true,
+        "string.prototype.matchall>es-abstract>has-property-descriptors": true,
+        "@lavamoat/lavapack>json-stable-stringify>object-keys": true
       }
     },
-    "eslint-plugin-import>eslint-module-utils>find-up>locate-path>p-locate": {
+    "gulp>gulp-cli>matchdep>micromatch>snapdragon>base>define-property": {
       "packages": {
-        "eslint-plugin-import>eslint-module-utils>find-up>locate-path>p-locate>p-limit": true
+        "gulp>gulp-cli>matchdep>micromatch>define-property>is-descriptor": true
       }
     },
-    "eslint-plugin-import>eslint-module-utils>find-up>locate-path>p-locate>p-limit": {
+    "gulp>glob-watcher>anymatch>micromatch>extglob>expand-brackets>define-property": {
       "packages": {
-        "eslint-plugin-import>eslint-module-utils>find-up>locate-path>p-locate>p-limit>p-try": true
+        "gulp>glob-watcher>anymatch>micromatch>extglob>expand-brackets>define-property>is-descriptor": true
       }
     },
-    "eslint-plugin-import>eslint-module-utils>find-up>locate-path>path-exists": {
-      "builtin": {
-        "fs.access": true,
-        "fs.accessSync": true
+    "gulp>glob-watcher>anymatch>micromatch>extglob>define-property": {
+      "packages": {
+        "gulp>gulp-cli>matchdep>micromatch>define-property>is-descriptor": true
       }
     },
-    "eslint-plugin-import>tsconfig-paths": {
-      "builtin": {
-        "fs.existsSync": true,
-        "fs.lstatSync": true,
-        "fs.readFile": true,
-        "fs.readFileSync": true,
-        "fs.stat": true,
-        "fs.statSync": true,
-        "module._resolveFilename": true,
-        "module.builtinModules": true,
-        "path.dirname": true,
-        "path.isAbsolute": true,
-        "path.join": true,
-        "path.resolve": true
-      },
-      "globals": {
-        "console.warn": true,
-        "process.argv.slice": true,
-        "process.cwd": true,
-        "process.env": true
-      },
+    "gulp>glob-watcher>anymatch>micromatch>define-property": {
       "packages": {
-        "eslint-plugin-import>tsconfig-paths>json5": true,
-        "eslint-plugin-import>tsconfig-paths>strip-bom": true,
-        "wait-on>minimist": true
-      }
-    },
-    "eslint-plugin-import>tsconfig-paths>json5": {
-      "globals": {
-        "console.warn": true
+        "gulp>gulp-cli>matchdep>micromatch>define-property>is-descriptor": true,
+        "gulp>gulp-cli>isobject": true
       }
     },
-    "eslint-plugin-jest": {
-      "builtin": {
-        "fs.readdirSync": true,
-        "path.join": true,
-        "path.parse": true
-      },
-      "globals": {
-        "__dirname": true
-      },
+    "gulp>gulp-cli>matchdep>micromatch>nanomatch>define-property": {
       "packages": {
-        "@typescript-eslint/eslint-plugin": true,
-        "eslint-plugin-jest>@typescript-eslint/utils": true
+        "gulp>gulp-cli>matchdep>micromatch>define-property>is-descriptor": true,
+        "gulp>gulp-cli>isobject": true
       }
     },
-    "eslint-plugin-jest>@typescript-eslint/experimental-utils": {
-      "builtin": {
-        "path": true
-      },
+    "gulp>gulp-cli>matchdep>micromatch>braces>snapdragon-node>define-property": {
       "packages": {
-        "@typescript-eslint/parser>@typescript-eslint/scope-manager": true,
-        "@typescript-eslint/parser>@typescript-eslint/types": true,
-        "eslint": true,
-        "eslint-plugin-jest>@typescript-eslint/experimental-utils>@typescript-eslint/types": true,
-        "eslint-plugin-jest>@typescript-eslint/experimental-utils>eslint-utils": true,
-        "eslint>eslint-scope": true,
-        "eslint>eslint-utils": true,
-        "webpack>eslint-scope": true
+        "gulp>gulp-cli>matchdep>micromatch>define-property>is-descriptor": true
       }
     },
-    "eslint-plugin-jest>@typescript-eslint/experimental-utils>eslint-utils": {
+    "gulp>gulp-cli>matchdep>micromatch>snapdragon>define-property": {
       "packages": {
-        "eslint-plugin-jest>@typescript-eslint/experimental-utils>eslint-utils>eslint-visitor-keys": true
+        "gulp>gulp-cli>matchdep>micromatch>snapdragon>define-property>is-descriptor": true
       }
     },
-    "eslint-plugin-jest>@typescript-eslint/utils": {
-      "builtin": {
-        "assert": true,
-        "path": true
-      },
+    "gulp>gulp-cli>matchdep>micromatch>to-regex>define-property": {
       "packages": {
-        "@typescript-eslint/parser>@typescript-eslint/scope-manager": true,
-        "@typescript-eslint/parser>@typescript-eslint/types": true,
-        "eslint": true,
-        "eslint-plugin-jest>@typescript-eslint/experimental-utils>@typescript-eslint/types": true,
-        "eslint-plugin-jest>@typescript-eslint/utils>@typescript-eslint/scope-manager": true,
-        "eslint-plugin-jest>@typescript-eslint/utils>@typescript-eslint/types": true,
-        "eslint-plugin-jest>@typescript-eslint/utils>webpack>eslint-scope": true,
-        "eslint-plugin-mocha>eslint-utils": true,
-        "eslint>@eslint-community/eslint-utils": true,
-        "eslint>eslint-scope": true,
-        "eslint>eslint-utils": true,
-        "semver": true,
-        "webpack>eslint-scope": true
+        "gulp>gulp-cli>matchdep>micromatch>define-property>is-descriptor": true,
+        "gulp>gulp-cli>isobject": true
       }
     },
-    "eslint-plugin-jest>@typescript-eslint/utils>@typescript-eslint/scope-manager": {
+    "del": {
       "builtin": {
-        "path": true
+        "path.resolve": true,
+        "util.promisify": true
       },
-      "packages": {
-        "eslint-plugin-jest>@typescript-eslint/utils>@typescript-eslint/scope-manager>@typescript-eslint/visitor-keys": true,
-        "eslint-plugin-jest>@typescript-eslint/utils>@typescript-eslint/types": true
-      }
-    },
-    "eslint-plugin-jest>@typescript-eslint/utils>@typescript-eslint/scope-manager>@typescript-eslint/visitor-keys": {
-      "builtin": {
-        "path": true
+      "globals": {
+        "process.cwd": true,
+        "process.platform": true
       },
       "packages": {
-        "eslint>eslint-visitor-keys": true
-      }
-    },
-    "eslint-plugin-jest>@typescript-eslint/utils>eslint-utils": {
-      "packages": {
-        "eslint-plugin-jest>@typescript-eslint/utils>eslint-utils>eslint-visitor-keys": true,
-        "eslint>@eslint-community/eslint-utils": true,
-        "semver": true
-      }
-    },
-    "eslint-plugin-jsdoc": {
-      "packages": {
-        "eslint": true,
-        "eslint-plugin-jsdoc>@es-joy/jsdoccomment": true,
-        "eslint-plugin-jsdoc>are-docs-informative": true,
-        "eslint-plugin-jsdoc>comment-parser": true,
-        "eslint-plugin-jsdoc>spdx-expression-parse": true,
-        "eslint>esquery": true,
-        "mocha>escape-string-regexp": true,
-        "nock>debug": true,
-        "semver": true
+        "globby": true,
+        "del>graceful-fs": true,
+        "del>is-glob": true,
+        "del>is-path-cwd": true,
+        "del>is-path-inside": true,
+        "del>p-map": true,
+        "del>rimraf": true,
+        "del>slash": true
       }
     },
-    "eslint-plugin-jsdoc>@es-joy/jsdoccomment": {
+    "browserify>deps-sort": {
       "packages": {
-        "eslint-plugin-jsdoc>@es-joy/jsdoccomment>jsdoc-type-pratt-parser": true,
-        "eslint-plugin-jsdoc>comment-parser": true,
-        "eslint>esquery": true
+        "browserify>shasum-object": true,
+        "browserify>deps-sort>through2": true
       }
     },
-    "eslint-plugin-jsdoc>@es-joy/jsdoccomment>jsdoc-type-pratt-parser": {
+    "gulp-watch>chokidar>fsevents>node-pre-gyp>detect-libc": {
+      "builtin": {
+        "child_process.spawnSync": true,
+        "fs.readdirSync": true,
+        "os.platform": true
+      },
       "globals": {
-        "define": true
+        "process.env": true
       }
     },
-    "eslint-plugin-jsdoc>spdx-expression-parse": {
+    "browserify>module-deps>detective": {
       "packages": {
-        "eslint-plugin-jsdoc>spdx-expression-parse>spdx-exceptions": true,
-        "eslint-plugin-jsdoc>spdx-expression-parse>spdx-license-ids": true
+        "browserify>syntax-error>acorn-node": true,
+        "watchify>defined": true
       }
     },
-    "eslint-plugin-mocha>eslint-utils": {
-      "packages": {
-        "eslint-plugin-mocha>eslint-utils>eslint-visitor-keys": true
+    "ts-node>diff": {
+      "globals": {
+        "setTimeout": true
       }
     },
-    "eslint-plugin-node": {
+    "globby>dir-glob": {
       "builtin": {
-        "fs.readFileSync": true,
-        "fs.readdirSync": true,
-        "fs.statSync": true,
-        "path.basename": true,
-        "path.dirname": true,
         "path.extname": true,
         "path.isAbsolute": true,
         "path.join": true,
-        "path.relative": true,
-        "path.resolve": true,
-        "path.sep": true
+        "path.posix.join": true
       },
       "globals": {
         "process.cwd": true
       },
       "packages": {
-        "depcheck>resolve": true,
-        "eslint-plugin-node>eslint-plugin-es": true,
-        "eslint-plugin-node>eslint-utils": true,
-        "eslint-plugin-node>semver": true,
-        "eslint>ignore": true,
-        "eslint>minimatch": true
-      }
-    },
-    "eslint-plugin-node>eslint-plugin-es": {
-      "packages": {
-        "eslint-plugin-node>eslint-plugin-es>regexpp": true,
-        "eslint-plugin-node>eslint-utils": true
-      }
-    },
-    "eslint-plugin-node>eslint-utils": {
-      "packages": {
-        "eslint-plugin-node>eslint-utils>eslint-visitor-keys": true
-      }
-    },
-    "eslint-plugin-node>semver": {
-      "globals": {
-        "console": true,
-        "process": true
+        "globby>dir-glob>path-type": true
       }
     },
-    "eslint-plugin-prettier": {
+    "eslint>doctrine": {
+      "builtin": {
+        "assert": true
+      },
       "packages": {
-        "eslint-plugin-prettier>prettier-linter-helpers": true,
-        "prettier": true
+        "eslint>esutils": true
       }
     },
-    "eslint-plugin-prettier>prettier-linter-helpers": {
+    "eslint-plugin-import>doctrine": {
+      "builtin": {
+        "assert": true
+      },
       "packages": {
-        "eslint-plugin-prettier>prettier-linter-helpers>fast-diff": true
+        "eslint>esutils": true
       }
     },
-    "eslint-plugin-react": {
+    "eslint-plugin-react>doctrine": {
       "builtin": {
-        "fs.statSync": true,
-        "path.dirname": true,
-        "path.extname": true
-      },
-      "globals": {
-        "console.error": true,
-        "console.log": true,
-        "process.argv.join": true,
-        "process.cwd": true
+        "assert": true
       },
       "packages": {
-        "eslint": true,
-        "eslint-plugin-react>array-includes": true,
-        "eslint-plugin-react>array.prototype.flatmap": true,
-        "eslint-plugin-react>doctrine": true,
-        "eslint-plugin-react>estraverse": true,
-        "eslint-plugin-react>jsx-ast-utils": true,
-        "eslint-plugin-react>object.entries": true,
-        "eslint-plugin-react>object.fromentries": true,
-        "eslint-plugin-react>object.hasown": true,
-        "eslint-plugin-react>object.values": true,
-        "eslint-plugin-react>resolve": true,
-        "eslint-plugin-react>semver": true,
-        "eslint>minimatch": true,
-        "prop-types": true,
-        "string.prototype.matchall": true
-      }
-    },
-    "eslint-plugin-react-hooks": {
-      "globals": {
-        "process.env.NODE_ENV": true
+        "eslint>esutils": true
       }
     },
-    "eslint-plugin-react>array-includes": {
+    "stylelint>postcss-html>htmlparser2>domutils>dom-serializer": {
       "packages": {
-        "eslint-plugin-react>array-includes>is-string": true,
-        "string.prototype.matchall>call-bind": true,
-        "string.prototype.matchall>define-properties": true,
-        "string.prototype.matchall>es-abstract": true,
-        "string.prototype.matchall>get-intrinsic": true
+        "stylelint>postcss-html>htmlparser2>domelementtype": true,
+        "stylelint>postcss-html>htmlparser2>entities": true
       }
     },
-    "eslint-plugin-react>array-includes>is-string": {
+    "stylelint>postcss-html>htmlparser2>domhandler": {
       "packages": {
-        "koa>is-generator-function>has-tostringtag": true
+        "stylelint>postcss-html>htmlparser2>domelementtype": true
       }
     },
-    "eslint-plugin-react>array.prototype.flatmap": {
+    "stylelint>postcss-html>htmlparser2>domutils": {
       "packages": {
-        "eslint-plugin-react>array.prototype.flatmap>es-shim-unscopables": true,
-        "string.prototype.matchall>call-bind": true,
-        "string.prototype.matchall>define-properties": true,
-        "string.prototype.matchall>es-abstract": true
+        "stylelint>postcss-html>htmlparser2>domutils>dom-serializer": true,
+        "stylelint>postcss-html>htmlparser2>domelementtype": true
       }
     },
-    "eslint-plugin-react>array.prototype.flatmap>es-shim-unscopables": {
+    "browserify>duplexer2": {
       "packages": {
-        "browserify>has": true
+        "browserify>duplexer2>readable-stream": true
       }
     },
-    "eslint-plugin-react>doctrine": {
+    "debounce-stream>duplexer": {
       "builtin": {
-        "assert": true
-      },
-      "packages": {
-        "eslint>esutils": true
+        "stream": true
       }
     },
-    "eslint-plugin-react>jsx-ast-utils": {
+    "duplexify": {
       "globals": {
-        "console.error": true
+        "Buffer": true,
+        "process.nextTick": true
       },
       "packages": {
-        "gulp>vinyl-fs>object.assign": true
+        "duplexify>end-of-stream": true,
+        "pumpify>inherits": true,
+        "readable-stream": true,
+        "duplexify>stream-shift": true
       }
     },
-    "eslint-plugin-react>object.entries": {
+    "gulp>vinyl-fs>glob-stream>pumpify>duplexify": {
+      "globals": {
+        "Buffer": true,
+        "process.nextTick": true
+      },
       "packages": {
-        "string.prototype.matchall>call-bind": true,
-        "string.prototype.matchall>define-properties": true,
-        "string.prototype.matchall>es-abstract": true
+        "duplexify>end-of-stream": true,
+        "pumpify>inherits": true,
+        "gulp>vinyl-fs>glob-stream>readable-stream": true,
+        "duplexify>stream-shift": true
       }
     },
-    "eslint-plugin-react>object.fromentries": {
-      "packages": {
-        "string.prototype.matchall>call-bind": true,
-        "string.prototype.matchall>define-properties": true,
-        "string.prototype.matchall>es-abstract": true
-      }
-    },
-    "eslint-plugin-react>object.hasown": {
-      "packages": {
-        "string.prototype.matchall>es-abstract": true
-      }
-    },
-    "eslint-plugin-react>resolve": {
-      "builtin": {
-        "fs.readFile": true,
-        "fs.readFileSync": true,
-        "fs.realpath": true,
-        "fs.realpathSync": true,
-        "fs.stat": true,
-        "fs.statSync": true,
-        "os.homedir": true,
-        "path.dirname": true,
-        "path.join": true,
-        "path.parse": true,
-        "path.relative": true,
-        "path.resolve": true
-      },
+    "gulp>vinyl-fs>pumpify>duplexify": {
       "globals": {
-        "process.env.HOME": true,
-        "process.env.HOMEDRIVE": true,
-        "process.env.HOMEPATH": true,
-        "process.env.LNAME": true,
-        "process.env.LOGNAME": true,
-        "process.env.USER": true,
-        "process.env.USERNAME": true,
-        "process.env.USERPROFILE": true,
-        "process.getuid": true,
-        "process.nextTick": true,
-        "process.platform": true,
-        "process.versions.pnp": true
+        "Buffer": true,
+        "process.nextTick": true
       },
       "packages": {
-        "depcheck>is-core-module": true,
-        "depcheck>resolve>path-parse": true
-      }
-    },
-    "eslint-plugin-react>semver": {
-      "globals": {
-        "console": true,
-        "process": true
-      }
-    },
-    "eslint>@eslint-community/eslint-utils": {
-      "packages": {
-        "eslint>eslint-visitor-keys": true
+        "duplexify>end-of-stream": true,
+        "pumpify>inherits": true,
+        "gulp>vinyl-fs>readable-stream": true,
+        "duplexify>stream-shift": true
       }
     },
-    "eslint>@eslint/eslintrc": {
-      "builtin": {
-        "assert": true,
-        "fs": true,
-        "module": true,
-        "os": true,
-        "path": true,
-        "url": true,
-        "util": true
-      },
+    "duplexify>end-of-stream": {
       "globals": {
-        "__filename": true,
-        "process.cwd": true,
-        "process.emitWarning": true,
-        "process.platform": true
+        "process.nextTick": true
       },
       "packages": {
-        "$root$": true,
-        "@babel/eslint-parser": true,
-        "@babel/eslint-plugin": true,
-        "@metamask/eslint-config": true,
-        "@metamask/eslint-config-nodejs": true,
-        "@metamask/eslint-config-typescript": true,
-        "@typescript-eslint/eslint-plugin": true,
-        "eslint": true,
-        "eslint-config-prettier": true,
-        "eslint-plugin-import": true,
-        "eslint-plugin-jsdoc": true,
-        "eslint-plugin-node": true,
-        "eslint-plugin-prettier": true,
-        "eslint-plugin-react": true,
-        "eslint-plugin-react-hooks": true,
-        "eslint>ajv": true,
-        "eslint>globals": true,
-        "eslint>ignore": true,
-        "eslint>minimatch": true,
-        "mocha>strip-json-comments": true,
-        "nock>debug": true
+        "@metamask/object-multiplex>once": true
       }
     },
-    "eslint>@eslint/eslintrc>import-fresh": {
+    "depcheck>cosmiconfig>parse-json>error-ex": {
       "builtin": {
-        "path.dirname": true
-      },
-      "globals": {
-        "__dirname": true,
-        "__filename": true
+        "util.inherits": true
       },
       "packages": {
-        "eslint>@eslint/eslintrc>import-fresh>parent-module": true,
-        "eslint>@eslint/eslintrc>import-fresh>resolve-from": true
-      }
-    },
-    "eslint>@eslint/eslintrc>import-fresh>parent-module": {
-      "packages": {
-        "@metamask/test-bundler>ow>callsites": true
-      }
-    },
-    "eslint>@eslint/eslintrc>import-fresh>resolve-from": {
-      "builtin": {
-        "fs.realpathSync": true,
-        "module._nodeModulePaths": true,
-        "module._resolveFilename": true,
-        "path.join": true,
-        "path.resolve": true
+        "depcheck>cosmiconfig>parse-json>error-ex>is-arrayish": true
       }
     },
-    "eslint>@humanwhocodes/config-array": {
+    "gulp-livereload>tiny-lr>body>error": {
       "builtin": {
-        "path.dirname": true,
-        "path.join": true,
-        "path.relative": true
+        "assert": true
       },
       "packages": {
-        "eslint>@humanwhocodes/config-array>@humanwhocodes/object-schema": true,
-        "eslint>minimatch": true,
-        "nock>debug": true
+        "gulp-livereload>tiny-lr>body>error>string-template": true,
+        "watchify>xtend": true
       }
     },
-    "eslint>@nodelib/fs.walk": {
-      "builtin": {
-        "events.EventEmitter": true,
-        "path.sep": true,
-        "stream.Readable": true
-      },
-      "globals": {
-        "setImmediate": true
-      },
+    "string.prototype.matchall>es-abstract": {
       "packages": {
-        "eslint>@nodelib/fs.walk>@nodelib/fs.scandir": true,
-        "eslint>@nodelib/fs.walk>fastq": true
+        "string.prototype.matchall>call-bind": true,
+        "string.prototype.matchall>call-bind>es-define-property": true,
+        "string.prototype.matchall>call-bind>es-errors": true,
+        "string.prototype.matchall>es-abstract>es-object-atoms": true,
+        "string.prototype.matchall>es-abstract>es-set-tostringtag": true,
+        "string.prototype.matchall>es-abstract>es-to-primitive": true,
+        "string.prototype.matchall>get-intrinsic": true,
+        "string.prototype.matchall>es-abstract>gopd": true,
+        "string.prototype.matchall>es-abstract>has-property-descriptors": true,
+        "string.prototype.matchall>es-abstract>has-proto": true,
+        "string.prototype.matchall>has-symbols": true,
+        "depcheck>is-core-module>hasown": true,
+        "string.prototype.matchall>internal-slot": true,
+        "string.prototype.matchall>es-abstract>is-callable": true,
+        "string.prototype.matchall>es-abstract>is-regex": true,
+        "eslint-plugin-react>array-includes>is-string": true,
+        "string.prototype.matchall>es-abstract>object-inspect": true,
+        "string.prototype.matchall>es-abstract>safe-regex-test": true,
+        "string.prototype.matchall>es-abstract>string.prototype.trim": true
       }
     },
-    "eslint>@nodelib/fs.walk>@nodelib/fs.scandir": {
-      "builtin": {
-        "fs.lstat": true,
-        "fs.lstatSync": true,
-        "fs.readdir": true,
-        "fs.readdirSync": true,
-        "fs.stat": true,
-        "fs.statSync": true,
-        "path.sep": true
-      },
-      "globals": {
-        "process.versions.node": true
-      },
+    "string.prototype.matchall>call-bind>es-define-property": {
       "packages": {
-        "eslint>@nodelib/fs.walk>@nodelib/fs.scandir>run-parallel": true,
-        "fast-glob>@nodelib/fs.stat": true
-      }
-    },
-    "eslint>@nodelib/fs.walk>@nodelib/fs.scandir>run-parallel": {
-      "globals": {
-        "process.nextTick": true
+        "string.prototype.matchall>get-intrinsic": true
       }
     },
-    "eslint>@nodelib/fs.walk>fastq": {
+    "string.prototype.matchall>es-abstract>es-object-atoms": {
       "packages": {
-        "eslint>@nodelib/fs.walk>fastq>reusify": true
-      }
-    },
-    "eslint>@ungap/structured-clone": {
-      "globals": {
-        "structuredClone": true
+        "string.prototype.matchall>call-bind>es-errors": true
       }
     },
-    "eslint>ajv": {
-      "globals": {
-        "console": true
-      },
+    "string.prototype.matchall>es-abstract>es-set-tostringtag": {
       "packages": {
-        "@metamask/snaps-utils>fast-json-stable-stringify": true,
-        "eslint>ajv>json-schema-traverse": true,
-        "eslint>fast-deep-equal": true,
-        "uri-js": true
+        "string.prototype.matchall>get-intrinsic": true,
+        "koa>is-generator-function>has-tostringtag": true,
+        "depcheck>is-core-module>hasown": true
       }
     },
-    "eslint>doctrine": {
-      "builtin": {
-        "assert": true
-      },
+    "eslint-plugin-react>array.prototype.flatmap>es-shim-unscopables": {
       "packages": {
-        "eslint>esutils": true
+        "browserify>has": true
       }
     },
-    "eslint>eslint-scope": {
-      "builtin": {
-        "assert": true
-      },
+    "string.prototype.matchall>es-abstract>es-to-primitive": {
       "packages": {
-        "eslint-plugin-react>estraverse": true,
-        "eslint>eslint-scope>esrecurse": true
+        "string.prototype.matchall>es-abstract>is-callable": true,
+        "@metamask/eth-token-tracker>deep-equal>is-date-object": true,
+        "string.prototype.matchall>es-abstract>es-to-primitive>is-symbol": true
       }
     },
-    "eslint>eslint-scope>esrecurse": {
+    "resolve-url-loader>es6-iterator>es5-ext": {
       "packages": {
-        "eslint-plugin-react>estraverse": true
+        "resolve-url-loader>es6-iterator>es6-symbol": true
       }
     },
-    "eslint>espree": {
+    "resolve-url-loader>es6-iterator": {
       "packages": {
-        "eslint>eslint-visitor-keys": true,
-        "eslint>espree>acorn-jsx": true,
-        "jsdom>acorn": true
+        "resolve-url-loader>es6-iterator>d": true,
+        "resolve-url-loader>es6-iterator>es5-ext": true,
+        "resolve-url-loader>es6-iterator>es6-symbol": true
       }
     },
-    "eslint>espree>acorn-jsx": {
+    "resolve-url-loader>es6-iterator>es6-symbol": {
       "packages": {
-        "jsdom>acorn": true
+        "resolve-url-loader>es6-iterator>d": true,
+        "resolve-url-loader>es6-iterator>es6-symbol>ext": true
       }
     },
-    "eslint>esquery": {
-      "globals": {
-        "define": true
+    "gulp>undertaker>es6-weak-map": {
+      "packages": {
+        "resolve-url-loader>es6-iterator>d": true,
+        "resolve-url-loader>es6-iterator>es5-ext": true,
+        "resolve-url-loader>es6-iterator": true,
+        "resolve-url-loader>es6-iterator>es6-symbol": true
       }
     },
-    "eslint>file-entry-cache": {
+    "yargs>escalade": {
       "builtin": {
-        "crypto.createHash": true,
-        "fs.readFileSync": true,
+        "fs.readdirSync": true,
         "fs.statSync": true,
-        "path.basename": true,
-        "path.dirname": true
-      },
-      "packages": {
-        "eslint>file-entry-cache>flat-cache": true
+        "path.dirname": true,
+        "path.resolve": true
       }
     },
-    "eslint>file-entry-cache>flat-cache": {
+    "eslint": {
       "builtin": {
+        "assert": true,
         "fs.existsSync": true,
-        "fs.mkdirSync": true,
-        "fs.readFileSync": true,
+        "fs.lstatSync": true,
+        "fs.promises": true,
+        "fs.readFileSync": true,
+        "fs.readdirSync": true,
+        "fs.statSync": true,
+        "fs.unlinkSync": true,
+        "fs.writeFile": true,
         "fs.writeFileSync": true,
-        "path.basename": true,
         "path.dirname": true,
-        "path.resolve": true
+        "path.extname": true,
+        "path.isAbsolute": true,
+        "path.join": true,
+        "path.normalize": true,
+        "path.posix.join": true,
+        "path.relative": true,
+        "path.resolve": true,
+        "path.sep": true,
+        "url.pathToFileURL": true,
+        "util.format": true,
+        "util.inspect": true,
+        "util.promisify": true
       },
       "globals": {
-        "__dirname": true
-      },
-      "packages": {
-        "del>rimraf": true,
-        "eslint>file-entry-cache>flat-cache>flatted": true
-      }
-    },
-    "eslint>glob-parent": {
-      "builtin": {
-        "os.platform": true,
-        "path.posix.dirname": true
+        "__dirname": true,
+        "console.log": true,
+        "describe": true,
+        "it": true,
+        "process": true
       },
       "packages": {
-        "del>is-glob": true
+        "eslint>@eslint-community/eslint-utils": true,
+        "eslint>@eslint-community/regexpp": true,
+        "eslint>@eslint/eslintrc": true,
+        "eslint>@eslint/js": true,
+        "eslint>@humanwhocodes/config-array": true,
+        "eslint>@nodelib/fs.walk": true,
+        "eslint>@ungap/structured-clone": true,
+        "eslint>ajv": true,
+        "nock>debug": true,
+        "eslint>doctrine": true,
+        "mocha>escape-string-regexp": true,
+        "eslint>eslint-scope": true,
+        "eslint>eslint-visitor-keys": true,
+        "eslint>espree": true,
+        "eslint>esquery": true,
+        "eslint>esutils": true,
+        "eslint>fast-deep-equal": true,
+        "eslint>file-entry-cache": true,
+        "mocha>find-up": true,
+        "eslint>glob-parent": true,
+        "eslint>globals": true,
+        "eslint>graphemer": true,
+        "eslint>ignore": true,
+        "eslint>imurmurhash": true,
+        "del>is-glob": true,
+        "del>is-path-inside": true,
+        "eslint>json-stable-stringify-without-jsonify": true,
+        "eslint>levn": true,
+        "eslint>lodash.merge": true,
+        "eslint>minimatch": true,
+        "eslint>natural-compare": true
       }
     },
-    "eslint>ignore": {
+    "eslint-config-prettier": {
       "globals": {
-        "process": true
-      }
-    },
-    "eslint>levn": {
-      "packages": {
-        "eslint>levn>prelude-ls": true,
-        "eslint>levn>type-check": true
+        "process.env.ESLINT_CONFIG_PRETTIER_NO_DEPRECATED": true
       }
     },
-    "eslint>levn>type-check": {
+    "eslint-import-resolver-node": {
+      "builtin": {
+        "path.dirname": true,
+        "path.join": true,
+        "path.resolve": true
+      },
       "packages": {
-        "eslint>levn>prelude-ls": true
+        "eslint-import-resolver-node>debug": true,
+        "depcheck>resolve": true
       }
     },
-    "eslint>minimatch": {
+    "eslint-import-resolver-typescript": {
       "builtin": {
         "path": true
       },
       "globals": {
-        "console": true
+        "console.warn": true,
+        "process.cwd": true
       },
       "packages": {
-        "eslint>minimatch>brace-expansion": true
+        "nock>debug": true,
+        "nyc>glob": true,
+        "del>is-glob": true,
+        "depcheck>resolve": true,
+        "eslint-plugin-import>tsconfig-paths": true
       }
     },
-    "eslint>minimatch>brace-expansion": {
+    "eslint-plugin-import>eslint-module-utils": {
+      "builtin": {
+        "crypto.createHash": true,
+        "fs.existsSync": true,
+        "fs.readFileSync": true,
+        "fs.readdirSync": true,
+        "module": true,
+        "path.dirname": true,
+        "path.extname": true,
+        "path.join": true,
+        "path.parse": true,
+        "path.resolve": true
+      },
+      "globals": {
+        "__dirname.toUpperCase": true,
+        "console.warn": true,
+        "process.cwd": true,
+        "process.hrtime": true
+      },
       "packages": {
-        "eslint>minimatch>brace-expansion>concat-map": true,
-        "stylelint>balanced-match": true
+        "@babel/eslint-parser": true,
+        "eslint-plugin-import>eslint-module-utils>debug": true,
+        "eslint-import-resolver-node": true,
+        "eslint-plugin-import>eslint-module-utils>find-up": true
       }
     },
-    "eslint>strip-ansi": {
+    "eslint-plugin-node>eslint-plugin-es": {
       "packages": {
-        "eslint>strip-ansi>ansi-regex": true
+        "eslint-plugin-node>eslint-utils": true,
+        "eslint-plugin-node>eslint-plugin-es>regexpp": true
       }
     },
-    "eta": {
+    "eslint-plugin-import": {
       "builtin": {
-        "node:fs": true,
-        "node:path": true
+        "fs": true,
+        "path": true,
+        "vm": true
       },
       "globals": {
-        "define": true
+        "process.cwd": true,
+        "process.env": true
+      },
+      "packages": {
+        "eslint-plugin-react>array-includes": true,
+        "eslint-plugin-import>array.prototype.flat": true,
+        "eslint-plugin-import>debug": true,
+        "eslint-plugin-import>doctrine": true,
+        "eslint": true,
+        "eslint-plugin-import>eslint-module-utils": true,
+        "browserify>has": true,
+        "depcheck>is-core-module": true,
+        "del>is-glob": true,
+        "eslint>minimatch": true,
+        "eslint-plugin-react>object.values": true,
+        "eslint-plugin-import>tsconfig-paths": true,
+        "typescript": true
       }
     },
-    "fancy-log": {
+    "eslint-plugin-jest": {
       "builtin": {
-        "console.Console": true
+        "fs.readdirSync": true,
+        "path.join": true,
+        "path.parse": true
       },
       "globals": {
-        "process.argv.indexOf": true,
-        "process.platform": true,
-        "process.stderr": true,
-        "process.stdout": true,
-        "process.version": true
+        "__dirname": true
       },
       "packages": {
-        "fancy-log>ansi-gray": true,
-        "fancy-log>color-support": true,
-        "fancy-log>parse-node-version": true,
-        "fancy-log>time-stamp": true
+        "@typescript-eslint/eslint-plugin": true,
+        "eslint-plugin-jest>@typescript-eslint/utils": true
       }
     },
-    "fancy-log>ansi-gray": {
+    "eslint-plugin-jsdoc": {
       "packages": {
-        "fancy-log>ansi-gray>ansi-wrap": true
-      }
-    },
-    "fancy-log>color-support": {
-      "globals": {
-        "process": true
+        "eslint-plugin-jsdoc>@es-joy/jsdoccomment": true,
+        "eslint-plugin-jsdoc>are-docs-informative": true,
+        "eslint-plugin-jsdoc>comment-parser": true,
+        "nock>debug": true,
+        "mocha>escape-string-regexp": true,
+        "eslint": true,
+        "eslint>esquery": true,
+        "semver": true,
+        "eslint-plugin-jsdoc>spdx-expression-parse": true
       }
     },
-    "fast-glob": {
+    "eslint-plugin-node": {
       "builtin": {
-        "fs.lstat": true,
-        "fs.lstatSync": true,
-        "fs.readdir": true,
+        "fs.readFileSync": true,
         "fs.readdirSync": true,
-        "fs.stat": true,
         "fs.statSync": true,
-        "os.cpus": true,
-        "os.platform": true,
         "path.basename": true,
+        "path.dirname": true,
+        "path.extname": true,
+        "path.isAbsolute": true,
+        "path.join": true,
+        "path.relative": true,
         "path.resolve": true,
-        "stream.PassThrough": true,
-        "stream.Readable": true
+        "path.sep": true
       },
       "globals": {
         "process.cwd": true
       },
       "packages": {
-        "eslint>@nodelib/fs.walk": true,
-        "eslint>glob-parent": true,
-        "fast-glob>@nodelib/fs.stat": true,
-        "fast-glob>micromatch": true,
-        "globby>merge2": true
-      }
-    },
-    "fast-glob>@nodelib/fs.stat": {
-      "builtin": {
-        "fs.lstat": true,
-        "fs.lstatSync": true,
-        "fs.stat": true,
-        "fs.statSync": true
+        "eslint-plugin-node>eslint-plugin-es": true,
+        "eslint-plugin-node>eslint-utils": true,
+        "eslint>ignore": true,
+        "eslint>minimatch": true,
+        "depcheck>resolve": true,
+        "eslint-plugin-node>semver": true
       }
     },
-    "fast-glob>micromatch": {
-      "builtin": {
-        "util.inspect": true
-      },
+    "eslint-plugin-prettier": {
       "packages": {
-        "chokidar>anymatch>picomatch": true,
-        "chokidar>braces": true
+        "prettier": true,
+        "eslint-plugin-prettier>prettier-linter-helpers": true
       }
     },
-    "fs-extra": {
+    "eslint-plugin-react": {
       "builtin": {
-        "assert": true,
-        "fs": true,
-        "os.tmpdir": true,
+        "fs.statSync": true,
         "path.dirname": true,
-        "path.isAbsolute": true,
-        "path.join": true,
-        "path.normalize": true,
-        "path.parse": true,
-        "path.relative": true,
-        "path.resolve": true,
-        "path.sep": true
+        "path.extname": true
       },
       "globals": {
-        "Buffer": true,
-        "console.warn": true,
-        "process.arch": true,
-        "process.cwd": true,
-        "process.platform": true,
-        "process.umask": true,
-        "process.versions.node.split": true,
-        "setTimeout": true
+        "console.error": true,
+        "console.log": true,
+        "process.argv.join": true,
+        "process.cwd": true
       },
       "packages": {
-        "del>graceful-fs": true,
-        "fs-extra>jsonfile": true,
-        "fs-extra>universalify": true
-      }
-    },
-    "fs-extra>jsonfile": {
-      "builtin": {
-        "fs": true
-      },
-      "globals": {
-        "Buffer.isBuffer": true
-      },
-      "packages": {
-        "del>graceful-fs": true
-      }
-    },
-    "gh-pages>globby>pinkie-promise": {
-      "packages": {
-        "gh-pages>globby>pinkie-promise>pinkie": true
+        "eslint-plugin-react>array-includes": true,
+        "eslint-plugin-react>array.prototype.flatmap": true,
+        "eslint-plugin-react>doctrine": true,
+        "eslint": true,
+        "eslint-plugin-react>estraverse": true,
+        "eslint-plugin-react>jsx-ast-utils": true,
+        "eslint>minimatch": true,
+        "eslint-plugin-react>object.entries": true,
+        "eslint-plugin-react>object.fromentries": true,
+        "eslint-plugin-react>object.hasown": true,
+        "eslint-plugin-react>object.values": true,
+        "prop-types": true,
+        "eslint-plugin-react>resolve": true,
+        "eslint-plugin-react>semver": true,
+        "string.prototype.matchall": true
       }
     },
-    "gh-pages>globby>pinkie-promise>pinkie": {
+    "eslint-plugin-react-hooks": {
       "globals": {
-        "process": true,
-        "setImmediate": true,
-        "setTimeout": true
+        "process.env.NODE_ENV": true
       }
     },
-    "globby": {
+    "@babel/eslint-parser>@nicolo-ribaudo/eslint-scope-5-internals>eslint-scope": {
       "builtin": {
-        "fs.Stats": true,
-        "fs.readFile": true,
-        "fs.readFileSync": true,
-        "fs.statSync": true,
-        "path.dirname": true,
-        "path.isAbsolute": true,
-        "path.join": true,
-        "path.posix.join": true,
-        "path.relative": true,
-        "stream.Transform": true,
-        "util.promisify": true
-      },
-      "globals": {
-        "process.cwd": true
+        "assert": true
       },
       "packages": {
-        "del>slash": true,
-        "eslint>ignore": true,
-        "fast-glob": true,
-        "globby>array-union": true,
-        "globby>dir-glob": true,
-        "globby>merge2": true
+        "eslint>eslint-scope>esrecurse": true,
+        "@babel/eslint-parser>@nicolo-ribaudo/eslint-scope-5-internals>eslint-scope>estraverse": true
       }
     },
-    "globby>dir-glob": {
+    "eslint-plugin-jest>@typescript-eslint/utils>eslint-scope": {
       "builtin": {
-        "path.extname": true,
-        "path.isAbsolute": true,
-        "path.join": true,
-        "path.posix.join": true
-      },
-      "globals": {
-        "process.cwd": true
+        "assert": true
       },
       "packages": {
-        "globby>dir-glob>path-type": true
+        "eslint>eslint-scope>esrecurse": true,
+        "eslint-plugin-jest>@typescript-eslint/utils>eslint-scope>estraverse": true
       }
     },
-    "globby>dir-glob>path-type": {
+    "eslint>eslint-scope": {
       "builtin": {
-        "fs": true,
-        "util.promisify": true
+        "assert": true
+      },
+      "packages": {
+        "eslint>eslint-scope>esrecurse": true,
+        "eslint-plugin-react>estraverse": true
       }
     },
-    "globby>merge2": {
+    "webpack>eslint-scope": {
       "builtin": {
-        "stream.PassThrough": true
+        "assert": true
       },
-      "globals": {
-        "process.nextTick": true
+      "packages": {
+        "eslint>eslint-scope>esrecurse": true,
+        "webpack>eslint-scope>estraverse": true
       }
     },
-    "gulp": {
-      "builtin": {
-        "util.inherits": true
-      },
+    "eslint-plugin-jest>@typescript-eslint/experimental-utils>eslint-utils": {
       "packages": {
-        "gulp>glob-watcher": true,
-        "gulp>undertaker": true,
-        "gulp>vinyl-fs": true
+        "eslint-plugin-jest>@typescript-eslint/experimental-utils>eslint-utils>eslint-visitor-keys": true
       }
     },
-    "gulp-livereload": {
-      "builtin": {
-        "path.relative": true
-      },
+    "eslint-plugin-jest>@typescript-eslint/utils>eslint-utils": {
       "packages": {
-        "fancy-log": true,
-        "gulp-livereload>chalk": true,
-        "gulp-livereload>debug": true,
-        "gulp-livereload>event-stream": true,
-        "gulp-livereload>lodash.assign": true,
-        "gulp-livereload>tiny-lr": true
+        "eslint>@eslint-community/eslint-utils": true,
+        "eslint-plugin-jest>@typescript-eslint/utils>eslint-utils>eslint-visitor-keys": true,
+        "semver": true
       }
     },
-    "gulp-livereload>chalk": {
-      "globals": {
-        "process.env.TERM": true,
-        "process.platform": true
-      },
+    "eslint-plugin-mocha>eslint-utils": {
       "packages": {
-        "gulp-livereload>chalk>ansi-styles": true,
-        "gulp-livereload>chalk>escape-string-regexp": true,
-        "gulp-livereload>chalk>supports-color": true
+        "eslint-plugin-mocha>eslint-utils>eslint-visitor-keys": true
       }
     },
-    "gulp-livereload>chalk>ansi-styles": {
+    "eslint-plugin-node>eslint-utils": {
       "packages": {
-        "@metamask/jazzicon>color>color-convert": true
+        "eslint-plugin-node>eslint-utils>eslint-visitor-keys": true
       }
     },
-    "gulp-livereload>chalk>supports-color": {
-      "builtin": {
-        "os.release": true
-      },
-      "globals": {
-        "process.env": true,
-        "process.platform": true,
-        "process.stderr": true,
-        "process.stdout": true,
-        "process.versions.node.split": true
-      },
+    "eslint>espree": {
       "packages": {
-        "gulp-livereload>chalk>supports-color>has-flag": true
+        "eslint>espree>acorn-jsx": true,
+        "jsdom>acorn": true,
+        "eslint>eslint-visitor-keys": true
       }
     },
-    "gulp-livereload>chalk>supports-color>has-flag": {
+    "eslint>esquery": {
       "globals": {
-        "process.argv": true
+        "define": true
       }
     },
-    "gulp-livereload>debug": {
+    "eslint>eslint-scope>esrecurse": {
+      "packages": {
+        "eslint-plugin-react>estraverse": true
+      }
+    },
+    "eta": {
       "builtin": {
-        "tty.isatty": true,
-        "util": true
+        "node:fs": true,
+        "node:path": true
       },
       "globals": {
-        "console": true,
-        "document": true,
-        "localStorage": true,
-        "navigator": true,
-        "process": true
-      },
+        "define": true
+      }
+    },
+    "gulp-sourcemaps>debug-fabulous>memoizee>event-emitter": {
       "packages": {
-        "gulp-livereload>chalk>supports-color": true,
-        "mocha>ms": true
+        "resolve-url-loader>es6-iterator>d": true,
+        "resolve-url-loader>es6-iterator>es5-ext": true
       }
     },
     "gulp-livereload>event-stream": {
@@ -3452,117 +2913,168 @@
       },
       "packages": {
         "debounce-stream>duplexer": true,
-        "debounce-stream>through": true,
         "gulp-livereload>event-stream>from": true,
         "gulp-livereload>event-stream>map-stream": true,
         "gulp-livereload>event-stream>pause-stream": true,
         "gulp-livereload>event-stream>split": true,
-        "gulp-livereload>event-stream>stream-combiner": true
+        "gulp-livereload>event-stream>stream-combiner": true,
+        "debounce-stream>through": true
       }
     },
-    "gulp-livereload>event-stream>from": {
-      "builtin": {
-        "stream": true
-      },
+    "@lavamoat/lavapack>readable-stream>abort-controller>event-target-shim": {
       "globals": {
-        "process.nextTick": true
+        "Event": true,
+        "EventTarget": true,
+        "console": true
       }
     },
-    "gulp-livereload>event-stream>map-stream": {
-      "builtin": {
-        "stream.Stream": true
-      },
-      "globals": {
-        "process.nextTick": true
+    "stylelint>execall": {
+      "packages": {
+        "stylelint>execall>clone-regexp": true
       }
     },
-    "gulp-livereload>event-stream>pause-stream": {
+    "gulp>glob-watcher>anymatch>micromatch>extglob>expand-brackets": {
+      "globals": {
+        "__filename": true
+      },
       "packages": {
-        "debounce-stream>through": true
+        "gulp>glob-watcher>anymatch>micromatch>extglob>expand-brackets>debug": true,
+        "gulp>glob-watcher>anymatch>micromatch>extglob>expand-brackets>define-property": true,
+        "gulp>glob-watcher>anymatch>micromatch>extglob>expand-brackets>extend-shallow": true,
+        "gulp>gulp-cli>matchdep>micromatch>extglob>expand-brackets>posix-character-classes": true,
+        "gulp>gulp-cli>matchdep>micromatch>regex-not": true,
+        "gulp>gulp-cli>matchdep>micromatch>snapdragon": true,
+        "gulp>gulp-cli>matchdep>micromatch>to-regex": true
       }
     },
-    "gulp-livereload>event-stream>split": {
-      "builtin": {
-        "string_decoder.StringDecoder": true
-      },
+    "gulp-watch>anymatch>micromatch>expand-brackets": {
       "packages": {
-        "debounce-stream>through": true
+        "gulp-watch>anymatch>micromatch>expand-brackets>is-posix-bracket": true
       }
     },
-    "gulp-livereload>event-stream>stream-combiner": {
+    "gulp-watch>anymatch>micromatch>braces>expand-range": {
       "packages": {
-        "debounce-stream>duplexer": true
+        "gulp-watch>anymatch>micromatch>braces>expand-range>fill-range": true
       }
     },
-    "gulp-livereload>tiny-lr": {
-      "builtin": {
-        "events": true,
-        "fs": true,
-        "http": true,
-        "https": true,
-        "url.parse": true
-      },
+    "resolve-url-loader>es6-iterator>es6-symbol>ext": {
       "globals": {
-        "console.error": true
-      },
+        "__global__": true
+      }
+    },
+    "gulp>glob-watcher>anymatch>micromatch>braces>extend-shallow": {
       "packages": {
-        "@storybook/addon-knobs>qs": true,
-        "gulp-livereload>tiny-lr>body": true,
-        "gulp-livereload>tiny-lr>debug": true,
-        "gulp-livereload>tiny-lr>faye-websocket": true,
-        "react>object-assign": true
+        "gulp-watch>anymatch>micromatch>object.omit>is-extendable": true
       }
     },
-    "gulp-livereload>tiny-lr>body": {
-      "builtin": {
-        "querystring.parse": true
-      },
+    "gulp>glob-watcher>anymatch>micromatch>extglob>expand-brackets>extend-shallow": {
       "packages": {
-        "gulp-livereload>tiny-lr>body>continuable-cache": true,
-        "gulp-livereload>tiny-lr>body>error": true,
-        "gulp-livereload>tiny-lr>body>raw-body": true,
-        "gulp-livereload>tiny-lr>body>safe-json-parse": true
+        "gulp-watch>anymatch>micromatch>object.omit>is-extendable": true
       }
     },
-    "gulp-livereload>tiny-lr>body>error": {
-      "builtin": {
-        "assert": true
-      },
+    "gulp>glob-watcher>anymatch>micromatch>extglob>extend-shallow": {
       "packages": {
-        "gulp-livereload>tiny-lr>body>error>string-template": true,
-        "watchify>xtend": true
+        "gulp-watch>anymatch>micromatch>object.omit>is-extendable": true
       }
     },
-    "gulp-livereload>tiny-lr>body>raw-body": {
-      "globals": {
-        "Buffer.concat": true,
-        "process.nextTick": true
-      },
+    "gulp>glob-watcher>anymatch>micromatch>braces>fill-range>extend-shallow": {
       "packages": {
-        "gulp-livereload>tiny-lr>body>raw-body>bytes": true,
-        "gulp-livereload>tiny-lr>body>raw-body>string_decoder": true
+        "gulp-watch>anymatch>micromatch>object.omit>is-extendable": true
       }
     },
-    "gulp-livereload>tiny-lr>body>raw-body>string_decoder": {
-      "builtin": {
-        "buffer.Buffer": true
+    "gulp-zip>plugin-error>extend-shallow": {
+      "packages": {
+        "gulp-zip>plugin-error>extend-shallow>assign-symbols": true,
+        "gulp-zip>plugin-error>extend-shallow>is-extendable": true
       }
     },
-    "gulp-livereload>tiny-lr>debug": {
-      "builtin": {
-        "tty.isatty": true,
-        "util": true
-      },
+    "gulp>gulp-cli>matchdep>micromatch>snapdragon>base>cache-base>set-value>extend-shallow": {
+      "packages": {
+        "gulp-watch>anymatch>micromatch>object.omit>is-extendable": true
+      }
+    },
+    "gulp>gulp-cli>matchdep>micromatch>snapdragon>extend-shallow": {
+      "packages": {
+        "gulp-watch>anymatch>micromatch>object.omit>is-extendable": true
+      }
+    },
+    "gulp>glob-watcher>anymatch>micromatch>extglob": {
+      "packages": {
+        "gulp>gulp-cli>matchdep>micromatch>array-unique": true,
+        "gulp>glob-watcher>anymatch>micromatch>extglob>define-property": true,
+        "gulp>glob-watcher>anymatch>micromatch>extglob>expand-brackets": true,
+        "gulp>glob-watcher>anymatch>micromatch>extglob>extend-shallow": true,
+        "gulp>gulp-cli>matchdep>micromatch>fragment-cache": true,
+        "gulp>gulp-cli>matchdep>micromatch>regex-not": true,
+        "gulp>gulp-cli>matchdep>micromatch>snapdragon": true,
+        "gulp>gulp-cli>matchdep>micromatch>to-regex": true
+      }
+    },
+    "gulp-watch>anymatch>micromatch>extglob": {
+      "packages": {
+        "gulp-watch>anymatch>micromatch>is-extglob": true
+      }
+    },
+    "fancy-log": {
+      "builtin": {
+        "console.Console": true
+      },
+      "globals": {
+        "process.argv.indexOf": true,
+        "process.platform": true,
+        "process.stderr": true,
+        "process.stdout": true,
+        "process.version": true
+      },
+      "packages": {
+        "fancy-log>ansi-gray": true,
+        "fancy-log>color-support": true,
+        "fancy-log>parse-node-version": true,
+        "fancy-log>time-stamp": true
+      }
+    },
+    "gulp-watch>fancy-log": {
       "globals": {
         "console": true,
-        "document": true,
-        "localStorage": true,
-        "navigator": true,
-        "process": true
+        "process.argv.indexOf": true,
+        "process.stderr.write": true,
+        "process.stdout.write": true
       },
       "packages": {
-        "mocha>ms": true,
-        "mocha>supports-color": true
+        "fancy-log>ansi-gray": true,
+        "fancy-log>color-support": true,
+        "fancy-log>time-stamp": true
+      }
+    },
+    "fast-glob": {
+      "builtin": {
+        "fs.lstat": true,
+        "fs.lstatSync": true,
+        "fs.readdir": true,
+        "fs.readdirSync": true,
+        "fs.stat": true,
+        "fs.statSync": true,
+        "os.cpus": true,
+        "os.platform": true,
+        "path.basename": true,
+        "path.resolve": true,
+        "stream.PassThrough": true,
+        "stream.Readable": true
+      },
+      "globals": {
+        "process.cwd": true
+      },
+      "packages": {
+        "fast-glob>@nodelib/fs.stat": true,
+        "eslint>@nodelib/fs.walk": true,
+        "eslint>glob-parent": true,
+        "globby>merge2": true,
+        "fast-glob>micromatch": true
+      }
+    },
+    "eslint>@nodelib/fs.walk>fastq": {
+      "packages": {
+        "eslint>@nodelib/fs.walk>fastq>reusify": true
       }
     },
     "gulp-livereload>tiny-lr>faye-websocket": {
@@ -3583,429 +3095,588 @@
         "webpack-dev-server>sockjs>websocket-driver": true
       }
     },
-    "gulp-postcss": {
+    "eslint>file-entry-cache": {
       "builtin": {
-        "path.dirname": true,
-        "path.isAbsolute": true,
-        "path.join": true,
-        "stream.Transform": true
-      },
-      "globals": {
-        "Buffer.from": true,
-        "setImmediate": true
+        "crypto.createHash": true,
+        "fs.readFileSync": true,
+        "fs.statSync": true,
+        "path.basename": true,
+        "path.dirname": true
       },
       "packages": {
-        "fancy-log": true,
-        "gulp-postcss>postcss-load-config": true,
-        "gulp-zip>plugin-error": true,
-        "postcss": true,
-        "vinyl-sourcemaps-apply": true
+        "eslint>file-entry-cache>flat-cache": true
       }
     },
-    "gulp-postcss>postcss-load-config": {
+    "stylelint>file-entry-cache": {
       "builtin": {
-        "module.createRequire": true,
-        "module.createRequireFromPath": true,
-        "path.resolve": true
+        "crypto.createHash": true,
+        "fs.readFileSync": true,
+        "fs.statSync": true,
+        "path.basename": true,
+        "path.dirname": true
       },
-      "globals": {
-        "process.cwd": true,
-        "process.env.NODE_ENV": true
+      "packages": {
+        "stylelint>file-entry-cache>flat-cache": true
+      }
+    },
+    "chokidar>braces>fill-range": {
+      "builtin": {
+        "util.inspect": true
       },
       "packages": {
-        "gulp-postcss>postcss-load-config>lilconfig": true,
-        "gulp-postcss>postcss-load-config>yaml": true,
-        "ts-node": true
+        "chokidar>braces>fill-range>to-regex-range": true
       }
     },
-    "gulp-postcss>postcss-load-config>lilconfig": {
+    "gulp>glob-watcher>anymatch>micromatch>braces>fill-range": {
       "builtin": {
-        "fs.accessSync": true,
-        "fs.promises.access": true,
-        "fs.promises.readFile": true,
-        "fs.readFileSync": true,
-        "os.homedir": true,
-        "path.extname": true,
-        "path.join": true,
-        "path.parse": true,
-        "path.resolve": true,
-        "path.sep": true
+        "util.inspect": true
       },
-      "globals": {
-        "process.cwd": true
+      "packages": {
+        "gulp>glob-watcher>anymatch>micromatch>braces>fill-range>extend-shallow": true,
+        "gulp>glob-watcher>anymatch>micromatch>braces>fill-range>is-number": true,
+        "stylelint>@stylelint/postcss-markdown>remark>remark-parse>repeat-string": true,
+        "gulp>glob-watcher>anymatch>micromatch>braces>fill-range>to-regex-range": true
       }
     },
-    "gulp-postcss>postcss-load-config>yaml": {
-      "globals": {
-        "Buffer": true,
-        "YAML_SILENCE_DEPRECATION_WARNINGS": true,
-        "YAML_SILENCE_WARNINGS": true,
-        "atob": true,
-        "btoa": true,
-        "console.warn": true,
-        "process": true
+    "gulp-watch>anymatch>micromatch>braces>expand-range>fill-range": {
+      "packages": {
+        "gulp-watch>anymatch>micromatch>braces>expand-range>fill-range>is-number": true,
+        "gulp-watch>anymatch>micromatch>braces>expand-range>fill-range>isobject": true,
+        "gulp-watch>anymatch>micromatch>braces>expand-range>fill-range>randomatic": true,
+        "gulp-watch>anymatch>micromatch>braces>repeat-element": true,
+        "stylelint>@stylelint/postcss-markdown>remark>remark-parse>repeat-string": true
       }
     },
-    "gulp-sass": {
+    "eslint-plugin-import>eslint-module-utils>find-up": {
       "builtin": {
-        "path.basename": true,
         "path.dirname": true,
-        "path.extname": true,
         "path.join": true,
-        "path.relative": true,
-        "stream.Transform": true
-      },
-      "globals": {
-        "process.cwd": true,
-        "process.exit": true,
-        "process.stderr.write": true
+        "path.parse": true,
+        "path.resolve": true
       },
       "packages": {
-        "eslint>strip-ansi": true,
-        "gulp-sass>lodash.clonedeep": true,
-        "gulp-sass>replace-ext": true,
-        "gulp-zip>plugin-error": true,
-        "postcss>picocolors": true,
-        "vinyl-sourcemaps-apply": true
+        "eslint-plugin-import>eslint-module-utils>find-up>locate-path": true
       }
     },
-    "gulp-sass>replace-ext": {
+    "mocha>find-up": {
       "builtin": {
-        "path.basename": true,
         "path.dirname": true,
-        "path.extname": true,
-        "path.join": true,
-        "path.sep": true
-      }
-    },
-    "gulp-sort": {
+        "path.parse": true,
+        "path.resolve": true
+      },
       "packages": {
-        "gulp-sort>through2": true
+        "mocha>find-up>locate-path": true,
+        "nyc>find-up>path-exists": true
       }
     },
-    "gulp-sort>through2": {
+    "gulp-watch>vinyl-file>strip-bom-stream>first-chunk-stream": {
       "builtin": {
         "util.inherits": true
       },
       "globals": {
-        "process.nextTick": true
+        "Buffer.concat": true,
+        "setImmediate": true
       },
       "packages": {
-        "gulp-sort>through2>readable-stream": true,
-        "watchify>xtend": true
+        "gulp-watch>vinyl-file>strip-bom-stream>first-chunk-stream>readable-stream": true
       }
     },
-    "gulp-sort>through2>readable-stream": {
+    "eslint>file-entry-cache>flat-cache": {
       "builtin": {
-        "events.EventEmitter": true,
-        "stream": true,
-        "util": true
+        "fs.existsSync": true,
+        "fs.mkdirSync": true,
+        "fs.readFileSync": true,
+        "fs.writeFileSync": true,
+        "path.basename": true,
+        "path.dirname": true,
+        "path.resolve": true
       },
       "globals": {
-        "process.browser": true,
-        "process.env.READABLE_STREAM": true,
-        "process.stderr": true,
-        "process.stdout": true,
-        "process.version.slice": true,
-        "setImmediate": true
+        "__dirname": true
       },
       "packages": {
-        "gulp-sort>through2>readable-stream>isarray": true,
-        "gulp-sort>through2>readable-stream>safe-buffer": true,
-        "gulp-sort>through2>readable-stream>string_decoder": true,
-        "pumpify>inherits": true,
-        "readable-stream-2>core-util-is": true,
-        "readable-stream-2>process-nextick-args": true,
-        "readable-stream>util-deprecate": true
-      }
-    },
-    "gulp-sort>through2>readable-stream>safe-buffer": {
-      "builtin": {
-        "buffer": true
-      }
-    },
-    "gulp-sort>through2>readable-stream>string_decoder": {
-      "packages": {
-        "gulp-sort>through2>readable-stream>safe-buffer": true
+        "eslint>file-entry-cache>flat-cache>flatted": true,
+        "del>rimraf": true
       }
     },
-    "gulp-sourcemaps": {
+    "stylelint>file-entry-cache>flat-cache": {
       "builtin": {
+        "fs.existsSync": true,
+        "fs.readFileSync": true,
+        "path.basename": true,
         "path.dirname": true,
-        "path.extname": true,
-        "path.join": true,
-        "path.relative": true,
-        "path.resolve": true,
-        "path.sep": true
+        "path.resolve": true
       },
       "globals": {
-        "Buffer.concat": true,
-        "Buffer.from": true
+        "__dirname": true
       },
       "packages": {
-        "del>graceful-fs": true,
-        "gulp-sourcemaps>@gulp-sourcemaps/identity-map": true,
-        "gulp-sourcemaps>@gulp-sourcemaps/map-sources": true,
-        "gulp-sourcemaps>acorn": true,
-        "gulp-sourcemaps>css": true,
-        "gulp-sourcemaps>debug-fabulous": true,
-        "gulp-sourcemaps>detect-newline": true,
-        "gulp-sourcemaps>source-map": true,
-        "gulp-sourcemaps>strip-bom-string": true,
-        "gulp-sourcemaps>through2": true,
-        "nyc>convert-source-map": true
+        "stylelint>file-entry-cache>flat-cache>flatted": true,
+        "stylelint>file-entry-cache>flat-cache>rimraf": true,
+        "stylelint>file-entry-cache>flat-cache>write": true
       }
     },
-    "gulp-sourcemaps>@gulp-sourcemaps/identity-map": {
+    "gulp>vinyl-fs>lead>flush-write-stream": {
+      "globals": {
+        "Buffer": true
+      },
       "packages": {
-        "gulp-sourcemaps>@gulp-sourcemaps/identity-map>acorn": true,
-        "gulp-sourcemaps>@gulp-sourcemaps/identity-map>normalize-path": true,
-        "gulp-sourcemaps>@gulp-sourcemaps/identity-map>postcss": true,
-        "gulp-sourcemaps>@gulp-sourcemaps/identity-map>source-map": true,
-        "gulp-sourcemaps>@gulp-sourcemaps/identity-map>through2": true
+        "pumpify>inherits": true,
+        "gulp>vinyl-fs>lead>flush-write-stream>readable-stream": true
       }
     },
-    "gulp-sourcemaps>@gulp-sourcemaps/identity-map>acorn": {
+    "lavamoat>lavamoat-core>merge-deep>clone-deep>for-own": {
+      "packages": {
+        "gulp>undertaker>object.reduce>for-own>for-in": true
+      }
+    },
+    "gulp-watch>anymatch>micromatch>object.omit>for-own": {
+      "packages": {
+        "gulp>undertaker>object.reduce>for-own>for-in": true
+      }
+    },
+    "gulp>undertaker>object.reduce>for-own": {
+      "packages": {
+        "gulp>undertaker>object.reduce>for-own>for-in": true
+      }
+    },
+    "gulp>gulp-cli>matchdep>micromatch>fragment-cache": {
+      "packages": {
+        "gulp>gulp-cli>liftoff>fined>parse-filepath>map-cache": true
+      }
+    },
+    "gulp-livereload>event-stream>from": {
+      "builtin": {
+        "stream": true
+      },
       "globals": {
-        "define": true
+        "process.nextTick": true
       }
     },
-    "gulp-sourcemaps>@gulp-sourcemaps/identity-map>postcss": {
+    "fs-extra": {
       "builtin": {
+        "assert": true,
         "fs": true,
-        "path": true
+        "os.tmpdir": true,
+        "path.dirname": true,
+        "path.isAbsolute": true,
+        "path.join": true,
+        "path.normalize": true,
+        "path.parse": true,
+        "path.relative": true,
+        "path.resolve": true,
+        "path.sep": true
       },
       "globals": {
         "Buffer": true,
-        "atob": true,
-        "btoa": true,
-        "console": true,
-        "process.env.NODE_ENV": true
+        "console.warn": true,
+        "process.arch": true,
+        "process.cwd": true,
+        "process.platform": true,
+        "process.umask": true,
+        "process.versions.node.split": true,
+        "setTimeout": true
       },
       "packages": {
-        "gulp-sourcemaps>@gulp-sourcemaps/identity-map>postcss>picocolors": true,
-        "gulp-sourcemaps>@gulp-sourcemaps/identity-map>source-map": true
+        "del>graceful-fs": true,
+        "fs-extra>jsonfile": true,
+        "fs-extra>universalify": true
       }
     },
-    "gulp-sourcemaps>@gulp-sourcemaps/identity-map>postcss>picocolors": {
+    "gulp>vinyl-fs>fs-mkdirp-stream": {
       "builtin": {
-        "tty.isatty": true
+        "path.dirname": true,
+        "path.resolve": true
       },
       "globals": {
-        "process.argv.includes": true,
-        "process.env": true,
-        "process.platform": true
+        "process.umask": true
+      },
+      "packages": {
+        "del>graceful-fs": true,
+        "gulp>vinyl-fs>fs-mkdirp-stream>through2": true
       }
     },
-    "gulp-sourcemaps>@gulp-sourcemaps/identity-map>through2": {
+    "nyc>glob>fs.realpath": {
       "builtin": {
-        "util.inherits": true
+        "fs.lstat": true,
+        "fs.lstatSync": true,
+        "fs.readlink": true,
+        "fs.readlinkSync": true,
+        "fs.realpath": true,
+        "fs.realpathSync": true,
+        "fs.stat": true,
+        "fs.statSync": true,
+        "path.normalize": true,
+        "path.resolve": true
       },
       "globals": {
-        "process.nextTick": true
-      },
-      "packages": {
-        "readable-stream": true
+        "console.error": true,
+        "console.trace": true,
+        "process.env.NODE_DEBUG": true,
+        "process.nextTick": true,
+        "process.noDeprecation": true,
+        "process.platform": true,
+        "process.throwDeprecation": true,
+        "process.traceDeprecation": true,
+        "process.version": true
       }
     },
-    "gulp-sourcemaps>@gulp-sourcemaps/map-sources": {
-      "packages": {
-        "gulp-sourcemaps>@gulp-sourcemaps/map-sources>through2": true,
-        "gulp-watch>anymatch>normalize-path": true
-      }
+    "chokidar>fsevents": {
+      "globals": {
+        "console.assert": true,
+        "process.platform": true
+      },
+      "native": true
     },
-    "gulp-sourcemaps>@gulp-sourcemaps/map-sources>through2": {
+    "gulp>glob-watcher>chokidar>fsevents": {
       "builtin": {
+        "events.EventEmitter": true,
+        "fs.stat": true,
+        "path.join": true,
         "util.inherits": true
       },
       "globals": {
-        "process.nextTick": true
+        "__dirname": true,
+        "console.assert": true,
+        "process.nextTick": true,
+        "process.platform": true,
+        "setImmediate": true
       },
       "packages": {
-        "gulp-sourcemaps>@gulp-sourcemaps/map-sources>through2>readable-stream": true,
-        "watchify>xtend": true
+        "gulp-watch>chokidar>fsevents>node-pre-gyp": true
       }
     },
-    "gulp-sourcemaps>@gulp-sourcemaps/map-sources>through2>readable-stream": {
+    "gulp-watch>chokidar>fsevents": {
       "builtin": {
         "events.EventEmitter": true,
-        "stream": true,
-        "util": true
+        "fs.stat": true,
+        "path.join": true,
+        "util.inherits": true
       },
       "globals": {
-        "process.browser": true,
-        "process.env.READABLE_STREAM": true,
-        "process.stderr": true,
-        "process.stdout": true,
-        "process.version.slice": true,
+        "__dirname": true,
+        "console.assert": true,
+        "process.nextTick": true,
+        "process.platform": true,
         "setImmediate": true
       },
       "packages": {
-        "gulp-sourcemaps>@gulp-sourcemaps/map-sources>through2>readable-stream>isarray": true,
-        "gulp-sourcemaps>@gulp-sourcemaps/map-sources>through2>readable-stream>safe-buffer": true,
-        "gulp-sourcemaps>@gulp-sourcemaps/map-sources>through2>readable-stream>string_decoder": true,
-        "pumpify>inherits": true,
-        "readable-stream-2>core-util-is": true,
-        "readable-stream-2>process-nextick-args": true,
-        "readable-stream>util-deprecate": true
+        "gulp-watch>chokidar>fsevents>node-pre-gyp": true
       }
     },
-    "gulp-sourcemaps>@gulp-sourcemaps/map-sources>through2>readable-stream>safe-buffer": {
+    "@lavamoat/allow-scripts>@npmcli/run-script>node-gyp>npmlog>gauge": {
       "builtin": {
-        "buffer": true
-      }
-    },
-    "gulp-sourcemaps>@gulp-sourcemaps/map-sources>through2>readable-stream>string_decoder": {
+        "util.format": true
+      },
+      "globals": {
+        "clearInterval": true,
+        "process": true,
+        "setImmediate": true,
+        "setInterval": true
+      },
       "packages": {
-        "gulp-sourcemaps>@gulp-sourcemaps/map-sources>through2>readable-stream>safe-buffer": true
+        "@lavamoat/allow-scripts>@npmcli/run-script>node-gyp>npmlog>gauge>aproba": true,
+        "@storybook/react>@storybook/node-logger>npmlog>console-control-strings": true,
+        "@storybook/react>@storybook/node-logger>npmlog>gauge>has-unicode": true,
+        "react>object-assign": true,
+        "nyc>signal-exit": true,
+        "@lavamoat/allow-scripts>@npmcli/run-script>node-gyp>npmlog>gauge>string-width": true,
+        "@lavamoat/allow-scripts>@npmcli/run-script>node-gyp>npmlog>gauge>strip-ansi": true,
+        "@storybook/react>@storybook/node-logger>npmlog>gauge>wide-align": true
       }
     },
-    "gulp-sourcemaps>acorn": {
-      "globals": {
-        "define": true
+    "browserify>insert-module-globals>undeclared-identifiers>get-assigned-identifiers": {
+      "builtin": {
+        "assert.equal": true
       }
     },
-    "gulp-sourcemaps>css": {
-      "builtin": {
-        "fs.readFileSync": true,
-        "path.dirname": true,
-        "path.sep": true
+    "string.prototype.matchall>get-intrinsic": {
+      "globals": {
+        "AggregateError": true,
+        "FinalizationRegistry": true,
+        "WeakRef": true
       },
       "packages": {
-        "gulp-sourcemaps>css>source-map": true,
-        "gulp-sourcemaps>css>source-map-resolve": true,
-        "pumpify>inherits": true
+        "string.prototype.matchall>call-bind>es-errors": true,
+        "browserify>has>function-bind": true,
+        "string.prototype.matchall>es-abstract>has-proto": true,
+        "string.prototype.matchall>has-symbols": true,
+        "depcheck>is-core-module>hasown": true
       }
     },
-    "gulp-sourcemaps>css>source-map-resolve": {
+    "gulp-zip>get-stream": {
       "builtin": {
-        "path.sep": true,
-        "url.resolve": true
+        "buffer.constants.MAX_LENGTH": true,
+        "stream.PassThrough": true
       },
       "globals": {
-        "TextDecoder": true,
-        "setImmediate": true
+        "Buffer.concat": true
       },
       "packages": {
-        "gulp-sourcemaps>css>source-map-resolve>atob": true,
-        "gulp-sourcemaps>css>source-map-resolve>decode-uri-component": true
+        "pumpify>pump": true
       }
     },
-    "gulp-sourcemaps>css>source-map-resolve>atob": {
-      "globals": {
-        "Buffer.from": true
+    "gulp-watch>anymatch>micromatch>parse-glob>glob-base": {
+      "builtin": {
+        "path.dirname": true
+      },
+      "packages": {
+        "eslint>glob-parent": true,
+        "gulp-watch>anymatch>micromatch>parse-glob>glob-base>is-glob": true
       }
     },
-    "gulp-sourcemaps>debug-fabulous": {
+    "eslint>glob-parent": {
+      "builtin": {
+        "os.platform": true,
+        "path.posix.dirname": true
+      },
       "packages": {
-        "gulp-sourcemaps>debug-fabulous>debug": true,
-        "gulp-sourcemaps>debug-fabulous>memoizee": true,
-        "react>object-assign": true
+        "del>is-glob": true
       }
     },
-    "gulp-sourcemaps>debug-fabulous>debug": {
+    "gulp>vinyl-fs>glob-stream": {
       "builtin": {
-        "tty.isatty": true,
-        "util": true
+        "util.inherits": true
       },
       "globals": {
-        "console": true,
-        "document": true,
-        "localStorage": true,
-        "navigator": true,
-        "process": true
+        "process.cwd": true,
+        "process.nextTick": true
       },
       "packages": {
-        "mocha>ms": true,
-        "mocha>supports-color": true
+        "react-markdown>unified>extend": true,
+        "eslint>glob-parent": true,
+        "nyc>glob": true,
+        "gulp>glob-watcher>is-negated-glob": true,
+        "gulp>vinyl-fs>glob-stream>ordered-read-streams": true,
+        "gulp>vinyl-fs>glob-stream>pumpify": true,
+        "gulp>vinyl-fs>glob-stream>readable-stream": true,
+        "vinyl>remove-trailing-separator": true,
+        "gulp>vinyl-fs>glob-stream>to-absolute-glob": true,
+        "gulp>vinyl-fs>glob-stream>unique-stream": true
       }
     },
-    "gulp-sourcemaps>debug-fabulous>memoizee": {
+    "gulp>glob-watcher": {
+      "packages": {
+        "gulp>glob-watcher>anymatch": true,
+        "gulp>glob-watcher>async-done": true,
+        "chokidar": true,
+        "gulp>glob-watcher>is-negated-glob": true,
+        "gulp>glob-watcher>just-debounce": true,
+        "gulp>undertaker>object.defaults": true
+      }
+    },
+    "nyc>glob": {
+      "builtin": {
+        "assert": true,
+        "events.EventEmitter": true,
+        "fs": true,
+        "path.join": true,
+        "path.resolve": true,
+        "util": true
+      },
       "globals": {
-        "clearTimeout": true,
-        "setTimeout": true
+        "console.error": true,
+        "process.cwd": true,
+        "process.nextTick": true,
+        "process.platform": true
       },
       "packages": {
-        "gulp-sourcemaps>debug-fabulous>memoizee>event-emitter": true,
-        "gulp-sourcemaps>debug-fabulous>memoizee>is-promise": true,
-        "gulp-sourcemaps>debug-fabulous>memoizee>lru-queue": true,
-        "gulp-sourcemaps>debug-fabulous>memoizee>next-tick": true,
-        "gulp-sourcemaps>debug-fabulous>memoizee>timers-ext": true,
-        "resolve-url-loader>es6-iterator>d": true,
-        "resolve-url-loader>es6-iterator>es5-ext": true
+        "nyc>glob>fs.realpath": true,
+        "nyc>glob>inflight": true,
+        "pumpify>inherits": true,
+        "eslint>minimatch": true,
+        "@metamask/object-multiplex>once": true,
+        "gulp-watch>path-is-absolute": true
       }
     },
-    "gulp-sourcemaps>debug-fabulous>memoizee>event-emitter": {
+    "stylelint>global-modules": {
+      "builtin": {
+        "path.resolve": true
+      },
+      "globals": {
+        "process.env.OSTYPE": true,
+        "process.platform": true
+      },
       "packages": {
-        "resolve-url-loader>es6-iterator>d": true,
-        "resolve-url-loader>es6-iterator>es5-ext": true
+        "stylelint>global-modules>global-prefix": true
       }
     },
-    "gulp-sourcemaps>debug-fabulous>memoizee>lru-queue": {
+    "stylelint>global-modules>global-prefix": {
+      "builtin": {
+        "fs.readFileSync": true,
+        "fs.realpathSync": true,
+        "os.homedir": true,
+        "path.dirname": true,
+        "path.join": true,
+        "path.resolve": true
+      },
+      "globals": {
+        "process.env.APPDATA": true,
+        "process.env.DESTDIR": true,
+        "process.env.OSTYPE": true,
+        "process.env.PREFIX": true,
+        "process.execPath": true,
+        "process.platform": true
+      },
       "packages": {
-        "resolve-url-loader>es6-iterator>es5-ext": true
+        "stylelint>global-modules>global-prefix>ini": true,
+        "stylelint>global-modules>global-prefix>which": true
       }
     },
-    "gulp-sourcemaps>debug-fabulous>memoizee>next-tick": {
+    "globby": {
+      "builtin": {
+        "fs.Stats": true,
+        "fs.readFile": true,
+        "fs.readFileSync": true,
+        "fs.statSync": true,
+        "path.dirname": true,
+        "path.isAbsolute": true,
+        "path.join": true,
+        "path.posix.join": true,
+        "path.relative": true,
+        "stream.Transform": true,
+        "util.promisify": true
+      },
       "globals": {
-        "MutationObserver": true,
-        "WebKitMutationObserver": true,
-        "document": true,
-        "process": true,
-        "queueMicrotask": true,
-        "setImmediate": true,
-        "setTimeout": true
+        "process.cwd": true
+      },
+      "packages": {
+        "globby>array-union": true,
+        "globby>dir-glob": true,
+        "fast-glob": true,
+        "eslint>ignore": true,
+        "globby>merge2": true,
+        "del>slash": true
       }
     },
-    "gulp-sourcemaps>debug-fabulous>memoizee>timers-ext": {
+    "stylelint>globjoin": {
+      "builtin": {
+        "path.join": true
+      }
+    },
+    "stylelint>postcss-sass>gonzales-pe": {
+      "globals": {
+        "console.error": true,
+        "define": true
+      }
+    },
+    "string.prototype.matchall>es-abstract>gopd": {
       "packages": {
-        "resolve-url-loader>es6-iterator>es5-ext": true
+        "string.prototype.matchall>get-intrinsic": true
       }
     },
-    "gulp-sourcemaps>through2": {
+    "del>graceful-fs": {
       "builtin": {
-        "util.inherits": true
+        "assert.equal": true,
+        "constants.O_SYMLINK": true,
+        "constants.O_WRONLY": true,
+        "constants.hasOwnProperty": true,
+        "fs": true,
+        "stream.Stream.call": true,
+        "util": true
       },
       "globals": {
-        "process.nextTick": true
+        "clearTimeout": true,
+        "console.error": true,
+        "process": true,
+        "setTimeout": true
+      }
+    },
+    "gulp": {
+      "builtin": {
+        "util.inherits": true
       },
       "packages": {
-        "gulp-sourcemaps>through2>readable-stream": true,
-        "watchify>xtend": true
+        "gulp>glob-watcher": true,
+        "gulp>undertaker": true,
+        "gulp>vinyl-fs": true
       }
     },
-    "gulp-sourcemaps>through2>readable-stream": {
+    "gulp-livereload": {
       "builtin": {
-        "events.EventEmitter": true,
-        "stream": true,
-        "util": true
+        "path.relative": true
+      },
+      "packages": {
+        "gulp-livereload>chalk": true,
+        "gulp-livereload>debug": true,
+        "gulp-livereload>event-stream": true,
+        "fancy-log": true,
+        "gulp-livereload>lodash.assign": true,
+        "gulp-livereload>tiny-lr": true
+      }
+    },
+    "gulp-postcss": {
+      "builtin": {
+        "path.dirname": true,
+        "path.isAbsolute": true,
+        "path.join": true,
+        "stream.Transform": true
       },
       "globals": {
-        "process.browser": true,
-        "process.env.READABLE_STREAM": true,
-        "process.stderr": true,
-        "process.stdout": true,
-        "process.version.slice": true,
+        "Buffer.from": true,
         "setImmediate": true
       },
       "packages": {
-        "gulp-sourcemaps>through2>readable-stream>isarray": true,
-        "gulp-sourcemaps>through2>readable-stream>safe-buffer": true,
-        "gulp-sourcemaps>through2>readable-stream>string_decoder": true,
-        "pumpify>inherits": true,
-        "readable-stream-2>core-util-is": true,
-        "readable-stream-2>process-nextick-args": true,
-        "readable-stream>util-deprecate": true
+        "fancy-log": true,
+        "gulp-zip>plugin-error": true,
+        "postcss": true,
+        "gulp-postcss>postcss-load-config": true,
+        "vinyl-sourcemaps-apply": true
       }
     },
-    "gulp-sourcemaps>through2>readable-stream>safe-buffer": {
+    "gulp-sass": {
       "builtin": {
-        "buffer": true
+        "path.basename": true,
+        "path.dirname": true,
+        "path.extname": true,
+        "path.join": true,
+        "path.relative": true,
+        "stream.Transform": true
+      },
+      "globals": {
+        "process.cwd": true,
+        "process.exit": true,
+        "process.stderr.write": true
+      },
+      "packages": {
+        "gulp-sass>lodash.clonedeep": true,
+        "postcss>picocolors": true,
+        "gulp-zip>plugin-error": true,
+        "gulp-sass>replace-ext": true,
+        "eslint>strip-ansi": true,
+        "vinyl-sourcemaps-apply": true
       }
     },
-    "gulp-sourcemaps>through2>readable-stream>string_decoder": {
+    "gulp-sort": {
       "packages": {
-        "gulp-sourcemaps>through2>readable-stream>safe-buffer": true
+        "gulp-sort>through2": true
+      }
+    },
+    "gulp-sourcemaps": {
+      "builtin": {
+        "path.dirname": true,
+        "path.extname": true,
+        "path.join": true,
+        "path.relative": true,
+        "path.resolve": true,
+        "path.sep": true
+      },
+      "globals": {
+        "Buffer.concat": true,
+        "Buffer.from": true
+      },
+      "packages": {
+        "gulp-sourcemaps>@gulp-sourcemaps/identity-map": true,
+        "gulp-sourcemaps>@gulp-sourcemaps/map-sources": true,
+        "gulp-sourcemaps>acorn": true,
+        "nyc>convert-source-map": true,
+        "gulp-sourcemaps>css": true,
+        "gulp-sourcemaps>debug-fabulous": true,
+        "gulp-sourcemaps>detect-newline": true,
+        "del>graceful-fs": true,
+        "gulp-sourcemaps>source-map": true,
+        "gulp-sourcemaps>strip-bom-string": true,
+        "gulp-sourcemaps>through2": true
       }
     },
     "gulp-stylelint": {
@@ -4021,23 +3692,12 @@
         "process.nextTick": true
       },
       "packages": {
-        "eslint>strip-ansi": true,
         "fancy-log": true,
-        "gulp-stylelint>through2": true,
         "gulp-zip>plugin-error": true,
         "source-map": true,
-        "stylelint": true
-      }
-    },
-    "gulp-stylelint>through2": {
-      "builtin": {
-        "util.inherits": true
-      },
-      "globals": {
-        "process.nextTick": true
-      },
-      "packages": {
-        "readable-stream": true
+        "eslint>strip-ansi": true,
+        "stylelint": true,
+        "gulp-stylelint>through2": true
       }
     },
     "gulp-watch": {
@@ -4054,835 +3714,497 @@
         "setTimeout": true
       },
       "packages": {
-        "chokidar": true,
-        "eslint>glob-parent": true,
         "gulp-watch>ansi-colors": true,
         "gulp-watch>anymatch": true,
+        "chokidar": true,
         "gulp-watch>fancy-log": true,
+        "eslint>glob-parent": true,
+        "react>object-assign": true,
         "gulp-watch>path-is-absolute": true,
+        "gulp-zip>plugin-error": true,
         "gulp-watch>readable-stream": true,
         "gulp-watch>slash": true,
-        "gulp-watch>vinyl-file": true,
-        "gulp-zip>plugin-error": true,
-        "react>object-assign": true,
-        "vinyl": true
-      }
-    },
-    "gulp-watch>ansi-colors": {
-      "packages": {
-        "fancy-log>ansi-gray>ansi-wrap": true
+        "vinyl": true,
+        "gulp-watch>vinyl-file": true
       }
     },
-    "gulp-watch>anymatch": {
+    "gulp-zip": {
       "builtin": {
-        "path.sep": true
+        "buffer.constants.MAX_LENGTH": true,
+        "path.join": true
       },
       "packages": {
-        "gulp-watch>anymatch>micromatch": true,
-        "gulp-watch>anymatch>normalize-path": true
+        "gulp-zip>get-stream": true,
+        "gulp-zip>plugin-error": true,
+        "gulp-zip>through2": true,
+        "vinyl": true,
+        "gulp-zip>yazl": true
       }
     },
-    "gulp-watch>anymatch>micromatch": {
-      "builtin": {
-        "path.sep": true
-      },
-      "globals": {
-        "process": true
-      },
+    "prettier-eslint>loglevel-colored-level-prefix>chalk>has-ansi": {
       "packages": {
-        "gulp-watch>anymatch>micromatch>arr-diff": true,
-        "gulp-watch>anymatch>micromatch>array-unique": true,
-        "gulp-watch>anymatch>micromatch>braces": true,
-        "gulp-watch>anymatch>micromatch>expand-brackets": true,
-        "gulp-watch>anymatch>micromatch>extglob": true,
-        "gulp-watch>anymatch>micromatch>filename-regex": true,
-        "gulp-watch>anymatch>micromatch>is-extglob": true,
-        "gulp-watch>anymatch>micromatch>is-glob": true,
-        "gulp-watch>anymatch>micromatch>kind-of": true,
-        "gulp-watch>anymatch>micromatch>object.omit": true,
-        "gulp-watch>anymatch>micromatch>parse-glob": true,
-        "gulp-watch>anymatch>micromatch>regex-cache": true,
-        "gulp-watch>anymatch>normalize-path": true
+        "prettier-eslint>loglevel-colored-level-prefix>chalk>has-ansi>ansi-regex": true
       }
     },
-    "gulp-watch>anymatch>micromatch>arr-diff": {
-      "packages": {
-        "gulp>undertaker>arr-flatten": true
+    "chalk>supports-color>has-flag": {
+      "globals": {
+        "process.argv": true
       }
     },
-    "gulp-watch>anymatch>micromatch>braces": {
-      "packages": {
-        "gulp-watch>anymatch>micromatch>braces>expand-range": true,
-        "gulp-watch>anymatch>micromatch>braces>preserve": true,
-        "gulp-watch>anymatch>micromatch>braces>repeat-element": true
+    "gulp-livereload>chalk>supports-color>has-flag": {
+      "globals": {
+        "process.argv": true
       }
     },
-    "gulp-watch>anymatch>micromatch>braces>expand-range": {
-      "packages": {
-        "gulp-watch>anymatch>micromatch>braces>expand-range>fill-range": true
+    "postcss-discard-font-face>postcss>supports-color>has-flag": {
+      "globals": {
+        "process.argv": true
       }
     },
-    "gulp-watch>anymatch>micromatch>braces>expand-range>fill-range": {
+    "string.prototype.matchall>es-abstract>has-property-descriptors": {
       "packages": {
-        "gulp-watch>anymatch>micromatch>braces>expand-range>fill-range>is-number": true,
-        "gulp-watch>anymatch>micromatch>braces>expand-range>fill-range>isobject": true,
-        "gulp-watch>anymatch>micromatch>braces>expand-range>fill-range>randomatic": true,
-        "gulp-watch>anymatch>micromatch>braces>repeat-element": true,
-        "stylelint>@stylelint/postcss-markdown>remark>remark-parse>repeat-string": true
+        "string.prototype.matchall>call-bind>es-define-property": true
       }
     },
-    "gulp-watch>anymatch>micromatch>braces>expand-range>fill-range>is-number": {
+    "koa>is-generator-function>has-tostringtag": {
       "packages": {
-        "gulp-watch>anymatch>micromatch>braces>expand-range>fill-range>is-number>kind-of": true
+        "string.prototype.matchall>has-symbols": true
       }
     },
-    "gulp-watch>anymatch>micromatch>braces>expand-range>fill-range>is-number>kind-of": {
-      "packages": {
-        "browserify>insert-module-globals>is-buffer": true
+    "@storybook/react>@storybook/node-logger>npmlog>gauge>has-unicode": {
+      "builtin": {
+        "os.type": true
+      },
+      "globals": {
+        "process.env.LANG": true,
+        "process.env.LC_ALL": true,
+        "process.env.LC_CTYPE": true
       }
     },
-    "gulp-watch>anymatch>micromatch>braces>expand-range>fill-range>isobject": {
+    "gulp>gulp-cli>matchdep>micromatch>snapdragon>base>cache-base>has-value": {
       "packages": {
-        "gulp-watch>anymatch>micromatch>braces>expand-range>fill-range>isobject>isarray": true
+        "gulp>gulp-cli>array-sort>get-value": true,
+        "gulp>gulp-cli>matchdep>micromatch>snapdragon>base>cache-base>has-value>has-values": true,
+        "gulp>gulp-cli>isobject": true
       }
     },
-    "gulp-watch>anymatch>micromatch>braces>expand-range>fill-range>randomatic": {
+    "gulp>gulp-cli>matchdep>micromatch>snapdragon>base>cache-base>unset-value>has-value": {
       "packages": {
-        "@babel/register>clone-deep>kind-of": true,
-        "gulp-watch>anymatch>micromatch>braces>expand-range>fill-range>randomatic>math-random": true,
-        "gulp>undertaker>bach>array-last>is-number": true
-      }
-    },
-    "gulp-watch>anymatch>micromatch>braces>expand-range>fill-range>randomatic>math-random": {
-      "builtin": {
-        "crypto.randomBytes": true
+        "gulp>gulp-cli>array-sort>get-value": true,
+        "gulp>gulp-cli>matchdep>micromatch>snapdragon>base>cache-base>unset-value>has-value>has-values": true,
+        "gulp>gulp-cli>matchdep>micromatch>snapdragon>base>cache-base>unset-value>has-value>isobject": true
       }
     },
-    "gulp-watch>anymatch>micromatch>expand-brackets": {
+    "gulp>gulp-cli>matchdep>micromatch>snapdragon>base>cache-base>has-value>has-values": {
       "packages": {
-        "gulp-watch>anymatch>micromatch>expand-brackets>is-posix-bracket": true
+        "gulp>gulp-cli>matchdep>micromatch>snapdragon>base>cache-base>has-value>has-values>is-number": true,
+        "gulp>gulp-cli>matchdep>micromatch>snapdragon>base>cache-base>has-value>has-values>kind-of": true
       }
     },
-    "gulp-watch>anymatch>micromatch>extglob": {
+    "browserify>has": {
       "packages": {
-        "gulp-watch>anymatch>micromatch>is-extglob": true
+        "browserify>has>function-bind": true
       }
     },
-    "gulp-watch>anymatch>micromatch>is-glob": {
+    "depcheck>is-core-module>hasown": {
       "packages": {
-        "gulp-watch>anymatch>micromatch>is-extglob": true
+        "browserify>has>function-bind": true
       }
     },
-    "gulp-watch>anymatch>micromatch>kind-of": {
+    "stylelint>postcss-html>htmlparser2": {
+      "builtin": {
+        "buffer.Buffer": true,
+        "events.EventEmitter": true,
+        "string_decoder.StringDecoder": true
+      },
       "packages": {
-        "browserify>insert-module-globals>is-buffer": true
+        "stylelint>postcss-html>htmlparser2>domelementtype": true,
+        "stylelint>postcss-html>htmlparser2>domhandler": true,
+        "stylelint>postcss-html>htmlparser2>domutils": true,
+        "stylelint>postcss-html>htmlparser2>entities": true,
+        "pumpify>inherits": true,
+        "readable-stream": true
       }
     },
-    "gulp-watch>anymatch>micromatch>object.omit": {
-      "packages": {
-        "gulp-watch>anymatch>micromatch>object.omit>for-own": true,
-        "gulp-watch>anymatch>micromatch>object.omit>is-extendable": true
+    "webpack-dev-server>sockjs>websocket-driver>http-parser-js": {
+      "builtin": {
+        "assert.equal": true,
+        "assert.ok": true
       }
     },
-    "gulp-watch>anymatch>micromatch>object.omit>for-own": {
-      "packages": {
-        "gulp>undertaker>object.reduce>for-own>for-in": true
+    "eslint>ignore": {
+      "globals": {
+        "process": true
       }
     },
-    "gulp-watch>anymatch>micromatch>parse-glob": {
-      "packages": {
-        "gulp-watch>anymatch>micromatch>is-extglob": true,
-        "gulp-watch>anymatch>micromatch>parse-glob>glob-base": true,
-        "gulp-watch>anymatch>micromatch>parse-glob>is-dotfile": true,
-        "gulp-watch>anymatch>micromatch>parse-glob>is-glob": true
+    "sass-embedded>immutable": {
+      "globals": {
+        "console": true,
+        "define": true
       }
     },
-    "gulp-watch>anymatch>micromatch>parse-glob>glob-base": {
+    "eslint>@eslint/eslintrc>import-fresh": {
       "builtin": {
         "path.dirname": true
       },
+      "globals": {
+        "__dirname": true,
+        "__filename": true
+      },
       "packages": {
-        "eslint>glob-parent": true,
-        "gulp-watch>anymatch>micromatch>parse-glob>glob-base>is-glob": true
+        "eslint>@eslint/eslintrc>import-fresh>parent-module": true,
+        "eslint>@eslint/eslintrc>import-fresh>resolve-from": true
       }
     },
-    "gulp-watch>anymatch>micromatch>parse-glob>glob-base>is-glob": {
+    "nyc>glob>inflight": {
+      "globals": {
+        "process.nextTick": true
+      },
       "packages": {
-        "gulp-watch>anymatch>micromatch>is-extglob": true
+        "@metamask/object-multiplex>once": true,
+        "@metamask/object-multiplex>once>wrappy": true
       }
     },
-    "gulp-watch>anymatch>micromatch>parse-glob>is-glob": {
-      "packages": {
-        "gulp-watch>anymatch>micromatch>is-extglob": true
+    "pumpify>inherits": {
+      "builtin": {
+        "util.inherits": true
       }
     },
-    "gulp-watch>anymatch>micromatch>regex-cache": {
-      "packages": {
-        "gulp-watch>anymatch>micromatch>regex-cache>is-equal-shallow": true
+    "ini": {
+      "globals": {
+        "process": true
       }
     },
-    "gulp-watch>anymatch>micromatch>regex-cache>is-equal-shallow": {
-      "packages": {
-        "gulp-watch>anymatch>micromatch>regex-cache>is-equal-shallow>is-primitive": true
+    "stylelint>global-modules>global-prefix>ini": {
+      "globals": {
+        "process": true
       }
     },
-    "gulp-watch>anymatch>normalize-path": {
+    "@lavamoat/lavapack>combine-source-map>inline-source-map": {
+      "globals": {
+        "Buffer.from": true
+      },
       "packages": {
-        "vinyl>remove-trailing-separator": true
+        "@lavamoat/lavapack>combine-source-map>inline-source-map>source-map": true
       }
     },
-    "gulp-watch>chokidar": {
+    "browserify>insert-module-globals": {
       "builtin": {
-        "events.EventEmitter": true,
-        "fs": true,
-        "path.basename": true,
         "path.dirname": true,
-        "path.extname": true,
-        "path.join": true,
+        "path.isAbsolute": true,
         "path.relative": true,
-        "path.resolve": true,
         "path.sep": true
       },
       "globals": {
-        "clearTimeout": true,
-        "console.error": true,
-        "process.env.CHOKIDAR_INTERVAL": true,
-        "process.env.CHOKIDAR_PRINT_FSEVENTS_REQUIRE_ERROR": true,
-        "process.env.CHOKIDAR_USEPOLLING": true,
-        "process.nextTick": true,
-        "process.platform": true,
-        "setTimeout": true
+        "Buffer.concat": true,
+        "Buffer.isBuffer": true
       },
       "packages": {
-        "chokidar>normalize-path": true,
-        "eslint>is-glob": true,
-        "gulp-watch>chokidar>anymatch": true,
-        "gulp-watch>chokidar>async-each": true,
-        "gulp-watch>chokidar>braces": true,
-        "gulp-watch>chokidar>fsevents": true,
-        "gulp-watch>chokidar>is-binary-path": true,
-        "gulp-watch>chokidar>readdirp": true,
-        "gulp-watch>chokidar>upath": true,
-        "gulp-watch>glob-parent": true,
+        "browserify>syntax-error>acorn-node": true,
+        "@lavamoat/lavapack>combine-source-map": true,
         "gulp-watch>path-is-absolute": true,
-        "pumpify>inherits": true
+        "browserify>insert-module-globals>through2": true,
+        "browserify>insert-module-globals>undeclared-identifiers": true,
+        "watchify>xtend": true
       }
     },
-    "gulp-watch>chokidar>fsevents": {
-      "builtin": {
-        "events.EventEmitter": true,
-        "fs.stat": true,
-        "path.join": true,
-        "util.inherits": true
-      },
-      "globals": {
-        "__dirname": true,
-        "console.assert": true,
-        "process.nextTick": true,
-        "process.platform": true,
-        "setImmediate": true
-      },
+    "string.prototype.matchall>internal-slot": {
       "packages": {
-        "gulp-watch>chokidar>fsevents>node-pre-gyp": true
+        "string.prototype.matchall>call-bind>es-errors": true,
+        "depcheck>is-core-module>hasown": true,
+        "string.prototype.matchall>side-channel": true
       }
     },
-    "gulp-watch>chokidar>fsevents>node-pre-gyp": {
-      "builtin": {
-        "events.EventEmitter": true,
-        "fs.existsSync": true,
-        "fs.readFileSync": true,
-        "fs.renameSync": true,
-        "path.dirname": true,
-        "path.existsSync": true,
-        "path.join": true,
-        "path.resolve": true,
-        "url.parse": true,
-        "url.resolve": true,
-        "util.inherits": true
-      },
-      "globals": {
-        "__dirname": true,
-        "console.log": true,
-        "process.arch": true,
-        "process.cwd": true,
-        "process.env": true,
-        "process.platform": true,
-        "process.version.substr": true,
-        "process.versions": true
-      },
+    "gulp>gulp-cli>replace-homedir>is-absolute": {
       "packages": {
-        "@lavamoat/allow-scripts>@npmcli/run-script>node-gyp>npmlog": true,
-        "gulp-watch>chokidar>fsevents>node-pre-gyp>detect-libc": true,
-        "gulp-watch>chokidar>fsevents>node-pre-gyp>nopt": true,
-        "gulp-watch>chokidar>fsevents>node-pre-gyp>rimraf": true,
-        "gulp-watch>chokidar>fsevents>node-pre-gyp>semver": true
+        "gulp>gulp-cli>replace-homedir>is-absolute>is-relative": true,
+        "nyc>spawn-wrap>is-windows": true
       }
     },
-    "gulp-watch>chokidar>fsevents>node-pre-gyp>detect-libc": {
-      "builtin": {
-        "child_process.spawnSync": true,
-        "fs.readdirSync": true,
-        "os.platform": true
-      },
-      "globals": {
-        "process.env": true
+    "gulp>glob-watcher>anymatch>micromatch>extglob>expand-brackets>define-property>is-descriptor>is-accessor-descriptor": {
+      "packages": {
+        "gulp>glob-watcher>anymatch>micromatch>extglob>expand-brackets>define-property>is-descriptor>is-accessor-descriptor>kind-of": true
       }
     },
-    "gulp-watch>chokidar>fsevents>node-pre-gyp>nopt": {
-      "builtin": {
-        "path": true,
-        "stream.Stream": true,
-        "url": true
-      },
-      "globals": {
-        "console": true,
-        "process.argv": true,
-        "process.env.DEBUG_NOPT": true,
-        "process.env.NOPT_DEBUG": true,
-        "process.platform": true
-      },
+    "gulp>gulp-cli>matchdep>micromatch>define-property>is-descriptor>is-accessor-descriptor": {
       "packages": {
-        "@lavamoat/allow-scripts>@npmcli/run-script>node-gyp>nopt>abbrev": true,
-        "gulp-watch>chokidar>fsevents>node-pre-gyp>nopt>osenv": true
+        "@babel/register>clone-deep>kind-of": true
       }
     },
-    "gulp-watch>chokidar>fsevents>node-pre-gyp>nopt>osenv": {
-      "builtin": {
-        "child_process.exec": true,
-        "path": true
-      },
-      "globals": {
-        "process.env.COMPUTERNAME": true,
-        "process.env.ComSpec": true,
-        "process.env.EDITOR": true,
-        "process.env.HOSTNAME": true,
-        "process.env.PATH": true,
-        "process.env.PROMPT": true,
-        "process.env.PS1": true,
-        "process.env.Path": true,
-        "process.env.SHELL": true,
-        "process.env.USER": true,
-        "process.env.USERDOMAIN": true,
-        "process.env.USERNAME": true,
-        "process.env.VISUAL": true,
-        "process.env.path": true,
-        "process.nextTick": true,
-        "process.platform": true
-      },
+    "gulp>gulp-cli>matchdep>micromatch>snapdragon>define-property>is-descriptor>is-accessor-descriptor": {
       "packages": {
-        "@storybook/core>@storybook/core-server>x-default-browser>default-browser-id>untildify>os-homedir": true,
-        "gulp-watch>chokidar>fsevents>node-pre-gyp>nopt>osenv>os-tmpdir": true
+        "gulp>gulp-cli>matchdep>micromatch>snapdragon>define-property>is-descriptor>is-data-descriptor>kind-of": true
       }
     },
-    "gulp-watch>chokidar>fsevents>node-pre-gyp>nopt>osenv>os-tmpdir": {
-      "globals": {
-        "process.env.SystemRoot": true,
-        "process.env.TEMP": true,
-        "process.env.TMP": true,
-        "process.env.TMPDIR": true,
-        "process.env.windir": true,
-        "process.platform": true
+    "react-syntax-highlighter>refractor>parse-entities>is-alphanumerical": {
+      "packages": {
+        "stylelint>@stylelint/postcss-markdown>remark>remark-parse>is-alphabetical": true,
+        "react-syntax-highlighter>refractor>parse-entities>is-decimal": true
       }
     },
-    "gulp-watch>chokidar>fsevents>node-pre-gyp>rimraf": {
+    "chokidar>is-binary-path": {
       "builtin": {
-        "assert": true,
-        "fs": true,
-        "path.join": true
-      },
-      "globals": {
-        "process.platform": true,
-        "setTimeout": true
+        "path.extname": true
       },
       "packages": {
-        "nyc>glob": true
+        "chokidar>is-binary-path>binary-extensions": true
       }
     },
-    "gulp-watch>chokidar>fsevents>node-pre-gyp>semver": {
+    "string.prototype.matchall>es-abstract>is-callable": {
       "globals": {
-        "console": true,
-        "process": true
+        "document": true
       }
     },
-    "gulp-watch>fancy-log": {
+    "depcheck>is-core-module": {
       "globals": {
-        "console": true,
-        "process.argv.indexOf": true,
-        "process.stderr.write": true,
-        "process.stdout.write": true
+        "process.versions": true
       },
       "packages": {
-        "fancy-log>ansi-gray": true,
-        "fancy-log>color-support": true,
-        "fancy-log>time-stamp": true
+        "depcheck>is-core-module>hasown": true
       }
     },
-    "gulp-watch>path-is-absolute": {
-      "globals": {
-        "process.platform": true
+    "gulp>glob-watcher>anymatch>micromatch>extglob>expand-brackets>define-property>is-descriptor>is-data-descriptor": {
+      "packages": {
+        "gulp>glob-watcher>anymatch>micromatch>extglob>expand-brackets>define-property>is-descriptor>is-data-descriptor>kind-of": true
       }
     },
-    "gulp-watch>readable-stream": {
-      "builtin": {
-        "events.EventEmitter": true,
-        "stream": true,
-        "util": true
-      },
-      "globals": {
-        "process.browser": true,
-        "process.env.READABLE_STREAM": true,
-        "process.stderr": true,
-        "process.stdout": true,
-        "process.version.slice": true,
-        "setImmediate": true
-      },
+    "gulp>gulp-cli>matchdep>micromatch>define-property>is-descriptor>is-data-descriptor": {
       "packages": {
-        "gulp-watch>readable-stream>isarray": true,
-        "gulp-watch>readable-stream>safe-buffer": true,
-        "gulp-watch>readable-stream>string_decoder": true,
-        "pumpify>inherits": true,
-        "readable-stream-2>core-util-is": true,
-        "readable-stream-2>process-nextick-args": true,
-        "readable-stream>util-deprecate": true
+        "@babel/register>clone-deep>kind-of": true
       }
     },
-    "gulp-watch>readable-stream>safe-buffer": {
-      "builtin": {
-        "buffer": true
+    "gulp>gulp-cli>matchdep>micromatch>snapdragon>define-property>is-descriptor>is-data-descriptor": {
+      "packages": {
+        "gulp>gulp-cli>matchdep>micromatch>snapdragon>define-property>is-descriptor>is-data-descriptor>kind-of": true
       }
     },
-    "gulp-watch>readable-stream>string_decoder": {
+    "@metamask/eth-token-tracker>deep-equal>is-date-object": {
       "packages": {
-        "gulp-watch>readable-stream>safe-buffer": true
+        "koa>is-generator-function>has-tostringtag": true
       }
     },
-    "gulp-watch>vinyl-file": {
-      "builtin": {
-        "path.resolve": true
-      },
-      "globals": {
-        "process.cwd": true
-      },
+    "gulp>glob-watcher>anymatch>micromatch>extglob>expand-brackets>define-property>is-descriptor": {
       "packages": {
-        "del>graceful-fs": true,
-        "gh-pages>globby>pinkie-promise": true,
-        "gulp-watch>vinyl-file>pify": true,
-        "gulp-watch>vinyl-file>strip-bom": true,
-        "gulp-watch>vinyl-file>strip-bom-stream": true,
-        "gulp-watch>vinyl-file>vinyl": true
+        "gulp>glob-watcher>anymatch>micromatch>extglob>expand-brackets>define-property>is-descriptor>is-accessor-descriptor": true,
+        "gulp>glob-watcher>anymatch>micromatch>extglob>expand-brackets>define-property>is-descriptor>is-data-descriptor": true,
+        "gulp>glob-watcher>anymatch>micromatch>extglob>expand-brackets>define-property>is-descriptor>kind-of": true
       }
     },
-    "gulp-watch>vinyl-file>strip-bom": {
-      "globals": {
-        "Buffer.isBuffer": true
-      },
+    "gulp>gulp-cli>matchdep>micromatch>define-property>is-descriptor": {
       "packages": {
-        "gulp>vinyl-fs>remove-bom-buffer>is-utf8": true
+        "gulp>gulp-cli>matchdep>micromatch>define-property>is-descriptor>is-accessor-descriptor": true,
+        "gulp>gulp-cli>matchdep>micromatch>define-property>is-descriptor>is-data-descriptor": true,
+        "@babel/register>clone-deep>kind-of": true
       }
     },
-    "gulp-watch>vinyl-file>strip-bom-stream": {
+    "gulp>gulp-cli>matchdep>micromatch>snapdragon>define-property>is-descriptor": {
       "packages": {
-        "gulp-watch>vinyl-file>strip-bom": true,
-        "gulp-watch>vinyl-file>strip-bom-stream>first-chunk-stream": true
+        "gulp>gulp-cli>matchdep>micromatch>snapdragon>define-property>is-descriptor>is-accessor-descriptor": true,
+        "gulp>gulp-cli>matchdep>micromatch>snapdragon>define-property>is-descriptor>is-data-descriptor": true,
+        "gulp>gulp-cli>matchdep>micromatch>snapdragon>define-property>is-descriptor>kind-of": true
       }
     },
-    "gulp-watch>vinyl-file>strip-bom-stream>first-chunk-stream": {
-      "builtin": {
-        "util.inherits": true
-      },
-      "globals": {
-        "Buffer.concat": true,
-        "setImmediate": true
-      },
+    "gulp-watch>anymatch>micromatch>regex-cache>is-equal-shallow": {
       "packages": {
-        "gulp-watch>vinyl-file>strip-bom-stream>first-chunk-stream>readable-stream": true
+        "gulp-watch>anymatch>micromatch>regex-cache>is-equal-shallow>is-primitive": true
       }
     },
-    "gulp-watch>vinyl-file>strip-bom-stream>first-chunk-stream>readable-stream": {
-      "builtin": {
-        "events.EventEmitter": true,
-        "stream": true,
-        "util": true
-      },
-      "globals": {
-        "process.browser": true,
-        "process.env.READABLE_STREAM": true,
-        "process.stderr": true,
-        "process.stdout": true,
-        "process.version.slice": true,
-        "setImmediate": true
-      },
+    "gulp-zip>plugin-error>extend-shallow>is-extendable": {
       "packages": {
-        "gulp-watch>vinyl-file>strip-bom-stream>first-chunk-stream>readable-stream>isarray": true,
-        "gulp-watch>vinyl-file>strip-bom-stream>first-chunk-stream>readable-stream>safe-buffer": true,
-        "gulp-watch>vinyl-file>strip-bom-stream>first-chunk-stream>readable-stream>string_decoder": true,
-        "pumpify>inherits": true,
-        "readable-stream-2>core-util-is": true,
-        "readable-stream-2>process-nextick-args": true,
-        "readable-stream>util-deprecate": true
+        "@babel/register>clone-deep>is-plain-object": true
       }
     },
-    "gulp-watch>vinyl-file>strip-bom-stream>first-chunk-stream>readable-stream>safe-buffer": {
-      "builtin": {
-        "buffer": true
+    "gulp>gulp-cli>matchdep>micromatch>snapdragon>base>mixin-deep>is-extendable": {
+      "packages": {
+        "@babel/register>clone-deep>is-plain-object": true
       }
     },
-    "gulp-watch>vinyl-file>strip-bom-stream>first-chunk-stream>readable-stream>string_decoder": {
+    "@lavamoat/allow-scripts>@npmcli/run-script>node-gyp>npmlog>gauge>string-width>is-fullwidth-code-point": {
       "packages": {
-        "gulp-watch>vinyl-file>strip-bom-stream>first-chunk-stream>readable-stream>safe-buffer": true
+        "gulp>gulp-cli>yargs>string-width>is-fullwidth-code-point>number-is-nan": true
       }
     },
-    "gulp-watch>vinyl-file>vinyl": {
-      "builtin": {
-        "buffer.Buffer": true,
-        "path.basename": true,
-        "path.dirname": true,
-        "path.extname": true,
-        "path.join": true,
-        "path.relative": true,
-        "stream.PassThrough": true,
-        "stream.Stream": true
-      },
-      "globals": {
-        "process.cwd": true
-      },
+    "del>is-glob": {
       "packages": {
-        "@metamask/jazzicon>color>clone": true,
-        "gulp-watch>vinyl-file>vinyl>clone-stats": true,
-        "gulp-watch>vinyl-file>vinyl>replace-ext": true
+        "del>is-glob>is-extglob": true
       }
     },
-    "gulp-watch>vinyl-file>vinyl>clone-stats": {
-      "builtin": {
-        "fs.Stats": true
-      }
-    },
-    "gulp-watch>vinyl-file>vinyl>replace-ext": {
-      "builtin": {
-        "path.basename": true,
-        "path.dirname": true,
-        "path.extname": true,
-        "path.join": true
-      }
-    },
-    "gulp-zip": {
-      "builtin": {
-        "buffer.constants.MAX_LENGTH": true,
-        "path.join": true
-      },
+    "gulp-watch>anymatch>micromatch>parse-glob>glob-base>is-glob": {
       "packages": {
-        "gulp-zip>get-stream": true,
-        "gulp-zip>plugin-error": true,
-        "gulp-zip>through2": true,
-        "gulp-zip>yazl": true,
-        "vinyl": true
+        "gulp-watch>anymatch>micromatch>is-extglob": true
       }
     },
-    "gulp-zip>get-stream": {
-      "builtin": {
-        "buffer.constants.MAX_LENGTH": true,
-        "stream.PassThrough": true
-      },
-      "globals": {
-        "Buffer.concat": true
-      },
+    "gulp-watch>anymatch>micromatch>is-glob": {
       "packages": {
-        "pumpify>pump": true
+        "gulp-watch>anymatch>micromatch>is-extglob": true
       }
     },
-    "gulp-zip>plugin-error": {
-      "builtin": {
-        "util.inherits": true
-      },
+    "gulp-watch>anymatch>micromatch>parse-glob>is-glob": {
       "packages": {
-        "gulp-watch>ansi-colors": true,
-        "gulp-zip>plugin-error>arr-diff": true,
-        "gulp-zip>plugin-error>arr-union": true,
-        "gulp-zip>plugin-error>extend-shallow": true
+        "gulp-watch>anymatch>micromatch>is-extglob": true
       }
     },
-    "gulp-zip>plugin-error>extend-shallow": {
+    "gulp>glob-watcher>anymatch>micromatch>braces>fill-range>is-number": {
       "packages": {
-        "gulp-zip>plugin-error>extend-shallow>assign-symbols": true,
-        "gulp-zip>plugin-error>extend-shallow>is-extendable": true
+        "gulp>glob-watcher>anymatch>micromatch>braces>fill-range>is-number>kind-of": true
       }
     },
-    "gulp-zip>plugin-error>extend-shallow>is-extendable": {
+    "gulp-watch>anymatch>micromatch>braces>expand-range>fill-range>is-number": {
       "packages": {
-        "@babel/register>clone-deep>is-plain-object": true
+        "gulp-watch>anymatch>micromatch>braces>expand-range>fill-range>is-number>kind-of": true
       }
     },
-    "gulp-zip>through2": {
-      "builtin": {
-        "util.inherits": true
-      },
-      "globals": {
-        "process.nextTick": true
-      },
+    "gulp>gulp-cli>matchdep>micromatch>snapdragon>base>cache-base>has-value>has-values>is-number": {
       "packages": {
-        "readable-stream": true
+        "gulp>gulp-cli>matchdep>micromatch>snapdragon>base>cache-base>has-value>has-values>is-number>kind-of": true
       }
     },
-    "gulp-zip>yazl": {
+    "del>is-path-cwd": {
       "builtin": {
-        "events.EventEmitter": true,
-        "fs.createReadStream": true,
-        "fs.stat": true,
-        "stream.PassThrough": true,
-        "stream.Transform": true,
-        "util.inherits": true,
-        "zlib.DeflateRaw": true,
-        "zlib.deflateRaw": true
+        "path.resolve": true
       },
       "globals": {
-        "Buffer": true,
-        "setImmediate": true,
-        "utf8FileName.length": true
-      },
-      "packages": {
-        "gulp-zip>yazl>buffer-crc32": true
+        "process.cwd": true,
+        "process.platform": true
       }
     },
-    "gulp-zip>yazl>buffer-crc32": {
+    "del>is-path-inside": {
       "builtin": {
-        "buffer.Buffer": true
+        "path.relative": true,
+        "path.resolve": true,
+        "path.sep": true
       }
     },
-    "gulp>glob-watcher": {
+    "@babel/register>clone-deep>is-plain-object": {
       "packages": {
-        "chokidar": true,
-        "gulp>glob-watcher>anymatch": true,
-        "gulp>glob-watcher>async-done": true,
-        "gulp>glob-watcher>is-negated-glob": true,
-        "gulp>glob-watcher>just-debounce": true,
-        "gulp>undertaker>object.defaults": true
+        "gulp>gulp-cli>isobject": true
       }
     },
-    "gulp>glob-watcher>anymatch": {
-      "builtin": {
-        "path.sep": true
-      },
+    "string.prototype.matchall>es-abstract>is-regex": {
       "packages": {
-        "gulp-watch>anymatch>normalize-path": true,
-        "gulp>glob-watcher>anymatch>micromatch": true
+        "string.prototype.matchall>call-bind": true,
+        "koa>is-generator-function>has-tostringtag": true
       }
     },
-    "gulp>glob-watcher>anymatch>micromatch": {
-      "builtin": {
-        "path.basename": true,
-        "path.sep": true,
-        "util.inspect": true
-      },
-      "globals": {
-        "process.platform": true
-      },
+    "gulp>gulp-cli>replace-homedir>is-absolute>is-relative": {
       "packages": {
-        "@babel/register>clone-deep>kind-of": true,
-        "gulp-zip>plugin-error>arr-diff": true,
-        "gulp-zip>plugin-error>extend-shallow": true,
-        "gulp>glob-watcher>anymatch>micromatch>braces": true,
-        "gulp>glob-watcher>anymatch>micromatch>define-property": true,
-        "gulp>glob-watcher>anymatch>micromatch>extglob": true,
-        "gulp>gulp-cli>liftoff>fined>object.pick": true,
-        "gulp>gulp-cli>matchdep>micromatch>array-unique": true,
-        "gulp>gulp-cli>matchdep>micromatch>fragment-cache": true,
-        "gulp>gulp-cli>matchdep>micromatch>nanomatch": true,
-        "gulp>gulp-cli>matchdep>micromatch>regex-not": true,
-        "gulp>gulp-cli>matchdep>micromatch>snapdragon": true,
-        "gulp>gulp-cli>matchdep>micromatch>to-regex": true
+        "gulp>gulp-cli>replace-homedir>is-absolute>is-relative>is-unc-path": true
       }
     },
-    "gulp>glob-watcher>anymatch>micromatch>braces": {
+    "eslint-plugin-react>array-includes>is-string": {
       "packages": {
-        "gulp-watch>anymatch>micromatch>braces>repeat-element": true,
-        "gulp>glob-watcher>anymatch>micromatch>braces>extend-shallow": true,
-        "gulp>glob-watcher>anymatch>micromatch>braces>fill-range": true,
-        "gulp>gulp-cli>isobject": true,
-        "gulp>gulp-cli>matchdep>micromatch>array-unique": true,
-        "gulp>gulp-cli>matchdep>micromatch>braces>snapdragon-node": true,
-        "gulp>gulp-cli>matchdep>micromatch>braces>split-string": true,
-        "gulp>gulp-cli>matchdep>micromatch>snapdragon": true,
-        "gulp>gulp-cli>matchdep>micromatch>to-regex": true,
-        "gulp>undertaker>arr-flatten": true
+        "koa>is-generator-function>has-tostringtag": true
       }
     },
-    "gulp>glob-watcher>anymatch>micromatch>braces>extend-shallow": {
+    "string.prototype.matchall>es-abstract>es-to-primitive>is-symbol": {
       "packages": {
-        "gulp-watch>anymatch>micromatch>object.omit>is-extendable": true
+        "string.prototype.matchall>has-symbols": true
       }
     },
-    "gulp>glob-watcher>anymatch>micromatch>braces>fill-range": {
-      "builtin": {
-        "util.inspect": true
-      },
+    "gulp>gulp-cli>replace-homedir>is-absolute>is-relative>is-unc-path": {
       "packages": {
-        "gulp>glob-watcher>anymatch>micromatch>braces>fill-range>extend-shallow": true,
-        "gulp>glob-watcher>anymatch>micromatch>braces>fill-range>is-number": true,
-        "gulp>glob-watcher>anymatch>micromatch>braces>fill-range>to-regex-range": true,
-        "stylelint>@stylelint/postcss-markdown>remark>remark-parse>repeat-string": true
+        "gulp>gulp-cli>replace-homedir>is-absolute>is-relative>is-unc-path>unc-path-regex": true
       }
     },
-    "gulp>glob-watcher>anymatch>micromatch>braces>fill-range>extend-shallow": {
-      "packages": {
-        "gulp-watch>anymatch>micromatch>object.omit>is-extendable": true
+    "mocha>log-symbols>is-unicode-supported": {
+      "globals": {
+        "process.env.CI": true,
+        "process.env.TERM": true,
+        "process.env.TERM_PROGRAM": true,
+        "process.env.WT_SESSION": true,
+        "process.platform": true
       }
     },
-    "gulp>glob-watcher>anymatch>micromatch>braces>fill-range>is-number": {
-      "packages": {
-        "gulp>glob-watcher>anymatch>micromatch>braces>fill-range>is-number>kind-of": true
+    "nyc>spawn-wrap>is-windows": {
+      "globals": {
+        "define": true,
+        "isWindows": "write",
+        "process": true
       }
     },
-    "gulp>glob-watcher>anymatch>micromatch>braces>fill-range>is-number>kind-of": {
-      "packages": {
-        "browserify>insert-module-globals>is-buffer": true
+    "@sentry/cli>which>isexe": {
+      "builtin": {
+        "fs": true
+      },
+      "globals": {
+        "TESTING_WINDOWS": true,
+        "process.env.PATHEXT": true,
+        "process.getgid": true,
+        "process.getuid": true,
+        "process.platform": true
       }
     },
-    "gulp>glob-watcher>anymatch>micromatch>braces>fill-range>to-regex-range": {
+    "gulp-watch>anymatch>micromatch>braces>expand-range>fill-range>isobject": {
       "packages": {
-        "gulp>glob-watcher>anymatch>micromatch>braces>fill-range>is-number": true,
-        "stylelint>@stylelint/postcss-markdown>remark>remark-parse>repeat-string": true
+        "gulp-watch>anymatch>micromatch>braces>expand-range>fill-range>isobject>isarray": true
       }
     },
-    "gulp>glob-watcher>anymatch>micromatch>define-property": {
+    "gulp>gulp-cli>matchdep>micromatch>snapdragon>base>cache-base>unset-value>has-value>isobject": {
       "packages": {
-        "gulp>gulp-cli>isobject": true,
-        "gulp>gulp-cli>matchdep>micromatch>define-property>is-descriptor": true
+        "gulp>gulp-cli>matchdep>micromatch>snapdragon>base>cache-base>unset-value>has-value>isobject>isarray": true
       }
     },
-    "gulp>glob-watcher>anymatch>micromatch>extglob": {
-      "packages": {
-        "gulp>glob-watcher>anymatch>micromatch>extglob>define-property": true,
-        "gulp>glob-watcher>anymatch>micromatch>extglob>expand-brackets": true,
-        "gulp>glob-watcher>anymatch>micromatch>extglob>extend-shallow": true,
-        "gulp>gulp-cli>matchdep>micromatch>array-unique": true,
-        "gulp>gulp-cli>matchdep>micromatch>fragment-cache": true,
-        "gulp>gulp-cli>matchdep>micromatch>regex-not": true,
-        "gulp>gulp-cli>matchdep>micromatch>snapdragon": true,
-        "gulp>gulp-cli>matchdep>micromatch>to-regex": true
+    "postcss-discard-font-face>postcss>js-base64": {
+      "globals": {
+        "Base64": "write",
+        "define": true
       }
     },
-    "gulp>glob-watcher>anymatch>micromatch>extglob>define-property": {
-      "packages": {
-        "gulp>gulp-cli>matchdep>micromatch>define-property>is-descriptor": true
+    "eslint-plugin-jsdoc>@es-joy/jsdoccomment>jsdoc-type-pratt-parser": {
+      "globals": {
+        "define": true
       }
     },
-    "gulp>glob-watcher>anymatch>micromatch>extglob>expand-brackets": {
+    "@babel/core>@babel/generator>jsesc": {
       "globals": {
-        "__filename": true
-      },
-      "packages": {
-        "gulp>glob-watcher>anymatch>micromatch>extglob>expand-brackets>debug": true,
-        "gulp>glob-watcher>anymatch>micromatch>extglob>expand-brackets>define-property": true,
-        "gulp>glob-watcher>anymatch>micromatch>extglob>expand-brackets>extend-shallow": true,
-        "gulp>gulp-cli>matchdep>micromatch>extglob>expand-brackets>posix-character-classes": true,
-        "gulp>gulp-cli>matchdep>micromatch>regex-not": true,
-        "gulp>gulp-cli>matchdep>micromatch>snapdragon": true,
-        "gulp>gulp-cli>matchdep>micromatch>to-regex": true
+        "Buffer": true
       }
     },
-    "gulp>glob-watcher>anymatch>micromatch>extglob>expand-brackets>debug": {
-      "builtin": {
-        "fs.SyncWriteStream": true,
-        "net.Socket": true,
-        "tty.WriteStream": true,
-        "tty.isatty": true,
-        "util": true
-      },
+    "webpack>json-parse-even-better-errors": {
       "globals": {
-        "chrome": true,
-        "console": true,
-        "document": true,
-        "localStorage": true,
-        "navigator": true,
-        "process": true
-      },
-      "packages": {
-        "gulp>glob-watcher>anymatch>micromatch>extglob>expand-brackets>debug>ms": true
+        "Buffer.isBuffer": true
       }
     },
-    "gulp>glob-watcher>anymatch>micromatch>extglob>expand-brackets>define-property": {
+    "@lavamoat/lavapack>json-stable-stringify": {
       "packages": {
-        "gulp>glob-watcher>anymatch>micromatch>extglob>expand-brackets>define-property>is-descriptor": true
+        "string.prototype.matchall>call-bind": true,
+        "@lavamoat/lavapack>json-stable-stringify>isarray": true,
+        "@lavamoat/lavapack>json-stable-stringify>jsonify": true,
+        "@lavamoat/lavapack>json-stable-stringify>object-keys": true
       }
     },
-    "gulp>glob-watcher>anymatch>micromatch>extglob>expand-brackets>define-property>is-descriptor": {
-      "packages": {
-        "gulp>glob-watcher>anymatch>micromatch>extglob>expand-brackets>define-property>is-descriptor>is-accessor-descriptor": true,
-        "gulp>glob-watcher>anymatch>micromatch>extglob>expand-brackets>define-property>is-descriptor>is-data-descriptor": true,
-        "gulp>glob-watcher>anymatch>micromatch>extglob>expand-brackets>define-property>is-descriptor>kind-of": true
-      }
-    },
-    "gulp>glob-watcher>anymatch>micromatch>extglob>expand-brackets>define-property>is-descriptor>is-accessor-descriptor": {
-      "packages": {
-        "gulp>glob-watcher>anymatch>micromatch>extglob>expand-brackets>define-property>is-descriptor>is-accessor-descriptor>kind-of": true
-      }
-    },
-    "gulp>glob-watcher>anymatch>micromatch>extglob>expand-brackets>define-property>is-descriptor>is-accessor-descriptor>kind-of": {
-      "packages": {
-        "browserify>insert-module-globals>is-buffer": true
-      }
-    },
-    "gulp>glob-watcher>anymatch>micromatch>extglob>expand-brackets>define-property>is-descriptor>is-data-descriptor": {
-      "packages": {
-        "gulp>glob-watcher>anymatch>micromatch>extglob>expand-brackets>define-property>is-descriptor>is-data-descriptor>kind-of": true
-      }
-    },
-    "gulp>glob-watcher>anymatch>micromatch>extglob>expand-brackets>define-property>is-descriptor>is-data-descriptor>kind-of": {
-      "packages": {
-        "browserify>insert-module-globals>is-buffer": true
-      }
-    },
-    "gulp>glob-watcher>anymatch>micromatch>extglob>expand-brackets>extend-shallow": {
-      "packages": {
-        "gulp-watch>anymatch>micromatch>object.omit>is-extendable": true
-      }
-    },
-    "gulp>glob-watcher>anymatch>micromatch>extglob>extend-shallow": {
-      "packages": {
-        "gulp-watch>anymatch>micromatch>object.omit>is-extendable": true
+    "depcheck>json5": {
+      "globals": {
+        "console.warn": true
       }
     },
-    "gulp>glob-watcher>async-done": {
+    "eslint-plugin-import>tsconfig-paths>json5": {
       "globals": {
-        "process.nextTick": true
-      },
-      "packages": {
-        "@metamask/object-multiplex>once": true,
-        "duplexify>end-of-stream": true,
-        "gulp>glob-watcher>async-done>stream-exhaust": true,
-        "readable-stream-2>process-nextick-args": true
+        "console.warn": true
       }
     },
-    "gulp>glob-watcher>async-done>stream-exhaust": {
+    "fs-extra>jsonfile": {
       "builtin": {
-        "stream.Writable": true,
-        "util.inherits": true
+        "fs": true
       },
       "globals": {
-        "setImmediate": true
+        "Buffer.isBuffer": true
+      },
+      "packages": {
+        "del>graceful-fs": true
       }
     },
-    "gulp>glob-watcher>chokidar": {
-      "packages": {
-        "gulp>glob-watcher>chokidar>fsevents": true
+    "browserify>JSONStream>jsonparse": {
+      "globals": {
+        "Buffer": true
       }
     },
-    "gulp>glob-watcher>chokidar>fsevents": {
-      "builtin": {
-        "events.EventEmitter": true,
-        "fs.stat": true,
-        "path.join": true,
-        "util.inherits": true
-      },
+    "eslint-plugin-react>jsx-ast-utils": {
       "globals": {
-        "__dirname": true,
-        "console.assert": true,
-        "process.nextTick": true,
-        "process.platform": true,
-        "setImmediate": true
+        "console.error": true
       },
       "packages": {
-        "gulp-watch>chokidar>fsevents>node-pre-gyp": true
+        "gulp>vinyl-fs>object.assign": true
       }
     },
     "gulp>glob-watcher>just-debounce": {
@@ -4891,1855 +4213,1297 @@
         "setTimeout": true
       }
     },
-    "gulp>gulp-cli>liftoff>fined>object.pick": {
+    "gulp>gulp-cli>matchdep>micromatch>snapdragon>base>cache-base>has-value>has-values>kind-of": {
       "packages": {
-        "gulp>gulp-cli>isobject": true
+        "browserify>insert-module-globals>is-buffer": true
       }
     },
-    "gulp>gulp-cli>matchdep>micromatch>braces>snapdragon-node": {
+    "gulp>glob-watcher>anymatch>micromatch>extglob>expand-brackets>define-property>is-descriptor>is-accessor-descriptor>kind-of": {
       "packages": {
-        "gulp>gulp-cli>isobject": true,
-        "gulp>gulp-cli>matchdep>micromatch>braces>snapdragon-node>define-property": true,
-        "gulp>gulp-cli>matchdep>micromatch>braces>snapdragon-node>snapdragon-util": true
+        "browserify>insert-module-globals>is-buffer": true
       }
     },
-    "gulp>gulp-cli>matchdep>micromatch>braces>snapdragon-node>define-property": {
+    "gulp>glob-watcher>anymatch>micromatch>extglob>expand-brackets>define-property>is-descriptor>is-data-descriptor>kind-of": {
       "packages": {
-        "gulp>gulp-cli>matchdep>micromatch>define-property>is-descriptor": true
+        "browserify>insert-module-globals>is-buffer": true
       }
     },
-    "gulp>gulp-cli>matchdep>micromatch>braces>snapdragon-node>snapdragon-util": {
+    "gulp>gulp-cli>matchdep>micromatch>snapdragon>define-property>is-descriptor>is-data-descriptor>kind-of": {
       "packages": {
-        "gulp>gulp-cli>matchdep>micromatch>braces>snapdragon-node>snapdragon-util>kind-of": true
+        "browserify>insert-module-globals>is-buffer": true
       }
     },
-    "gulp>gulp-cli>matchdep>micromatch>braces>snapdragon-node>snapdragon-util>kind-of": {
+    "gulp>glob-watcher>anymatch>micromatch>braces>fill-range>is-number>kind-of": {
       "packages": {
         "browserify>insert-module-globals>is-buffer": true
       }
     },
-    "gulp>gulp-cli>matchdep>micromatch>braces>split-string": {
+    "gulp-watch>anymatch>micromatch>braces>expand-range>fill-range>is-number>kind-of": {
       "packages": {
-        "gulp-zip>plugin-error>extend-shallow": true
+        "browserify>insert-module-globals>is-buffer": true
       }
     },
-    "gulp>gulp-cli>matchdep>micromatch>define-property>is-descriptor": {
+    "gulp>gulp-cli>matchdep>micromatch>snapdragon>base>cache-base>has-value>has-values>is-number>kind-of": {
       "packages": {
-        "@babel/register>clone-deep>kind-of": true,
-        "gulp>gulp-cli>matchdep>micromatch>define-property>is-descriptor>is-accessor-descriptor": true,
-        "gulp>gulp-cli>matchdep>micromatch>define-property>is-descriptor>is-data-descriptor": true
+        "browserify>insert-module-globals>is-buffer": true
       }
     },
-    "gulp>gulp-cli>matchdep>micromatch>define-property>is-descriptor>is-accessor-descriptor": {
+    "lavamoat>lavamoat-core>merge-deep>kind-of": {
       "packages": {
-        "@babel/register>clone-deep>kind-of": true
+        "browserify>insert-module-globals>is-buffer": true
       }
     },
-    "gulp>gulp-cli>matchdep>micromatch>define-property>is-descriptor>is-data-descriptor": {
+    "gulp-watch>anymatch>micromatch>kind-of": {
       "packages": {
-        "@babel/register>clone-deep>kind-of": true
+        "browserify>insert-module-globals>is-buffer": true
       }
     },
-    "gulp>gulp-cli>matchdep>micromatch>fragment-cache": {
+    "gulp>gulp-cli>matchdep>micromatch>snapdragon>base>class-utils>static-extend>object-copy>kind-of": {
       "packages": {
-        "gulp>gulp-cli>liftoff>fined>parse-filepath>map-cache": true
+        "browserify>insert-module-globals>is-buffer": true
       }
     },
-    "gulp>gulp-cli>matchdep>micromatch>nanomatch": {
-      "builtin": {
-        "path.basename": true,
-        "path.sep": true,
-        "util.inspect": true
+    "lavamoat>lavamoat-core>merge-deep>clone-deep>shallow-clone>kind-of": {
+      "globals": {
+        "Buffer": true
       },
       "packages": {
-        "@babel/register>clone-deep>kind-of": true,
-        "gulp-zip>plugin-error>arr-diff": true,
-        "gulp-zip>plugin-error>extend-shallow": true,
-        "gulp>gulp-cli>liftoff>fined>object.pick": true,
-        "gulp>gulp-cli>matchdep>micromatch>array-unique": true,
-        "gulp>gulp-cli>matchdep>micromatch>fragment-cache": true,
-        "gulp>gulp-cli>matchdep>micromatch>nanomatch>define-property": true,
-        "gulp>gulp-cli>matchdep>micromatch>regex-not": true,
-        "gulp>gulp-cli>matchdep>micromatch>snapdragon": true,
-        "gulp>gulp-cli>matchdep>micromatch>to-regex": true,
-        "nyc>spawn-wrap>is-windows": true
+        "browserify>insert-module-globals>is-buffer": true
       }
     },
-    "gulp>gulp-cli>matchdep>micromatch>nanomatch>define-property": {
+    "gulp>gulp-cli>matchdep>micromatch>braces>snapdragon-node>snapdragon-util>kind-of": {
       "packages": {
-        "gulp>gulp-cli>isobject": true,
-        "gulp>gulp-cli>matchdep>micromatch>define-property>is-descriptor": true
+        "browserify>insert-module-globals>is-buffer": true
       }
     },
-    "gulp>gulp-cli>matchdep>micromatch>regex-not": {
+    "gulp>gulp-cli>matchdep>micromatch>snapdragon>base>cache-base>to-object-path>kind-of": {
       "packages": {
-        "gulp-zip>plugin-error>extend-shallow": true,
-        "gulp>gulp-cli>matchdep>micromatch>to-regex>safe-regex": true
+        "browserify>insert-module-globals>is-buffer": true
       }
     },
-    "gulp>gulp-cli>matchdep>micromatch>snapdragon": {
-      "builtin": {
-        "fs.readFileSync": true,
-        "path.dirname": true,
-        "util.inspect": true
-      },
-      "globals": {
-        "__filename": true
-      },
+    "labeled-stream-splicer": {
       "packages": {
-        "gulp>gulp-cli>liftoff>fined>parse-filepath>map-cache": true,
-        "gulp>gulp-cli>matchdep>micromatch>snapdragon>base": true,
-        "gulp>gulp-cli>matchdep>micromatch>snapdragon>debug": true,
-        "gulp>gulp-cli>matchdep>micromatch>snapdragon>define-property": true,
-        "gulp>gulp-cli>matchdep>micromatch>snapdragon>extend-shallow": true,
-        "gulp>gulp-cli>matchdep>micromatch>snapdragon>source-map": true,
-        "gulp>gulp-cli>matchdep>micromatch>snapdragon>use": true,
-        "resolve-url-loader>rework>css>source-map-resolve": true
+        "pumpify>inherits": true,
+        "labeled-stream-splicer>stream-splicer": true
       }
     },
-    "gulp>gulp-cli>matchdep>micromatch>snapdragon>base": {
+    "gulp>undertaker>last-run": {
       "builtin": {
-        "util.inherits": true
+        "assert": true
       },
       "packages": {
-        "gulp>gulp-cli>isobject": true,
-        "gulp>gulp-cli>matchdep>micromatch>snapdragon>base>cache-base": true,
-        "gulp>gulp-cli>matchdep>micromatch>snapdragon>base>class-utils": true,
-        "gulp>gulp-cli>matchdep>micromatch>snapdragon>base>component-emitter": true,
-        "gulp>gulp-cli>matchdep>micromatch>snapdragon>base>define-property": true,
-        "gulp>gulp-cli>matchdep>micromatch>snapdragon>base>mixin-deep": true,
-        "gulp>gulp-cli>matchdep>micromatch>snapdragon>base>pascalcase": true
+        "gulp>undertaker>last-run>default-resolution": true,
+        "gulp>undertaker>es6-weak-map": true
       }
     },
-    "gulp>gulp-cli>matchdep>micromatch>snapdragon>base>cache-base": {
+    "lavamoat-browserify": {
+      "builtin": {
+        "node:fs.existsSync": true,
+        "node:fs.mkdirSync": true,
+        "node:fs.readFileSync": true,
+        "node:fs.writeFileSync": true,
+        "node:path.dirname": true,
+        "node:path.extname": true,
+        "node:path.resolve": true,
+        "node:util.callbackify": true
+      },
+      "globals": {
+        "console.warn": true,
+        "process.cwd": true,
+        "setTimeout": true
+      },
       "packages": {
-        "gulp>gulp-cli>array-sort>get-value": true,
-        "gulp>gulp-cli>isobject": true,
-        "gulp>gulp-cli>matchdep>micromatch>snapdragon>base>cache-base>collection-visit": true,
-        "gulp>gulp-cli>matchdep>micromatch>snapdragon>base>cache-base>has-value": true,
-        "gulp>gulp-cli>matchdep>micromatch>snapdragon>base>cache-base>set-value": true,
-        "gulp>gulp-cli>matchdep>micromatch>snapdragon>base>cache-base>to-object-path": true,
-        "gulp>gulp-cli>matchdep>micromatch>snapdragon>base>cache-base>union-value": true,
-        "gulp>gulp-cli>matchdep>micromatch>snapdragon>base>cache-base>unset-value": true,
-        "gulp>gulp-cli>matchdep>micromatch>snapdragon>base>component-emitter": true
+        "lavamoat>@lavamoat/aa": true,
+        "@lavamoat/lavapack": true,
+        "browserify>browser-resolve": true,
+        "lavamoat-browserify>concat-stream": true,
+        "duplexify": true,
+        "lavamoat>lavamoat-core": true,
+        "lavamoat-browserify>readable-stream": true,
+        "through2": true
       }
     },
-    "gulp>gulp-cli>matchdep>micromatch>snapdragon>base>cache-base>collection-visit": {
+    "lavamoat>lavamoat-core": {
+      "builtin": {
+        "node:events": true,
+        "node:fs.readFileSync": true,
+        "node:fs/promises.writeFile": true,
+        "node:path.extname": true,
+        "node:path.join": true
+      },
+      "globals": {
+        "__dirname": true,
+        "console.error": true,
+        "console.warn": true,
+        "define": true
+      },
       "packages": {
-        "gulp>gulp-cli>matchdep>micromatch>snapdragon>base>cache-base>collection-visit>map-visit": true,
-        "gulp>gulp-cli>matchdep>micromatch>snapdragon>base>cache-base>collection-visit>object-visit": true
+        "@lavamoat/lavapack>json-stable-stringify": true,
+        "lavamoat>lavamoat-tofu": true,
+        "lavamoat>lavamoat-core>merge-deep": true
       }
     },
-    "gulp>gulp-cli>matchdep>micromatch>snapdragon>base>cache-base>collection-visit>map-visit": {
-      "builtin": {
-        "util.inspect": true
+    "lavamoat>lavamoat-tofu": {
+      "globals": {
+        "console.log": true
       },
       "packages": {
-        "gulp>gulp-cli>matchdep>micromatch>snapdragon>base>cache-base>collection-visit>object-visit": true
+        "@babel/core>@babel/parser": true,
+        "depcheck>@babel/traverse": true
       }
     },
-    "gulp>gulp-cli>matchdep>micromatch>snapdragon>base>cache-base>collection-visit>object-visit": {
-      "packages": {
-        "gulp>gulp-cli>isobject": true
+    "lavamoat>lavamoat-core>merge-deep>clone-deep>lazy-cache": {
+      "globals": {
+        "process.env.TRAVIS": true,
+        "process.env.UNLAZY": true
       }
     },
-    "gulp>gulp-cli>matchdep>micromatch>snapdragon>base>cache-base>has-value": {
-      "packages": {
-        "gulp>gulp-cli>array-sort>get-value": true,
-        "gulp>gulp-cli>isobject": true,
-        "gulp>gulp-cli>matchdep>micromatch>snapdragon>base>cache-base>has-value>has-values": true
+    "lavamoat>lavamoat-core>merge-deep>clone-deep>shallow-clone>lazy-cache": {
+      "globals": {
+        "process.env.UNLAZY": true
       }
     },
-    "gulp>gulp-cli>matchdep>micromatch>snapdragon>base>cache-base>has-value>has-values": {
+    "gulp>vinyl-fs>lazystream": {
+      "builtin": {
+        "util.inherits": true
+      },
       "packages": {
-        "gulp>gulp-cli>matchdep>micromatch>snapdragon>base>cache-base>has-value>has-values>is-number": true,
-        "gulp>gulp-cli>matchdep>micromatch>snapdragon>base>cache-base>has-value>has-values>kind-of": true
+        "gulp>vinyl-fs>lazystream>readable-stream": true
       }
     },
-    "gulp>gulp-cli>matchdep>micromatch>snapdragon>base>cache-base>has-value>has-values>is-number": {
+    "gulp>vinyl-fs>lead": {
+      "globals": {
+        "process.nextTick": true
+      },
       "packages": {
-        "gulp>gulp-cli>matchdep>micromatch>snapdragon>base>cache-base>has-value>has-values>is-number>kind-of": true
+        "gulp>vinyl-fs>lead>flush-write-stream": true
       }
     },
-    "gulp>gulp-cli>matchdep>micromatch>snapdragon>base>cache-base>has-value>has-values>is-number>kind-of": {
+    "eslint>levn": {
       "packages": {
-        "browserify>insert-module-globals>is-buffer": true
+        "eslint>levn>prelude-ls": true,
+        "eslint>levn>type-check": true
       }
     },
-    "gulp>gulp-cli>matchdep>micromatch>snapdragon>base>cache-base>has-value>has-values>kind-of": {
-      "packages": {
-        "browserify>insert-module-globals>is-buffer": true
+    "gulp-postcss>postcss-load-config>lilconfig": {
+      "builtin": {
+        "fs.accessSync": true,
+        "fs.promises.access": true,
+        "fs.promises.readFile": true,
+        "fs.readFileSync": true,
+        "os.homedir": true,
+        "path.extname": true,
+        "path.join": true,
+        "path.parse": true,
+        "path.resolve": true,
+        "path.sep": true
+      },
+      "globals": {
+        "process.cwd": true
       }
     },
-    "gulp>gulp-cli>matchdep>micromatch>snapdragon>base>cache-base>set-value": {
+    "eslint-plugin-import>eslint-module-utils>find-up>locate-path": {
+      "builtin": {
+        "path.resolve": true
+      },
+      "globals": {
+        "process.cwd": true
+      },
       "packages": {
-        "@babel/register>clone-deep>is-plain-object": true,
-        "gulp-watch>anymatch>micromatch>object.omit>is-extendable": true,
-        "gulp>gulp-cli>matchdep>micromatch>braces>split-string": true,
-        "gulp>gulp-cli>matchdep>micromatch>snapdragon>base>cache-base>set-value>extend-shallow": true
+        "eslint-plugin-import>eslint-module-utils>find-up>locate-path>p-locate": true,
+        "eslint-plugin-import>eslint-module-utils>find-up>locate-path>path-exists": true
       }
     },
-    "gulp>gulp-cli>matchdep>micromatch>snapdragon>base>cache-base>set-value>extend-shallow": {
+    "mocha>find-up>locate-path": {
+      "builtin": {
+        "fs.lstat": true,
+        "fs.lstatSync": true,
+        "fs.stat": true,
+        "fs.statSync": true,
+        "path.resolve": true,
+        "util.promisify": true
+      },
+      "globals": {
+        "process.cwd": true
+      },
       "packages": {
-        "gulp-watch>anymatch>micromatch>object.omit>is-extendable": true
+        "mocha>find-up>locate-path>p-locate": true
       }
     },
-    "gulp>gulp-cli>matchdep>micromatch>snapdragon>base>cache-base>to-object-path": {
-      "packages": {
-        "gulp>gulp-cli>matchdep>micromatch>snapdragon>base>cache-base>to-object-path>kind-of": true
+    "lodash": {
+      "globals": {
+        "define": true
       }
     },
-    "gulp>gulp-cli>matchdep>micromatch>snapdragon>base>cache-base>to-object-path>kind-of": {
+    "@babel/preset-env>babel-plugin-polyfill-corejs2>@babel/helper-define-polyfill-provider>lodash.debounce": {
+      "globals": {
+        "clearTimeout": true,
+        "setTimeout": true
+      }
+    },
+    "mocha>log-symbols": {
       "packages": {
-        "browserify>insert-module-globals>is-buffer": true
+        "chalk": true,
+        "mocha>log-symbols>is-unicode-supported": true
       }
     },
-    "gulp>gulp-cli>matchdep>micromatch>snapdragon>base>cache-base>union-value": {
+    "loose-envify": {
+      "builtin": {
+        "stream.PassThrough": true,
+        "stream.Transform": true,
+        "util.inherits": true
+      },
+      "globals": {
+        "process.env": true
+      },
       "packages": {
-        "gulp-watch>anymatch>micromatch>object.omit>is-extendable": true,
-        "gulp-zip>plugin-error>arr-union": true,
-        "gulp>gulp-cli>array-sort>get-value": true,
-        "gulp>gulp-cli>matchdep>micromatch>snapdragon>base>cache-base>set-value": true
+        "loose-envify>js-tokens": true
       }
     },
-    "gulp>gulp-cli>matchdep>micromatch>snapdragon>base>cache-base>unset-value": {
+    "@babel/core>@babel/helper-compilation-targets>lru-cache": {
       "packages": {
-        "gulp>gulp-cli>isobject": true,
-        "gulp>gulp-cli>matchdep>micromatch>snapdragon>base>cache-base>unset-value>has-value": true
+        "@babel/core>@babel/helper-compilation-targets>lru-cache>yallist": true
       }
     },
-    "gulp>gulp-cli>matchdep>micromatch>snapdragon>base>cache-base>unset-value>has-value": {
+    "gulp-sourcemaps>debug-fabulous>memoizee>lru-queue": {
       "packages": {
-        "gulp>gulp-cli>array-sort>get-value": true,
-        "gulp>gulp-cli>matchdep>micromatch>snapdragon>base>cache-base>unset-value>has-value>has-values": true,
-        "gulp>gulp-cli>matchdep>micromatch>snapdragon>base>cache-base>unset-value>has-value>isobject": true
+        "resolve-url-loader>es6-iterator>es5-ext": true
       }
     },
-    "gulp>gulp-cli>matchdep>micromatch>snapdragon>base>cache-base>unset-value>has-value>isobject": {
+    "gulp>undertaker>arr-map>make-iterator": {
       "packages": {
-        "gulp>gulp-cli>matchdep>micromatch>snapdragon>base>cache-base>unset-value>has-value>isobject>isarray": true
+        "@babel/register>clone-deep>kind-of": true
       }
     },
-    "gulp>gulp-cli>matchdep>micromatch>snapdragon>base>class-utils": {
+    "gulp-livereload>event-stream>map-stream": {
       "builtin": {
-        "util": true
+        "stream.Stream": true
       },
-      "packages": {
-        "gulp-zip>plugin-error>arr-union": true,
-        "gulp>gulp-cli>isobject": true,
-        "gulp>gulp-cli>matchdep>micromatch>snapdragon>base>class-utils>static-extend": true,
-        "gulp>gulp-cli>matchdep>micromatch>snapdragon>define-property": true
+      "globals": {
+        "process.nextTick": true
       }
     },
-    "gulp>gulp-cli>matchdep>micromatch>snapdragon>base>class-utils>static-extend": {
+    "gulp>gulp-cli>matchdep>micromatch>snapdragon>base>cache-base>collection-visit>map-visit": {
       "builtin": {
-        "util.inherits": true
+        "util.inspect": true
       },
       "packages": {
-        "gulp>gulp-cli>matchdep>micromatch>snapdragon>base>class-utils>static-extend>object-copy": true,
-        "gulp>gulp-cli>matchdep>micromatch>snapdragon>define-property": true
+        "gulp>gulp-cli>matchdep>micromatch>snapdragon>base>cache-base>collection-visit>object-visit": true
       }
     },
-    "gulp>gulp-cli>matchdep>micromatch>snapdragon>base>class-utils>static-extend>object-copy": {
+    "stylelint>@stylelint/postcss-markdown>remark>remark-stringify>markdown-table": {
       "packages": {
-        "gulp>gulp-cli>matchdep>micromatch>snapdragon>base>class-utils>static-extend>object-copy>copy-descriptor": true,
-        "gulp>gulp-cli>matchdep>micromatch>snapdragon>base>class-utils>static-extend>object-copy>kind-of": true,
-        "gulp>gulp-cli>matchdep>micromatch>snapdragon>define-property": true
+        "stylelint>@stylelint/postcss-markdown>remark>remark-parse>repeat-string": true
       }
     },
-    "gulp>gulp-cli>matchdep>micromatch>snapdragon>base>class-utils>static-extend>object-copy>kind-of": {
-      "packages": {
-        "browserify>insert-module-globals>is-buffer": true
+    "gulp-watch>anymatch>micromatch>braces>expand-range>fill-range>randomatic>math-random": {
+      "builtin": {
+        "crypto.randomBytes": true
       }
     },
-    "gulp>gulp-cli>matchdep>micromatch>snapdragon>base>define-property": {
+    "stylelint>@stylelint/postcss-markdown>remark>remark-stringify>mdast-util-compact": {
       "packages": {
-        "gulp>gulp-cli>matchdep>micromatch>define-property>is-descriptor": true
+        "react-markdown>unist-util-visit": true
       }
     },
-    "gulp>gulp-cli>matchdep>micromatch>snapdragon>base>mixin-deep": {
+    "gulp-sourcemaps>debug-fabulous>memoizee": {
+      "globals": {
+        "clearTimeout": true,
+        "setTimeout": true
+      },
       "packages": {
-        "gulp>gulp-cli>matchdep>micromatch>snapdragon>base>mixin-deep>is-extendable": true,
-        "gulp>undertaker>object.reduce>for-own>for-in": true
+        "resolve-url-loader>es6-iterator>d": true,
+        "resolve-url-loader>es6-iterator>es5-ext": true,
+        "gulp-sourcemaps>debug-fabulous>memoizee>event-emitter": true,
+        "gulp-sourcemaps>debug-fabulous>memoizee>is-promise": true,
+        "gulp-sourcemaps>debug-fabulous>memoizee>lru-queue": true,
+        "gulp-sourcemaps>debug-fabulous>memoizee>next-tick": true,
+        "gulp-sourcemaps>debug-fabulous>memoizee>timers-ext": true
       }
     },
-    "gulp>gulp-cli>matchdep>micromatch>snapdragon>base>mixin-deep>is-extendable": {
+    "lavamoat>lavamoat-core>merge-deep": {
       "packages": {
-        "@babel/register>clone-deep>is-plain-object": true
+        "gulp-zip>plugin-error>arr-union": true,
+        "lavamoat>lavamoat-core>merge-deep>clone-deep": true,
+        "lavamoat>lavamoat-core>merge-deep>kind-of": true
       }
     },
-    "gulp>gulp-cli>matchdep>micromatch>snapdragon>debug": {
+    "globby>merge2": {
       "builtin": {
-        "fs.SyncWriteStream": true,
-        "net.Socket": true,
-        "tty.WriteStream": true,
-        "tty.isatty": true,
-        "util": true
+        "stream.PassThrough": true
       },
       "globals": {
-        "chrome": true,
-        "console": true,
-        "document": true,
-        "localStorage": true,
-        "navigator": true,
-        "process": true
-      },
-      "packages": {
-        "gulp>gulp-cli>matchdep>micromatch>snapdragon>debug>ms": true
+        "process.nextTick": true
       }
     },
-    "gulp>gulp-cli>matchdep>micromatch>snapdragon>define-property": {
+    "gulp>glob-watcher>anymatch>micromatch": {
+      "builtin": {
+        "path.basename": true,
+        "path.sep": true,
+        "util.inspect": true
+      },
+      "globals": {
+        "process.platform": true
+      },
       "packages": {
-        "gulp>gulp-cli>matchdep>micromatch>snapdragon>define-property>is-descriptor": true
+        "gulp-zip>plugin-error>arr-diff": true,
+        "gulp>gulp-cli>matchdep>micromatch>array-unique": true,
+        "gulp>glob-watcher>anymatch>micromatch>braces": true,
+        "gulp>glob-watcher>anymatch>micromatch>define-property": true,
+        "gulp-zip>plugin-error>extend-shallow": true,
+        "gulp>glob-watcher>anymatch>micromatch>extglob": true,
+        "gulp>gulp-cli>matchdep>micromatch>fragment-cache": true,
+        "@babel/register>clone-deep>kind-of": true,
+        "gulp>gulp-cli>matchdep>micromatch>nanomatch": true,
+        "gulp>gulp-cli>liftoff>fined>object.pick": true,
+        "gulp>gulp-cli>matchdep>micromatch>regex-not": true,
+        "gulp>gulp-cli>matchdep>micromatch>snapdragon": true,
+        "gulp>gulp-cli>matchdep>micromatch>to-regex": true
       }
     },
-    "gulp>gulp-cli>matchdep>micromatch>snapdragon>define-property>is-descriptor": {
+    "gulp-watch>anymatch>micromatch": {
+      "builtin": {
+        "path.sep": true
+      },
+      "globals": {
+        "process": true
+      },
       "packages": {
-        "gulp>gulp-cli>matchdep>micromatch>snapdragon>define-property>is-descriptor>is-accessor-descriptor": true,
-        "gulp>gulp-cli>matchdep>micromatch>snapdragon>define-property>is-descriptor>is-data-descriptor": true,
-        "gulp>gulp-cli>matchdep>micromatch>snapdragon>define-property>is-descriptor>kind-of": true
+        "gulp-watch>anymatch>micromatch>arr-diff": true,
+        "gulp-watch>anymatch>micromatch>array-unique": true,
+        "gulp-watch>anymatch>micromatch>braces": true,
+        "gulp-watch>anymatch>micromatch>expand-brackets": true,
+        "gulp-watch>anymatch>micromatch>extglob": true,
+        "gulp-watch>anymatch>micromatch>filename-regex": true,
+        "gulp-watch>anymatch>micromatch>is-extglob": true,
+        "gulp-watch>anymatch>micromatch>is-glob": true,
+        "gulp-watch>anymatch>micromatch>kind-of": true,
+        "gulp-watch>anymatch>normalize-path": true,
+        "gulp-watch>anymatch>micromatch>object.omit": true,
+        "gulp-watch>anymatch>micromatch>parse-glob": true,
+        "gulp-watch>anymatch>micromatch>regex-cache": true
       }
     },
-    "gulp>gulp-cli>matchdep>micromatch>snapdragon>define-property>is-descriptor>is-accessor-descriptor": {
+    "fast-glob>micromatch": {
+      "builtin": {
+        "util.inspect": true
+      },
       "packages": {
-        "gulp>gulp-cli>matchdep>micromatch>snapdragon>define-property>is-descriptor>is-data-descriptor>kind-of": true
+        "chokidar>braces": true,
+        "chokidar>anymatch>picomatch": true
       }
     },
-    "gulp>gulp-cli>matchdep>micromatch>snapdragon>define-property>is-descriptor>is-data-descriptor": {
+    "eslint>minimatch": {
+      "builtin": {
+        "path": true
+      },
+      "globals": {
+        "console": true
+      },
       "packages": {
-        "gulp>gulp-cli>matchdep>micromatch>snapdragon>define-property>is-descriptor>is-data-descriptor>kind-of": true
+        "eslint>minimatch>brace-expansion": true
       }
     },
-    "gulp>gulp-cli>matchdep>micromatch>snapdragon>define-property>is-descriptor>is-data-descriptor>kind-of": {
+    "gulp>gulp-cli>matchdep>micromatch>snapdragon>base>mixin-deep": {
       "packages": {
-        "browserify>insert-module-globals>is-buffer": true
+        "gulp>undertaker>object.reduce>for-own>for-in": true,
+        "gulp>gulp-cli>matchdep>micromatch>snapdragon>base>mixin-deep>is-extendable": true
       }
     },
-    "gulp>gulp-cli>matchdep>micromatch>snapdragon>extend-shallow": {
+    "lavamoat>lavamoat-core>merge-deep>clone-deep>shallow-clone>mixin-object": {
       "packages": {
+        "lavamoat>lavamoat-core>merge-deep>clone-deep>shallow-clone>mixin-object>for-in": true,
         "gulp-watch>anymatch>micromatch>object.omit>is-extendable": true
       }
     },
-    "gulp>gulp-cli>matchdep>micromatch>snapdragon>use": {
-      "packages": {
-        "@babel/register>clone-deep>kind-of": true
+    "mockttp>portfinder>mkdirp": {
+      "builtin": {
+        "fs": true,
+        "path.dirname": true,
+        "path.resolve": true
       }
     },
-    "gulp>gulp-cli>matchdep>micromatch>to-regex": {
+    "browserify>module-deps": {
+      "builtin": {
+        "fs.createReadStream": true,
+        "fs.readFile": true,
+        "path.delimiter": true,
+        "path.dirname": true,
+        "path.join": true,
+        "path.resolve": true
+      },
+      "globals": {
+        "process.cwd": true,
+        "process.env.NODE_PATH": true,
+        "process.nextTick": true,
+        "process.platform": true,
+        "setTimeout": true,
+        "tr": true
+      },
       "packages": {
-        "gulp-zip>plugin-error>extend-shallow": true,
-        "gulp>gulp-cli>matchdep>micromatch>regex-not": true,
-        "gulp>gulp-cli>matchdep>micromatch>to-regex>define-property": true,
-        "gulp>gulp-cli>matchdep>micromatch>to-regex>safe-regex": true
+        "browserify>browser-resolve": true,
+        "browserify>cached-path-relative": true,
+        "browserify>concat-stream": true,
+        "watchify>defined": true,
+        "browserify>module-deps>detective": true,
+        "browserify>duplexer2": true,
+        "pumpify>inherits": true,
+        "loose-envify": true,
+        "browserify>parents": true,
+        "browserify>module-deps>readable-stream": true,
+        "depcheck>resolve": true,
+        "browserify>module-deps>stream-combiner2": true,
+        "browserify>module-deps>through2": true,
+        "watchify>xtend": true
       }
     },
-    "gulp>gulp-cli>matchdep>micromatch>to-regex>define-property": {
+    "gulp>gulp-cli>matchdep>micromatch>nanomatch": {
+      "builtin": {
+        "path.basename": true,
+        "path.sep": true,
+        "util.inspect": true
+      },
       "packages": {
-        "gulp>gulp-cli>isobject": true,
-        "gulp>gulp-cli>matchdep>micromatch>define-property>is-descriptor": true
+        "gulp-zip>plugin-error>arr-diff": true,
+        "gulp>gulp-cli>matchdep>micromatch>array-unique": true,
+        "gulp>gulp-cli>matchdep>micromatch>nanomatch>define-property": true,
+        "gulp-zip>plugin-error>extend-shallow": true,
+        "gulp>gulp-cli>matchdep>micromatch>fragment-cache": true,
+        "nyc>spawn-wrap>is-windows": true,
+        "@babel/register>clone-deep>kind-of": true,
+        "gulp>gulp-cli>liftoff>fined>object.pick": true,
+        "gulp>gulp-cli>matchdep>micromatch>regex-not": true,
+        "gulp>gulp-cli>matchdep>micromatch>snapdragon": true,
+        "gulp>gulp-cli>matchdep>micromatch>to-regex": true
       }
     },
-    "gulp>gulp-cli>matchdep>micromatch>to-regex>safe-regex": {
+    "gulp-sourcemaps>debug-fabulous>memoizee>next-tick": {
+      "globals": {
+        "MutationObserver": true,
+        "WebKitMutationObserver": true,
+        "document": true,
+        "process": true,
+        "queueMicrotask": true,
+        "setImmediate": true,
+        "setTimeout": true
+      }
+    },
+    "gulp-watch>chokidar>fsevents>node-pre-gyp": {
+      "builtin": {
+        "events.EventEmitter": true,
+        "fs.existsSync": true,
+        "fs.readFileSync": true,
+        "fs.renameSync": true,
+        "path.dirname": true,
+        "path.existsSync": true,
+        "path.join": true,
+        "path.resolve": true,
+        "url.parse": true,
+        "url.resolve": true,
+        "util.inherits": true
+      },
+      "globals": {
+        "__dirname": true,
+        "console.log": true,
+        "process.arch": true,
+        "process.cwd": true,
+        "process.env": true,
+        "process.platform": true,
+        "process.version.substr": true,
+        "process.versions": true
+      },
       "packages": {
-        "gulp>gulp-cli>matchdep>micromatch>to-regex>safe-regex>ret": true
+        "gulp-watch>chokidar>fsevents>node-pre-gyp>detect-libc": true,
+        "gulp-watch>chokidar>fsevents>node-pre-gyp>nopt": true,
+        "@lavamoat/allow-scripts>@npmcli/run-script>node-gyp>npmlog": true,
+        "gulp-watch>chokidar>fsevents>node-pre-gyp>rimraf": true,
+        "gulp-watch>chokidar>fsevents>node-pre-gyp>semver": true
       }
     },
-    "gulp>gulp-cli>replace-homedir>is-absolute": {
+    "node-sass": {
+      "native": true
+    },
+    "gulp-watch>chokidar>fsevents>node-pre-gyp>nopt": {
+      "builtin": {
+        "path": true,
+        "stream.Stream": true,
+        "url": true
+      },
+      "globals": {
+        "console": true,
+        "process.argv": true,
+        "process.env.DEBUG_NOPT": true,
+        "process.env.NOPT_DEBUG": true,
+        "process.platform": true
+      },
       "packages": {
-        "gulp>gulp-cli>replace-homedir>is-absolute>is-relative": true,
-        "nyc>spawn-wrap>is-windows": true
+        "@lavamoat/allow-scripts>@npmcli/run-script>node-gyp>nopt>abbrev": true,
+        "gulp-watch>chokidar>fsevents>node-pre-gyp>nopt>osenv": true
       }
     },
-    "gulp>gulp-cli>replace-homedir>is-absolute>is-relative": {
+    "gulp-watch>anymatch>normalize-path": {
       "packages": {
-        "gulp>gulp-cli>replace-homedir>is-absolute>is-relative>is-unc-path": true
+        "vinyl>remove-trailing-separator": true
       }
     },
-    "gulp>gulp-cli>replace-homedir>is-absolute>is-relative>is-unc-path": {
+    "stylelint>normalize-selector": {
+      "globals": {
+        "define": true
+      }
+    },
+    "gulp>vinyl-fs>vinyl-sourcemap>now-and-later": {
       "packages": {
-        "gulp>gulp-cli>replace-homedir>is-absolute>is-relative>is-unc-path>unc-path-regex": true
+        "@metamask/object-multiplex>once": true
       }
     },
-    "gulp>undertaker": {
+    "@lavamoat/allow-scripts>@npmcli/run-script>node-gyp>npmlog": {
       "builtin": {
-        "assert": true,
         "events.EventEmitter": true,
-        "util.inherits": true
+        "util": true
       },
       "globals": {
-        "process.env.UNDERTAKER_SETTLE": true,
-        "process.env.UNDERTAKER_TIME_RESOLUTION": true,
-        "process.hrtime": true
+        "process.nextTick": true,
+        "process.stderr": true
       },
       "packages": {
-        "gulp>undertaker>arr-flatten": true,
-        "gulp>undertaker>arr-map": true,
-        "gulp>undertaker>bach": true,
-        "gulp>undertaker>collection-map": true,
-        "gulp>undertaker>es6-weak-map": true,
-        "gulp>undertaker>last-run": true,
-        "gulp>undertaker>object.defaults": true,
-        "gulp>undertaker>object.reduce": true,
-        "gulp>undertaker>undertaker-registry": true
-      }
-    },
-    "gulp>undertaker>arr-map": {
-      "packages": {
-        "gulp>undertaker>arr-map>make-iterator": true
+        "@lavamoat/allow-scripts>@npmcli/run-script>node-gyp>npmlog>are-we-there-yet": true,
+        "@storybook/react>@storybook/node-logger>npmlog>console-control-strings": true,
+        "@lavamoat/allow-scripts>@npmcli/run-script>node-gyp>npmlog>gauge": true,
+        "nyc>yargs>set-blocking": true
       }
     },
-    "gulp>undertaker>arr-map>make-iterator": {
+    "gulp>gulp-cli>matchdep>micromatch>snapdragon>base>class-utils>static-extend>object-copy": {
       "packages": {
-        "@babel/register>clone-deep>kind-of": true
+        "gulp>gulp-cli>matchdep>micromatch>snapdragon>base>class-utils>static-extend>object-copy>copy-descriptor": true,
+        "gulp>gulp-cli>matchdep>micromatch>snapdragon>define-property": true,
+        "gulp>gulp-cli>matchdep>micromatch>snapdragon>base>class-utils>static-extend>object-copy>kind-of": true
       }
     },
-    "gulp>undertaker>bach": {
+    "string.prototype.matchall>es-abstract>object-inspect": {
       "builtin": {
-        "assert.ok": true
+        "util.inspect": true
       },
-      "packages": {
-        "gulp>glob-watcher>async-done": true,
-        "gulp>undertaker>arr-flatten": true,
-        "gulp>undertaker>arr-map": true,
-        "gulp>undertaker>bach>arr-filter": true,
-        "gulp>undertaker>bach>array-each": true,
-        "gulp>undertaker>bach>array-initial": true,
-        "gulp>undertaker>bach>array-last": true,
-        "gulp>undertaker>bach>async-settle": true,
-        "gulp>vinyl-fs>vinyl-sourcemap>now-and-later": true
+      "globals": {
+        "HTMLElement": true,
+        "WeakRef": true
       }
     },
-    "gulp>undertaker>bach>arr-filter": {
+    "gulp>gulp-cli>matchdep>micromatch>snapdragon>base>cache-base>collection-visit>object-visit": {
       "packages": {
-        "gulp>undertaker>arr-map>make-iterator": true
+        "gulp>gulp-cli>isobject": true
       }
     },
-    "gulp>undertaker>bach>array-initial": {
+    "gulp>vinyl-fs>object.assign": {
       "packages": {
-        "gulp>undertaker>bach>array-last>is-number": true,
-        "gulp>undertaker>object.defaults>array-slice": true
+        "string.prototype.matchall>call-bind": true,
+        "string.prototype.matchall>define-properties": true,
+        "string.prototype.matchall>has-symbols": true,
+        "@lavamoat/lavapack>json-stable-stringify>object-keys": true
       }
     },
-    "gulp>undertaker>bach>array-last": {
+    "gulp>undertaker>object.defaults": {
       "packages": {
-        "gulp>undertaker>bach>array-last>is-number": true
+        "gulp>undertaker>bach>array-each": true,
+        "gulp>undertaker>object.defaults>array-slice": true,
+        "gulp>undertaker>object.reduce>for-own": true,
+        "gulp>gulp-cli>isobject": true
       }
     },
-    "gulp>undertaker>bach>async-settle": {
+    "eslint-plugin-react>object.entries": {
       "packages": {
-        "gulp>glob-watcher>async-done": true
+        "string.prototype.matchall>call-bind": true,
+        "string.prototype.matchall>define-properties": true,
+        "string.prototype.matchall>es-abstract": true
       }
     },
-    "gulp>undertaker>collection-map": {
+    "eslint-plugin-react>object.fromentries": {
       "packages": {
-        "gulp>undertaker>arr-map": true,
-        "gulp>undertaker>arr-map>make-iterator": true,
-        "gulp>undertaker>object.reduce>for-own": true
+        "string.prototype.matchall>call-bind": true,
+        "string.prototype.matchall>define-properties": true,
+        "string.prototype.matchall>es-abstract": true
       }
     },
-    "gulp>undertaker>es6-weak-map": {
+    "eslint-plugin-react>object.hasown": {
       "packages": {
-        "resolve-url-loader>es6-iterator": true,
-        "resolve-url-loader>es6-iterator>d": true,
-        "resolve-url-loader>es6-iterator>es5-ext": true,
-        "resolve-url-loader>es6-iterator>es6-symbol": true
+        "string.prototype.matchall>es-abstract": true
       }
     },
-    "gulp>undertaker>last-run": {
-      "builtin": {
-        "assert": true
-      },
+    "gulp-watch>anymatch>micromatch>object.omit": {
       "packages": {
-        "gulp>undertaker>es6-weak-map": true,
-        "gulp>undertaker>last-run>default-resolution": true
-      }
-    },
-    "gulp>undertaker>last-run>default-resolution": {
-      "globals": {
-        "process.version.match": true
+        "gulp-watch>anymatch>micromatch>object.omit>for-own": true,
+        "gulp-watch>anymatch>micromatch>object.omit>is-extendable": true
       }
     },
-    "gulp>undertaker>object.defaults": {
+    "gulp>gulp-cli>liftoff>fined>object.pick": {
       "packages": {
-        "gulp>gulp-cli>isobject": true,
-        "gulp>undertaker>bach>array-each": true,
-        "gulp>undertaker>object.defaults>array-slice": true,
-        "gulp>undertaker>object.reduce>for-own": true
+        "gulp>gulp-cli>isobject": true
       }
     },
     "gulp>undertaker>object.reduce": {
       "packages": {
-        "gulp>undertaker>arr-map>make-iterator": true,
-        "gulp>undertaker>object.reduce>for-own": true
+        "gulp>undertaker>object.reduce>for-own": true,
+        "gulp>undertaker>arr-map>make-iterator": true
       }
     },
-    "gulp>undertaker>object.reduce>for-own": {
+    "@metamask/object-multiplex>once": {
       "packages": {
-        "gulp>undertaker>object.reduce>for-own>for-in": true
+        "@metamask/object-multiplex>once>wrappy": true
       }
     },
-    "gulp>vinyl-fs": {
+    "gulp>vinyl-fs>glob-stream>ordered-read-streams": {
       "builtin": {
-        "os.platform": true,
-        "path.relative": true,
-        "path.resolve": true,
         "util.inherits": true
       },
-      "globals": {
-        "Buffer.isBuffer": true,
-        "process.cwd": true,
-        "process.geteuid": true,
-        "process.getuid": true,
-        "process.nextTick": true
-      },
       "packages": {
-        "del>graceful-fs": true,
-        "gulp>vinyl-fs>fs-mkdirp-stream": true,
-        "gulp>vinyl-fs>glob-stream": true,
-        "gulp>vinyl-fs>is-valid-glob": true,
-        "gulp>vinyl-fs>lazystream": true,
-        "gulp>vinyl-fs>lead": true,
-        "gulp>vinyl-fs>object.assign": true,
-        "gulp>vinyl-fs>pumpify": true,
-        "gulp>vinyl-fs>readable-stream": true,
-        "gulp>vinyl-fs>remove-bom-buffer": true,
-        "gulp>vinyl-fs>remove-bom-stream": true,
-        "gulp>vinyl-fs>resolve-options": true,
-        "gulp>vinyl-fs>through2": true,
-        "gulp>vinyl-fs>to-through": true,
-        "gulp>vinyl-fs>value-or-function": true,
-        "gulp>vinyl-fs>vinyl-sourcemap": true,
-        "vinyl": true
+        "gulp>vinyl-fs>glob-stream>ordered-read-streams>readable-stream": true
       }
     },
-    "gulp>vinyl-fs>fs-mkdirp-stream": {
+    "@storybook/core>@storybook/core-server>x-default-browser>default-browser-id>untildify>os-homedir": {
       "builtin": {
-        "path.dirname": true,
-        "path.resolve": true
+        "os.homedir": true
       },
       "globals": {
-        "process.umask": true
-      },
-      "packages": {
-        "del>graceful-fs": true,
-        "gulp>vinyl-fs>fs-mkdirp-stream>through2": true
+        "process.env": true,
+        "process.getuid": true,
+        "process.platform": true
       }
     },
-    "gulp>vinyl-fs>fs-mkdirp-stream>through2": {
-      "builtin": {
-        "util.inherits": true
-      },
+    "gulp-watch>chokidar>fsevents>node-pre-gyp>nopt>osenv>os-tmpdir": {
       "globals": {
-        "process.nextTick": true
-      },
-      "packages": {
-        "gulp>vinyl-fs>fs-mkdirp-stream>through2>readable-stream": true,
-        "watchify>xtend": true
+        "process.env.SystemRoot": true,
+        "process.env.TEMP": true,
+        "process.env.TMP": true,
+        "process.env.TMPDIR": true,
+        "process.env.windir": true,
+        "process.platform": true
       }
     },
-    "gulp>vinyl-fs>fs-mkdirp-stream>through2>readable-stream": {
+    "gulp-watch>chokidar>fsevents>node-pre-gyp>nopt>osenv": {
       "builtin": {
-        "events.EventEmitter": true,
-        "stream": true,
-        "util": true
+        "child_process.exec": true,
+        "path": true
       },
       "globals": {
-        "process.browser": true,
-        "process.env.READABLE_STREAM": true,
-        "process.stderr": true,
-        "process.stdout": true,
-        "process.version.slice": true,
-        "setImmediate": true
+        "process.env.COMPUTERNAME": true,
+        "process.env.ComSpec": true,
+        "process.env.EDITOR": true,
+        "process.env.HOSTNAME": true,
+        "process.env.PATH": true,
+        "process.env.PROMPT": true,
+        "process.env.PS1": true,
+        "process.env.Path": true,
+        "process.env.SHELL": true,
+        "process.env.USER": true,
+        "process.env.USERDOMAIN": true,
+        "process.env.USERNAME": true,
+        "process.env.VISUAL": true,
+        "process.env.path": true,
+        "process.nextTick": true,
+        "process.platform": true
       },
       "packages": {
-        "gulp>vinyl-fs>fs-mkdirp-stream>through2>readable-stream>isarray": true,
-        "gulp>vinyl-fs>fs-mkdirp-stream>through2>readable-stream>safe-buffer": true,
-        "gulp>vinyl-fs>fs-mkdirp-stream>through2>readable-stream>string_decoder": true,
-        "pumpify>inherits": true,
-        "readable-stream-2>core-util-is": true,
-        "readable-stream-2>process-nextick-args": true,
-        "readable-stream>util-deprecate": true
+        "@storybook/core>@storybook/core-server>x-default-browser>default-browser-id>untildify>os-homedir": true,
+        "gulp-watch>chokidar>fsevents>node-pre-gyp>nopt>osenv>os-tmpdir": true
       }
     },
-    "gulp>vinyl-fs>fs-mkdirp-stream>through2>readable-stream>safe-buffer": {
-      "builtin": {
-        "buffer": true
+    "@storybook/test-runner>jest-circus>p-limit": {
+      "packages": {
+        "@storybook/test-runner>jest-circus>p-limit>yocto-queue": true
       }
     },
-    "gulp>vinyl-fs>fs-mkdirp-stream>through2>readable-stream>string_decoder": {
+    "eslint-plugin-import>eslint-module-utils>find-up>locate-path>p-locate>p-limit": {
       "packages": {
-        "gulp>vinyl-fs>fs-mkdirp-stream>through2>readable-stream>safe-buffer": true
+        "eslint-plugin-import>eslint-module-utils>find-up>locate-path>p-locate>p-limit>p-try": true
       }
     },
-    "gulp>vinyl-fs>glob-stream": {
-      "builtin": {
-        "util.inherits": true
-      },
-      "globals": {
-        "process.cwd": true,
-        "process.nextTick": true
-      },
+    "eslint-plugin-import>eslint-module-utils>find-up>locate-path>p-locate": {
       "packages": {
-        "eslint>glob-parent": true,
-        "gulp>glob-watcher>is-negated-glob": true,
-        "gulp>vinyl-fs>glob-stream>ordered-read-streams": true,
-        "gulp>vinyl-fs>glob-stream>pumpify": true,
-        "gulp>vinyl-fs>glob-stream>readable-stream": true,
-        "gulp>vinyl-fs>glob-stream>to-absolute-glob": true,
-        "gulp>vinyl-fs>glob-stream>unique-stream": true,
-        "nyc>glob": true,
-        "react-markdown>unified>extend": true,
-        "vinyl>remove-trailing-separator": true
+        "eslint-plugin-import>eslint-module-utils>find-up>locate-path>p-locate>p-limit": true
       }
     },
-    "gulp>vinyl-fs>glob-stream>ordered-read-streams": {
-      "builtin": {
-        "util.inherits": true
-      },
+    "mocha>find-up>locate-path>p-locate": {
       "packages": {
-        "gulp>vinyl-fs>glob-stream>ordered-read-streams>readable-stream": true
+        "@storybook/test-runner>jest-circus>p-limit": true
       }
     },
-    "gulp>vinyl-fs>glob-stream>ordered-read-streams>readable-stream": {
-      "builtin": {
-        "events.EventEmitter": true,
-        "stream": true,
-        "util": true
-      },
-      "globals": {
-        "process.browser": true,
-        "process.env.READABLE_STREAM": true,
-        "process.stderr": true,
-        "process.stdout": true,
-        "process.version.slice": true,
-        "setImmediate": true
-      },
+    "del>p-map": {
       "packages": {
-        "gulp>vinyl-fs>glob-stream>ordered-read-streams>readable-stream>isarray": true,
-        "gulp>vinyl-fs>glob-stream>ordered-read-streams>readable-stream>safe-buffer": true,
-        "gulp>vinyl-fs>glob-stream>ordered-read-streams>readable-stream>string_decoder": true,
-        "pumpify>inherits": true,
-        "readable-stream-2>core-util-is": true,
-        "readable-stream-2>process-nextick-args": true,
-        "readable-stream>util-deprecate": true
+        "del>p-map>aggregate-error": true
       }
     },
-    "gulp>vinyl-fs>glob-stream>ordered-read-streams>readable-stream>safe-buffer": {
-      "builtin": {
-        "buffer": true
+    "eslint>@eslint/eslintrc>import-fresh>parent-module": {
+      "packages": {
+        "@metamask/test-bundler>ow>callsites": true
       }
     },
-    "gulp>vinyl-fs>glob-stream>ordered-read-streams>readable-stream>string_decoder": {
+    "browserify>parents": {
+      "globals": {
+        "process.cwd": true,
+        "process.platform": true
+      },
       "packages": {
-        "gulp>vinyl-fs>glob-stream>ordered-read-streams>readable-stream>safe-buffer": true
+        "browserify>parents>path-platform": true
       }
     },
-    "gulp>vinyl-fs>glob-stream>pumpify": {
+    "react-syntax-highlighter>refractor>parse-entities": {
       "packages": {
-        "gulp>vinyl-fs>glob-stream>pumpify>duplexify": true,
-        "gulp>vinyl-fs>glob-stream>pumpify>pump": true,
-        "pumpify>inherits": true
+        "react-syntax-highlighter>refractor>parse-entities>character-entities-legacy": true,
+        "react-syntax-highlighter>refractor>parse-entities>character-entities": true,
+        "react-syntax-highlighter>refractor>parse-entities>character-reference-invalid": true,
+        "react-syntax-highlighter>refractor>parse-entities>is-alphanumerical": true,
+        "react-syntax-highlighter>refractor>parse-entities>is-decimal": true,
+        "react-syntax-highlighter>refractor>parse-entities>is-hexadecimal": true
       }
     },
-    "gulp>vinyl-fs>glob-stream>pumpify>duplexify": {
-      "globals": {
-        "Buffer": true,
-        "process.nextTick": true
-      },
+    "gulp-watch>anymatch>micromatch>parse-glob": {
       "packages": {
-        "duplexify>end-of-stream": true,
-        "duplexify>stream-shift": true,
-        "gulp>vinyl-fs>glob-stream>readable-stream": true,
-        "pumpify>inherits": true
+        "gulp-watch>anymatch>micromatch>parse-glob>glob-base": true,
+        "gulp-watch>anymatch>micromatch>parse-glob>is-dotfile": true,
+        "gulp-watch>anymatch>micromatch>is-extglob": true,
+        "gulp-watch>anymatch>micromatch>parse-glob>is-glob": true
       }
     },
-    "gulp>vinyl-fs>glob-stream>pumpify>pump": {
-      "builtin": {
-        "fs": true
-      },
+    "depcheck>cosmiconfig>parse-json": {
       "packages": {
-        "@metamask/object-multiplex>once": true,
-        "duplexify>end-of-stream": true
+        "@babel/code-frame": true,
+        "depcheck>cosmiconfig>parse-json>error-ex": true,
+        "webpack>json-parse-even-better-errors": true,
+        "depcheck>cosmiconfig>parse-json>lines-and-columns": true
       }
     },
-    "gulp>vinyl-fs>glob-stream>readable-stream": {
+    "nyc>find-up>path-exists": {
       "builtin": {
-        "events.EventEmitter": true,
-        "stream": true,
-        "util": true
-      },
-      "globals": {
-        "process.browser": true,
-        "process.env.READABLE_STREAM": true,
-        "process.stderr": true,
-        "process.stdout": true,
-        "process.version.slice": true,
-        "setImmediate": true
-      },
-      "packages": {
-        "gulp>vinyl-fs>glob-stream>readable-stream>isarray": true,
-        "gulp>vinyl-fs>glob-stream>readable-stream>safe-buffer": true,
-        "gulp>vinyl-fs>glob-stream>readable-stream>string_decoder": true,
-        "pumpify>inherits": true,
-        "readable-stream-2>core-util-is": true,
-        "readable-stream-2>process-nextick-args": true,
-        "readable-stream>util-deprecate": true
+        "fs.access": true,
+        "fs.accessSync": true,
+        "util.promisify": true
       }
     },
-    "gulp>vinyl-fs>glob-stream>readable-stream>safe-buffer": {
+    "eslint-plugin-import>eslint-module-utils>find-up>locate-path>path-exists": {
       "builtin": {
-        "buffer": true
+        "fs.access": true,
+        "fs.accessSync": true
       }
     },
-    "gulp>vinyl-fs>glob-stream>readable-stream>string_decoder": {
-      "packages": {
-        "gulp>vinyl-fs>glob-stream>readable-stream>safe-buffer": true
+    "gulp-watch>path-is-absolute": {
+      "globals": {
+        "process.platform": true
       }
     },
-    "gulp>vinyl-fs>glob-stream>to-absolute-glob": {
+    "depcheck>resolve>path-parse": {
+      "globals": {
+        "process.platform": true
+      }
+    },
+    "browserify>parents>path-platform": {
       "builtin": {
-        "path.resolve": true
+        "path": true,
+        "util.isObject": true,
+        "util.isString": true
       },
       "globals": {
         "process.cwd": true,
+        "process.env": true,
         "process.platform": true
-      },
-      "packages": {
-        "gulp>glob-watcher>is-negated-glob": true,
-        "gulp>gulp-cli>replace-homedir>is-absolute": true
       }
     },
-    "gulp>vinyl-fs>glob-stream>unique-stream": {
-      "packages": {
-        "@lavamoat/lavapack>json-stable-stringify": true,
-        "gulp>vinyl-fs>glob-stream>unique-stream>through2-filter": true
+    "globby>dir-glob>path-type": {
+      "builtin": {
+        "fs": true,
+        "util.promisify": true
       }
     },
-    "gulp>vinyl-fs>glob-stream>unique-stream>through2-filter": {
+    "gulp-livereload>event-stream>pause-stream": {
       "packages": {
-        "gulp>vinyl-fs>glob-stream>unique-stream>through2-filter>through2": true,
-        "watchify>xtend": true
+        "debounce-stream>through": true
       }
     },
-    "gulp>vinyl-fs>glob-stream>unique-stream>through2-filter>through2": {
+    "postcss>picocolors": {
+      "globals": {
+        "process": true
+      }
+    },
+    "gulp-sourcemaps>@gulp-sourcemaps/identity-map>postcss>picocolors": {
       "builtin": {
-        "util.inherits": true
+        "tty.isatty": true
       },
       "globals": {
-        "process.nextTick": true
+        "process.argv.includes": true,
+        "process.env": true,
+        "process.platform": true
+      }
+    },
+    "stylelint>postcss-less>postcss>picocolors": {
+      "builtin": {
+        "tty.isatty": true
       },
-      "packages": {
-        "gulp>vinyl-fs>glob-stream>unique-stream>through2-filter>through2>readable-stream": true,
-        "watchify>xtend": true
+      "globals": {
+        "process.argv.includes": true,
+        "process.env": true,
+        "process.platform": true
       }
     },
-    "gulp>vinyl-fs>glob-stream>unique-stream>through2-filter>through2>readable-stream": {
+    "stylelint>postcss-safe-parser>postcss>picocolors": {
       "builtin": {
-        "events.EventEmitter": true,
-        "stream": true,
-        "util": true
+        "tty.isatty": true
       },
       "globals": {
-        "process.browser": true,
-        "process.env.READABLE_STREAM": true,
-        "process.stderr": true,
-        "process.stdout": true,
-        "process.version.slice": true,
-        "setImmediate": true
-      },
-      "packages": {
-        "gulp>vinyl-fs>glob-stream>unique-stream>through2-filter>through2>readable-stream>isarray": true,
-        "gulp>vinyl-fs>glob-stream>unique-stream>through2-filter>through2>readable-stream>safe-buffer": true,
-        "gulp>vinyl-fs>glob-stream>unique-stream>through2-filter>through2>readable-stream>string_decoder": true,
-        "pumpify>inherits": true,
-        "readable-stream-2>core-util-is": true,
-        "readable-stream-2>process-nextick-args": true,
-        "readable-stream>util-deprecate": true
+        "process.argv.includes": true,
+        "process.env": true,
+        "process.platform": true
       }
     },
-    "gulp>vinyl-fs>glob-stream>unique-stream>through2-filter>through2>readable-stream>safe-buffer": {
+    "stylelint>postcss-sass>postcss>picocolors": {
       "builtin": {
-        "buffer": true
+        "tty.isatty": true
+      },
+      "globals": {
+        "process.argv.includes": true,
+        "process.env": true,
+        "process.platform": true
       }
     },
-    "gulp>vinyl-fs>glob-stream>unique-stream>through2-filter>through2>readable-stream>string_decoder": {
-      "packages": {
-        "gulp>vinyl-fs>glob-stream>unique-stream>through2-filter>through2>readable-stream>safe-buffer": true
+    "stylelint>postcss-scss>postcss>picocolors": {
+      "builtin": {
+        "tty.isatty": true
+      },
+      "globals": {
+        "process.argv.includes": true,
+        "process.env": true,
+        "process.platform": true
       }
     },
-    "gulp>vinyl-fs>lazystream": {
+    "stylelint>postcss>picocolors": {
       "builtin": {
-        "util.inherits": true
+        "tty.isatty": true
       },
-      "packages": {
-        "gulp>vinyl-fs>lazystream>readable-stream": true
+      "globals": {
+        "process.argv.includes": true,
+        "process.env": true,
+        "process.platform": true
       }
     },
-    "gulp>vinyl-fs>lazystream>readable-stream": {
+    "stylelint>sugarss>postcss>picocolors": {
       "builtin": {
-        "events.EventEmitter": true,
-        "stream": true,
-        "util": true
+        "tty.isatty": true
       },
       "globals": {
-        "process.browser": true,
-        "process.env.READABLE_STREAM": true,
-        "process.stderr": true,
-        "process.stdout": true,
-        "process.version.slice": true,
-        "setImmediate": true
-      },
-      "packages": {
-        "gulp>vinyl-fs>lazystream>readable-stream>isarray": true,
-        "gulp>vinyl-fs>lazystream>readable-stream>safe-buffer": true,
-        "gulp>vinyl-fs>lazystream>readable-stream>string_decoder": true,
-        "pumpify>inherits": true,
-        "readable-stream-2>core-util-is": true,
-        "readable-stream-2>process-nextick-args": true,
-        "readable-stream>util-deprecate": true
+        "process.argv.includes": true,
+        "process.env": true,
+        "process.platform": true
       }
     },
-    "gulp>vinyl-fs>lazystream>readable-stream>safe-buffer": {
+    "chokidar>anymatch>picomatch": {
       "builtin": {
-        "buffer": true
+        "path.basename": true,
+        "path.sep": true
+      },
+      "globals": {
+        "process.platform": true,
+        "process.version.slice": true
       }
     },
-    "gulp>vinyl-fs>lazystream>readable-stream>string_decoder": {
+    "gh-pages>globby>pinkie-promise": {
       "packages": {
-        "gulp>vinyl-fs>lazystream>readable-stream>safe-buffer": true
+        "gh-pages>globby>pinkie-promise>pinkie": true
       }
     },
-    "gulp>vinyl-fs>lead": {
+    "gh-pages>globby>pinkie-promise>pinkie": {
       "globals": {
-        "process.nextTick": true
-      },
-      "packages": {
-        "gulp>vinyl-fs>lead>flush-write-stream": true
+        "process": true,
+        "setImmediate": true,
+        "setTimeout": true
       }
     },
-    "gulp>vinyl-fs>lead>flush-write-stream": {
-      "globals": {
-        "Buffer": true
+    "gulp-zip>plugin-error": {
+      "builtin": {
+        "util.inherits": true
       },
       "packages": {
-        "gulp>vinyl-fs>lead>flush-write-stream>readable-stream": true,
-        "pumpify>inherits": true
+        "gulp-watch>ansi-colors": true,
+        "gulp-zip>plugin-error>arr-diff": true,
+        "gulp-zip>plugin-error>arr-union": true,
+        "gulp-zip>plugin-error>extend-shallow": true
       }
     },
-    "gulp>vinyl-fs>lead>flush-write-stream>readable-stream": {
+    "postcss": {
       "builtin": {
-        "events.EventEmitter": true,
-        "stream": true,
-        "util": true
+        "fs.existsSync": true,
+        "fs.readFileSync": true,
+        "path.dirname": true,
+        "path.isAbsolute": true,
+        "path.join": true,
+        "path.relative": true,
+        "path.resolve": true,
+        "path.sep": true,
+        "url.fileURLToPath": true,
+        "url.pathToFileURL": true
       },
       "globals": {
-        "process.browser": true,
-        "process.env.READABLE_STREAM": true,
-        "process.stderr": true,
-        "process.stdout": true,
-        "process.version.slice": true,
-        "setImmediate": true
+        "Buffer": true,
+        "URL": true,
+        "atob": true,
+        "btoa": true,
+        "console": true,
+        "process.env.LANG": true,
+        "process.env.NODE_ENV": true
       },
       "packages": {
-        "gulp>vinyl-fs>lead>flush-write-stream>readable-stream>isarray": true,
-        "gulp>vinyl-fs>lead>flush-write-stream>readable-stream>safe-buffer": true,
-        "gulp>vinyl-fs>lead>flush-write-stream>readable-stream>string_decoder": true,
-        "pumpify>inherits": true,
-        "readable-stream-2>core-util-is": true,
-        "readable-stream-2>process-nextick-args": true,
-        "readable-stream>util-deprecate": true
-      }
-    },
-    "gulp>vinyl-fs>lead>flush-write-stream>readable-stream>safe-buffer": {
-      "builtin": {
-        "buffer": true
+        "nanoid": true,
+        "postcss>picocolors": true,
+        "postcss>source-map-js": true
       }
     },
-    "gulp>vinyl-fs>lead>flush-write-stream>readable-stream>string_decoder": {
+    "postcss-discard-font-face": {
       "packages": {
-        "gulp>vinyl-fs>lead>flush-write-stream>readable-stream>safe-buffer": true
+        "postcss-discard-font-face>balanced-match": true,
+        "postcss-discard-font-face>postcss": true
       }
     },
-    "gulp>vinyl-fs>object.assign": {
+    "stylelint>postcss-html": {
+      "globals": {
+        "__dirname": true
+      },
       "packages": {
-        "@lavamoat/lavapack>json-stable-stringify>object-keys": true,
-        "string.prototype.matchall>call-bind": true,
-        "string.prototype.matchall>define-properties": true,
-        "string.prototype.matchall>has-symbols": true
+        "stylelint>postcss-html>htmlparser2": true,
+        "stylelint>postcss-syntax": true
       }
     },
-    "gulp>vinyl-fs>pumpify": {
+    "stylelint>postcss-less": {
       "packages": {
-        "gulp>vinyl-fs>pumpify>duplexify": true,
-        "gulp>vinyl-fs>pumpify>pump": true,
-        "pumpify>inherits": true
+        "stylelint>postcss-less>postcss": true
       }
     },
-    "gulp>vinyl-fs>pumpify>duplexify": {
+    "gulp-postcss>postcss-load-config": {
+      "builtin": {
+        "module.createRequire": true,
+        "module.createRequireFromPath": true,
+        "path.resolve": true
+      },
       "globals": {
-        "Buffer": true,
-        "process.nextTick": true
+        "process.cwd": true,
+        "process.env.NODE_ENV": true
       },
       "packages": {
-        "duplexify>end-of-stream": true,
-        "duplexify>stream-shift": true,
-        "gulp>vinyl-fs>readable-stream": true,
-        "pumpify>inherits": true
+        "gulp-postcss>postcss-load-config>lilconfig": true,
+        "ts-node": true,
+        "gulp-postcss>postcss-load-config>yaml": true
       }
     },
-    "gulp>vinyl-fs>pumpify>pump": {
-      "builtin": {
-        "fs": true
-      },
+    "stylelint>postcss-reporter": {
       "packages": {
-        "@metamask/object-multiplex>once": true,
-        "duplexify>end-of-stream": true
+        "lodash": true
       }
     },
-    "gulp>vinyl-fs>readable-stream": {
-      "builtin": {
-        "events.EventEmitter": true,
-        "stream": true,
-        "util": true
-      },
+    "postcss-rtlcss": {
       "globals": {
-        "process.browser": true,
-        "process.env.READABLE_STREAM": true,
-        "process.stderr": true,
-        "process.stdout": true,
-        "process.version.slice": true,
-        "setImmediate": true
+        "SuppressedError": true
       },
       "packages": {
-        "gulp>vinyl-fs>readable-stream>isarray": true,
-        "gulp>vinyl-fs>readable-stream>safe-buffer": true,
-        "gulp>vinyl-fs>readable-stream>string_decoder": true,
-        "pumpify>inherits": true,
-        "readable-stream-2>core-util-is": true,
-        "readable-stream-2>process-nextick-args": true,
-        "readable-stream>util-deprecate": true
+        "postcss": true,
+        "postcss-rtlcss>rtlcss": true
       }
     },
-    "gulp>vinyl-fs>readable-stream>safe-buffer": {
-      "builtin": {
-        "buffer": true
+    "stylelint>postcss-safe-parser": {
+      "packages": {
+        "stylelint>postcss-safe-parser>postcss": true
       }
     },
-    "gulp>vinyl-fs>readable-stream>string_decoder": {
+    "stylelint>postcss-sass": {
       "packages": {
-        "gulp>vinyl-fs>readable-stream>safe-buffer": true
+        "stylelint>postcss-sass>gonzales-pe": true,
+        "stylelint>postcss-sass>postcss": true
       }
     },
-    "gulp>vinyl-fs>remove-bom-buffer": {
+    "stylelint>postcss-scss": {
       "packages": {
-        "browserify>insert-module-globals>is-buffer": true,
-        "gulp>vinyl-fs>remove-bom-buffer>is-utf8": true
+        "stylelint>postcss-scss>postcss": true
       }
     },
-    "gulp>vinyl-fs>remove-bom-stream": {
+    "stylelint>postcss-selector-parser": {
       "packages": {
-        "gulp>vinyl-fs>remove-bom-buffer": true,
-        "gulp>vinyl-fs>remove-bom-stream>through2": true,
-        "koa>content-disposition>safe-buffer": true
+        "stylelint>postcss-selector-parser>cssesc": true,
+        "readable-stream>util-deprecate": true
       }
     },
-    "gulp>vinyl-fs>remove-bom-stream>through2": {
+    "stylelint>postcss-syntax": {
       "builtin": {
-        "util.inherits": true
-      },
-      "globals": {
-        "process.nextTick": true
+        "path.isAbsolute": true,
+        "path.resolve": true,
+        "path.sep": true
       },
       "packages": {
-        "gulp>vinyl-fs>remove-bom-stream>through2>readable-stream": true,
-        "watchify>xtend": true
+        "stylelint>postcss": true
       }
     },
-    "gulp>vinyl-fs>remove-bom-stream>through2>readable-stream": {
+    "gulp-sourcemaps>@gulp-sourcemaps/identity-map>postcss": {
       "builtin": {
-        "events.EventEmitter": true,
-        "stream": true,
-        "util": true
+        "fs": true,
+        "path": true
       },
       "globals": {
-        "process.browser": true,
-        "process.env.READABLE_STREAM": true,
-        "process.stderr": true,
-        "process.stdout": true,
-        "process.version.slice": true,
-        "setImmediate": true
+        "Buffer": true,
+        "atob": true,
+        "btoa": true,
+        "console": true,
+        "process.env.NODE_ENV": true
       },
       "packages": {
-        "gulp>vinyl-fs>remove-bom-stream>through2>readable-stream>isarray": true,
-        "gulp>vinyl-fs>remove-bom-stream>through2>readable-stream>safe-buffer": true,
-        "gulp>vinyl-fs>remove-bom-stream>through2>readable-stream>string_decoder": true,
-        "pumpify>inherits": true,
-        "readable-stream-2>core-util-is": true,
-        "readable-stream-2>process-nextick-args": true,
-        "readable-stream>util-deprecate": true
-      }
-    },
-    "gulp>vinyl-fs>remove-bom-stream>through2>readable-stream>safe-buffer": {
-      "builtin": {
-        "buffer": true
-      }
-    },
-    "gulp>vinyl-fs>remove-bom-stream>through2>readable-stream>string_decoder": {
-      "packages": {
-        "gulp>vinyl-fs>remove-bom-stream>through2>readable-stream>string_decoder>safe-buffer": true
-      }
-    },
-    "gulp>vinyl-fs>remove-bom-stream>through2>readable-stream>string_decoder>safe-buffer": {
-      "builtin": {
-        "buffer": true
-      }
-    },
-    "gulp>vinyl-fs>resolve-options": {
-      "packages": {
-        "gulp>vinyl-fs>value-or-function": true
+        "gulp-sourcemaps>@gulp-sourcemaps/identity-map>postcss>picocolors": true,
+        "gulp-sourcemaps>@gulp-sourcemaps/identity-map>source-map": true
       }
     },
-    "gulp>vinyl-fs>through2": {
+    "postcss-discard-font-face>postcss": {
       "builtin": {
-        "util.inherits": true
+        "fs": true,
+        "path": true
       },
       "globals": {
-        "process.nextTick": true
+        "console": true
       },
       "packages": {
-        "gulp>vinyl-fs>readable-stream": true,
-        "watchify>xtend": true
-      }
-    },
-    "gulp>vinyl-fs>to-through": {
-      "packages": {
-        "gulp>vinyl-fs>to-through>through2": true
+        "postcss-discard-font-face>postcss>chalk": true,
+        "postcss-discard-font-face>postcss>js-base64": true,
+        "postcss-discard-font-face>postcss>source-map": true,
+        "postcss-discard-font-face>postcss>supports-color": true
       }
     },
-    "gulp>vinyl-fs>to-through>through2": {
+    "stylelint>postcss-less>postcss": {
       "builtin": {
-        "util.inherits": true
+        "fs": true,
+        "path": true
       },
       "globals": {
-        "process.nextTick": true
+        "Buffer": true,
+        "atob": true,
+        "btoa": true,
+        "console": true,
+        "process.env.NODE_ENV": true
       },
       "packages": {
-        "gulp>vinyl-fs>to-through>through2>readable-stream": true,
-        "watchify>xtend": true
+        "stylelint>postcss-less>postcss>picocolors": true,
+        "stylelint>postcss-less>postcss>source-map": true
       }
     },
-    "gulp>vinyl-fs>to-through>through2>readable-stream": {
+    "stylelint>postcss-safe-parser>postcss": {
       "builtin": {
-        "events.EventEmitter": true,
-        "stream": true,
-        "util": true
+        "fs": true,
+        "path": true
       },
       "globals": {
-        "process.browser": true,
-        "process.env.READABLE_STREAM": true,
-        "process.stderr": true,
-        "process.stdout": true,
-        "process.version.slice": true,
-        "setImmediate": true
+        "Buffer": true,
+        "atob": true,
+        "btoa": true,
+        "console": true,
+        "process.env.NODE_ENV": true
       },
       "packages": {
-        "gulp>vinyl-fs>to-through>through2>readable-stream>isarray": true,
-        "gulp>vinyl-fs>to-through>through2>readable-stream>safe-buffer": true,
-        "gulp>vinyl-fs>to-through>through2>readable-stream>string_decoder": true,
-        "pumpify>inherits": true,
-        "readable-stream-2>core-util-is": true,
-        "readable-stream-2>process-nextick-args": true,
-        "readable-stream>util-deprecate": true
-      }
-    },
-    "gulp>vinyl-fs>to-through>through2>readable-stream>safe-buffer": {
-      "builtin": {
-        "buffer": true
-      }
-    },
-    "gulp>vinyl-fs>to-through>through2>readable-stream>string_decoder": {
-      "packages": {
-        "gulp>vinyl-fs>to-through>through2>readable-stream>safe-buffer": true
+        "stylelint>postcss-safe-parser>postcss>picocolors": true,
+        "stylelint>postcss-safe-parser>postcss>source-map": true
       }
     },
-    "gulp>vinyl-fs>vinyl-sourcemap": {
+    "stylelint>postcss-sass>postcss": {
       "builtin": {
-        "path.dirname": true,
-        "path.join": true,
-        "path.relative": true,
-        "path.resolve": true
+        "fs": true,
+        "path": true
       },
       "globals": {
-        "Buffer": true
+        "Buffer": true,
+        "atob": true,
+        "btoa": true,
+        "console": true,
+        "process.env.NODE_ENV": true
       },
       "packages": {
-        "del>graceful-fs": true,
-        "gulp-watch>anymatch>normalize-path": true,
-        "gulp>vinyl-fs>remove-bom-buffer": true,
-        "gulp>vinyl-fs>vinyl-sourcemap>append-buffer": true,
-        "gulp>vinyl-fs>vinyl-sourcemap>now-and-later": true,
-        "nyc>convert-source-map": true,
-        "vinyl": true
+        "stylelint>postcss-sass>postcss>picocolors": true,
+        "stylelint>postcss-sass>postcss>source-map": true
       }
     },
-    "gulp>vinyl-fs>vinyl-sourcemap>append-buffer": {
+    "stylelint>postcss-scss>postcss": {
       "builtin": {
-        "os.EOL": true
+        "fs": true,
+        "path": true
       },
       "globals": {
-        "Buffer": true
+        "Buffer": true,
+        "atob": true,
+        "btoa": true,
+        "console": true,
+        "process.env.NODE_ENV": true
       },
       "packages": {
-        "gulp>vinyl-fs>vinyl-sourcemap>append-buffer>buffer-equal": true
+        "stylelint>postcss-scss>postcss>picocolors": true,
+        "stylelint>postcss-scss>postcss>source-map": true
       }
     },
-    "gulp>vinyl-fs>vinyl-sourcemap>append-buffer>buffer-equal": {
+    "stylelint>postcss": {
       "builtin": {
-        "buffer.Buffer.isBuffer": true
-      }
-    },
-    "gulp>vinyl-fs>vinyl-sourcemap>now-and-later": {
-      "packages": {
-        "@metamask/object-multiplex>once": true
-      }
-    },
-    "ini": {
-      "globals": {
-        "process": true
-      }
-    },
-    "jsdom>acorn": {
+        "fs": true,
+        "path": true
+      },
       "globals": {
+        "Buffer": true,
+        "atob": true,
+        "btoa": true,
         "console": true,
-        "define": true
-      }
-    },
-    "koa>content-disposition>safe-buffer": {
-      "builtin": {
-        "buffer": true
-      }
-    },
-    "koa>is-generator-function>has-tostringtag": {
-      "packages": {
-        "string.prototype.matchall>has-symbols": true
-      }
-    },
-    "labeled-stream-splicer": {
-      "packages": {
-        "labeled-stream-splicer>stream-splicer": true,
-        "pumpify>inherits": true
-      }
-    },
-    "labeled-stream-splicer>stream-splicer": {
-      "globals": {
-        "process.nextTick": true,
-        "setImmediate": true
+        "process.env.NODE_ENV": true
       },
       "packages": {
-        "labeled-stream-splicer>stream-splicer>readable-stream": true,
-        "pumpify>inherits": true
+        "stylelint>postcss>picocolors": true,
+        "stylelint>postcss>source-map": true
       }
     },
-    "labeled-stream-splicer>stream-splicer>readable-stream": {
+    "stylelint>sugarss>postcss": {
       "builtin": {
-        "events.EventEmitter": true,
-        "stream": true,
-        "util": true
+        "fs": true,
+        "path": true
       },
       "globals": {
-        "process.browser": true,
-        "process.env.READABLE_STREAM": true,
-        "process.stderr": true,
-        "process.stdout": true,
-        "process.version.slice": true,
-        "setImmediate": true
+        "Buffer": true,
+        "atob": true,
+        "btoa": true,
+        "console": true,
+        "process.env.NODE_ENV": true
       },
       "packages": {
-        "labeled-stream-splicer>stream-splicer>readable-stream>isarray": true,
-        "labeled-stream-splicer>stream-splicer>readable-stream>safe-buffer": true,
-        "labeled-stream-splicer>stream-splicer>readable-stream>string_decoder": true,
-        "pumpify>inherits": true,
-        "readable-stream-2>core-util-is": true,
-        "readable-stream-2>process-nextick-args": true,
-        "readable-stream>util-deprecate": true
-      }
-    },
-    "labeled-stream-splicer>stream-splicer>readable-stream>safe-buffer": {
-      "builtin": {
-        "buffer": true
-      }
-    },
-    "labeled-stream-splicer>stream-splicer>readable-stream>string_decoder": {
-      "packages": {
-        "labeled-stream-splicer>stream-splicer>readable-stream>safe-buffer": true
+        "stylelint>sugarss>postcss>picocolors": true,
+        "stylelint>sugarss>postcss>source-map": true
       }
     },
-    "lavamoat-browserify": {
+    "prettier": {
       "builtin": {
-        "fs.existsSync": true,
-        "fs.mkdirSync": true,
-        "fs.readFileSync": true,
-        "fs.writeFileSync": true,
-        "path.dirname": true,
-        "path.extname": true,
-        "path.resolve": true,
-        "util.callbackify": true
+        "assert": true,
+        "events.EventEmitter": true,
+        "fs": true,
+        "module._nodeModulePaths": true,
+        "module._resolveFilename": true,
+        "os": true,
+        "path": true,
+        "stream.PassThrough": true,
+        "stream.Readable": true,
+        "util.inherits": true,
+        "util.inspect": true,
+        "util.promisify": true
       },
       "globals": {
-        "console.warn": true,
-        "process.cwd": true,
-        "setTimeout": true
-      },
-      "packages": {
-        "@lavamoat/lavapack": true,
-        "@lavamoat/lavapack>json-stable-stringify": true,
-        "browserify>browser-resolve": true,
-        "lavamoat-browserify>concat-stream": true,
-        "lavamoat-browserify>duplexify": true,
-        "lavamoat-viz>lavamoat-core": true,
-        "lavamoat>@lavamoat/aa": true,
-        "readable-stream": true,
-        "through2": true
-      }
-    },
-    "lavamoat-browserify>concat-stream": {
-      "globals": {
-        "Buffer.concat": true,
-        "Buffer.isBuffer": true
-      },
-      "packages": {
-        "browserify>concat-stream>typedarray": true,
-        "pumpify>inherits": true,
-        "readable-stream": true,
-        "terser>source-map-support>buffer-from": true
-      }
-    },
-    "lavamoat-browserify>duplexify": {
-      "globals": {
+        "ANONYMOUS": true,
         "Buffer": true,
-        "process.nextTick": true
-      },
-      "packages": {
-        "duplexify>end-of-stream": true,
-        "duplexify>stream-shift": true,
-        "pumpify>inherits": true,
-        "readable-stream": true
-      }
-    },
-    "lavamoat-viz>lavamoat-core": {
-      "builtin": {
-        "node:events": true,
-        "node:fs.readFileSync": true,
-        "node:fs/promises.writeFile": true,
-        "node:path.extname": true,
-        "node:path.join": true
-      },
-      "globals": {
+        "BuilderFileEmit": true,
+        "BuilderProgramKind": true,
+        "BuilderState": true,
+        "CheckMode": true,
+        "ClassificationType": true,
+        "ClassificationTypeNames": true,
+        "CompletionInfoFlags": true,
+        "CompletionTriggerKind": true,
+        "ConfigFileProgramReloadLevel": true,
+        "CoreServicesShimHostAdapter": true,
+        "DocumentHighlights": true,
+        "Element": true,
+        "EndOfLineState": true,
+        "ExportKind": true,
+        "FileSystemEntryKind": true,
+        "FileWatcherEventKind": true,
+        "FlattenLevel": true,
+        "ForegroundColorEscapeSequences": true,
+        "HTMLElement": true,
+        "HighlightSpanKind": true,
+        "ImportKind": true,
+        "IndentStyle": true,
+        "InlayHintKind": true,
+        "Intl": true,
+        "InvalidatedProjectKind": true,
+        "LanguageServiceMode": true,
+        "LanguageServiceShimHostAdapter": true,
+        "ModuleInstanceState": true,
+        "NodeResolutionFeatures": true,
+        "OrganizeImportsMode": true,
+        "OutliningSpanKind": true,
+        "OutputFileType": true,
+        "PackageJsonAutoImportPreference": true,
+        "PackageJsonDependencyGroup": true,
+        "PatternMatchKind": true,
+        "PollingInterval": true,
+        "PrivateIdentifierKind": true,
+        "ProcessLevel": true,
+        "QuotePreference": true,
+        "SVGElement": true,
+        "ScriptElementKind": true,
+        "ScriptElementKindModifier": true,
+        "ScriptSnapshot": true,
+        "SemanticClassificationFormat": true,
+        "SemanticMeaning": true,
+        "SemicolonPreference": true,
+        "SignatureCheckMode": true,
+        "SymbolDisplayPartKind": true,
+        "TokenClass": true,
+        "TypeFacts": true,
+        "TypeScriptServicesFactory": true,
+        "UpToDateStatusType": true,
+        "Version": true,
+        "VersionRange": true,
+        "WatchLogLevel": true,
+        "WatchType": true,
+        "WorkerGlobalScope": true,
+        "YAML_SILENCE_DEPRECATION_WARNINGS": true,
+        "YAML_SILENCE_WARNINGS": true,
         "__dirname": true,
-        "console.error": true,
-        "console.warn": true,
-        "define": true
-      },
-      "packages": {
-        "@lavamoat/lavapack>json-stable-stringify": true,
-        "lavamoat-viz>lavamoat-core>lavamoat-tofu": true,
-        "lavamoat>lavamoat-core>merge-deep": true
-      }
-    },
-    "lavamoat-viz>lavamoat-core>lavamoat-tofu": {
-      "globals": {
-        "console.log": true
-      },
-      "packages": {
-        "lavamoat-viz>lavamoat-core>lavamoat-tofu>@babel/parser": true,
-        "lavamoat-viz>lavamoat-core>lavamoat-tofu>@babel/traverse": true
-      }
-    },
-    "lavamoat-viz>lavamoat-core>lavamoat-tofu>@babel/traverse": {
-      "globals": {
-        "console.log": true
-      },
-      "packages": {
-        "@babel/code-frame": true,
-        "@babel/core>@babel/generator": true,
-        "lavamoat-viz>lavamoat-core>lavamoat-tofu>@babel/traverse>@babel/parser": true,
-        "lavamoat-viz>lavamoat-core>lavamoat-tofu>@babel/traverse>@babel/types": true,
-        "lavamoat-viz>lavamoat-core>lavamoat-tofu>@babel/traverse>globals": true,
-        "lavamoat>lavamoat-tofu>@babel/traverse>@babel/helper-environment-visitor": true,
-        "lavamoat>lavamoat-tofu>@babel/traverse>@babel/helper-function-name": true,
-        "lavamoat>lavamoat-tofu>@babel/traverse>@babel/helper-hoist-variables": true,
-        "lavamoat>lavamoat-tofu>@babel/traverse>@babel/helper-split-export-declaration": true,
-        "nock>debug": true
-      }
-    },
-    "lavamoat-viz>lavamoat-core>lavamoat-tofu>@babel/traverse>@babel/types": {
-      "globals": {
-        "console.warn": true,
-        "process.env": true
-      },
-      "packages": {
-        "@babel/core>@babel/types>@babel/helper-string-parser": true,
-        "lavamoat>@babel/highlight>@babel/helper-validator-identifier": true
-      }
-    },
-    "lavamoat>@lavamoat/aa": {
-      "builtin": {
-        "node:fs.lstatSync": true,
-        "node:fs.readFileSync": true,
-        "node:fs.realpathSync": true,
-        "node:path.dirname": true,
-        "node:path.join": true,
-        "node:path.relative": true
-      },
-      "packages": {
-        "depcheck>resolve": true
-      }
-    },
-    "lavamoat>lavamoat-core>merge-deep": {
-      "packages": {
-        "gulp-zip>plugin-error>arr-union": true,
-        "lavamoat>lavamoat-core>merge-deep>clone-deep": true,
-        "lavamoat>lavamoat-core>merge-deep>kind-of": true
-      }
-    },
-    "lavamoat>lavamoat-core>merge-deep>clone-deep": {
-      "packages": {
-        "@babel/register>clone-deep>is-plain-object": true,
-        "lavamoat>lavamoat-core>merge-deep>clone-deep>for-own": true,
-        "lavamoat>lavamoat-core>merge-deep>clone-deep>lazy-cache": true,
-        "lavamoat>lavamoat-core>merge-deep>clone-deep>shallow-clone": true,
-        "lavamoat>lavamoat-core>merge-deep>kind-of": true
-      }
-    },
-    "lavamoat>lavamoat-core>merge-deep>clone-deep>for-own": {
-      "packages": {
-        "gulp>undertaker>object.reduce>for-own>for-in": true
-      }
-    },
-    "lavamoat>lavamoat-core>merge-deep>clone-deep>lazy-cache": {
-      "globals": {
-        "process.env.TRAVIS": true,
-        "process.env.UNLAZY": true
-      }
-    },
-    "lavamoat>lavamoat-core>merge-deep>clone-deep>shallow-clone": {
-      "packages": {
-        "gulp-watch>anymatch>micromatch>object.omit>is-extendable": true,
-        "lavamoat>lavamoat-core>merge-deep>clone-deep>shallow-clone>kind-of": true,
-        "lavamoat>lavamoat-core>merge-deep>clone-deep>shallow-clone>lazy-cache": true,
-        "lavamoat>lavamoat-core>merge-deep>clone-deep>shallow-clone>mixin-object": true
-      }
-    },
-    "lavamoat>lavamoat-core>merge-deep>clone-deep>shallow-clone>kind-of": {
-      "globals": {
-        "Buffer": true
-      },
-      "packages": {
-        "browserify>insert-module-globals>is-buffer": true
-      }
-    },
-    "lavamoat>lavamoat-core>merge-deep>clone-deep>shallow-clone>lazy-cache": {
-      "globals": {
-        "process.env.UNLAZY": true
-      }
-    },
-    "lavamoat>lavamoat-core>merge-deep>clone-deep>shallow-clone>mixin-object": {
-      "packages": {
-        "gulp-watch>anymatch>micromatch>object.omit>is-extendable": true,
-        "lavamoat>lavamoat-core>merge-deep>clone-deep>shallow-clone>mixin-object>for-in": true
-      }
-    },
-    "lavamoat>lavamoat-core>merge-deep>kind-of": {
-      "packages": {
-        "browserify>insert-module-globals>is-buffer": true
-      }
-    },
-    "lavamoat>lavamoat-tofu>@babel/traverse>@babel/helper-function-name": {
-      "packages": {
-        "@babel/core>@babel/template": true,
-        "@babel/core>@babel/types": true
-      }
-    },
-    "lavamoat>lavamoat-tofu>@babel/traverse>@babel/helper-hoist-variables": {
-      "packages": {
-        "@babel/core>@babel/types": true
-      }
-    },
-    "lavamoat>lavamoat-tofu>@babel/traverse>@babel/helper-split-export-declaration": {
-      "packages": {
-        "@babel/core>@babel/types": true
-      }
-    },
-    "lodash": {
-      "globals": {
-        "define": true
-      }
-    },
-    "loose-envify": {
-      "builtin": {
-        "stream.PassThrough": true,
-        "stream.Transform": true,
-        "util.inherits": true
-      },
-      "globals": {
-        "process.env": true
-      },
-      "packages": {
-        "loose-envify>js-tokens": true
-      }
-    },
-    "mocha>find-up": {
-      "builtin": {
-        "path.dirname": true,
-        "path.parse": true,
-        "path.resolve": true
-      },
-      "packages": {
-        "mocha>find-up>locate-path": true,
-        "nyc>find-up>path-exists": true
-      }
-    },
-    "mocha>find-up>locate-path": {
-      "builtin": {
-        "fs.lstat": true,
-        "fs.lstatSync": true,
-        "fs.stat": true,
-        "fs.statSync": true,
-        "path.resolve": true,
-        "util.promisify": true
-      },
-      "globals": {
-        "process.cwd": true
-      },
-      "packages": {
-        "mocha>find-up>locate-path>p-locate": true
-      }
-    },
-    "mocha>find-up>locate-path>p-locate": {
-      "packages": {
-        "@storybook/test-runner>jest-circus>p-limit": true
-      }
-    },
-    "mocha>log-symbols": {
-      "packages": {
-        "chalk": true,
-        "mocha>log-symbols>is-unicode-supported": true
-      }
-    },
-    "mocha>log-symbols>is-unicode-supported": {
-      "globals": {
-        "process.env.CI": true,
-        "process.env.TERM": true,
-        "process.env.TERM_PROGRAM": true,
-        "process.env.WT_SESSION": true,
-        "process.platform": true
-      }
-    },
-    "mocha>supports-color": {
-      "builtin": {
-        "os.release": true,
-        "tty.isatty": true
-      },
-      "globals": {
-        "process.env": true,
-        "process.platform": true
-      },
-      "packages": {
-        "mocha>supports-color>has-flag": true
-      }
-    },
-    "mocha>supports-color>has-flag": {
-      "globals": {
-        "process.argv": true
-      }
-    },
-    "mockttp>portfinder>mkdirp": {
-      "builtin": {
-        "fs": true,
-        "path.dirname": true,
-        "path.resolve": true
-      }
-    },
-    "nock>debug": {
-      "builtin": {
-        "tty.isatty": true,
-        "util.deprecate": true,
-        "util.formatWithOptions": true,
-        "util.inspect": true
-      },
-      "globals": {
-        "console": true,
-        "document": true,
-        "localStorage": true,
-        "navigator": true,
-        "process": true
-      },
-      "packages": {
-        "mocha>supports-color": true,
-        "nock>debug>ms": true
-      }
-    },
-    "node-sass": {
-      "native": true
-    },
-    "nyc>convert-source-map": {
-      "builtin": {
-        "fs.readFileSync": true,
-        "path.join": true
-      },
-      "globals": {
-        "Buffer.from": true
-      }
-    },
-    "nyc>find-up>path-exists": {
-      "builtin": {
-        "fs.access": true,
-        "fs.accessSync": true,
-        "util.promisify": true
-      }
-    },
-    "nyc>glob": {
-      "builtin": {
-        "assert": true,
-        "events.EventEmitter": true,
-        "fs": true,
-        "path.join": true,
-        "path.resolve": true,
-        "util": true
-      },
-      "globals": {
-        "console.error": true,
-        "process.cwd": true,
-        "process.nextTick": true,
-        "process.platform": true
-      },
-      "packages": {
-        "@metamask/object-multiplex>once": true,
-        "eslint>minimatch": true,
-        "gulp-watch>path-is-absolute": true,
-        "nyc>glob>fs.realpath": true,
-        "nyc>glob>inflight": true,
-        "pumpify>inherits": true
-      }
-    },
-    "nyc>glob>fs.realpath": {
-      "builtin": {
-        "fs.lstat": true,
-        "fs.lstatSync": true,
-        "fs.readlink": true,
-        "fs.readlinkSync": true,
-        "fs.realpath": true,
-        "fs.realpathSync": true,
-        "fs.stat": true,
-        "fs.statSync": true,
-        "path.normalize": true,
-        "path.resolve": true
-      },
-      "globals": {
-        "console.error": true,
-        "console.trace": true,
-        "process.env.NODE_DEBUG": true,
-        "process.nextTick": true,
-        "process.noDeprecation": true,
-        "process.platform": true,
-        "process.throwDeprecation": true,
-        "process.traceDeprecation": true,
-        "process.version": true
-      }
-    },
-    "nyc>glob>inflight": {
-      "globals": {
-        "process.nextTick": true
-      },
-      "packages": {
-        "@metamask/object-multiplex>once": true,
-        "@metamask/object-multiplex>once>wrappy": true
-      }
-    },
-    "nyc>resolve-from": {
-      "builtin": {
-        "fs.realpathSync": true,
-        "module._nodeModulePaths": true,
-        "module._resolveFilename": true,
-        "path.join": true,
-        "path.resolve": true
-      }
-    },
-    "nyc>signal-exit": {
-      "builtin": {
-        "assert.equal": true,
-        "events": true
-      },
-      "globals": {
-        "process": true
-      }
-    },
-    "nyc>spawn-wrap>is-windows": {
-      "globals": {
-        "define": true,
-        "isWindows": "write",
-        "process": true
-      }
-    },
-    "nyc>yargs>set-blocking": {
-      "globals": {
-        "process.stderr": true,
-        "process.stdout": true
-      }
-    },
-    "postcss": {
-      "builtin": {
-        "fs.existsSync": true,
-        "fs.readFileSync": true,
-        "path.dirname": true,
-        "path.isAbsolute": true,
-        "path.join": true,
-        "path.relative": true,
-        "path.resolve": true,
-        "path.sep": true,
-        "url.fileURLToPath": true,
-        "url.pathToFileURL": true
-      },
-      "globals": {
-        "Buffer": true,
-        "URL": true,
+        "__filename": true,
+        "accessPrivateIdentifier": true,
+        "addEmitFlags": true,
+        "addEmitHelper": true,
+        "addEmitHelpers": true,
+        "addInternalEmitFlags": true,
+        "addSyntheticLeadingComment": true,
+        "addSyntheticTrailingComment": true,
+        "advancedAsyncSuperHelper": true,
+        "affectsDeclarationPathOptionDeclarations": true,
+        "affectsEmitOptionDeclarations": true,
+        "allKeysStartWithDot": true,
+        "assertDoc": true,
+        "assignHelper": true,
+        "asyncDelegator": true,
+        "asyncGeneratorHelper": true,
+        "asyncSuperHelper": true,
+        "asyncValues": true,
         "atob": true,
+        "awaitHelper": true,
+        "awaiterHelper": true,
+        "bindSourceFile": true,
+        "breakIntoCharacterSpans": true,
+        "breakIntoWordSpans": true,
         "btoa": true,
-        "console": true,
-        "process.env.LANG": true,
-        "process.env.NODE_ENV": true
-      },
-      "packages": {
-        "nanoid": true,
-        "postcss>picocolors": true,
-        "postcss>source-map-js": true
-      }
-    },
-    "postcss-discard-font-face": {
-      "packages": {
-        "postcss-discard-font-face>balanced-match": true,
-        "postcss-discard-font-face>postcss": true
-      }
-    },
-    "postcss-discard-font-face>postcss": {
-      "builtin": {
-        "fs": true,
-        "path": true
-      },
-      "globals": {
-        "console": true
-      },
-      "packages": {
-        "postcss-discard-font-face>postcss>chalk": true,
-        "postcss-discard-font-face>postcss>js-base64": true,
-        "postcss-discard-font-face>postcss>source-map": true,
-        "postcss-discard-font-face>postcss>supports-color": true
-      }
-    },
-    "postcss-discard-font-face>postcss>chalk": {
-      "globals": {
-        "process.env.TERM": true,
-        "process.platform": true
-      },
-      "packages": {
-        "postcss-discard-font-face>postcss>chalk>ansi-styles": true,
-        "postcss-discard-font-face>postcss>chalk>escape-string-regexp": true,
-        "postcss-discard-font-face>postcss>chalk>strip-ansi": true,
-        "postcss-discard-font-face>postcss>chalk>supports-color": true,
-        "prettier-eslint>loglevel-colored-level-prefix>chalk>has-ansi": true
-      }
-    },
-    "postcss-discard-font-face>postcss>chalk>strip-ansi": {
-      "packages": {
-        "postcss-discard-font-face>postcss>chalk>strip-ansi>ansi-regex": true
-      }
-    },
-    "postcss-discard-font-face>postcss>chalk>supports-color": {
-      "globals": {
-        "process.argv": true,
-        "process.env": true,
-        "process.platform": true,
-        "process.stdout": true
-      }
-    },
-    "postcss-discard-font-face>postcss>js-base64": {
-      "globals": {
-        "Base64": "write",
-        "define": true
-      }
-    },
-    "postcss-discard-font-face>postcss>supports-color": {
-      "globals": {
-        "process": true
-      },
-      "packages": {
-        "postcss-discard-font-face>postcss>supports-color>has-flag": true
-      }
-    },
-    "postcss-discard-font-face>postcss>supports-color>has-flag": {
-      "globals": {
-        "process.argv": true
-      }
-    },
-    "postcss-rtlcss": {
-      "globals": {
-        "SuppressedError": true
-      },
-      "packages": {
-        "postcss": true,
-        "postcss-rtlcss>rtlcss": true
-      }
-    },
-    "postcss-rtlcss>rtlcss": {
-      "packages": {
-        "postcss": true
-      }
-    },
-    "postcss>picocolors": {
-      "globals": {
-        "process": true
-      }
-    },
-    "postcss>source-map-js": {
-      "globals": {
-        "console": true
-      }
-    },
-    "prettier": {
-      "builtin": {
-        "assert": true,
-        "events.EventEmitter": true,
-        "fs": true,
-        "module._nodeModulePaths": true,
-        "module._resolveFilename": true,
-        "os": true,
-        "path": true,
-        "stream.PassThrough": true,
-        "stream.Readable": true,
-        "util.inherits": true,
-        "util.inspect": true,
-        "util.promisify": true
-      },
-      "globals": {
-        "ANONYMOUS": true,
-        "Buffer": true,
-        "BuilderFileEmit": true,
-        "BuilderProgramKind": true,
-        "BuilderState": true,
-        "CheckMode": true,
-        "ClassificationType": true,
-        "ClassificationTypeNames": true,
-        "CompletionInfoFlags": true,
-        "CompletionTriggerKind": true,
-        "ConfigFileProgramReloadLevel": true,
-        "CoreServicesShimHostAdapter": true,
-        "DocumentHighlights": true,
-        "Element": true,
-        "EndOfLineState": true,
-        "ExportKind": true,
-        "FileSystemEntryKind": true,
-        "FileWatcherEventKind": true,
-        "FlattenLevel": true,
-        "ForegroundColorEscapeSequences": true,
-        "HTMLElement": true,
-        "HighlightSpanKind": true,
-        "ImportKind": true,
-        "IndentStyle": true,
-        "InlayHintKind": true,
-        "Intl": true,
-        "InvalidatedProjectKind": true,
-        "LanguageServiceMode": true,
-        "LanguageServiceShimHostAdapter": true,
-        "ModuleInstanceState": true,
-        "NodeResolutionFeatures": true,
-        "OrganizeImportsMode": true,
-        "OutliningSpanKind": true,
-        "OutputFileType": true,
-        "PackageJsonAutoImportPreference": true,
-        "PackageJsonDependencyGroup": true,
-        "PatternMatchKind": true,
-        "PollingInterval": true,
-        "PrivateIdentifierKind": true,
-        "ProcessLevel": true,
-        "QuotePreference": true,
-        "SVGElement": true,
-        "ScriptElementKind": true,
-        "ScriptElementKindModifier": true,
-        "ScriptSnapshot": true,
-        "SemanticClassificationFormat": true,
-        "SemanticMeaning": true,
-        "SemicolonPreference": true,
-        "SignatureCheckMode": true,
-        "SymbolDisplayPartKind": true,
-        "TokenClass": true,
-        "TypeFacts": true,
-        "TypeScriptServicesFactory": true,
-        "UpToDateStatusType": true,
-        "Version": true,
-        "VersionRange": true,
-        "WatchLogLevel": true,
-        "WatchType": true,
-        "WorkerGlobalScope": true,
-        "YAML_SILENCE_DEPRECATION_WARNINGS": true,
-        "YAML_SILENCE_WARNINGS": true,
-        "__dirname": true,
-        "__filename": true,
-        "accessPrivateIdentifier": true,
-        "addEmitFlags": true,
-        "addEmitHelper": true,
-        "addEmitHelpers": true,
-        "addInternalEmitFlags": true,
-        "addSyntheticLeadingComment": true,
-        "addSyntheticTrailingComment": true,
-        "advancedAsyncSuperHelper": true,
-        "affectsDeclarationPathOptionDeclarations": true,
-        "affectsEmitOptionDeclarations": true,
-        "allKeysStartWithDot": true,
-        "assertDoc": true,
-        "assignHelper": true,
-        "asyncDelegator": true,
-        "asyncGeneratorHelper": true,
-        "asyncSuperHelper": true,
-        "asyncValues": true,
-        "atob": true,
-        "awaitHelper": true,
-        "awaiterHelper": true,
-        "bindSourceFile": true,
-        "breakIntoCharacterSpans": true,
-        "breakIntoWordSpans": true,
-        "btoa": true,
-        "buildLinkParts": true,
-        "buildOpts": true,
-        "buildOverload": true,
-        "bundlerModuleNameResolver": true,
-        "canBeConvertedToAsync": true,
-        "canJsonReportNoInputFiles": true,
-        "canProduceDiagnostics": true,
-        "canWatchDirectoryOrFile": true,
-        "chainBundle": true,
-        "changeCompilerHostLikeToUseCache": true,
-        "classPrivateFieldGetHelper": true,
-        "classPrivateFieldInHelper": true,
-        "classPrivateFieldSetHelper": true,
-        "classicNameResolver": true,
-        "cleanExtendedConfigCache": true,
-        "clearSharedExtendedConfigFileWatcher": true,
-        "clearTimeout": true,
-        "climbPastPropertyAccess": true,
-        "climbPastPropertyOrElementAccess": true,
-        "cloneCompilerOptions": true,
-        "closeFileWatcherOf": true,
-        "collectExternalModuleInfo": true,
-        "commonOptionsWithBuild": true,
-        "compareEmitHelpers": true,
-        "comparePatternKeys": true,
-        "compileOnSaveCommandLineOption": true,
-        "compilerOptionsDidYouMeanDiagnostics": true,
-        "compilerOptionsIndicateEsModules": true,
-        "computeCommonSourceDirectoryOfFilenames": true,
-        "computeSignature": true,
-        "computeSignatureWithDiagnostics": true,
-        "computeSuggestionDiagnostics": true,
+        "buildLinkParts": true,
+        "buildOpts": true,
+        "buildOverload": true,
+        "bundlerModuleNameResolver": true,
+        "canBeConvertedToAsync": true,
+        "canJsonReportNoInputFiles": true,
+        "canProduceDiagnostics": true,
+        "canWatchDirectoryOrFile": true,
+        "chainBundle": true,
+        "changeCompilerHostLikeToUseCache": true,
+        "classPrivateFieldGetHelper": true,
+        "classPrivateFieldInHelper": true,
+        "classPrivateFieldSetHelper": true,
+        "classicNameResolver": true,
+        "cleanExtendedConfigCache": true,
+        "clearSharedExtendedConfigFileWatcher": true,
+        "clearTimeout": true,
+        "climbPastPropertyAccess": true,
+        "climbPastPropertyOrElementAccess": true,
+        "cloneCompilerOptions": true,
+        "closeFileWatcherOf": true,
+        "collectExternalModuleInfo": true,
+        "commonOptionsWithBuild": true,
+        "compareEmitHelpers": true,
+        "comparePatternKeys": true,
+        "compileOnSaveCommandLineOption": true,
+        "compilerOptionsDidYouMeanDiagnostics": true,
+        "compilerOptionsIndicateEsModules": true,
+        "computeCommonSourceDirectoryOfFilenames": true,
+        "computeSignature": true,
+        "computeSignatureWithDiagnostics": true,
+        "computeSuggestionDiagnostics": true,
         "console": true,
         "consumesNodeCoreModules": true,
         "convertCompilerOptionsForTelemetry": true,
@@ -7399,208 +6163,1361 @@
         "zipToModeAwareCache": true
       }
     },
-    "prettier-eslint>loglevel-colored-level-prefix>chalk>has-ansi": {
+    "eslint-plugin-prettier>prettier-linter-helpers": {
+      "packages": {
+        "eslint-plugin-prettier>prettier-linter-helpers>fast-diff": true
+      }
+    },
+    "process": {
+      "globals": {
+        "process": true
+      }
+    },
+    "vinyl>cloneable-readable>process-nextick-args": {
+      "globals": {
+        "process.nextTick": true,
+        "process.version": true
+      }
+    },
+    "readable-stream-2>process-nextick-args": {
+      "globals": {
+        "process": true
+      }
+    },
+    "vinyl>cloneable-readable>through2>readable-stream>process-nextick-args": {
+      "globals": {
+        "process": true
+      }
+    },
+    "prop-types": {
+      "globals": {
+        "console": true,
+        "process.env.NODE_ENV": true
+      },
+      "packages": {
+        "react>object-assign": true,
+        "prop-types>react-is": true
+      }
+    },
+    "pumpify>pump": {
+      "builtin": {
+        "fs": true
+      },
+      "globals": {
+        "process.version": true
+      },
+      "packages": {
+        "duplexify>end-of-stream": true,
+        "@metamask/object-multiplex>once": true
+      }
+    },
+    "gulp>vinyl-fs>glob-stream>pumpify>pump": {
+      "builtin": {
+        "fs": true
+      },
+      "packages": {
+        "duplexify>end-of-stream": true,
+        "@metamask/object-multiplex>once": true
+      }
+    },
+    "gulp>vinyl-fs>pumpify>pump": {
+      "builtin": {
+        "fs": true
+      },
+      "packages": {
+        "duplexify>end-of-stream": true,
+        "@metamask/object-multiplex>once": true
+      }
+    },
+    "pumpify": {
+      "packages": {
+        "duplexify": true,
+        "pumpify>inherits": true,
+        "pumpify>pump": true
+      }
+    },
+    "gulp>vinyl-fs>glob-stream>pumpify": {
+      "packages": {
+        "gulp>vinyl-fs>glob-stream>pumpify>duplexify": true,
+        "pumpify>inherits": true,
+        "gulp>vinyl-fs>glob-stream>pumpify>pump": true
+      }
+    },
+    "gulp>vinyl-fs>pumpify": {
+      "packages": {
+        "gulp>vinyl-fs>pumpify>duplexify": true,
+        "pumpify>inherits": true,
+        "gulp>vinyl-fs>pumpify>pump": true
+      }
+    },
+    "@storybook/addon-knobs>qs": {
+      "packages": {
+        "string.prototype.matchall>side-channel": true
+      }
+    },
+    "gulp-watch>anymatch>micromatch>braces>expand-range>fill-range>randomatic": {
+      "packages": {
+        "gulp>undertaker>bach>array-last>is-number": true,
+        "@babel/register>clone-deep>kind-of": true,
+        "gulp-watch>anymatch>micromatch>braces>expand-range>fill-range>randomatic>math-random": true
+      }
+    },
+    "randomcolor": {
+      "globals": {
+        "define": true
+      }
+    },
+    "gulp-livereload>tiny-lr>body>raw-body": {
+      "globals": {
+        "Buffer.concat": true,
+        "process.nextTick": true
+      },
+      "packages": {
+        "gulp-livereload>tiny-lr>body>raw-body>bytes": true,
+        "gulp-livereload>tiny-lr>body>raw-body>string_decoder": true
+      }
+    },
+    "prop-types>react-is": {
+      "globals": {
+        "console": true,
+        "process.env.NODE_ENV": true
+      }
+    },
+    "browserify>read-only-stream": {
+      "packages": {
+        "browserify>read-only-stream>readable-stream": true
+      }
+    },
+    "readable-stream": {
+      "builtin": {
+        "buffer.Buffer": true,
+        "events.EventEmitter": true,
+        "stream": true,
+        "util": true
+      },
+      "globals": {
+        "process.env.READABLE_STREAM": true,
+        "process.nextTick": true,
+        "process.stderr": true,
+        "process.stdout": true
+      },
+      "packages": {
+        "pumpify>inherits": true,
+        "browserify>string_decoder": true,
+        "readable-stream>util-deprecate": true
+      }
+    },
+    "@lavamoat/lavapack>readable-stream": {
+      "builtin": {
+        "buffer.Blob": true,
+        "buffer.Buffer": true,
+        "events.EventEmitter": true,
+        "events.addAbortListener": true,
+        "stream": true,
+        "string_decoder.StringDecoder": true
+      },
+      "globals": {
+        "AbortController": true,
+        "AbortSignal": true,
+        "AggregateError": true,
+        "Blob": true,
+        "ERR_INVALID_ARG_TYPE": true,
+        "process.env.READABLE_STREAM": true,
+        "queueMicrotask": true
+      },
+      "packages": {
+        "@lavamoat/lavapack>readable-stream>abort-controller": true,
+        "process": true
+      }
+    },
+    "vinyl-buffer>bl>readable-stream": {
+      "builtin": {
+        "events.EventEmitter": true,
+        "stream": true,
+        "util": true
+      },
+      "globals": {
+        "process.browser": true,
+        "process.env.READABLE_STREAM": true,
+        "process.stderr": true,
+        "process.stdout": true,
+        "process.version.slice": true,
+        "setImmediate": true
+      },
+      "packages": {
+        "readable-stream-2>core-util-is": true,
+        "pumpify>inherits": true,
+        "vinyl-buffer>bl>readable-stream>isarray": true,
+        "readable-stream-2>process-nextick-args": true,
+        "vinyl-buffer>bl>readable-stream>safe-buffer": true,
+        "vinyl-buffer>bl>readable-stream>string_decoder": true,
+        "readable-stream>util-deprecate": true
+      }
+    },
+    "browserify>readable-stream": {
+      "builtin": {
+        "events.EventEmitter": true,
+        "stream": true,
+        "util": true
+      },
+      "globals": {
+        "process.browser": true,
+        "process.env.READABLE_STREAM": true,
+        "process.stderr": true,
+        "process.stdout": true,
+        "process.version.slice": true,
+        "setImmediate": true
+      },
+      "packages": {
+        "readable-stream-2>core-util-is": true,
+        "pumpify>inherits": true,
+        "browserify>readable-stream>isarray": true,
+        "readable-stream-2>process-nextick-args": true,
+        "browserify>readable-stream>safe-buffer": true,
+        "browserify>readable-stream>string_decoder": true,
+        "readable-stream>util-deprecate": true
+      }
+    },
+    "browserify>concat-stream>readable-stream": {
+      "builtin": {
+        "events.EventEmitter": true,
+        "stream": true,
+        "util": true
+      },
+      "globals": {
+        "process.browser": true,
+        "process.env.READABLE_STREAM": true,
+        "process.stderr": true,
+        "process.stdout": true,
+        "process.version.slice": true,
+        "setImmediate": true
+      },
+      "packages": {
+        "readable-stream-2>core-util-is": true,
+        "pumpify>inherits": true,
+        "browserify>concat-stream>readable-stream>isarray": true,
+        "readable-stream-2>process-nextick-args": true,
+        "browserify>concat-stream>readable-stream>safe-buffer": true,
+        "browserify>concat-stream>readable-stream>string_decoder": true,
+        "readable-stream>util-deprecate": true
+      }
+    },
+    "lavamoat-browserify>concat-stream>readable-stream": {
+      "builtin": {
+        "buffer.Buffer": true,
+        "events.EventEmitter": true,
+        "stream": true,
+        "util": true
+      },
+      "globals": {
+        "process.env.READABLE_STREAM": true,
+        "process.nextTick": true,
+        "process.stderr": true,
+        "process.stdout": true
+      },
+      "packages": {
+        "pumpify>inherits": true,
+        "browserify>string_decoder": true,
+        "readable-stream>util-deprecate": true
+      }
+    },
+    "browserify>duplexer2>readable-stream": {
+      "builtin": {
+        "events.EventEmitter": true,
+        "stream": true,
+        "util": true
+      },
+      "globals": {
+        "process.browser": true,
+        "process.env.READABLE_STREAM": true,
+        "process.stderr": true,
+        "process.stdout": true,
+        "process.version.slice": true,
+        "setImmediate": true
+      },
+      "packages": {
+        "readable-stream-2>core-util-is": true,
+        "pumpify>inherits": true,
+        "browserify>duplexer2>readable-stream>isarray": true,
+        "readable-stream-2>process-nextick-args": true,
+        "browserify>duplexer2>readable-stream>safe-buffer": true,
+        "browserify>duplexer2>readable-stream>string_decoder": true,
+        "readable-stream>util-deprecate": true
+      }
+    },
+    "gulp-watch>vinyl-file>strip-bom-stream>first-chunk-stream>readable-stream": {
+      "builtin": {
+        "events.EventEmitter": true,
+        "stream": true,
+        "util": true
+      },
+      "globals": {
+        "process.browser": true,
+        "process.env.READABLE_STREAM": true,
+        "process.stderr": true,
+        "process.stdout": true,
+        "process.version.slice": true,
+        "setImmediate": true
+      },
+      "packages": {
+        "readable-stream-2>core-util-is": true,
+        "pumpify>inherits": true,
+        "gulp-watch>vinyl-file>strip-bom-stream>first-chunk-stream>readable-stream>isarray": true,
+        "readable-stream-2>process-nextick-args": true,
+        "gulp-watch>vinyl-file>strip-bom-stream>first-chunk-stream>readable-stream>safe-buffer": true,
+        "gulp-watch>vinyl-file>strip-bom-stream>first-chunk-stream>readable-stream>string_decoder": true,
+        "readable-stream>util-deprecate": true
+      }
+    },
+    "gulp>vinyl-fs>lead>flush-write-stream>readable-stream": {
+      "builtin": {
+        "events.EventEmitter": true,
+        "stream": true,
+        "util": true
+      },
+      "globals": {
+        "process.browser": true,
+        "process.env.READABLE_STREAM": true,
+        "process.stderr": true,
+        "process.stdout": true,
+        "process.version.slice": true,
+        "setImmediate": true
+      },
+      "packages": {
+        "readable-stream-2>core-util-is": true,
+        "pumpify>inherits": true,
+        "gulp>vinyl-fs>lead>flush-write-stream>readable-stream>isarray": true,
+        "readable-stream-2>process-nextick-args": true,
+        "gulp>vinyl-fs>lead>flush-write-stream>readable-stream>safe-buffer": true,
+        "gulp>vinyl-fs>lead>flush-write-stream>readable-stream>string_decoder": true,
+        "readable-stream>util-deprecate": true
+      }
+    },
+    "gulp>vinyl-fs>glob-stream>readable-stream": {
+      "builtin": {
+        "events.EventEmitter": true,
+        "stream": true,
+        "util": true
+      },
+      "globals": {
+        "process.browser": true,
+        "process.env.READABLE_STREAM": true,
+        "process.stderr": true,
+        "process.stdout": true,
+        "process.version.slice": true,
+        "setImmediate": true
+      },
+      "packages": {
+        "readable-stream-2>core-util-is": true,
+        "pumpify>inherits": true,
+        "gulp>vinyl-fs>glob-stream>readable-stream>isarray": true,
+        "readable-stream-2>process-nextick-args": true,
+        "gulp>vinyl-fs>glob-stream>readable-stream>safe-buffer": true,
+        "gulp>vinyl-fs>glob-stream>readable-stream>string_decoder": true,
+        "readable-stream>util-deprecate": true
+      }
+    },
+    "gulp-watch>readable-stream": {
+      "builtin": {
+        "events.EventEmitter": true,
+        "stream": true,
+        "util": true
+      },
+      "globals": {
+        "process.browser": true,
+        "process.env.READABLE_STREAM": true,
+        "process.stderr": true,
+        "process.stdout": true,
+        "process.version.slice": true,
+        "setImmediate": true
+      },
+      "packages": {
+        "readable-stream-2>core-util-is": true,
+        "pumpify>inherits": true,
+        "gulp-watch>readable-stream>isarray": true,
+        "readable-stream-2>process-nextick-args": true,
+        "gulp-watch>readable-stream>safe-buffer": true,
+        "gulp-watch>readable-stream>string_decoder": true,
+        "readable-stream>util-deprecate": true
+      }
+    },
+    "lavamoat-browserify>readable-stream": {
+      "builtin": {
+        "buffer.Blob": true,
+        "buffer.Buffer": true,
+        "events.EventEmitter": true,
+        "events.addAbortListener": true,
+        "stream": true,
+        "string_decoder.StringDecoder": true
+      },
+      "globals": {
+        "AbortController": true,
+        "AbortSignal": true,
+        "AggregateError": true,
+        "Blob": true,
+        "ERR_INVALID_ARG_TYPE": true,
+        "process.env.READABLE_STREAM": true,
+        "queueMicrotask": true
+      },
+      "packages": {
+        "@lavamoat/lavapack>readable-stream>abort-controller": true,
+        "process": true
+      }
+    },
+    "gulp>vinyl-fs>lazystream>readable-stream": {
+      "builtin": {
+        "events.EventEmitter": true,
+        "stream": true,
+        "util": true
+      },
+      "globals": {
+        "process.browser": true,
+        "process.env.READABLE_STREAM": true,
+        "process.stderr": true,
+        "process.stdout": true,
+        "process.version.slice": true,
+        "setImmediate": true
+      },
+      "packages": {
+        "readable-stream-2>core-util-is": true,
+        "pumpify>inherits": true,
+        "gulp>vinyl-fs>lazystream>readable-stream>isarray": true,
+        "readable-stream-2>process-nextick-args": true,
+        "gulp>vinyl-fs>lazystream>readable-stream>safe-buffer": true,
+        "gulp>vinyl-fs>lazystream>readable-stream>string_decoder": true,
+        "readable-stream>util-deprecate": true
+      }
+    },
+    "browserify>module-deps>readable-stream": {
+      "builtin": {
+        "events.EventEmitter": true,
+        "stream": true,
+        "util": true
+      },
+      "globals": {
+        "process.browser": true,
+        "process.env.READABLE_STREAM": true,
+        "process.stderr": true,
+        "process.stdout": true,
+        "process.version.slice": true,
+        "setImmediate": true
+      },
+      "packages": {
+        "readable-stream-2>core-util-is": true,
+        "pumpify>inherits": true,
+        "browserify>module-deps>readable-stream>isarray": true,
+        "readable-stream-2>process-nextick-args": true,
+        "browserify>module-deps>readable-stream>safe-buffer": true,
+        "browserify>module-deps>readable-stream>string_decoder": true,
+        "readable-stream>util-deprecate": true
+      }
+    },
+    "gulp>vinyl-fs>glob-stream>ordered-read-streams>readable-stream": {
+      "builtin": {
+        "events.EventEmitter": true,
+        "stream": true,
+        "util": true
+      },
+      "globals": {
+        "process.browser": true,
+        "process.env.READABLE_STREAM": true,
+        "process.stderr": true,
+        "process.stdout": true,
+        "process.version.slice": true,
+        "setImmediate": true
+      },
+      "packages": {
+        "readable-stream-2>core-util-is": true,
+        "pumpify>inherits": true,
+        "gulp>vinyl-fs>glob-stream>ordered-read-streams>readable-stream>isarray": true,
+        "readable-stream-2>process-nextick-args": true,
+        "gulp>vinyl-fs>glob-stream>ordered-read-streams>readable-stream>safe-buffer": true,
+        "gulp>vinyl-fs>glob-stream>ordered-read-streams>readable-stream>string_decoder": true,
+        "readable-stream>util-deprecate": true
+      }
+    },
+    "browserify>read-only-stream>readable-stream": {
+      "builtin": {
+        "events.EventEmitter": true,
+        "stream": true,
+        "util": true
+      },
+      "globals": {
+        "process.browser": true,
+        "process.env.READABLE_STREAM": true,
+        "process.stderr": true,
+        "process.stdout": true,
+        "process.version.slice": true,
+        "setImmediate": true
+      },
+      "packages": {
+        "readable-stream-2>core-util-is": true,
+        "pumpify>inherits": true,
+        "browserify>read-only-stream>readable-stream>isarray": true,
+        "readable-stream-2>process-nextick-args": true,
+        "browserify>read-only-stream>readable-stream>safe-buffer": true,
+        "browserify>read-only-stream>readable-stream>string_decoder": true,
+        "readable-stream>util-deprecate": true
+      }
+    },
+    "browserify>module-deps>stream-combiner2>readable-stream": {
+      "builtin": {
+        "events.EventEmitter": true,
+        "stream": true,
+        "util": true
+      },
+      "globals": {
+        "process.browser": true,
+        "process.env.READABLE_STREAM": true,
+        "process.stderr": true,
+        "process.stdout": true,
+        "process.version.slice": true,
+        "setImmediate": true
+      },
+      "packages": {
+        "readable-stream-2>core-util-is": true,
+        "pumpify>inherits": true,
+        "browserify>module-deps>stream-combiner2>readable-stream>isarray": true,
+        "readable-stream-2>process-nextick-args": true,
+        "browserify>module-deps>stream-combiner2>readable-stream>safe-buffer": true,
+        "browserify>module-deps>stream-combiner2>readable-stream>string_decoder": true,
+        "readable-stream>util-deprecate": true
+      }
+    },
+    "labeled-stream-splicer>stream-splicer>readable-stream": {
+      "builtin": {
+        "events.EventEmitter": true,
+        "stream": true,
+        "util": true
+      },
+      "globals": {
+        "process.browser": true,
+        "process.env.READABLE_STREAM": true,
+        "process.stderr": true,
+        "process.stdout": true,
+        "process.version.slice": true,
+        "setImmediate": true
+      },
+      "packages": {
+        "readable-stream-2>core-util-is": true,
+        "pumpify>inherits": true,
+        "labeled-stream-splicer>stream-splicer>readable-stream>isarray": true,
+        "readable-stream-2>process-nextick-args": true,
+        "labeled-stream-splicer>stream-splicer>readable-stream>safe-buffer": true,
+        "labeled-stream-splicer>stream-splicer>readable-stream>string_decoder": true,
+        "readable-stream>util-deprecate": true
+      }
+    },
+    "gulp-sourcemaps>@gulp-sourcemaps/map-sources>through2>readable-stream": {
+      "builtin": {
+        "events.EventEmitter": true,
+        "stream": true,
+        "util": true
+      },
+      "globals": {
+        "process.browser": true,
+        "process.env.READABLE_STREAM": true,
+        "process.stderr": true,
+        "process.stdout": true,
+        "process.version.slice": true,
+        "setImmediate": true
+      },
+      "packages": {
+        "readable-stream-2>core-util-is": true,
+        "pumpify>inherits": true,
+        "gulp-sourcemaps>@gulp-sourcemaps/map-sources>through2>readable-stream>isarray": true,
+        "readable-stream-2>process-nextick-args": true,
+        "gulp-sourcemaps>@gulp-sourcemaps/map-sources>through2>readable-stream>safe-buffer": true,
+        "gulp-sourcemaps>@gulp-sourcemaps/map-sources>through2>readable-stream>string_decoder": true,
+        "readable-stream>util-deprecate": true
+      }
+    },
+    "browserify>browser-pack>through2>readable-stream": {
+      "builtin": {
+        "events.EventEmitter": true,
+        "stream": true,
+        "util": true
+      },
+      "globals": {
+        "process.browser": true,
+        "process.env.READABLE_STREAM": true,
+        "process.stderr": true,
+        "process.stdout": true,
+        "process.version.slice": true,
+        "setImmediate": true
+      },
+      "packages": {
+        "readable-stream-2>core-util-is": true,
+        "pumpify>inherits": true,
+        "browserify>browser-pack>through2>readable-stream>isarray": true,
+        "readable-stream-2>process-nextick-args": true,
+        "browserify>browser-pack>through2>readable-stream>safe-buffer": true,
+        "browserify>browser-pack>through2>readable-stream>string_decoder": true,
+        "readable-stream>util-deprecate": true
+      }
+    },
+    "vinyl>cloneable-readable>through2>readable-stream": {
+      "builtin": {
+        "events.EventEmitter": true,
+        "stream": true,
+        "util": true
+      },
+      "globals": {
+        "process.browser": true,
+        "process.env.READABLE_STREAM": true,
+        "process.stderr": true,
+        "process.stdout": true,
+        "process.version.slice": true,
+        "setImmediate": true
+      },
+      "packages": {
+        "readable-stream-2>core-util-is": true,
+        "pumpify>inherits": true,
+        "vinyl>cloneable-readable>through2>readable-stream>isarray": true,
+        "vinyl>cloneable-readable>through2>readable-stream>process-nextick-args": true,
+        "vinyl>cloneable-readable>through2>readable-stream>safe-buffer": true,
+        "vinyl>cloneable-readable>through2>readable-stream>string_decoder": true,
+        "readable-stream>util-deprecate": true
+      }
+    },
+    "browserify>deps-sort>through2>readable-stream": {
+      "builtin": {
+        "events.EventEmitter": true,
+        "stream": true,
+        "util": true
+      },
+      "globals": {
+        "process.browser": true,
+        "process.env.READABLE_STREAM": true,
+        "process.stderr": true,
+        "process.stdout": true,
+        "process.version.slice": true,
+        "setImmediate": true
+      },
+      "packages": {
+        "readable-stream-2>core-util-is": true,
+        "pumpify>inherits": true,
+        "browserify>deps-sort>through2>readable-stream>isarray": true,
+        "readable-stream-2>process-nextick-args": true,
+        "browserify>deps-sort>through2>readable-stream>safe-buffer": true,
+        "browserify>deps-sort>through2>readable-stream>string_decoder": true,
+        "readable-stream>util-deprecate": true
+      }
+    },
+    "gulp>vinyl-fs>fs-mkdirp-stream>through2>readable-stream": {
+      "builtin": {
+        "events.EventEmitter": true,
+        "stream": true,
+        "util": true
+      },
+      "globals": {
+        "process.browser": true,
+        "process.env.READABLE_STREAM": true,
+        "process.stderr": true,
+        "process.stdout": true,
+        "process.version.slice": true,
+        "setImmediate": true
+      },
+      "packages": {
+        "readable-stream-2>core-util-is": true,
+        "pumpify>inherits": true,
+        "gulp>vinyl-fs>fs-mkdirp-stream>through2>readable-stream>isarray": true,
+        "readable-stream-2>process-nextick-args": true,
+        "gulp>vinyl-fs>fs-mkdirp-stream>through2>readable-stream>safe-buffer": true,
+        "gulp>vinyl-fs>fs-mkdirp-stream>through2>readable-stream>string_decoder": true,
+        "readable-stream>util-deprecate": true
+      }
+    },
+    "gulp-sort>through2>readable-stream": {
+      "builtin": {
+        "events.EventEmitter": true,
+        "stream": true,
+        "util": true
+      },
+      "globals": {
+        "process.browser": true,
+        "process.env.READABLE_STREAM": true,
+        "process.stderr": true,
+        "process.stdout": true,
+        "process.version.slice": true,
+        "setImmediate": true
+      },
+      "packages": {
+        "readable-stream-2>core-util-is": true,
+        "pumpify>inherits": true,
+        "gulp-sort>through2>readable-stream>isarray": true,
+        "readable-stream-2>process-nextick-args": true,
+        "gulp-sort>through2>readable-stream>safe-buffer": true,
+        "gulp-sort>through2>readable-stream>string_decoder": true,
+        "readable-stream>util-deprecate": true
+      }
+    },
+    "gulp-sourcemaps>through2>readable-stream": {
+      "builtin": {
+        "events.EventEmitter": true,
+        "stream": true,
+        "util": true
+      },
+      "globals": {
+        "process.browser": true,
+        "process.env.READABLE_STREAM": true,
+        "process.stderr": true,
+        "process.stdout": true,
+        "process.version.slice": true,
+        "setImmediate": true
+      },
+      "packages": {
+        "readable-stream-2>core-util-is": true,
+        "pumpify>inherits": true,
+        "gulp-sourcemaps>through2>readable-stream>isarray": true,
+        "readable-stream-2>process-nextick-args": true,
+        "gulp-sourcemaps>through2>readable-stream>safe-buffer": true,
+        "gulp-sourcemaps>through2>readable-stream>string_decoder": true,
+        "readable-stream>util-deprecate": true
+      }
+    },
+    "browserify>insert-module-globals>through2>readable-stream": {
+      "builtin": {
+        "events.EventEmitter": true,
+        "stream": true,
+        "util": true
+      },
+      "globals": {
+        "process.browser": true,
+        "process.env.READABLE_STREAM": true,
+        "process.stderr": true,
+        "process.stdout": true,
+        "process.version.slice": true,
+        "setImmediate": true
+      },
+      "packages": {
+        "readable-stream-2>core-util-is": true,
+        "pumpify>inherits": true,
+        "browserify>insert-module-globals>through2>readable-stream>isarray": true,
+        "readable-stream-2>process-nextick-args": true,
+        "browserify>insert-module-globals>through2>readable-stream>safe-buffer": true,
+        "browserify>insert-module-globals>through2>readable-stream>string_decoder": true,
+        "readable-stream>util-deprecate": true
+      }
+    },
+    "gulp>vinyl-fs>remove-bom-stream>through2>readable-stream": {
+      "builtin": {
+        "events.EventEmitter": true,
+        "stream": true,
+        "util": true
+      },
+      "globals": {
+        "process.browser": true,
+        "process.env.READABLE_STREAM": true,
+        "process.stderr": true,
+        "process.stdout": true,
+        "process.version.slice": true,
+        "setImmediate": true
+      },
+      "packages": {
+        "readable-stream-2>core-util-is": true,
+        "pumpify>inherits": true,
+        "gulp>vinyl-fs>remove-bom-stream>through2>readable-stream>isarray": true,
+        "readable-stream-2>process-nextick-args": true,
+        "gulp>vinyl-fs>remove-bom-stream>through2>readable-stream>safe-buffer": true,
+        "gulp>vinyl-fs>remove-bom-stream>through2>readable-stream>string_decoder": true,
+        "readable-stream>util-deprecate": true
+      }
+    },
+    "gulp>vinyl-fs>glob-stream>unique-stream>through2-filter>through2>readable-stream": {
+      "builtin": {
+        "events.EventEmitter": true,
+        "stream": true,
+        "util": true
+      },
+      "globals": {
+        "process.browser": true,
+        "process.env.READABLE_STREAM": true,
+        "process.stderr": true,
+        "process.stdout": true,
+        "process.version.slice": true,
+        "setImmediate": true
+      },
+      "packages": {
+        "readable-stream-2>core-util-is": true,
+        "pumpify>inherits": true,
+        "gulp>vinyl-fs>glob-stream>unique-stream>through2-filter>through2>readable-stream>isarray": true,
+        "readable-stream-2>process-nextick-args": true,
+        "gulp>vinyl-fs>glob-stream>unique-stream>through2-filter>through2>readable-stream>safe-buffer": true,
+        "gulp>vinyl-fs>glob-stream>unique-stream>through2-filter>through2>readable-stream>string_decoder": true,
+        "readable-stream>util-deprecate": true
+      }
+    },
+    "gulp>vinyl-fs>to-through>through2>readable-stream": {
+      "builtin": {
+        "events.EventEmitter": true,
+        "stream": true,
+        "util": true
+      },
+      "globals": {
+        "process.browser": true,
+        "process.env.READABLE_STREAM": true,
+        "process.stderr": true,
+        "process.stdout": true,
+        "process.version.slice": true,
+        "setImmediate": true
+      },
+      "packages": {
+        "readable-stream-2>core-util-is": true,
+        "pumpify>inherits": true,
+        "gulp>vinyl-fs>to-through>through2>readable-stream>isarray": true,
+        "readable-stream-2>process-nextick-args": true,
+        "gulp>vinyl-fs>to-through>through2>readable-stream>safe-buffer": true,
+        "gulp>vinyl-fs>to-through>through2>readable-stream>string_decoder": true,
+        "readable-stream>util-deprecate": true
+      }
+    },
+    "vinyl-source-stream>through2>readable-stream": {
+      "builtin": {
+        "events.EventEmitter": true,
+        "stream": true,
+        "util": true
+      },
+      "globals": {
+        "process.browser": true,
+        "process.env.READABLE_STREAM": true,
+        "process.stderr": true,
+        "process.stdout": true,
+        "process.version.slice": true,
+        "setImmediate": true
+      },
+      "packages": {
+        "readable-stream-2>core-util-is": true,
+        "pumpify>inherits": true,
+        "vinyl-source-stream>through2>readable-stream>isarray": true,
+        "readable-stream-2>process-nextick-args": true,
+        "vinyl-source-stream>through2>readable-stream>safe-buffer": true,
+        "vinyl-source-stream>through2>readable-stream>string_decoder": true,
+        "readable-stream>util-deprecate": true
+      }
+    },
+    "gulp>vinyl-fs>readable-stream": {
+      "builtin": {
+        "events.EventEmitter": true,
+        "stream": true,
+        "util": true
+      },
+      "globals": {
+        "process.browser": true,
+        "process.env.READABLE_STREAM": true,
+        "process.stderr": true,
+        "process.stdout": true,
+        "process.version.slice": true,
+        "setImmediate": true
+      },
+      "packages": {
+        "readable-stream-2>core-util-is": true,
+        "pumpify>inherits": true,
+        "gulp>vinyl-fs>readable-stream>isarray": true,
+        "readable-stream-2>process-nextick-args": true,
+        "gulp>vinyl-fs>readable-stream>safe-buffer": true,
+        "gulp>vinyl-fs>readable-stream>string_decoder": true,
+        "readable-stream>util-deprecate": true
+      }
+    },
+    "chokidar>readdirp": {
+      "builtin": {
+        "fs": true,
+        "path.join": true,
+        "path.relative": true,
+        "path.resolve": true,
+        "path.sep": true,
+        "stream.Readable": true,
+        "util.promisify": true
+      },
+      "globals": {
+        "process.platform": true,
+        "process.versions.node.split": true
+      },
+      "packages": {
+        "chokidar>anymatch>picomatch": true
+      }
+    },
+    "@babel/preset-env>@babel/plugin-transform-dotall-regex>@babel/helper-create-regexp-features-plugin>regexpu-core>regenerate": {
+      "globals": {
+        "define": true
+      }
+    },
+    "@babel/preset-env>@babel/plugin-transform-regenerator>regenerator-transform": {
+      "builtin": {
+        "assert": true,
+        "util.inherits": true
+      },
+      "packages": {
+        "@babel/runtime": true
+      }
+    },
+    "gulp-watch>anymatch>micromatch>regex-cache": {
+      "packages": {
+        "gulp-watch>anymatch>micromatch>regex-cache>is-equal-shallow": true
+      }
+    },
+    "gulp>gulp-cli>matchdep>micromatch>regex-not": {
+      "packages": {
+        "gulp-zip>plugin-error>extend-shallow": true,
+        "gulp>gulp-cli>matchdep>micromatch>to-regex>safe-regex": true
+      }
+    },
+    "string.prototype.matchall>regexp.prototype.flags": {
+      "packages": {
+        "string.prototype.matchall>call-bind": true,
+        "string.prototype.matchall>define-properties": true,
+        "string.prototype.matchall>call-bind>es-errors": true,
+        "string.prototype.matchall>regexp.prototype.flags>set-function-name": true
+      }
+    },
+    "@babel/preset-env>@babel/plugin-transform-dotall-regex>@babel/helper-create-regexp-features-plugin>regexpu-core": {
+      "globals": {
+        "characterClassItem.kind": true
+      },
+      "packages": {
+        "@babel/preset-env>@babel/plugin-transform-dotall-regex>@babel/helper-create-regexp-features-plugin>regexpu-core>regenerate": true,
+        "@babel/preset-env>@babel/plugin-transform-dotall-regex>@babel/helper-create-regexp-features-plugin>regexpu-core>regjsgen": true,
+        "@babel/preset-env>@babel/plugin-transform-dotall-regex>@babel/helper-create-regexp-features-plugin>regexpu-core>regjsparser": true,
+        "@babel/preset-env>@babel/plugin-transform-dotall-regex>@babel/helper-create-regexp-features-plugin>regexpu-core>unicode-match-property-ecmascript": true,
+        "@babel/preset-env>@babel/plugin-transform-dotall-regex>@babel/helper-create-regexp-features-plugin>regexpu-core>unicode-match-property-value-ecmascript": true
+      }
+    },
+    "@babel/preset-env>@babel/plugin-transform-dotall-regex>@babel/helper-create-regexp-features-plugin>regexpu-core>regjsgen": {
+      "globals": {
+        "define": true
+      }
+    },
+    "@babel/preset-env>@babel/plugin-transform-dotall-regex>@babel/helper-create-regexp-features-plugin>regexpu-core>regjsparser": {
+      "globals": {
+        "regjsparser": "write"
+      }
+    },
+    "stylelint>@stylelint/postcss-markdown>remark>remark-parse": {
+      "packages": {
+        "stylelint>@stylelint/postcss-markdown>remark>remark-parse>ccount": true,
+        "stylelint>@stylelint/postcss-markdown>remark>remark-parse>collapse-white-space": true,
+        "stylelint>@stylelint/postcss-markdown>remark>remark-parse>is-alphabetical": true,
+        "react-syntax-highlighter>refractor>parse-entities>is-decimal": true,
+        "stylelint>@stylelint/postcss-markdown>remark>remark-parse>is-whitespace-character": true,
+        "stylelint>@stylelint/postcss-markdown>remark>remark-parse>is-word-character": true,
+        "stylelint>@stylelint/postcss-markdown>remark>remark-parse>markdown-escapes": true,
+        "react-syntax-highlighter>refractor>parse-entities": true,
+        "stylelint>@stylelint/postcss-markdown>remark>remark-parse>repeat-string": true,
+        "stylelint>@stylelint/postcss-markdown>remark>remark-parse>state-toggle": true,
+        "stylelint>@stylelint/postcss-markdown>remark>remark-parse>trim-trailing-lines": true,
+        "stylelint>@stylelint/postcss-markdown>remark>remark-parse>trim": true,
+        "stylelint>@stylelint/postcss-markdown>remark>remark-parse>unherit": true,
+        "stylelint>@stylelint/postcss-markdown>remark>remark-parse>unist-util-remove-position": true,
+        "stylelint>@stylelint/postcss-markdown>remark>remark-parse>vfile-location": true,
+        "watchify>xtend": true
+      }
+    },
+    "stylelint>@stylelint/postcss-markdown>remark>remark-stringify": {
+      "packages": {
+        "stylelint>@stylelint/postcss-markdown>remark>remark-parse>ccount": true,
+        "stylelint>@stylelint/postcss-markdown>remark>remark-stringify>is-alphanumeric": true,
+        "react-syntax-highlighter>refractor>parse-entities>is-decimal": true,
+        "stylelint>@stylelint/postcss-markdown>remark>remark-parse>is-whitespace-character": true,
+        "stylelint>@stylelint/postcss-markdown>remark>remark-stringify>longest-streak": true,
+        "stylelint>@stylelint/postcss-markdown>remark>remark-parse>markdown-escapes": true,
+        "stylelint>@stylelint/postcss-markdown>remark>remark-stringify>markdown-table": true,
+        "stylelint>@stylelint/postcss-markdown>remark>remark-stringify>mdast-util-compact": true,
+        "react-syntax-highlighter>refractor>parse-entities": true,
+        "stylelint>@stylelint/postcss-markdown>remark>remark-parse>repeat-string": true,
+        "stylelint>@stylelint/postcss-markdown>remark>remark-parse>state-toggle": true,
+        "stylelint>@stylelint/postcss-markdown>remark>remark-stringify>stringify-entities": true,
+        "stylelint>@stylelint/postcss-markdown>remark>remark-parse>unherit": true,
+        "watchify>xtend": true
+      }
+    },
+    "stylelint>@stylelint/postcss-markdown>remark": {
+      "packages": {
+        "stylelint>@stylelint/postcss-markdown>remark>remark-parse": true,
+        "stylelint>@stylelint/postcss-markdown>remark>remark-stringify": true,
+        "react-markdown>unified": true
+      }
+    },
+    "gulp>vinyl-fs>remove-bom-buffer": {
+      "packages": {
+        "browserify>insert-module-globals>is-buffer": true,
+        "gulp>vinyl-fs>remove-bom-buffer>is-utf8": true
+      }
+    },
+    "gulp>vinyl-fs>remove-bom-stream": {
+      "packages": {
+        "gulp>vinyl-fs>remove-bom-buffer": true,
+        "koa>content-disposition>safe-buffer": true,
+        "gulp>vinyl-fs>remove-bom-stream>through2": true
+      }
+    },
+    "vinyl>remove-trailing-separator": {
+      "globals": {
+        "process.platform": true
+      }
+    },
+    "gulp-sass>replace-ext": {
+      "builtin": {
+        "path.basename": true,
+        "path.dirname": true,
+        "path.extname": true,
+        "path.join": true,
+        "path.sep": true
+      }
+    },
+    "react-markdown>vfile>replace-ext": {
+      "builtin": {
+        "path.basename": true,
+        "path.dirname": true,
+        "path.extname": true,
+        "path.join": true
+      }
+    },
+    "vinyl>replace-ext": {
+      "builtin": {
+        "path.basename": true,
+        "path.dirname": true,
+        "path.extname": true,
+        "path.join": true,
+        "path.sep": true
+      }
+    },
+    "gulp-watch>vinyl-file>vinyl>replace-ext": {
+      "builtin": {
+        "path.basename": true,
+        "path.dirname": true,
+        "path.extname": true,
+        "path.join": true
+      }
+    },
+    "yargs>require-directory": {
+      "builtin": {
+        "fs.readdirSync": true,
+        "fs.statSync": true,
+        "path.dirname": true,
+        "path.join": true,
+        "path.resolve": true
+      }
+    },
+    "eslint>@eslint/eslintrc>import-fresh>resolve-from": {
+      "builtin": {
+        "fs.realpathSync": true,
+        "module._nodeModulePaths": true,
+        "module._resolveFilename": true,
+        "path.join": true,
+        "path.resolve": true
+      }
+    },
+    "nyc>resolve-from": {
+      "builtin": {
+        "fs.realpathSync": true,
+        "module._nodeModulePaths": true,
+        "module._resolveFilename": true,
+        "path.join": true,
+        "path.resolve": true
+      }
+    },
+    "gulp>vinyl-fs>resolve-options": {
       "packages": {
-        "prettier-eslint>loglevel-colored-level-prefix>chalk>has-ansi>ansi-regex": true
+        "gulp>vinyl-fs>value-or-function": true
       }
     },
-    "prop-types": {
+    "depcheck>resolve": {
+      "builtin": {
+        "fs.readFile": true,
+        "fs.readFileSync": true,
+        "fs.realpath": true,
+        "fs.realpathSync": true,
+        "fs.stat": true,
+        "fs.statSync": true,
+        "os.homedir": true,
+        "path.dirname": true,
+        "path.join": true,
+        "path.parse": true,
+        "path.relative": true,
+        "path.resolve": true
+      },
       "globals": {
-        "console": true,
-        "process.env.NODE_ENV": true
+        "process.env.HOME": true,
+        "process.env.HOMEDRIVE": true,
+        "process.env.HOMEPATH": true,
+        "process.env.LNAME": true,
+        "process.env.LOGNAME": true,
+        "process.env.USER": true,
+        "process.env.USERNAME": true,
+        "process.env.USERPROFILE": true,
+        "process.getuid": true,
+        "process.nextTick": true,
+        "process.platform": true,
+        "process.versions.pnp": true
       },
       "packages": {
-        "prop-types>react-is": true,
-        "react>object-assign": true
+        "depcheck>is-core-module": true,
+        "depcheck>resolve>path-parse": true
       }
     },
-    "prop-types>react-is": {
+    "eslint-plugin-react>resolve": {
+      "builtin": {
+        "fs.readFile": true,
+        "fs.readFileSync": true,
+        "fs.realpath": true,
+        "fs.realpathSync": true,
+        "fs.stat": true,
+        "fs.statSync": true,
+        "os.homedir": true,
+        "path.dirname": true,
+        "path.join": true,
+        "path.parse": true,
+        "path.relative": true,
+        "path.resolve": true
+      },
       "globals": {
-        "console": true,
-        "process.env.NODE_ENV": true
+        "process.env.HOME": true,
+        "process.env.HOMEDRIVE": true,
+        "process.env.HOMEPATH": true,
+        "process.env.LNAME": true,
+        "process.env.LOGNAME": true,
+        "process.env.USER": true,
+        "process.env.USERNAME": true,
+        "process.env.USERPROFILE": true,
+        "process.getuid": true,
+        "process.nextTick": true,
+        "process.platform": true,
+        "process.versions.pnp": true
+      },
+      "packages": {
+        "depcheck>is-core-module": true,
+        "depcheck>resolve>path-parse": true
       }
     },
-    "pumpify": {
+    "del>rimraf": {
+      "builtin": {
+        "assert": true,
+        "fs": true,
+        "path.join": true
+      },
+      "globals": {
+        "process.platform": true,
+        "setTimeout": true
+      },
       "packages": {
-        "duplexify": true,
-        "pumpify>inherits": true,
-        "pumpify>pump": true
+        "nyc>glob": true
       }
     },
-    "pumpify>inherits": {
+    "stylelint>file-entry-cache>flat-cache>rimraf": {
       "builtin": {
-        "util.inherits": true
+        "assert": true,
+        "fs": true,
+        "path.join": true
+      },
+      "globals": {
+        "process.platform": true,
+        "setTimeout": true
+      },
+      "packages": {
+        "nyc>glob": true
       }
     },
-    "pumpify>pump": {
+    "gulp-watch>chokidar>fsevents>node-pre-gyp>rimraf": {
       "builtin": {
-        "fs": true
+        "assert": true,
+        "fs": true,
+        "path.join": true
       },
       "globals": {
-        "process.version": true
+        "process.platform": true,
+        "setTimeout": true
       },
       "packages": {
-        "@metamask/object-multiplex>once": true,
-        "duplexify>end-of-stream": true
+        "nyc>glob": true
       }
     },
-    "randomcolor": {
+    "postcss-rtlcss>rtlcss": {
+      "packages": {
+        "postcss": true
+      }
+    },
+    "eslint>@nodelib/fs.walk>@nodelib/fs.scandir>run-parallel": {
       "globals": {
-        "define": true
+        "process.nextTick": true
       }
     },
-    "react-markdown>unified": {
-      "packages": {
-        "mocha>yargs-unparser>is-plain-obj": true,
-        "react-markdown>unified>bail": true,
-        "react-markdown>unified>extend": true,
-        "react-markdown>unified>is-buffer": true,
-        "react-markdown>unified>trough": true,
-        "react-markdown>vfile": true
+    "wait-on>rxjs": {
+      "globals": {
+        "cancelAnimationFrame": true,
+        "clearInterval": true,
+        "clearTimeout": true,
+        "performance": true,
+        "requestAnimationFrame": true,
+        "setInterval.apply": true,
+        "setTimeout.apply": true
       }
     },
-    "react-markdown>unist-util-visit": {
-      "packages": {
-        "react-markdown>unist-util-visit>unist-util-visit-parents": true
+    "koa>content-disposition>safe-buffer": {
+      "builtin": {
+        "buffer": true
       }
     },
-    "react-markdown>unist-util-visit>unist-util-visit-parents": {
-      "packages": {
-        "react-markdown>unist-util-visit>unist-util-is": true
+    "vinyl-buffer>bl>readable-stream>safe-buffer": {
+      "builtin": {
+        "buffer": true
       }
     },
-    "react-markdown>vfile": {
+    "browserify>readable-stream>safe-buffer": {
       "builtin": {
-        "path.basename": true,
-        "path.dirname": true,
-        "path.extname": true,
-        "path.join": true,
-        "path.sep": true
-      },
-      "globals": {
-        "process.cwd": true
-      },
-      "packages": {
-        "react-markdown>vfile>is-buffer": true,
-        "react-markdown>vfile>replace-ext": true,
-        "react-markdown>vfile>vfile-message": true
+        "buffer": true
       }
     },
-    "react-markdown>vfile>replace-ext": {
+    "browserify>concat-stream>readable-stream>safe-buffer": {
       "builtin": {
-        "path.basename": true,
-        "path.dirname": true,
-        "path.extname": true,
-        "path.join": true
+        "buffer": true
       }
     },
-    "react-markdown>vfile>vfile-message": {
-      "packages": {
-        "react-markdown>vfile>unist-util-stringify-position": true
+    "browserify>duplexer2>readable-stream>safe-buffer": {
+      "builtin": {
+        "buffer": true
       }
     },
-    "react-syntax-highlighter>refractor>parse-entities": {
-      "packages": {
-        "react-syntax-highlighter>refractor>parse-entities>character-entities": true,
-        "react-syntax-highlighter>refractor>parse-entities>character-entities-legacy": true,
-        "react-syntax-highlighter>refractor>parse-entities>character-reference-invalid": true,
-        "react-syntax-highlighter>refractor>parse-entities>is-alphanumerical": true,
-        "react-syntax-highlighter>refractor>parse-entities>is-decimal": true,
-        "react-syntax-highlighter>refractor>parse-entities>is-hexadecimal": true
+    "gulp-watch>vinyl-file>strip-bom-stream>first-chunk-stream>readable-stream>safe-buffer": {
+      "builtin": {
+        "buffer": true
+      }
+    },
+    "gulp>vinyl-fs>lead>flush-write-stream>readable-stream>safe-buffer": {
+      "builtin": {
+        "buffer": true
+      }
+    },
+    "gulp>vinyl-fs>glob-stream>readable-stream>safe-buffer": {
+      "builtin": {
+        "buffer": true
+      }
+    },
+    "gulp-watch>readable-stream>safe-buffer": {
+      "builtin": {
+        "buffer": true
+      }
+    },
+    "gulp>vinyl-fs>lazystream>readable-stream>safe-buffer": {
+      "builtin": {
+        "buffer": true
+      }
+    },
+    "browserify>module-deps>readable-stream>safe-buffer": {
+      "builtin": {
+        "buffer": true
+      }
+    },
+    "gulp>vinyl-fs>glob-stream>ordered-read-streams>readable-stream>safe-buffer": {
+      "builtin": {
+        "buffer": true
+      }
+    },
+    "browserify>read-only-stream>readable-stream>safe-buffer": {
+      "builtin": {
+        "buffer": true
+      }
+    },
+    "browserify>module-deps>stream-combiner2>readable-stream>safe-buffer": {
+      "builtin": {
+        "buffer": true
+      }
+    },
+    "labeled-stream-splicer>stream-splicer>readable-stream>safe-buffer": {
+      "builtin": {
+        "buffer": true
+      }
+    },
+    "gulp-sourcemaps>@gulp-sourcemaps/map-sources>through2>readable-stream>safe-buffer": {
+      "builtin": {
+        "buffer": true
+      }
+    },
+    "browserify>browser-pack>through2>readable-stream>safe-buffer": {
+      "builtin": {
+        "buffer": true
+      }
+    },
+    "vinyl>cloneable-readable>through2>readable-stream>safe-buffer": {
+      "builtin": {
+        "buffer": true
+      }
+    },
+    "browserify>deps-sort>through2>readable-stream>safe-buffer": {
+      "builtin": {
+        "buffer": true
+      }
+    },
+    "gulp>vinyl-fs>fs-mkdirp-stream>through2>readable-stream>safe-buffer": {
+      "builtin": {
+        "buffer": true
       }
     },
-    "react-syntax-highlighter>refractor>parse-entities>is-alphanumerical": {
-      "packages": {
-        "react-syntax-highlighter>refractor>parse-entities>is-decimal": true,
-        "stylelint>@stylelint/postcss-markdown>remark>remark-parse>is-alphabetical": true
+    "gulp-sort>through2>readable-stream>safe-buffer": {
+      "builtin": {
+        "buffer": true
       }
     },
-    "readable-stream": {
+    "gulp-sourcemaps>through2>readable-stream>safe-buffer": {
       "builtin": {
-        "buffer.Buffer": true,
-        "events.EventEmitter": true,
-        "stream": true,
-        "util": true
-      },
-      "globals": {
-        "process.env.READABLE_STREAM": true,
-        "process.nextTick": true,
-        "process.stderr": true,
-        "process.stdout": true
-      },
-      "packages": {
-        "browserify>string_decoder": true,
-        "pumpify>inherits": true,
-        "readable-stream>util-deprecate": true
+        "buffer": true
       }
     },
-    "readable-stream-2>core-util-is": {
-      "globals": {
-        "Buffer.isBuffer": true
+    "browserify>insert-module-globals>through2>readable-stream>safe-buffer": {
+      "builtin": {
+        "buffer": true
       }
     },
-    "readable-stream-2>process-nextick-args": {
-      "globals": {
-        "process": true
+    "gulp>vinyl-fs>remove-bom-stream>through2>readable-stream>safe-buffer": {
+      "builtin": {
+        "buffer": true
       }
     },
-    "readable-stream>util-deprecate": {
+    "gulp>vinyl-fs>glob-stream>unique-stream>through2-filter>through2>readable-stream>safe-buffer": {
       "builtin": {
-        "util.deprecate": true
+        "buffer": true
       }
     },
-    "resolve-url-loader>es6-iterator": {
-      "packages": {
-        "resolve-url-loader>es6-iterator>d": true,
-        "resolve-url-loader>es6-iterator>es5-ext": true,
-        "resolve-url-loader>es6-iterator>es6-symbol": true
+    "gulp>vinyl-fs>to-through>through2>readable-stream>safe-buffer": {
+      "builtin": {
+        "buffer": true
       }
     },
-    "resolve-url-loader>es6-iterator>d": {
-      "packages": {
-        "resolve-url-loader>es6-iterator>d>type": true,
-        "resolve-url-loader>es6-iterator>es5-ext": true
+    "vinyl-source-stream>through2>readable-stream>safe-buffer": {
+      "builtin": {
+        "buffer": true
       }
     },
-    "resolve-url-loader>es6-iterator>es5-ext": {
-      "packages": {
-        "resolve-url-loader>es6-iterator>es6-symbol": true
+    "gulp>vinyl-fs>readable-stream>safe-buffer": {
+      "builtin": {
+        "buffer": true
       }
     },
-    "resolve-url-loader>es6-iterator>es6-symbol": {
-      "packages": {
-        "resolve-url-loader>es6-iterator>d": true,
-        "resolve-url-loader>es6-iterator>es6-symbol>ext": true
+    "vinyl-buffer>bl>readable-stream>string_decoder>safe-buffer": {
+      "builtin": {
+        "buffer": true
       }
     },
-    "resolve-url-loader>es6-iterator>es6-symbol>ext": {
-      "globals": {
-        "__global__": true
+    "browserify>browser-pack>through2>readable-stream>string_decoder>safe-buffer": {
+      "builtin": {
+        "buffer": true
       }
     },
-    "resolve-url-loader>rework>css>source-map-resolve": {
+    "gulp>vinyl-fs>remove-bom-stream>through2>readable-stream>string_decoder>safe-buffer": {
       "builtin": {
-        "url.resolve": true
-      },
-      "globals": {
-        "TextDecoder": true,
-        "setImmediate": true
-      },
-      "packages": {
-        "gulp-sourcemaps>css>source-map-resolve>atob": true,
-        "gulp-sourcemaps>css>source-map-resolve>decode-uri-component": true,
-        "resolve-url-loader>rework>css>source-map-resolve>source-map-url": true,
-        "resolve-url-loader>rework>css>urix": true
+        "buffer": true
       }
     },
-    "resolve-url-loader>rework>css>source-map-resolve>source-map-url": {
-      "globals": {
-        "define": true
+    "string.prototype.matchall>es-abstract>safe-regex-test": {
+      "packages": {
+        "string.prototype.matchall>call-bind": true,
+        "string.prototype.matchall>call-bind>es-errors": true,
+        "string.prototype.matchall>es-abstract>is-regex": true
       }
     },
-    "resolve-url-loader>rework>css>urix": {
-      "builtin": {
-        "path.sep": true
+    "gulp>gulp-cli>matchdep>micromatch>to-regex>safe-regex": {
+      "packages": {
+        "gulp>gulp-cli>matchdep>micromatch>to-regex>safe-regex>ret": true
       }
     },
     "sass": {
@@ -7651,37 +7568,183 @@
         "process.stderr.write": true
       },
       "packages": {
-        "mocha>supports-color": true,
         "sass-embedded>@bufbuild/protobuf": true,
         "sass-embedded>buffer-builder": true,
         "sass-embedded>immutable": true,
-        "sass-embedded>varint": true,
-        "wait-on>rxjs": true
+        "wait-on>rxjs": true,
+        "mocha>supports-color": true,
+        "sass-embedded>varint": true
       }
     },
-    "sass-embedded>@bufbuild/protobuf": {
+    "semver": {
       "globals": {
-        "TextDecoder": true,
-        "TextEncoder": true,
-        "__values": true,
+        "console.error": true,
         "process": true
       }
     },
-    "sass-embedded>buffer-builder": {
+    "@babel/core>semver": {
       "globals": {
-        "Buffer": true
+        "console": true,
+        "process": true
       }
     },
-    "sass-embedded>immutable": {
+    "@babel/eslint-parser>semver": {
       "globals": {
         "console": true,
-        "define": true
+        "process": true
       }
     },
-    "semver": {
+    "@babel/core>@babel/helper-compilation-targets>semver": {
+      "globals": {
+        "console": true,
+        "process": true
+      }
+    },
+    "@babel/preset-env>@babel/plugin-transform-private-methods>@babel/helper-create-class-features-plugin>semver": {
+      "globals": {
+        "console": true,
+        "process": true
+      }
+    },
+    "@babel/preset-env>@babel/plugin-transform-dotall-regex>@babel/helper-create-regexp-features-plugin>semver": {
+      "globals": {
+        "console": true,
+        "process": true
+      }
+    },
+    "@babel/preset-env>semver": {
+      "globals": {
+        "console": true,
+        "process": true
+      }
+    },
+    "@babel/preset-env>babel-plugin-polyfill-corejs2>semver": {
+      "globals": {
+        "console": true,
+        "process": true
+      }
+    },
+    "eslint-plugin-node>semver": {
+      "globals": {
+        "console": true,
+        "process": true
+      }
+    },
+    "eslint-plugin-react>semver": {
+      "globals": {
+        "console": true,
+        "process": true
+      }
+    },
+    "gulp-watch>chokidar>fsevents>node-pre-gyp>semver": {
+      "globals": {
+        "console": true,
+        "process": true
+      }
+    },
+    "nyc>yargs>set-blocking": {
+      "globals": {
+        "process.stderr": true,
+        "process.stdout": true
+      }
+    },
+    "string.prototype.matchall>call-bind>set-function-length": {
+      "packages": {
+        "string.prototype.matchall>define-properties>define-data-property": true,
+        "string.prototype.matchall>call-bind>es-errors": true,
+        "string.prototype.matchall>get-intrinsic": true,
+        "string.prototype.matchall>es-abstract>gopd": true,
+        "string.prototype.matchall>es-abstract>has-property-descriptors": true
+      }
+    },
+    "string.prototype.matchall>regexp.prototype.flags>set-function-name": {
+      "packages": {
+        "string.prototype.matchall>define-properties>define-data-property": true,
+        "string.prototype.matchall>call-bind>es-errors": true,
+        "string.prototype.matchall>es-abstract>function.prototype.name>functions-have-names": true,
+        "string.prototype.matchall>es-abstract>has-property-descriptors": true
+      }
+    },
+    "gulp>gulp-cli>matchdep>micromatch>snapdragon>base>cache-base>set-value": {
+      "packages": {
+        "gulp>gulp-cli>matchdep>micromatch>snapdragon>base>cache-base>set-value>extend-shallow": true,
+        "gulp-watch>anymatch>micromatch>object.omit>is-extendable": true,
+        "@babel/register>clone-deep>is-plain-object": true,
+        "gulp>gulp-cli>matchdep>micromatch>braces>split-string": true
+      }
+    },
+    "lavamoat>lavamoat-core>merge-deep>clone-deep>shallow-clone": {
+      "packages": {
+        "gulp-watch>anymatch>micromatch>object.omit>is-extendable": true,
+        "lavamoat>lavamoat-core>merge-deep>clone-deep>shallow-clone>kind-of": true,
+        "lavamoat>lavamoat-core>merge-deep>clone-deep>shallow-clone>lazy-cache": true,
+        "lavamoat>lavamoat-core>merge-deep>clone-deep>shallow-clone>mixin-object": true
+      }
+    },
+    "browserify>shasum-object": {
+      "builtin": {
+        "crypto.createHash": true
+      },
+      "globals": {
+        "Buffer.isBuffer": true
+      },
+      "packages": {
+        "@metamask/rpc-errors>fast-safe-stringify": true
+      }
+    },
+    "string.prototype.matchall>side-channel": {
+      "packages": {
+        "string.prototype.matchall>call-bind": true,
+        "string.prototype.matchall>get-intrinsic": true,
+        "string.prototype.matchall>es-abstract>object-inspect": true
+      }
+    },
+    "nyc>signal-exit": {
+      "builtin": {
+        "assert.equal": true,
+        "events": true
+      },
+      "globals": {
+        "process": true
+      }
+    },
+    "stylelint>table>slice-ansi": {
+      "packages": {
+        "stylelint>table>slice-ansi>ansi-styles": true,
+        "stylelint>table>slice-ansi>astral-regex": true,
+        "stylelint>table>slice-ansi>is-fullwidth-code-point": true
+      }
+    },
+    "gulp>gulp-cli>matchdep>micromatch>braces>snapdragon-node": {
+      "packages": {
+        "gulp>gulp-cli>matchdep>micromatch>braces>snapdragon-node>define-property": true,
+        "gulp>gulp-cli>isobject": true,
+        "gulp>gulp-cli>matchdep>micromatch>braces>snapdragon-node>snapdragon-util": true
+      }
+    },
+    "gulp>gulp-cli>matchdep>micromatch>braces>snapdragon-node>snapdragon-util": {
+      "packages": {
+        "gulp>gulp-cli>matchdep>micromatch>braces>snapdragon-node>snapdragon-util>kind-of": true
+      }
+    },
+    "gulp>gulp-cli>matchdep>micromatch>snapdragon": {
+      "builtin": {
+        "fs.readFileSync": true,
+        "path.dirname": true,
+        "util.inspect": true
+      },
       "globals": {
-        "console.error": true,
-        "process": true
+        "__filename": true
+      },
+      "packages": {
+        "gulp>gulp-cli>matchdep>micromatch>snapdragon>base": true,
+        "gulp>gulp-cli>matchdep>micromatch>snapdragon>debug": true,
+        "gulp>gulp-cli>matchdep>micromatch>snapdragon>define-property": true,
+        "gulp>gulp-cli>matchdep>micromatch>snapdragon>extend-shallow": true,
+        "gulp>gulp-cli>liftoff>fined>parse-filepath>map-cache": true,
+        "resolve-url-loader>rework>css>source-map-resolve": true,
+        "gulp>gulp-cli>matchdep>micromatch>snapdragon>source-map": true,
+        "gulp>gulp-cli>matchdep>micromatch>snapdragon>use": true
       }
     },
     "source-map": {
@@ -7698,134 +7761,152 @@
         "fetch": true
       }
     },
-    "string.prototype.matchall": {
-      "packages": {
-        "string.prototype.matchall>call-bind": true,
-        "string.prototype.matchall>define-properties": true,
-        "string.prototype.matchall>es-abstract": true,
-        "string.prototype.matchall>has-symbols": true,
-        "string.prototype.matchall>regexp.prototype.flags": true
+    "postcss>source-map-js": {
+      "globals": {
+        "console": true
       }
     },
-    "string.prototype.matchall>call-bind": {
+    "gulp-sourcemaps>css>source-map-resolve": {
+      "builtin": {
+        "path.sep": true,
+        "url.resolve": true
+      },
+      "globals": {
+        "TextDecoder": true,
+        "setImmediate": true
+      },
       "packages": {
-        "browserify>has>function-bind": true,
-        "string.prototype.matchall>call-bind>es-define-property": true,
-        "string.prototype.matchall>call-bind>es-errors": true,
-        "string.prototype.matchall>call-bind>set-function-length": true,
-        "string.prototype.matchall>get-intrinsic": true
+        "gulp-sourcemaps>css>source-map-resolve>atob": true,
+        "gulp-sourcemaps>css>source-map-resolve>decode-uri-component": true
       }
     },
-    "string.prototype.matchall>call-bind>es-define-property": {
+    "resolve-url-loader>rework>css>source-map-resolve": {
+      "builtin": {
+        "url.resolve": true
+      },
+      "globals": {
+        "TextDecoder": true,
+        "setImmediate": true
+      },
       "packages": {
-        "string.prototype.matchall>get-intrinsic": true
+        "gulp-sourcemaps>css>source-map-resolve>atob": true,
+        "gulp-sourcemaps>css>source-map-resolve>decode-uri-component": true,
+        "resolve-url-loader>rework>css>source-map-resolve>source-map-url": true,
+        "resolve-url-loader>rework>css>urix": true
       }
     },
-    "string.prototype.matchall>call-bind>set-function-length": {
+    "terser>source-map-support": {
+      "builtin": {
+        "fs": true,
+        "path.dirname": true,
+        "path.resolve": true
+      },
+      "globals": {
+        "XMLHttpRequest": true,
+        "console.error": true,
+        "process": true
+      },
       "packages": {
-        "string.prototype.matchall>call-bind>es-errors": true,
-        "string.prototype.matchall>define-properties>define-data-property": true,
-        "string.prototype.matchall>es-abstract>gopd": true,
-        "string.prototype.matchall>es-abstract>has-property-descriptors": true,
-        "string.prototype.matchall>get-intrinsic": true
+        "terser>source-map-support>buffer-from": true,
+        "terser>source-map-support>source-map": true
       }
     },
-    "string.prototype.matchall>define-properties": {
-      "packages": {
-        "@lavamoat/lavapack>json-stable-stringify>object-keys": true,
-        "string.prototype.matchall>define-properties>define-data-property": true,
-        "string.prototype.matchall>es-abstract>has-property-descriptors": true
+    "resolve-url-loader>rework>css>source-map-resolve>source-map-url": {
+      "globals": {
+        "define": true
       }
     },
-    "string.prototype.matchall>define-properties>define-data-property": {
+    "eslint-plugin-jsdoc>spdx-expression-parse": {
       "packages": {
-        "string.prototype.matchall>call-bind>es-define-property": true,
-        "string.prototype.matchall>call-bind>es-errors": true,
-        "string.prototype.matchall>es-abstract>gopd": true
+        "eslint-plugin-jsdoc>spdx-expression-parse>spdx-exceptions": true,
+        "eslint-plugin-jsdoc>spdx-expression-parse>spdx-license-ids": true
       }
     },
-    "string.prototype.matchall>es-abstract": {
-      "packages": {
-        "depcheck>is-core-module>hasown": true,
-        "eslint-plugin-react>array-includes>is-string": true,
-        "string.prototype.matchall>call-bind": true,
-        "string.prototype.matchall>call-bind>es-define-property": true,
-        "string.prototype.matchall>call-bind>es-errors": true,
-        "string.prototype.matchall>es-abstract>es-object-atoms": true,
-        "string.prototype.matchall>es-abstract>es-set-tostringtag": true,
-        "string.prototype.matchall>es-abstract>es-to-primitive": true,
-        "string.prototype.matchall>es-abstract>gopd": true,
-        "string.prototype.matchall>es-abstract>has-property-descriptors": true,
-        "string.prototype.matchall>es-abstract>has-proto": true,
-        "string.prototype.matchall>es-abstract>is-callable": true,
-        "string.prototype.matchall>es-abstract>is-regex": true,
-        "string.prototype.matchall>es-abstract>object-inspect": true,
-        "string.prototype.matchall>es-abstract>safe-regex-test": true,
-        "string.prototype.matchall>es-abstract>string.prototype.trim": true,
-        "string.prototype.matchall>get-intrinsic": true,
-        "string.prototype.matchall>has-symbols": true,
-        "string.prototype.matchall>internal-slot": true
+    "stylelint>specificity": {
+      "globals": {
+        "define": true
       }
     },
-    "string.prototype.matchall>es-abstract>es-object-atoms": {
+    "gulp>gulp-cli>matchdep>micromatch>braces>split-string": {
       "packages": {
-        "string.prototype.matchall>call-bind>es-errors": true
+        "gulp-zip>plugin-error>extend-shallow": true
       }
     },
-    "string.prototype.matchall>es-abstract>es-set-tostringtag": {
+    "gulp-livereload>event-stream>split": {
+      "builtin": {
+        "string_decoder.StringDecoder": true
+      },
       "packages": {
-        "depcheck>is-core-module>hasown": true,
-        "koa>is-generator-function>has-tostringtag": true,
-        "string.prototype.matchall>get-intrinsic": true
+        "debounce-stream>through": true
       }
     },
-    "string.prototype.matchall>es-abstract>es-to-primitive": {
+    "gulp>gulp-cli>matchdep>micromatch>snapdragon>base>class-utils>static-extend": {
+      "builtin": {
+        "util.inherits": true
+      },
       "packages": {
-        "@metamask/eth-token-tracker>deep-equal>is-date-object": true,
-        "string.prototype.matchall>es-abstract>es-to-primitive>is-symbol": true,
-        "string.prototype.matchall>es-abstract>is-callable": true
+        "gulp>gulp-cli>matchdep>micromatch>snapdragon>define-property": true,
+        "gulp>gulp-cli>matchdep>micromatch>snapdragon>base>class-utils>static-extend>object-copy": true
       }
     },
-    "string.prototype.matchall>es-abstract>es-to-primitive>is-symbol": {
+    "browserify>module-deps>stream-combiner2": {
       "packages": {
-        "string.prototype.matchall>has-symbols": true
+        "browserify>duplexer2": true,
+        "browserify>module-deps>stream-combiner2>readable-stream": true
       }
     },
-    "string.prototype.matchall>es-abstract>gopd": {
+    "gulp-livereload>event-stream>stream-combiner": {
       "packages": {
-        "string.prototype.matchall>get-intrinsic": true
+        "debounce-stream>duplexer": true
       }
     },
-    "string.prototype.matchall>es-abstract>has-property-descriptors": {
-      "packages": {
-        "string.prototype.matchall>call-bind>es-define-property": true
+    "gulp>glob-watcher>async-done>stream-exhaust": {
+      "builtin": {
+        "stream.Writable": true,
+        "util.inherits": true
+      },
+      "globals": {
+        "setImmediate": true
       }
     },
-    "string.prototype.matchall>es-abstract>is-callable": {
+    "labeled-stream-splicer>stream-splicer": {
       "globals": {
-        "document": true
+        "process.nextTick": true,
+        "setImmediate": true
+      },
+      "packages": {
+        "pumpify>inherits": true,
+        "labeled-stream-splicer>stream-splicer>readable-stream": true
       }
     },
-    "string.prototype.matchall>es-abstract>is-regex": {
+    "@lavamoat/allow-scripts>@npmcli/run-script>node-gyp>npmlog>gauge>string-width": {
       "packages": {
-        "koa>is-generator-function>has-tostringtag": true,
-        "string.prototype.matchall>call-bind": true
+        "gulp>gulp-cli>yargs>string-width>code-point-at": true,
+        "@lavamoat/allow-scripts>@npmcli/run-script>node-gyp>npmlog>gauge>string-width>is-fullwidth-code-point": true,
+        "@lavamoat/allow-scripts>@npmcli/run-script>node-gyp>npmlog>gauge>strip-ansi": true
       }
     },
-    "string.prototype.matchall>es-abstract>object-inspect": {
-      "builtin": {
-        "util.inspect": true
-      },
-      "globals": {
-        "HTMLElement": true,
-        "WeakRef": true
+    "stylelint>table>string-width": {
+      "packages": {
+        "stylelint>table>string-width>emoji-regex": true,
+        "stylelint>table>slice-ansi>is-fullwidth-code-point": true,
+        "stylelint>table>string-width>strip-ansi": true
       }
     },
-    "string.prototype.matchall>es-abstract>safe-regex-test": {
+    "yargs>string-width": {
+      "packages": {
+        "yargs>string-width>emoji-regex": true,
+        "yargs>string-width>is-fullwidth-code-point": true,
+        "eslint>strip-ansi": true
+      }
+    },
+    "string.prototype.matchall": {
       "packages": {
         "string.prototype.matchall>call-bind": true,
-        "string.prototype.matchall>call-bind>es-errors": true,
-        "string.prototype.matchall>es-abstract>is-regex": true
+        "string.prototype.matchall>define-properties": true,
+        "string.prototype.matchall>es-abstract": true,
+        "string.prototype.matchall>has-symbols": true,
+        "string.prototype.matchall>regexp.prototype.flags": true
       }
     },
     "string.prototype.matchall>es-abstract>string.prototype.trim": {
@@ -7836,821 +7917,684 @@
         "string.prototype.matchall>es-abstract>es-object-atoms": true
       }
     },
-    "string.prototype.matchall>get-intrinsic": {
-      "globals": {
-        "AggregateError": true,
-        "FinalizationRegistry": true,
-        "WeakRef": true
-      },
+    "browserify>string_decoder": {
       "packages": {
-        "browserify>has>function-bind": true,
-        "depcheck>is-core-module>hasown": true,
-        "string.prototype.matchall>call-bind>es-errors": true,
-        "string.prototype.matchall>es-abstract>has-proto": true,
-        "string.prototype.matchall>has-symbols": true
+        "koa>content-disposition>safe-buffer": true
       }
     },
-    "string.prototype.matchall>internal-slot": {
+    "gulp-livereload>tiny-lr>body>raw-body>string_decoder": {
+      "builtin": {
+        "buffer.Buffer": true
+      }
+    },
+    "vinyl-buffer>bl>readable-stream>string_decoder": {
       "packages": {
-        "depcheck>is-core-module>hasown": true,
-        "string.prototype.matchall>call-bind>es-errors": true,
-        "string.prototype.matchall>side-channel": true
+        "vinyl-buffer>bl>readable-stream>string_decoder>safe-buffer": true
       }
     },
-    "string.prototype.matchall>regexp.prototype.flags": {
+    "browserify>readable-stream>string_decoder": {
       "packages": {
-        "string.prototype.matchall>call-bind": true,
-        "string.prototype.matchall>call-bind>es-errors": true,
-        "string.prototype.matchall>define-properties": true,
-        "string.prototype.matchall>regexp.prototype.flags>set-function-name": true
+        "browserify>readable-stream>safe-buffer": true
       }
     },
-    "string.prototype.matchall>regexp.prototype.flags>set-function-name": {
+    "browserify>concat-stream>readable-stream>string_decoder": {
       "packages": {
-        "string.prototype.matchall>call-bind>es-errors": true,
-        "string.prototype.matchall>define-properties>define-data-property": true,
-        "string.prototype.matchall>es-abstract>function.prototype.name>functions-have-names": true,
-        "string.prototype.matchall>es-abstract>has-property-descriptors": true
+        "browserify>concat-stream>readable-stream>safe-buffer": true
       }
     },
-    "string.prototype.matchall>side-channel": {
+    "browserify>duplexer2>readable-stream>string_decoder": {
       "packages": {
-        "string.prototype.matchall>call-bind": true,
-        "string.prototype.matchall>es-abstract>object-inspect": true,
-        "string.prototype.matchall>get-intrinsic": true
+        "browserify>duplexer2>readable-stream>safe-buffer": true
       }
     },
-    "stylelint": {
-      "builtin": {
-        "fs.lstatSync": true,
-        "fs.readFile": true,
-        "fs.readFileSync": true,
-        "fs.stat": true,
-        "os.EOL": true,
-        "path.dirname": true,
-        "path.isAbsolute": true,
-        "path.join": true,
-        "path.normalize": true,
-        "path.relative": true,
-        "path.resolve": true,
-        "path.sep": true,
-        "url.URL": true
-      },
-      "globals": {
-        "__dirname": true,
-        "assert": true,
-        "console.warn": true,
-        "process.cwd": true,
-        "process.env.NODE_ENV": true,
-        "process.stdout.columns": true,
-        "process.stdout.isTTY": true
-      },
+    "gulp-watch>vinyl-file>strip-bom-stream>first-chunk-stream>readable-stream>string_decoder": {
+      "packages": {
+        "gulp-watch>vinyl-file>strip-bom-stream>first-chunk-stream>readable-stream>safe-buffer": true
+      }
+    },
+    "gulp>vinyl-fs>lead>flush-write-stream>readable-stream>string_decoder": {
       "packages": {
-        "chalk": true,
-        "del>slash": true,
-        "eslint>ignore": true,
-        "eslint>imurmurhash": true,
-        "fast-glob>micromatch": true,
-        "globby": true,
-        "lodash": true,
-        "mocha>log-symbols": true,
-        "nock>debug": true,
-        "nyc>resolve-from": true,
-        "stylelint>@stylelint/postcss-css-in-js": true,
-        "stylelint>@stylelint/postcss-markdown": true,
-        "stylelint>autoprefixer": true,
-        "stylelint>balanced-match": true,
-        "stylelint>cosmiconfig": true,
-        "stylelint>execall": true,
-        "stylelint>file-entry-cache": true,
-        "stylelint>global-modules": true,
-        "stylelint>globjoin": true,
-        "stylelint>html-tags": true,
-        "stylelint>import-lazy": true,
-        "stylelint>known-css-properties": true,
-        "stylelint>leven": true,
-        "stylelint>mathml-tag-names": true,
-        "stylelint>normalize-selector": true,
-        "stylelint>postcss": true,
-        "stylelint>postcss-html": true,
-        "stylelint>postcss-less": true,
-        "stylelint>postcss-media-query-parser": true,
-        "stylelint>postcss-reporter": true,
-        "stylelint>postcss-resolve-nested-selector": true,
-        "stylelint>postcss-safe-parser": true,
-        "stylelint>postcss-sass": true,
-        "stylelint>postcss-scss": true,
-        "stylelint>postcss-selector-parser": true,
-        "stylelint>postcss-syntax": true,
-        "stylelint>postcss-value-parser": true,
-        "stylelint>specificity": true,
-        "stylelint>style-search": true,
-        "stylelint>sugarss": true,
-        "stylelint>svg-tags": true,
-        "stylelint>table": true,
-        "stylelint>write-file-atomic": true,
-        "yargs>string-width": true
+        "gulp>vinyl-fs>lead>flush-write-stream>readable-stream>safe-buffer": true
       }
     },
-    "stylelint>@stylelint/postcss-css-in-js": {
-      "globals": {
-        "__dirname": true
-      },
+    "gulp>vinyl-fs>glob-stream>readable-stream>string_decoder": {
       "packages": {
-        "@babel/core": true,
-        "stylelint>postcss": true,
-        "stylelint>postcss-syntax": true
+        "gulp>vinyl-fs>glob-stream>readable-stream>safe-buffer": true
       }
     },
-    "stylelint>@stylelint/postcss-markdown": {
+    "gulp-watch>readable-stream>string_decoder": {
       "packages": {
-        "stylelint>@stylelint/postcss-markdown>remark": true,
-        "stylelint>@stylelint/postcss-markdown>unist-util-find-all-after": true,
-        "stylelint>postcss-html": true,
-        "stylelint>postcss-syntax": true
+        "gulp-watch>readable-stream>safe-buffer": true
       }
     },
-    "stylelint>@stylelint/postcss-markdown>remark": {
+    "gulp>vinyl-fs>lazystream>readable-stream>string_decoder": {
       "packages": {
-        "react-markdown>unified": true,
-        "stylelint>@stylelint/postcss-markdown>remark>remark-parse": true,
-        "stylelint>@stylelint/postcss-markdown>remark>remark-stringify": true
+        "gulp>vinyl-fs>lazystream>readable-stream>safe-buffer": true
       }
     },
-    "stylelint>@stylelint/postcss-markdown>remark>remark-parse": {
+    "browserify>module-deps>readable-stream>string_decoder": {
       "packages": {
-        "react-syntax-highlighter>refractor>parse-entities": true,
-        "react-syntax-highlighter>refractor>parse-entities>is-decimal": true,
-        "stylelint>@stylelint/postcss-markdown>remark>remark-parse>ccount": true,
-        "stylelint>@stylelint/postcss-markdown>remark>remark-parse>collapse-white-space": true,
-        "stylelint>@stylelint/postcss-markdown>remark>remark-parse>is-alphabetical": true,
-        "stylelint>@stylelint/postcss-markdown>remark>remark-parse>is-whitespace-character": true,
-        "stylelint>@stylelint/postcss-markdown>remark>remark-parse>is-word-character": true,
-        "stylelint>@stylelint/postcss-markdown>remark>remark-parse>markdown-escapes": true,
-        "stylelint>@stylelint/postcss-markdown>remark>remark-parse>repeat-string": true,
-        "stylelint>@stylelint/postcss-markdown>remark>remark-parse>state-toggle": true,
-        "stylelint>@stylelint/postcss-markdown>remark>remark-parse>trim": true,
-        "stylelint>@stylelint/postcss-markdown>remark>remark-parse>trim-trailing-lines": true,
-        "stylelint>@stylelint/postcss-markdown>remark>remark-parse>unherit": true,
-        "stylelint>@stylelint/postcss-markdown>remark>remark-parse>unist-util-remove-position": true,
-        "stylelint>@stylelint/postcss-markdown>remark>remark-parse>vfile-location": true,
-        "watchify>xtend": true
+        "browserify>module-deps>readable-stream>safe-buffer": true
       }
     },
-    "stylelint>@stylelint/postcss-markdown>remark>remark-parse>unherit": {
+    "gulp>vinyl-fs>glob-stream>ordered-read-streams>readable-stream>string_decoder": {
       "packages": {
-        "pumpify>inherits": true,
-        "watchify>xtend": true
+        "gulp>vinyl-fs>glob-stream>ordered-read-streams>readable-stream>safe-buffer": true
       }
     },
-    "stylelint>@stylelint/postcss-markdown>remark>remark-parse>unist-util-remove-position": {
+    "browserify>read-only-stream>readable-stream>string_decoder": {
       "packages": {
-        "react-markdown>unist-util-visit": true
+        "browserify>read-only-stream>readable-stream>safe-buffer": true
       }
     },
-    "stylelint>@stylelint/postcss-markdown>remark>remark-stringify": {
+    "browserify>module-deps>stream-combiner2>readable-stream>string_decoder": {
       "packages": {
-        "react-syntax-highlighter>refractor>parse-entities": true,
-        "react-syntax-highlighter>refractor>parse-entities>is-decimal": true,
-        "stylelint>@stylelint/postcss-markdown>remark>remark-parse>ccount": true,
-        "stylelint>@stylelint/postcss-markdown>remark>remark-parse>is-whitespace-character": true,
-        "stylelint>@stylelint/postcss-markdown>remark>remark-parse>markdown-escapes": true,
-        "stylelint>@stylelint/postcss-markdown>remark>remark-parse>repeat-string": true,
-        "stylelint>@stylelint/postcss-markdown>remark>remark-parse>state-toggle": true,
-        "stylelint>@stylelint/postcss-markdown>remark>remark-parse>unherit": true,
-        "stylelint>@stylelint/postcss-markdown>remark>remark-stringify>is-alphanumeric": true,
-        "stylelint>@stylelint/postcss-markdown>remark>remark-stringify>longest-streak": true,
-        "stylelint>@stylelint/postcss-markdown>remark>remark-stringify>markdown-table": true,
-        "stylelint>@stylelint/postcss-markdown>remark>remark-stringify>mdast-util-compact": true,
-        "stylelint>@stylelint/postcss-markdown>remark>remark-stringify>stringify-entities": true,
-        "watchify>xtend": true
+        "browserify>module-deps>stream-combiner2>readable-stream>safe-buffer": true
       }
     },
-    "stylelint>@stylelint/postcss-markdown>remark>remark-stringify>markdown-table": {
+    "labeled-stream-splicer>stream-splicer>readable-stream>string_decoder": {
       "packages": {
-        "stylelint>@stylelint/postcss-markdown>remark>remark-parse>repeat-string": true
+        "labeled-stream-splicer>stream-splicer>readable-stream>safe-buffer": true
       }
     },
-    "stylelint>@stylelint/postcss-markdown>remark>remark-stringify>mdast-util-compact": {
+    "gulp-sourcemaps>@gulp-sourcemaps/map-sources>through2>readable-stream>string_decoder": {
       "packages": {
-        "react-markdown>unist-util-visit": true
+        "gulp-sourcemaps>@gulp-sourcemaps/map-sources>through2>readable-stream>safe-buffer": true
       }
     },
-    "stylelint>@stylelint/postcss-markdown>remark>remark-stringify>stringify-entities": {
+    "browserify>browser-pack>through2>readable-stream>string_decoder": {
       "packages": {
-        "react-syntax-highlighter>refractor>parse-entities>character-entities-legacy": true,
-        "react-syntax-highlighter>refractor>parse-entities>is-alphanumerical": true,
-        "react-syntax-highlighter>refractor>parse-entities>is-decimal": true,
-        "react-syntax-highlighter>refractor>parse-entities>is-hexadecimal": true,
-        "stylelint>@stylelint/postcss-markdown>remark>remark-stringify>stringify-entities>character-entities-html4": true
+        "browserify>browser-pack>through2>readable-stream>string_decoder>safe-buffer": true
       }
     },
-    "stylelint>@stylelint/postcss-markdown>unist-util-find-all-after": {
+    "vinyl>cloneable-readable>through2>readable-stream>string_decoder": {
       "packages": {
-        "stylelint>@stylelint/postcss-markdown>unist-util-find-all-after>unist-util-is": true
+        "vinyl>cloneable-readable>through2>readable-stream>safe-buffer": true
       }
     },
-    "stylelint>autoprefixer": {
-      "globals": {
-        "console": true,
-        "process.cwd": true,
-        "process.env.AUTOPREFIXER_GRID": true
-      },
+    "browserify>deps-sort>through2>readable-stream>string_decoder": {
       "packages": {
-        "autoprefixer>caniuse-lite": true,
-        "autoprefixer>normalize-range": true,
-        "browserslist": true,
-        "stylelint>autoprefixer>num2fraction": true,
-        "stylelint>postcss": true,
-        "stylelint>postcss-value-parser": true,
-        "stylelint>postcss>picocolors": true
+        "browserify>deps-sort>through2>readable-stream>safe-buffer": true
       }
     },
-    "stylelint>cosmiconfig": {
-      "builtin": {
-        "fs": true,
-        "os": true,
-        "path": true
-      },
-      "globals": {
-        "process.cwd": true
-      },
+    "gulp>vinyl-fs>fs-mkdirp-stream>through2>readable-stream>string_decoder": {
       "packages": {
-        "depcheck>cosmiconfig>parse-json": true,
-        "eslint>@eslint/eslintrc>import-fresh": true,
-        "globby>dir-glob>path-type": true,
-        "stylelint>cosmiconfig>yaml": true
+        "gulp>vinyl-fs>fs-mkdirp-stream>through2>readable-stream>safe-buffer": true
       }
     },
-    "stylelint>cosmiconfig>yaml": {
-      "globals": {
-        "Buffer": true,
-        "YAML_SILENCE_DEPRECATION_WARNINGS": true,
-        "YAML_SILENCE_WARNINGS": true,
-        "atob": true,
-        "btoa": true,
-        "console.warn": true,
-        "process": true
+    "gulp-sort>through2>readable-stream>string_decoder": {
+      "packages": {
+        "gulp-sort>through2>readable-stream>safe-buffer": true
       }
     },
-    "stylelint>execall": {
+    "gulp-sourcemaps>through2>readable-stream>string_decoder": {
       "packages": {
-        "stylelint>execall>clone-regexp": true
+        "gulp-sourcemaps>through2>readable-stream>safe-buffer": true
       }
     },
-    "stylelint>execall>clone-regexp": {
+    "browserify>insert-module-globals>through2>readable-stream>string_decoder": {
       "packages": {
-        "stylelint>execall>clone-regexp>is-regexp": true
+        "browserify>insert-module-globals>through2>readable-stream>safe-buffer": true
       }
     },
-    "stylelint>file-entry-cache": {
-      "builtin": {
-        "crypto.createHash": true,
-        "fs.readFileSync": true,
-        "fs.statSync": true,
-        "path.basename": true,
-        "path.dirname": true
-      },
+    "gulp>vinyl-fs>remove-bom-stream>through2>readable-stream>string_decoder": {
       "packages": {
-        "stylelint>file-entry-cache>flat-cache": true
+        "gulp>vinyl-fs>remove-bom-stream>through2>readable-stream>string_decoder>safe-buffer": true
       }
     },
-    "stylelint>file-entry-cache>flat-cache": {
-      "builtin": {
-        "fs.existsSync": true,
-        "fs.readFileSync": true,
-        "path.basename": true,
-        "path.dirname": true,
-        "path.resolve": true
-      },
-      "globals": {
-        "__dirname": true
-      },
+    "gulp>vinyl-fs>glob-stream>unique-stream>through2-filter>through2>readable-stream>string_decoder": {
       "packages": {
-        "stylelint>file-entry-cache>flat-cache>flatted": true,
-        "stylelint>file-entry-cache>flat-cache>rimraf": true,
-        "stylelint>file-entry-cache>flat-cache>write": true
+        "gulp>vinyl-fs>glob-stream>unique-stream>through2-filter>through2>readable-stream>safe-buffer": true
       }
     },
-    "stylelint>file-entry-cache>flat-cache>rimraf": {
-      "builtin": {
-        "assert": true,
-        "fs": true,
-        "path.join": true
-      },
-      "globals": {
-        "process.platform": true,
-        "setTimeout": true
-      },
+    "gulp>vinyl-fs>to-through>through2>readable-stream>string_decoder": {
       "packages": {
-        "nyc>glob": true
+        "gulp>vinyl-fs>to-through>through2>readable-stream>safe-buffer": true
       }
     },
-    "stylelint>file-entry-cache>flat-cache>write": {
-      "builtin": {
-        "fs.createWriteStream": true,
-        "fs.writeFile": true,
-        "fs.writeFileSync": true,
-        "path.dirname": true
-      },
+    "vinyl-source-stream>through2>readable-stream>string_decoder": {
       "packages": {
-        "mockttp>portfinder>mkdirp": true
+        "vinyl-source-stream>through2>readable-stream>safe-buffer": true
       }
     },
-    "stylelint>global-modules": {
-      "builtin": {
-        "path.resolve": true
-      },
-      "globals": {
-        "process.env.OSTYPE": true,
-        "process.platform": true
-      },
+    "gulp>vinyl-fs>readable-stream>string_decoder": {
       "packages": {
-        "stylelint>global-modules>global-prefix": true
+        "gulp>vinyl-fs>readable-stream>safe-buffer": true
       }
     },
-    "stylelint>global-modules>global-prefix": {
-      "builtin": {
-        "fs.readFileSync": true,
-        "fs.realpathSync": true,
-        "os.homedir": true,
-        "path.dirname": true,
-        "path.join": true,
-        "path.resolve": true
-      },
-      "globals": {
-        "process.env.APPDATA": true,
-        "process.env.DESTDIR": true,
-        "process.env.OSTYPE": true,
-        "process.env.PREFIX": true,
-        "process.execPath": true,
-        "process.platform": true
-      },
+    "stylelint>@stylelint/postcss-markdown>remark>remark-stringify>stringify-entities": {
       "packages": {
-        "stylelint>global-modules>global-prefix>ini": true,
-        "stylelint>global-modules>global-prefix>which": true
+        "stylelint>@stylelint/postcss-markdown>remark>remark-stringify>stringify-entities>character-entities-html4": true,
+        "react-syntax-highlighter>refractor>parse-entities>character-entities-legacy": true,
+        "react-syntax-highlighter>refractor>parse-entities>is-alphanumerical": true,
+        "react-syntax-highlighter>refractor>parse-entities>is-decimal": true,
+        "react-syntax-highlighter>refractor>parse-entities>is-hexadecimal": true
       }
     },
-    "stylelint>global-modules>global-prefix>ini": {
-      "globals": {
-        "process": true
+    "postcss-discard-font-face>postcss>chalk>strip-ansi": {
+      "packages": {
+        "postcss-discard-font-face>postcss>chalk>strip-ansi>ansi-regex": true
       }
     },
-    "stylelint>global-modules>global-prefix>which": {
-      "builtin": {
-        "path.join": true
-      },
-      "globals": {
-        "process.cwd": true,
-        "process.env.OSTYPE": true,
-        "process.env.PATH": true,
-        "process.env.PATHEXT": true,
-        "process.platform": true
-      },
+    "eslint>strip-ansi": {
       "packages": {
-        "@sentry/cli>which>isexe": true
+        "eslint>strip-ansi>ansi-regex": true
       }
     },
-    "stylelint>globjoin": {
-      "builtin": {
-        "path.join": true
+    "@lavamoat/allow-scripts>@npmcli/run-script>node-gyp>npmlog>gauge>strip-ansi": {
+      "packages": {
+        "@lavamoat/allow-scripts>@npmcli/run-script>node-gyp>npmlog>gauge>strip-ansi>ansi-regex": true
       }
     },
-    "stylelint>normalize-selector": {
-      "globals": {
-        "define": true
+    "stylelint>table>string-width>strip-ansi": {
+      "packages": {
+        "stylelint>table>string-width>strip-ansi>ansi-regex": true
       }
     },
-    "stylelint>postcss": {
-      "builtin": {
-        "fs": true,
-        "path": true
-      },
-      "globals": {
-        "Buffer": true,
-        "atob": true,
-        "btoa": true,
-        "console": true,
-        "process.env.NODE_ENV": true
-      },
+    "gulp-watch>vinyl-file>strip-bom-stream": {
       "packages": {
-        "stylelint>postcss>picocolors": true,
-        "stylelint>postcss>source-map": true
+        "gulp-watch>vinyl-file>strip-bom-stream>first-chunk-stream": true,
+        "gulp-watch>vinyl-file>strip-bom": true
       }
     },
-    "stylelint>postcss-html": {
+    "gulp-watch>vinyl-file>strip-bom": {
       "globals": {
-        "__dirname": true
+        "Buffer.isBuffer": true
       },
       "packages": {
-        "stylelint>postcss-html>htmlparser2": true,
-        "stylelint>postcss-syntax": true
+        "gulp>vinyl-fs>remove-bom-buffer>is-utf8": true
       }
     },
-    "stylelint>postcss-html>htmlparser2": {
+    "stylelint": {
       "builtin": {
-        "buffer.Buffer": true,
-        "events.EventEmitter": true,
-        "string_decoder.StringDecoder": true
+        "fs.lstatSync": true,
+        "fs.readFile": true,
+        "fs.readFileSync": true,
+        "fs.stat": true,
+        "os.EOL": true,
+        "path.dirname": true,
+        "path.isAbsolute": true,
+        "path.join": true,
+        "path.normalize": true,
+        "path.relative": true,
+        "path.resolve": true,
+        "path.sep": true,
+        "url.URL": true
+      },
+      "globals": {
+        "__dirname": true,
+        "assert": true,
+        "console.warn": true,
+        "process.cwd": true,
+        "process.env.NODE_ENV": true,
+        "process.stdout.columns": true,
+        "process.stdout.isTTY": true
       },
       "packages": {
-        "pumpify>inherits": true,
-        "readable-stream": true,
-        "stylelint>postcss-html>htmlparser2>domelementtype": true,
-        "stylelint>postcss-html>htmlparser2>domhandler": true,
-        "stylelint>postcss-html>htmlparser2>domutils": true,
-        "stylelint>postcss-html>htmlparser2>entities": true
-      }
-    },
-    "stylelint>postcss-html>htmlparser2>domhandler": {
-      "packages": {
-        "stylelint>postcss-html>htmlparser2>domelementtype": true
+        "stylelint>@stylelint/postcss-css-in-js": true,
+        "stylelint>@stylelint/postcss-markdown": true,
+        "stylelint>autoprefixer": true,
+        "stylelint>balanced-match": true,
+        "chalk": true,
+        "stylelint>cosmiconfig": true,
+        "nock>debug": true,
+        "stylelint>execall": true,
+        "stylelint>file-entry-cache": true,
+        "stylelint>global-modules": true,
+        "globby": true,
+        "stylelint>globjoin": true,
+        "stylelint>html-tags": true,
+        "eslint>ignore": true,
+        "stylelint>import-lazy": true,
+        "eslint>imurmurhash": true,
+        "stylelint>known-css-properties": true,
+        "stylelint>leven": true,
+        "lodash": true,
+        "mocha>log-symbols": true,
+        "stylelint>mathml-tag-names": true,
+        "fast-glob>micromatch": true,
+        "stylelint>normalize-selector": true,
+        "stylelint>postcss-html": true,
+        "stylelint>postcss-less": true,
+        "stylelint>postcss-media-query-parser": true,
+        "stylelint>postcss-reporter": true,
+        "stylelint>postcss-resolve-nested-selector": true,
+        "stylelint>postcss-safe-parser": true,
+        "stylelint>postcss-sass": true,
+        "stylelint>postcss-scss": true,
+        "stylelint>postcss-selector-parser": true,
+        "stylelint>postcss-syntax": true,
+        "stylelint>postcss-value-parser": true,
+        "stylelint>postcss": true,
+        "nyc>resolve-from": true,
+        "del>slash": true,
+        "stylelint>specificity": true,
+        "yargs>string-width": true,
+        "stylelint>style-search": true,
+        "stylelint>sugarss": true,
+        "stylelint>svg-tags": true,
+        "stylelint>table": true,
+        "stylelint>write-file-atomic": true
       }
     },
-    "stylelint>postcss-html>htmlparser2>domutils": {
+    "stylelint>sugarss": {
       "packages": {
-        "stylelint>postcss-html>htmlparser2>domelementtype": true,
-        "stylelint>postcss-html>htmlparser2>domutils>dom-serializer": true
+        "stylelint>sugarss>postcss": true
       }
     },
-    "stylelint>postcss-html>htmlparser2>domutils>dom-serializer": {
-      "packages": {
-        "stylelint>postcss-html>htmlparser2>domelementtype": true,
-        "stylelint>postcss-html>htmlparser2>entities": true
+    "superstruct": {
+      "globals": {
+        "console.warn": true,
+        "define": true
       }
     },
-    "stylelint>postcss-less": {
+    "chalk>supports-color": {
+      "builtin": {
+        "os.release": true,
+        "tty.isatty": true
+      },
+      "globals": {
+        "process.env": true,
+        "process.platform": true
+      },
       "packages": {
-        "stylelint>postcss-less>postcss": true
+        "chalk>supports-color>has-flag": true
       }
     },
-    "stylelint>postcss-less>postcss": {
+    "gulp-livereload>chalk>supports-color": {
       "builtin": {
-        "fs": true,
-        "path": true
+        "os.release": true
       },
       "globals": {
-        "Buffer": true,
-        "atob": true,
-        "btoa": true,
-        "console": true,
-        "process.env.NODE_ENV": true
+        "process.env": true,
+        "process.platform": true,
+        "process.stderr": true,
+        "process.stdout": true,
+        "process.versions.node.split": true
       },
       "packages": {
-        "stylelint>postcss-less>postcss>picocolors": true,
-        "stylelint>postcss-less>postcss>source-map": true
+        "gulp-livereload>chalk>supports-color>has-flag": true
       }
     },
-    "stylelint>postcss-less>postcss>picocolors": {
+    "postcss-discard-font-face>postcss>chalk>supports-color": {
+      "globals": {
+        "process.argv": true,
+        "process.env": true,
+        "process.platform": true,
+        "process.stdout": true
+      }
+    },
+    "mocha>supports-color": {
       "builtin": {
+        "os.release": true,
         "tty.isatty": true
       },
       "globals": {
-        "process.argv.includes": true,
         "process.env": true,
         "process.platform": true
+      },
+      "packages": {
+        "chalk>supports-color>has-flag": true
       }
     },
-    "stylelint>postcss-reporter": {
+    "postcss-discard-font-face>postcss>supports-color": {
+      "globals": {
+        "process": true
+      },
       "packages": {
-        "lodash": true
+        "postcss-discard-font-face>postcss>supports-color>has-flag": true
       }
     },
-    "stylelint>postcss-safe-parser": {
+    "browserify>syntax-error": {
       "packages": {
-        "stylelint>postcss-safe-parser>postcss": true
+        "browserify>syntax-error>acorn-node": true
       }
     },
-    "stylelint>postcss-safe-parser>postcss": {
-      "builtin": {
-        "fs": true,
-        "path": true
+    "stylelint>table": {
+      "globals": {
+        "process.stdout.write": true
       },
+      "packages": {
+        "eslint>ajv": true,
+        "lodash": true,
+        "stylelint>table>slice-ansi": true,
+        "stylelint>table>string-width": true
+      }
+    },
+    "terser": {
       "globals": {
         "Buffer": true,
         "atob": true,
         "btoa": true,
-        "console": true,
-        "process.env.NODE_ENV": true
+        "console.log": true,
+        "console.warn": true,
+        "define": true,
+        "process": true
       },
       "packages": {
-        "stylelint>postcss-safe-parser>postcss>picocolors": true,
-        "stylelint>postcss-safe-parser>postcss>source-map": true
-      }
-    },
-    "stylelint>postcss-safe-parser>postcss>picocolors": {
-      "builtin": {
-        "tty.isatty": true
-      },
-      "globals": {
-        "process.argv.includes": true,
-        "process.env": true,
-        "process.platform": true
+        "terser>@jridgewell/source-map": true,
+        "jsdom>acorn": true
       }
     },
-    "stylelint>postcss-sass": {
+    "through2": {
       "packages": {
-        "stylelint>postcss-sass>gonzales-pe": true,
-        "stylelint>postcss-sass>postcss": true
+        "readable-stream": true
       }
     },
-    "stylelint>postcss-sass>gonzales-pe": {
-      "globals": {
-        "console.error": true,
-        "define": true
+    "gulp>vinyl-fs>glob-stream>unique-stream>through2-filter": {
+      "packages": {
+        "gulp>vinyl-fs>glob-stream>unique-stream>through2-filter>through2": true,
+        "watchify>xtend": true
       }
     },
-    "stylelint>postcss-sass>postcss": {
+    "gulp-sourcemaps>@gulp-sourcemaps/identity-map>through2": {
       "builtin": {
-        "fs": true,
-        "path": true
+        "util.inherits": true
       },
       "globals": {
-        "Buffer": true,
-        "atob": true,
-        "btoa": true,
-        "console": true,
-        "process.env.NODE_ENV": true
+        "process.nextTick": true
       },
       "packages": {
-        "stylelint>postcss-sass>postcss>picocolors": true,
-        "stylelint>postcss-sass>postcss>source-map": true
+        "readable-stream": true
       }
     },
-    "stylelint>postcss-sass>postcss>picocolors": {
+    "gulp-sourcemaps>@gulp-sourcemaps/map-sources>through2": {
       "builtin": {
-        "tty.isatty": true
+        "util.inherits": true
       },
       "globals": {
-        "process.argv.includes": true,
-        "process.env": true,
-        "process.platform": true
-      }
-    },
-    "stylelint>postcss-scss": {
+        "process.nextTick": true
+      },
       "packages": {
-        "stylelint>postcss-scss>postcss": true
+        "gulp-sourcemaps>@gulp-sourcemaps/map-sources>through2>readable-stream": true,
+        "watchify>xtend": true
       }
     },
-    "stylelint>postcss-scss>postcss": {
+    "bify-module-groups>through2": {
       "builtin": {
-        "fs": true,
-        "path": true
+        "util.inherits": true
       },
       "globals": {
-        "Buffer": true,
-        "atob": true,
-        "btoa": true,
-        "console": true,
-        "process.env.NODE_ENV": true
+        "process.nextTick": true
       },
       "packages": {
-        "stylelint>postcss-scss>postcss>picocolors": true,
-        "stylelint>postcss-scss>postcss>source-map": true
+        "readable-stream": true
       }
     },
-    "stylelint>postcss-scss>postcss>picocolors": {
+    "browserify>browser-pack>through2": {
       "builtin": {
-        "tty.isatty": true
+        "util.inherits": true
       },
       "globals": {
-        "process.argv.includes": true,
-        "process.env": true,
-        "process.platform": true
-      }
-    },
-    "stylelint>postcss-selector-parser": {
+        "process.nextTick": true
+      },
       "packages": {
-        "readable-stream>util-deprecate": true,
-        "stylelint>postcss-selector-parser>cssesc": true
+        "browserify>browser-pack>through2>readable-stream": true,
+        "watchify>xtend": true
       }
     },
-    "stylelint>postcss-syntax": {
+    "browserify>through2": {
       "builtin": {
-        "path.isAbsolute": true,
-        "path.resolve": true,
-        "path.sep": true
+        "util.inherits": true
+      },
+      "globals": {
+        "process.nextTick": true
       },
       "packages": {
-        "stylelint>postcss": true
+        "browserify>readable-stream": true,
+        "watchify>xtend": true
       }
     },
-    "stylelint>postcss>picocolors": {
+    "vinyl>cloneable-readable>through2": {
       "builtin": {
-        "tty.isatty": true
+        "util.inherits": true
       },
       "globals": {
-        "process.argv.includes": true,
-        "process.env": true,
-        "process.platform": true
+        "process.nextTick": true
+      },
+      "packages": {
+        "vinyl>cloneable-readable>through2>readable-stream": true,
+        "watchify>xtend": true
       }
     },
-    "stylelint>specificity": {
+    "browserify>deps-sort>through2": {
+      "builtin": {
+        "util.inherits": true
+      },
       "globals": {
-        "define": true
-      }
-    },
-    "stylelint>sugarss": {
+        "process.nextTick": true
+      },
       "packages": {
-        "stylelint>sugarss>postcss": true
+        "browserify>deps-sort>through2>readable-stream": true,
+        "watchify>xtend": true
       }
     },
-    "stylelint>sugarss>postcss": {
+    "gulp>vinyl-fs>fs-mkdirp-stream>through2": {
       "builtin": {
-        "fs": true,
-        "path": true
+        "util.inherits": true
       },
       "globals": {
-        "Buffer": true,
-        "atob": true,
-        "btoa": true,
-        "console": true,
-        "process.env.NODE_ENV": true
+        "process.nextTick": true
       },
       "packages": {
-        "stylelint>sugarss>postcss>picocolors": true,
-        "stylelint>sugarss>postcss>source-map": true
+        "gulp>vinyl-fs>fs-mkdirp-stream>through2>readable-stream": true,
+        "watchify>xtend": true
       }
     },
-    "stylelint>sugarss>postcss>picocolors": {
+    "gulp-sort>through2": {
       "builtin": {
-        "tty.isatty": true
+        "util.inherits": true
       },
       "globals": {
-        "process.argv.includes": true,
-        "process.env": true,
-        "process.platform": true
+        "process.nextTick": true
+      },
+      "packages": {
+        "gulp-sort>through2>readable-stream": true,
+        "watchify>xtend": true
       }
     },
-    "stylelint>table": {
+    "gulp-sourcemaps>through2": {
+      "builtin": {
+        "util.inherits": true
+      },
       "globals": {
-        "process.stdout.write": true
+        "process.nextTick": true
       },
       "packages": {
-        "eslint>ajv": true,
-        "lodash": true,
-        "stylelint>table>slice-ansi": true,
-        "stylelint>table>string-width": true
+        "gulp-sourcemaps>through2>readable-stream": true,
+        "watchify>xtend": true
       }
     },
-    "stylelint>table>slice-ansi": {
+    "gulp-stylelint>through2": {
+      "builtin": {
+        "util.inherits": true
+      },
+      "globals": {
+        "process.nextTick": true
+      },
       "packages": {
-        "stylelint>table>slice-ansi>ansi-styles": true,
-        "stylelint>table>slice-ansi>astral-regex": true,
-        "stylelint>table>slice-ansi>is-fullwidth-code-point": true
+        "readable-stream": true
       }
     },
-    "stylelint>table>slice-ansi>ansi-styles": {
+    "gulp-zip>through2": {
+      "builtin": {
+        "util.inherits": true
+      },
+      "globals": {
+        "process.nextTick": true
+      },
       "packages": {
-        "@metamask/jazzicon>color>color-convert": true
+        "readable-stream": true
       }
     },
-    "stylelint>table>string-width": {
+    "browserify>insert-module-globals>through2": {
+      "builtin": {
+        "util.inherits": true
+      },
+      "globals": {
+        "process.nextTick": true
+      },
       "packages": {
-        "stylelint>table>slice-ansi>is-fullwidth-code-point": true,
-        "stylelint>table>string-width>emoji-regex": true,
-        "stylelint>table>string-width>strip-ansi": true
+        "browserify>insert-module-globals>through2>readable-stream": true,
+        "watchify>xtend": true
       }
     },
-    "stylelint>table>string-width>strip-ansi": {
+    "browserify>module-deps>through2": {
+      "builtin": {
+        "util.inherits": true
+      },
+      "globals": {
+        "process.nextTick": true
+      },
       "packages": {
-        "stylelint>table>string-width>strip-ansi>ansi-regex": true
+        "browserify>module-deps>readable-stream": true,
+        "watchify>xtend": true
       }
     },
-    "stylelint>write-file-atomic": {
+    "gulp>vinyl-fs>remove-bom-stream>through2": {
       "builtin": {
-        "fs.chmod": true,
-        "fs.chmodSync": true,
-        "fs.chown": true,
-        "fs.chownSync": true,
-        "fs.close": true,
-        "fs.closeSync": true,
-        "fs.fsync": true,
-        "fs.fsyncSync": true,
-        "fs.open": true,
-        "fs.openSync": true,
-        "fs.realpath": true,
-        "fs.realpathSync": true,
-        "fs.rename": true,
-        "fs.renameSync": true,
-        "fs.stat": true,
-        "fs.statSync": true,
-        "fs.unlink": true,
-        "fs.unlinkSync": true,
-        "fs.write": true,
-        "fs.writeSync": true,
-        "path.resolve": true,
-        "util.promisify": true,
-        "worker_threads.threadId": true
+        "util.inherits": true
       },
       "globals": {
-        "Buffer.isBuffer": true,
-        "__filename": true,
-        "process.getuid": true,
-        "process.pid": true
+        "process.nextTick": true
       },
       "packages": {
-        "eslint>imurmurhash": true,
-        "nyc>signal-exit": true,
-        "stylelint>write-file-atomic>is-typedarray": true,
-        "stylelint>write-file-atomic>typedarray-to-buffer": true
+        "gulp>vinyl-fs>remove-bom-stream>through2>readable-stream": true,
+        "watchify>xtend": true
       }
     },
-    "stylelint>write-file-atomic>typedarray-to-buffer": {
+    "gulp>vinyl-fs>glob-stream>unique-stream>through2-filter>through2": {
+      "builtin": {
+        "util.inherits": true
+      },
       "globals": {
-        "Buffer.from": true
+        "process.nextTick": true
       },
       "packages": {
-        "stylelint>write-file-atomic>is-typedarray": true
+        "gulp>vinyl-fs>glob-stream>unique-stream>through2-filter>through2>readable-stream": true,
+        "watchify>xtend": true
       }
     },
-    "superstruct": {
+    "gulp>vinyl-fs>to-through>through2": {
+      "builtin": {
+        "util.inherits": true
+      },
       "globals": {
-        "console.warn": true,
-        "define": true
+        "process.nextTick": true
+      },
+      "packages": {
+        "gulp>vinyl-fs>to-through>through2>readable-stream": true,
+        "watchify>xtend": true
       }
     },
-    "terser": {
+    "vinyl-buffer>through2": {
+      "builtin": {
+        "util.inherits": true
+      },
       "globals": {
-        "Buffer": true,
-        "atob": true,
-        "btoa": true,
-        "console.log": true,
-        "console.warn": true,
-        "define": true,
-        "process": true
+        "process.nextTick": true
       },
       "packages": {
-        "jsdom>acorn": true,
-        "terser>@jridgewell/source-map": true
+        "vinyl-buffer>bl>readable-stream": true,
+        "watchify>xtend": true
       }
     },
-    "terser-webpack-plugin>@jridgewell/trace-mapping": {
+    "gulp>vinyl-fs>through2": {
+      "builtin": {
+        "util.inherits": true
+      },
       "globals": {
-        "define": true
+        "process.nextTick": true
       },
       "packages": {
-        "terser-webpack-plugin>@jridgewell/trace-mapping>@jridgewell/resolve-uri": true,
-        "terser-webpack-plugin>@jridgewell/trace-mapping>@jridgewell/sourcemap-codec": true
+        "gulp>vinyl-fs>readable-stream": true,
+        "watchify>xtend": true
       }
     },
-    "terser-webpack-plugin>@jridgewell/trace-mapping>@jridgewell/resolve-uri": {
+    "vinyl-source-stream>through2": {
+      "builtin": {
+        "util.inherits": true
+      },
       "globals": {
-        "define": true
+        "process.nextTick": true
+      },
+      "packages": {
+        "vinyl-source-stream>through2>readable-stream": true,
+        "watchify>xtend": true
       }
     },
-    "terser-webpack-plugin>@jridgewell/trace-mapping>@jridgewell/sourcemap-codec": {
+    "debounce-stream>through": {
+      "builtin": {
+        "stream": true
+      },
       "globals": {
-        "Buffer": true,
-        "TextDecoder": true,
-        "define": true
+        "process.nextTick": true
       }
     },
-    "terser>@jridgewell/source-map": {
+    "gulp-sourcemaps>debug-fabulous>memoizee>timers-ext": {
       "packages": {
-        "terser-webpack-plugin>@jridgewell/trace-mapping": true,
-        "terser>@jridgewell/source-map>@jridgewell/gen-mapping": true
+        "resolve-url-loader>es6-iterator>es5-ext": true
       }
     },
-    "terser>@jridgewell/source-map>@jridgewell/gen-mapping": {
+    "gulp-livereload>tiny-lr": {
+      "builtin": {
+        "events": true,
+        "fs": true,
+        "http": true,
+        "https": true,
+        "url.parse": true
+      },
       "globals": {
-        "define": true
+        "console.error": true
       },
       "packages": {
-        "terser-webpack-plugin>@jridgewell/trace-mapping": true,
-        "terser-webpack-plugin>@jridgewell/trace-mapping>@jridgewell/sourcemap-codec": true,
-        "terser>@jridgewell/source-map>@jridgewell/gen-mapping>@jridgewell/set-array": true
-      }
-    },
-    "terser>@jridgewell/source-map>@jridgewell/gen-mapping>@jridgewell/set-array": {
-      "globals": {
-        "define": true
+        "gulp-livereload>tiny-lr>body": true,
+        "gulp-livereload>tiny-lr>debug": true,
+        "gulp-livereload>tiny-lr>faye-websocket": true,
+        "react>object-assign": true,
+        "@storybook/addon-knobs>qs": true
       }
     },
-    "terser>source-map-support": {
+    "gulp>vinyl-fs>glob-stream>to-absolute-glob": {
       "builtin": {
-        "fs": true,
-        "path.dirname": true,
         "path.resolve": true
       },
       "globals": {
-        "XMLHttpRequest": true,
-        "console.error": true,
-        "process": true
+        "process.cwd": true,
+        "process.platform": true
       },
       "packages": {
-        "terser>source-map-support>buffer-from": true,
-        "terser>source-map-support>source-map": true
+        "gulp>gulp-cli>replace-homedir>is-absolute": true,
+        "gulp>glob-watcher>is-negated-glob": true
       }
     },
-    "terser>source-map-support>buffer-from": {
-      "globals": {
-        "Buffer": true
+    "gulp>gulp-cli>matchdep>micromatch>snapdragon>base>cache-base>to-object-path": {
+      "packages": {
+        "gulp>gulp-cli>matchdep>micromatch>snapdragon>base>cache-base>to-object-path>kind-of": true
       }
     },
-    "through2": {
+    "chokidar>braces>fill-range>to-regex-range": {
       "packages": {
-        "readable-stream": true
+        "chokidar>braces>fill-range>to-regex-range>is-number": true
+      }
+    },
+    "gulp>glob-watcher>anymatch>micromatch>braces>fill-range>to-regex-range": {
+      "packages": {
+        "gulp>glob-watcher>anymatch>micromatch>braces>fill-range>is-number": true,
+        "stylelint>@stylelint/postcss-markdown>remark>remark-parse>repeat-string": true
+      }
+    },
+    "gulp>gulp-cli>matchdep>micromatch>to-regex": {
+      "packages": {
+        "gulp>gulp-cli>matchdep>micromatch>to-regex>define-property": true,
+        "gulp-zip>plugin-error>extend-shallow": true,
+        "gulp>gulp-cli>matchdep>micromatch>regex-not": true,
+        "gulp>gulp-cli>matchdep>micromatch>to-regex>safe-regex": true
+      }
+    },
+    "gulp>vinyl-fs>to-through": {
+      "packages": {
+        "gulp>vinyl-fs>to-through>through2": true
       }
     },
     "ts-node": {
@@ -8683,13 +8627,13 @@
         "value": true
       },
       "packages": {
-        "jsdom>acorn": true,
         "ts-node>@cspotcode/source-map-support": true,
         "ts-node>@tsconfig/node10": true,
         "ts-node>@tsconfig/node12": true,
         "ts-node>@tsconfig/node14": true,
         "ts-node>@tsconfig/node16": true,
         "ts-node>acorn-walk": true,
+        "jsdom>acorn": true,
         "ts-node>arg": true,
         "ts-node>create-require": true,
         "ts-node>diff": true,
@@ -8698,63 +8642,195 @@
         "ts-node>yn": true
       }
     },
-    "ts-node>@cspotcode/source-map-support": {
-      "builtin": {
-        "fs": true,
-        "path.isAbsolute": true,
-        "path.join": true,
-        "path.normalize": true,
-        "path.resolve": true,
-        "url.fileURLToPath": true,
-        "url.pathToFileURL": true,
-        "util.inspect": true
-      },
-      "globals": {
-        "Buffer.from": true,
-        "URL": true,
-        "XMLHttpRequest": true,
-        "console.error": true,
-        "process": true
-      },
+    "eslint-plugin-import>tsconfig-paths": {
+      "builtin": {
+        "fs.existsSync": true,
+        "fs.lstatSync": true,
+        "fs.readFile": true,
+        "fs.readFileSync": true,
+        "fs.stat": true,
+        "fs.statSync": true,
+        "module._resolveFilename": true,
+        "module.builtinModules": true,
+        "path.dirname": true,
+        "path.isAbsolute": true,
+        "path.join": true,
+        "path.resolve": true
+      },
+      "globals": {
+        "console.warn": true,
+        "process.argv.slice": true,
+        "process.cwd": true,
+        "process.env": true
+      },
+      "packages": {
+        "eslint-plugin-import>tsconfig-paths>json5": true,
+        "wait-on>minimist": true,
+        "eslint-plugin-import>tsconfig-paths>strip-bom": true
+      }
+    },
+    "tsutils": {
+      "packages": {
+        "tslib": true,
+        "typescript": true
+      }
+    },
+    "eslint>levn>type-check": {
+      "packages": {
+        "eslint>levn>prelude-ls": true
+      }
+    },
+    "stylelint>write-file-atomic>typedarray-to-buffer": {
+      "globals": {
+        "Buffer.from": true
+      },
+      "packages": {
+        "stylelint>write-file-atomic>is-typedarray": true
+      }
+    },
+    "typescript": {
+      "builtin": {
+        "buffer.Buffer": true,
+        "crypto": true,
+        "fs": true,
+        "inspector": true,
+        "module.findPnpApi": true,
+        "os.EOL": true,
+        "os.platform": true,
+        "path.dirname": true,
+        "path.join": true,
+        "path.resolve": true,
+        "perf_hooks.PerformanceObserver": true,
+        "perf_hooks.performance": true
+      },
+      "globals": {
+        "Intl.Collator": true,
+        "PerformanceObserver": true,
+        "__dirname": true,
+        "__filename": true,
+        "clearTimeout": true,
+        "console": true,
+        "gc": true,
+        "globalThis": true,
+        "onProfilerEvent": true,
+        "performance": true,
+        "process": true,
+        "setTimeout": true
+      },
+      "packages": {
+        "terser>source-map-support": true
+      }
+    },
+    "browserify>insert-module-globals>undeclared-identifiers": {
+      "packages": {
+        "browserify>syntax-error>acorn-node": true,
+        "browserify>insert-module-globals>undeclared-identifiers>get-assigned-identifiers": true,
+        "watchify>xtend": true
+      }
+    },
+    "gulp>undertaker": {
+      "builtin": {
+        "assert": true,
+        "events.EventEmitter": true,
+        "util.inherits": true
+      },
+      "globals": {
+        "process.env.UNDERTAKER_SETTLE": true,
+        "process.env.UNDERTAKER_TIME_RESOLUTION": true,
+        "process.hrtime": true
+      },
+      "packages": {
+        "gulp>undertaker>arr-flatten": true,
+        "gulp>undertaker>arr-map": true,
+        "gulp>undertaker>bach": true,
+        "gulp>undertaker>collection-map": true,
+        "gulp>undertaker>es6-weak-map": true,
+        "gulp>undertaker>last-run": true,
+        "gulp>undertaker>object.defaults": true,
+        "gulp>undertaker>object.reduce": true,
+        "gulp>undertaker>undertaker-registry": true
+      }
+    },
+    "stylelint>@stylelint/postcss-markdown>remark>remark-parse>unherit": {
+      "packages": {
+        "pumpify>inherits": true,
+        "watchify>xtend": true
+      }
+    },
+    "@babel/preset-env>@babel/plugin-transform-dotall-regex>@babel/helper-create-regexp-features-plugin>regexpu-core>unicode-match-property-ecmascript": {
+      "packages": {
+        "@babel/preset-env>@babel/plugin-transform-dotall-regex>@babel/helper-create-regexp-features-plugin>regexpu-core>unicode-match-property-ecmascript>unicode-canonical-property-names-ecmascript": true,
+        "@babel/preset-env>@babel/plugin-transform-dotall-regex>@babel/helper-create-regexp-features-plugin>regexpu-core>unicode-match-property-ecmascript>unicode-property-aliases-ecmascript": true
+      }
+    },
+    "react-markdown>unified": {
+      "packages": {
+        "react-markdown>unified>bail": true,
+        "react-markdown>unified>extend": true,
+        "react-markdown>unified>is-buffer": true,
+        "mocha>yargs-unparser>is-plain-obj": true,
+        "react-markdown>unified>trough": true,
+        "react-markdown>vfile": true
+      }
+    },
+    "gulp>gulp-cli>matchdep>micromatch>snapdragon>base>cache-base>union-value": {
+      "packages": {
+        "gulp-zip>plugin-error>arr-union": true,
+        "gulp>gulp-cli>array-sort>get-value": true,
+        "gulp-watch>anymatch>micromatch>object.omit>is-extendable": true,
+        "gulp>gulp-cli>matchdep>micromatch>snapdragon>base>cache-base>set-value": true
+      }
+    },
+    "gulp>vinyl-fs>glob-stream>unique-stream": {
+      "packages": {
+        "@lavamoat/lavapack>json-stable-stringify": true,
+        "gulp>vinyl-fs>glob-stream>unique-stream>through2-filter": true
+      }
+    },
+    "stylelint>@stylelint/postcss-markdown>unist-util-find-all-after": {
+      "packages": {
+        "stylelint>@stylelint/postcss-markdown>unist-util-find-all-after>unist-util-is": true
+      }
+    },
+    "stylelint>@stylelint/postcss-markdown>remark>remark-parse>unist-util-remove-position": {
+      "packages": {
+        "react-markdown>unist-util-visit": true
+      }
+    },
+    "react-markdown>unist-util-visit>unist-util-visit-parents": {
+      "packages": {
+        "react-markdown>unist-util-visit>unist-util-is": true
+      }
+    },
+    "react-markdown>unist-util-visit": {
       "packages": {
-        "ts-node>@cspotcode/source-map-support>@jridgewell/trace-mapping": true
+        "react-markdown>unist-util-visit>unist-util-visit-parents": true
       }
     },
-    "ts-node>@cspotcode/source-map-support>@jridgewell/trace-mapping": {
-      "globals": {
-        "define": true
-      },
+    "gulp>gulp-cli>matchdep>micromatch>snapdragon>base>cache-base>unset-value": {
       "packages": {
-        "terser-webpack-plugin>@jridgewell/trace-mapping>@jridgewell/resolve-uri": true,
-        "terser-webpack-plugin>@jridgewell/trace-mapping>@jridgewell/sourcemap-codec": true
+        "gulp>gulp-cli>matchdep>micromatch>snapdragon>base>cache-base>unset-value>has-value": true,
+        "gulp>gulp-cli>isobject": true
       }
     },
-    "ts-node>acorn-walk": {
+    "uri-js": {
       "globals": {
         "define": true
       }
     },
-    "ts-node>arg": {
-      "globals": {
-        "process.argv.slice": true
+    "resolve-url-loader>rework>css>urix": {
+      "builtin": {
+        "path.sep": true
       }
     },
-    "ts-node>create-require": {
-      "builtin": {
-        "fs.lstatSync": true,
-        "module.Module": true,
-        "module.createRequire": true,
-        "module.createRequireFromPath": true,
-        "path.dirname": true,
-        "path.join": true
-      },
-      "globals": {
-        "process.cwd": true
+    "gulp>gulp-cli>matchdep>micromatch>snapdragon>use": {
+      "packages": {
+        "@babel/register>clone-deep>kind-of": true
       }
     },
-    "ts-node>diff": {
-      "globals": {
-        "setTimeout": true
+    "readable-stream>util-deprecate": {
+      "builtin": {
+        "util.deprecate": true
       }
     },
     "ts-node>v8-compile-cache-lib": {
@@ -8782,48 +8858,26 @@
         "process": true
       }
     },
-    "tsutils": {
+    "react-markdown>vfile>vfile-message": {
       "packages": {
-        "tslib": true,
-        "typescript": true
+        "react-markdown>vfile>unist-util-stringify-position": true
       }
     },
-    "typescript": {
+    "react-markdown>vfile": {
       "builtin": {
-        "buffer.Buffer": true,
-        "crypto": true,
-        "fs": true,
-        "inspector": true,
-        "module.findPnpApi": true,
-        "os.EOL": true,
-        "os.platform": true,
+        "path.basename": true,
         "path.dirname": true,
+        "path.extname": true,
         "path.join": true,
-        "path.resolve": true,
-        "perf_hooks.PerformanceObserver": true,
-        "perf_hooks.performance": true
+        "path.sep": true
       },
       "globals": {
-        "Intl.Collator": true,
-        "PerformanceObserver": true,
-        "__dirname": true,
-        "__filename": true,
-        "clearTimeout": true,
-        "console": true,
-        "gc": true,
-        "globalThis": true,
-        "onProfilerEvent": true,
-        "performance": true,
-        "process": true,
-        "setTimeout": true
+        "process.cwd": true
       },
       "packages": {
-        "terser>source-map-support": true
-      }
-    },
-    "uri-js": {
-      "globals": {
-        "define": true
+        "react-markdown>vfile>is-buffer": true,
+        "react-markdown>vfile>replace-ext": true,
+        "react-markdown>vfile>vfile-message": true
       }
     },
     "vinyl": {
@@ -8841,9 +8895,9 @@
         "process.cwd": true
       },
       "packages": {
-        "vinyl>clone": true,
         "vinyl>clone-buffer": true,
         "vinyl>clone-stats": true,
+        "vinyl>clone": true,
         "vinyl>cloneable-readable": true,
         "vinyl>remove-trailing-separator": true,
         "vinyl>replace-ext": true
@@ -8855,67 +8909,7 @@
         "vinyl-buffer>through2": true
       }
     },
-    "vinyl-buffer>bl": {
-      "builtin": {
-        "util.inherits": true
-      },
-      "packages": {
-        "koa>content-disposition>safe-buffer": true,
-        "vinyl-buffer>bl>readable-stream": true
-      }
-    },
-    "vinyl-buffer>bl>readable-stream": {
-      "builtin": {
-        "events.EventEmitter": true,
-        "stream": true,
-        "util": true
-      },
-      "globals": {
-        "process.browser": true,
-        "process.env.READABLE_STREAM": true,
-        "process.stderr": true,
-        "process.stdout": true,
-        "process.version.slice": true,
-        "setImmediate": true
-      },
-      "packages": {
-        "pumpify>inherits": true,
-        "readable-stream-2>core-util-is": true,
-        "readable-stream-2>process-nextick-args": true,
-        "readable-stream>util-deprecate": true,
-        "vinyl-buffer>bl>readable-stream>isarray": true,
-        "vinyl-buffer>bl>readable-stream>safe-buffer": true,
-        "vinyl-buffer>bl>readable-stream>string_decoder": true
-      }
-    },
-    "vinyl-buffer>bl>readable-stream>safe-buffer": {
-      "builtin": {
-        "buffer": true
-      }
-    },
-    "vinyl-buffer>bl>readable-stream>string_decoder": {
-      "packages": {
-        "vinyl-buffer>bl>readable-stream>string_decoder>safe-buffer": true
-      }
-    },
-    "vinyl-buffer>bl>readable-stream>string_decoder>safe-buffer": {
-      "builtin": {
-        "buffer": true
-      }
-    },
-    "vinyl-buffer>through2": {
-      "builtin": {
-        "util.inherits": true
-      },
-      "globals": {
-        "process.nextTick": true
-      },
-      "packages": {
-        "vinyl-buffer>bl>readable-stream": true,
-        "watchify>xtend": true
-      }
-    },
-    "vinyl-source-stream": {
+    "gulp-watch>vinyl-file": {
       "builtin": {
         "path.resolve": true
       },
@@ -8923,163 +8917,103 @@
         "process.cwd": true
       },
       "packages": {
-        "vinyl": true,
-        "vinyl-source-stream>through2": true
+        "del>graceful-fs": true,
+        "gulp-watch>vinyl-file>pify": true,
+        "gh-pages>globby>pinkie-promise": true,
+        "gulp-watch>vinyl-file>strip-bom-stream": true,
+        "gulp-watch>vinyl-file>strip-bom": true,
+        "gulp-watch>vinyl-file>vinyl": true
       }
     },
-    "vinyl-source-stream>through2": {
+    "gulp>vinyl-fs": {
       "builtin": {
+        "os.platform": true,
+        "path.relative": true,
+        "path.resolve": true,
         "util.inherits": true
       },
       "globals": {
+        "Buffer.isBuffer": true,
+        "process.cwd": true,
+        "process.geteuid": true,
+        "process.getuid": true,
         "process.nextTick": true
       },
       "packages": {
-        "vinyl-source-stream>through2>readable-stream": true,
-        "watchify>xtend": true
-      }
-    },
-    "vinyl-source-stream>through2>readable-stream": {
-      "builtin": {
-        "events.EventEmitter": true,
-        "stream": true,
-        "util": true
-      },
-      "globals": {
-        "process.browser": true,
-        "process.env.READABLE_STREAM": true,
-        "process.stderr": true,
-        "process.stdout": true,
-        "process.version.slice": true,
-        "setImmediate": true
-      },
-      "packages": {
-        "pumpify>inherits": true,
-        "readable-stream-2>core-util-is": true,
-        "readable-stream-2>process-nextick-args": true,
-        "readable-stream>util-deprecate": true,
-        "vinyl-source-stream>through2>readable-stream>isarray": true,
-        "vinyl-source-stream>through2>readable-stream>safe-buffer": true,
-        "vinyl-source-stream>through2>readable-stream>string_decoder": true
-      }
-    },
-    "vinyl-source-stream>through2>readable-stream>safe-buffer": {
-      "builtin": {
-        "buffer": true
-      }
-    },
-    "vinyl-source-stream>through2>readable-stream>string_decoder": {
-      "packages": {
-        "vinyl-source-stream>through2>readable-stream>safe-buffer": true
-      }
-    },
-    "vinyl-sourcemaps-apply": {
-      "packages": {
-        "vinyl-sourcemaps-apply>source-map": true
-      }
-    },
-    "vinyl>clone": {
-      "globals": {
-        "Buffer": true
-      }
-    },
-    "vinyl>clone-buffer": {
-      "builtin": {
-        "buffer.Buffer": true
-      }
-    },
-    "vinyl>clone-stats": {
-      "builtin": {
-        "fs.Stats": true
-      }
-    },
-    "vinyl>cloneable-readable": {
-      "packages": {
-        "pumpify>inherits": true,
-        "vinyl>cloneable-readable>process-nextick-args": true,
-        "vinyl>cloneable-readable>through2": true
-      }
-    },
-    "vinyl>cloneable-readable>process-nextick-args": {
-      "globals": {
-        "process.nextTick": true,
-        "process.version": true
+        "gulp>vinyl-fs>fs-mkdirp-stream": true,
+        "gulp>vinyl-fs>glob-stream": true,
+        "del>graceful-fs": true,
+        "gulp>vinyl-fs>is-valid-glob": true,
+        "gulp>vinyl-fs>lazystream": true,
+        "gulp>vinyl-fs>lead": true,
+        "gulp>vinyl-fs>object.assign": true,
+        "gulp>vinyl-fs>pumpify": true,
+        "gulp>vinyl-fs>readable-stream": true,
+        "gulp>vinyl-fs>remove-bom-buffer": true,
+        "gulp>vinyl-fs>remove-bom-stream": true,
+        "gulp>vinyl-fs>resolve-options": true,
+        "gulp>vinyl-fs>through2": true,
+        "gulp>vinyl-fs>to-through": true,
+        "gulp>vinyl-fs>value-or-function": true,
+        "vinyl": true,
+        "gulp>vinyl-fs>vinyl-sourcemap": true
       }
     },
-    "vinyl>cloneable-readable>through2": {
+    "vinyl-source-stream": {
       "builtin": {
-        "util.inherits": true
+        "path.resolve": true
       },
       "globals": {
-        "process.nextTick": true
+        "process.cwd": true
       },
       "packages": {
-        "vinyl>cloneable-readable>through2>readable-stream": true,
-        "watchify>xtend": true
+        "vinyl-source-stream>through2": true,
+        "vinyl": true
       }
     },
-    "vinyl>cloneable-readable>through2>readable-stream": {
+    "gulp>vinyl-fs>vinyl-sourcemap": {
       "builtin": {
-        "events.EventEmitter": true,
-        "stream": true,
-        "util": true
+        "path.dirname": true,
+        "path.join": true,
+        "path.relative": true,
+        "path.resolve": true
       },
       "globals": {
-        "process.browser": true,
-        "process.env.READABLE_STREAM": true,
-        "process.stderr": true,
-        "process.stdout": true,
-        "process.version.slice": true,
-        "setImmediate": true
+        "Buffer": true
       },
       "packages": {
-        "pumpify>inherits": true,
-        "readable-stream-2>core-util-is": true,
-        "readable-stream>util-deprecate": true,
-        "vinyl>cloneable-readable>through2>readable-stream>isarray": true,
-        "vinyl>cloneable-readable>through2>readable-stream>process-nextick-args": true,
-        "vinyl>cloneable-readable>through2>readable-stream>safe-buffer": true,
-        "vinyl>cloneable-readable>through2>readable-stream>string_decoder": true
-      }
-    },
-    "vinyl>cloneable-readable>through2>readable-stream>process-nextick-args": {
-      "globals": {
-        "process": true
-      }
-    },
-    "vinyl>cloneable-readable>through2>readable-stream>safe-buffer": {
-      "builtin": {
-        "buffer": true
+        "gulp>vinyl-fs>vinyl-sourcemap>append-buffer": true,
+        "nyc>convert-source-map": true,
+        "del>graceful-fs": true,
+        "gulp-watch>anymatch>normalize-path": true,
+        "gulp>vinyl-fs>vinyl-sourcemap>now-and-later": true,
+        "gulp>vinyl-fs>remove-bom-buffer": true,
+        "vinyl": true
       }
     },
-    "vinyl>cloneable-readable>through2>readable-stream>string_decoder": {
+    "vinyl-sourcemaps-apply": {
       "packages": {
-        "vinyl>cloneable-readable>through2>readable-stream>safe-buffer": true
-      }
-    },
-    "vinyl>remove-trailing-separator": {
-      "globals": {
-        "process.platform": true
+        "vinyl-sourcemaps-apply>source-map": true
       }
     },
-    "vinyl>replace-ext": {
+    "gulp-watch>vinyl-file>vinyl": {
       "builtin": {
+        "buffer.Buffer": true,
         "path.basename": true,
         "path.dirname": true,
         "path.extname": true,
         "path.join": true,
-        "path.sep": true
-      }
-    },
-    "wait-on>rxjs": {
+        "path.relative": true,
+        "stream.PassThrough": true,
+        "stream.Stream": true
+      },
       "globals": {
-        "cancelAnimationFrame": true,
-        "clearInterval": true,
-        "clearTimeout": true,
-        "performance": true,
-        "requestAnimationFrame": true,
-        "setInterval.apply": true,
-        "setTimeout.apply": true
+        "process.cwd": true
+      },
+      "packages": {
+        "gulp-watch>vinyl-file>vinyl>clone-stats": true,
+        "@metamask/jazzicon>color>clone": true,
+        "gulp-watch>vinyl-file>vinyl>replace-ext": true
       }
     },
     "watchify": {
@@ -9091,8 +9025,8 @@
         "setTimeout": true
       },
       "packages": {
-        "chokidar": true,
         "chokidar>anymatch": true,
+        "chokidar": true,
         "through2": true,
         "watchify>xtend": true
       }
@@ -9110,20 +9044,93 @@
         "process.version": true
       },
       "packages": {
-        "koa>content-disposition>safe-buffer": true,
         "webpack-dev-server>sockjs>websocket-driver>http-parser-js": true,
+        "koa>content-disposition>safe-buffer": true,
         "webpack-dev-server>sockjs>websocket-driver>websocket-extensions": true
       }
     },
-    "webpack-dev-server>sockjs>websocket-driver>http-parser-js": {
+    "stylelint>global-modules>global-prefix>which": {
       "builtin": {
-        "assert.equal": true,
-        "assert.ok": true
+        "path.join": true
+      },
+      "globals": {
+        "process.cwd": true,
+        "process.env.OSTYPE": true,
+        "process.env.PATH": true,
+        "process.env.PATHEXT": true,
+        "process.platform": true
+      },
+      "packages": {
+        "@sentry/cli>which>isexe": true
       }
     },
-    "webpack>json-parse-even-better-errors": {
+    "@storybook/react>@storybook/node-logger>npmlog>gauge>wide-align": {
+      "packages": {
+        "yargs>string-width": true
+      }
+    },
+    "yargs>cliui>wrap-ansi": {
+      "packages": {
+        "chalk>ansi-styles": true,
+        "yargs>string-width": true,
+        "eslint>strip-ansi": true
+      }
+    },
+    "stylelint>write-file-atomic": {
+      "builtin": {
+        "fs.chmod": true,
+        "fs.chmodSync": true,
+        "fs.chown": true,
+        "fs.chownSync": true,
+        "fs.close": true,
+        "fs.closeSync": true,
+        "fs.fsync": true,
+        "fs.fsyncSync": true,
+        "fs.open": true,
+        "fs.openSync": true,
+        "fs.realpath": true,
+        "fs.realpathSync": true,
+        "fs.rename": true,
+        "fs.renameSync": true,
+        "fs.stat": true,
+        "fs.statSync": true,
+        "fs.unlink": true,
+        "fs.unlinkSync": true,
+        "fs.write": true,
+        "fs.writeSync": true,
+        "path.resolve": true,
+        "util.promisify": true,
+        "worker_threads.threadId": true
+      },
       "globals": {
-        "Buffer.isBuffer": true
+        "Buffer.isBuffer": true,
+        "__filename": true,
+        "process.getuid": true,
+        "process.pid": true
+      },
+      "packages": {
+        "eslint>imurmurhash": true,
+        "stylelint>write-file-atomic>is-typedarray": true,
+        "nyc>signal-exit": true,
+        "stylelint>write-file-atomic>typedarray-to-buffer": true
+      }
+    },
+    "stylelint>file-entry-cache>flat-cache>write": {
+      "builtin": {
+        "fs.createWriteStream": true,
+        "fs.writeFile": true,
+        "fs.writeFileSync": true,
+        "path.dirname": true
+      },
+      "packages": {
+        "mockttp>portfinder>mkdirp": true
+      }
+    },
+    "yargs>y18n": {
+      "builtin": {
+        "fs": true,
+        "path": true,
+        "util": true
       }
     },
     "yaml": {
@@ -9137,6 +9144,28 @@
         "process": true
       }
     },
+    "stylelint>cosmiconfig>yaml": {
+      "globals": {
+        "Buffer": true,
+        "YAML_SILENCE_DEPRECATION_WARNINGS": true,
+        "YAML_SILENCE_WARNINGS": true,
+        "atob": true,
+        "btoa": true,
+        "console.warn": true,
+        "process": true
+      }
+    },
+    "gulp-postcss>postcss-load-config>yaml": {
+      "globals": {
+        "Buffer": true,
+        "YAML_SILENCE_DEPRECATION_WARNINGS": true,
+        "YAML_SILENCE_WARNINGS": true,
+        "atob": true,
+        "btoa": true,
+        "console.warn": true,
+        "process": true
+      }
+    },
     "yargs": {
       "builtin": {
         "assert": true,
@@ -9151,13 +9180,13 @@
         "process": true
       },
       "packages": {
-        "yargs-parser": true,
         "yargs>cliui": true,
         "yargs>escalade": true,
         "yargs>get-caller-file": true,
         "yargs>require-directory": true,
         "yargs>string-width": true,
-        "yargs>y18n": true
+        "yargs>y18n": true,
+        "yargs-parser": true
       }
     },
     "yargs-parser": {
@@ -9171,62 +9200,34 @@
         "process": true
       }
     },
-    "yargs>cliui": {
-      "globals": {
-        "process": true
-      },
-      "packages": {
-        "eslint>strip-ansi": true,
-        "yargs>cliui>wrap-ansi": true,
-        "yargs>string-width": true
-      }
-    },
-    "yargs>cliui>wrap-ansi": {
-      "packages": {
-        "chalk>ansi-styles": true,
-        "eslint>strip-ansi": true,
-        "yargs>string-width": true
-      }
-    },
-    "yargs>escalade": {
-      "builtin": {
-        "fs.readdirSync": true,
-        "fs.statSync": true,
-        "path.dirname": true,
-        "path.resolve": true
-      }
-    },
-    "yargs>require-directory": {
-      "builtin": {
-        "fs.readdirSync": true,
-        "fs.statSync": true,
-        "path.dirname": true,
-        "path.join": true,
-        "path.resolve": true
-      }
-    },
-    "yargs>string-width": {
-      "packages": {
-        "eslint>strip-ansi": true,
-        "yargs>string-width>emoji-regex": true,
-        "yargs>string-width>is-fullwidth-code-point": true
-      }
-    },
-    "yargs>y18n": {
+    "yargs>yargs-parser": {
       "builtin": {
         "fs": true,
         "path": true,
         "util": true
+      },
+      "globals": {
+        "process": true
       }
     },
-    "yargs>yargs-parser": {
+    "gulp-zip>yazl": {
       "builtin": {
-        "fs": true,
-        "path": true,
-        "util": true
+        "events.EventEmitter": true,
+        "fs.createReadStream": true,
+        "fs.stat": true,
+        "stream.PassThrough": true,
+        "stream.Transform": true,
+        "util.inherits": true,
+        "zlib.DeflateRaw": true,
+        "zlib.deflateRaw": true
       },
       "globals": {
-        "process": true
+        "Buffer": true,
+        "setImmediate": true,
+        "utf8FileName.length": true
+      },
+      "packages": {
+        "gulp-zip>yazl>buffer-crc32": true
       }
     }
   }
diff --git a/package.json b/package.json
index 0cc3222a7d1d..c3e6ff9eac24 100644
--- a/package.json
+++ b/package.json
@@ -452,9 +452,9 @@
     "@babel/preset-typescript": "^7.25.9",
     "@babel/register": "^7.25.9",
     "@jest/globals": "^29.7.0",
-    "@lavamoat/allow-scripts": "^3.0.4",
+    "@lavamoat/allow-scripts": "^3.3.1",
     "@lavamoat/lavadome-core": "0.0.10",
-    "@lavamoat/lavapack": "^6.1.0",
+    "@lavamoat/lavapack": "^7.0.5",
     "@lgbot/madge": "^6.2.0",
     "@lydell/node-pty": "^1.0.1",
     "@metamask/api-specs": "^0.9.3",
@@ -611,8 +611,8 @@
     "jsdom": "^16.7.0",
     "json-schema-to-ts": "^3.0.1",
     "koa": "^2.7.0",
-    "lavamoat": "^8.0.2",
-    "lavamoat-browserify": "^17.0.4",
+    "lavamoat": "^9.0.5",
+    "lavamoat-browserify": "^18.1.2",
     "lavamoat-viz": "^7.0.5",
     "level": "^8.0.1",
     "lockfile-lint": "^4.10.6",
@@ -762,7 +762,8 @@
       "resolve-url-loader>es6-iterator>d>es5-ext>esniff>es5-ext": false,
       "level>classic-level": false,
       "jest-preview": false,
-      "@metamask/solana-wallet-snap>@solana/web3.js>bigint-buffer": false
+      "@metamask/solana-wallet-snap>@solana/web3.js>bigint-buffer": false,
+      "@lavamoat/allow-scripts>@lavamoat/preinstall-always-fail": false
     }
   },
   "packageManager": "yarn@4.5.1"
diff --git a/test/e2e/playwright/global/specs/protect-intrinsics.spec.ts b/test/e2e/playwright/global/specs/protect-intrinsics.spec.ts
index 7f67cd587f2b..63091e9fe5cc 100644
--- a/test/e2e/playwright/global/specs/protect-intrinsics.spec.ts
+++ b/test/e2e/playwright/global/specs/protect-intrinsics.spec.ts
@@ -1,5 +1,4 @@
 import { test, expect } from '@playwright/test';
-// @ts-expect-error lint fails otherwise
 import 'ses';
 import '../../../../../app/scripts/lockdown-run';
 import '../../../../../app/scripts/lockdown-more';
diff --git a/yarn.lock b/yarn.lock
index 033ff849acd8..0b959e498c51 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -78,23 +78,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/code-frame@npm:7.22.13":
-  version: 7.22.13
-  resolution: "@babel/code-frame@npm:7.22.13"
+"@babel/code-frame@npm:7.26.2, @babel/code-frame@npm:^7.0.0, @babel/code-frame@npm:^7.10.4, @babel/code-frame@npm:^7.12.13, @babel/code-frame@npm:^7.16.7, @babel/code-frame@npm:^7.23.5, @babel/code-frame@npm:^7.25.9":
+  version: 7.26.2
+  resolution: "@babel/code-frame@npm:7.26.2"
   dependencies:
-    "@babel/highlight": "npm:^7.22.13"
-    chalk: "npm:^2.4.2"
-  checksum: 10/bf6ae6ba3a510adfda6a211b4a89b0f1c98ca1352b745c077d113f3b568141e0d44ce750b9ac2a80143ba5c8c4080c50fcfc1aa11d86e194ea6785f62520eb5a
-  languageName: node
-  linkType: hard
-
-"@babel/code-frame@npm:^7.0.0, @babel/code-frame@npm:^7.10.4, @babel/code-frame@npm:^7.12.13, @babel/code-frame@npm:^7.16.7, @babel/code-frame@npm:^7.23.5, @babel/code-frame@npm:^7.25.9":
-  version: 7.25.9
-  resolution: "@babel/code-frame@npm:7.25.9"
-  dependencies:
-    "@babel/highlight": "npm:^7.25.9"
+    "@babel/helper-validator-identifier": "npm:^7.25.9"
+    js-tokens: "npm:^4.0.0"
     picocolors: "npm:^1.0.0"
-  checksum: 10/96d69a570d0df82daedeb3d26ca508970bb31de83580c36c9605e7e7c0aae307ae17bc42609363016f0bdab12e991cebca3c02bf10765036b136bfe7281aee9a
+  checksum: 10/db2c2122af79d31ca916755331bb4bac96feb2b334cdaca5097a6b467fdd41963b89b14b6836a14f083de7ff887fc78fa1b3c10b14e743d33e12dbfe5ee3d223
   languageName: node
   linkType: hard
 
@@ -441,18 +432,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/highlight@npm:7.22.20":
-  version: 7.22.20
-  resolution: "@babel/highlight@npm:7.22.20"
-  dependencies:
-    "@babel/helper-validator-identifier": "npm:^7.22.20"
-    chalk: "npm:^2.4.2"
-    js-tokens: "npm:^4.0.0"
-  checksum: 10/1aabc95b2cb7f67adc26c7049554306f1435bfedb76b9731c36ff3d7cdfcb32bd65a6dd06985644124eb2100bd911721d9e5c4f5ac40b7f0da2995a61bf8da92
-  languageName: node
-  linkType: hard
-
-"@babel/highlight@npm:^7.22.13, @babel/highlight@npm:^7.25.9":
+"@babel/highlight@npm:7.25.9":
   version: 7.25.9
   resolution: "@babel/highlight@npm:7.25.9"
   dependencies:
@@ -482,14 +462,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/parser@npm:^7.1.0, @babel/parser@npm:^7.12.0, @babel/parser@npm:^7.13.9, @babel/parser@npm:^7.14.7, @babel/parser@npm:^7.20.7, @babel/parser@npm:^7.21.8, @babel/parser@npm:^7.23.0, @babel/parser@npm:^7.24.0, @babel/parser@npm:^7.25.9":
-  version: 7.25.9
-  resolution: "@babel/parser@npm:7.25.9"
+"@babel/parser@npm:7.26.2, @babel/parser@npm:^7.1.0, @babel/parser@npm:^7.12.0, @babel/parser@npm:^7.13.9, @babel/parser@npm:^7.14.7, @babel/parser@npm:^7.20.7, @babel/parser@npm:^7.21.8, @babel/parser@npm:^7.23.0, @babel/parser@npm:^7.24.0, @babel/parser@npm:^7.25.9":
+  version: 7.26.2
+  resolution: "@babel/parser@npm:7.26.2"
   dependencies:
-    "@babel/types": "npm:^7.25.9"
+    "@babel/types": "npm:^7.26.0"
   bin:
     parser: ./bin/babel-parser.js
-  checksum: 10/702af8c40bb1236e3e3e6187b99e1290bd4bc1500aa53593ea63df8fe99f07ff1efef147b1d58886b264aff0972c4b9440ace442c8db9a6e079f318d46773421
+  checksum: 10/8baee43752a3678ad9f9e360ec845065eeee806f1fdc8e0f348a8a0e13eef0959dabed4a197c978896c493ea205c804d0a1187cc52e4a1ba017c7935bab4983d
   languageName: node
   linkType: hard
 
@@ -1620,7 +1600,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/traverse@npm:^7.12.5, @babel/traverse@npm:^7.18.9, @babel/traverse@npm:^7.23.2, @babel/traverse@npm:^7.25.9":
+"@babel/traverse@npm:7.25.9, @babel/traverse@npm:^7.12.5, @babel/traverse@npm:^7.18.9, @babel/traverse@npm:^7.23.2, @babel/traverse@npm:^7.25.9":
   version: 7.25.9
   resolution: "@babel/traverse@npm:7.25.9"
   dependencies:
@@ -1646,7 +1626,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/types@npm:^7.0.0, @babel/types@npm:^7.12.0, @babel/types@npm:^7.13.0, @babel/types@npm:^7.18.9, @babel/types@npm:^7.20.0, @babel/types@npm:^7.20.7, @babel/types@npm:^7.22.5, @babel/types@npm:^7.23.0, @babel/types@npm:^7.24.0, @babel/types@npm:^7.24.7, @babel/types@npm:^7.25.9, @babel/types@npm:^7.3.3, @babel/types@npm:^7.4.4, @babel/types@npm:^7.8.3":
+"@babel/types@npm:7.26.0":
   version: 7.26.0
   resolution: "@babel/types@npm:7.26.0"
   dependencies:
@@ -1656,6 +1636,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/types@npm:^7.0.0, @babel/types@npm:^7.12.0, @babel/types@npm:^7.13.0, @babel/types@npm:^7.18.9, @babel/types@npm:^7.20.0, @babel/types@npm:^7.20.7, @babel/types@npm:^7.22.5, @babel/types@npm:^7.23.0, @babel/types@npm:^7.24.0, @babel/types@npm:^7.24.7, @babel/types@npm:^7.25.9, @babel/types@npm:^7.26.0, @babel/types@npm:^7.3.3, @babel/types@npm:^7.4.4, @babel/types@npm:^7.8.3":
+  version: 7.26.3
+  resolution: "@babel/types@npm:7.26.3"
+  dependencies:
+    "@babel/helper-string-parser": "npm:^7.25.9"
+    "@babel/helper-validator-identifier": "npm:^7.25.9"
+  checksum: 10/c31d0549630a89abfa11410bf82a318b0c87aa846fbf5f9905e47ba5e2aa44f41cc746442f105d622c519e4dc532d35a8d8080460ff4692f9fc7485fbf3a00eb
+  languageName: node
+  linkType: hard
+
 "@base2/pretty-print-object@npm:1.0.1":
   version: 1.0.1
   resolution: "@base2/pretty-print-object@npm:1.0.1"
@@ -1918,10 +1908,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@endo/env-options@npm:^1.1.0":
-  version: 1.1.0
-  resolution: "@endo/env-options@npm:1.1.0"
-  checksum: 10/c362b5ccda9407c7049d4f5812023b9f5123116282719a4b296702f93baca7030066359af0b8bf869f8d7736f85d5fe12d21e1375049b10a482eb9bae3715797
+"@endo/env-options@npm:^1.1.7":
+  version: 1.1.8
+  resolution: "@endo/env-options@npm:1.1.8"
+  checksum: 10/f7e84346599dd2bcb6365c314e9a8129c5ebbb457476de72ed896ea461d616c0b7e0dfc7733e20c0abb8400212fb5eafdae993bcfd4cbfe92acbb5c881a6ad0d
   languageName: node
   linkType: hard
 
@@ -4214,29 +4204,32 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@lavamoat/aa@npm:^4.0.1, @lavamoat/aa@npm:^4.2.0":
-  version: 4.2.0
-  resolution: "@lavamoat/aa@npm:4.2.0"
+"@lavamoat/aa@npm:^4.3.1":
+  version: 4.3.1
+  resolution: "@lavamoat/aa@npm:4.3.1"
   dependencies:
     resolve: "npm:1.22.8"
   bin:
     lavamoat-ls: src/cli.js
-  checksum: 10/13901bfe71b74fefac707d6f94651a1f26d72825f24391b59cc712d33e671dd492123891071c900104cf806a48b543b8d19c9f04110c532b3acfa6928fd00cc0
+  checksum: 10/664692b22c6fcf44a47259ec3b48873c0064872a5a285c7ee4ddc0f99217d5a6653236304cc393f03970f0810694ab44d1f02ce4c980ce86cc24b0e27e9c622f
   languageName: node
   linkType: hard
 
-"@lavamoat/allow-scripts@npm:^3.0.4":
-  version: 3.0.4
-  resolution: "@lavamoat/allow-scripts@npm:3.0.4"
+"@lavamoat/allow-scripts@npm:^3.3.1":
+  version: 3.3.1
+  resolution: "@lavamoat/allow-scripts@npm:3.3.1"
   dependencies:
-    "@lavamoat/aa": "npm:^4.2.0"
-    "@npmcli/run-script": "npm:7.0.4"
-    bin-links: "npm:4.0.3"
+    "@lavamoat/aa": "npm:^4.3.1"
+    "@npmcli/run-script": "npm:8.1.0"
+    bin-links: "npm:4.0.4"
     npm-normalize-package-bin: "npm:3.0.1"
+    type-fest: "npm:4.30.0"
     yargs: "npm:17.7.2"
+  peerDependencies:
+    "@lavamoat/preinstall-always-fail": "*"
   bin:
     allow-scripts: src/cli.js
-  checksum: 10/02975c9187d9cfe2c2bd0d2b645a49a04f5bd7c8cc95fa10fbc7fb15988f170d27e76bb6f977908957c2c369447eca35d3c3f3ad7e91d685c33d22ae39a86a98
+  checksum: 10/78bb7502136cee509592e66a1824a3e049a392e79740d99f528774743934d28e2099d3e80beded9a6623ce8842250d6207ebeea694d08c87e4fd8e2899eb0d7a
   languageName: node
   linkType: hard
 
@@ -4269,20 +4262,19 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@lavamoat/lavapack@npm:^6.1.0":
-  version: 6.1.0
-  resolution: "@lavamoat/lavapack@npm:6.1.0"
+"@lavamoat/lavapack@npm:^7.0.5":
+  version: 7.0.5
+  resolution: "@lavamoat/lavapack@npm:7.0.5"
   dependencies:
     JSONStream: "npm:1.3.5"
     combine-source-map: "npm:0.8.0"
-    convert-source-map: "npm:2.0.0"
     espree: "npm:9.6.1"
     json-stable-stringify: "npm:1.1.1"
-    lavamoat-core: "npm:^15.1.2"
-    readable-stream: "npm:3.6.2"
+    lavamoat-core: "npm:^16.2.2"
+    readable-stream: "npm:4.5.2"
     through2: "npm:4.0.2"
     umd: "npm:3.0.3"
-  checksum: 10/faf4425e740c5abb9a441b6e872921943d48129f8f2120ce26672119824cea5dfcbcb7ae7113ece639a34c924794e3f6088564281672421bf31b40c25cfc93dc
+  checksum: 10/47e8e1c5d8c39817db75a579a513f0a89f8b479092174828f606c9afa8d0543168648788624fccefde778a7d38bfddfb1b4e18bf70b315de34b99dee140ba035
   languageName: node
   linkType: hard
 
@@ -4300,6 +4292,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@lavamoat/sourcemap-validator@npm:2.1.1":
+  version: 2.1.1
+  resolution: "@lavamoat/sourcemap-validator@npm:2.1.1"
+  dependencies:
+    jsesc: "npm:~0.3.x"
+    lodash: "npm:^4.17.21"
+    source-map: "npm:~0.1.x"
+  checksum: 10/a4b11acd50be05be60504c9f6db3d681e6d3bbf186a9fbc04a7597a28a1bd26d95c7fdee4d060ff02e58159060bb0dc921887a2831f03a2fcad48ef12237ac7c
+  languageName: node
+  linkType: hard
+
 "@ledgerhq/cryptoassets-evm-signatures@npm:^13.5.0":
   version: 13.5.0
   resolution: "@ledgerhq/cryptoassets-evm-signatures@npm:13.5.0"
@@ -6750,16 +6753,17 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@npmcli/run-script@npm:7.0.4":
-  version: 7.0.4
-  resolution: "@npmcli/run-script@npm:7.0.4"
+"@npmcli/run-script@npm:8.1.0":
+  version: 8.1.0
+  resolution: "@npmcli/run-script@npm:8.1.0"
   dependencies:
     "@npmcli/node-gyp": "npm:^3.0.0"
     "@npmcli/package-json": "npm:^5.0.0"
     "@npmcli/promise-spawn": "npm:^7.0.0"
     node-gyp: "npm:^10.0.0"
+    proc-log: "npm:^4.0.0"
     which: "npm:^4.0.0"
-  checksum: 10/f09268051f74af7d7be46e9911a23126d531160c338d3c05d53e6cd7994b88271fb4ec524139fe7f2d826525f15a281eafef3be02831adc1f68556a8a668621a
+  checksum: 10/256bd580f82b98db93e54065bf9bcc94946be4f2d668a062cf756cb8ea091f58ef7154b3d2450d79738081a150f25cc48f6075351911e672f24ffd34350f02f2
   languageName: node
   linkType: hard
 
@@ -10152,7 +10156,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/babel__traverse@npm:*, @types/babel__traverse@npm:^7.0.6, @types/babel__traverse@npm:^7.18.0":
+"@types/babel__traverse@npm:*, @types/babel__traverse@npm:7.20.6, @types/babel__traverse@npm:^7.0.6, @types/babel__traverse@npm:^7.18.0":
   version: 7.20.6
   resolution: "@types/babel__traverse@npm:7.20.6"
   dependencies:
@@ -12420,6 +12424,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"amdefine@npm:>=0.0.4":
+  version: 1.0.1
+  resolution: "amdefine@npm:1.0.1"
+  checksum: 10/517df65fc33d3ff14fe5c0057e041b03d603a2254dea7968b05dfbfa3041eb8430ea6729e305bc428c03fad03f162de91a4b256692d27d7b81d3ee691312cffe
+  languageName: node
+  linkType: hard
+
 "ansi-align@npm:^2.0.0":
   version: 2.0.0
   resolution: "ansi-align@npm:2.0.0"
@@ -13645,15 +13656,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"bin-links@npm:4.0.3":
-  version: 4.0.3
-  resolution: "bin-links@npm:4.0.3"
+"bin-links@npm:4.0.4":
+  version: 4.0.4
+  resolution: "bin-links@npm:4.0.4"
   dependencies:
     cmd-shim: "npm:^6.0.0"
     npm-normalize-package-bin: "npm:^3.0.0"
     read-cmd-shim: "npm:^4.0.0"
     write-file-atomic: "npm:^5.0.0"
-  checksum: 10/8b4eec67e5d000768cc5a8cd4399d3af55eab059b2b6f864f96ad69bd73d8c4702a9f002a54747d11643cbd3e2a043d91f12bceedcfdcd96321cf186cfb33802
+  checksum: 10/58d62143aacdbb783b076e9bdd970d8470f2750e1076d6fd1ae559fa532c4647478dd2550a911ba22d4c9e6339881451046e2fbc4b8958f4bf3bf8e5144d1e4d
   languageName: node
   linkType: hard
 
@@ -15761,6 +15772,19 @@ __metadata:
   languageName: node
   linkType: hard
 
+"corepack@npm:0.29.4":
+  version: 0.29.4
+  resolution: "corepack@npm:0.29.4"
+  bin:
+    corepack: ./dist/corepack.js
+    pnpm: ./dist/pnpm.js
+    pnpx: ./dist/pnpx.js
+    yarn: ./dist/yarn.js
+    yarnpkg: ./dist/yarnpkg.js
+  checksum: 10/814fb0c1d77fdebc1d87770c88115bd5623c21d1a00a1bb94d8dc588017d3d5b7ffae92ac628b0796e32ceecf71db809b6d9dc9046d0a765157ddfefa6378b9c
+  languageName: node
+  linkType: hard
+
 "cors-gate@npm:^1.1.3":
   version: 1.1.3
   resolution: "cors-gate@npm:1.1.3"
@@ -17392,15 +17416,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"duplexify@npm:4.1.2":
-  version: 4.1.2
-  resolution: "duplexify@npm:4.1.2"
+"duplexify@npm:4.1.3, duplexify@npm:^4.1.1":
+  version: 4.1.3
+  resolution: "duplexify@npm:4.1.3"
   dependencies:
     end-of-stream: "npm:^1.4.1"
     inherits: "npm:^2.0.3"
     readable-stream: "npm:^3.1.1"
-    stream-shift: "npm:^1.0.0"
-  checksum: 10/eeb4f362defa4da0b2474d853bc4edfa446faeb1bde76819a68035632c118de91f6a58e6fe05c84f6e6de2548f8323ec8473aa9fe37332c99e4d77539747193e
+    stream-shift: "npm:^1.0.2"
+  checksum: 10/b44b98ba0ffac3a658b4b1bf877219e996db288c5ae6f3dc55ca9b2cbef7df60c10eabfdd947f3d73a623eb9975a74a66d6d61e6f26bff90155315adb362aa77
   languageName: node
   linkType: hard
 
@@ -17416,18 +17440,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"duplexify@npm:^4.1.1":
-  version: 4.1.3
-  resolution: "duplexify@npm:4.1.3"
-  dependencies:
-    end-of-stream: "npm:^1.4.1"
-    inherits: "npm:^2.0.3"
-    readable-stream: "npm:^3.1.1"
-    stream-shift: "npm:^1.0.2"
-  checksum: 10/b44b98ba0ffac3a658b4b1bf877219e996db288c5ae6f3dc55ca9b2cbef7df60c10eabfdd947f3d73a623eb9975a74a66d6d61e6f26bff90155315adb362aa77
-  languageName: node
-  linkType: hard
-
 "each-props@npm:^1.3.2":
   version: 1.3.2
   resolution: "each-props@npm:1.3.2"
@@ -24585,6 +24597,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"jsesc@npm:~0.3.x":
+  version: 0.3.0
+  resolution: "jsesc@npm:0.3.0"
+  bin:
+    jsesc: bin/jsesc
+  checksum: 10/381917c354b54025e3821f5cd724faf1b0ffa6c6e7b95a9ad1768146aea44175541832e2c5b6f9ec71f88d58968a22ab1f47fccbc35d171dc09234afd21b28e9
+  languageName: node
+  linkType: hard
+
 "json-buffer@npm:3.0.0":
   version: 3.0.0
   resolution: "json-buffer@npm:3.0.0"
@@ -24683,15 +24704,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"json-stable-stringify@npm:1.0.2":
-  version: 1.0.2
-  resolution: "json-stable-stringify@npm:1.0.2"
-  dependencies:
-    jsonify: "npm:^0.0.1"
-  checksum: 10/96c8d697520072231c4916b7c0084ea857418cad0d06dc910f89a40df3824386a8eee5ed83ceea25b6052d67223fe821f9b1e51be311383104c5b2305b1dc87e
-  languageName: node
-  linkType: hard
-
 "json-stable-stringify@npm:1.1.1, json-stable-stringify@npm:^1.0.0":
   version: 1.1.1
   resolution: "json-stable-stringify@npm:1.1.1"
@@ -25188,39 +25200,27 @@ __metadata:
   languageName: node
   linkType: hard
 
-"lavamoat-browserify@npm:^17.0.4":
-  version: 17.0.4
-  resolution: "lavamoat-browserify@npm:17.0.4"
+"lavamoat-browserify@npm:^18.1.2":
+  version: 18.1.2
+  resolution: "lavamoat-browserify@npm:18.1.2"
   dependencies:
-    "@lavamoat/aa": "npm:^4.0.1"
-    "@lavamoat/lavapack": "npm:^6.1.0"
+    "@lavamoat/aa": "npm:^4.3.1"
+    "@lavamoat/lavapack": "npm:^7.0.5"
+    "@lavamoat/sourcemap-validator": "npm:2.1.1"
     browser-resolve: "npm:2.0.0"
     concat-stream: "npm:2.0.0"
     convert-source-map: "npm:2.0.0"
-    duplexify: "npm:4.1.2"
-    json-stable-stringify: "npm:1.1.1"
-    lavamoat-core: "npm:^15.1.2"
+    duplexify: "npm:4.1.3"
+    lavamoat-core: "npm:^16.2.2"
     pify: "npm:5.0.0"
-    readable-stream: "npm:3.6.2"
+    readable-stream: "npm:4.5.2"
     source-map: "npm:0.7.4"
     through2: "npm:4.0.2"
-  checksum: 10/84db338bb7ea412e62cd531bd1eab231e899c481314816a88d519cc24f4466283b2654dac06e87a03be28e609a3b91131b7abe499a09a2f2981f7ad9731e4937
-  languageName: node
-  linkType: hard
-
-"lavamoat-core@npm:15.1.1":
-  version: 15.1.1
-  resolution: "lavamoat-core@npm:15.1.1"
-  dependencies:
-    json-stable-stringify: "npm:1.0.2"
-    lavamoat-tofu: "npm:^7.1.0"
-    merge-deep: "npm:3.0.3"
-    type-fest: "npm:4.7.1"
-  checksum: 10/7564f6d6f5c5e7934ec93a87d46c687928c8635ec0dabaf4aaea5595df0a097c3cb23131180cff7a23ed6bf444ef01b627168e08546e8f654844a11be31864fa
+  checksum: 10/80df727d28076cca29d65a316d95681796051197f3a90414529c80e3d6d5455eabaf100d22ae905c1690c790b9d501bc7811fd39f99cda70196398bbe46a6d7e
   languageName: node
   linkType: hard
 
-"lavamoat-core@npm:^15.1.2, lavamoat-core@npm:^15.2.1":
+"lavamoat-core@npm:^15.2.1":
   version: 15.3.0
   resolution: "lavamoat-core@npm:15.3.0"
   dependencies:
@@ -25233,19 +25233,23 @@ __metadata:
   languageName: node
   linkType: hard
 
-"lavamoat-core@patch:lavamoat-core@npm%3A15.1.1#~/.yarn/patches/lavamoat-core-npm-15.1.1-51fbe39988.patch":
-  version: 15.1.1
-  resolution: "lavamoat-core@patch:lavamoat-core@npm%3A15.1.1#~/.yarn/patches/lavamoat-core-npm-15.1.1-51fbe39988.patch::version=15.1.1&hash=95165a"
+"lavamoat-core@npm:^16.2.2":
+  version: 16.2.2
+  resolution: "lavamoat-core@npm:16.2.2"
   dependencies:
-    json-stable-stringify: "npm:1.0.2"
-    lavamoat-tofu: "npm:^7.1.0"
+    "@babel/types": "npm:7.26.0"
+    json-stable-stringify: "npm:1.1.1"
+    lavamoat-tofu: "npm:^8.0.4"
     merge-deep: "npm:3.0.3"
-    type-fest: "npm:4.7.1"
-  checksum: 10/e408e3fd65987e0083a4649da3b158ace2eb55379add58a2a0c9a2d1b9b5aee86d03dd44dc616796a5c1c07f303c0691db7c41877b2c3cc4ce86d80af229844b
+    ses: "npm:1.9.0"
+    type-fest: "npm:4.30.0"
+  bin:
+    lavamoat-sort-policy: src/policy-sort-cli.js
+  checksum: 10/4509a560ec6f35aabf3f2915beeaefb526db06121b0bea40864c8f75d0b3e55df089bedd719392a3224dab040fa03a2593c998a66ea23ca820c29de038aa448b
   languageName: node
   linkType: hard
 
-"lavamoat-tofu@npm:^7.1.0, lavamoat-tofu@npm:^7.2.3":
+"lavamoat-tofu@npm:^7.2.3":
   version: 7.2.3
   resolution: "lavamoat-tofu@npm:7.2.3"
   dependencies:
@@ -25260,6 +25264,21 @@ __metadata:
   languageName: node
   linkType: hard
 
+"lavamoat-tofu@npm:^8.0.4":
+  version: 8.0.4
+  resolution: "lavamoat-tofu@npm:8.0.4"
+  dependencies:
+    "@babel/parser": "npm:7.26.2"
+    "@babel/traverse": "npm:7.25.9"
+    "@babel/types": "npm:7.26.0"
+    "@types/babel__traverse": "npm:7.20.6"
+    type-fest: "npm:4.30.0"
+  peerDependencies:
+    lavamoat-core: ">15.4.0"
+  checksum: 10/2ed4689beca070bae5b3e712609bc1de075c343573054205415a06d7a5f28b4347a137afe266a22b054eb053050bfd0d38f2ccb693f819b274105079373bed9d
+  languageName: node
+  linkType: hard
+
 "lavamoat-viz@npm:^7.0.5":
   version: 7.0.5
   resolution: "lavamoat-viz@npm:7.0.5"
@@ -25276,25 +25295,25 @@ __metadata:
   languageName: node
   linkType: hard
 
-"lavamoat@npm:^8.0.2":
-  version: 8.0.2
-  resolution: "lavamoat@npm:8.0.2"
+"lavamoat@npm:^9.0.5":
+  version: 9.0.5
+  resolution: "lavamoat@npm:9.0.5"
   dependencies:
-    "@babel/code-frame": "npm:7.22.13"
-    "@babel/highlight": "npm:7.22.20"
-    "@lavamoat/aa": "npm:^4.0.1"
+    "@babel/code-frame": "npm:7.26.2"
+    "@babel/highlight": "npm:7.25.9"
+    "@lavamoat/aa": "npm:^4.3.1"
     bindings: "npm:1.5.0"
+    corepack: "npm:0.29.4"
     htmlescape: "npm:1.1.1"
-    json-stable-stringify: "npm:1.0.2"
-    lavamoat-core: "npm:^15.1.1"
-    lavamoat-tofu: "npm:^7.1.0"
-    node-gyp-build: "npm:4.6.1"
+    lavamoat-core: "npm:^16.2.2"
+    lavamoat-tofu: "npm:^8.0.4"
+    node-gyp-build: "npm:4.8.4"
     resolve: "npm:1.22.8"
     yargs: "npm:17.7.2"
   bin:
     lavamoat: src/cli.js
     lavamoat-run-command: src/run-command.js
-  checksum: 10/644b59c86bfd75e33154ee0794aea6e44b64dd649814cb98829d232af117c338311fd65827a098bfb1e815aca6e2456c9a247fb35202d50c16cb08a8930d7689
+  checksum: 10/9b97782d5f2d4a80eeba75f450399c256c1ab05a79c3ceded623d70b1c7e4eda055528d9ab1a578bc898c1e4a86a907d282661d0c974858c5321a3e40d17d7d3
   languageName: node
   linkType: hard
 
@@ -26526,10 +26545,10 @@ __metadata:
     "@jest/globals": "npm:^29.7.0"
     "@keystonehq/bc-ur-registry-eth": "npm:^0.19.1"
     "@keystonehq/metamask-airgapped-keyring": "npm:^0.14.1"
-    "@lavamoat/allow-scripts": "npm:^3.0.4"
+    "@lavamoat/allow-scripts": "npm:^3.3.1"
     "@lavamoat/lavadome-core": "npm:0.0.10"
     "@lavamoat/lavadome-react": "npm:0.0.17"
-    "@lavamoat/lavapack": "npm:^6.1.0"
+    "@lavamoat/lavapack": "npm:^7.0.5"
     "@lavamoat/snow": "npm:^2.0.2"
     "@lgbot/madge": "npm:^6.2.0"
     "@lydell/node-pty": "npm:^1.0.1"
@@ -26812,8 +26831,8 @@ __metadata:
     json-schema-to-ts: "npm:^3.0.1"
     koa: "npm:^2.7.0"
     labeled-stream-splicer: "npm:^2.0.2"
-    lavamoat: "npm:^8.0.2"
-    lavamoat-browserify: "npm:^17.0.4"
+    lavamoat: "npm:^9.0.5"
+    lavamoat-browserify: "npm:^18.1.2"
     lavamoat-viz: "npm:^7.0.5"
     level: "npm:^8.0.1"
     localforage: "npm:^1.9.0"
@@ -28216,25 +28235,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"node-gyp-build@npm:4.6.1":
-  version: 4.6.1
-  resolution: "node-gyp-build@npm:4.6.1"
+"node-gyp-build@npm:4.8.4, node-gyp-build@npm:^4.2.0, node-gyp-build@npm:^4.2.2, node-gyp-build@npm:^4.3.0, node-gyp-build@npm:^4.5.0":
+  version: 4.8.4
+  resolution: "node-gyp-build@npm:4.8.4"
   bin:
     node-gyp-build: bin.js
     node-gyp-build-optional: optional.js
     node-gyp-build-test: build-test.js
-  checksum: 10/79b948377492ae8e1aa1c18071661e6020c11f8847d5ce822abd67ec02bee5b21715b1b4861041d2b40d16633824476735bc9a60e81c82c49e715d55ee29b206
-  languageName: node
-  linkType: hard
-
-"node-gyp-build@npm:^4.2.0, node-gyp-build@npm:^4.2.2, node-gyp-build@npm:^4.3.0, node-gyp-build@npm:^4.5.0":
-  version: 4.8.0
-  resolution: "node-gyp-build@npm:4.8.0"
-  bin:
-    node-gyp-build: bin.js
-    node-gyp-build-optional: optional.js
-    node-gyp-build-test: build-test.js
-  checksum: 10/80f410ab412df38e84171d3634a5716b6c6f14ecfa4eb971424d289381fb76f8bcbe1b666419ceb2c81060e558fd7c6d70cc0f60832bcca6a1559098925d9657
+  checksum: 10/6a7d62289d1afc419fc8fc9bd00aa4e554369e50ca0acbc215cb91446148b75ff7e2a3b53c2c5b2c09a39d416d69f3d3237937860373104b5fe429bf30ad9ac5
   languageName: node
   linkType: hard
 
@@ -31616,16 +31624,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"readable-stream@npm:^3.6.2 || ^4.4.2, readable-stream@npm:^4.0.0":
-  version: 4.4.2
-  resolution: "readable-stream@npm:4.4.2"
+"readable-stream@npm:4.5.2, readable-stream@npm:^3.6.2 || ^4.4.2, readable-stream@npm:^4.0.0":
+  version: 4.5.2
+  resolution: "readable-stream@npm:4.5.2"
   dependencies:
     abort-controller: "npm:^3.0.0"
     buffer: "npm:^6.0.3"
     events: "npm:^3.3.0"
     process: "npm:^0.11.10"
     string_decoder: "npm:^1.3.0"
-  checksum: 10/02950422df3f20d2e231f40e9f312e3306b7d4c2a9716849509d0d6668eea24657c96f85ed057e38cc576b34a72db613fbde9ba3689ca8de466cd31bdda96827
+  checksum: 10/01b128a559c5fd76a898495f858cf0a8839f135e6a69e3409f986e88460134791657eb46a2ff16826f331682a3c4d0c5a75cef5e52ef259711021ba52b1c2e82
   languageName: node
   linkType: hard
 
@@ -33417,12 +33425,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"ses@npm:^1.1.0":
-  version: 1.1.0
-  resolution: "ses@npm:1.1.0"
+"ses@npm:1.9.0, ses@npm:^1.1.0":
+  version: 1.9.0
+  resolution: "ses@npm:1.9.0"
   dependencies:
-    "@endo/env-options": "npm:^1.1.0"
-  checksum: 10/b98b360a1d40ebb737cb237ac025b5b6ccf74f21ce000fc9c470241e2db357bd3bd041a400f21fe863acb76543e0b6757cd70ec0f8618df69d5d05be5a222b12
+    "@endo/env-options": "npm:^1.1.7"
+  checksum: 10/6a1a54d3a62839b1fb888a71136960ad042bed89bdb2e20417fd7ef8880387b30d5fe6aa2420ec58992962f790f0392c65a84c5d3be36e0ebbc4d604d8795174
   languageName: node
   linkType: hard
 
@@ -33952,6 +33960,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"source-map@npm:~0.1.x":
+  version: 0.1.43
+  resolution: "source-map@npm:0.1.43"
+  dependencies:
+    amdefine: "npm:>=0.0.4"
+  checksum: 10/6fe101dc2745bd75700636144a71ef4d2819f37cfa0a3ee9c8f2b1c3f6799f5c2f8f8d64e5e2ba3af4db447bf72eaf09b3964da9804d58b06cf6fe1fb9f093f5
+  languageName: node
+  linkType: hard
+
 "sourcemap-codec@npm:^1.4.4":
   version: 1.4.8
   resolution: "sourcemap-codec@npm:1.4.8"
@@ -35778,10 +35795,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"type-fest@npm:4.7.1":
-  version: 4.7.1
-  resolution: "type-fest@npm:4.7.1"
-  checksum: 10/ef21f317738080d71d8603a65bd7136e1e0246980b407e9fe6b4c35cc239b712dd737b06c391e7cde8213d8a733449930b6cc5a3417324b90dddeb84fa167629
+"type-fest@npm:4.30.0, type-fest@npm:^4.12.0":
+  version: 4.30.0
+  resolution: "type-fest@npm:4.30.0"
+  checksum: 10/46c733df4feb87dfd281fba4fa3913dc38b45136be35adffbcef95e13414105a4669476c1f8686680b9c98e59ed5dc85efe42caf67adbaa04f48dfc41f8330fa
   languageName: node
   linkType: hard
 
@@ -35834,13 +35851,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"type-fest@npm:^4.12.0":
-  version: 4.18.1
-  resolution: "type-fest@npm:4.18.1"
-  checksum: 10/ff76e19cb969854161fea2de854073f346e159f5efff05906ece93cbde8a7161b9374121aca53782b44f754152cbacc70264c90ca1acc81ca917723acce5054f
-  languageName: node
-  linkType: hard
-
 "type-is@npm:^1.6.16, type-is@npm:~1.6.18":
   version: 1.6.18
   resolution: "type-is@npm:1.6.18"

From e87c714283f674bbb45974c18fb66e9cc07bc1f7 Mon Sep 17 00:00:00 2001
From: Jyoti Puri <jyotipuri@gmail.com>
Date: Wed, 18 Dec 2024 19:09:02 +0530
Subject: [PATCH 164/175] fix: Remove use of boolean value for metrics
 properties (#29315)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## **Description**

Remove use of boolean value for metrics property.

## **Related issues**

Fixes: https://github.com/MetaMask/MetaMask-planning/issues/3811

## **Manual testing steps**
NA

## **Screenshots/Recordings**
NA

## **Pre-merge author checklist**

- [X] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension Coding
Standards](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/CODING_GUIDELINES.md).
- [X] I've completed the PR template to the best of my ability
- [X] I’ve included tests if applicable
- [X] I’ve documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [X] I’ve applied the right labels on the PR (see [labeling
guidelines](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.

## **Pre-merge reviewer checklist**

- [ ] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed).
- [ ] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.
---
 .../hooks/useTrackERC20WithoutDecimalInformation.ts             | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ui/pages/confirmations/hooks/useTrackERC20WithoutDecimalInformation.ts b/ui/pages/confirmations/hooks/useTrackERC20WithoutDecimalInformation.ts
index 266048e11134..27417613d3cc 100644
--- a/ui/pages/confirmations/hooks/useTrackERC20WithoutDecimalInformation.ts
+++ b/ui/pages/confirmations/hooks/useTrackERC20WithoutDecimalInformation.ts
@@ -39,7 +39,7 @@ const useTrackERC20WithoutDecimalInformation = (
           event: MetaMetricsEventName.SimulationIncompleteAssetDisplayed,
           category: MetaMetricsEventCategory.Confirmations,
           properties: {
-            token_decimals_available: false,
+            token_decimals_available: 'not_available',
             asset_address: tokenAddress,
             asset_type: TokenStandard.ERC20,
             chain_id: chainId,

From d5335c6329e8cb1e1feac85b08cd248a1573faa3 Mon Sep 17 00:00:00 2001
From: Frederik Bolding <frederik.bolding@gmail.com>
Date: Wed, 18 Dec 2024 15:10:00 +0100
Subject: [PATCH 165/175] fix: Remove details option if permission has no
 description (#29313)

<!--
Please submit this PR as a draft initially.
Do not mark it as "Ready for review" until the template has been
completely filled out, and PR status checks have passed at least once.
-->

## **Description**

Remove details option if permission has no description, for instance
`eth_accounts` has no description currently.

[![Open in GitHub
Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/29313?quickstart=1)

## **Manual testing steps**

1. Install Ethereum Provider Snap
2. Connect the Snap to an account
3. Go to Snaps settings
4. See that there is no "details" button for the eth_accounts permission
---
 .../permission-cell-options.js                | 26 ++++++++++++-------
 1 file changed, 16 insertions(+), 10 deletions(-)

diff --git a/ui/components/app/permission-cell/permission-cell-options.js b/ui/components/app/permission-cell/permission-cell-options.js
index 5cefdf7f7d8f..f94a2b7599d3 100644
--- a/ui/components/app/permission-cell/permission-cell-options.js
+++ b/ui/components/app/permission-cell/permission-cell-options.js
@@ -49,6 +49,10 @@ export const PermissionCellOptions = ({
     dispatch(revokeDynamicSnapPermissions(snapId, [permissionName]));
   };
 
+  if (!description && !isRevokable) {
+    return null;
+  }
+
   return (
     <Box ref={ref}>
       <ButtonIcon
@@ -59,16 +63,18 @@ export const PermissionCellOptions = ({
       />
       {showOptions && (
         <Menu anchorElement={ref.current} onHide={handleClose}>
-          <MenuItem onClick={handleDetailsOpen}>
-            <Text
-              variant={TextVariant.bodySm}
-              style={{
-                whiteSpace: 'nowrap',
-              }}
-            >
-              {t('details')}
-            </Text>
-          </MenuItem>
+          {description && (
+            <MenuItem onClick={handleDetailsOpen}>
+              <Text
+                variant={TextVariant.bodySm}
+                style={{
+                  whiteSpace: 'nowrap',
+                }}
+              >
+                {t('details')}
+              </Text>
+            </MenuItem>
+          )}
           {isRevokable && (
             <MenuItem onClick={handleRevokePermission}>
               <Text

From 86bd5dcfc76bcb1007fbe9f6a8599df0e0dbd39c Mon Sep 17 00:00:00 2001
From: Jony Bursztyn <jony.bursztyn@consensys.net>
Date: Wed, 18 Dec 2024 15:12:29 +0000
Subject: [PATCH 166/175] fix: close network/accounts toasts when opening the
 Edit page (#29239)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<!--
Please submit this PR as a draft initially.
Do not mark it as "Ready for review" until the template has been
completely filled out, and PR status checks have passed at least once.
-->

## **Description**

<!--
Write a short description of the changes included in this pull request,
also include relevant motivation and context. Have in mind the following
questions:
1. What is the reason for the change?
2. What is the improvement/solution?
-->

This PR fixes the issue where toasts persist after navigating between
`Permissions view` > `Edit networks` or `Edit accounts`. The fix ensures
the toast dismisses upon navigating to edit in the Permissions modal.

[![Open in GitHub
Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/29239?quickstart=1)

## **Related issues**

Fixes: https://github.com/MetaMask/metamask-extension/issues/27808

## **Manual testing steps**

1. Connect a dapp and grant permissions.
2. Go to the Connection icon > Permissions view > Accounts > Edit.
3. Change the account selection.
4. Update and verify the toast confirms account permissions were
updated.
5. Navigate to Networks > Edit.
6. Change the network selection.
7. Update and verify the toast confirms network permissions were
updated.
8. Confirm no stale toast persists after each navigation.

## **Screenshots/Recordings**

<!-- If applicable, add screenshots and/or recordings to visualize the
before and after of your change. -->

### **Before**

![Brave Browser 2024-10-11 at 4 24 18
PM](https://github.com/user-attachments/assets/a011d199-e0cc-40a7-b059-16d808c18964)

### **After**


https://github.com/user-attachments/assets/6cdd3b9d-90ce-4435-aea8-cf990b8b985a


## **Pre-merge author checklist**

- [ ] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension Coding
Standards](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/CODING_GUIDELINES.md).
- [ ] I've completed the PR template to the best of my ability.
- [ ] I’ve included tests if applicable.
- [ ] I’ve documented my code using [JSDoc](https://jsdoc.app/) format
if applicable.
- [ ] I’ve applied the right labels on the PR (see [labeling
guidelines](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.

## **Pre-merge reviewer checklist**

- [ ] I've manually tested the PR (e.g., pulled and built the branch,
ran the app, tested the code being changed).
- [ ] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and/or screenshots.
---
 .../review-permissions-page.tsx               |  6 ++
 .../site-cell/site-cell.test.tsx              | 81 +++++++++++++++++++
 .../site-cell/site-cell.tsx                   | 48 ++++++-----
 3 files changed, 115 insertions(+), 20 deletions(-)
 create mode 100644 ui/components/multichain/pages/review-permissions-page/site-cell/site-cell.test.tsx

diff --git a/ui/components/multichain/pages/review-permissions-page/review-permissions-page.tsx b/ui/components/multichain/pages/review-permissions-page/review-permissions-page.tsx
index d71bc499717e..cb3c929b5d27 100644
--- a/ui/components/multichain/pages/review-permissions-page/review-permissions-page.tsx
+++ b/ui/components/multichain/pages/review-permissions-page/review-permissions-page.tsx
@@ -176,6 +176,11 @@ export const ReviewPermissions = () => {
     setShowAccountToast(true);
   };
 
+  const hideAllToasts = () => {
+    setShowAccountToast(false);
+    setShowNetworkToast(false);
+  };
+
   return (
     <Page
       data-testid="connections-page"
@@ -196,6 +201,7 @@ export const ReviewPermissions = () => {
               onSelectChainIds={handleSelectChainIds}
               selectedAccountAddresses={connectedAccountAddresses}
               selectedChainIds={connectedChainIds}
+              hideAllToasts={hideAllToasts}
             />
           ) : (
             <NoConnectionContent />
diff --git a/ui/components/multichain/pages/review-permissions-page/site-cell/site-cell.test.tsx b/ui/components/multichain/pages/review-permissions-page/site-cell/site-cell.test.tsx
new file mode 100644
index 000000000000..affd55cfaa66
--- /dev/null
+++ b/ui/components/multichain/pages/review-permissions-page/site-cell/site-cell.test.tsx
@@ -0,0 +1,81 @@
+import React from 'react';
+import { Provider } from 'react-redux';
+import { render, fireEvent } from '@testing-library/react';
+import configureStore from '../../../../../store/store';
+import { SiteCell } from './site-cell';
+
+describe('SiteCell', () => {
+  const store = configureStore({
+    metamask: {
+      useBlockie: false,
+    },
+  });
+
+  describe('toast handling', () => {
+    it('should call hideAllToasts when edit accounts is clicked', () => {
+      const hideAllToasts = jest.fn();
+      const { getAllByTestId } = render(
+        <Provider store={store}>
+          <SiteCell
+            nonTestNetworks={[]}
+            testNetworks={[]}
+            accounts={[]}
+            onSelectAccountAddresses={() => undefined}
+            onSelectChainIds={() => undefined}
+            selectedAccountAddresses={[]}
+            selectedChainIds={[]}
+            hideAllToasts={hideAllToasts}
+          />
+        </Provider>,
+      );
+
+      const editButtons = getAllByTestId('edit');
+      fireEvent.click(editButtons[0]);
+      expect(hideAllToasts).toHaveBeenCalled();
+    });
+
+    it('should call hideAllToasts when edit networks is clicked', () => {
+      const hideAllToasts = jest.fn();
+      const { getAllByTestId } = render(
+        <Provider store={store}>
+          <SiteCell
+            nonTestNetworks={[]}
+            testNetworks={[]}
+            accounts={[]}
+            onSelectAccountAddresses={() => undefined}
+            onSelectChainIds={() => undefined}
+            selectedAccountAddresses={[]}
+            selectedChainIds={[]}
+            hideAllToasts={hideAllToasts}
+          />
+        </Provider>,
+      );
+
+      const editButtons = getAllByTestId('edit');
+      fireEvent.click(editButtons[1]);
+      expect(hideAllToasts).toHaveBeenCalled();
+    });
+
+    it('should not throw if hideAllToasts is not provided', () => {
+      const { getAllByTestId } = render(
+        <Provider store={store}>
+          <SiteCell
+            nonTestNetworks={[]}
+            testNetworks={[]}
+            accounts={[]}
+            onSelectAccountAddresses={() => undefined}
+            onSelectChainIds={() => undefined}
+            selectedAccountAddresses={[]}
+            selectedChainIds={[]}
+          />
+        </Provider>,
+      );
+
+      expect(() => {
+        const editButtons = getAllByTestId('edit');
+        fireEvent.click(editButtons[0]);
+        fireEvent.click(editButtons[1]);
+      }).not.toThrow();
+    });
+  });
+});
diff --git a/ui/components/multichain/pages/review-permissions-page/site-cell/site-cell.tsx b/ui/components/multichain/pages/review-permissions-page/site-cell/site-cell.tsx
index fcb104937e28..1c91489d0d1f 100644
--- a/ui/components/multichain/pages/review-permissions-page/site-cell/site-cell.tsx
+++ b/ui/components/multichain/pages/review-permissions-page/site-cell/site-cell.tsx
@@ -38,6 +38,7 @@ type SiteCellProps = {
   selectedAccountAddresses: string[];
   selectedChainIds: string[];
   isConnectFlow?: boolean;
+  hideAllToasts?: () => void;
 };
 
 export const SiteCell: React.FC<SiteCellProps> = ({
@@ -49,6 +50,7 @@ export const SiteCell: React.FC<SiteCellProps> = ({
   selectedAccountAddresses,
   selectedChainIds,
   isConnectFlow,
+  hideAllToasts = () => undefined,
 }) => {
   const t = useI18nContext();
   const trackEvent = useContext(MetaMetricsContext);
@@ -91,6 +93,30 @@ export const SiteCell: React.FC<SiteCellProps> = ({
       ? t('requestingForNetwork', [selectedNetworks[0].name])
       : t('requestingFor');
 
+  const handleOpenAccountsModal = () => {
+    hideAllToasts?.();
+    setShowEditAccountsModal(true);
+    trackEvent({
+      category: MetaMetricsEventCategory.Navigation,
+      event: MetaMetricsEventName.ViewPermissionedAccounts,
+      properties: {
+        location: 'Connect view, Permissions toast, Permissions (dapp)',
+      },
+    });
+  };
+
+  const handleOpenNetworksModal = () => {
+    hideAllToasts?.();
+    setShowEditNetworksModal(true);
+    trackEvent({
+      category: MetaMetricsEventCategory.Navigation,
+      event: MetaMetricsEventName.ViewPermissionedNetworks,
+      properties: {
+        location: 'Connect view, Permissions toast, Permissions (dapp)',
+      },
+    });
+  };
+
   return (
     <>
       <Box
@@ -105,16 +131,7 @@ export const SiteCell: React.FC<SiteCellProps> = ({
           connectedMessage={accountMessageConnectedState}
           unconnectedMessage={accountMessageNotConnectedState}
           isConnectFlow={isConnectFlow}
-          onClick={() => {
-            setShowEditAccountsModal(true);
-            trackEvent({
-              category: MetaMetricsEventCategory.Navigation,
-              event: MetaMetricsEventName.ViewPermissionedAccounts,
-              properties: {
-                location: 'Connect view, Permissions toast, Permissions (dapp)',
-              },
-            });
-          }}
+          onClick={handleOpenAccountsModal}
           paddingBottomValue={2}
           paddingTopValue={0}
           content={
@@ -136,16 +153,7 @@ export const SiteCell: React.FC<SiteCellProps> = ({
           connectedMessage={networkMessageConnectedState}
           unconnectedMessage={networkMessageNotConnectedState}
           isConnectFlow={isConnectFlow}
-          onClick={() => {
-            setShowEditNetworksModal(true);
-            trackEvent({
-              category: MetaMetricsEventCategory.Navigation,
-              event: MetaMetricsEventName.ViewPermissionedNetworks,
-              properties: {
-                location: 'Connect view, Permissions toast, Permissions (dapp)',
-              },
-            });
-          }}
+          onClick={handleOpenNetworksModal}
           paddingTopValue={2}
           paddingBottomValue={0}
           content={<SiteCellTooltip networks={selectedNetworks} />}

From fd9eb4837070abd041c405a94ab78d9c7e755ad8 Mon Sep 17 00:00:00 2001
From: Jony Bursztyn <jony.bursztyn@consensys.net>
Date: Wed, 18 Dec 2024 15:16:19 +0000
Subject: [PATCH 167/175] feat: center backup toast (#29200)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<!--
Please submit this PR as a draft initially.
Do not mark it as "Ready for review" until the template has been
completely filled out, and PR status checks have passed at least once.
-->

## **Description**

Centers the backup warning toast

[![Open in GitHub
Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/29200?quickstart=1)

## **Related issues**

Fixes:

## **Manual testing steps**

1. Go to this page...
2.
3.

## **Screenshots/Recordings**


### **Before**

<img width="397" alt="Screenshot 2024-12-13 at 14 54 15"
src="https://github.com/user-attachments/assets/aa36f379-b18f-4eb9-95d5-5b08d3f161f2"
/>


### **After**

<img width="355" alt="Screenshot 2024-12-13 at 14 53 25"
src="https://github.com/user-attachments/assets/4869708c-9a03-4d17-9732-6176477ab96f"
/>
<img width="891" alt="Screenshot 2024-12-13 at 14 53 36"
src="https://github.com/user-attachments/assets/5fc462a0-558f-43d9-a332-129d10b4c30a"
/>

## **Pre-merge author checklist**

- [ ] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension Coding
Standards](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/CODING_GUIDELINES.md).
- [ ] I've completed the PR template to the best of my ability
- [ ] I’ve included tests if applicable
- [ ] I’ve documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [ ] I’ve applied the right labels on the PR (see [labeling
guidelines](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.

## **Pre-merge reviewer checklist**

- [ ] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed).
- [ ] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.
---
 ui/components/app/home-notification/index.scss | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/ui/components/app/home-notification/index.scss b/ui/components/app/home-notification/index.scss
index ec997e00e3aa..647dc7314d0d 100644
--- a/ui/components/app/home-notification/index.scss
+++ b/ui/components/app/home-notification/index.scss
@@ -10,10 +10,9 @@
   border-radius: 8px;
   min-height: 116px;
   padding: 16px;
+  width: calc(100% - 16px);
+  max-width: 472px;
 
-  @include design-system.screen-sm-min {
-    min-width: 472px;
-  }
 
   &__content-container {
     display: flex;

From 804a56f252b5d65777b183648139ec04cd450270 Mon Sep 17 00:00:00 2001
From: Brian Bergeron <brian.e.bergeron@gmail.com>
Date: Wed, 18 Dec 2024 07:50:17 -0800
Subject: [PATCH 168/175] feat: event when token list is refreshed (#29300)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## **Description**

Adds an event when the user refreshes the token list

[![Open in GitHub
Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/29300?quickstart=1)

## **Related issues**

Fixes: https://consensyssoftware.atlassian.net/browse/MMASSETS-440

## **Manual testing steps**

- Enable metametrics

- Click this refresh button on the tokens tab:

<img width="277" alt="Screenshot 2024-12-17 at 2 11 33 PM"
src="https://github.com/user-attachments/assets/dfc19710-5c13-4b00-8a06-d5751b5b9b4c"
/>

- Verify an event is emitted.

I test this by adding a console.log in
`MetaMetricsController.trackEvent`, but in a production build you may be
able to check network requests.

## **Screenshots/Recordings**

<!-- If applicable, add screenshots and/or recordings to visualize the
before and after of your change. -->

### **Before**

<!-- [screenshots/recordings] -->

### **After**

<!-- [screenshots/recordings] -->

## **Pre-merge author checklist**

- [ ] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension Coding
Standards](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/CODING_GUIDELINES.md).
- [ ] I've completed the PR template to the best of my ability
- [ ] I’ve included tests if applicable
- [ ] I’ve documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [ ] I’ve applied the right labels on the PR (see [labeling
guidelines](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.

## **Pre-merge reviewer checklist**

- [ ] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed).
- [ ] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.
---
 shared/constants/metametrics.ts               |  1 +
 .../asset-list-control-bar.test.tsx           | 62 +++++++++++++++++++
 .../asset-list-control-bar.tsx                |  4 ++
 3 files changed, 67 insertions(+)
 create mode 100644 ui/components/app/assets/asset-list/asset-list-control-bar/asset-list-control-bar.test.tsx

diff --git a/shared/constants/metametrics.ts b/shared/constants/metametrics.ts
index a65c349963ec..9b99140b7d24 100644
--- a/shared/constants/metametrics.ts
+++ b/shared/constants/metametrics.ts
@@ -766,6 +766,7 @@ export enum MetaMetricsEventName {
   TokenAdded = 'Token Added',
   TokenRemoved = 'Token Removed',
   TokenSortPreference = 'Token Sort Preference',
+  TokenListRefreshed = 'Token List Refreshed',
   NFTRemoved = 'NFT Removed',
   TokenDetected = 'Token Detected',
   TokenHidden = 'Token Hidden',
diff --git a/ui/components/app/assets/asset-list/asset-list-control-bar/asset-list-control-bar.test.tsx b/ui/components/app/assets/asset-list/asset-list-control-bar/asset-list-control-bar.test.tsx
new file mode 100644
index 000000000000..7c6ba579943c
--- /dev/null
+++ b/ui/components/app/assets/asset-list/asset-list-control-bar/asset-list-control-bar.test.tsx
@@ -0,0 +1,62 @@
+import React from 'react';
+import thunk from 'redux-thunk';
+import configureMockStore from 'redux-mock-store';
+import { renderWithProvider } from '../../../../../../test/jest';
+import { MetaMetricsContext } from '../../../../../contexts/metametrics';
+import {
+  MetaMetricsEventCategory,
+  MetaMetricsEventName,
+} from '../../../../../../shared/constants/metametrics';
+import AssetListControlBar from './asset-list-control-bar';
+
+describe('AssetListControlBar', () => {
+  afterEach(() => {
+    jest.clearAllMocks();
+  });
+
+  it('should fire metrics event when refresh button is clicked', async () => {
+    const store = configureMockStore([thunk])({
+      metamask: {
+        selectedNetworkClientId: 'selectedNetworkClientId',
+        networkConfigurationsByChainId: {
+          '0x1': {
+            chainId: '0x1',
+            defaultRpcEndpointIndex: 0,
+            rpcEndpoints: [
+              {
+                networkClientId: 'selectedNetworkClientId',
+              },
+            ],
+          },
+        },
+        internalAccounts: {
+          selectedAccount: 'selectedAccount',
+          accounts: {
+            selectedAccount: {},
+          },
+        },
+      },
+    });
+
+    const mockTrackEvent = jest.fn();
+
+    const { findByTestId } = renderWithProvider(
+      <MetaMetricsContext.Provider value={mockTrackEvent}>
+        <AssetListControlBar />
+      </MetaMetricsContext.Provider>,
+      store,
+    );
+
+    const importButton = await findByTestId('import-token-button');
+    importButton.click();
+
+    const refreshListItem = await findByTestId('refreshList__button');
+    refreshListItem.click();
+
+    expect(mockTrackEvent).toHaveBeenCalledTimes(1);
+    expect(mockTrackEvent).toHaveBeenCalledWith({
+      category: MetaMetricsEventCategory.Tokens,
+      event: MetaMetricsEventName.TokenListRefreshed,
+    });
+  });
+});
diff --git a/ui/components/app/assets/asset-list/asset-list-control-bar/asset-list-control-bar.tsx b/ui/components/app/assets/asset-list/asset-list-control-bar/asset-list-control-bar.tsx
index c61815a9ab0a..d335f6f41820 100644
--- a/ui/components/app/assets/asset-list/asset-list-control-bar/asset-list-control-bar.tsx
+++ b/ui/components/app/assets/asset-list/asset-list-control-bar/asset-list-control-bar.tsx
@@ -160,6 +160,10 @@ const AssetListControlBar = ({ showTokensLinks }: AssetListControlBarProps) => {
   const handleRefresh = () => {
     dispatch(detectTokens());
     closePopover();
+    trackEvent({
+      category: MetaMetricsEventCategory.Tokens,
+      event: MetaMetricsEventName.TokenListRefreshed,
+    });
   };
 
   return (

From acdaefe8d03d79364171188f09dbc299c48d8e7d Mon Sep 17 00:00:00 2001
From: Brian Bergeron <brian.e.bergeron@gmail.com>
Date: Wed, 18 Dec 2024 07:50:24 -0800
Subject: [PATCH 169/175] chore: remove `NewNetworkInfo` (#29293)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## **Description**

In https://github.com/MetaMask/metamask-extension/pull/28765 the
`NewNetworkInfo` modal stopped being rendered. This PR removes the
component entirely, since it's no longer referenced anywhere.

[![Open in GitHub
Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/29293?quickstart=1)

## **Related issues**

Fixes: https://consensyssoftware.atlassian.net/browse/MMASSETS-477

## **Manual testing steps**

No changes expected.  Switching networks should continue to work.

## **Screenshots/Recordings**

<!-- If applicable, add screenshots and/or recordings to visualize the
before and after of your change. -->

### **Before**

<!-- [screenshots/recordings] -->

### **After**

<!-- [screenshots/recordings] -->

## **Pre-merge author checklist**

- [ ] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension Coding
Standards](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/CODING_GUIDELINES.md).
- [ ] I've completed the PR template to the best of my ability
- [ ] I’ve included tests if applicable
- [ ] I’ve documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [ ] I’ve applied the right labels on the PR (see [labeling
guidelines](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.

## **Pre-merge reviewer checklist**

- [ ] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed).
- [ ] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.
---
 app/_locales/de/messages.json                 |  37 ---
 app/_locales/el/messages.json                 |  37 ---
 app/_locales/en/messages.json                 |  49 +---
 app/_locales/es/messages.json                 |  37 ---
 app/_locales/fr/messages.json                 |  37 ---
 app/_locales/hi/messages.json                 |  37 ---
 app/_locales/id/messages.json                 |  37 ---
 app/_locales/it/messages.json                 |   6 -
 app/_locales/ja/messages.json                 |  38 ---
 app/_locales/ko/messages.json                 |  38 ---
 app/_locales/pt/messages.json                 |  38 ---
 app/_locales/ru/messages.json                 |  37 ---
 app/_locales/tl/messages.json                 |  38 ---
 app/_locales/tr/messages.json                 |  38 ---
 app/_locales/vi/messages.json                 |  38 ---
 app/_locales/zh_CN/messages.json              |  38 ---
 ui/components/ui/new-network-info/index.js    |   1 -
 ui/components/ui/new-network-info/index.scss  |  59 ----
 .../ui/new-network-info/new-network-info.js   | 267 ------------------
 .../new-network-info.stories.js               |  10 -
 .../new-network-info/new-network-info.test.js | 223 ---------------
 ui/components/ui/ui-components.scss           |   1 -
 ui/pages/routes/routes.component.test.js      |  96 +------
 23 files changed, 10 insertions(+), 1227 deletions(-)
 delete mode 100644 ui/components/ui/new-network-info/index.js
 delete mode 100644 ui/components/ui/new-network-info/index.scss
 delete mode 100644 ui/components/ui/new-network-info/new-network-info.js
 delete mode 100644 ui/components/ui/new-network-info/new-network-info.stories.js
 delete mode 100644 ui/components/ui/new-network-info/new-network-info.test.js

diff --git a/app/_locales/de/messages.json b/app/_locales/de/messages.json
index a738b56b0fe0..946f556f1abd 100644
--- a/app/_locales/de/messages.json
+++ b/app/_locales/de/messages.json
@@ -330,9 +330,6 @@
   "addingCustomNetwork": {
     "message": "Netzwerk wird hinzugefügt"
   },
-  "addingTokens": {
-    "message": "Hinzufügen von Token"
-  },
   "additionalNetworks": {
     "message": "Zusätzliche Netzwerke"
   },
@@ -627,12 +624,6 @@
   "assetsDescription": {
     "message": "Automatische Erkennung von Tokens in Ihrer Wallet, Anzeige von NFTs und stapelweise Aktualisierung des Kontostands"
   },
-  "attemptSendingAssets": {
-    "message": "Wenn Sie versuchen, Assets direkt von einem Netzwerk in ein anderes zu senden, kann dies zu einem dauerhaften Asset-Verlust führen. Verwenden Sie unbedingt eine Bridge."
-  },
-  "attemptSendingAssetsWithPortfolio": {
-    "message": "Sie können Ihre Assets verlieren, wenn Sie versuchen, sie von einem anderen Netzwerk zu versenden. Übertragen Sie Gelder sicher zwischen den Netzwerken, indem Sie eine Bridge wie $1 verwenden."
-  },
   "attemptToCancelSwapForFree": {
     "message": "Versuch, den Swap kostenlos zu stornieren"
   },
@@ -840,9 +831,6 @@
   "bridgeCalculatingAmount": {
     "message": "Berechnen ..."
   },
-  "bridgeDontSend": {
-    "message": "Bridge, nicht senden"
-  },
   "bridgeEnterAmount": {
     "message": "Betrag eingeben"
   },
@@ -954,9 +942,6 @@
     "message": "Klicken Sie hier, um Ihren Ledger über WebHID zu verbinden.",
     "description": "Text that can be clicked to open a browser popup for connecting the ledger device via webhid"
   },
-  "clickToManuallyAdd": {
-    "message": "Sie können Tokens jederzeit manuell hinzufügen."
-  },
   "close": {
     "message": "Schließen"
   },
@@ -2138,9 +2123,6 @@
   "gasFee": {
     "message": "Gas-Gebühr"
   },
-  "gasIsETH": {
-    "message": "Gas ist $1"
-  },
   "gasLimit": {
     "message": "Gas-Limit"
   },
@@ -2702,9 +2684,6 @@
   "learnScamRisk": {
     "message": "Betrügereien und Sicherheitsrisiken."
   },
-  "learnToBridge": {
-    "message": "Lernen Sie zu bridgen"
-  },
   "leaveMetaMask": {
     "message": "MetaMask verlassen?"
   },
@@ -2900,9 +2879,6 @@
   "metamaskNotificationsAreOff": {
     "message": "Wallet-Benachrichtigungen sind momentan nicht aktiv."
   },
-  "metamaskPortfolio": {
-    "message": "MetaMask Portfolio."
-  },
   "metamaskSwapsOfflineDescription": {
     "message": "MetaMask Swaps wird gewartet. Bitte versuchen Sie es später erneut."
   },
@@ -3047,10 +3023,6 @@
     "message": "$1 bittet um Ihre Zustimmung zu:",
     "description": "$1 represents dapp name"
   },
-  "nativeToken": {
-    "message": "Das native Token dieses Netzwerks ist $1. Dieses Token wird für die Gas-Gebühr verwendet. ",
-    "description": "$1 represents the name of the native token on the current network"
-  },
   "nativeTokenScamWarningConversion": {
     "message": "Netzwerkdetails bearbeiten"
   },
@@ -5940,9 +5912,6 @@
     "message": "$1 ist jetzt aktiv bei $2",
     "description": "$1 represents the account name, $2 represents the network name"
   },
-  "switchedTo": {
-    "message": "Sie verwenden jetzt"
-  },
   "switchingNetworksCancelsPendingConfirmations": {
     "message": "Das Wechseln der Netzwerke wird alle ausstehenden Bestätigungen stornieren."
   },
@@ -5979,9 +5948,6 @@
   "themeDescription": {
     "message": "Wählen Sie Ihr bevorzugtes MetaMask-Motiv aus."
   },
-  "thingsToKeep": {
-    "message": "Was Sie beachten sollten:"
-  },
   "thirdPartySoftware": {
     "message": "Mitteilung bzgl. Drittanbieter-Software",
     "description": "Title of a popup modal displayed when installing a snap for the first time."
@@ -6063,9 +6029,6 @@
   "tokenScamSecurityRisk": {
     "message": "Token-Betrügereien und Sicherheitsrisiken"
   },
-  "tokenShowUp": {
-    "message": "Ihre Tokens werden möglicherweise nicht automatisch in Ihrer Wallet angezeigt. "
-  },
   "tokenStandard": {
     "message": "Token-Standard"
   },
diff --git a/app/_locales/el/messages.json b/app/_locales/el/messages.json
index 7992443a500a..a02ec275c224 100644
--- a/app/_locales/el/messages.json
+++ b/app/_locales/el/messages.json
@@ -330,9 +330,6 @@
   "addingCustomNetwork": {
     "message": "Προσθήκη δικτύου"
   },
-  "addingTokens": {
-    "message": "Προσθήκη tokens"
-  },
   "additionalNetworks": {
     "message": "Επιπλέον δίκτυα"
   },
@@ -627,12 +624,6 @@
   "assetsDescription": {
     "message": "Αυτόματος εντοπισμός tokens στο πορτοφόλι σας, εμφάνιση NFT και ομαδοποιημένες ενημερώσεις υπολοίπων λογαριασμών"
   },
-  "attemptSendingAssets": {
-    "message": "Ενδέχεται να χάσετε τα περιουσιακά σας στοιχεία εάν προσπαθήσετε να τα στείλετε από άλλο δίκτυο. Μεταφέρετε κεφάλαια με ασφάλεια μεταξύ δικτύων χρησιμοποιώντας μια διασύνδεση."
-  },
-  "attemptSendingAssetsWithPortfolio": {
-    "message": "Μπορεί να χάσετε τα περιουσιακά σας στοιχεία αν προσπαθήσετε να τα στείλετε από άλλο δίκτυο. Μεταφέρετε χρήματα με ασφάλεια μεταξύ δικτύων χρησιμοποιώντας μια διασύνδεση, όπως το $1"
-  },
   "attemptToCancelSwapForFree": {
     "message": "Προσπάθεια ακύρωσης των ανταλλαγών δωρεάν"
   },
@@ -840,9 +831,6 @@
   "bridgeCalculatingAmount": {
     "message": "Υπολογισμός..."
   },
-  "bridgeDontSend": {
-    "message": "Μην στείλετε χωρίς διασύνδεση"
-  },
   "bridgeEnterAmount": {
     "message": "Πληκτρολογήστε το ποσό"
   },
@@ -954,9 +942,6 @@
     "message": "Κάντε κλικ εδώ για να συνδέσετε το Ledger σας μέσω WebHID",
     "description": "Text that can be clicked to open a browser popup for connecting the ledger device via webhid"
   },
-  "clickToManuallyAdd": {
-    "message": "Μπορείτε πάντα να προσθέσετε τα tokens χειροκίνητα."
-  },
   "close": {
     "message": "Κλείσιμο"
   },
@@ -2138,9 +2123,6 @@
   "gasFee": {
     "message": "Τέλη συναλλαγών"
   },
-  "gasIsETH": {
-    "message": "Τέλη συναλλαγής $1 "
-  },
   "gasLimit": {
     "message": "Όριο τέλους συναλλαγής"
   },
@@ -2702,9 +2684,6 @@
   "learnScamRisk": {
     "message": "απάτες και κίνδυνοι ασφάλειας."
   },
-  "learnToBridge": {
-    "message": "Μάθετε για την διασύνδεση"
-  },
   "leaveMetaMask": {
     "message": "Αποχώρηση από το MetaMask;"
   },
@@ -2900,9 +2879,6 @@
   "metamaskNotificationsAreOff": {
     "message": "Οι ειδοποιήσεις του πορτοφολιού δεν είναι προς το παρόν ενεργές."
   },
-  "metamaskPortfolio": {
-    "message": "MetaMask Portfolio."
-  },
   "metamaskSwapsOfflineDescription": {
     "message": "Το MetaMask Swaps είναι υπό συντήρηση. Παρακαλείστε να επιστρέψετε αργότερα."
   },
@@ -3047,10 +3023,6 @@
     "message": "Το $1 ζητάει την έγκρισή σας για:",
     "description": "$1 represents dapp name"
   },
-  "nativeToken": {
-    "message": "Το αρχικό token σε αυτό το δίκτυο είναι το $1. Είναι το token που χρησιμοποιείται για τα τέλη συναλλαγών.",
-    "description": "$1 represents the name of the native token on the current network"
-  },
   "nativeTokenScamWarningConversion": {
     "message": "Επεξεργασία λεπτομερειών δικτύου"
   },
@@ -5940,9 +5912,6 @@
     "message": "Το $1 είναι τώρα ενεργό στο $2",
     "description": "$1 represents the account name, $2 represents the network name"
   },
-  "switchedTo": {
-    "message": "Τώρα χρησιμοποιείτε το"
-  },
   "switchingNetworksCancelsPendingConfirmations": {
     "message": "Η αλλαγή δικτύων θα ακυρώσει όλες τις εκκρεμείς επιβεβαιώσεις"
   },
@@ -5979,9 +5948,6 @@
   "themeDescription": {
     "message": "Επιλέξτε το προτιμώμενο θέμα σας για το MetaMask."
   },
-  "thingsToKeep": {
-    "message": "Πράγματα που πρέπει να έχετε υπόψη σας:"
-  },
   "thirdPartySoftware": {
     "message": "Ειδοποίηση για λογισμικό τρίτων",
     "description": "Title of a popup modal displayed when installing a snap for the first time."
@@ -6063,9 +6029,6 @@
   "tokenScamSecurityRisk": {
     "message": "απάτες με token και κίνδυνοι ασφάλειας"
   },
-  "tokenShowUp": {
-    "message": "Τα tokens σας ενδέχεται να μην εμφανιστούν αυτόματα στο πορτοφόλι σας."
-  },
   "tokenStandard": {
     "message": "Πρότυπο Token"
   },
diff --git a/app/_locales/en/messages.json b/app/_locales/en/messages.json
index 3bfd303e5dd0..7ddf609b48f0 100644
--- a/app/_locales/en/messages.json
+++ b/app/_locales/en/messages.json
@@ -330,9 +330,6 @@
   "addingCustomNetwork": {
     "message": "Adding Network"
   },
-  "addingTokens": {
-    "message": "Adding tokens"
-  },
   "additionalNetworks": {
     "message": "Additional networks"
   },
@@ -648,12 +645,6 @@
   "assetsDescription": {
     "message": "Autodetect tokens in your wallet, display NFTs, and get batched account balance updates"
   },
-  "attemptSendingAssets": {
-    "message": "You may lose your assets if you try to send them from another network. Transfer funds safely between networks by using a bridge."
-  },
-  "attemptSendingAssetsWithPortfolio": {
-    "message": "You may lose your assets if you try to send them from another network. Transfer funds safely between networks by using a bridge, like $1"
-  },
   "attemptToCancelSwapForFree": {
     "message": "Attempt to cancel swap for free"
   },
@@ -880,9 +871,6 @@
   "bridgeConfirmTwoTransactions": {
     "message": "You'll need to confirm 2 transactions on your hardware wallet:"
   },
-  "bridgeDontSend": {
-    "message": "Bridge, don't send"
-  },
   "bridgeEnterAmount": {
     "message": "Select amount"
   },
@@ -1089,9 +1077,6 @@
     "message": "Click here to connect your Ledger via WebHID",
     "description": "Text that can be clicked to open a browser popup for connecting the ledger device via webhid"
   },
-  "clickToManuallyAdd": {
-    "message": "You can always add tokens manually."
-  },
   "close": {
     "message": "Close"
   },
@@ -2299,9 +2284,6 @@
   "gasFee": {
     "message": "Gas fee"
   },
-  "gasIsETH": {
-    "message": "Gas is $1 "
-  },
   "gasLimit": {
     "message": "Gas limit"
   },
@@ -2387,7 +2369,9 @@
   "gotIt": {
     "message": "Got it"
   },
-  "grantExactAccess": { "message": "Grant exact access" },
+  "grantExactAccess": {
+    "message": "Grant exact access"
+  },
   "grantedToWithColon": {
     "message": "Granted to:"
   },
@@ -2870,9 +2854,6 @@
   "learnScamRisk": {
     "message": "scams and security risks."
   },
-  "learnToBridge": {
-    "message": "Learn to bridge"
-  },
   "leaveMetaMask": {
     "message": "Leave MetaMask?"
   },
@@ -3077,9 +3058,6 @@
   "metamaskNotificationsAreOff": {
     "message": "Wallet notifications are currently not active."
   },
-  "metamaskPortfolio": {
-    "message": "MetaMask Portfolio."
-  },
   "metamaskSwapsOfflineDescription": {
     "message": "MetaMask Swaps is undergoing maintenance. Please check back later."
   },
@@ -3230,10 +3208,6 @@
     "message": "$1 is asking for your approval to:",
     "description": "$1 represents dapp name"
   },
-  "nativeToken": {
-    "message": "The native token on this network is $1. It is the token used for gas fees. ",
-    "description": "$1 represents the name of the native token on the current network"
-  },
   "nativeTokenScamWarningConversion": {
     "message": "Edit network details"
   },
@@ -4527,7 +4501,9 @@
   "quotedReceiveAmount": {
     "message": "$1 receive amount"
   },
-  "quotedTotalCost": { "message": "$1 total cost" },
+  "quotedTotalCost": {
+    "message": "$1 total cost"
+  },
   "rank": {
     "message": "Rank"
   },
@@ -6230,9 +6206,6 @@
     "message": "You're now using $1",
     "description": "$1 represents the network name"
   },
-  "switchedTo": {
-    "message": "You're now using"
-  },
   "switchingNetworksCancelsPendingConfirmations": {
     "message": "Switching networks will cancel all pending confirmations"
   },
@@ -6269,9 +6242,6 @@
   "themeDescription": {
     "message": "Choose your preferred MetaMask theme."
   },
-  "thingsToKeep": {
-    "message": "Keep in mind:"
-  },
   "thirdPartySoftware": {
     "message": "Third-party software notice",
     "description": "Title of a popup modal displayed when installing a snap for the first time."
@@ -6353,9 +6323,6 @@
   "tokenScamSecurityRisk": {
     "message": "token scams and security risks"
   },
-  "tokenShowUp": {
-    "message": "Your tokens may not automatically show up in your wallet. "
-  },
   "tokenStandard": {
     "message": "Token standard"
   },
@@ -6876,7 +6843,9 @@
   "you": {
     "message": "You"
   },
-  "youDeclinedTheTransaction": { "message": "You declined the transaction." },
+  "youDeclinedTheTransaction": {
+    "message": "You declined the transaction."
+  },
   "youNeedToAllowCameraAccess": {
     "message": "You need to allow camera access to use this feature."
   },
diff --git a/app/_locales/es/messages.json b/app/_locales/es/messages.json
index 2475977d0794..8acce0ad02d9 100644
--- a/app/_locales/es/messages.json
+++ b/app/_locales/es/messages.json
@@ -330,9 +330,6 @@
   "addingCustomNetwork": {
     "message": "Agregando red"
   },
-  "addingTokens": {
-    "message": "Agregando tokens"
-  },
   "additionalNetworks": {
     "message": "Redes adicionales"
   },
@@ -627,12 +624,6 @@
   "assetsDescription": {
     "message": "Detectar automáticamente tokens en su monedero, mostrar NFT y recibir actualizaciones de saldo de cuenta por lotes"
   },
-  "attemptSendingAssets": {
-    "message": "Puede perder sus activos si intenta enviarlos desde otra red. Transfiera fondos de forma segura entre redes mediante el uso de un puente."
-  },
-  "attemptSendingAssetsWithPortfolio": {
-    "message": "Puede perder sus activos si intenta enviarlos desde otra red. Transfiera fondos de forma segura entre redes usando un puente, como $1"
-  },
   "attemptToCancelSwapForFree": {
     "message": "Intente cancelar el intercambio de forma gratuita"
   },
@@ -840,9 +831,6 @@
   "bridgeCalculatingAmount": {
     "message": "Calculando..."
   },
-  "bridgeDontSend": {
-    "message": "Puente, no enviar"
-  },
   "bridgeEnterAmount": {
     "message": "Ingrese el monto"
   },
@@ -954,9 +942,6 @@
     "message": "Haga clic aquí para conectar su Ledger a través de WebHID",
     "description": "Text that can be clicked to open a browser popup for connecting the ledger device via webhid"
   },
-  "clickToManuallyAdd": {
-    "message": "Siempre puede agregar tókenes manualmente."
-  },
   "close": {
     "message": "Cerrar"
   },
@@ -2138,9 +2123,6 @@
   "gasFee": {
     "message": "Tarifa de gas"
   },
-  "gasIsETH": {
-    "message": "El gas es $1 "
-  },
   "gasLimit": {
     "message": "Límite de gas"
   },
@@ -2702,9 +2684,6 @@
   "learnScamRisk": {
     "message": "estafas y riesgos en seguridad."
   },
-  "learnToBridge": {
-    "message": "Aprenda a puentear"
-  },
   "leaveMetaMask": {
     "message": "¿Dejar MetaMask?"
   },
@@ -2900,9 +2879,6 @@
   "metamaskNotificationsAreOff": {
     "message": "Las notificaciones del monedero no están activas actualmente."
   },
-  "metamaskPortfolio": {
-    "message": "MetaMask Portfolio."
-  },
   "metamaskSwapsOfflineDescription": {
     "message": "MetaMask Swaps está en mantenimiento. Vuelva a comprobarlo más tarde."
   },
@@ -3047,10 +3023,6 @@
     "message": "$1 solicita su aprobación para:",
     "description": "$1 represents dapp name"
   },
-  "nativeToken": {
-    "message": "El token nativo en esta red es de $1. Es el token utilizado para las tarifas de gas. ",
-    "description": "$1 represents the name of the native token on the current network"
-  },
   "nativeTokenScamWarningConversion": {
     "message": "Editar detalles de la red"
   },
@@ -5940,9 +5912,6 @@
     "message": "$1 ahora está activo en $2",
     "description": "$1 represents the account name, $2 represents the network name"
   },
-  "switchedTo": {
-    "message": "Ahora está usando"
-  },
   "switchingNetworksCancelsPendingConfirmations": {
     "message": "Cambiar de red cancelará todas las confirmaciones pendientes"
   },
@@ -5979,9 +5948,6 @@
   "themeDescription": {
     "message": "Elija su tema MetaMask preferido."
   },
-  "thingsToKeep": {
-    "message": "Tenga en cuenta:"
-  },
   "thirdPartySoftware": {
     "message": "Aviso de software de terceros",
     "description": "Title of a popup modal displayed when installing a snap for the first time."
@@ -6063,9 +6029,6 @@
   "tokenScamSecurityRisk": {
     "message": "estafas de tokens y riesgos de seguridad"
   },
-  "tokenShowUp": {
-    "message": "Es posible que sus tókenes no aparezcan automáticamente en su monedero. "
-  },
   "tokenStandard": {
     "message": "Estándar de tokenes"
   },
diff --git a/app/_locales/fr/messages.json b/app/_locales/fr/messages.json
index abe83f8ea900..68e6626c4688 100644
--- a/app/_locales/fr/messages.json
+++ b/app/_locales/fr/messages.json
@@ -330,9 +330,6 @@
   "addingCustomNetwork": {
     "message": "Ajout de réseau"
   },
-  "addingTokens": {
-    "message": "Ajouter des jetons"
-  },
   "additionalNetworks": {
     "message": "Réseaux supplémentaires"
   },
@@ -627,12 +624,6 @@
   "assetsDescription": {
     "message": "Détection automatique des jetons dans votre portefeuille, affichage des NFT et mise à jour du solde de plusieurs comptes"
   },
-  "attemptSendingAssets": {
-    "message": "Si vous essayez d’envoyer des actifs directement d’un réseau à un autre, une perte permanente des actifs pourrait en résulter. Assurez-vous d’utiliser une passerelle."
-  },
-  "attemptSendingAssetsWithPortfolio": {
-    "message": "Si vous essayez d’envoyer des actifs directement d’un réseau à un autre, vous pourriez les perdre définitivement. Utilisez une passerelle comme $1 pour transférer en toute sécurité des fonds d’un réseau à un autre"
-  },
   "attemptToCancelSwapForFree": {
     "message": "Tentative d’annuler gratuitement le swap"
   },
@@ -840,9 +831,6 @@
   "bridgeCalculatingAmount": {
     "message": "Calcul en cours…"
   },
-  "bridgeDontSend": {
-    "message": "Passerelle, ne pas envoyer"
-  },
   "bridgeEnterAmount": {
     "message": "Saisissez le montant"
   },
@@ -954,9 +942,6 @@
     "message": "Cliquez ici pour connecter votre Ledger via WebHID",
     "description": "Text that can be clicked to open a browser popup for connecting the ledger device via webhid"
   },
-  "clickToManuallyAdd": {
-    "message": "Vous pouvez ajouter des jetons manuellement."
-  },
   "close": {
     "message": "Fermer"
   },
@@ -2138,9 +2123,6 @@
   "gasFee": {
     "message": "Frais de gaz"
   },
-  "gasIsETH": {
-    "message": "Le gaz est $1 "
-  },
   "gasLimit": {
     "message": "Montant maximal des frais de transaction"
   },
@@ -2702,9 +2684,6 @@
   "learnScamRisk": {
     "message": "hameçonnages et risques de sécurité."
   },
-  "learnToBridge": {
-    "message": "Apprenez à établir une passerelle"
-  },
   "leaveMetaMask": {
     "message": "Voulez-vous quitter MetaMask ?"
   },
@@ -2900,9 +2879,6 @@
   "metamaskNotificationsAreOff": {
     "message": "Les notifications du portefeuille ne sont actuellement pas activées."
   },
-  "metamaskPortfolio": {
-    "message": "Portfolio MetaMask."
-  },
   "metamaskSwapsOfflineDescription": {
     "message": "MetaMask Swaps est en cours de maintenance. Nous vous invitons à revenir plus tard."
   },
@@ -3047,10 +3023,6 @@
     "message": "$1 vous demande votre approbation pour :",
     "description": "$1 represents dapp name"
   },
-  "nativeToken": {
-    "message": "Le jeton natif de ce réseau est $1. C’est le jeton utilisé pour les frais de gaz. ",
-    "description": "$1 represents the name of the native token on the current network"
-  },
   "nativeTokenScamWarningConversion": {
     "message": "Modifier les détails du réseau"
   },
@@ -5940,9 +5912,6 @@
     "message": "$1 est maintenant actif sur $2",
     "description": "$1 represents the account name, $2 represents the network name"
   },
-  "switchedTo": {
-    "message": "Vous êtes en train d’utiliser"
-  },
   "switchingNetworksCancelsPendingConfirmations": {
     "message": "Le changement de réseau annulera toutes les confirmations en attente"
   },
@@ -5979,9 +5948,6 @@
   "themeDescription": {
     "message": "Choisissez votre thème MetaMask préféré."
   },
-  "thingsToKeep": {
-    "message": "Les choses que vous devez garder à l’esprit :"
-  },
   "thirdPartySoftware": {
     "message": "Avis sur les logiciels développés par des tiers",
     "description": "Title of a popup modal displayed when installing a snap for the first time."
@@ -6063,9 +6029,6 @@
   "tokenScamSecurityRisk": {
     "message": "les arnaques et les risques de piratage informatique"
   },
-  "tokenShowUp": {
-    "message": "Il se peut que vos jetons n’apparaissent pas automatiquement dans votre portefeuille. "
-  },
   "tokenStandard": {
     "message": "Jeton standard"
   },
diff --git a/app/_locales/hi/messages.json b/app/_locales/hi/messages.json
index 4eaf54f8b012..1f96413e81ff 100644
--- a/app/_locales/hi/messages.json
+++ b/app/_locales/hi/messages.json
@@ -330,9 +330,6 @@
   "addingCustomNetwork": {
     "message": "नेटवर्क जोड़ रहे हैं"
   },
-  "addingTokens": {
-    "message": "टोकन जोड़ना"
-  },
   "additionalNetworks": {
     "message": "अतिरिक्त नेटवर्क"
   },
@@ -627,12 +624,6 @@
   "assetsDescription": {
     "message": "अपने वॉलेट में टोकन ऑटोडिटेक्ट करें, NFT प्रदर्शित करें, और बैच अकाउंट बैलेंस संबंधी अपडेट प्राप्त करें"
   },
-  "attemptSendingAssets": {
-    "message": "अगर आप एसेट्स को सीधे एक नेटवर्क से दूसरे नेटवर्क पर भेजने की कोशिश करते हैं, तो ऐसा करने से आपको एसेट्स का नुकसान हो सकता है। ब्रिज का इस्तेमाल करके नेटवर्कों के बीच फंड्स को सुरक्षित तरीके से ट्रांसफ़र करें।"
-  },
-  "attemptSendingAssetsWithPortfolio": {
-    "message": "अगर आप एसेट्स को सीधे एक नेटवर्क से दूसरे नेटवर्क पर भेजने की कोशिश करते हैं, तो ऐसा करने से आपको एसेट्स का नुकसान हो सकता है। ब्रिज, जैसे like $1, का इस्तेमाल करके नेटवर्कों के बीच फंड्स को सुरक्षित तरीके से ट्रांसफ़र करें।"
-  },
   "attemptToCancelSwapForFree": {
     "message": "स्वैप को मुफ्त में कैंसिल करने की कोशिश करें"
   },
@@ -840,9 +831,6 @@
   "bridgeCalculatingAmount": {
     "message": "कैलकुलेट किया जा रहा है..."
   },
-  "bridgeDontSend": {
-    "message": "ब्रिज, न भेजें"
-  },
   "bridgeEnterAmount": {
     "message": "रकम डालें"
   },
@@ -954,9 +942,6 @@
     "message": "अपने Ledger को WebHID के ज़रिए कनेक्ट करने के लिए यहां क्लिक करें",
     "description": "Text that can be clicked to open a browser popup for connecting the ledger device via webhid"
   },
-  "clickToManuallyAdd": {
-    "message": "आप कभी भी मैन्युअल रूप से टोकन जोड़ सकते हैं।"
-  },
   "close": {
     "message": "बंद करें"
   },
@@ -2138,9 +2123,6 @@
   "gasFee": {
     "message": "गैस फीस"
   },
-  "gasIsETH": {
-    "message": "गैस $1 है "
-  },
   "gasLimit": {
     "message": "गैस लिमिट"
   },
@@ -2702,9 +2684,6 @@
   "learnScamRisk": {
     "message": "घोटाले और सुरक्षा जोखिम।"
   },
-  "learnToBridge": {
-    "message": "ब्रिज करना सीखें"
-  },
   "leaveMetaMask": {
     "message": "MetaMask से बाहर निकलें?"
   },
@@ -2900,9 +2879,6 @@
   "metamaskNotificationsAreOff": {
     "message": "वॉलेट नोटिफिकेशंस वर्तमान में सक्रिय नहीं हैं।"
   },
-  "metamaskPortfolio": {
-    "message": "MetaMask Portfolio."
-  },
   "metamaskSwapsOfflineDescription": {
     "message": "MetaMask स्वैप का रखरखाव किया जा रहा है। कृपया बाद में वापस देखें।"
   },
@@ -3047,10 +3023,6 @@
     "message": "$1 निम्नलिखित के लिए आपका एप्रूवल मांग रहा है:",
     "description": "$1 represents dapp name"
   },
-  "nativeToken": {
-    "message": "इस नेटवर्क पर ओरिजिनल टोकन $1 है। यह गैस फ़ीस के लिए इस्तेमाल किया जाने वाला टोकन है।",
-    "description": "$1 represents the name of the native token on the current network"
-  },
   "nativeTokenScamWarningConversion": {
     "message": "नेटवर्क का ब्यौरा बदलें"
   },
@@ -5940,9 +5912,6 @@
     "message": "$1 अब $2 पर एक्टिव है",
     "description": "$1 represents the account name, $2 represents the network name"
   },
-  "switchedTo": {
-    "message": "आप अब इस्तेमाल कर रहे हैं"
-  },
   "switchingNetworksCancelsPendingConfirmations": {
     "message": "नेटवर्क स्विच करने से सभी लंबित कन्फर्मेशन कैंसिल हो जाएंगे"
   },
@@ -5979,9 +5948,6 @@
   "themeDescription": {
     "message": "अपनी पसंदीदा MetaMask थीम चुन लें"
   },
-  "thingsToKeep": {
-    "message": "ध्यान रखने योग्य बातें:"
-  },
   "thirdPartySoftware": {
     "message": "थर्ड-पार्टी सॉफ्टवेयर नोटिस",
     "description": "Title of a popup modal displayed when installing a snap for the first time."
@@ -6063,9 +6029,6 @@
   "tokenScamSecurityRisk": {
     "message": "टोकन घोटाले और सुरक्षा जोखिम"
   },
-  "tokenShowUp": {
-    "message": "हो सकता है आपके वॉलेट में आपके टोकन ऑटोमेटिकली दिखाई नहीं दें। "
-  },
   "tokenStandard": {
     "message": "टोकन स्टैंडर्ड"
   },
diff --git a/app/_locales/id/messages.json b/app/_locales/id/messages.json
index c93bd496ac12..68bbf6477be5 100644
--- a/app/_locales/id/messages.json
+++ b/app/_locales/id/messages.json
@@ -330,9 +330,6 @@
   "addingCustomNetwork": {
     "message": "Menambahkan Jaringan"
   },
-  "addingTokens": {
-    "message": "Menambahkan token"
-  },
   "additionalNetworks": {
     "message": "Jaringan tambahan"
   },
@@ -627,12 +624,6 @@
   "assetsDescription": {
     "message": "Autodeteksi token di dompet Anda, tampilkan NFT, dan dapatkan pembaruan saldo akun secara batch"
   },
-  "attemptSendingAssets": {
-    "message": "Aset Anda berpotensi hilang jika mencoba mengirimnya dari jaringan lain. Transfer dana secara aman antar jaringan menggunakan bridge."
-  },
-  "attemptSendingAssetsWithPortfolio": {
-    "message": "Aset Anda berpotensi hilang jika mencoba mengirimnya melalui jaringan lain. Transfer dana antar jaringan dengan aman menggunakan bridge, seperti $1"
-  },
   "attemptToCancelSwapForFree": {
     "message": "Mencoba membatalkan pertukaran secara gratis"
   },
@@ -840,9 +831,6 @@
   "bridgeCalculatingAmount": {
     "message": "Menghitung..."
   },
-  "bridgeDontSend": {
-    "message": "Bridge, jangan kirim"
-  },
   "bridgeEnterAmount": {
     "message": "Masukkan jumlah"
   },
@@ -954,9 +942,6 @@
     "message": "Klik di sini untuk menghubungkan Ledger Anda melalui WebHID",
     "description": "Text that can be clicked to open a browser popup for connecting the ledger device via webhid"
   },
-  "clickToManuallyAdd": {
-    "message": "Anda dapat menambahkan token secara manual setiap saat."
-  },
   "close": {
     "message": "Tutup"
   },
@@ -2138,9 +2123,6 @@
   "gasFee": {
     "message": "Biaya gas"
   },
-  "gasIsETH": {
-    "message": "Gas bernilai $1 "
-  },
   "gasLimit": {
     "message": "Batas gas"
   },
@@ -2702,9 +2684,6 @@
   "learnScamRisk": {
     "message": "penipuan dan risiko keamanan."
   },
-  "learnToBridge": {
-    "message": "Pelajari bridge"
-  },
   "leaveMetaMask": {
     "message": "Keluar dari MetaMask?"
   },
@@ -2900,9 +2879,6 @@
   "metamaskNotificationsAreOff": {
     "message": "Saat ini notifikasi dompet tidak aktif."
   },
-  "metamaskPortfolio": {
-    "message": "Portfolio MetaMask."
-  },
   "metamaskSwapsOfflineDescription": {
     "message": "MetaMask Swap sedang dalam pemeliharaan. Harap periksa kembali nanti."
   },
@@ -3047,10 +3023,6 @@
     "message": "$1 meminta persetujuan Anda untuk:",
     "description": "$1 represents dapp name"
   },
-  "nativeToken": {
-    "message": "Token asli di jaringan ini adalah $1. Ini merupakan token yang digunakan untuk biaya gas. ",
-    "description": "$1 represents the name of the native token on the current network"
-  },
   "nativeTokenScamWarningConversion": {
     "message": "Edit detail jaringan"
   },
@@ -5940,9 +5912,6 @@
     "message": "$1 kini telah aktif di $2",
     "description": "$1 represents the account name, $2 represents the network name"
   },
-  "switchedTo": {
-    "message": "Saat ini Anda menggunakan"
-  },
   "switchingNetworksCancelsPendingConfirmations": {
     "message": "Mengalihkan jaringan akan membatalkan semua konfirmasi yang berstatus menunggu"
   },
@@ -5979,9 +5948,6 @@
   "themeDescription": {
     "message": "Pilih tema MetaMask yang Anda sukai."
   },
-  "thingsToKeep": {
-    "message": "Ingatlah:"
-  },
   "thirdPartySoftware": {
     "message": "Pemberitahuan perangkat lunak pihak ketiga",
     "description": "Title of a popup modal displayed when installing a snap for the first time."
@@ -6063,9 +6029,6 @@
   "tokenScamSecurityRisk": {
     "message": "penipuan dan risiko keamanan token"
   },
-  "tokenShowUp": {
-    "message": "Token Anda mungkin tidak muncul secara otomatis di dompet Anda. "
-  },
   "tokenStandard": {
     "message": "Standar token"
   },
diff --git a/app/_locales/it/messages.json b/app/_locales/it/messages.json
index 05cccdac0359..c00040b84086 100644
--- a/app/_locales/it/messages.json
+++ b/app/_locales/it/messages.json
@@ -252,9 +252,6 @@
   "assetOptions": {
     "message": "Opzioni asset"
   },
-  "attemptSendingAssets": {
-    "message": "Se si tenta di inviare risorse direttamente da una rete all'altra, ciò potrebbe comportare una perdita permanente della risorca coinvolta. Assicurati di usare un bridge."
-  },
   "attributions": {
     "message": "Attribuzioni"
   },
@@ -369,9 +366,6 @@
     "message": "Clicca qui per connettere il tuo Ledger tramite WebHID",
     "description": "Text that can be clicked to open a browser popup for connecting the ledger device via webhid"
   },
-  "clickToManuallyAdd": {
-    "message": "Clicca qui per aggiungere manualmente i token."
-  },
   "close": {
     "message": "Chiudi"
   },
diff --git a/app/_locales/ja/messages.json b/app/_locales/ja/messages.json
index 24a2f60314cd..05f359973442 100644
--- a/app/_locales/ja/messages.json
+++ b/app/_locales/ja/messages.json
@@ -330,9 +330,6 @@
   "addingCustomNetwork": {
     "message": "ネットワークを追加中"
   },
-  "addingTokens": {
-    "message": "トークンを追加しています"
-  },
   "additionalNetworks": {
     "message": "他のネットワーク"
   },
@@ -627,12 +624,6 @@
   "assetsDescription": {
     "message": "ウォレットのトークンを自動検出し、NFTを表示して、アカウント残高の最新情報を一括で取得します"
   },
-  "attemptSendingAssets": {
-    "message": "別のネットワークからアセットを送ろうとすると、アセットが失われる可能性があります。ネットワーク間で安全に資金を移動するには、必ずブリッジを使用してください。"
-  },
-  "attemptSendingAssetsWithPortfolio": {
-    "message": "別のネットワークからアセットを送ろうとすると、アセットが失われる可能性があります。ネットワーク間で安全に資金を移動するには、必ず$1などのブリッジを使用してください。"
-  },
   "attemptToCancelSwapForFree": {
     "message": "無料でスワップのキャンセルを試行"
   },
@@ -840,9 +831,6 @@
   "bridgeCalculatingAmount": {
     "message": "計算中..."
   },
-  "bridgeDontSend": {
-    "message": "ブリッジを使用してください"
-  },
   "bridgeEnterAmount": {
     "message": "金額を入力"
   },
@@ -858,7 +846,6 @@
   "bridgeTo": {
     "message": "ブリッジ先:"
   },
-
   "browserNotSupported": {
     "message": "ご使用のブラウザはサポートされていません..."
   },
@@ -955,9 +942,6 @@
     "message": "ここをクリックして、WebHIDでLedgerを接続します",
     "description": "Text that can be clicked to open a browser popup for connecting the ledger device via webhid"
   },
-  "clickToManuallyAdd": {
-    "message": "トークンはいつでも手動で追加できます。"
-  },
   "close": {
     "message": "閉じる"
   },
@@ -2139,9 +2123,6 @@
   "gasFee": {
     "message": "ガス代"
   },
-  "gasIsETH": {
-    "message": "ガス代は$1です"
-  },
   "gasLimit": {
     "message": "ガスリミット"
   },
@@ -2703,9 +2684,6 @@
   "learnScamRisk": {
     "message": "詐欺やセキュリティのリスク。"
   },
-  "learnToBridge": {
-    "message": "ブリッジの使い方"
-  },
   "leaveMetaMask": {
     "message": "MetaMaskから離れますか？"
   },
@@ -2901,9 +2879,6 @@
   "metamaskNotificationsAreOff": {
     "message": "ウォレットの通知は現在無効になっています"
   },
-  "metamaskPortfolio": {
-    "message": "MetaMask Portfolio。"
-  },
   "metamaskSwapsOfflineDescription": {
     "message": "MetaMask Swapsはメンテナンス中です。後でもう一度確認してください。"
   },
@@ -3048,10 +3023,6 @@
     "message": "$1が次の承認を求めています:",
     "description": "$1 represents dapp name"
   },
-  "nativeToken": {
-    "message": "このネットワークのネイティブトークンは$1です。ガス代にもこのトークンが使用されます。",
-    "description": "$1 represents the name of the native token on the current network"
-  },
   "nativeTokenScamWarningConversion": {
     "message": "ネットワークの詳細を編集"
   },
@@ -5941,9 +5912,6 @@
     "message": "$1が$2で有効になりました",
     "description": "$1 represents the account name, $2 represents the network name"
   },
-  "switchedTo": {
-    "message": "次に切り替えました:"
-  },
   "switchingNetworksCancelsPendingConfirmations": {
     "message": "ネットワークを切り替えると、保留中の承認がすべてキャンセルされます"
   },
@@ -5980,9 +5948,6 @@
   "themeDescription": {
     "message": "ご希望のMetaMaskテーマを選択してください。"
   },
-  "thingsToKeep": {
-    "message": "留意点:"
-  },
   "thirdPartySoftware": {
     "message": "サードパーティソフトウェアに関する通知",
     "description": "Title of a popup modal displayed when installing a snap for the first time."
@@ -6064,9 +6029,6 @@
   "tokenScamSecurityRisk": {
     "message": "トークン関連の詐欺やセキュリティのリスク"
   },
-  "tokenShowUp": {
-    "message": "トークンはウォレットに自動的に表示されない可能性があります。"
-  },
   "tokenStandard": {
     "message": "トークン規格"
   },
diff --git a/app/_locales/ko/messages.json b/app/_locales/ko/messages.json
index c261f74b4b5c..f261c0b24c06 100644
--- a/app/_locales/ko/messages.json
+++ b/app/_locales/ko/messages.json
@@ -330,9 +330,6 @@
   "addingCustomNetwork": {
     "message": "네트워크 추가"
   },
-  "addingTokens": {
-    "message": "토큰 추가"
-  },
   "additionalNetworks": {
     "message": "추가 네트워크"
   },
@@ -627,12 +624,6 @@
   "assetsDescription": {
     "message": "지갑에서 토큰을 자동으로 감지하고, NFT를 표시하며, 계정 잔액을 일괄 업데이트하세요."
   },
-  "attemptSendingAssets": {
-    "message": "다른 네트워크로 자산을 직접 전송하면 자산이 영구적으로 손실될 수 있습니다. 브릿지를 이용하여 네트워크 간에 자금을 안전하게 전송하세요."
-  },
-  "attemptSendingAssetsWithPortfolio": {
-    "message": "다른 네트워크에서 자산을 전송하려고 하면 자산이 손실될 수 있습니다. $1 같은 브릿지를 사용하여 네트워크 간에 자산을 안전하게 전송하세요."
-  },
   "attemptToCancelSwapForFree": {
     "message": "무료 스왑 취소 시도"
   },
@@ -840,9 +831,6 @@
   "bridgeCalculatingAmount": {
     "message": "계산 중..."
   },
-  "bridgeDontSend": {
-    "message": "전송하지 마세요, 브릿지 하세요"
-  },
   "bridgeEnterAmount": {
     "message": "금액 입력"
   },
@@ -858,7 +846,6 @@
   "bridgeTo": {
     "message": "브릿지 대상"
   },
-
   "browserNotSupported": {
     "message": "지원되지 않는 브라우저입니다..."
   },
@@ -955,9 +942,6 @@
     "message": "WebHID를 통해 Ledger를 연결하려면 여기를 클릭하세요.",
     "description": "Text that can be clicked to open a browser popup for connecting the ledger device via webhid"
   },
-  "clickToManuallyAdd": {
-    "message": "토큰은 언제든지 직접 추가할 수 있습니다."
-  },
   "close": {
     "message": "닫기"
   },
@@ -2139,9 +2123,6 @@
   "gasFee": {
     "message": "가스비"
   },
-  "gasIsETH": {
-    "message": "가스는 $1입니다 "
-  },
   "gasLimit": {
     "message": "가스 한도"
   },
@@ -2703,9 +2684,6 @@
   "learnScamRisk": {
     "message": "사기 및 보안 위험"
   },
-  "learnToBridge": {
-    "message": "브릿지 알아보기"
-  },
   "leaveMetaMask": {
     "message": "MetaMask를 나가시겠습니까?"
   },
@@ -2901,9 +2879,6 @@
   "metamaskNotificationsAreOff": {
     "message": "현재 지갑 알림이 꺼져 있습니다."
   },
-  "metamaskPortfolio": {
-    "message": "MetaMask Portfolio."
-  },
   "metamaskSwapsOfflineDescription": {
     "message": "MetaMask Swaps 점검 중입니다. 나중에 다시 확인하세요."
   },
@@ -3048,10 +3023,6 @@
     "message": "$1에서 다음 승인을 요청합니다:",
     "description": "$1 represents dapp name"
   },
-  "nativeToken": {
-    "message": "이 네트워크의 네이티브 토큰은 $1입니다. 이는 가스비 지불에 사용하는 토큰입니다. ",
-    "description": "$1 represents the name of the native token on the current network"
-  },
   "nativeTokenScamWarningConversion": {
     "message": "네트워크 세부 정보 편집"
   },
@@ -5941,9 +5912,6 @@
     "message": "$1 계정이 현재 $2 네트워크에서 활성화되어 있습니다",
     "description": "$1 represents the account name, $2 represents the network name"
   },
-  "switchedTo": {
-    "message": "다음을 사용 중입니다:"
-  },
   "switchingNetworksCancelsPendingConfirmations": {
     "message": "네트워크를 전환하면 대기 중인 모든 컨펌 작업이 취소됩니다."
   },
@@ -5980,9 +5948,6 @@
   "themeDescription": {
     "message": "원하는 MetaMask 테마를 선택하세요."
   },
-  "thingsToKeep": {
-    "message": "유의 사항:"
-  },
   "thirdPartySoftware": {
     "message": "타사 소프트웨어 알림",
     "description": "Title of a popup modal displayed when installing a snap for the first time."
@@ -6064,9 +6029,6 @@
   "tokenScamSecurityRisk": {
     "message": "토큰 사기 및 보안 위험"
   },
-  "tokenShowUp": {
-    "message": "토큰이 지갑에 자동으로 표시되지 않을 수 있습니다. "
-  },
   "tokenStandard": {
     "message": "토큰 표준"
   },
diff --git a/app/_locales/pt/messages.json b/app/_locales/pt/messages.json
index 5a1389a0d4d6..1c3bba86966d 100644
--- a/app/_locales/pt/messages.json
+++ b/app/_locales/pt/messages.json
@@ -330,9 +330,6 @@
   "addingCustomNetwork": {
     "message": "Adicionar rede"
   },
-  "addingTokens": {
-    "message": "Adicionando tokens"
-  },
   "additionalNetworks": {
     "message": "Redes adicionais"
   },
@@ -627,12 +624,6 @@
   "assetsDescription": {
     "message": "Detecte automaticamente os tokens em sua carteira, exiba NFTs e receba atualizações de saldo de contas em lote"
   },
-  "attemptSendingAssets": {
-    "message": "Você poderá perder seus ativos se tentar enviá-los a partir de outra rede. Transfira fundos entre redes com segurança usando uma ponte."
-  },
-  "attemptSendingAssetsWithPortfolio": {
-    "message": "Você poderá perder seus ativos se tentar enviá-los a partir de outra rede. Transfira os fundos com segurança entre redes usando uma ponte, como $1"
-  },
   "attemptToCancelSwapForFree": {
     "message": "Tentar cancelar a troca sem custo"
   },
@@ -840,9 +831,6 @@
   "bridgeCalculatingAmount": {
     "message": "Calculando..."
   },
-  "bridgeDontSend": {
-    "message": "Usar uma ponte, não enviar"
-  },
   "bridgeEnterAmount": {
     "message": "Insira o valor"
   },
@@ -858,7 +846,6 @@
   "bridgeTo": {
     "message": "Ponte para"
   },
-
   "browserNotSupported": {
     "message": "Seu navegador não é compatível..."
   },
@@ -955,9 +942,6 @@
     "message": "Clique aqui para conectar seu Ledger por meio do WebHID",
     "description": "Text that can be clicked to open a browser popup for connecting the ledger device via webhid"
   },
-  "clickToManuallyAdd": {
-    "message": "Sempre é possível adicionar tokens manualmente."
-  },
   "close": {
     "message": "Fechar"
   },
@@ -2139,9 +2123,6 @@
   "gasFee": {
     "message": "Taxa de gás"
   },
-  "gasIsETH": {
-    "message": "O gás é $1 "
-  },
   "gasLimit": {
     "message": "Limite de gás"
   },
@@ -2703,9 +2684,6 @@
   "learnScamRisk": {
     "message": "golpes e riscos de segurança."
   },
-  "learnToBridge": {
-    "message": "Aprenda a usar uma ponte"
-  },
   "leaveMetaMask": {
     "message": "Sair da MetaMask?"
   },
@@ -2901,9 +2879,6 @@
   "metamaskNotificationsAreOff": {
     "message": "As notificações de carteiras estão inativas no momento."
   },
-  "metamaskPortfolio": {
-    "message": "MetaMask Portfolio."
-  },
   "metamaskSwapsOfflineDescription": {
     "message": "O recurso de Trocas da MetaMask está em manutenção. Verifique novamente mais tarde."
   },
@@ -3048,10 +3023,6 @@
     "message": "$1 solicita sua aprovação para:",
     "description": "$1 represents dapp name"
   },
-  "nativeToken": {
-    "message": "O token nativo dessa rede é $1. Esse é o token usado para taxas de gás.",
-    "description": "$1 represents the name of the native token on the current network"
-  },
   "nativeTokenScamWarningConversion": {
     "message": "Editar detalhes da rede"
   },
@@ -5941,9 +5912,6 @@
     "message": "$1 agora está ativa na $2",
     "description": "$1 represents the account name, $2 represents the network name"
   },
-  "switchedTo": {
-    "message": "Você alternou para"
-  },
   "switchingNetworksCancelsPendingConfirmations": {
     "message": "A alternância de redes cancelará todas as confirmações pendentes"
   },
@@ -5980,9 +5948,6 @@
   "themeDescription": {
     "message": "Escolha o seu tema preferido para a MetaMask."
   },
-  "thingsToKeep": {
-    "message": "Informações importantes:"
-  },
   "thirdPartySoftware": {
     "message": "Aviso de software de terceiros",
     "description": "Title of a popup modal displayed when installing a snap for the first time."
@@ -6064,9 +6029,6 @@
   "tokenScamSecurityRisk": {
     "message": "golpes e riscos de segurança envolvendo tokens"
   },
-  "tokenShowUp": {
-    "message": "Seus tokens podem não aparecer automaticamente em sua carteira."
-  },
   "tokenStandard": {
     "message": "Padrão de token"
   },
diff --git a/app/_locales/ru/messages.json b/app/_locales/ru/messages.json
index 37a672ec798a..fd0b0b84fcb4 100644
--- a/app/_locales/ru/messages.json
+++ b/app/_locales/ru/messages.json
@@ -330,9 +330,6 @@
   "addingCustomNetwork": {
     "message": "Добавление сети"
   },
-  "addingTokens": {
-    "message": "Добавление токенов"
-  },
   "additionalNetworks": {
     "message": "Дополнительные сети"
   },
@@ -627,12 +624,6 @@
   "assetsDescription": {
     "message": "Автоматически обнаруживайте токены в своем кошельке, отображайте NFT и получайте пакетные обновления баланса счета"
   },
-  "attemptSendingAssets": {
-    "message": "Вы можете потерять свои активы, если попытаетесь отправить их из другой сети. Безопасно переводите средства между сетями с помощью моста."
-  },
-  "attemptSendingAssetsWithPortfolio": {
-    "message": "Попытка отправки активов напрямую из одной сети в другую может привести к необратимой потере активов. Следует использовать мост, такой как $1"
-  },
   "attemptToCancelSwapForFree": {
     "message": "Бесплатная попытка отменить своп"
   },
@@ -840,9 +831,6 @@
   "bridgeCalculatingAmount": {
     "message": "Расчет..."
   },
-  "bridgeDontSend": {
-    "message": "Мост, не отправлять"
-  },
   "bridgeEnterAmount": {
     "message": "Введите сумму"
   },
@@ -954,9 +942,6 @@
     "message": "Нажмите здесь, чтобы подключить свой Ledger через WebHID",
     "description": "Text that can be clicked to open a browser popup for connecting the ledger device via webhid"
   },
-  "clickToManuallyAdd": {
-    "message": "Вы также можете добавлять токены вручную."
-  },
   "close": {
     "message": "Закрыть"
   },
@@ -2138,9 +2123,6 @@
   "gasFee": {
     "message": "Плата за газ"
   },
-  "gasIsETH": {
-    "message": "Газ стоит $1 "
-  },
   "gasLimit": {
     "message": "Лимит газа"
   },
@@ -2702,9 +2684,6 @@
   "learnScamRisk": {
     "message": "мошенничество и угрозы безопасности."
   },
-  "learnToBridge": {
-    "message": "Научитесь создавать мост для"
-  },
   "leaveMetaMask": {
     "message": "Выйти из MetaMask?"
   },
@@ -2900,9 +2879,6 @@
   "metamaskNotificationsAreOff": {
     "message": "Уведомления кошелька в настоящее время неактивны."
   },
-  "metamaskPortfolio": {
-    "message": "MetaMask Portfolio."
-  },
   "metamaskSwapsOfflineDescription": {
     "message": "Сервис свопов MetaMask на техобслуживании. Зайдите позже."
   },
@@ -3047,10 +3023,6 @@
     "message": "$1 запрашивает ваше одобрение на:",
     "description": "$1 represents dapp name"
   },
-  "nativeToken": {
-    "message": "Нативный токен этой сети — $1. Этот токен используется для внесения платы за газ. ",
-    "description": "$1 represents the name of the native token on the current network"
-  },
   "nativeTokenScamWarningConversion": {
     "message": "Изменить сведения о сети"
   },
@@ -5940,9 +5912,6 @@
     "message": "$1 теперь активен в $2",
     "description": "$1 represents the account name, $2 represents the network name"
   },
-  "switchedTo": {
-    "message": "Сейчас вы используете"
-  },
   "switchingNetworksCancelsPendingConfirmations": {
     "message": "В случае смены сетей все ожидающие подтверждения будут отменены"
   },
@@ -5979,9 +5948,6 @@
   "themeDescription": {
     "message": "Выберите предпочитаемую тему MetaMask."
   },
-  "thingsToKeep": {
-    "message": "Что нужно помнить:"
-  },
   "thirdPartySoftware": {
     "message": "Уведомление о стороннем ПО",
     "description": "Title of a popup modal displayed when installing a snap for the first time."
@@ -6063,9 +6029,6 @@
   "tokenScamSecurityRisk": {
     "message": "мошенничество с токенами и угрозы безопасности"
   },
-  "tokenShowUp": {
-    "message": "Ваши токены могут не отображаться автоматически в вашем кошельке. "
-  },
   "tokenStandard": {
     "message": "Стандарт токена"
   },
diff --git a/app/_locales/tl/messages.json b/app/_locales/tl/messages.json
index 20b318456d77..4c201294dcdb 100644
--- a/app/_locales/tl/messages.json
+++ b/app/_locales/tl/messages.json
@@ -330,9 +330,6 @@
   "addingCustomNetwork": {
     "message": "Nagdaragdag ng Network"
   },
-  "addingTokens": {
-    "message": "Nagdaragdag ng mga token"
-  },
   "additionalNetworks": {
     "message": "Mga karagdagang network"
   },
@@ -627,12 +624,6 @@
   "assetsDescription": {
     "message": "I-autodetect ang mga token sa wallet mo, ipakita ang mga NFT, at kumuha ng naka-batch na mga update sa balanse ng account"
   },
-  "attemptSendingAssets": {
-    "message": "Maaari mong mawala ang mga asset kung susubukan mo itong ipadala mula sa isang network papunta sa isa pa. Ligtas ng maglipat ng pondo sa pagitan ng mga network sa pamamagitan ng paggamit ng bridge."
-  },
-  "attemptSendingAssetsWithPortfolio": {
-    "message": "Maaaring mawala ang iyong mga asset kung susubukan mong ipadala ito mula sa ibang network. Ilipat ang mga pondo nang ligtas sa pagitan ng mga network gamit ang isang bridge, tulad ng $1"
-  },
   "attemptToCancelSwapForFree": {
     "message": "Subukang kanselahin ang swap nang libre"
   },
@@ -840,9 +831,6 @@
   "bridgeCalculatingAmount": {
     "message": "Nagkakalkula..."
   },
-  "bridgeDontSend": {
-    "message": "Bridge, huwag ipadala"
-  },
   "bridgeEnterAmount": {
     "message": "Ilagay ang halaga"
   },
@@ -858,7 +846,6 @@
   "bridgeTo": {
     "message": "I-bridge papunta sa"
   },
-
   "browserNotSupported": {
     "message": "Hindi sinusuportahan ang iyong browser..."
   },
@@ -955,9 +942,6 @@
     "message": "Mag-click dito upang ikonekta ang iyong Ledger sa pamamagitan ng WebHID",
     "description": "Text that can be clicked to open a browser popup for connecting the ledger device via webhid"
   },
-  "clickToManuallyAdd": {
-    "message": "Maaari ka ring magdagdag ng mga token nang manu-mano."
-  },
   "close": {
     "message": "Isara"
   },
@@ -2139,9 +2123,6 @@
   "gasFee": {
     "message": "Bayad sa gas"
   },
-  "gasIsETH": {
-    "message": "Ang gas ay $1 "
-  },
   "gasLimit": {
     "message": "Limitasyon ng gas"
   },
@@ -2703,9 +2684,6 @@
   "learnScamRisk": {
     "message": "mga panloloko at panganib sa seguridad."
   },
-  "learnToBridge": {
-    "message": "Matutong mag-bridge"
-  },
   "leaveMetaMask": {
     "message": "Umalis sa MetaMask?"
   },
@@ -2901,9 +2879,6 @@
   "metamaskNotificationsAreOff": {
     "message": "Hindi active sa kasalukuyan ang mga notipikasyon sa wallet."
   },
-  "metamaskPortfolio": {
-    "message": "MetaMask Portfolio."
-  },
   "metamaskSwapsOfflineDescription": {
     "message": "Kasalukuyang minementina ang MetaMask Swaps. Bumalik sa ibang pagkakataon."
   },
@@ -3048,10 +3023,6 @@
     "message": "Ang $1 ay humihiling ng iyong pag-apruba para:",
     "description": "$1 represents dapp name"
   },
-  "nativeToken": {
-    "message": "Ang native token sa network na ito ay $1. Ito ang token na ginagamit para sa mga gas fee. ",
-    "description": "$1 represents the name of the native token on the current network"
-  },
   "nativeTokenScamWarningConversion": {
     "message": "I-edit ang mga detalye ng network"
   },
@@ -5941,9 +5912,6 @@
     "message": "Ang $1 ay aktibo ngayon sa $2",
     "description": "$1 represents the account name, $2 represents the network name"
   },
-  "switchedTo": {
-    "message": "Lumipat ka sa"
-  },
   "switchingNetworksCancelsPendingConfirmations": {
     "message": "Ang paglipat ng network ay magkakansela ng lahat ng nakabinbing kumpirmasyon"
   },
@@ -5980,9 +5948,6 @@
   "themeDescription": {
     "message": "Piliin ang mas gusto mong tema ng MetaMask."
   },
-  "thingsToKeep": {
-    "message": "Mga bagay na dapat tandaan:"
-  },
   "thirdPartySoftware": {
     "message": "Paunawa ng third-party na software",
     "description": "Title of a popup modal displayed when installing a snap for the first time."
@@ -6064,9 +6029,6 @@
   "tokenScamSecurityRisk": {
     "message": "mga panloloko sa token at panganib sa seguridad"
   },
-  "tokenShowUp": {
-    "message": "Maaaring hindi awtomatikong lumabas ang iyong mga token sa iyong wallet. "
-  },
   "tokenStandard": {
     "message": "Pamantayan ng token"
   },
diff --git a/app/_locales/tr/messages.json b/app/_locales/tr/messages.json
index 470bb934f74b..f55ea0c69c14 100644
--- a/app/_locales/tr/messages.json
+++ b/app/_locales/tr/messages.json
@@ -330,9 +330,6 @@
   "addingCustomNetwork": {
     "message": "Ağ Ekleniyor"
   },
-  "addingTokens": {
-    "message": "Token'leri ekleme"
-  },
   "additionalNetworks": {
     "message": "İlave ağlar"
   },
@@ -627,12 +624,6 @@
   "assetsDescription": {
     "message": "Cüzdanınızdaki token'ler otomatik algılansın, NFT'ler gösterilsin ve toplu hesap bakiye güncellemeleri alınsın"
   },
-  "attemptSendingAssets": {
-    "message": "Varlıklarınızı doğrudan bir ağdan diğerine göndermeye çalışırsanız onları kaybedebilirsiniz. Fonları köprü kullanarak ağlar arasında güvenli bir şekilde transfer edin."
-  },
-  "attemptSendingAssetsWithPortfolio": {
-    "message": "Varlıkları doğrudan bir ağdan diğerine göndermeye çalışırsanız bu durum kalıcı varlık kaybına neden olabilir. $1 gibi bir köprü kullandığınızdan emin olun"
-  },
   "attemptToCancelSwapForFree": {
     "message": "Swap işlemini ücretsiz iptal etme girişimi"
   },
@@ -840,9 +831,6 @@
   "bridgeCalculatingAmount": {
     "message": "Hesaplanıyor..."
   },
-  "bridgeDontSend": {
-    "message": "Köprü yap, gönderme"
-  },
   "bridgeEnterAmount": {
     "message": "Miktar girin"
   },
@@ -858,7 +846,6 @@
   "bridgeTo": {
     "message": "Şuraya köprü:"
   },
-
   "browserNotSupported": {
     "message": "Tarayıcınız desteklenmiyor..."
   },
@@ -955,9 +942,6 @@
     "message": "WebHID üzerinden Ledger'ınızı bağlamak için tıklayın",
     "description": "Text that can be clicked to open a browser popup for connecting the ledger device via webhid"
   },
-  "clickToManuallyAdd": {
-    "message": "Dilediğiniz zaman tokenleri manuel olarak ekleyebilirsiniz."
-  },
   "close": {
     "message": "Kapat"
   },
@@ -2139,9 +2123,6 @@
   "gasFee": {
     "message": "Gaz ücreti"
   },
-  "gasIsETH": {
-    "message": "Gaz $1 "
-  },
   "gasLimit": {
     "message": "Gaz limiti"
   },
@@ -2703,9 +2684,6 @@
   "learnScamRisk": {
     "message": "dolandırıcılıklar ve güvenlik riskleri."
   },
-  "learnToBridge": {
-    "message": "Köprü yapmayı öğren"
-  },
   "leaveMetaMask": {
     "message": "MetaMask'ten ayrıl?"
   },
@@ -2901,9 +2879,6 @@
   "metamaskNotificationsAreOff": {
     "message": "Cüzdan bildirimleri şu anda aktif değil."
   },
-  "metamaskPortfolio": {
-    "message": "MetaMask Portfolio."
-  },
   "metamaskSwapsOfflineDescription": {
     "message": "MetaMask Swap İşlemleri bakımda. Lütfen daha sonra tekrar kontrol edin."
   },
@@ -3048,10 +3023,6 @@
     "message": "$1 sizden şunun için onay istiyor:",
     "description": "$1 represents dapp name"
   },
-  "nativeToken": {
-    "message": "Bu ağdaki yerli token $1. Bu, gaz ücretleri için kullanılan tokendir. ",
-    "description": "$1 represents the name of the native token on the current network"
-  },
   "nativeTokenScamWarningConversion": {
     "message": "Ağ bilgilerini düzenle"
   },
@@ -5941,9 +5912,6 @@
     "message": "$1, $2 üzerinde aktif",
     "description": "$1 represents the account name, $2 represents the network name"
   },
-  "switchedTo": {
-    "message": "Şu anda kullandığınız ağ"
-  },
   "switchingNetworksCancelsPendingConfirmations": {
     "message": "Ağ değiştirmek bekleyen tüm onayları iptal eder"
   },
@@ -5980,9 +5948,6 @@
   "themeDescription": {
     "message": "Tercih ettiğin MetaMask temasını seç."
   },
-  "thingsToKeep": {
-    "message": "Unutulmaması gerekenler:"
-  },
   "thirdPartySoftware": {
     "message": "Üçüncü taraf yazılım uyarısı",
     "description": "Title of a popup modal displayed when installing a snap for the first time."
@@ -6064,9 +6029,6 @@
   "tokenScamSecurityRisk": {
     "message": "token dolandırıcılıkları ve güvenlik riskleri"
   },
-  "tokenShowUp": {
-    "message": "Tokenleriniz cüzdanınızda otomatik olarak görünmeyebilir. "
-  },
   "tokenStandard": {
     "message": "Token standardı"
   },
diff --git a/app/_locales/vi/messages.json b/app/_locales/vi/messages.json
index d331ab42b9b5..07262f16cbd2 100644
--- a/app/_locales/vi/messages.json
+++ b/app/_locales/vi/messages.json
@@ -330,9 +330,6 @@
   "addingCustomNetwork": {
     "message": "Thêm mạng"
   },
-  "addingTokens": {
-    "message": "Đang thêm token"
-  },
   "additionalNetworks": {
     "message": "Mạng bổ sung"
   },
@@ -627,12 +624,6 @@
   "assetsDescription": {
     "message": "Tự động phát hiện token trong ví của bạn, hiển thị NFT và nhận hàng loạt thông tin cập nhật về số dư tài khoản"
   },
-  "attemptSendingAssets": {
-    "message": "Bạn có thể bị mất tài sản nếu cố gắng gửi tài sản từ một mạng khác. Chuyển tiền an toàn giữa các mạng bằng cách sử dụng cầu nối."
-  },
-  "attemptSendingAssetsWithPortfolio": {
-    "message": "Bạn có thể bị mất tài sản nếu cố gắng gửi tài sản từ một mạng khác. Chuyển tiền an toàn giữa các mạng bằng cách sử dụng cầu nối, chẳng hạn như $1"
-  },
   "attemptToCancelSwapForFree": {
     "message": "Cố gắng hủy hoán đổi miễn phí"
   },
@@ -840,9 +831,6 @@
   "bridgeCalculatingAmount": {
     "message": "Đang tính toán..."
   },
-  "bridgeDontSend": {
-    "message": "Cầu nối, không gửi"
-  },
   "bridgeEnterAmount": {
     "message": "Nhập số tiền"
   },
@@ -858,7 +846,6 @@
   "bridgeTo": {
     "message": "Cầu nối đến"
   },
-
   "browserNotSupported": {
     "message": "Trình duyệt của bạn không được hỗ trợ..."
   },
@@ -955,9 +942,6 @@
     "message": "Nhấp vào đây để kết nối với ví Ledger của bạn qua WebHID",
     "description": "Text that can be clicked to open a browser popup for connecting the ledger device via webhid"
   },
-  "clickToManuallyAdd": {
-    "message": "Bạn luôn có thể thêm token theo cách thủ công."
-  },
   "close": {
     "message": "Đóng"
   },
@@ -2139,9 +2123,6 @@
   "gasFee": {
     "message": "Phí gas"
   },
-  "gasIsETH": {
-    "message": "Gas là $1 "
-  },
   "gasLimit": {
     "message": "Hạn mức phí gas"
   },
@@ -2703,9 +2684,6 @@
   "learnScamRisk": {
     "message": "lừa đảo và nguy cơ bảo mật."
   },
-  "learnToBridge": {
-    "message": "Tìm hiểu cách sử dụng cầu nối"
-  },
   "leaveMetaMask": {
     "message": "Rời khỏi MetaMask?"
   },
@@ -2901,9 +2879,6 @@
   "metamaskNotificationsAreOff": {
     "message": "Thông báo ví hiện không hoạt động."
   },
-  "metamaskPortfolio": {
-    "message": "MetaMask Portfolio."
-  },
   "metamaskSwapsOfflineDescription": {
     "message": "Tính năng Hoán đổi trên MetaMask đang được bảo trì. Vui lòng kiểm tra lại sau."
   },
@@ -3048,10 +3023,6 @@
     "message": "$1 đang yêu cầu sự chấp thuận của bạn cho:",
     "description": "$1 represents dapp name"
   },
-  "nativeToken": {
-    "message": "Token gốc của mạng này là $1. Token này được dùng làm phí gas.",
-    "description": "$1 represents the name of the native token on the current network"
-  },
   "nativeTokenScamWarningConversion": {
     "message": "Chỉnh sửa thông tin mạng"
   },
@@ -5941,9 +5912,6 @@
     "message": "$1 hiện đang hoạt động trên $2",
     "description": "$1 represents the account name, $2 represents the network name"
   },
-  "switchedTo": {
-    "message": "Bạn hiện đang sử dụng"
-  },
   "switchingNetworksCancelsPendingConfirmations": {
     "message": "Khi bạn chuyển mạng, mọi xác nhận đang chờ xử lý sẽ bị hủy"
   },
@@ -5980,9 +5948,6 @@
   "themeDescription": {
     "message": "Chọn chủ đề MetaMask yêu thích của bạn."
   },
-  "thingsToKeep": {
-    "message": "Những điều cần lưu ý:"
-  },
   "thirdPartySoftware": {
     "message": "Thông báo phần mềm của bên thứ ba",
     "description": "Title of a popup modal displayed when installing a snap for the first time."
@@ -6064,9 +6029,6 @@
   "tokenScamSecurityRisk": {
     "message": "rủi ro về bảo mật và lừa đảo token"
   },
-  "tokenShowUp": {
-    "message": "Các token có thể không tự động hiển thị trong ví của bạn. "
-  },
   "tokenStandard": {
     "message": "Tiêu chuẩn token"
   },
diff --git a/app/_locales/zh_CN/messages.json b/app/_locales/zh_CN/messages.json
index 52941dcc24f9..944ad47289f0 100644
--- a/app/_locales/zh_CN/messages.json
+++ b/app/_locales/zh_CN/messages.json
@@ -330,9 +330,6 @@
   "addingCustomNetwork": {
     "message": "正在添加网络"
   },
-  "addingTokens": {
-    "message": "正在添加代币"
-  },
   "additionalNetworks": {
     "message": "其他网络"
   },
@@ -627,12 +624,6 @@
   "assetsDescription": {
     "message": "自动检测钱包中的代币，显示 NFT，并获取批量账户余额更新"
   },
-  "attemptSendingAssets": {
-    "message": "如果您试图将资产从一个网络直接发送到另一个网络，这可能会导致永久的资产损失。请务必使用跨链桥进行操作。"
-  },
-  "attemptSendingAssetsWithPortfolio": {
-    "message": "如果您尝试将资产从一个网络发送到另一个网络，这可能会导致资产损失。请务必使用跨链桥在不同网络间安全转移资金，例如 $1"
-  },
   "attemptToCancelSwapForFree": {
     "message": "尝试免费取消兑换"
   },
@@ -840,9 +831,6 @@
   "bridgeCalculatingAmount": {
     "message": "正在计算......"
   },
-  "bridgeDontSend": {
-    "message": "跨链桥，不要发送"
-  },
   "bridgeEnterAmount": {
     "message": "输入金额"
   },
@@ -858,7 +846,6 @@
   "bridgeTo": {
     "message": "桥接至"
   },
-
   "browserNotSupported": {
     "message": "您的浏览器不受支持……"
   },
@@ -955,9 +942,6 @@
     "message": "点击这里以通过 WebHID 连接您的 Ledger",
     "description": "Text that can be clicked to open a browser popup for connecting the ledger device via webhid"
   },
-  "clickToManuallyAdd": {
-    "message": "请点击这里，以手动添加代币。"
-  },
   "close": {
     "message": "关闭"
   },
@@ -2139,9 +2123,6 @@
   "gasFee": {
     "message": "燃料费"
   },
-  "gasIsETH": {
-    "message": "燃料是 $1 "
-  },
   "gasLimit": {
     "message": "燃料限制"
   },
@@ -2703,9 +2684,6 @@
   "learnScamRisk": {
     "message": "欺诈和安全风险信息。"
   },
-  "learnToBridge": {
-    "message": "了解跨链桥"
-  },
   "leaveMetaMask": {
     "message": "要离开 MetaMask？"
   },
@@ -2901,9 +2879,6 @@
   "metamaskNotificationsAreOff": {
     "message": "钱包通知目前未开启。"
   },
-  "metamaskPortfolio": {
-    "message": "MetaMask Portfolio。"
-  },
   "metamaskSwapsOfflineDescription": {
     "message": "MetaMask Swaps 正在进行维护。请稍后再查看。"
   },
@@ -3048,10 +3023,6 @@
     "message": "$1 请求您的批准，以便：",
     "description": "$1 represents dapp name"
   },
-  "nativeToken": {
-    "message": "此网络上的原生代币为 $1。它是用于燃料费的代币。 ",
-    "description": "$1 represents the name of the native token on the current network"
-  },
   "nativeTokenScamWarningConversion": {
     "message": "编辑网络详情"
   },
@@ -5941,9 +5912,6 @@
     "message": "$1 现已在 $2 上激活",
     "description": "$1 represents the account name, $2 represents the network name"
   },
-  "switchedTo": {
-    "message": "您现在使用的是"
-  },
   "switchingNetworksCancelsPendingConfirmations": {
     "message": "切换网络将取消所有待处理的确认"
   },
@@ -5980,9 +5948,6 @@
   "themeDescription": {
     "message": "选择您喜欢的MetaMask主题。"
   },
-  "thingsToKeep": {
-    "message": "注意事项:"
-  },
   "thirdPartySoftware": {
     "message": "第三方软件通告",
     "description": "Title of a popup modal displayed when installing a snap for the first time."
@@ -6064,9 +6029,6 @@
   "tokenScamSecurityRisk": {
     "message": "代币欺诈和安全风险。"
   },
-  "tokenShowUp": {
-    "message": "您的代币可能不会自动显示在您的钱包中。"
-  },
   "tokenStandard": {
     "message": "代币标准"
   },
diff --git a/ui/components/ui/new-network-info/index.js b/ui/components/ui/new-network-info/index.js
deleted file mode 100644
index e4bd2dcdbd3e..000000000000
--- a/ui/components/ui/new-network-info/index.js
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from './new-network-info';
diff --git a/ui/components/ui/new-network-info/index.scss b/ui/components/ui/new-network-info/index.scss
deleted file mode 100644
index 989a927bb251..000000000000
--- a/ui/components/ui/new-network-info/index.scss
+++ /dev/null
@@ -1,59 +0,0 @@
-.new-network-info {
-  &__wrapper {
-    box-shadow: 0 4px 20px rgba(0, 0, 0, 0.214);
-    border-radius: 8px;
-
-    .popover-footer {
-      border-top: none;
-      width: 100%;
-      gap: 16px;
-
-      .footer__button {
-        flex: 1;
-        flex-grow: 1;
-        white-space: nowrap;
-        overflow: hidden;
-      }
-
-      a:hover > span {
-        color: var(--inherit);
-      }
-    }
-
-    .popover-header {
-      padding-bottom: 1px;
-    }
-
-    .popover-header__button {
-      color: var(--color-icon-default);
-    }
-  }
-
-  &__token-box {
-    align-self: center;
-    margin-top: 8px;
-    max-width: 245px;
-  }
-
-  &__button {
-    display: contents;
-    padding: 0;
-  }
-
-  &__bullet-icon-container {
-    background-color: var(--color-info-muted);
-    border-radius: 50%;
-    padding: 6px;
-
-    .mm-icon {
-      display: flex;
-      color: var(--color-info-default);
-    }
-  }
-}
-
-.chip--with-left-icon {
-  padding-left: 8px;
-  padding-top: 8px;
-  padding-bottom: 8px;
-}
diff --git a/ui/components/ui/new-network-info/new-network-info.js b/ui/components/ui/new-network-info/new-network-info.js
deleted file mode 100644
index 9d4df0ec63ec..000000000000
--- a/ui/components/ui/new-network-info/new-network-info.js
+++ /dev/null
@@ -1,267 +0,0 @@
-import React, { useCallback, useContext, useEffect, useState } from 'react';
-import { useSelector } from 'react-redux';
-import { TOKEN_API_METASWAP_CODEFI_URL } from '../../../../shared/constants/tokens';
-import fetchWithCache from '../../../../shared/lib/fetch-with-cache';
-import { I18nContext } from '../../../contexts/i18n';
-import { getProviderConfig } from '../../../../shared/modules/selectors/networks';
-import {
-  AlignItems,
-  BackgroundColor,
-  BorderColor,
-  Color,
-  Display,
-  FlexDirection,
-  TextAlign,
-  TextColor,
-  TextVariant,
-} from '../../../helpers/constants/design-system';
-import {
-  getCurrentNetwork,
-  getIsBridgeChain,
-  getMetaMetricsId,
-  getUseTokenDetection,
-  getUseExternalServices,
-  getParticipateInMetaMetrics,
-  getDataCollectionForMarketing,
-} from '../../../selectors';
-import {
-  PickerNetwork,
-  Text,
-  Box,
-  Button,
-  Icon,
-  IconName,
-  ButtonPrimarySize,
-  IconSize,
-  AvatarNetworkSize,
-} from '../../component-library';
-import Popover from '../popover';
-import { getPortfolioUrl } from '../../../helpers/utils/portfolio';
-import ZENDESK_URLS from '../../../helpers/constants/zendesk-url';
-
-export default function NewNetworkInfo() {
-  const t = useContext(I18nContext);
-  const [tokenDetectionSupported, setTokenDetectionSupported] = useState(false);
-  const [showPopup, setShowPopup] = useState(true);
-  const [isLoading, setIsLoading] = useState(true);
-  const autoDetectToken = useSelector(getUseTokenDetection);
-  const areExternalServicesEnabled = useSelector(getUseExternalServices);
-  const providerConfig = useSelector(getProviderConfig);
-  const currentNetwork = useSelector(getCurrentNetwork);
-  const metaMetricsId = useSelector(getMetaMetricsId);
-  const isBridgeChain = useSelector(getIsBridgeChain);
-  const isMetaMetricsEnabled = useSelector(getParticipateInMetaMetrics);
-  const isMarketingEnabled = useSelector(getDataCollectionForMarketing);
-
-  const onCloseClick = () => {
-    setShowPopup(false);
-  };
-
-  const checkTokenDetection = useCallback(async () => {
-    setIsLoading(true);
-    const fetchedTokenData = await fetchWithCache({
-      url: `${TOKEN_API_METASWAP_CODEFI_URL}${providerConfig.chainId}?occurrenceFloor=100&includeNativeAssets=false`,
-      functionName: 'getIsTokenDetectionSupported',
-    });
-    const isTokenDetectionSupported = !fetchedTokenData?.error;
-    setTokenDetectionSupported(isTokenDetectionSupported);
-    setIsLoading(false);
-  }, [providerConfig.chainId]);
-
-  useEffect(() => {
-    if (!areExternalServicesEnabled) {
-      return;
-    }
-    checkTokenDetection();
-    // we want to only fetch once
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, []);
-
-  return (
-    !isLoading &&
-    showPopup && (
-      <Popover
-        title={t('switchedTo')}
-        centerTitle
-        onClose={onCloseClick}
-        className="new-network-info__wrapper"
-        headerProps={{ marginLeft: 6 }}
-        footer={
-          <>
-            <Button
-              variant="secondary"
-              href={ZENDESK_URLS.USER_GUIDE_CUSTOM_NETWORKS}
-              externalLink
-              rel="noreferrer"
-              size={ButtonPrimarySize.Md}
-              className="footer__button"
-            >
-              <Text variant={TextVariant.bodySm} as="h6" color={Color.inherit}>
-                {t('learnToBridge')}
-              </Text>
-            </Button>
-            <Button
-              variant="primary"
-              onClick={onCloseClick}
-              size={ButtonPrimarySize.Md}
-              className="footer__button"
-            >
-              <Text variant={TextVariant.bodySm} as="h6" color={Color.inherit}>
-                {t('recoveryPhraseReminderConfirm')}
-              </Text>
-            </Button>
-          </>
-        }
-      >
-        <Box
-          data-testid="new-network-info__wrapper"
-          display={Display.Flex}
-          flexDirection={FlexDirection.Column}
-        >
-          <PickerNetwork
-            label={currentNetwork?.nickname}
-            src={currentNetwork?.rpcPrefs?.imageUrl}
-            marginLeft="auto"
-            marginRight="auto"
-            marginBottom={4}
-            iconProps={{ display: 'none' }} // do not show the dropdown icon
-            avatarNetworkProps={{ size: AvatarNetworkSize.Sm }}
-            as="div" // do not render as a button
-            backgroundColor={BackgroundColor.transparent}
-            borderWidth={1}
-            borderColor={BorderColor.borderMuted}
-          />
-          <Text
-            variant={TextVariant.bodySm}
-            as="h6"
-            color={Color.textDefault}
-            align={TextAlign.Start}
-            marginLeft={4}
-            marginTop={2}
-          >
-            {t('thingsToKeep')}
-          </Text>
-          <Box marginRight={4} marginLeft={4} marginTop={5}>
-            {providerConfig.ticker && (
-              <Box
-                display={Display.Flex}
-                alignItems={AlignItems.flexStart}
-                marginBottom={2}
-                paddingBottom={2}
-                data-testid="new-network-info__bullet-paragraph"
-                gap={3}
-              >
-                <Box className="new-network-info__bullet-icon-container">
-                  <Icon name={IconName.Gas} size={IconSize.Sm} />
-                </Box>
-                <Box flexDirection={FlexDirection.Column}>
-                  <Text
-                    variant={TextVariant.bodySmBold}
-                    as="h6"
-                    color={TextColor.textDefault}
-                  >
-                    {t('gasIsETH', [providerConfig.ticker])}
-                  </Text>
-                  <Text
-                    variant={TextVariant.bodySm}
-                    as="h6"
-                    color={TextColor.textDefault}
-                    display={Display.InlineBlock}
-                    key="nativeTokenInfo"
-                  >
-                    {t('nativeToken', [providerConfig.ticker])}
-                  </Text>
-                </Box>
-              </Box>
-            )}
-            <Box
-              display={Display.Flex}
-              alignItems={AlignItems.flexStart}
-              marginBottom={2}
-              paddingBottom={2}
-              gap={3}
-            >
-              <Box className="new-network-info__bullet-icon-container">
-                <Icon name={IconName.Bridge} size={IconSize.Sm} />
-              </Box>
-              <Box flexDirection={FlexDirection.Column}>
-                <Text
-                  variant={TextVariant.bodySmBold}
-                  as="h6"
-                  color={TextColor.textDefault}
-                >
-                  {t('bridgeDontSend')}
-                </Text>
-                <Text
-                  variant={TextVariant.bodySm}
-                  as="h6"
-                  color={TextColor.textDefault}
-                  display={Display.InlineBlock}
-                >
-                  {isBridgeChain
-                    ? t('attemptSendingAssetsWithPortfolio', [
-                        <a
-                          href={`${getPortfolioUrl(
-                            'bridge',
-                            'ext_bridge_new_network_info_link',
-                            metaMetricsId,
-                            isMetaMetricsEnabled,
-                            isMarketingEnabled,
-                          )}&destChain=${currentNetwork?.chainId}`}
-                          target="_blank"
-                          rel="noreferrer"
-                          key="bridge-link"
-                        >
-                          <Text
-                            variant={TextVariant.bodySm}
-                            as="h6"
-                            color={TextColor.infoDefault}
-                            className="new-network-info__button"
-                          >
-                            {t('metamaskPortfolio')}
-                          </Text>
-                        </a>,
-                      ])
-                    : t('attemptSendingAssets')}
-                </Text>
-              </Box>
-            </Box>
-
-            {!autoDetectToken || !tokenDetectionSupported ? (
-              <Box
-                display={Display.Flex}
-                alignItems={AlignItems.flexStart}
-                marginBottom={2}
-                paddingBottom={2}
-                data-testid="new-network-info__add-token-manually"
-                gap={3}
-              >
-                <Box className="new-network-info__bullet-icon-container">
-                  <Icon name={IconName.Coin} size={IconSize.Sm} />
-                </Box>
-                <Box flexDirection={FlexDirection.Column}>
-                  <Text
-                    variant={TextVariant.bodySmBold}
-                    as="h6"
-                    color={TextColor.textDefault}
-                  >
-                    {t('addingTokens')}
-                  </Text>
-                  <Text
-                    variant={TextVariant.bodySm}
-                    as="h6"
-                    color={Color.textDefault}
-                    display={Display.InlineBlock}
-                  >
-                    {t('tokenShowUp')}
-                    {t('clickToManuallyAdd')}
-                  </Text>
-                </Box>
-              </Box>
-            ) : null}
-          </Box>
-        </Box>
-      </Popover>
-    )
-  );
-}
diff --git a/ui/components/ui/new-network-info/new-network-info.stories.js b/ui/components/ui/new-network-info/new-network-info.stories.js
deleted file mode 100644
index 9d70ef07b5f0..000000000000
--- a/ui/components/ui/new-network-info/new-network-info.stories.js
+++ /dev/null
@@ -1,10 +0,0 @@
-import React from 'react';
-import NewNetworkInfo from '.';
-
-export default {
-  title: 'Components/UI/NewNetworkInfo',
-};
-
-export const DefaultStory = () => <NewNetworkInfo />;
-
-DefaultStory.storyName = 'Default';
diff --git a/ui/components/ui/new-network-info/new-network-info.test.js b/ui/components/ui/new-network-info/new-network-info.test.js
deleted file mode 100644
index 59d98ab358fd..000000000000
--- a/ui/components/ui/new-network-info/new-network-info.test.js
+++ /dev/null
@@ -1,223 +0,0 @@
-import React from 'react';
-import { waitFor } from '@testing-library/react';
-import configureMockStore from 'redux-mock-store';
-import nock from 'nock';
-import { renderWithProvider } from '../../../../test/lib/render-helpers';
-import { mockNetworkState } from '../../../../test/stub/networks';
-import { CHAIN_IDS } from '../../../../shared/constants/network';
-import NewNetworkInfo from './new-network-info';
-
-const fetchWithCache =
-  require('../../../../shared/lib/fetch-with-cache').default;
-
-const localStorageMock = (function () {
-  let store = {};
-  return {
-    getItem(key) {
-      return store[key];
-    },
-
-    setItem(key, value) {
-      store[key] = value.toString();
-    },
-
-    clear() {
-      store = {};
-    },
-
-    removeItem(key) {
-      delete store[key];
-    },
-  };
-})();
-Object.defineProperty(window, 'localStorage', { value: localStorageMock });
-
-const responseOfTokenList = [];
-describe('NewNetworkInfo', () => {
-  afterEach(() => {
-    nock.cleanAll();
-  });
-
-  describe('fetch token successfully', () => {
-    const state = {
-      metamask: {
-        ...mockNetworkState({ chainId: CHAIN_IDS.MAINNET }),
-        useExternalServices: true,
-        useTokenDetection: false,
-        currencyRates: {},
-      },
-    };
-
-    it('should match snapshot and render component', async () => {
-      nock('https://token.api.cx.metamask.io')
-        .get('/tokens/0x1?occurrenceFloor=100&includeNativeAssets=false')
-        .reply(200, responseOfTokenList);
-
-      const store = configureMockStore()(state);
-      const { getByText, getByTestId } = renderWithProvider(
-        <NewNetworkInfo />,
-        store,
-      );
-      // wait for the fetch to finish
-      await waitFor(() => {
-        expect(getByTestId('new-network-info__wrapper')).toBeInTheDocument();
-      });
-      // render title
-      expect(getByText("You're now using")).toBeInTheDocument();
-      // render the network name
-      expect(getByText('Ethereum Mainnet')).toBeInTheDocument();
-      expect(
-        getByTestId('new-network-info__bullet-paragraph').textContent,
-      ).toMatchInlineSnapshot(
-        `"Gas is ETH The native token on this network is ETH. It is the token used for gas fees. "`,
-      );
-    });
-
-    it('should render a question mark icon image for non-main network', async () => {
-      nock('https://token.api.cx.metamask.io')
-        .get('/tokens/0x1?occurrenceFloor=100&includeNativeAssets=false')
-        .reply(200, responseOfTokenList);
-
-      const updateTokenDetectionSupportStatus = await fetchWithCache({
-        url: 'https://token.api.cx.metamask.io/tokens/0x1?occurrenceFloor=100&includeNativeAssets=false',
-        functionName: 'getTokenDetectionSupportStatus',
-      });
-
-      state.metamask.nativeCurrency = '';
-
-      const store = configureMockStore()(
-        state,
-        updateTokenDetectionSupportStatus,
-      );
-      const { container, getByTestId } = renderWithProvider(
-        <NewNetworkInfo />,
-        store,
-      );
-      // wait for the fetch to finish
-      await waitFor(() => {
-        expect(getByTestId('new-network-info__wrapper')).toBeInTheDocument();
-      });
-
-      const questionMark = container.querySelector('.question');
-
-      expect(questionMark).toBeDefined();
-    });
-
-    it('should not render first bullet when provider ticker is null', async () => {
-      nock('https://token.api.cx.metamask.io')
-        .get('/tokens/0x3?occurrenceFloor=100&includeNativeAssets=false')
-        .reply(200, '{"error":"ChainId 0x3 is not supported"}');
-
-      const store = configureMockStore()({
-        metamask: {
-          ...state.metamask,
-          ...mockNetworkState({ chainId: '0x3', ticker: undefined }),
-        },
-      });
-      const { container, getByTestId } = renderWithProvider(
-        <NewNetworkInfo />,
-        store,
-      );
-      // wait for the fetch to finish
-      await new Promise((r) => setTimeout(r, 2000));
-      await waitFor(() => {
-        expect(getByTestId('new-network-info__wrapper')).toBeInTheDocument();
-      });
-      const firstBox = container.querySelector(
-        'new-network-info__content-box-1',
-      );
-
-      expect(firstBox).toBeNull();
-    });
-
-    describe('add token link', () => {
-      const newState = {
-        metamask: {
-          ...mockNetworkState({ chainId: CHAIN_IDS.MAINNET }),
-
-          useExternalServices: true,
-          useTokenDetection: true,
-          currencyRates: {},
-        },
-      };
-
-      it('should not render link when auto token detection is set true and token detection is supported', async () => {
-        nock('https://token.api.cx.metamask.io')
-          .get('/tokens/0x1?occurrenceFloor=100&includeNativeAssets=false')
-          .reply(200, responseOfTokenList);
-
-        const store = configureMockStore()(newState);
-        const { getByTestId, queryByTestId } = renderWithProvider(
-          <NewNetworkInfo />,
-          store,
-        );
-        // should not render add token link
-        await waitFor(() => {
-          expect(getByTestId('new-network-info__wrapper')).toBeInTheDocument();
-        });
-        expect(
-          queryByTestId('new-network-info__add-token-manually'),
-        ).toBeNull();
-      });
-
-      it('should render link when auto token detection is set true and token detection is not supported', async () => {
-        nock('https://token.api.cx.metamask.io')
-          .get('/tokens/0x1?occurrenceFloor=100&includeNativeAssets=false')
-          .replyWithError('something awful happened');
-
-        const store = configureMockStore()(newState);
-        const { getByTestId } = renderWithProvider(<NewNetworkInfo />, store);
-        // render add token link when token is supported
-        await waitFor(() => {
-          expect(getByTestId('new-network-info__wrapper')).toBeInTheDocument();
-        });
-      });
-
-      it('should render link when auto token detection is set false but token detection is not supported', async () => {
-        nock('https://token.api.cx.metamask.io')
-          .get('/tokens/0x1?occurrenceFloor=100&includeNativeAssets=false')
-          .reply(403);
-
-        const store = configureMockStore()(state);
-        const { getByTestId } = renderWithProvider(<NewNetworkInfo />, store);
-        // render add token link when token is supported
-        await waitFor(() => {
-          expect(getByTestId('new-network-info__wrapper')).toBeInTheDocument();
-        });
-        expect(
-          getByTestId('new-network-info__add-token-manually'),
-        ).toBeInTheDocument();
-      });
-
-      it('should render link when auto token detection is set false and token detection is supported', async () => {
-        nock('https://token.api.cx.metamask.io')
-          .get('/tokens/0x1?occurrenceFloor=100&includeNativeAssets=false')
-          .reply(200, responseOfTokenList);
-
-        const updateTokenDetectionSupportStatus = await fetchWithCache({
-          url: 'https://token.api.cx.metamask.io/tokens/0x1?occurrenceFloor=100&includeNativeAssets=false',
-          functionName: 'getTokenDetectionSupportStatus',
-        });
-
-        const store = configureMockStore()(
-          state,
-          updateTokenDetectionSupportStatus,
-        );
-        const { getByText, getByTestId } = renderWithProvider(
-          <NewNetworkInfo />,
-          store,
-        );
-        // wait for the fetch to finish
-        await waitFor(() => {
-          expect(getByTestId('new-network-info__wrapper')).toBeInTheDocument();
-        });
-        // render add token link when token is supported
-        expect(
-          getByText(
-            'Your tokens may not automatically show up in your wallet. You can always add tokens manually.',
-          ),
-        ).toBeInTheDocument();
-      });
-    });
-  });
-});
diff --git a/ui/components/ui/ui-components.scss b/ui/components/ui/ui-components.scss
index a851a6fd72d5..a1a901ac2a4d 100644
--- a/ui/components/ui/ui-components.scss
+++ b/ui/components/ui/ui-components.scss
@@ -29,7 +29,6 @@
 @import 'logo/logo-coinbasepay.scss';
 @import 'loading-screen/index';
 @import 'menu/menu';
-@import 'new-network-info/index';
 @import 'numeric-input/numeric-input';
 @import 'nickname-popover/index';
 @import 'form-field/index';
diff --git a/ui/pages/routes/routes.component.test.js b/ui/pages/routes/routes.component.test.js
index e661099e1aa2..b9bd116195ea 100644
--- a/ui/pages/routes/routes.component.test.js
+++ b/ui/pages/routes/routes.component.test.js
@@ -1,6 +1,6 @@
 import React from 'react';
 import configureMockStore from 'redux-mock-store';
-import { act, waitFor } from '@testing-library/react';
+import { act } from '@testing-library/react';
 import thunk from 'redux-thunk';
 import { BtcAccountType } from '@metamask/keyring-api';
 import { SEND_STAGES } from '../../ducks/send';
@@ -15,10 +15,6 @@ import { useIsOriginalNativeTokenSymbol } from '../../hooks/useIsOriginalNativeT
 import { createMockInternalAccount } from '../../../test/jest/mocks';
 import { CHAIN_IDS } from '../../../shared/constants/network';
 import { mockNetworkState } from '../../../test/stub/networks';
-import {
-  MOCK_ACCOUNT_BIP122_P2WPKH,
-  MOCK_ACCOUNT_EOA,
-} from '../../../test/data/mock-accounts';
 import useMultiPolling from '../../hooks/useMultiPolling';
 import Routes from '.';
 
@@ -191,96 +187,6 @@ describe('Routes Component', () => {
       expect(getByTestId('account-menu-icon')).not.toBeDisabled();
     });
   });
-
-  describe('new network popup', () => {
-    const mockBtcAccount = MOCK_ACCOUNT_BIP122_P2WPKH;
-    const mockEvmAccount = MOCK_ACCOUNT_EOA;
-
-    const mockNewlyAddedNetwork = {
-      chainId: CHAIN_IDS.BASE,
-      name: 'Base',
-      nativeCurrency: 'ETH',
-      defaultRpcEndpointIndex: 0,
-      rpcEndpoints: [
-        {
-          type: 'custom',
-          url: 'https://base.com',
-          networkClientId: CHAIN_IDS.BASE,
-        },
-      ],
-    };
-
-    const renderPopup = async (account) => {
-      // This popup does not show up for tests, so we have to disable this:
-      process.env.IN_TEST = '';
-      const state = {
-        ...mockSendState,
-        metamask: {
-          ...mockState.metamask,
-          completedOnboarding: true,
-          selectedNetworkClientId: mockNewlyAddedNetwork.chainId,
-          internalAccounts: {
-            accounts: {
-              [account.id]: account,
-            },
-            selectedAccount: account.id,
-          },
-          networkConfigurationsByChainId: {
-            ...mockState.metamask.networkConfigurationsByChainId,
-            [mockNewlyAddedNetwork.chainId]: mockNewlyAddedNetwork,
-          },
-          networksMetadata: {
-            ...mockState.metamask.networksMetadata,
-            [mockNewlyAddedNetwork.chainId]: {
-              EIPS: {
-                1559: true,
-              },
-              status: 'available',
-            },
-          },
-          tokens: [],
-          swapsState: { swapsFeatureIsLive: false },
-          announcements: {},
-          pendingApprovals: {},
-          termsOfUseLastAgreed: new Date('2999-03-25'),
-          shouldShowSeedPhraseReminder: false,
-          useExternalServices: true,
-        },
-        send: {
-          ...mockSendState.send,
-          stage: SEND_STAGES.INACTIVE,
-          currentTransactionUUID: null,
-          draftTransactions: {},
-        },
-        appState: {
-          ...mockSendState.appState,
-          showWhatsNewPopup: false,
-          onboardedInThisUISession: false,
-        },
-      };
-      return await render(['/'], state);
-    };
-
-    it('displays new EVM network popup for EVM accounts', async () => {
-      const { getAllByText, queryByTestId } = await renderPopup(mockEvmAccount);
-
-      await waitFor(() => {
-        expect(getAllByText(mockNewlyAddedNetwork.name).length).toBeGreaterThan(
-          0,
-        );
-        expect(
-          queryByTestId('new-network-info__bullet-paragraph'),
-        ).not.toBeInTheDocument();
-      });
-    });
-
-    it('does not display new EVM network popup for non-EVM accounts', async () => {
-      const { queryByTestId } = await renderPopup(mockBtcAccount);
-
-      const networkInfo = queryByTestId('new-network-info__bullet-paragraph');
-      expect(networkInfo).not.toBeInTheDocument();
-    });
-  });
 });
 
 describe('toast display', () => {

From 41b46a04daa8f1fa610c65e1a0666a8b7130d4dd Mon Sep 17 00:00:00 2001
From: chloeYue <105063779+chloeYue@users.noreply.github.com>
Date: Wed, 18 Dec 2024 16:51:16 +0100
Subject: [PATCH 170/175] test: [POM] Migrate portfolio e2e tests and
 permission requests tests to TS and Page Object Model (#29274)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## **Description**

- Migrate portfolio e2e tests and permission requests e2e tests to TS
and Page Object Model

```
test/e2e/tests/portfolio/portfolio-site.spec.ts
test/e2e/json-rpc/wallet_revokePermissions.spec.ts
test/e2e/json-rpc/wallet_requestPermissions.spec.ts
```
- Remove unused ganach setup

[![Open in GitHub
Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/27155?quickstart=1)

## **Related issues**


## **Manual testing steps**
Check code readability, make sure tests pass.

## **Screenshots/Recordings**

<!-- If applicable, add screenshots and/or recordings to visualize the
before and after of your change. -->

### **Before**

<!-- [screenshots/recordings] -->

### **After**

<!-- [screenshots/recordings] -->

## **Pre-merge author checklist**

- [x] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension Coding
Standards](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/CODING_GUIDELINES.md).
- [x] I've completed the PR template to the best of my ability
- [x] I’ve included tests if applicable
- [x] I’ve documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [x] I’ve applied the right labels on the PR (see [labeling
guidelines](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.

## **Pre-merge reviewer checklist**

- [x] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed).
- [x] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.
---
 test/e2e/constants.ts                         |  3 ++
 ...c.js => wallet_requestPermissions.spec.ts} | 42 +++++----------
 ...ec.js => wallet_revokePermissions.spec.ts} | 34 ++++---------
 test/e2e/page-objects/pages/home/homepage.ts  |  7 +++
 test/e2e/page-objects/pages/test-dapp.ts      | 51 ++++++++++---------
 ...io-site.spec.js => portfolio-site.spec.ts} | 27 +++++-----
 .../sendTx-revokePermissions.spec.ts          |  6 +--
 7 files changed, 75 insertions(+), 95 deletions(-)
 rename test/e2e/json-rpc/{wallet_requestPermissions.spec.js => wallet_requestPermissions.spec.ts} (51%)
 rename test/e2e/json-rpc/{wallet_revokePermissions.spec.js => wallet_revokePermissions.spec.ts} (52%)
 rename test/e2e/tests/portfolio/{portfolio-site.spec.js => portfolio-site.spec.ts} (56%)

diff --git a/test/e2e/constants.ts b/test/e2e/constants.ts
index 7123d3e4114a..8296cdc3e3d1 100644
--- a/test/e2e/constants.ts
+++ b/test/e2e/constants.ts
@@ -70,3 +70,6 @@ export const DEFAULT_SOLANA_ACCOUNT =
 
 /* Default (mocked) SOLANA balance used by the Solana RPC provider */
 export const DEFAULT_SOLANA_BALANCE = 1; // SOL
+
+/* Title of the mocked E2E test empty HTML page */
+export const EMPTY_E2E_TEST_PAGE_TITLE = 'E2E Test Page';
diff --git a/test/e2e/json-rpc/wallet_requestPermissions.spec.js b/test/e2e/json-rpc/wallet_requestPermissions.spec.ts
similarity index 51%
rename from test/e2e/json-rpc/wallet_requestPermissions.spec.js
rename to test/e2e/json-rpc/wallet_requestPermissions.spec.ts
index 5484fdf73d80..d2a033dcf3c5 100644
--- a/test/e2e/json-rpc/wallet_requestPermissions.spec.js
+++ b/test/e2e/json-rpc/wallet_requestPermissions.spec.ts
@@ -1,58 +1,42 @@
-const { strict: assert } = require('assert');
-const {
-  defaultGanacheOptions,
-  withFixtures,
-  switchToNotificationWindow,
-  switchToOrOpenDapp,
-  unlockWallet,
-} = require('../helpers');
-const FixtureBuilder = require('../fixture-builder');
+import { strict as assert } from 'assert';
+import { withFixtures } from '../helpers';
+import FixtureBuilder from '../fixture-builder';
+import { loginWithBalanceValidation } from '../page-objects/flows/login.flow';
+import TestDapp from '../page-objects/pages/test-dapp';
 
 describe('wallet_requestPermissions', function () {
   it('executes a request permissions on eth_accounts event', async function () {
     await withFixtures(
       {
         dapp: true,
-        fixtures: new FixtureBuilder()
-          .withPermissionControllerConnectedToTestDapp()
-          .build(),
-        ganacheOptions: defaultGanacheOptions,
-        title: this.test.title,
+        fixtures: new FixtureBuilder().build(),
+        title: this.test?.title,
       },
       async ({ driver }) => {
-        await unlockWallet(driver);
+        await loginWithBalanceValidation(driver);
+        const testDapp = new TestDapp(driver);
+        await testDapp.openTestDappPage();
 
         // wallet_requestPermissions
-        await driver.openNewPage(`http://127.0.0.1:8080`);
-
         const requestPermissionsRequest = JSON.stringify({
           jsonrpc: '2.0',
           method: 'wallet_requestPermissions',
           params: [{ eth_accounts: {} }],
         });
-
         await driver.executeScript(
           `window.ethereum.request(${requestPermissionsRequest})`,
         );
 
-        await switchToNotificationWindow(driver);
-
-        await driver.clickElement({
-          text: 'Connect',
-          tag: 'button',
-        });
-
-        await switchToOrOpenDapp(driver);
+        // confirm connect account
+        await testDapp.confirmConnectAccountModal();
 
         const getPermissionsRequest = JSON.stringify({
           method: 'wallet_getPermissions',
         });
-
         const getPermissions = await driver.executeScript(
           `return window.ethereum.request(${getPermissionsRequest})`,
         );
-
-        assert.strictEqual(getPermissions[0].parentCapability, 'eth_accounts');
+        assert.strictEqual(getPermissions[1].parentCapability, 'eth_accounts');
       },
     );
   });
diff --git a/test/e2e/json-rpc/wallet_revokePermissions.spec.js b/test/e2e/json-rpc/wallet_revokePermissions.spec.ts
similarity index 52%
rename from test/e2e/json-rpc/wallet_revokePermissions.spec.js
rename to test/e2e/json-rpc/wallet_revokePermissions.spec.ts
index 70d2fd3ba572..5c444b5ecf01 100644
--- a/test/e2e/json-rpc/wallet_revokePermissions.spec.js
+++ b/test/e2e/json-rpc/wallet_revokePermissions.spec.ts
@@ -1,12 +1,8 @@
-const { strict: assert } = require('assert');
-
-const {
-  withFixtures,
-  defaultGanacheOptions,
-  unlockWallet,
-  openDapp,
-} = require('../helpers');
-const FixtureBuilder = require('../fixture-builder');
+import { strict as assert } from 'assert';
+import { ACCOUNT_1, withFixtures } from '../helpers';
+import FixtureBuilder from '../fixture-builder';
+import TestDapp from '../page-objects/pages/test-dapp';
+import { loginWithBalanceValidation } from '../page-objects/flows/login.flow';
 
 describe('Revoke Dapp Permissions', function () {
   it('should revoke dapp permissions ', async function () {
@@ -16,18 +12,13 @@ describe('Revoke Dapp Permissions', function () {
         fixtures: new FixtureBuilder()
           .withPermissionControllerConnectedToTestDapp()
           .build(),
-        ganacheOptions: defaultGanacheOptions,
         title: this.test?.fullTitle(),
       },
       async ({ driver }) => {
-        await unlockWallet(driver);
-
-        await openDapp(driver);
-
-        await driver.findElement({
-          text: '0x5cfe73b6021e818b776b421b1c4db2474086a7e1',
-          css: '#accounts',
-        });
+        await loginWithBalanceValidation(driver);
+        const testDapp = new TestDapp(driver);
+        await testDapp.openTestDappPage();
+        await testDapp.check_connectedAccounts(ACCOUNT_1);
 
         // wallet_revokePermissions request
         const revokePermissionsRequest = JSON.stringify({
@@ -43,15 +34,10 @@ describe('Revoke Dapp Permissions', function () {
         const result = await driver.executeScript(
           `return window.ethereum.request(${revokePermissionsRequest})`,
         );
-
         // Response of method call
         assert.deepEqual(result, null);
 
-        // TODO: Fix having to reload dapp as it is not the proper behavior in production, issue with test setup.
-        await driver.executeScript(`window.location.reload()`);
-
-        // You cannot use driver.findElement() with an empty string, so use xpath
-        await driver.findElement({ xpath: '//span[@id="accounts"][.=""]' });
+        await testDapp.check_connectedAccounts(ACCOUNT_1, false);
       },
     );
   });
diff --git a/test/e2e/page-objects/pages/home/homepage.ts b/test/e2e/page-objects/pages/home/homepage.ts
index 1da2349752cb..b4b79846fb06 100644
--- a/test/e2e/page-objects/pages/home/homepage.ts
+++ b/test/e2e/page-objects/pages/home/homepage.ts
@@ -39,6 +39,8 @@ class HomePage {
     testId: 'popover-close',
   };
 
+  private readonly portfolioLink = '[data-testid="portfolio-link"]';
+
   private readonly privacyBalanceToggle = {
     testId: 'sensitive-toggle',
   };
@@ -99,6 +101,11 @@ class HomePage {
     await this.driver.clickElement(this.nftTab);
   }
 
+  async openPortfolioPage(): Promise<void> {
+    console.log(`Open portfolio page on homepage`);
+    await this.driver.clickElement(this.portfolioLink);
+  }
+
   async refreshErc20TokenList(): Promise<void> {
     console.log(`Refresh the ERC20 token list`);
     await this.driver.clickElement(this.erc20TokenDropdown);
diff --git a/test/e2e/page-objects/pages/test-dapp.ts b/test/e2e/page-objects/pages/test-dapp.ts
index 4eff00462351..6b82926fd9ca 100644
--- a/test/e2e/page-objects/pages/test-dapp.ts
+++ b/test/e2e/page-objects/pages/test-dapp.ts
@@ -273,6 +273,16 @@ class TestDapp {
     await this.driver.clickElement(this.erc20TokenTransferButton);
   }
 
+  async confirmConnectAccountModal() {
+    console.log('Confirm connect account modal in notification window');
+    await this.driver.switchToWindowWithTitle(WINDOW_TITLES.Dialog);
+    await this.driver.waitForSelector(this.connectMetaMaskMessage);
+    await this.driver.clickElementAndWaitForWindowToClose(
+      this.confirmDialogButton,
+    );
+    await this.driver.switchToWindowWithTitle(WINDOW_TITLES.TestDApp);
+  }
+
   /**
    * Connect account to test dapp.
    *
@@ -289,25 +299,18 @@ class TestDapp {
   }) {
     console.log('Connect account to test dapp');
     await this.driver.clickElement(this.connectAccountButton);
-    await this.driver.switchToWindowWithTitle(WINDOW_TITLES.Dialog);
-    await this.driver.waitForSelector(this.connectMetaMaskMessage);
     if (connectAccountButtonEnabled) {
-      await this.driver.clickElementAndWaitForWindowToClose(
-        this.confirmDialogButton,
-      );
+      await this.confirmConnectAccountModal();
     } else {
+      await this.driver.switchToWindowWithTitle(WINDOW_TITLES.Dialog);
+      await this.driver.waitForSelector(this.connectMetaMaskMessage);
       const confirmConnectDialogButton = await this.driver.findElement(
         this.confirmDialogButton,
       );
       assert.equal(await confirmConnectDialogButton.isEnabled(), false);
     }
-
     if (publicAddress) {
-      await this.driver.switchToWindowWithTitle(WINDOW_TITLES.TestDApp);
-      await this.driver.waitForSelector({
-        css: this.connectedAccount,
-        text: publicAddress.toLowerCase(),
-      });
+      await this.check_connectedAccounts(publicAddress);
       await this.driver.waitForSelector(this.localhostNetworkMessage);
     }
   }
@@ -332,28 +335,30 @@ class TestDapp {
     await this.driver.clickElement(this.revokePermissionButton);
     await this.driver.refresh();
     await this.check_pageIsLoaded();
-    await this.driver.assertElementNotPresent({
-      css: this.connectedAccount,
-      text: publicAddress.toLowerCase(),
-    });
+    await this.check_connectedAccounts(publicAddress, false);
   }
 
   /**
-   * Verifies the accounts connected to the test dapp.
+   * Check if the accounts connected to the test dapp.
    *
-   * @param connectedAccounts - The expected connected accounts separated by a comma. If no accounts are connected we can omit the param.
+   * @param connectedAccounts - Account addresses to check if connected to test dapp, separated by a comma.
+   * @param shouldBeConnected - Whether the accounts should be connected to test dapp. Defaults to true.
    */
-  async check_connectedAccounts(connectedAccounts: string = '') {
-    console.log('Verify connected accounts');
-    if (connectedAccounts) {
+  async check_connectedAccounts(
+    connectedAccounts: string,
+    shouldBeConnected: boolean = true,
+  ) {
+    if (shouldBeConnected) {
+      console.log('Verify connected accounts:', connectedAccounts);
       await this.driver.waitForSelector({
         css: this.connectedAccount,
-        text: connectedAccounts,
+        text: connectedAccounts.toLowerCase(),
       });
     } else {
-      await this.driver.waitForSelector({
+      console.log('Verify accounts not connected:', connectedAccounts);
+      await this.driver.assertElementNotPresent({
         css: this.connectedAccount,
-        text: ' ',
+        text: connectedAccounts.toLowerCase(),
       });
     }
   }
diff --git a/test/e2e/tests/portfolio/portfolio-site.spec.js b/test/e2e/tests/portfolio/portfolio-site.spec.ts
similarity index 56%
rename from test/e2e/tests/portfolio/portfolio-site.spec.js
rename to test/e2e/tests/portfolio/portfolio-site.spec.ts
index cba9c0452522..f630de50f1da 100644
--- a/test/e2e/tests/portfolio/portfolio-site.spec.js
+++ b/test/e2e/tests/portfolio/portfolio-site.spec.ts
@@ -1,13 +1,13 @@
-const {
-  withFixtures,
-  unlockWallet,
-  defaultGanacheOptions,
-} = require('../../helpers');
-const FixtureBuilder = require('../../fixture-builder');
-const { emptyHtmlPage } = require('../../mock-e2e');
+import { MockttpServer } from 'mockttp';
+import { withFixtures } from '../../helpers';
+import { EMPTY_E2E_TEST_PAGE_TITLE } from '../../constants';
+import FixtureBuilder from '../../fixture-builder';
+import { emptyHtmlPage } from '../../mock-e2e';
+import HomePage from '../../page-objects/pages/home/homepage';
+import { loginWithBalanceValidation } from '../../page-objects/flows/login.flow';
 
 describe('Portfolio site', function () {
-  async function mockPortfolioSite(mockServer) {
+  async function mockPortfolioSite(mockServer: MockttpServer) {
     return await mockServer
       .forGet('https://portfolio.metamask.io/')
       .withQuery({
@@ -27,18 +27,15 @@ describe('Portfolio site', function () {
       {
         dapp: true,
         fixtures: new FixtureBuilder().build(),
-        ganacheOptions: defaultGanacheOptions,
-        title: this.test.fullTitle(),
+        title: this.test?.fullTitle(),
         testSpecificMock: mockPortfolioSite,
       },
       async ({ driver }) => {
-        await unlockWallet(driver);
+        await loginWithBalanceValidation(driver);
+        await new HomePage(driver).openPortfolioPage();
 
         // Click Portfolio site
-        await driver.clickElement('[data-testid="portfolio-link"]');
-        await driver.waitUntilXWindowHandles(2);
-        const windowHandles = await driver.getAllWindowHandles();
-        await driver.switchToWindowWithTitle('E2E Test Page', windowHandles);
+        await driver.switchToWindowWithTitle(EMPTY_E2E_TEST_PAGE_TITLE);
 
         // Verify site
         await driver.waitForUrl({
diff --git a/test/e2e/tests/request-queuing/sendTx-revokePermissions.spec.ts b/test/e2e/tests/request-queuing/sendTx-revokePermissions.spec.ts
index c5ff864df99c..9f5454404806 100644
--- a/test/e2e/tests/request-queuing/sendTx-revokePermissions.spec.ts
+++ b/test/e2e/tests/request-queuing/sendTx-revokePermissions.spec.ts
@@ -41,9 +41,7 @@ describe('Request Queuing', function () {
         // Open test dapp
         const testDapp = new TestDapp(driver);
         await testDapp.openTestDappPage();
-        await testDapp.check_connectedAccounts(
-          DEFAULT_FIXTURE_ACCOUNT.toLowerCase(),
-        );
+        await testDapp.check_connectedAccounts(DEFAULT_FIXTURE_ACCOUNT);
 
         // Trigger a tx
         await testDapp.clickSimpleSendButton();
@@ -71,7 +69,7 @@ describe('Request Queuing', function () {
         await driver.waitUntilXWindowHandles(2);
 
         // Cleared eth_accounts account label
-        await testDapp.check_connectedAccounts();
+        await testDapp.check_connectedAccounts(DEFAULT_FIXTURE_ACCOUNT, false);
       },
     );
   });

From 22bcc760ab137d4faf44fdcd27e3d6f1c5bb9a52 Mon Sep 17 00:00:00 2001
From: George Marshall <george.marshall@consensys.net>
Date: Wed, 18 Dec 2024 08:04:16 -0800
Subject: [PATCH 171/175] chore: fix security settings layout (#29258)

## **Description**

This PR improves the layout of the basic security section by aligning
the toggle button with the heading text. The changes include:

1. Restructuring the layout using Box components with proper alignment
2. Moving the toggle button to be inline with the heading
3. Improving the visual hierarchy by using proper Typography components
4. Maintaining the description text below with appropriate spacing

[![Open in GitHub
Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/29258?quickstart=1)

## **Related issues**

Fixes: https://github.com/MetaMask/metamask-extension/issues/26667

## **Manual testing steps**

1. Go to Settings > Security & Privacy
2. Observe the Basic Configuration section at the top
3. Verify the toggle button is properly aligned with the heading
4. Verify the description text appears below with proper spacing

## **Screenshots/Recordings**

### **Before**


https://github.com/user-attachments/assets/bab9a14c-8f10-4865-b159-5343537a2785

### **After**


https://github.com/user-attachments/assets/b9d02fd8-8e35-4dfa-a00d-b4e6952625df

## **Pre-merge author checklist**

- [x] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension Coding
Standards](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/CODING_GUIDELINES.md).
- [x] I've completed the PR template to the best of my ability
- [x] I've included tests if applicable
- [x] I've documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [x] I've applied the right labels on the PR (see [labeling
guidelines](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.

## **Pre-merge reviewer checklist**

- [ ] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed).
- [ ] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.
---
 .../__snapshots__/security-tab.test.js.snap   | 109 +++++++++---------
 .../security-tab/security-tab.component.js    |  77 +++++++------
 2 files changed, 100 insertions(+), 86 deletions(-)

diff --git a/ui/pages/settings/security-tab/__snapshots__/security-tab.test.js.snap b/ui/pages/settings/security-tab/__snapshots__/security-tab.test.js.snap
index 1d5b622b6b46..3b1837d55ef2 100644
--- a/ui/pages/settings/security-tab/__snapshots__/security-tab.test.js.snap
+++ b/ui/pages/settings/security-tab/__snapshots__/security-tab.test.js.snap
@@ -12,11 +12,62 @@ exports[`Security Tab should match snapshot 1`] = `
       <div
         class="settings-page__content-item"
       >
-        <span>
-          Basic functionality
-        </span>
         <div
-          class="settings-page__content-description"
+          class="mm-box mm-box--margin-bottom-2 mm-box--display-flex mm-box--justify-content-space-between mm-box--align-items-center"
+        >
+          <h4
+            class="mm-box mm-text mm-text--heading-sm mm-box--color-text-default"
+          >
+            Basic functionality
+          </h4>
+          <label
+            class="toggle-button toggle-button--off"
+            tabindex="0"
+          >
+            <div
+              style="display: flex; width: 52px; align-items: center; justify-content: flex-start; position: relative; cursor: pointer; background-color: transparent; border: 0px; padding: 0px; user-select: none;"
+            >
+              <div
+                style="width: 40px; height: 24px; padding: 0px; border-radius: 26px; display: flex; align-items: center; justify-content: center; background-color: rgb(106, 115, 125);"
+              >
+                <div
+                  style="font-size: 11px; display: flex; align-items: center; justify-content: center; font-family: 'Helvetica Neue', Helvetica, sans-serif; position: relative; color: rgb(250, 250, 250); margin-top: auto; margin-bottom: auto; line-height: 0; opacity: 0; width: 26px; height: 20px; left: 4px;"
+                />
+                <div
+                  style="font-size: 11px; display: flex; align-items: center; justify-content: center; font-family: 'Helvetica Neue', Helvetica, sans-serif; position: relative; color: rgba(255, 255, 255, 0.6); bottom: 0px; margin-top: auto; margin-bottom: auto; padding-right: 5px; line-height: 0; width: 26px; height: 20px; opacity: 1;"
+                />
+              </div>
+              <div
+                style="position: absolute; height: 100%; top: 0px; left: 0px; display: flex; flex: 1; align-self: stretch; align-items: center; justify-content: flex-start;"
+              >
+                <div
+                  style="width: 18px; height: 18px; display: flex; align-self: center; box-shadow: var(--shadow-size-xs) var(--color-shadow-default); border-radius: 50%; box-sizing: border-box; position: relative; background-color: rgb(255, 255, 255); left: 3px;"
+                />
+              </div>
+              <input
+                style="border: 0px; height: 1px; margin: -1px; overflow: hidden; padding: 0px; position: absolute; width: 1px;"
+                type="checkbox"
+                value="false"
+              />
+            </div>
+            <div
+              class="toggle-button__status"
+            >
+              <span
+                class="toggle-button__label-off"
+              >
+                Off
+              </span>
+              <span
+                class="toggle-button__label-on"
+              >
+                On
+              </span>
+            </div>
+          </label>
+        </div>
+        <p
+          class="mm-box mm-text mm-text--body-md mm-box--margin-bottom-2 mm-box--color-text-alternative"
         >
           <span>
              
@@ -31,57 +82,11 @@ exports[`Security Tab should match snapshot 1`] = `
             .
              
           </span>
-        </div>
+        </p>
       </div>
       <div
         class="settings-page__content-item-col"
-      >
-        <label
-          class="toggle-button toggle-button--off"
-          tabindex="0"
-        >
-          <div
-            style="display: flex; width: 52px; align-items: center; justify-content: flex-start; position: relative; cursor: pointer; background-color: transparent; border: 0px; padding: 0px; user-select: none;"
-          >
-            <div
-              style="width: 40px; height: 24px; padding: 0px; border-radius: 26px; display: flex; align-items: center; justify-content: center; background-color: rgb(106, 115, 125);"
-            >
-              <div
-                style="font-size: 11px; display: flex; align-items: center; justify-content: center; font-family: 'Helvetica Neue', Helvetica, sans-serif; position: relative; color: rgb(250, 250, 250); margin-top: auto; margin-bottom: auto; line-height: 0; opacity: 0; width: 26px; height: 20px; left: 4px;"
-              />
-              <div
-                style="font-size: 11px; display: flex; align-items: center; justify-content: center; font-family: 'Helvetica Neue', Helvetica, sans-serif; position: relative; color: rgba(255, 255, 255, 0.6); bottom: 0px; margin-top: auto; margin-bottom: auto; padding-right: 5px; line-height: 0; width: 26px; height: 20px; opacity: 1;"
-              />
-            </div>
-            <div
-              style="position: absolute; height: 100%; top: 0px; left: 0px; display: flex; flex: 1; align-self: stretch; align-items: center; justify-content: flex-start;"
-            >
-              <div
-                style="width: 18px; height: 18px; display: flex; align-self: center; box-shadow: var(--shadow-size-xs) var(--color-shadow-default); border-radius: 50%; box-sizing: border-box; position: relative; background-color: rgb(255, 255, 255); left: 3px;"
-              />
-            </div>
-            <input
-              style="border: 0px; height: 1px; margin: -1px; overflow: hidden; padding: 0px; position: absolute; width: 1px;"
-              type="checkbox"
-              value="false"
-            />
-          </div>
-          <div
-            class="toggle-button__status"
-          >
-            <span
-              class="toggle-button__label-off"
-            >
-              Off
-            </span>
-            <span
-              class="toggle-button__label-on"
-            >
-              On
-            </span>
-          </div>
-        </label>
-      </div>
+      />
     </div>
     <span
       class="settings-page__security-tab-sub-header__bold"
diff --git a/ui/pages/settings/security-tab/security-tab.component.js b/ui/pages/settings/security-tab/security-tab.component.js
index fe9785f5e4c1..a475e3a4c7bb 100644
--- a/ui/pages/settings/security-tab/security-tab.component.js
+++ b/ui/pages/settings/security-tab/security-tab.component.js
@@ -26,7 +26,7 @@ import {
 import SRPQuiz from '../../../components/app/srp-quiz-modal/SRPQuiz';
 import {
   Button,
-  BUTTON_SIZES,
+  ButtonSize,
   Icon,
   IconSize,
   IconName,
@@ -44,6 +44,7 @@ import {
   TextColor,
   TextVariant,
   IconColor,
+  AlignItems,
 } from '../../../helpers/constants/design-system';
 import { ADD_POPULAR_CUSTOM_NETWORK } from '../../../helpers/constants/routes';
 import {
@@ -177,7 +178,7 @@ export default class SecurityTab extends PureComponent {
           <Button
             data-testid="reveal-seed-words"
             type="danger"
-            size={BUTTON_SIZES.LG}
+            size={ButtonSize.Lg}
             onClick={(event) => {
               event.preventDefault();
               this.context.trackEvent({
@@ -1042,8 +1043,44 @@ export default class SecurityTab extends PureComponent {
         data-testid="advanced-setting-show-testnet-conversion"
       >
         <div className="settings-page__content-item">
-          <span>{t('basicConfigurationLabel')}</span>
-          <div className="settings-page__content-description">
+          <Box
+            display={Display.Flex}
+            justifyContent={JustifyContent.spaceBetween}
+            alignItems={AlignItems.center}
+            marginBottom={2}
+          >
+            <Text variant={TextVariant.headingSm}>
+              {t('basicConfigurationLabel')}
+            </Text>
+            <ToggleButton
+              value={useExternalServices}
+              onToggle={() => {
+                if (useExternalServices) {
+                  // If we are going to be disabling external services, then we want to show the "turn off" warning modal
+                  setBasicFunctionalityModalOpen();
+                } else {
+                  toggleExternalServices(true);
+                  this.context.trackEvent({
+                    category: MetaMetricsEventCategory.Settings,
+                    event: MetaMetricsEventName.SettingsUpdated,
+                    properties: {
+                      settings_group: 'security_privacy',
+                      settings_type: 'basic_functionality',
+                      old_value: false,
+                      new_value: true,
+                      // these values will always be set to false
+                      // when basic functionality is re-enabled
+                      was_notifications_on: false,
+                      was_profile_syncing_on: false,
+                    },
+                  });
+                }
+              }}
+              offLabel={t('off')}
+              onLabel={t('on')}
+            />
+          </Box>
+          <Text marginBottom={2} color={TextColor.textAlternative}>
             {t('basicConfigurationDescription', [
               <a
                 href="https://consensys.io/privacy-policy"
@@ -1054,38 +1091,10 @@ export default class SecurityTab extends PureComponent {
                 {t('privacyMsg')}
               </a>,
             ])}
-          </div>
+          </Text>
         </div>
 
-        <div className="settings-page__content-item-col">
-          <ToggleButton
-            value={useExternalServices}
-            onToggle={() => {
-              if (useExternalServices) {
-                // If we are going to be disabling external services, then we want to show the "turn off" warning modal
-                setBasicFunctionalityModalOpen();
-              } else {
-                toggleExternalServices(true);
-                this.context.trackEvent({
-                  category: MetaMetricsEventCategory.Settings,
-                  event: MetaMetricsEventName.SettingsUpdated,
-                  properties: {
-                    settings_group: 'security_privacy',
-                    settings_type: 'basic_functionality',
-                    old_value: false,
-                    new_value: true,
-                    // these values will always be set to false
-                    // when basic functionality is re-enabled
-                    was_notifications_on: false,
-                    was_profile_syncing_on: false,
-                  },
-                });
-              }
-            }}
-            offLabel={t('off')}
-            onLabel={t('on')}
-          />
-        </div>
+        <div className="settings-page__content-item-col"></div>
       </Box>
     );
   }

From bdd92438275867c9904cb8d1ec5e1f6c930f706b Mon Sep 17 00:00:00 2001
From: Nick Gambino <35090461+gambinish@users.noreply.github.com>
Date: Wed, 18 Dec 2024 08:54:55 -0800
Subject: [PATCH 172/175] fix: Token details should not display zero balance
 for tokens without marketData (#29299)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## **Description**

On main asset list, if a token doesn't have marketData, we do not
display the fiat value. On tokenDetails we were falling back to zero
balance (this is incorrect)

This PR adds a fix to not fallback to zero balance, and to instead
simply omit the value.

[![Open in GitHub
Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/29299?quickstart=1)

## **Related issues**

Fixes: https://github.com/MetaMask/metamask-extension/issues/29244

## **Manual testing steps**

1. Add a memcoin without marketData
2. Validate that no fiat value is shown on main asset list
3. Validate that no fiat value is shown on token details (should not
display zero value)
4. Ensure nothing results in `NaN` value.

## **Screenshots/Recordings**

<!-- If applicable, add screenshots and/or recordings to visualize the
before and after of your change. -->

### **Before**

<img width="355" alt="Screenshot 2024-12-17 at 1 39 10 PM"
src="https://github.com/user-attachments/assets/3c561498-9ee7-403e-97ff-adf16bf6beda"
/>

<img width="358" alt="Screenshot 2024-12-17 at 1 39 26 PM"
src="https://github.com/user-attachments/assets/c19062d9-7082-46f1-b3e9-8264e9ba3749"
/>

### **After**

<img width="360" alt="Screenshot 2024-12-17 at 1 34 09 PM"
src="https://github.com/user-attachments/assets/80240d57-e875-4418-9574-81ecca7c2690"
/>

<img width="357" alt="Screenshot 2024-12-17 at 1 34 26 PM"
src="https://github.com/user-attachments/assets/852e2cab-0a8b-413b-97ea-35ad725f3add"
/>

## **Pre-merge author checklist**

- [x] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension Coding
Standards](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/CODING_GUIDELINES.md).
- [x] I've completed the PR template to the best of my ability
- [x] I’ve included tests if applicable
- [x] I’ve documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [x] I’ve applied the right labels on the PR (see [labeling
guidelines](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.

## **Pre-merge reviewer checklist**

- [ ] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed).
- [ ] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.
---
 .../asset/components/__snapshots__/asset-page.test.tsx.snap | 4 +---
 ui/pages/asset/components/asset-page.tsx                    | 6 ++++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/ui/pages/asset/components/__snapshots__/asset-page.test.tsx.snap b/ui/pages/asset/components/__snapshots__/asset-page.test.tsx.snap
index dc3cf4c408de..6a55226a42cb 100644
--- a/ui/pages/asset/components/__snapshots__/asset-page.test.tsx.snap
+++ b/ui/pages/asset/components/__snapshots__/asset-page.test.tsx.snap
@@ -223,9 +223,7 @@ exports[`AssetPage should render a native asset 1`] = `
               <p
                 class="mm-box mm-text mm-text--body-md mm-text--font-weight-medium mm-text--text-align-end mm-box--color-text-default"
                 data-testid="multichain-token-list-item-secondary-value"
-              >
-                $0.00
-              </p>
+              />
             </div>
             <div
               class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-space-between"
diff --git a/ui/pages/asset/components/asset-page.tsx b/ui/pages/asset/components/asset-page.tsx
index aef098bfd9d2..c26f2d025f70 100644
--- a/ui/pages/asset/components/asset-page.tsx
+++ b/ui/pages/asset/components/asset-page.tsx
@@ -168,7 +168,7 @@ const AssetPage = ({
 
   // Market and conversion rate data
   const baseCurrency = marketData[chainId]?.[address]?.currency;
-  const tokenMarketPrice = marketData[chainId]?.[address]?.price || 0;
+  const tokenMarketPrice = marketData[chainId]?.[address]?.price || undefined;
   const tokenExchangeRate =
     type === AssetType.native
       ? currencyRates[symbol]?.conversionRate
@@ -284,7 +284,9 @@ const AssetPage = ({
           chainId={chainId}
           symbol={symbol}
           image={image}
-          tokenFiatAmount={showFiat ? tokenFiatAmount : null}
+          tokenFiatAmount={
+            showFiat && tokenMarketPrice ? tokenFiatAmount : null
+          }
           string={balance?.toString()}
         />
         <Box

From 19f486158281121a00995ca5befc7684e16d3894 Mon Sep 17 00:00:00 2001
From: David Murdoch <187813+davidmurdoch@users.noreply.github.com>
Date: Wed, 18 Dec 2024 12:02:46 -0500
Subject: [PATCH 173/175] refactor: remove duplication of selectors in
 `selectors/confirm-transaction.js` (#27641)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

These selectors were duplicated because our circular dependencies were
not letting us import them. Now that I've untangled a bunch of files we
can import them just fine!

<!--
Please submit this PR as a draft initially.
Do not mark it as "Ready for review" until the template has been
completely filled out, and PR status checks have passed at least once.


## **Description**

<!--
Write a short description of the changes included in this pull request,
also include relevant motivation and context. Have in mind the following
questions:
1. What is the reason for the change?
2. What is the improvement/solution?


[![Open in GitHub
Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/27641?quickstart=1)

## **Related issues**

Fixes:

## **Manual testing steps**

1. Go to this page...
2.
3.

## **Screenshots/Recordings**

### **Before**


### **After**

<!-- [screenshots/recordings]

## **Pre-merge author checklist**

- [ ] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension Coding
Standards](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/CODING_GUIDELINES.md).
- [ ] I've completed the PR template to the best of my ability
- [ ] I’ve included tests if applicable
- [ ] I’ve documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [ ] I’ve applied the right labels on the PR (see [labeling
guidelines](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.

## **Pre-merge reviewer checklist**

- [ ] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed).
- [ ] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.
-->
---
 ui/selectors/confirm-transaction.js | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/ui/selectors/confirm-transaction.js b/ui/selectors/confirm-transaction.js
index 10183c916652..2017c3c68932 100644
--- a/ui/selectors/confirm-transaction.js
+++ b/ui/selectors/confirm-transaction.js
@@ -42,17 +42,13 @@ import {
   getUnapprovedTransactions,
   selectTransactionMetadata,
   selectTransactionSender,
+  unapprovedPersonalMsgsSelector,
+  unapprovedDecryptMsgsSelector,
+  unapprovedEncryptionPublicKeyMsgsSelector,
+  unapprovedTypedMessagesSelector,
 } from './transactions';
 
 const unapprovedTxsSelector = (state) => getUnapprovedTransactions(state);
-const unapprovedPersonalMsgsSelector = (state) =>
-  state.metamask.unapprovedPersonalMsgs;
-const unapprovedDecryptMsgsSelector = (state) =>
-  state.metamask.unapprovedDecryptMsgs;
-const unapprovedEncryptionPublicKeyMsgsSelector = (state) =>
-  state.metamask.unapprovedEncryptionPublicKeyMsgs;
-const unapprovedTypedMessagesSelector = (state) =>
-  state.metamask.unapprovedTypedMessages;
 
 export const unconfirmedTransactionsListSelector = createSelector(
   unapprovedTxsSelector,

From 2258c15fe513bb6a9bc952fc879b357a27842bfd Mon Sep 17 00:00:00 2001
From: cmd-ob <ola.bale@consensys.net>
Date: Wed, 18 Dec 2024 17:44:54 +0000
Subject: [PATCH 174/175] test: [POM] Migrate add-multiple-tokens test (#29288)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<!--
Please submit this PR as a draft initially.
Do not mark it as "Ready for review" until the template has been
completely filled out, and PR status checks have passed at least once.
-->

## **Description**

* Moving `test/e2e/tests/tokens/add-multiple-tokens.spec.js` to use POM
and TS
* Adds new generic modal PO for when we just need to click confirm or
cancel `test/e2e/page-objects/pages/dialog/dialog.ts`
* New PO for add tokens dialog
`test/e2e/page-objects/pages/dialog/add-tokens.ts`
* Minor updates to asset-list and dapp POs

[![Open in GitHub
Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/29288?quickstart=1)

## **Related issues**

Fixes:

## **Manual testing steps**

Tests should pass, and test logic should be checked for correctness.

## **Screenshots/Recordings**

<!-- If applicable, add screenshots and/or recordings to visualize the
before and after of your change. -->

### **Before**

<!-- [screenshots/recordings] -->

### **After**

<!-- [screenshots/recordings] -->

## **Pre-merge author checklist**

- [x] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension Coding
Standards](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/CODING_GUIDELINES.md).
- [x] I've completed the PR template to the best of my ability
- [x] I’ve included tests if applicable
- [x] I’ve documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [x] I’ve applied the right labels on the PR (see [labeling
guidelines](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.

## **Pre-merge reviewer checklist**

- [x] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed).
- [x] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.
---
 .../page-objects/pages/dialog/add-tokens.ts   |  50 ++++++++
 .../pages/dialog/create-contract.ts           |  39 ++++++
 .../e2e/page-objects/pages/home/asset-list.ts |  15 +++
 test/e2e/page-objects/pages/test-dapp.ts      |  47 +++++++-
 .../tests/tokens/add-multiple-tokens.spec.js  | 114 ------------------
 .../tests/tokens/add-multiple-tokens.spec.ts  |  70 +++++++++++
 6 files changed, 220 insertions(+), 115 deletions(-)
 create mode 100644 test/e2e/page-objects/pages/dialog/add-tokens.ts
 create mode 100644 test/e2e/page-objects/pages/dialog/create-contract.ts
 delete mode 100644 test/e2e/tests/tokens/add-multiple-tokens.spec.js
 create mode 100644 test/e2e/tests/tokens/add-multiple-tokens.spec.ts

diff --git a/test/e2e/page-objects/pages/dialog/add-tokens.ts b/test/e2e/page-objects/pages/dialog/add-tokens.ts
new file mode 100644
index 000000000000..e587113ab7f5
--- /dev/null
+++ b/test/e2e/page-objects/pages/dialog/add-tokens.ts
@@ -0,0 +1,50 @@
+import { strict as assert } from 'assert';
+import { Driver } from '../../../webdriver/driver';
+
+class AddTokensModal {
+  protected driver: Driver;
+
+  private addTokenButton = { text: 'Add token', tag: 'button' };
+
+  private tokenListItem = '.confirm-add-suggested-token__token-list-item';
+
+  constructor(driver: Driver) {
+    this.driver = driver;
+  }
+
+  async check_pageIsLoaded(): Promise<void> {
+    try {
+      await this.driver.waitForMultipleSelectors([
+        this.tokenListItem,
+        this.addTokenButton,
+      ]);
+    } catch (e) {
+      console.log(
+        'Timeout while waiting for Add tokens dialog to be loaded',
+        e,
+      );
+      throw e;
+    }
+    console.log('Add tokens dialog was loaded');
+  }
+
+  /**
+   * Checks the count of suggested tokens.
+   *
+   * @param expectedTokenCount - The expected count of suggested tokens.
+   */
+  async check_SuggestedTokensCount(expectedTokenCount: number) {
+    const multipleSuggestedTokens = await this.driver.findElements(
+      this.tokenListItem,
+    );
+
+    // Confirm the expected number of tokens are present as suggested token list
+    assert.equal(multipleSuggestedTokens.length, expectedTokenCount);
+  }
+
+  async confirmAddTokens() {
+    await this.driver.clickElementAndWaitForWindowToClose(this.addTokenButton);
+  }
+}
+
+export default AddTokensModal;
diff --git a/test/e2e/page-objects/pages/dialog/create-contract.ts b/test/e2e/page-objects/pages/dialog/create-contract.ts
new file mode 100644
index 000000000000..44c101271ffe
--- /dev/null
+++ b/test/e2e/page-objects/pages/dialog/create-contract.ts
@@ -0,0 +1,39 @@
+import { Driver } from '../../../webdriver/driver';
+
+class CreateContractModal {
+  protected driver: Driver;
+
+  private readonly confirmButtton = { text: 'Confirm', tag: 'button' };
+
+  private readonly cancelButton = { text: 'Cancel', tag: 'button' };
+
+  constructor(driver: Driver) {
+    this.driver = driver;
+  }
+
+  async check_pageIsLoaded(): Promise<void> {
+    try {
+      await this.driver.waitForMultipleSelectors([
+        this.confirmButtton,
+        this.cancelButton,
+      ]);
+    } catch (e) {
+      console.log(
+        'Timeout while waiting for create contract dialog to be loaded',
+        e,
+      );
+      throw e;
+    }
+    console.log('Create contract dialog was loaded');
+  }
+
+  async clickConfirm() {
+    await this.driver.clickElementAndWaitForWindowToClose(this.confirmButtton);
+  }
+
+  async clickCancel() {
+    await this.driver.clickElementAndWaitForWindowToClose(this.cancelButton);
+  }
+}
+
+export default CreateContractModal;
diff --git a/test/e2e/page-objects/pages/home/asset-list.ts b/test/e2e/page-objects/pages/home/asset-list.ts
index db9367991bf7..9db896e3a035 100644
--- a/test/e2e/page-objects/pages/home/asset-list.ts
+++ b/test/e2e/page-objects/pages/home/asset-list.ts
@@ -204,6 +204,21 @@ class AssetListPage {
     });
   }
 
+  /**
+   * This function checks if the specified token is displayed in the token list by its name.
+   *
+   * @param tokenName - The name of the token to check for.
+   * @returns A promise that resolves if the specified token is displayed.
+   */
+  async check_tokenIsDisplayed(tokenName: string): Promise<void> {
+    console.log(`Waiting for token ${tokenName} to be displayed`);
+    await this.driver.waitForSelector({
+      text: tokenName,
+      tag: 'p',
+    });
+    console.log(`Token ${tokenName} is displayed.`);
+  }
+
   /**
    * This function checks if the specified number of token items is displayed in the token list.
    *
diff --git a/test/e2e/page-objects/pages/test-dapp.ts b/test/e2e/page-objects/pages/test-dapp.ts
index 6b82926fd9ca..5471afb3556a 100644
--- a/test/e2e/page-objects/pages/test-dapp.ts
+++ b/test/e2e/page-objects/pages/test-dapp.ts
@@ -8,6 +8,11 @@ const DAPP_URL = `http://${DAPP_HOST_ADDRESS}`;
 class TestDapp {
   private driver: Driver;
 
+  private readonly addTokensToWalletButton = {
+    text: 'Add Token(s) to Wallet',
+    tag: 'button',
+  };
+
   private readonly confirmDepositButton =
     '[data-testid="confirm-footer-button"]';
 
@@ -38,6 +43,8 @@ class TestDapp {
 
   private readonly simpleSendButton = '#sendButton';
 
+  private readonly erc20TokenAddresses = '#erc20TokenAddresses';
+
   private readonly erc721MintButton = '#mintButton';
 
   private readonly erc721TransferFromButton = '#transferFromButton';
@@ -177,6 +184,11 @@ class TestDapp {
 
   private erc20TokenTransferButton = '#transferTokens';
 
+  private createTokenButton = {
+    text: 'Create Token',
+    tag: 'button',
+  };
+
   constructor(driver: Driver) {
     this.driver = driver;
   }
@@ -221,6 +233,10 @@ class TestDapp {
     });
   }
 
+  public async clickAddTokenToWallet() {
+    await this.driver.clickElement(this.addTokensToWalletButton);
+  }
+
   async clickSimpleSendButton() {
     await this.driver.clickElement(this.simpleSendButton);
   }
@@ -339,7 +355,18 @@ class TestDapp {
   }
 
   /**
-   * Check if the accounts connected to the test dapp.
+   * Scrolls to the create token button and clicks it.
+   */
+  public async findAndClickCreateToken() {
+    const createTokenElement = await this.driver.findElement(
+      this.createTokenButton,
+    );
+    await this.driver.scrollToElement(createTokenElement);
+    await this.driver.clickElement(this.createTokenButton);
+  }
+
+  /**
+   * Verifies the accounts connected to the test dapp.
    *
    * @param connectedAccounts - Account addresses to check if connected to test dapp, separated by a comma.
    * @param shouldBeConnected - Whether the accounts should be connected to test dapp. Defaults to true.
@@ -599,6 +626,24 @@ class TestDapp {
     });
   }
 
+  /**
+   * Checks the count of token addresses.
+   *
+   * @param expectedCount - The expected count of token addresses.
+   */
+  async check_TokenAddressesCount(expectedCount: number) {
+    console.log(`checking token addresses count: ${expectedCount}`);
+    await this.driver.wait(async () => {
+      const tokenAddressesElement = await this.driver.findElement(
+        this.erc20TokenAddresses,
+      );
+      const tokenAddresses = await tokenAddressesElement.getText();
+      const addresses = tokenAddresses.split(',').filter(Boolean);
+
+      return addresses.length === expectedCount;
+    }, 10000);
+  }
+
   async verify_successSignTypedDataV4Result(result: string) {
     await this.driver.waitForSelector({
       css: this.signTypedDataV4Result,
diff --git a/test/e2e/tests/tokens/add-multiple-tokens.spec.js b/test/e2e/tests/tokens/add-multiple-tokens.spec.js
deleted file mode 100644
index bc6ea5e6f2c0..000000000000
--- a/test/e2e/tests/tokens/add-multiple-tokens.spec.js
+++ /dev/null
@@ -1,114 +0,0 @@
-const { strict: assert } = require('assert');
-const {
-  withFixtures,
-  defaultGanacheOptions,
-  openDapp,
-  switchToNotificationWindow,
-  WINDOW_TITLES,
-  DAPP_URL,
-  unlockWallet,
-} = require('../../helpers');
-const FixtureBuilder = require('../../fixture-builder');
-
-describe('Multiple ERC20 Watch Asset', function () {
-  // TODO: This assertion will change once the method is fixed.
-  it('should show multiple erc20 watchAsset token list, only confirms one bug', async function () {
-    await withFixtures(
-      {
-        dapp: true,
-        fixtures: new FixtureBuilder()
-          .withPermissionControllerConnectedToTestDapp()
-          .build(),
-        ganacheOptions: defaultGanacheOptions,
-        title: this.test.fullTitle(),
-      },
-      async ({ driver }) => {
-        await unlockWallet(driver);
-
-        await openDapp(driver, undefined, DAPP_URL);
-
-        // Create Token 1
-        const createToken = await driver.findElement({
-          text: 'Create Token',
-          tag: 'button',
-        });
-        await driver.scrollToElement(createToken);
-        await driver.clickElement({ text: 'Create Token', tag: 'button' });
-        await switchToNotificationWindow(driver);
-        await driver.findClickableElement({ text: 'Confirm', tag: 'button' });
-        await driver.clickElement({ text: 'Confirm', tag: 'button' });
-
-        // Wait for token 1 address to populate in dapp
-        await driver.switchToWindowWithTitle(WINDOW_TITLES.TestDApp);
-        await driver.wait(async () => {
-          const tokenAddressesElement = await driver.findElement(
-            '#erc20TokenAddresses',
-          );
-          const tokenAddresses = await tokenAddressesElement.getText();
-          return tokenAddresses !== '';
-        }, 10000);
-
-        // Create Token 2
-        await driver.clickElement({ text: 'Create Token', tag: 'button' });
-        await switchToNotificationWindow(driver);
-        await driver.findClickableElement({ text: 'Confirm', tag: 'button' });
-        await driver.clickElement({ text: 'Confirm', tag: 'button' });
-
-        // Wait for token 2 address to populate in dapp
-        await driver.switchToWindowWithTitle(WINDOW_TITLES.TestDApp);
-        await driver.wait(async () => {
-          const tokenAddressesElement = await driver.findElement(
-            '#erc20TokenAddresses',
-          );
-          const tokenAddresses = await tokenAddressesElement.getText();
-          return tokenAddresses.split(',').length === 2;
-        }, 10000);
-
-        // Create Token 3
-        await driver.clickElement({ text: 'Create Token', tag: 'button' });
-        await switchToNotificationWindow(driver);
-        await driver.findClickableElement({ text: 'Confirm', tag: 'button' });
-        await driver.clickElement({ text: 'Confirm', tag: 'button' });
-
-        // Wait for token 3 address to populate in dapp
-        await driver.switchToWindowWithTitle(WINDOW_TITLES.TestDApp);
-        await driver.wait(async () => {
-          const tokenAddressesElement = await driver.findElement(
-            '#erc20TokenAddresses',
-          );
-          const tokenAddresses = await tokenAddressesElement.getText();
-          return tokenAddresses.split(',').length === 3;
-        }, 10000);
-
-        // Watch all 3 tokens
-        await driver.clickElement({
-          text: 'Add Token(s) to Wallet',
-          tag: 'button',
-        });
-
-        // Switch to watchAsset notification
-        await switchToNotificationWindow(driver);
-        const multipleSuggestedtokens = await driver.findElements(
-          '.confirm-add-suggested-token__token-list-item',
-        );
-
-        // Confirm all 3 tokens are present as suggested token list
-        assert.equal(multipleSuggestedtokens.length, 3);
-        await driver.findClickableElement({ text: 'Add token', tag: 'button' });
-        await driver.clickElement({ text: 'Add token', tag: 'button' });
-
-        // Switch to fullscreen extension
-        await driver.switchToWindowWithTitle(
-          WINDOW_TITLES.ExtensionInFullScreenView,
-        );
-
-        // Check all three tokens have been added to the token list.
-        const addedTokens = await driver.findElements({
-          tag: 'p',
-          text: 'TST',
-        });
-        assert.equal(addedTokens.length, 3);
-      },
-    );
-  });
-});
diff --git a/test/e2e/tests/tokens/add-multiple-tokens.spec.ts b/test/e2e/tests/tokens/add-multiple-tokens.spec.ts
new file mode 100644
index 000000000000..78daa2531da1
--- /dev/null
+++ b/test/e2e/tests/tokens/add-multiple-tokens.spec.ts
@@ -0,0 +1,70 @@
+import AddTokensModal from '../../page-objects/pages/dialog/add-tokens';
+import AssetListPage from '../../page-objects/pages/home/asset-list';
+import TestDapp from '../../page-objects/pages/test-dapp';
+import {
+  withFixtures,
+  defaultGanacheOptions,
+  openDapp,
+  WINDOW_TITLES,
+  DAPP_URL,
+  unlockWallet,
+} from '../../helpers';
+import FixtureBuilder from '../../fixture-builder';
+import CreateContractModal from '../../page-objects/pages/dialog/create-contract';
+
+describe('Multiple ERC20 Watch Asset', function () {
+  it('should show multiple erc20 watchAsset token list, only confirms one bug', async function () {
+    await withFixtures(
+      {
+        dapp: true,
+        fixtures: new FixtureBuilder()
+          .withPermissionControllerConnectedToTestDapp()
+          .build(),
+        ganacheOptions: defaultGanacheOptions,
+        title: this.test?.fullTitle(),
+      },
+      async ({ driver }) => {
+        await unlockWallet(driver);
+        await openDapp(driver, undefined, DAPP_URL);
+        const testDapp = new TestDapp(driver);
+
+        // Create multiple tokens
+        for (let i = 0; i < 3; i++) {
+          // Create token
+          await testDapp.findAndClickCreateToken();
+
+          // Confirm token creation
+          await driver.switchToWindowWithTitle(WINDOW_TITLES.Dialog);
+          const createContractModal = new CreateContractModal(driver);
+          await createContractModal.check_pageIsLoaded();
+          await createContractModal.clickConfirm();
+
+          // Wait for token address to populate in dapp
+          await driver.switchToWindowWithTitle(WINDOW_TITLES.TestDApp);
+          await testDapp.check_pageIsLoaded();
+          await testDapp.check_TokenAddressesCount(i + 1);
+        }
+
+        // Watch all 3 tokens
+        // Switch to watchAsset notification
+        await testDapp.clickAddTokenToWallet();
+        await driver.switchToWindowWithTitle(WINDOW_TITLES.Dialog);
+        const addTokensPopupModal = new AddTokensModal(driver);
+        await addTokensPopupModal.check_pageIsLoaded();
+        await addTokensPopupModal.check_SuggestedTokensCount(3);
+        await addTokensPopupModal.confirmAddTokens();
+
+        // Switch to fullscreen extension
+        await driver.switchToWindowWithTitle(
+          WINDOW_TITLES.ExtensionInFullScreenView,
+        );
+
+        // Check all three tokens have been added to the token list.
+        const tokenList = new AssetListPage(driver);
+        await tokenList.check_tokenItemNumber(4); // 3 tokens plus ETH
+        await tokenList.check_tokenIsDisplayed('Ethereum');
+        await tokenList.check_tokenIsDisplayed('TST');
+      },
+    );
+  });
+});

From f8a1d4fca314c890fd03f6d76d98183052a9fe7f Mon Sep 17 00:00:00 2001
From: Michele Esposito <34438276+mikesposito@users.noreply.github.com>
Date: Wed, 18 Dec 2024 18:45:58 +0100
Subject: [PATCH 175/175] fix: block tracker stops polling when switching away
 from the network (#29045)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<!--
Please submit this PR as a draft initially.
Do not mark it as "Ready for review" until the template has been
completely filled out, and PR status checks have passed at least once.
-->

## **Description**

<!--
Write a short description of the changes included in this pull request,
also include relevant motivation and context. Have in mind the following
questions:
1. What is the reason for the change?
2. What is the improvement/solution?
-->
This PR bumps `@metamask/network-controller` and
`@metamask/eth-json-rpc-middleware` by a patch version to fix an issue
related to `@metamask/eth-block-tracker`, used to listen to new blocks
emitted by networks.

[![Open in GitHub
Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/29045?quickstart=1)

## **Related issues**

Fixes: #17040

## **Manual testing steps**

This only applies to views that show a single chain: since now the
wallet home shows all networks, requests will be fired regardless of the
globally selected network. To test this, the chain filter in the home
should be set to a specific chain, instead of all

1. Add a local ganache network
2. Turn off the local ganache server
3. Observe requests failing when navigating to the home of the wallet
(while showing all networks)
4. Filter a single chain which is not the local one (e.g. mainnet)
5. Polling to localhost should stop

## **Screenshots/Recordings**

<!-- If applicable, add screenshots and/or recordings to visualize the
before and after of your change. -->

### **Before**

<!-- [screenshots/recordings] -->

### **After**

<!-- [screenshots/recordings] -->

## **Pre-merge author checklist**

- [ ] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension Coding
Standards](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/CODING_GUIDELINES.md).
- [ ] I've completed the PR template to the best of my ability
- [ ] I’ve included tests if applicable
- [ ] I’ve documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [ ] I’ve applied the right labels on the PR (see [labeling
guidelines](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.

## **Pre-merge reviewer checklist**

- [ ] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed).
- [ ] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.
---
 ...rk-controller-npm-22.1.1-09b6510f1e.patch} |  7 ++-
 package.json                                  |  6 +--
 yarn.lock                                     | 50 +++++--------------
 3 files changed, 18 insertions(+), 45 deletions(-)
 rename .yarn/patches/{@metamask-network-controller-npm-22.1.0-621c281f70.patch => @metamask-network-controller-npm-22.1.1-09b6510f1e.patch} (85%)

diff --git a/.yarn/patches/@metamask-network-controller-npm-22.1.0-621c281f70.patch b/.yarn/patches/@metamask-network-controller-npm-22.1.1-09b6510f1e.patch
similarity index 85%
rename from .yarn/patches/@metamask-network-controller-npm-22.1.0-621c281f70.patch
rename to .yarn/patches/@metamask-network-controller-npm-22.1.1-09b6510f1e.patch
index 027c44b96395..a1a3e7401c0c 100644
--- a/.yarn/patches/@metamask-network-controller-npm-22.1.0-621c281f70.patch
+++ b/.yarn/patches/@metamask-network-controller-npm-22.1.1-09b6510f1e.patch
@@ -1,6 +1,6 @@
 diff --git a/PATCH.txt b/PATCH.txt
 new file mode 100644
-index 0000000000000000000000000000000000000000..ce3b18534f055ee00aa5821793f855fd300fb72c
+index 0000000000000000000000000000000000000000..376255036ca54b83a3f3c3e0277c2666473df30e
 --- /dev/null
 +++ b/PATCH.txt
 @@ -0,0 +1,4 @@
@@ -8,9 +8,8 @@ index 0000000000000000000000000000000000000000..ce3b18534f055ee00aa5821793f855fd
 +The network lookup is done after onboarding is completed, and when the extension reloads if onboarding has been completed.
 +This patch is part of a temporary fix that will be reverted soon to make way for a more permanent solution. https://github.com/MetaMask/metamask-extension/pull/23005
 +You can see the changes before compilation on this branch: https://github.com/MetaMask/core/compare/pnf/ext-23622-review?expand=1
-\ No newline at end of file
 diff --git a/dist/NetworkController.cjs b/dist/NetworkController.cjs
-index cc9793f576eb39a51ab141b7d03de57cf99e5570..c573b5134d40f522217a6ab6df129040d02e9660 100644
+index cc9793f576eb39a51ab141b7d03de57cf99e5570..184153067f2bbd58ea76d7db33c2af56245cd8c0 100644
 --- a/dist/NetworkController.cjs
 +++ b/dist/NetworkController.cjs
 @@ -422,7 +422,6 @@ class NetworkController extends base_controller_1.BaseController {
@@ -22,7 +21,7 @@ index cc9793f576eb39a51ab141b7d03de57cf99e5570..c573b5134d40f522217a6ab6df129040
      /**
       * Refreshes the network meta with EIP-1559 support and the network status
 diff --git a/dist/NetworkController.mjs b/dist/NetworkController.mjs
-index 806f32edeffaad9f7eb1cafa4184368ec95f63e7..9268947cbed4bf717729ca6ac8ea83a8b91b6e8a 100644
+index 806f32edeffaad9f7eb1cafa4184368ec95f63e7..7ba60e613ec8de7d273c32282be564f36873cbd2 100644
 --- a/dist/NetworkController.mjs
 +++ b/dist/NetworkController.mjs
 @@ -397,7 +397,6 @@ export class NetworkController extends BaseController {
diff --git a/package.json b/package.json
index c3e6ff9eac24..31fed3a39b52 100644
--- a/package.json
+++ b/package.json
@@ -237,7 +237,7 @@
     "@expo/config-plugins/glob": "^10.3.10",
     "@solana/web3.js/rpc-websockets": "^8.0.1",
     "@metamask/nonce-tracker@npm:^5.0.0": "patch:@metamask/nonce-tracker@npm%3A5.0.0#~/.yarn/patches/@metamask-nonce-tracker-npm-5.0.0-d81478218e.patch",
-    "@metamask/network-controller@npm:^22.0.0": "patch:@metamask/network-controller@npm%3A22.1.0#~/.yarn/patches/@metamask-network-controller-npm-22.1.0-621c281f70.patch",
+    "@metamask/network-controller@npm:^22.0.2": "patch:@metamask/network-controller@npm%3A22.1.1#~/.yarn/patches/@metamask-network-controller-npm-22.1.1-09b6510f1e.patch",
     "path-to-regexp": "1.9.0",
     "@ledgerhq/cryptoassets-evm-signatures/axios": "^0.28.0",
     "@ledgerhq/domain-service/axios": "^0.28.0",
@@ -296,7 +296,7 @@
     "@metamask/ens-controller": "^15.0.0",
     "@metamask/ens-resolver-snap": "^0.1.2",
     "@metamask/eth-json-rpc-filters": "^9.0.0",
-    "@metamask/eth-json-rpc-middleware": "^15.0.0",
+    "@metamask/eth-json-rpc-middleware": "^15.0.1",
     "@metamask/eth-ledger-bridge-keyring": "^5.0.1",
     "@metamask/eth-query": "^4.0.0",
     "@metamask/eth-sig-util": "^7.0.1",
@@ -321,7 +321,7 @@
     "@metamask/message-signing-snap": "^0.6.0",
     "@metamask/metamask-eth-abis": "^3.1.1",
     "@metamask/name-controller": "^8.0.0",
-    "@metamask/network-controller": "patch:@metamask/network-controller@npm%3A22.1.0#~/.yarn/patches/@metamask-network-controller-npm-22.1.0-621c281f70.patch",
+    "@metamask/network-controller": "patch:@metamask/network-controller@npm%3A22.1.1#~/.yarn/patches/@metamask-network-controller-npm-22.1.1-09b6510f1e.patch",
     "@metamask/notification-services-controller": "^0.15.0",
     "@metamask/object-multiplex": "^2.0.0",
     "@metamask/obs-store": "^9.0.0",
diff --git a/yarn.lock b/yarn.lock
index 0b959e498c51..7bfb4b6e4336 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5221,7 +5221,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/eth-block-tracker@npm:^11.0.2, @metamask/eth-block-tracker@npm:^11.0.3":
+"@metamask/eth-block-tracker@npm:^11.0.3":
   version: 11.0.3
   resolution: "@metamask/eth-block-tracker@npm:11.0.3"
   dependencies:
@@ -5272,7 +5272,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/eth-json-rpc-middleware@npm:^15.0.0, @metamask/eth-json-rpc-middleware@npm:^15.0.1":
+"@metamask/eth-json-rpc-middleware@npm:^15.0.1":
   version: 15.0.1
   resolution: "@metamask/eth-json-rpc-middleware@npm:15.0.1"
   dependencies:
@@ -5785,33 +5785,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/network-controller@npm:22.1.0":
-  version: 22.1.0
-  resolution: "@metamask/network-controller@npm:22.1.0"
-  dependencies:
-    "@metamask/base-controller": "npm:^7.0.2"
-    "@metamask/controller-utils": "npm:^11.4.4"
-    "@metamask/eth-block-tracker": "npm:^11.0.2"
-    "@metamask/eth-json-rpc-infura": "npm:^10.0.0"
-    "@metamask/eth-json-rpc-middleware": "npm:^15.0.0"
-    "@metamask/eth-json-rpc-provider": "npm:^4.1.6"
-    "@metamask/eth-query": "npm:^4.0.0"
-    "@metamask/json-rpc-engine": "npm:^10.0.1"
-    "@metamask/rpc-errors": "npm:^7.0.1"
-    "@metamask/swappable-obj-proxy": "npm:^2.2.0"
-    "@metamask/utils": "npm:^10.0.0"
-    async-mutex: "npm:^0.5.0"
-    fast-deep-equal: "npm:^3.1.3"
-    immer: "npm:^9.0.6"
-    loglevel: "npm:^1.8.1"
-    reselect: "npm:^5.1.1"
-    uri-js: "npm:^4.4.1"
-    uuid: "npm:^8.3.2"
-  checksum: 10/587ad3eba45e898d83a06c800c1649c1dc1ae708c53114a2e8a82bb18fc3773eaca2abc9b8f2afd46106aa96e22a28e79d2d5bd620d9de1606e5180b5a8996df
-  languageName: node
-  linkType: hard
-
-"@metamask/network-controller@npm:^22.1.1":
+"@metamask/network-controller@npm:22.1.1, @metamask/network-controller@npm:^22.1.1":
   version: 22.1.1
   resolution: "@metamask/network-controller@npm:22.1.1"
   dependencies:
@@ -5837,20 +5811,20 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/network-controller@patch:@metamask/network-controller@npm%3A22.1.0#~/.yarn/patches/@metamask-network-controller-npm-22.1.0-621c281f70.patch":
-  version: 22.1.0
-  resolution: "@metamask/network-controller@patch:@metamask/network-controller@npm%3A22.1.0#~/.yarn/patches/@metamask-network-controller-npm-22.1.0-621c281f70.patch::version=22.1.0&hash=93e992"
+"@metamask/network-controller@patch:@metamask/network-controller@npm%3A22.1.1#~/.yarn/patches/@metamask-network-controller-npm-22.1.1-09b6510f1e.patch":
+  version: 22.1.1
+  resolution: "@metamask/network-controller@patch:@metamask/network-controller@npm%3A22.1.1#~/.yarn/patches/@metamask-network-controller-npm-22.1.1-09b6510f1e.patch::version=22.1.1&hash=64b409"
   dependencies:
     "@metamask/base-controller": "npm:^7.0.2"
     "@metamask/controller-utils": "npm:^11.4.4"
-    "@metamask/eth-block-tracker": "npm:^11.0.2"
+    "@metamask/eth-block-tracker": "npm:^11.0.3"
     "@metamask/eth-json-rpc-infura": "npm:^10.0.0"
-    "@metamask/eth-json-rpc-middleware": "npm:^15.0.0"
+    "@metamask/eth-json-rpc-middleware": "npm:^15.0.1"
     "@metamask/eth-json-rpc-provider": "npm:^4.1.6"
     "@metamask/eth-query": "npm:^4.0.0"
     "@metamask/json-rpc-engine": "npm:^10.0.1"
     "@metamask/rpc-errors": "npm:^7.0.1"
-    "@metamask/swappable-obj-proxy": "npm:^2.2.0"
+    "@metamask/swappable-obj-proxy": "npm:^2.3.0"
     "@metamask/utils": "npm:^10.0.0"
     async-mutex: "npm:^0.5.0"
     fast-deep-equal: "npm:^3.1.3"
@@ -5859,7 +5833,7 @@ __metadata:
     reselect: "npm:^5.1.1"
     uri-js: "npm:^4.4.1"
     uuid: "npm:^8.3.2"
-  checksum: 10/21427a6bc57fa318dadd223342d3eda07c077705ef641c3448fb4dc438fb9f87e730e0bd5f7c9fc3f785bfce87c6a52f9b4ae5e17d933ecb5792e0bdc5ea4746
+  checksum: 10/ffe5156f3129a8c09242c01d477a6e1149e42f8884c721f03b51fc64a933cc6324d922f20cef6954e974ee3d7a2433d9c72a72b0899d83aa68ecf775d4edd4dc
   languageName: node
   linkType: hard
 
@@ -26587,7 +26561,7 @@ __metadata:
     "@metamask/eslint-config-typescript": "npm:^9.0.1"
     "@metamask/eslint-plugin-design-tokens": "npm:^1.1.0"
     "@metamask/eth-json-rpc-filters": "npm:^9.0.0"
-    "@metamask/eth-json-rpc-middleware": "npm:^15.0.0"
+    "@metamask/eth-json-rpc-middleware": "npm:^15.0.1"
     "@metamask/eth-json-rpc-provider": "npm:^4.1.6"
     "@metamask/eth-ledger-bridge-keyring": "npm:^5.0.1"
     "@metamask/eth-query": "npm:^4.0.0"
@@ -26614,7 +26588,7 @@ __metadata:
     "@metamask/message-signing-snap": "npm:^0.6.0"
     "@metamask/metamask-eth-abis": "npm:^3.1.1"
     "@metamask/name-controller": "npm:^8.0.0"
-    "@metamask/network-controller": "patch:@metamask/network-controller@npm%3A22.1.0#~/.yarn/patches/@metamask-network-controller-npm-22.1.0-621c281f70.patch"
+    "@metamask/network-controller": "patch:@metamask/network-controller@npm%3A22.1.1#~/.yarn/patches/@metamask-network-controller-npm-22.1.1-09b6510f1e.patch"
     "@metamask/notification-services-controller": "npm:^0.15.0"
     "@metamask/object-multiplex": "npm:^2.0.0"
     "@metamask/obs-store": "npm:^9.0.0"